mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,549 Commits 3 Branches 0 Tags 638 MiB
Commit Graph

182 Commits

Author SHA1 Message Date
zhimin.zeng 9f88906587 FIX: remove Tolerance test and modify wiki link for mac 
Change-Id: Ieca66b0226eef692191e9e7bed56e54dc9d7b40c
 2023-11-01 09:11:19 +08:00
maosheng.wei f87996960d FIX: [github 2259] Maintain development mode when reopening BBS 
Change-Id: I9cd6bddbc58f7841499665e21dc606b35c706afc
 2023-11-01 09:11:19 +08:00
maosheng.wei d8b56977b9 FIX: STUDIO-3745 open gcode.3mf, unable export to file 
Change-Id: Ib8a45cb38f28438ecc4d2a772f1437dbd324078a
 2023-11-01 09:11:19 +08:00
Kunlong Ma fcb7db2dde FIX:Fix bugs caused by buried points 
Change-Id: I47d4e786912120124c134404afce15dec48c7974
Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com>
 2023-08-01 22:09:01 +08:00
tao wang e9182b2d1d FIX:fixed UI display error in the monitor page 
fixed STUDIO-3754

Change-Id: I96f9e52a9924b7f34e8e6ac7139ca70514af79ae
 2023-07-31 14:29:15 +08:00
Kunlong Ma b3f519a0d4 NEW:Add buried points at panel buttons 
Change-Id: Idfdcd964b03ea06e832e9e7c2cfaac232212f518
 2023-07-31 14:29:15 +08:00
liz.li 4d8ad0003b FIX: linux darkmode text display 
Change-Id: I2c935647669dd9743cf4a230ef21e48ea4b92eb8
 2023-07-31 14:29:15 +08:00
zhimin.zeng 5673defdb9 FIX: modify the 3rd party wiki link 
and disable the next button after cali

Change-Id: I29437cfbeda1828bbcaf5898b660dd814d1298f0
 2023-07-07 17:52:43 +08:00
zhimin.zeng a98b781425 FIX: fix save preset problem 
Change-Id: I0e6f53b0386e8f04babe2d6c7d18f515c37caae3
 2023-07-07 17:52:43 +08:00
chunmao.guo 29b61a1da0 FIX: [STUDIO-3439] show/hide calibration page 
Change-Id: I3b083b47609c40e084cf3058eda2a84c03447760
 2023-07-07 17:52:43 +08:00
chunmao.guo 1c0ccc5f3d FIX: [STUDIO-3294] show/hide thirdparty calibrate button 
Change-Id: Ib720f7572255f4ac506f421ccf5256ed2e3c68d1
 2023-07-07 17:52:43 +08:00
chunmao.guo 2a24eb55b8 FIX: [STUDIO-3329] show/hide thirdparty calibrate button 
Change-Id: Ie5a7cd454b50617af8c8bf9c78fecc60386e4e9d
(cherry picked from commit 1a98981f8b0a854f431d9430355b4fc5d2bb4fb1)
 2023-07-07 17:52:43 +08:00
zhimin.zeng 176c9053b5 FIX: add cali for 3rd party printer in mac 
Change-Id: I62be98bcd6bb70c34aa83fcefe819200231bd33c
(cherry picked from commit 543d751818d80892dd3371026987199e4768b8bc)
 2023-07-07 17:52:43 +08:00
tao wang 663e0503a2 ENH:publish entrance layout 
Change-Id: Ib7e3f6dd60047de02e4ccb0d3793f3bd31947597
 2023-07-07 17:29:08 +08:00
Stone Li e0e8d1467d FIX: fix crash when loading a 3mf 
fix plate name encoding issue in Object List

Change-Id: I7d5a3261998c9af87b20dab822c7048a4b689790
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2023-07-07 17:29:08 +08:00
salt.wei 2fe7629388 ENH: normalize comment from OrcaSlicer 
Mark code from OrcaSlicer with same comment tag for follow easily

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: If4db502a1b0e6d0648c73f2f383b6d1cc8e1aa01
 2023-07-07 17:29:08 +08:00
tao wang cbb69c415a ENH:update the entrance for model upload 
Change-Id: I59a4a9d4802b31871601259c3a5766d789fc3b94
 2023-07-07 17:29:08 +08:00
zhimin.zeng 4b23192d6f NEW: add calibration for 3rd printer 
cherry pick from SoftFever

Change-Id: Ibb2b4693c3f2e800dbef1542cbada6736154ce48
 2023-07-07 17:29:08 +08:00
Stone Li efd65561a2 NEW: add Device view for third-party printers 
cherry-picked from SoftFever

Change-Id: I36b2fa0227886e4fac494c8b83e12f4fc0b04e17
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2023-07-07 17:29:08 +08:00
Stone Li 43810bdac8 NEW: add more track records 
Change-Id: If82430f8b432f1a1d5a78cd6a63a16cf50d2bbaa
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2023-07-07 17:29:08 +08:00
liz.li 373152c78a FIX: print button enable status [STUDIO-3136] 
on all plates stats page, should disable print button

Change-Id: I27dbc87c6a3ffda8f58a8544aae71618bffb3272
 2023-07-07 17:29:08 +08:00
liz.li d53bd3394a ENH:calibration 
1.adjust interaction of calibration
    add select my device
    add select multi-amstray
    modify ams selector
2.add some x1c calibration command

Change-Id: I403446cc0cd3ae5e1dec5d2dc97920ff334522da
 2023-07-07 17:25:51 +08:00
zhimin.zeng 032bf107b8 FIX: fix the conflict 
Change-Id: Id5f2bf11344e9d42302420d167daa3af1c3c1845
 2023-07-07 17:25:51 +08:00
liz.li 1f54aaf22b NEW: add calibration 
Change-Id: I03e5489a67042e7f76f5a42260a289d540b5a63a
(cherry picked from commit cbac2c639db830eb779b1979c8d6b4eb3decb7e6)
 2023-07-07 17:25:51 +08:00
maosheng.wei 049a5c5a8f NEW: add Report issue entry 
Change-Id: Ie5cc195e34f2dbb94b4958c495cd28cd5bf4fd51
 2023-07-07 17:25:51 +08:00
tao wang 8e41e6cee2 FIX:supports dark mode on linux systems 
Change-Id: I424f4a686ffe0d25075022b7e58c89d2683fcea2
 2023-07-07 17:25:51 +08:00
chunmao.guo 1b0b14c0f2 FIX: [STUDIO-2844] use user presets only if login 
Change-Id: Iec2dc9a77be8354ff1d5e0e4a60f79006ee682d3
 2023-07-07 17:25:51 +08:00
chunmao.guo dfd049374c FIX: [STUDIO-2865] only send changed thubmails to home page 
Change-Id: I88ae0dd3a47c4cf02bf97978a22fd72ed0ef0299
 2023-07-07 17:25:51 +08:00
chunmao.guo de895e573a FIX: [STUDIO-2825] ctrl + tab only switch main pages 
Change-Id: I10ed43929e4b757fb7c5415ba23a78ded1f2c7d0
(cherry picked from commit 10983c4d177b772e8eda264e5a9957218f779435)
 2023-07-07 17:25:51 +08:00
chunmao.guo c770926142 FIX: [STUDIO-2702] fix maximize size offset, ad7bda2 
Change-Id: I4f65ef25dc4241bf7c1c3d15c38198ea2b40b337
 2023-07-07 17:25:51 +08:00
chunmao.guo 56b9d0fbb3 FIX: [STUDIO-2608] recent project not open starting from number 10 
Change-Id: I9e867f26342993cae7a98d6e8b61e9c21b4f434c
 2023-07-07 17:25:51 +08:00
maosheng.wei 92d764e9ee NEW: [STUDIO-2769] Split developer mode 
Divide developer mode into display parameters and other development
options

Change-Id: I8666991f3e5580c1abb46f36567651893e8fba4a
 2023-07-07 17:25:51 +08:00
zhou.xu 507a8a6d36 NEW: add overhang highlight area 
overhang rgb=(200,0,0)，remove supportType,do not save para after overhang operation preview

Change-Id: I947bbd9db264f00f0609b3f02140060f9a2621fb
(cherry picked from commit 796c4460fe998da206f9ca77973a20796fa1d3ca)
 2023-07-07 17:25:51 +08:00
liz.li 23295f251c FIX: mac command key been translated and cannot work 
Change-Id: Ib8f83e7c0acee36ebf2f7365f544eeb804b4db8a
 2023-07-07 17:25:51 +08:00
tao wang 2dbd2bcef9 FIX:hide publish in the Chinese region 
Change-Id: I39e6d96ab6fa14f25a284a5eaf9988dd37a42b6a
 2023-07-07 17:25:51 +08:00
tao wang 0efbf523ee ENH:open the model store and no longer check login status 
Change-Id: I045ea9f33467637841cb811e8799ab903b981ebe
 2023-07-07 17:25:51 +08:00
tao wang 8eb84e8d4f ENH:show the entrance of the model mall on Mac OS 
Change-Id: I6d40149a32d862247db3d4c446a0f3fa8e8bbac6
 2023-07-07 17:25:51 +08:00
yifan.wu bd2df4801a ENH: refine model uploading logics 
1. change the url of product env to makerworld
2. always show the uploading button without checking permission

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I666042a216d1a4aca69e2a50d430532f722d9b00
(cherry picked from commit 94daddc0aa593778fbf4a9d44d92a68883292a7f)
 2023-07-07 17:25:51 +08:00
liz.li adb6583458 FIX:(mac) cannot use copy and paste in imgui input box 
Change-Id: I4024bfbe178f86a5d456de47ddd82bc028d4788c
 2023-04-17 15:39:02 +08:00
liz.li bde527f6e1 FIX: mac command key display 
Change-Id: Ida9f41e7c05a414122176893dafaf150c460d458
 2023-04-17 15:39:02 +08:00
liz.li b2e4935b6f FIX: german translation 
Ctrl -> Strg
Del -> Entf
Shift -> Umschalt

Change-Id: Ifa340ee86cb9fb96ec3694ef47cac5235f519c40
 2023-04-17 15:39:02 +08:00
liz.li 3c6e68553b ENH: add height_range 
Change-Id: Ica4def5d54f9e0906d424eea1efd3545b79ed186
 2023-04-17 15:39:02 +08:00
chunmao.guo 778761908a ENH: [STUDIO-2548] maximum recent project count 
Change-Id: Iba9c9959089ff1cb9dfdba717fe62b99375da137
 2023-04-17 15:39:02 +08:00
chunmao.guo 9558ed242c FIX: backup switch take effect 
Change-Id: Ie9740d7f985ae6adc2778eaac0a80cf7a94c98c4
 2023-04-17 15:39:02 +08:00
chunmao.guo 9f3a89320b FIX: [STUDIO-1033] rm webview script handler on webview destory 
Change-Id: If1465ba6bf997bf17b8a33bc33d0f20d34fcbdc7
 2023-04-17 15:39:02 +08:00
Stone Li 6827b41eb3 NEW: add track events for debugging network 
Change-Id: I671f91b4af00277236ca71014f8d667109756d00
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2023-04-17 15:39:02 +08:00
tao wang a86d94f2c9 NEW:update the content of the project page 
Change-Id: Idb7f8a2564c78a1f062580f6b388ee033238cedf
 2023-04-17 15:39:02 +08:00
tao.jin c1cc270788 ENH: chinese translation 
Change-Id: I6c072b36a14fed516a9cdcbd7c7ea2038ec29f3f
 2023-02-22 20:09:17 +08:00
tao wang 2c1a123d91 ENH:optimize the switching effect of dark mode 
Change-Id: I51175dc5bdeff83442d46d4fa34511916f90b878
 2023-02-22 20:09:17 +08:00
tao.jin 240d106d58 NEW: check privacy update 
Change-Id: I260fbc20cdddbdadd38f1470a2e7050ee1ed14cd
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2023-02-22 20:09:17 +08:00
Stone Li 6faecbf718 ENH: move get_user_machine_info to new thread 
Change-Id: Id034346550e356c958aa35f0b12e7a2730078e4a
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2023-02-22 20:09:17 +08:00
tao wang f29b41a6c1 FIX:fixed chinese name display error in only gcode mode 
Change-Id: I86be69ec9f9577fc658516ea9b86d99d59e78bb1
 2023-02-22 20:09:17 +08:00
liz.li 5f71eba979 ENH:add some global shortcut key 
Change-Id: Ib29d13c84755b0e4e15b6a4c25583df91653aa84
 2023-02-22 20:09:17 +08:00
tao.jin c2eeb2522b FIX: display of Label and warning dialog 
Change-Id: Ib147f28096336b07b033c2e8104a56f5c28b7d93
 2023-02-22 20:09:17 +08:00
Stone Li ac854d8f4d FIX: fix export all sliced file in file menu 
Change-Id: I88bb63eb69a370e9824a87b1708e1021a28eaeb9
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2023-02-22 20:09:17 +08:00
chunmao.guo 00221d8652 FIX: [STUDIO-2004] text in ConfigsOverwriteConfirmDialog 
Change-Id: I98f2159ccf467782edb25d5cdfecd468e4346fe7
 2023-02-02 12:14:41 +08:00
tao wang 9a8f832498 ENH:Update IP address input process 
Change-Id: Iaf1c187dac117ba10ac16045049a346f7c2b9478
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2023-02-01 16:24:44 +08:00
Stone Li 67d4e2148f FIX: fix sending gcode to octoprint 
Change-Id: Id541b18d8e3522854d83f57dd4f3b02863a6aae7
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2023-02-01 16:24:44 +08:00
chunmao.guo a4cf284c3d ENH: adjust user preset handling 
1. async fetch user presets from server (in thread)
2. always load default user presets
3. load user presets from cache immediately
4. not remove user presets cache
5. hide some loading ui

Change-Id: I1d29ed18e09606d0b2f69a69eea2eb5042c26223
 2023-01-10 19:08:26 +08:00
Stone Li 9bc46daf40 ENH: optimize the copy description format 
remove "\n" from _L macro

Change-Id: If1beda4a77f1c2b42945657b7386e155b8bc7a20
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2023-01-10 19:08:26 +08:00
Stone Li f89dfa7615 ENH: modify slice button and print button initial value 
Change-Id: I114aa63b25f32ba6b427afd8b9ce4ebebfe18915
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2023-01-10 19:08:26 +08:00
zhimin.zeng 4284d2ddb0 ENH: generate wipe tower when custom change gcode filament 
Change-Id: Ia0c81453f09457a9d1d56fbcdce79112953c0208
 2023-01-10 19:08:26 +08:00
zhimin.zeng 260e2e1c31 FIX: modify svg display position 
Change-Id: Ie824d457fcac93918244a6491e821dc43e7e1d9f
 2022-12-15 04:38:15 -05:00
tao wang 8713c5ccc4 FIX:optimized some ui for macos 
Change-Id: I0451edc06d9dadfef3b9d1087bb863b4666bb276
 2022-12-15 04:38:15 -05:00
tao.jin a3730b9236 FIX: fix display of long filename in preview-only hint 
Change-Id: Ib365a39b262cbf03b14eeefa64e3e46d1b48306e
 2022-12-15 04:38:15 -05:00
tao.jin 9ab6e86b47 FIX: get exported file name in preview-only mode 
Change-Id: Ibea53d951e020ff03c1e7f378714b117a4e8a19f
 2022-12-15 04:38:15 -05:00
tao.jin 38dfde8fc2 ENH: jump to prepare in preview only mode 
Change-Id: Ic7d1b17938172f81f334df020699b3ffbe92d65f
 2022-12-15 04:38:15 -05:00
chunmao.guo 41b1ad6f2f ENH: [STUDIO-1608] select support filament by combobox 
Change-Id: I26543530202a53ef5753c38404617458a6d4a1ef
 2022-12-15 04:38:15 -05:00
tao wang dc55a6a2a6 FIX:fixed some issues with dark mode on mac 
Change-Id: Ic43760cd8e934f463c2bf35c2fa240d8e5b14c20
 2022-12-15 04:38:15 -05:00
chunmao.guo a4cffa3c87 FIX: [STUDIO-1589] restore pos of mainframe before show 
Change-Id: I73f73597a939f8e65ff8cc5ce9a98741f62c48c3
 2022-12-15 04:38:15 -05:00
tao.jin bb70b60dbc ENH: change help menu order 
Change-Id: I1589de6feac1a77f8ebc17314f513969d9891c5f
 2022-12-15 04:38:15 -05:00
tao wang 97cd9e900b ENH:updated some chinese translations 
Change-Id: I7ec7b64920bd92d0d8e56a06fdaa4f0fb4add17f
 2022-12-15 04:38:15 -05:00
yifan.wu 98686a708f FIX: cannot input hotkey chars in 3D Text tool 
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: Ie28fc3943ddcde1e2fa1f607fe9e8d0125399a74
 2022-12-15 04:38:15 -05:00
tao wang 1c919977b1 FIX:fixed fixed crash when started on macos 
Change-Id: Ic09a1fb61f68dffabdaf61b4c9e88bac62094a52
 2022-12-15 04:38:15 -05:00
lane.wei c3a6b207b5 ENH: optimize the sequent-print behavior 
1. don't sort automatically
2. enable the dragging on the object list to adjust the arrange order
3. adjust the object list order after auto-arrange
4. turn off label by default
5. add the snapshot key for label
6. check the the validation of the order

Change-Id: I91461c475cda5335b01a9a608143aa1df31741ab
 2022-12-15 04:38:15 -05:00
Arthur 4419703f41 ENH: do not add L prefix to empty string 
Change-Id: I0fc7f57baf256452645be497020d75ffaf9c20f4
 2022-12-15 04:38:15 -05:00
tao wang eca5897a25 FIX:fixed appconfig is not saved when switching dark mode 
Change-Id: I77fc3808309a23497000c34b6047a359d12c4622
 2022-12-15 04:38:15 -05:00
tao wang 5a78f7ade1 FIX:fixed some issues with sending files 
1. send to printer change to send to print sd card
2. update the default error message
3. display networking error messages on the page

Change-Id: Ib82f952486d18ff481ac377aa607b5455b31564b
 2022-12-15 04:38:15 -05:00
tao wang 0f00adb0d1 NEW:added to send all plate to printer sd card 
Change-Id: Ib7610d64a3b45afaea432c26832313d248c6890b
 2022-12-15 04:38:15 -05:00
chunmao.guo 5e02f87980 FIX: max 18 recent files 
Change-Id: I83d1b38a6c5f89150ee4cd6dc9ed0c6f548fe234
 2022-12-15 04:38:15 -05:00
tao wang 6f4e80bbb6 NEW:added dark mode 
Change-Id: I3f61f1d93020e0a9dfba2c7d6cf6bf5194effcfa
 2022-12-15 04:38:15 -05:00
tao wang 8f498c7665 FIX:fixed the issue publish menu being added twice 
Change-Id: Id414e281749a08a285344eec818d03dc6af3846d
 2022-12-15 04:38:15 -05:00
chunmao.guo bf24a71b60 ENH: webview dark mode 
Change-Id: I0b58e759268d057d5942dd8726c37d1abbdd5930
 2022-12-15 04:38:15 -05:00
chunmao.guo b209243b27 ENH: dark mode of StateColor 
Change-Id: I5928898c50280c7f2eedbb9389032230c7e251c4
 2022-12-15 04:38:15 -05:00
liz.li 196f20fbc9 FIX:macos change delete character to backspace 
Change-Id: I91f9b005b4105928ff73fc7b956ffa99974b9455
 2022-12-15 04:38:15 -05:00
lane.wei eecc2a738c ENH: label: refine some label logic 
1. only show label of object in current partplate
2. disable label under gizmo
3. fix a issue of label not updated in time
4. add some logs

Change-Id: If20196a566cc45a4a0c2bcc6bbe212aaa9f74dd3
(cherry picked from commit 3e92ed61e9687d5351a9bb2bc6d25b568cd1c973)
 2022-12-15 04:38:15 -05:00
lane.wei aac34a5411 FIX: fix serveral issues under multiple plate slicing 
1. preview result not correct when switch from invalid to valid
2. slice_all button not correct after loading gcode
3. slice_all button always set to enable with normal model(not gcode and exported files)
4. thumbnail missing issue after mmu paint

Change-Id: I9873a035acc277b790d46d705c4a794c09bbd889
 2022-12-15 04:38:15 -05:00
liz.li 9795cb8d0e ENH:add next_button in dailytips 
1.add next button in dailytips
2.adjust menuitem position of show tip in menu bar
3.add new tip

Change-Id: Idad011b5849d7bddeb36b3a3e7d843aa596023d4
 2022-12-15 04:33:48 -05:00
tao wang 0713945e02 FIX:Fixed crash issue on mac without plugin 
Change-Id: I19f82037c58d61c3286f6a029b007e1199fb87cf
 2022-12-15 04:33:48 -05:00
tao wang 72b4827f85 ENH:displays the publish button based on user permissions 
Change-Id: I853506fa61f1f8cf14dfeb4601c8bb5f1a0c5914
 2022-12-15 04:33:48 -05:00
tao wang 0320872e4e FIX:fixed the mall system dialog not being destroyed 
Change-Id: Ie453bdbb41e59da69987e24a7c2d5cc9f378aee4
 2022-12-15 04:33:48 -05:00
tao wang a8ad6e9f69 FIX:fixed some issues with unsavechangeddialog 
Change-Id: I5addcc4c1ddaa6a98c31a0e57028de72a606a493
 2022-12-15 04:33:48 -05:00
tao wang 3e21f0cc91 FIX:keep all three import methods consistent 
Change-Id: I82fe0b8ec2df2092b35119c021d6dff2575720ae
 2022-12-15 04:33:48 -05:00
Stone Li 71acbec38d NEW: add slice all and print all buttons 
1. export all sliced files
2. support to print all sliced files

Change-Id: I59345370fb590b4c3c70b9b71385b25342a22e02
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2022-12-15 04:33:48 -05:00
tao wang 407d1faf0d NEW:add model mall system 
Change-Id: Iccfe460cd7bfd11d91cdd7eddf142a8590e3c5b0
 2022-12-15 04:33:48 -05:00
lane.wei a9a228d071 ENH: wireframe: refine the rendering logic under paint 
1. remove wireframe in 3d view, only keep in paint;
2. pass barycentric_coordinates from outside
3. add shortcut hints

Change-Id: I911e5cdf3475926d9527dc0839fdce072ed54746
(cherry picked from commit 6e16d0ccfb71741e55daabd757be9f9e7613e695)
 2022-12-15 04:33:48 -05:00
lane.wei 79b5c94f4f ENH: enable wireframe 
This reverts commit ed6e149381240fd83b61da70891127d400f30a39.

Change-Id: I010871fcf22322214c627fe907539c0916fa6ff5
 2022-12-15 04:33:48 -05:00
Arthur 867a5c982c ENH: modify some words to simplify translation 
Some sentenses are only slightly different which is
unnecessary. Making them the same can save a
translation and also keep consistency.

Change-Id: Ie59c0bf788a31ee0c6a0d792af7b3d532fe34f75
(cherry picked from commit eb69195569518e3be61e5a8887ea317fbe3e7302)
 2022-12-15 04:33:48 -05:00
liz.li 0b84ca62bf NEW: add custom printer config wizard 
Change-Id: I48f34039635803c3f1cee4cc2c853a0ffa5b451a
Signed-off-by: Stone Li <stone.li@bambulab.com>
(cherry picked from commit 387ba2a5aac05d3b3af0923f88415188ae8cb44e)
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2022-12-15 04:33:48 -05:00
tao wang 529131138a FIX:block send to printer function 
Change-Id: I04dff128e598b9679d39ece3f60f56ba09cbd72f
 2022-10-20 19:34:37 +08:00