Commit Graph

412 Commits

Author SHA1 Message Date
openharmony_ci
ea53a17f14 !295 Merge LTS3.0 and RK bugfix to Master.
Merge pull request !295 from zhongjianfei/ms1021
2021-10-21 11:36:37 +00:00
openharmony_ci
a22ffc1a8c !279 ark napi adapt
Merge pull request !279 from songcy-hw/add_napi_support_19
2021-10-21 07:31:19 +00:00
openharmony_ci
4953906071 !287 修复margin异常问题以及主题崩溃
Merge pull request !287 from jiangdayuan/dev
2021-10-21 07:25:50 +00:00
zhongjianfei
073f43aec3 zhongjianfei@huawei.com
Signed-off-by: zhongjianfei <zhongjianfei@huawei.com>
Change-Id: I7ce42874db7c26c104083cd3e1a9c6eb8425b465
2021-10-21 13:03:01 +08:00
zengsiyu
bd43458955 retain state after pausing animation
Signed-off-by: zengsiyu <zengsiyu3@huawei.com>
Change-Id: Ied9b36c0885cc2170b1a5b5977b00949d51d2ed7
2021-10-21 11:09:47 +08:00
jiangdayuan
78ed1c0999 jiangdayuan@huawei.com
Signed-off-by: jiangdayuan <jiangdayuan@huawei.com>
Change-Id: I4c76ce039450ba5cdbb548f7b236cc6de0fae27d
2021-10-21 10:35:56 +08:00
openharmony_ci
7628cd8f36 !280 修改空指针调用导致的崩溃
Merge pull request !280 from caocan/master
2021-10-20 09:48:10 +00:00
openharmony_ci
ae4307fb35 !273 多模提交联调代码
Merge pull request !273 from licheng_1123/multimodal_1018
2021-10-20 08:37:07 +00:00
openharmony_ci
637c0a6dde !291 解除AceView对flutter头文件的依赖
Merge pull request !291 from Sunfei/work_1012
2021-10-20 06:37:53 +00:00
openharmony_ci
b6ba9e919a !289 compatible with web-like static transition
Merge pull request !289 from coderLsq/shared_transition_controller
2021-10-20 06:34:58 +00:00
sunfei
53af02ddcf don't deps on flutter in common header
Signed-off-by: sunfei <sunfei.sun@huawei.com>
Change-Id: Id952cfdc0e6a72bfef079d2c781197c1cdfdf3bc
2021-10-20 11:57:08 +08:00
coderLsq
f8459db7ce compatible with web-like static transition
Signed-off-by: coderLsq <lsq1474521181@163.com>
2021-10-20 11:31:38 +08:00
jiangdayuan
a6e3a54717 jiangdayuan@huawei.com
Signed-off-by: jiangdayuan <jiangdayuan@huawei.com>
Change-Id: I96ecb0b61fbb4932321cd1446c1f68d25bc3aa6e
2021-10-20 11:14:18 +08:00
openharmony_ci
644d42b270 !285 解决Asset路径非defalut时加载失败
Merge pull request !285 from Sunfei/work_1012
2021-10-20 02:41:13 +00:00
openharmony_ci
b5caed4548 !276 don't report js crash when jsi engine destroy
Merge pull request !276 from changcheng/master
2021-10-20 02:35:56 +00:00
sunfei
b8547c8948 fix path error of file assets
Signed-off-by: sunfei <sunfei.sun@huawei.com>
Change-Id: I89c5c080bbcec9d21ef136975b547cb59e92ae83
2021-10-20 10:13:36 +08:00
openharmony_ci
9216b8d8b7 !282 fix wrong order
Merge pull request !282 from zhanghaibo/master
2021-10-19 13:19:24 +00:00
zhanghaibo
9a49ed80f5 fix wrong order
Signed-off-by: zhanghaibo <zhanghaibo0@huawei.com>
2021-10-19 16:34:09 +08:00
openharmony_ci
e20b7c8ed7 !258 修改Ace中skia的BUILD.gn
Merge pull request !258 from shiyu_huang/ace_dev_branch
2021-10-19 08:13:00 +00:00
caocan
dde64e3cec fix null pointer problems
Signed-off-by: caocan <1532643766@qq.com>
Change-Id: Ibb957a6f4744525c09126c0e12a12c98983decef
2021-10-19 15:50:06 +08:00
songcongyi
3e4b1bba9f adapt ark napi
Change-Id: Ie75db3462042ead5b7785e2f7422a2372e80c734
Signed-off-by: songcongyi <songcongyi1@huawei.com>
2021-10-19 15:06:52 +08:00
songliy
1cb8609ee8 多模修改ace告警
Signed-off-by: licheng.li <licheng.li@huawei.com>
2021-10-19 14:11:42 +08:00
wengchangcheng
e2f77f05fa dont report js crash when jsi engine destroy
Signed-off-by: wengchangcheng <wengchangcheng@huawei.com>
2021-10-19 11:04:44 +08:00
songliy
6521f71cd0 多模修改ace告警
Signed-off-by: licheng.li <licheng.li@huawei.com>
2021-10-19 10:14:42 +08:00
openharmony_ci
e840a25b79 !271 samgr part name rectify
Merge pull request !271 from zmx/master-dev
2021-10-19 01:57:47 +00:00
songliy
7055ab585b 多模提交联调代码
Signed-off-by: licheng.li <licheng.li@huawei.com>
2021-10-18 21:34:39 +08:00
openharmony_ci
2f42d2ecd4 !268 remove unused form ability code
Merge pull request !268 from zero-cyc/master_1015
2021-10-18 12:23:06 +00:00
openharmony_ci
74949bf70d !264 2.0 video FullScreen
Merge pull request !264 from obama/d1018
2021-10-18 12:17:31 +00:00
zmx
ebbfe44c31 samgr part name rectify
Signed-off-by: zmx <1029211721@qq.com>
Change-Id: I7822e57fcca061d46e4cfeba0b855e4a3f123f3f
2021-10-18 20:02:05 +08:00
zero-cyc
8f6aa070f2 chenlien@huawei.com
Signed-off-by: zero-cyc <chenlien@huawei.com>
Change-Id: Ia478d68a7be4760e25c127515e311a0aecd3f7df
2021-10-18 16:38:02 +08:00
dujingcheng
f567989c8a FullScreen
Signed-off-by: dujingcheng <dujingcheng@huawei.com>
2021-10-18 07:07:48 +00:00
openharmony_ci
6ec5dd2f55 !260 merge
Merge pull request !260 from obama/djc
2021-10-18 02:57:30 +00:00
dujingcheng
5188184f0f accebility
Signed-off-by: dujingcheng <dujingcheng@huawei.com>
2021-10-18 01:20:06 +00:00
shiyu_huang
1234894b7d Modify build script for skia in Ace
Signed-off-by: shiyu_huang <huangshiyu1@huawei.com>
Change-Id: Iac5f1e65a1525c6fe8ac1eba28fd39256cd8a31a
2021-10-15 17:11:02 +08:00
openharmony_ci
b1ff5782ba !175 fix codex
Merge pull request !175 from lushi1202/master
2021-10-15 03:23:11 +00:00
openharmony_ci
f7b3c16f05 !254 lts 回合 master
Merge pull request !254 from hanfeng/master
2021-10-15 01:32:08 +00:00
openharmony_ci
2169f87fbc !253 add DatePicker in ark engine of jsi
Merge pull request !253 from changcheng/master
2021-10-15 00:50:12 +00:00
openharmony_ci
fc692fe841 !257 修复span深浅色切换后颜色改变的问题
Merge pull request !257 from caocan/master
2021-10-15 00:46:45 +00:00
openharmony_ci
e495c38a0d !255 merge
Merge pull request !255 from obama/dmerge
2021-10-14 13:15:25 +00:00
caocan
69ee344e59 fix color of span when change color mode
Signed-off-by: caocan <1532643766@qq.com>
Change-Id: Ibb90dfe9ce8d80f531aabbfc5abe1c521d2422cf
2021-10-14 21:09:18 +08:00
wengchangcheng
c6ef1e1a13 support DatePicker in ark app
Signed-off-by: wengchangcheng <wengchangcheng@huawei.com>
Change-Id: I8fbf6ebb1c83db3704b2dc7dd909244affcde6e0
2021-10-14 21:06:47 +08:00
openharmony_ci
1d560b6bde !252 修改router getParams接口异常问题
Merge pull request !252 from jiangdayuan/master
2021-10-14 12:46:35 +00:00
dujingcheng
2c535d9e6e dujingcheng@huawei.com
Signed-off-by: dujingcheng <dujingcheng@huawei.com>
2021-10-14 12:33:54 +00:00
17764556280
5eceef2ae4 lts to master
Signed-off-by: 17764556280 <hanfeng6@huawei.com>
2021-10-14 19:49:38 +08:00
jiangdayuan
13dad12ace jiangdayuan@huawei.com
Signed-off-by: jiangdayuan <jiangdayuan@huawei.com>
2021-10-14 16:31:28 +08:00
openharmony_ci
fd1482f29f !198 Add L2 trace support
Merge pull request !198 from guozejun/master
2021-10-14 04:12:29 +00:00
lushi
ffec1b7e12 use weak ptr of io manager on io thread
Signed-off-by: lushi <lushi@huawei.com>
Change-Id: I46b513860241ee9aa5177ba8d0940956b93b42b6
2021-10-14 10:47:08 +08:00
openharmony_ci
2da545288f !249 最新代码回合master
Merge pull request !249 from Sunfei/work_1012
2021-10-13 06:22:58 +00:00
sunfei
981606b99e Merge code to openHarmony master
Signed-off-by: sunfei <sunfei.sun@huawei.com>
Change-Id: I169774adad5132dd2c13e168ddc8216e5c31439c
2021-10-13 11:34:26 +08:00
openharmony_ci
518aa723d4 !247 fix font check failure
Merge pull request !247 from zhanghaibo/master
2021-10-13 01:34:28 +00:00