Commit Graph

4351 Commits

Author SHA1 Message Date
xin.zhang eb90f16dd5 FIX: move the function to API
jira: [none]
Change-Id: I2b30082148d6d9b937a218e37464727ba8fdf131
2025-03-24 08:24:22 +08:00
chunmao.guo 99bc6f6a80 FIX: title of Extruder Tab
Change-Id: I2c436d9e0aa3e857d97395b65a8632ab39b02d50
Jira: STUDIO-10148
2025-03-24 08:24:22 +08:00
zhimin.zeng 5c3d804b9f FIX: Detach the timelapse gcode from layer_change_gcode
for X and P machine
2. remove lift and retract in filament_change_gcode and layer_change_gcode
jira: none

Change-Id: I3da2d3ac7f0100d1963dcbb1228323666a060534
2025-03-24 08:24:22 +08:00
zhimin.zeng f05800dbae FIX: add timelapse warning message when sending print
jira: none
Change-Id: Ie73761f300fc4902f667d66e30a6a94a9557cd19
2025-03-24 08:24:22 +08:00
xin.zhang e43e4950da FIX: update the message color settings
jira: [STUDIO-9903]
Change-Id: I73306d98d679620666a1ab68d5da7222b45cd332
2025-03-24 08:24:22 +08:00
xin.zhang 2431dbc48f FIX: the display content of calibration dialog
jira: [STUDIO-9875]
Change-Id: Ie6039c9b16f010f774ec5ad3e457c5651e54399f
2025-03-24 08:24:22 +08:00
xin.zhang 559eba688d FIX: make the main area able to scroll
jira: [STUDIO-9878]
Change-Id: I89921f76b684a63bffde894eed89ecfa5d946b66
2025-03-24 08:24:22 +08:00
zhou.xu d5fc51843a FIX:call is_online flag at the beginning of sync printer
jira: STUDIO-10183
Change-Id: If2d1b5ad55e9f1552e98e158a24b0887d5023eb3
2025-03-24 08:24:22 +08:00
Arthur 02b8a79285 ENH: auto arranging won't put more than 1 TPU filament on the same plate
jira: none
Change-Id: I0ac0968ac56f9969f94b73cfacaac3a97a814b2d
2025-03-24 08:24:22 +08:00
Arthur f9a1ed7b24 ENH: rewrite ModelInstance::rotate with rotation matrix
1. Rotation operation should always work on rotation matrix. Euler angles are not reliable.
2. Remove the ambiguous set_rotation on single euler angle.
3. Fix the bug that the rotation of the mirrored object is not correct.
jira: STUDIO-8752

Change-Id: I25d661b732a872b8378af87c0ba52d75afd75c1f
2025-03-24 08:24:22 +08:00
zhimin.zeng fff7873456 FIX: enhance for timelapse gcode
1. support traditional timelapse for H2D when printing by object
2. insert timelapse gcode when close wipe tower
3. remove hard gcode before filament gcode
jira: none

Change-Id: Ib56c21b1f07832f2cbc8ba5ab7f2e8653b3105bf
(cherry picked from commit 7613474cefd210685d16a5585608c0c7cb7efa95)
2025-03-24 08:24:22 +08:00
zhou.xu 742efe2e3d ENH:Add button linkage display when gap_area is valid
jira: STUDIO-10042
Change-Id: Ia2b60d735a61cbd2a71a840d3db27e60239c8fcf
2025-03-23 20:31:58 +08:00
zhou.xu e66a291235 ENH:translate text
jira: none
Change-Id: I3d8cc9596d6abeae680deeef827514ac97bce863
2025-03-23 20:31:58 +08:00
zhou.xu 52442fa6d5 FIX:fix crash for no valid filaments
jira: none
Change-Id: I9433da99d2ad355f088917e88350c5fd36bd1aea
2025-03-23 20:31:58 +08:00
zhou.xu 69f28a711f NEW:Display AMS mapping relationship in override mode
jira: none
Change-Id: Iac0b3563df2f76710a5bc461adab6dd8335ee62d
2025-03-23 20:31:58 +08:00
zhou.xu f95f88de0d FIX:Synchronize the machine to maintain the same hot bed selection
jira: STUDIO-10146
Change-Id: Ia2000bab1c41097ef50ee84aa35d9a5c8921ef56
2025-03-23 20:31:58 +08:00
xin.zhang b40306ac22 FIX: make the tips as gray style
jira: [STUDIO-9646]
Change-Id: I88dcce6990e97ddea24d5726a3c728a5efd1fd6c
2025-03-23 20:31:58 +08:00
xun.zhang d64977c9ab ENH: update translation
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I85317044598c4a014c095cca30d1e9abc1fa9145
2025-03-23 20:31:27 +08:00
zhou.xu f608327a10 ENH:add "forward" function in MsgDialog
jira: STUDIO-9971
Change-Id: I699912b4d18cb52aec2badf64a4655d20559ed7c
2025-03-23 20:31:27 +08:00
zhou.xu 12fe1ac740 FIX:Click OK should disappear immediately
jira: STUDIO-10132
Change-Id: I62547c6888f11afcf76f7a3fd0ad6aa8fe9b0091
2025-03-23 20:31:27 +08:00
zhou.xu f5133d9d43 FIX:fix display in mac
jira: STUDIO-10130 STUDIO-10062
Change-Id: Ie98b19cdd3ead958940a8730e6091fc74be05ad8
2025-03-23 20:31:27 +08:00
qing.zhang 0e21d762be ENH: translate
Jira: none

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I2ed88be363eb5f1bd8a35269d669f3947d46e7f4
2025-03-23 20:31:26 +08:00
xin.zhang fe2ae4ab9b FIX: the select machine suit DPI
jira: [STUDIO-10067]
Change-Id: Idee141746b73764c9bb80746358ec65f1147cc31
2025-03-23 20:31:26 +08:00
xin.zhang 36deba9d13 FIX: the dpi changed display of bed control
jira: [STUDIO-10067]
Change-Id: I84a2763686b004cfb27ddb567b0f6a44577924b0
2025-03-23 20:31:26 +08:00
xin.zhang a78ce0fef7 FIX: the painting fault of AMS Preview
jira: [STUDIO-10067]
Change-Id: I7690ca2cb3437182d4990ec13eb94bbcd3c237a3
2025-03-23 20:31:26 +08:00
xun.zhang 96512530b2 ENH: add filament group wiki english version
jira:studio-9944,studio-10036

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Id72974e3877307a2ddc1477c78dcf3d6b3c83ac5
2025-03-23 20:31:26 +08:00
zhou.xu e74c9e710b ENH:add "not support bed type" function
jira: STUDIO-9028
Change-Id: Id1c6cc9005fc5073d885274e360d31282063a9a3
2025-03-23 20:31:25 +08:00
zhou.xu 2676c47259 FIX:add "visible" for GLModel
jira: STUDIO-10126
Change-Id: I95c7882db09e3a86012c0f1a184e505bfd0bdd87
2025-03-23 20:31:10 +08:00
zhou.xu 968dc86710 FIX:fix is_connect_printer
jira: STUDIO-10083
Change-Id: Iea8af8a6547eeac311f41e260115f9e12832de80
2025-03-23 20:31:10 +08:00
jun.zhang 999bae0f53 FIX: black edge issue
jira: STUDIO-9954

Change-Id: Ib503039383763074947992606ac9a8f7b8409ec8
(cherry picked from commit 3870dbb980a36535f22ec8a0849546c0b1ee7b4c)
2025-03-23 20:31:10 +08:00
xin.zhang 93446f05e1 FIX: wait the new result about 3 seconds
jira: [STUDIO-8518]
Change-Id: Ida64d94ab44e71473096ae55ef2db50d7c8286ca
2025-03-23 20:31:10 +08:00
xin.zhang 4dcdfc6beb FIX: the layout problem
jira: [STUDIO-9768]
Change-Id: Ic6e317241aa933c63da6360f6156c34ae434e28e
2025-03-23 20:31:09 +08:00
zhimin.zeng 7380ee0a2c FIX:k value is set to default value when editing k value on printer
jira: STUDIO-10120
Change-Id: I6c67efb77ca681aab510399031deed7faa473713
2025-03-23 20:31:09 +08:00
zhou.xu 22e3f08992 FIX:close gcode.3mf not pop window that should not appear
jira: STUDIO-9821
Change-Id: I6c9d4e5231d2c7a9b9629003bdffab1c523fe15f
2025-03-23 20:31:09 +08:00
zhimin.zeng 9eee96ead7 FIX: modify the printable range error prompt
jira: STUDIO-10116
Change-Id: I489ff742f51ab8883306883ee59c98a31523fd34
2025-03-23 20:31:09 +08:00
xin.zhang 677ec9e364 FIX: update some scale while DPI changed
jira: [STUDIO-10067]
Change-Id: Icb8480d01bdf20a17c699746677d54fc8c8680a6
2025-03-23 20:31:09 +08:00
xin.zhang ca85009945 FIX: update the extruder panel when object changed
jira: [STUDIO-10050]
Change-Id: I4eb12f3cdecf2a099a9b0773c73a48a8aa3713b6
2025-03-23 20:31:06 +08:00
xun.zhang 1793060e96 ENH: jump to filament map dialog in error tip
1. Remove error tip for unprintable areas if no longer needed
2. Add link for filament map dialog in error tip

jira:STUDIO-10073

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ic3235038de73a85964c6dbcb9b4f435e7aa47d34
2025-03-23 20:31:05 +08:00
zhou.xu 492033182c FIX:update bbl_bed_pte_left_bottom.svg
jira: STUDIO-9954
Change-Id: I93a808651a84b6fa30de608a7e21d5ca722f200c
2025-03-23 20:31:05 +08:00
zhou.xu 81ff3cdfce FIX:allow only External Spool color map
jira: STUDIO-10096
Change-Id: Ic0d2133fe688f275210df8f0a1adf1f29239598c
2025-03-23 20:31:05 +08:00
qing.zhang be02e769bb ENH:instead of prime_volume by filament_prime_volume
Jira: none

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I96e7d0604da8f90678feed81833e3a634752ffff
2025-03-23 20:31:05 +08:00
zhimin.zeng ab2cc0f73a FIX:split the prompt info for different models and different presets
jira: STUDIO-10016
Change-Id: Ic4b24772b1e2eb58adbd74cf0f953f8a754150b0
2025-03-23 20:31:05 +08:00
zhimin.zeng 1fbc179ae4 FIX: sync extruder info when select preset
when the connected machine is mutli_extruer and is the same as preset
2. fix the filament unprintable check bug
jira: STUDIO-10047

Change-Id: I4e78003f080897d5b43c0a742852078b149eba45
2025-03-23 20:31:05 +08:00
zhou.xu 29b0be89eb FIX:fix bug for the base color of the color modification
after matching the untreated material
jira:STUDIO-10062

Change-Id: I699fd843600182bc87b224eee488e752b64ca0b4
2025-03-23 20:31:04 +08:00
xin.zhang ea36ee5879 FIX: update message and translation
jira: [STUDIO-9580] [STUDIO-10092]
Change-Id: I133d23bef894d3784fa0e12c1d27a8a93448ebfa
2025-03-23 20:31:04 +08:00
xin.zhang 8a7164dbc1 FIX: remove the unsupported nozzle diameter
jira: [STUDIO-10089]
Change-Id: I8a7e13788bac103a60390dbc89c3d3b95cb79d2d
2025-03-23 20:31:04 +08:00
xin.zhang 655373cb82 FIX: the bed calibration default to unchecked
jira: [STUDIO-10091]
Change-Id: I313cc8419276ca89e9d9cb57604adc19d2cfee89
2025-03-23 20:31:04 +08:00
jiangkai.zhao 4dd4e9e12c ENH: enhance some functions of the wipe_tower
1.Add automatic calculation of the wipe_tower's brim width by height;
2.modify the min_depth_per_height and the default ridwidth

jira: none
Change-Id: Idd96bc90e8e631aa8481b559e1e9fec24c6b822f
2025-03-23 20:31:04 +08:00
zhou.xu e113538a17 FIX:Unknown material display incomplete
jira: STUDIO-9997
Change-Id: I55409e5ba054eadf9200c22b8c6ab31223c3b689
(cherry picked from commit 5c6a752279c20d3bc2628edf9db0aa320bdf322d)
2025-03-23 20:30:50 +08:00
xin.zhang 9c7214428d FIX: update the load or unload
jira: [STUDIO-10088]
Change-Id: I234c1c092f403a42789c1eff67819420322fcdb7
2025-03-23 20:30:50 +08:00
zhimin.zeng 7a0b8d9135 FIX: Update blacklist
jira: none
Change-Id: I5ce98aeab6ee1a5b84b35c12c8caf3cf70f30ba6
2025-03-23 20:30:46 +08:00
zhou.xu a87bdf0d54 FIX:fix dark mode bug of SyncAmsInfoDialog
jira: STUDIO-10012
Change-Id: I6b27b8908f04995814af97baabcee6f77643c125
2025-03-23 20:30:46 +08:00
qing.zhang 78079dacd1 ENH: move extra params
Jira: none

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ib5c4d203c6585b9946d8703d9f33477780afb275
2025-03-23 20:30:46 +08:00
xun.zhang 868b056f1a ENH: modify description for filament group mode
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ia0098b0aced6c764962874197da8d63fc7a06d6d
2025-03-23 20:30:45 +08:00
xin.zhang 3e9187cf3b FIX: remove the internal update codes
jira: [none]
Change-Id: I4d5cfc6b643117d136865b143e2d42c398d2bde2
2025-03-23 20:30:45 +08:00
xin.zhang bc96302f12 FIX: support UTF-8 search for devices
jira: [none]
Change-Id: I29c6509c0d06f238f0d42d0c5422fb0686a598ca
2025-03-23 20:30:45 +08:00
xin.zhang 784b5a69cc FIX: the text display incomplete
jira: [none]
Change-Id: If5dec5af26ee80b8f0d722b0d75d0bd10e09ddb5
2025-03-23 20:30:45 +08:00
xin.zhang cb89a9eb12 FIX: dynamic flow cali is default to auto
jira: [STUDIO-10085]
Change-Id: I8cac8ea2fddf1fafacf69680a983315c71e751a0
2025-03-23 20:30:45 +08:00
zhou.xu e45bb41cd1 FIX:update MaterialItem
jira: STUDIO-9996
Change-Id: Id225c13eaa2f4f66aca0f76754408fc8506d532c
2025-03-23 20:30:45 +08:00
zhou.xu c5406570bc NEW:add "Fade out" effect for BaseTransparentDPIFrame
jira: none
Change-Id: Ied2fd3a07c213c3518183865169728a87a7d5b1a
2025-03-23 20:30:45 +08:00
zhimin.zeng 66b5ef0d86 FIX: the machine status is not refreshed after unbinding in lan mode
jira: STUDIO-10017
Change-Id: I62f955c47fbf7c59782ec8a7a7e316ef020942a5
2025-03-23 20:30:45 +08:00
chunmao.guo 8d3c346b1a FIX: cancel switch diameter restore old selection
Change-Id: Ic0919ade0ab3f75c417d87c7cf6c5738958a1cf8
Jira: STUDIO-10069
2025-03-23 20:30:32 +08:00
zhou.xu 05e006ba11 FIX:close gcode.3mf not pop window that should not appear
jira: STUDIO-9821
Change-Id: I09994c23d977794e9b2a375bf169e841782d9481
2025-03-23 20:30:31 +08:00
zhou.xu d34a8cb2ee NEW:add BaseTransparentDPIFrame and timed disappearance
jira: none
Change-Id: I8fcf56ead20aba640c59406c0dad3b6ad67f18a6
2025-03-23 20:30:31 +08:00
Mack 45e7d7bb7d Fix:filament svg icon add transparent color
jira: STUDIO-9929
Change-Id: I7650670988d3c3538818278417ab9fb48c232400
2025-03-23 20:30:31 +08:00
xin.zhang 403a3b42e7 FIX: show the refill graph only if it's enabled
jira: [none]
Change-Id: I8a1f015a92ac965972f6de46a143a6b0f02340a0
2025-03-23 20:30:31 +08:00
xin.zhang 32597b43f9 FIX: support the dark mode AMSPreview
jira: [none]
Change-Id: If4329081535a1155588afad932403ea3615163f7
2025-03-23 20:30:31 +08:00
xin.zhang eae81e9d95 FIX: disable the switch nozzle if not connected
jira: [STUDIO-10072]
Change-Id: I2f705af4cd6f50770c9c0019287855ef90518d18
2025-03-23 20:30:31 +08:00
zhou.xu abfa726162 ENH:add "sync filaments status" logic
jira: none
Change-Id: I7a74641e6d8e1d1d713d4d97af370a8c0a87f154
2025-03-23 20:30:30 +08:00
zhou.xu eab6384c6c FIX:Only one of the two dialogs is displayed
jira: STUDIO-10065
Change-Id: I7763de83697ea9645808757b9396acd34cd12cca
2025-03-23 20:30:30 +08:00
zhou.xu 170687352e ENH:add "pop_sync_nozzle_and_ams_ialog" api
jira: STUDIO-10016
Change-Id: I000fa5719cf631ff0c63b6379850e1915f78ddaa
2025-03-23 20:30:30 +08:00
zhimin.zeng 55772c5912 EMH: enhance for rib wall wiper tower
1. fix the slice error status
2. add rendering for wiper tower
3. modify the wipe tower start pos for rib wall wipe tower
jira: none

Change-Id: If554ca0fb30f6c7ce9641014c0ed4a7f23afd6f4
(cherry picked from commit 3ae08b458dea1d04cad33b2787d98407111b038c)
2025-03-23 20:30:29 +08:00
jiangkai.zhao 1f4d2cf714 ENH: adjust the interaction of the rib_wall
jira: none
Change-Id: I2462240304fc4ce4a1047d7c8ac818c209f15200
(cherry picked from commit 6567642e938a4edd4197535418aeb8be0bbc7c55)
2025-03-23 20:30:29 +08:00
jiangkai.zhao 1d33d1c37d ENH:add rib wall wipe tower
jira: none

Change-Id: I9699cc74e206851284949f89230e986435b9e1b7
(cherry picked from commit eabfa6b272590698886ecec33b89207605b91993)
2025-03-23 20:30:29 +08:00
xin.zhang 3cb5ee0b30 FIX: wrap the text
jira: [none]
Change-Id: I8deb09ac6caa3c3a4ab45d75286e8697d0babb06
2025-03-23 20:30:29 +08:00
zhou.xu c3990592ac FIX:modify text and fix show bug of SyncAmsInfoDialog
jira: STUDIO-9974
Change-Id: Id10dd54bc23e98cd709860b563fc26b4c570b98f
2025-03-23 20:30:29 +08:00
zhimin.zeng 4a01c840ab FIX: the machine status is not refreshed after unbinding
jira: STUDIO-10017
Change-Id: I351a17abac132369ecf342ffb79b17228d5ef250
2025-03-23 20:30:29 +08:00
zhimin.zeng 9e1a206d11 FIX: auto sync printer info
when the machine is H2D and the file is H2D preset
jira: STUDIO-10016

Change-Id: Ic8145c521486a30f1df5715c6809abae2c565c05
2025-03-23 20:30:29 +08:00
xin.zhang 371ef9c554 FIX: move the state record to higher coding level
jira: [STUDIO-10050]
Change-Id: I1e0721c80492688c66e700979461ac0bdd396ef4
2025-03-23 20:30:29 +08:00
zhou.xu 4c9d891700 FIX:change control for two dialog
jira: STUDIO-10038
Change-Id: Ia88ebc9c5a61920108cdec2ae33fdf73cf6e0b00
2025-03-23 20:30:29 +08:00
tao wang 17dddbdccc FIX:added n3s load/unload filament steps
Change-Id: I75ebf4d3c7854ded933d1a755b13cab48b1efc90
2025-03-23 20:30:29 +08:00
chunmao.guo 2d4cdc8218 FIX: nozzle AMS rescale
Change-Id: I8006c72947463d23984fa62ce3a9a2e2d40e990f
Jira: STUDIO-10045
2025-03-23 20:30:29 +08:00
chunmao.guo 71d9d8969e FIX: liveview_remote protocol missing agora
Change-Id: If3a46c67e139e3abc47dc672e32246eb6b59f9fd
Jira: STUDIO-10041
2025-03-23 20:30:28 +08:00
xun.zhang e24a0bc603 FIX: ui issues with filament map dialog
jira:STUDIO-10040,STUDIO-10039

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I939df4fc0fe3eb8d287cf1efc7d459c0790d04c7
2025-03-23 20:30:28 +08:00
zhimin.zeng 7897cd68c9 FIX: timelapse should not enable when not supporting timelapse
jira: STUDIO-9946
Change-Id: Ic8f369972c598c812e30d197927fa5fb63be133b
2025-03-23 20:30:28 +08:00
xin.zhang 3bef21933f FIX: update some translation
jira: [none]
Change-Id: I0b6e14b78c26188b20d8303444ed294eee64dff2
2025-03-23 20:30:28 +08:00
xin.zhang 716f22046d FIX: paint the invalid remain as 100%
jira: [STUDIO-9967]
Change-Id: Ie0b96d6a12e5d5b526e92360f7e93087134ed0a9
2025-03-23 20:30:28 +08:00
xin.zhang 0c80f1a975 FIX: update the wrap DIP
jira: [STUDIO-10037]
Change-Id: I24c7d1ad54bbcfb4ac43609bff1dd9cd10db2e60
2025-03-23 20:30:27 +08:00
zhou.xu 5427e9e052 ENH:translate text
jira:none
Change-Id: I2d37d7ba4867b1507d2a8073dfdfc836b7c8e112
2025-03-23 20:30:27 +08:00
zhou.xu a1de92523f FIX:All plates share the current mapping
jira: STUDIO-10008
Change-Id: I5d04c95dea7bd6b56c97258863a190f0f0c3b4e6
2025-03-23 20:30:27 +08:00
xin.zhang a039401683 FIX: add the translation
jira: [STUDIO-9148]
Change-Id: I937b0fb93be39bd7567a5049a2fd1ed5f0aad9d2
2025-03-23 20:30:27 +08:00
xin.zhang b47885b137 FIX: disable send button for PrintStatusLanModeNoSdcard
jira: [STUDIO-100013]
Change-Id: I8077d81ab9ecdc8f4c3e5fe5269c87f4ebc41640
2025-03-23 20:30:27 +08:00
xun.zhang 2e26c5812a ENH: refine logic in filament group in gcodeviewer
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Id89daec05f2d4017d326c6473bd62008dd9f0b11
2025-03-23 20:30:13 +08:00
chunmao.guo 33684a12f6 FIX: adjust text switch printer inconsistant variant values
Change-Id: Ie494b57698f45fbf0eea0546a486d6514002887e
Jira: none
2025-03-23 20:30:13 +08:00
zhou.xu 012d90bd7e ENH:add MaterialSyncItem
jira: STUDIO-9994
Change-Id: Id0d2ebd8dd68854f5cc1c821c7453b75852b8ba7
2025-03-23 20:30:13 +08:00
tao wang b675a2e433 FIX:hide advanced options when device incompatible
jira:[STUDIO-9973]

Change-Id: I34338e8f87ccc709d4a9f69ce16af17269c91784
2025-03-23 20:30:13 +08:00
tao wang efcad28fb2 FIX:Update the translation of the best strategy
jira:[STUDIO-10001]

Change-Id: Idb20d2042f7bbe14891f3c1e8e1bdef947b01071
2025-03-23 20:30:13 +08:00
tao wang 2b1fdcf327 ENH:aAdd protection logic for AMS backup
Change-Id: I5ae871aa03cfe706c7c079cd60a4422cae4464fb
2025-03-23 20:30:13 +08:00
chunmao.guo 50f9bdbd91 FIX: switch diameter texts
Change-Id: I2e93cdd0895f3b7f2531d96c64f7caa8d0440194
Jira: none
2025-03-23 20:30:12 +08:00
tao wang dc4919ebd6 ENH:add unmatched status for ams mapping
jira:[STUDIO-9995]

Change-Id: I9400ae8ef33a2292565395a8fb4fedbe71437da6
2025-03-23 20:30:12 +08:00