p90524618
/
antv-l7
mirror of https://gitee.com/antv-l7/antv-l7
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
4,793 Commits 22 Branches 197 Tags 697 MiB
Commit Graph

574 Commits

Author SHA1 Message Date
thinkinggis 5a58ab8f86 fix: fix build layer opactiy 2020-03-17 00:08:26 +08:00
thinkinggis 97a3bea604 refactor: refactor demos 2020-03-15 20:09:16 +08:00
thinkinggis f4abe6a6b9 fix: 图层不可见,取消拾取 2020-03-14 21:18:44 +08:00
thinkinggis 59fc79edd3 docs: update demos 2020-03-12 17:34:50 +08:00
thinkinggis 20d2a6d8b8 fix: mapbox 光照问题 2020-03-12 16:14:59 +08:00
thinkinggis 3c5333d7c7 docs: add site example 2020-03-11 21:35:11 +08:00
thinkinggis 7b8822aa1e docs: add react demos 2020-03-11 14:49:39 +08:00
thinkinggis 412ca0f488 fix: image layer color 2020-03-10 10:40:33 +08:00
thinkinggis 89c00f41eb docs: addd popup marker 2020-03-09 01:04:27 +08:00
thinkinggis a8075c1f37 docs: update docs 2020-03-08 18:04:13 +08:00
@thinkinggis c559a21e99
Merge pull request #245 from antvis/react 
React
 2020-03-08 16:47:05 +08:00
thinkinggis 56e535cac3 docs: react scene 2020-03-08 15:19:21 +08:00
ImgBotApp c66f265fab
[ImgBot] Optimize images 
*Total -- 12,884.81kb -> 8,944.92kb (30.58%)

/dev-docs/screenshots/packages.png -- 192.20kb -> 59.97kb (68.8%)
/dev-docs/screenshots/halton.png -- 30.45kb -> 10.38kb (65.91%)
/dev-docs/screenshots/MSAA.png -- 152.05kb -> 61.65kb (59.45%)
/dev-docs/screenshots/jest.png -- 77.24kb -> 43.92kb (43.13%)
/packages/component/src/images/layers.png -- 1.88kb -> 1.12kb (40.05%)
/dev-docs/screenshots/sepia.png -- 847.17kb -> 508.78kb (39.94%)
/dev-docs/screenshots/hexagonalPixelate.png -- 895.05kb -> 547.21kb (38.86%)
/dev-docs/screenshots/halftone.png -- 1,543.29kb -> 953.16kb (38.24%)
/dev-docs/screenshots/dotscreen.png -- 2,073.34kb -> 1,310.22kb (36.81%)
/dev-docs/screenshots/di-containers.png -- 257.50kb -> 164.13kb (36.26%)
/dev-docs/screenshots/monorep.png -- 27.46kb -> 18.21kb (33.69%)
/packages/component/src/images/logo.png -- 8.22kb -> 5.48kb (33.26%)
/dev-docs/screenshots/blurpass.png -- 721.27kb -> 535.14kb (25.81%)
/dev-docs/screenshots/multi-scene.png -- 974.41kb -> 727.94kb (25.29%)
/dev-docs/screenshots/taa-1.png -- 167.38kb -> 125.92kb (24.77%)
/dev-docs/screenshots/noise.png -- 2,381.13kb -> 1,805.74kb (24.16%)
/dev-docs/screenshots/taa-step1.png -- 143.83kb -> 109.47kb (23.88%)
/dev-docs/screenshots/taa-step3.png -- 206.41kb -> 158.91kb (23.01%)
/dev-docs/screenshots/taa-step2.png -- 77.12kb -> 62.14kb (19.42%)
/dev-docs/screenshots/custom-effect.png -- 1,312.92kb -> 1,058.90kb (19.35%)
/stories/MapAdaptor/components/image/icon.svg -- 1.45kb -> 1.22kb (15.91%)
/dev-docs/screenshots/mapbox-MSAA.png -- 789.67kb -> 672.25kb (14.87%)
/stories/assets/images/layers.svg -- 1.68kb -> 1.54kb (8.76%)
/packages/component/src/images/layers.svg -- 1.68kb -> 1.54kb (8.76%)

Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com>
 2020-03-08 07:08:27 +00:00
thinkinggis a6f004b65e fix: fix scene loaded & add react docs 2020-03-08 14:48:52 +08:00
thinkinggis 0679435c14 feat: add popup add marker 2020-03-05 22:40:41 +08:00
thinkinggis 661ff69fb1 fix: detroy method 2020-03-01 21:24:03 +08:00
thinkinggis 880a730253 fix: 高德地图logo & scene 为初始化完成销毁 & 地图背景问题 2020-02-29 14:56:55 +08:00
thinkinggis 06746163f2 feat: 新增地图导出方法 & fix 文本渲染 2020-02-28 11:51:45 +08:00
thinkinggis 9e5a18fe9e refactor: componet style 2020-02-27 00:56:42 +08:00
thinkinggis 92b898ba28 refactor: iE 11 打包支持 2020-02-25 20:35:43 +08:00
thinkinggis 55c2838568 refactor: update yarn.lock 2020-02-23 22:20:34 +08:00
thinkinggis bf1c5000b6 fix: mapbox 3d 柱图显示问题 2020-02-21 10:06:49 +08:00
thinkinggis 5579166a87 fix: amap webgl force 2020-02-21 00:37:03 +08:00
thinkinggis cfdb0bae8a improvement: update l7-react 2020-02-20 14:18:15 +08:00
thinkinggis ef7b3608b0 improvement: 修复提高拾取性能10倍+ 2020-02-20 00:03:00 +08:00
thinkinggis 19ca0750dc fix: 修复文本更新shape修改不生效 2020-02-19 21:16:19 +08:00
thinkinggis 3129de4afe feat: merge react lib & 新增自定义control 2020-02-19 16:45:58 +08:00
thinkinggis c19df8344f feat: scale 支持根据字段和颜色指定 2020-02-18 23:23:28 +08:00
thinkinggis 5936f9aa47 refactor(feature picking): feature picking 2020-02-17 22:47:33 +08:00
thinkinggis 091a4b6a15 fix: text update color 2020-02-14 15:59:03 +08:00
thinkinggis b39a32f9e9 fix: layer filter update 2020-02-14 12:08:28 +08:00
thinkinggis a162b4c498 improvement: 新增图层按需开取拾取 2020-02-12 18:20:39 +08:00
thinkinggis 1b407433d5 Merge branch 'master' into react 2020-02-12 15:54:27 +08:00
thinkinggis d4b799d9ef fix: 弧线显示有虚线存在 2020-02-12 00:06:08 +08:00
thinkinggis 9830afbed1 improvement: 点亮城市支持自定义动画频率&scene支持传入dom动画 2020-02-11 20:35:51 +08:00
thinkinggis e70f700486 feat(react): add react lib 2020-02-11 20:31:55 +08:00
thinkinggis 48644b6414 improvement: 点亮城市支持自定义动画频率&scene支持传入dom动画 2020-02-11 16:35:18 +08:00
thinkinggis e597415dde improvement(markerlayer): 支持根据缩放范围动态获取聚合数据 2020-02-11 12:10:26 +08:00
thinkinggis c4263b0565 fix: getlayer & getlayerByName 2020-02-08 01:51:17 +08:00
thinkinggis 26c9927e23 chore: update version 2.0.17 2020-02-07 23:03:10 +08:00
thinkinggis 28cb25f0be fix: layer 拾取 fix #191 2020-02-07 22:12:56 +08:00
thinkinggis d8464855a3 fix: line opacity & text stroke opacity 2020-02-07 21:11:58 +08:00
thinkinggis bca202d331 fix: many bugs 
- marker offsets
- layer update color,size,shape
- 官网压缩
- 数据映射 回调函数
 2020-02-06 21:05:49 +08:00
thinkinggis d52fe42f2f fix(stories): colorscales 2020-02-05 15:17:46 +08:00
thinkinggis 4a9f0c466d feat(control): 修复地图缩放时,图层控件选中失效 2020-02-05 14:56:20 +08:00
thinkinggis 62da56dc22 improvement: 增加L7 logo是否显示属性 2020-02-04 22:41:00 +08:00
thinkinggis 2133b72035 fix: amap 加载地图插件问题 2020-02-03 17:26:19 +08:00
thinkinggis 79f811ddb2 fix: source hexagon layer get rawdata 2020-01-31 13:12:38 +08:00
thinkinggis 0b7d3e1626 fix: fix clusterMarker style 2020-01-28 21:53:15 +08:00
thinkinggis 7348ca889d improvement: markerLayer 新增聚合方法 sum| mean| max | min 2020-01-27 11:27:29 +08:00
thinkinggis 77020ce1cf fix: text overlap 2020-01-23 00:31:48 +08:00
thinkinggis 4374a03227 fix: hightlight opacity 2020-01-21 17:19:30 +08:00
thinkinggis f2279e54a0 fix: style attribute Maximum call stack size exceeded 2020-01-21 11:47:12 +08:00
thinkinggis 1946de6207 fix: pointlayer image 模糊&事件& marker add some new method 2020-01-20 19:20:47 +08:00
thinkinggis aabb45159b fix: popup service init 2020-01-20 12:14:49 +08:00
thinkinggis 7300c1aa62 fix: amap repeat js load 2020-01-19 19:40:25 +08:00
thinkinggis 94a60e844c chore: add buildmodels plugin 2020-01-18 23:16:56 +08:00
@thinkinggis 7cd0d21f12 Merge pull request #166 from antvis/clusterMarker 
feat(component): 新增cluster marker
 2020-01-17 12:17:03 +08:00
thinkinggis 41624f12fe feat(component): 新增cluster marker 2020-01-17 00:40:37 +08:00
thinkinggis 052f306faf fix: 修复数据更新方法 2020-01-16 18:22:38 +08:00
thinkinggis 63b7bb844a fix: 事件交互机制 setselect setActive方法 2020-01-16 11:11:34 +08:00
thinkinggis f5c6f74ab7 fix: 修复图层高亮不正常显示的问题 fix #150 2020-01-15 15:11:33 +08:00
thinkinggis 4f9ccbbd4b fix: 3D 柱图偏移坐标系坐标转换的问题 2020-01-14 16:12:48 +08:00
thinkinggis ecda21c0db chore: 测试用例jest-electron 环境 & 修复一些文档问题 2020-01-13 21:14:08 +08:00
thinkinggis 70825f9364 feat: 添加移除全部要marker layer 的方法 2020-01-10 12:07:19 +08:00
yuqi.pyq e982ef89ba feat(three.js layer): support rendering three.js meshes 2020-01-09 14:53:27 +08:00
thinkinggis 7aa7fc782d docs: update demo 2020-01-08 22:42:43 +08:00
thinkinggis c19ecd4b3f fix: fix line animate size 2020-01-08 18:12:23 +08:00
thinkinggis 39258c5999 docs: update demo 2020-01-08 17:54:23 +08:00
thinkinggis c3c22921a2 docs: update 图层引入 2020-01-07 21:15:23 +08:00
thinkinggis 8aa24988ff feat: marker 支持鼠标事件 2020-01-03 14:43:51 +08:00
thinkinggis f03cc59ed9 feat: add raster layer 2020-01-02 20:14:25 +08:00
thinkinggis 3114ab55a5 feat: polygon 支持text 2019-12-30 18:10:21 +08:00
thinkinggis 0a9558d8eb feat: point text add overlap 2019-12-30 15:35:47 +08:00
thinkinggis f9e4ea89e6 docs: add pointanimate demo 2019-12-27 11:35:19 +08:00
thinkinggis 1e641f0de2 feat(layer): pointLayer add text model 2019-12-27 10:15:22 +08:00
thinkinggis 9fa15e4d2a fix: 高德地图底图模式,事件交互注册顺序的问题导致不生效 2019-12-26 11:42:09 +08:00
thinkinggis 40851dabb9 fix: layer style storkeColor->stroke 2019-12-26 00:44:32 +08:00
thinkinggis ae1e0fafaa feat(layer): add citybuildinglayer & add line add animate 2019-12-25 00:01:14 +08:00
thinkinggis aa3589675d chore: babel useBuiltIns useage 2019-12-20 17:31:50 +08:00
thinkinggis 9fce267950 fix(layer): fix default model config 2019-12-20 00:16:00 +08:00
thinkinggis 73e946ff94 feat(layer): add blend 效果配置支持 normal,additive 2019-12-18 22:39:27 +08:00
thinkinggis 81c2e4eee3 docs: add layer docs 2019-12-18 14:32:11 +08:00
thinkinggis c9ffc3b7c0 feat(layer): add setSelect setActive 方法 & refactor color util 2019-12-18 00:33:25 +08:00
thinkinggis 0c4ecb80e1 fix: source 聚合方法接口定义问题 2019-12-17 14:08:02 +08:00
thinkinggis 9089d69d0d feat: scene 实例化支持传入地图实例 & 更新文档 2019-12-17 11:14:31 +08:00
thinkinggis 87176fb0bc feat(source render): source transfrom, layer event 2019-12-12 00:35:15 +08:00
thinkinggis 611be14042 feat(source render): source transfrom, layer event 2019-12-12 00:35:15 +08:00
thinkinggis 594d9c821c docs: add source docs, fix mapbox marker 2019-12-10 20:11:26 +08:00
thinkinggis 6322779a78 docs: add source docs, fix mapbox marker 2019-12-10 20:11:26 +08:00
thinkinggis fe7aecadfd fix(lint): igonre lint test data lint 2019-12-07 20:55:59 +08:00
thinkinggis c2e613b533 fix(lint): igonre lint test data lint 2019-12-07 20:55:59 +08:00
thinkinggis 7e09ec1f6c fix(scene): contianer resize 2019-12-07 01:43:18 +08:00
thinkinggis 88bbc1fc65 fix(scene): contianer resize 2019-12-07 01:43:18 +08:00
thinkinggis 2d396504ce feat(source): wip cluster 2019-12-04 19:00:43 +08:00
thinkinggis 9ad51fe641 feat(source): wip cluster 2019-12-04 19:00:43 +08:00
thinkinggis 024477adf8 fix(parser): fix multipolygom parser 2019-12-02 15:16:45 +08:00
thinkinggis a867ed7d31 fix(parser): fix multipolygom parser 2019-12-02 15:16:45 +08:00
xiaoiver 3eff40b37b 修复 Windows 环境开发问题 (#109) 
* fix(windows): preparing Windows environment

* re #101, add `CONTRIBUTING.md`

* chore(windows): fix lerna watch command in Windows
 2019-11-29 15:38:17 +08:00
xiaoiver 3c23170514 修复 Windows 环境开发问题 (#109) 
* fix(windows): preparing Windows environment

* re #101, add `CONTRIBUTING.md`

* chore(windows): fix lerna watch command in Windows
 2019-11-29 15:38:17 +08:00
thinkinggis 451172b611 fix(map): temporarily closed amap offset coordinate 2019-11-29 11:19:04 +08:00
thinkinggis b306e4ce1d fix(map): temporarily closed amap offset coordinate 2019-11-29 11:19:04 +08:00
thinkinggis bc17add4c3 fix(component): fix marker 2019-11-28 17:25:56 +08:00
thinkinggis 8dabe4c9c1 fix(component): fix marker 2019-11-28 17:25:56 +08:00
thinkinggis 62f42618bb refactor(component): add popup marker service 2019-11-28 00:26:09 +08:00
thinkinggis 3734898a5f refactor(component): add popup marker service 2019-11-28 00:26:09 +08:00
yuqi.pyq 1e6bea4619 fix(map): use P20 offset coordinates 
fix #94
 2019-11-26 20:37:39 +08:00
yuqi.pyq a4a618e3a4 fix(map): use P20 offset coordinates 
fix #94
 2019-11-26 20:37:39 +08:00
yuqi.pyq 4a494373e8 feat(map): adjust Scene API, use @antv/l7-maps instead 
re #86
 2019-11-26 17:51:29 +08:00
yuqi.pyq 648357fe8e feat(map): adjust Scene API, use @antv/l7-maps instead 
re #86
 2019-11-26 17:51:29 +08:00
xiaoiver c5aae1675f 完善构建方案 & 容器 Bug 修复 (#84) 
* feat(core): support hierarchical containers

* feat(multipassrenderer): support custom postprocessing pass

* build(rollup): output CDN bundle to @antv/l7/dist

* build(tsc): generate TS declaration files

* chore(prerelease): prerelease beta.10
 2019-11-25 15:27:56 +08:00
xiaoiver 44dec441af 完善构建方案 & 容器 Bug 修复 (#84) 
* feat(core): support hierarchical containers

* feat(multipassrenderer): support custom postprocessing pass

* build(rollup): output CDN bundle to @antv/l7/dist

* build(tsc): generate TS declaration files

* chore(prerelease): prerelease beta.10
 2019-11-25 15:27:56 +08:00
thinkinggis 23211d091d fix(site): megre conflict 2019-11-22 19:28:43 +08:00
thinkinggis d8967f2b45 fix(site): megre conflict 2019-11-22 19:28:43 +08:00
thinkinggis 6124e414ec fix(doc): file name lowercase 2019-11-22 18:08:49 +08:00
thinkinggis 066935ce34 fix(doc): file name lowercase 2019-11-22 18:08:49 +08:00
thinkinggis 63b4c83167 fix(rm cache): rm cache 2019-11-21 13:05:22 +08:00
thinkinggis 45b2b3ac11 fix(rm cache): rm cache 2019-11-21 13:05:22 +08:00
thinkinggis 04d8c5be92 refactor(example): add lint 2019-11-20 17:26:24 +08:00
thinkinggis cd612223c1 refactor(example): add lint 2019-11-20 17:26:24 +08:00
thinkinggis e67224a5a7 fix(fix confilict): conflict 2019-11-14 18:22:08 +08:00
thinkinggis 40aba768c6 fix(fix confilict): conflict 2019-11-14 18:22:08 +08:00
yuqi.pyq 00493b81e6 build(prettier): support optional chain with TS 3.7 
fix #46
 2019-11-12 15:37:31 +08:00
yuqi.pyq 76d2c9a51f build(prettier): support optional chain with TS 3.7 
fix #46
 2019-11-12 15:37:31 +08:00
thinkinggis 26c3cca511 feat(scene): scene service inTransientScope 2019-11-07 00:52:03 +08:00
thinkinggis b1f2942631 feat(scene): scene service inTransientScope 2019-11-07 00:52:03 +08:00
thinkinggis a32dc230a0 feat(add l7 site): add websites 2019-11-06 11:57:42 +08:00
thinkinggis 47296a24ef feat(add l7 site): add websites 2019-11-06 11:57:42 +08:00
thinkinggis 9b8d3c8f5d feat(layers): add heatmap 3d layer 2019-11-02 00:45:00 +08:00
thinkinggis 05bd44be1c feat(layers): add heatmap 3d layer 2019-11-02 00:45:00 +08:00
thinkinggis 86ec8e4718 feat(layers): add heatmap layer 2019-11-01 15:36:20 +08:00
thinkinggis 99dac21e66 feat(layers): add heatmap layer 2019-11-01 15:36:20 +08:00
thinkinggis 37d6799422 feat(layer): add arc2d layer 2019-10-30 16:38:59 +08:00
thinkinggis d5155afcac feat(layer): add arc2d layer 2019-10-30 16:38:59 +08:00
yuqi.pyq a2a69fad2a feat(post-processing): add some post processing effects 
add noise, sepia, halftone and ink effects
 2019-10-30 16:12:11 +08:00
yuqi.pyq 585ea28d74 feat(post-processing): add some post processing effects 
add noise, sepia, halftone and ink effects
 2019-10-30 16:12:11 +08:00
thinkinggis fe894bc660 feat(layers): add arclayer 2019-10-30 14:53:18 +08:00
thinkinggis dd97c55ac4 feat(layers): add arclayer 2019-10-30 14:53:18 +08:00
thinkinggis 861c0bba41 feat(layers): add girdheatmap add raster imagelayer 2019-10-30 11:52:36 +08:00
thinkinggis 7aa37fdbdc feat(layers): add girdheatmap add raster imagelayer 2019-10-30 11:52:36 +08:00
thinkinggis a5b77b3648 feat(layers): add polygon3d , pointimagelayer 2019-10-30 10:12:02 +08:00
thinkinggis 54b67150cd feat(layers): add polygon3d , pointimagelayer 2019-10-30 10:12:02 +08:00
thinkinggis 35f4ff61d3 fix(merge): merge next branch 2019-10-29 17:39:42 +08:00
thinkinggis eb9e220ede fix(merge): merge next branch 2019-10-29 17:39:42 +08:00
thinkinggis cbb6c3a0d2 feat(layer): point layer 2019-10-29 17:33:37 +08:00
thinkinggis cfabee3d03 feat(layer): point layer 2019-10-29 17:33:37 +08:00
yuqi.pyq dfb03f62d4 feat(multi-pass): support TAA(Temporal Anti-Aliasing) 
we can enable TAA in layer's options now, but there're something wrong when picking enabled at same
time.
 2019-10-29 14:42:41 +08:00
yuqi.pyq 39aba9d9ec feat(multi-pass): support TAA(Temporal Anti-Aliasing) 
we can enable TAA in layer's options now, but there're something wrong when picking enabled at same
time.
 2019-10-29 14:42:41 +08:00
yuqi.pyq b844e63015 feat(schema-validation): support validation for layer's options 
implement with JSON Schema (ajv)
 2019-10-27 20:58:33 +08:00
yuqi.pyq 896b02c1e7 feat(schema-validation): support validation for layer's options 
implement with JSON Schema (ajv)
 2019-10-27 20:58:33 +08:00
yuqi.pyq f748db05dc feat(picking): support advanced picking API: `layer.pick({x, y})` 2019-10-25 17:16:53 +08:00
yuqi.pyq 39fb89cc7f feat(picking): support advanced picking API: `layer.pick({x, y})` 2019-10-25 17:16:53 +08:00
thinkinggis f223f2965c fix(merge branch): fix confilt 2019-10-25 10:46:58 +08:00
thinkinggis af43098fcf fix(merge branch): fix confilt 2019-10-25 10:46:58 +08:00
thinkinggis dcb2e91a9c feat(component): add scale ,zoom, popup, marker map method 2019-10-24 21:23:15 +08:00
thinkinggis f55429d018 feat(component): add scale ,zoom, popup, marker map method 2019-10-24 21:23:15 +08:00
yuqi.pyq 76a75f5df7 feat(picking): support PixelPickingPass and highlight the picked feature 2019-10-24 20:53:15 +08:00
yuqi.pyq 9e29d1a949 feat(picking): support PixelPickingPass and highlight the picked feature 2019-10-24 20:53:15 +08:00
thinkinggis cccf70e7d8 feat(core): add map method 2019-10-21 14:37:35 +08:00
thinkinggis 2cffc58813 feat(core): add map method 2019-10-21 14:37:35 +08:00
thinkinggis 09a88582be feat(point image): add point image 2019-10-16 19:46:10 +08:00
thinkinggis 7e6d48aba7 feat(point image): add point image 2019-10-16 19:46:10 +08:00
thinkinggis c5458d54b6 feat(layer): add imagelayer 2019-10-16 10:13:44 +08:00
thinkinggis 557115b12f feat(layer): add imagelayer 2019-10-16 10:13:44 +08:00
thinkinggis 2aecec62e3 fix(layer): fix merge conflict 2019-10-14 19:22:51 +08:00
thinkinggis 453adb09d6 fix(layer): fix merge conflict 2019-10-14 19:22:51 +08:00
thinkinggis 2e2667f55b feat(layer): add point line polygon image layer 2019-10-12 21:26:54 +08:00
thinkinggis c0289113cf feat(layer): add point line polygon image layer 2019-10-12 21:26:54 +08:00
yuqi.pyq 3286c59d5a refactor(@l7/core): 重构 MultiPassRenderer & PostProcessor 
不依赖具体 renderer 渲染服务接口，@l7/renderer 各渲染引擎只需要实现基础 WebGL 资源对象接口
 2019-10-12 10:42:50 +08:00
yuqi.pyq 7059ef3186 refactor(@l7/core): 重构 MultiPassRenderer & PostProcessor 
不依赖具体 renderer 渲染服务接口，@l7/renderer 各渲染引擎只需要实现基础 WebGL 资源对象接口
 2019-10-12 10:42:50 +08:00
thinkinggis 3a92b02691 feat(layer): 新增sourceplugin, attribute 增加类型判断 2019-10-10 11:45:18 +08:00
thinkinggis 83d6dcc4a4 feat(layer): 新增sourceplugin, attribute 增加类型判断 2019-10-10 11:45:18 +08:00
yuqi.pyq 2542b0643a refactor: refactor with monorep architecture 2019-10-08 20:15:52 +08:00
yuqi.pyq 31a3db93a1 refactor: refactor with monorep architecture 2019-10-08 20:15:52 +08:00