Commit Graph

415 Commits

Author SHA1 Message Date
pengfei.zhou
8339a64663 optimize: make lazy registered doric library effective 2021-06-22 17:19:50 +08:00
王劲鹏
1ddd0c05a8 fix: android scroller child measure 2021-06-18 10:39:08 +08:00
pengfei.zhou
9fed9e431c feat:Input add beforeTextChange API 2021-06-11 17:48:56 +08:00
pengfei.zhou
e528630f71 feat:Input add getSelection API 2021-06-11 17:48:56 +08:00
pengfei.zhou
5263731dd7 feat:input add onSubmitEditing 2021-06-11 17:48:56 +08:00
pengfei.zhou
ff641bf983 feat:Input add editable and returnKeyType 2021-06-11 17:48:56 +08:00
pengfei.zhou
23a39f20fc android:fix list item set action cannot respond to click 2021-06-08 17:31:53 +08:00
pengfei.zhou
4da1f3be9d feat: enhance plugin navigator,add popSelf and popToRoot 2021-06-08 11:56:11 +08:00
pengfei.zhou
b18bec6899 Android: fix code error cause npe 2021-05-31 15:30:33 +08:00
pengfei.zhou
c1ac0a04a5 bugfix: read callbackId before read other properties. 2021-05-21 18:29:36 +08:00
pengfei.zhou
7570278352 android:fix log output format error 2021-05-20 18:26:46 +08:00
pengfei.zhou
546af79534 feat: modular add test case 2021-05-14 19:58:34 +08:00
王劲鹏
67ee81e90e Android: fix list item action overlapped when sub view click set 2021-05-14 13:15:53 +08:00
pengfei.zhou
91b1a3c24c android: protect color type error 2021-04-29 14:13:26 +08:00
pengfei.zhou
2e3f8f3cea android: fix npe when create plugin error 2021-04-29 12:00:01 +08:00
pengfei.zhou
658f0ed3b3 feat:android support listItem's actions 2021-04-25 15:49:01 +08:00
pengfei.zhou
5982b15b0d feat:NestedScroller add scrollable 2021-04-23 17:58:48 +08:00
pengfei.zhou
056f2f041f feat:Slider add scrollable 2021-04-23 17:58:48 +08:00
pengfei.zhou
c2ca3c0b31 feat:Flowlayout support scrollable 2021-04-23 17:58:48 +08:00
pengfei.zhou
418b71c7a3 feat:List support scrollable 2021-04-23 17:58:48 +08:00
pengfei.zhou
4cc67a463d feat:Scroller support scrollable 2021-04-23 17:58:48 +08:00
王劲鹏
9e6d9131ee android: fix fullscreen without virtual navigation 2021-04-22 16:46:08 +08:00
pengfei.zhou
cdd25caa7d feat:when cancel Animation,sync the properties from native 2021-04-22 14:57:51 +08:00
pengfei.zhou
e7ced92281 feat:Add cancelAnimation and clearAnimation 2021-04-22 14:57:51 +08:00
pengfei.zhou
5c20680c4c feat: add API clearAnimation 2021-04-22 14:57:51 +08:00
pengfei.zhou
009e8734b6 feat:add pureCallEntityMethod,avoid hook affects 2021-04-19 17:44:04 +08:00
pengfei.zhou
c6a6f76504 android: fix corner and hidden property conflict 2021-04-07 17:25:47 +08:00
pengfei.zhou
0363e5d207 Android:Fix cannot receive onActivityForResult by DoricPanelFrgment 2021-04-06 14:25:50 +08:00
王劲鹏
f4e6042cae Android: add oldBottomMargin, oldHeight & bottomMargin 2021-03-30 12:29:16 +08:00
pengfei.zhou
0290c7a929 Android:fix input set Text,set selection to the last 2021-03-25 17:26:58 +08:00
王劲鹏
a56f1164e9 Android: implement keyboard plugin 2021-03-19 10:34:32 +08:00
王劲鹏
2d5d24ac40 Android: on switch not called when toggle by js code 2021-03-08 11:17:38 +08:00
pengfei.zhou
e78625281f fix:iOS Runloop cannot exit and other issues 2021-03-04 14:52:00 +08:00
pengfei.zhou
627f323ae3 feat:fix iOS memory leak in debugging 2021-03-04 14:52:00 +08:00
刘涛
cc6355aea7 feat:android render response time change 2021-02-24 14:56:09 +08:00
刘涛
411c92f0f0 fix:android unwarp return activity 2021-02-24 14:56:09 +08:00
pengfeizhou
af31014e2e debugger:complete android part 2021-02-23 11:45:53 +08:00
pengfeizhou
a7e042174f android:Fix cannot receive onActivityResult in plugin when call activity.startActivityForResult 2021-02-09 15:11:54 +08:00
pengfeizhou
07c701ef23 feat:Input add password property 2021-02-08 18:19:23 +08:00
pengfeizhou
0666b61096 Android:remove useless import 2021-02-03 16:34:36 +08:00
pengfeizhou
a786977b80 Android:protect type error 2021-02-03 16:34:36 +08:00
pengfeizhou
2de59a307f feat:Fix Flowlayout call onLoadMore multi times 2021-02-02 19:56:27 +08:00
pengfeizhou
112e45af06 feat:Fix List call onLoadMore multi times 2021-02-02 19:56:27 +08:00
pengfeizhou
c9dd90d19b bugfix:fix Android List validateViewHolderForOffsetPosition error 2021-01-27 16:37:00 +08:00
pengfei.zhou
ac2a4121c2 Android Notification add permission 2020-12-08 12:31:22 +08:00
刘涛
a355361f33 fix:Android shadow setAntiAlias false 2020-11-11 17:39:20 +08:00
pengfei.zhou
ed5c2103b0 android:fix type cast error 2020-09-11 10:35:11 +08:00
pengfei.zhou
821cb1823c iOS support internal class 2020-09-05 14:19:49 +08:00
pengfei.zhou
4df7df1327 Android support internal class 2020-09-05 14:19:49 +08:00
pengfei.zhou
f14017281e Android:protect when subviews not synced from js 2020-09-05 14:06:31 +08:00
pengfei.zhou
cf2b5b3fac feat:Popover area do not over the root view's area 2020-09-04 15:38:13 +08:00
pengfei.zhou
e4351e3b00 android:navigator plugin push support singlePage flag and the default value is false 2020-09-01 17:48:38 +08:00
pengfei.zhou
4e724ba922 android:when in DoricPanelFragment,do not observe Lifecycle 2020-09-01 17:48:38 +08:00
pengfei.zhou
6484439852 android:DoricJavaPlugin add onActivityResult support 2020-09-01 11:27:06 +08:00
刘涛
f6eb8632d6 fix:android ImageNode check error context 2020-08-28 17:46:05 +08:00
王劲鹏
26103255a0 android: pick width & height as default constant in portrait orientation 2020-08-25 17:16:42 +08:00
王劲鹏
663c3d5b92 android: add json array to java value 2020-08-03 12:39:23 +08:00
刘涛
414f25d8fd android: navController pop logic 2020-07-20 14:22:57 +08:00
刘涛
f8d624d097 android:remove invalid null check 2020-07-20 12:58:56 +08:00
刘涛
1de1fdeb47 android: navController check null 2020-07-20 12:58:56 +08:00
王劲鹏
77281b945f fix scroll end callback time 2020-07-04 15:14:11 +08:00
刘涛
787ea71862 feat:Android LinearNode setBaselineAligned false 2020-07-03 17:05:05 +08:00
刘涛
ae5ac30fb6 fix:android IDoricNavigator pop/push return when activity is finishing 2020-07-02 19:01:02 +08:00
pengfei.zhou
4a788eb4bb adjust code style and add default case 2020-06-13 11:59:47 +08:00
tracy
497bd0ac45 android alphabet 2020-06-13 11:59:47 +08:00
tracy
8e8999dd7a add inputtype 2020-06-13 11:59:47 +08:00
王劲鹏
5e0b1ea92b replace regex with sub string 2020-06-08 09:40:50 +08:00
pengfei.zhou
9b181830fc add perspective for rotattionX and rotationY 2020-06-03 14:54:52 +08:00
pengfei.zhou
c14ec1954e Add rotationX and rotationY 2020-06-03 14:54:52 +08:00
刘涛
b81c1d824b android:update textnode shadow prop 2020-05-29 10:14:45 +08:00
pengfei.zhou
edb355da80 android:DoricPanelFragment fix npe 2020-05-26 11:11:37 +08:00
刘涛
26d0a38357 feat:android TextNode font support load from res 2020-05-25 18:17:49 +08:00
pengfei.zhou
3a9b6c2a85 android:add protection for DoricPanel is null 2020-05-20 10:33:24 +08:00
王劲鹏
39401524f2 Android: implements base64 for placeholder & error in image 2020-05-11 11:31:42 +08:00
王劲鹏
506f89930e Android: implements locations in gradient color 2020-05-11 09:53:28 +08:00
王劲鹏
c2264e621c Android: ensure start & end are not null 2020-05-11 09:53:28 +08:00
王劲鹏
d91142a1db Android: implements multiple segments as gradient color 2020-05-11 09:53:28 +08:00
刘涛
c66466f241 android: input releaseFocus hide softInput 2020-05-08 16:20:42 +08:00
pengfei.zhou
8f693b451d feat:fix lifecycle call not exactly right 2020-05-06 16:22:13 +08:00
pengfei.zhou
8db686b89b android:fix input gravity 2020-05-06 15:13:00 +08:00
pengfei.zhou
f1a222f339 code format 2020-05-06 15:13:00 +08:00
王劲鹏
007786f4ef Android: implements navbar set center 2020-04-30 18:52:28 +08:00
刘涛
b7da580842 feat:android input add maxLength 2020-04-30 18:18:29 +08:00
pengfei.zhou
b169f581d3 feat:protect when build set navbar's view 2020-04-30 18:11:59 +08:00
pengfei.zhou
fdff5af3d9 feat:Text add truncateAt 2020-04-27 18:58:41 +08:00
pengfei.zhou
ab28256916 android:image strech unit should multiply scale 2020-04-27 16:03:16 +08:00
pengfei.zhou
0535d0d4d4 android:fix render callback thread error 2020-04-27 16:03:16 +08:00
pengfei.zhou
57b5c7596b feat:when reload doriccontext,release the js resource 2020-04-27 16:03:16 +08:00
pengfei.zhou
12fcf71526 android:use addIdelHandler to avoid call render callback before it is actually rendered 2020-04-27 16:03:16 +08:00
pengfei.zhou
2995296121 android:fix synchronously set image 2020-04-26 14:55:22 +08:00
pengfei.zhou
05927b33d5 fix when parent is fit ,child is most,resolve this situation 2020-04-23 20:02:23 +08:00
pengfei.zhou
496c4c1838 fix:when onDestroy call native plugin 2020-04-23 17:43:54 +08:00
pengfei.zhou
82fdd5e46c Android and iOS add handling imageScale 2020-04-23 16:52:24 +08:00
pengfei.zhou
9e7c1f04ef feat:Environment add scale 2020-04-23 16:52:24 +08:00
pengfei.zhou
229fc41de3 update js api 2020-04-22 11:38:15 +08:00
pengfei.zhou
5f4942a8ff feat:List add scrollToItem method 2020-04-22 11:38:15 +08:00
pengfei.zhou
64d1153e93 android:incase load image url after activity is destroyed 2020-04-21 19:25:22 +08:00
pengfei.zhou
a386c548ec android:fix DoricActivity be called externally 2020-04-20 09:37:31 +08:00
王劲鹏
4c18171a2b change px to proportion 2020-04-17 17:01:10 +08:00
王劲鹏
b1c1650478 Android: implement stretchInset for ImageNode 2020-04-17 17:01:10 +08:00
刘涛
c329cfcf53 android:fix android textview truncate problem 2020-04-14 20:25:42 +08:00
pengfei.zhou
9e0b3e067b feat:Text add htmlText 2020-04-14 12:10:55 +08:00
pengfei.zhou
e73ad1db2b android:fix RootNode type is null 2020-04-14 12:10:55 +08:00
pengfei.zhou
8cb135b7b1 Text add strikethrough and underline 2020-04-13 17:44:15 +08:00
pengfei.zhou
8faf0e5d33 android:set imageView adjustViewBounds anywhere 2020-04-13 14:44:32 +08:00
pengfei.zhou
7a2bffdb64 android:fix mix use layoutConfig and flexConfig 2020-04-13 14:44:32 +08:00
pengfei.zhou
d29ff4991d add handling layoutconfig in flexlayout 2020-04-13 14:44:32 +08:00
pengfei.zhou
f66b6161b2 Android:imageview support maxWidth and maxHeight 2020-04-11 13:02:16 +08:00
pengfei.zhou
1e112055db Android implement maxWidth maxHeight 2020-04-11 13:02:16 +08:00
pengfei.zhou
80811a3bf6 Layout add minWidth minHeight maxWidth maxHeight 2020-04-11 13:02:16 +08:00
pengfei.zhou
fb23a11aa9 android add FlexNode 2020-04-10 14:35:21 +08:00
pengfei.zhou
404b4b594f add ts define 2020-04-10 14:35:21 +08:00
王劲鹏
4bb9df4dbb Android: add loop in slider 2020-04-10 11:08:39 +08:00
王劲鹏
c44c3e5353 add loop property & fix bug caused by renderPage cache 2020-04-10 11:08:39 +08:00
pengfei.zhou
d1f32b7f5c Android:render's promise's resolve should happen after view's been measured and layouted 2020-04-09 14:14:16 +08:00
pengfei.zhou
c20f1c53bf android:text setIncludeFontPadding to false 2020-04-01 18:00:04 +08:00
pengfei.zhou
78d4f51314 navigator add openUrl 2020-04-01 18:00:04 +08:00
pengfei.zhou
9c520e1dc5 android:fix DoricPanel cannot build automaticaly 2020-04-01 14:15:01 +08:00
pengfei.zhou
3bbf671420 feat:Image localRes and base64 support animation image 2020-04-01 14:15:01 +08:00
pengfei.zhou
e7ddcd1b67 android:fix runtime error 2020-03-28 12:04:37 +08:00
pengfei.zhou
0abf8533db feat:align Android and iOS treat ImageView's scale type 2020-03-25 22:52:39 +08:00
pengfei.zhou
139a8775d4 android:add JSDispatcher to optimize scrollchange callback 2020-03-25 15:05:50 +08:00
pengfei.zhou
66afc4c4bb android:add data type check for blending 2020-03-25 15:05:50 +08:00
pengfei.zhou
75fbb3d527 android fix npe 2020-03-24 20:35:56 +08:00
pengfei.zhou
4ea6da2d0a feat:align android and iOS image's default scale type 2020-03-24 16:25:14 +08:00
pengfei.zhou
0cfbef67a2 feat:add Text lineSpacing 2020-03-24 16:25:14 +08:00
pengfei.zhou
fe33a18213 feat:add maxWidth and maxHeight for text 2020-03-24 16:25:14 +08:00
pengfei.zhou
7f16aa23ae android:fix cannot change width and height after rendered 2020-03-24 16:25:14 +08:00
pengfei.zhou
2046baa23d feat:fix command view cannot find view,let find on UI Thread 2020-03-23 13:38:11 +08:00
pengfei.zhou
5b096ffb2d android remove unused import 2020-03-19 15:36:23 +08:00
pengfei.zhou
2b62e8bd3b feat:adjust the inject timing of panel's initData 2020-03-19 15:36:23 +08:00
王劲鹏
9bb92f410e android: notch plugin implementation 2020-03-19 15:11:57 +08:00
王劲鹏
b626eb3071 android: hasNotch default false 2020-03-19 15:11:57 +08:00
pengfei.zhou
98c7d59a70 Environment add device brand and model info 2020-03-14 10:55:35 +08:00
pengfei.zhou
aecccabe84 feat:add onFrameChangedCallback for DoricPanel 2020-03-13 19:38:39 +08:00
王劲鹏
5728b852cd android: add gradient background for view node 2020-03-13 19:08:49 +08:00
王劲鹏
73c0a5e7ab add android icon font support 2020-03-13 15:06:19 +08:00
pengfei.zhou
4359eec700 feat:add switch for Android and iOS 2020-03-13 13:03:23 +08:00
pengfei.zhou
a6df529f8f feat:add imagepath and imageRes for Image 2020-03-13 13:03:23 +08:00
pengfei.zhou
7b371ca58b feat:add onScroll and onScrollEnd for list and flowlayout 2020-03-11 13:42:17 +08:00
pengfei.zhou
348a6f3e56 feat:blendProps for Cooridinate changes 2020-03-11 13:42:17 +08:00
pengfei.zhou
f3f28c55f8 add panel.onRederFinished to be invoked after shader.render make sure coordinatorPlugin affected 2020-03-11 13:42:17 +08:00
pengfei.zhou
01d736c5a6 feature:CoordinateLayout support multi set 2020-03-11 13:42:17 +08:00
pengfei.zhou
3b0a245129 feat:Android and iOS monitor use DoricContext as parameter 2020-03-07 10:41:25 +08:00
pengfei.zhou
fac7f005d8 android:protect while glide version conflict 2020-03-05 12:53:56 +08:00
pengfei.zhou
5053262dd5 feat:add PlcaeHolder and Error setting for Image 2020-03-05 12:53:56 +08:00
pengfei.zhou
ef77d5ec95 android:fix context call method error 2020-03-04 14:18:16 +08:00
pengfei.zhou
021fdab35f feat:scroller add onScroll and onScrollEnd property 2020-03-03 16:37:40 +08:00
pengfei.zhou
35e9f05114 feat:add getX and getY for view 2020-03-03 16:37:40 +08:00
pengfei.zhou
0641f5e223 feat:scroller add scrollBy 2020-03-03 16:37:40 +08:00
pengfei.zhou
6d7562877e feat:Scroller add contentOffset property 2020-03-03 13:24:29 +08:00
pengfei.zhou
46255632ec feat:Scroller add scrollTo method 2020-03-03 13:24:29 +08:00
pengfei.zhou
a3148ef065 android:avoid crash while compating different glide version 2020-03-03 12:00:24 +08:00
pengfei.zhou
523beaa0e1 android:Switch statusbar mode 2020-02-29 15:11:27 +08:00
pengfei.zhou
d713b04d51 feat:fix when reloading call onCreate and onShow 2020-02-29 15:11:27 +08:00
pengfei.zhou
eb6ba3ee36 Align lifecycle timing for Android and iOS 2020-02-29 14:18:08 +08:00
pengfei.zhou
7f1b1256ce android:adjust Doric.java and DoricKit.java,optimize api 2020-02-28 18:42:03 +08:00
pengfei.zhou
7e7e9fed36 android:use QMUI to change statusbar status 2020-02-28 18:42:03 +08:00
pengfei.zhou
e11a26bd6d android:fix navbar setHidden cause bottombar translucent 2020-02-27 19:02:49 +08:00
pengfei.zhou
42ae0e245f feat:fix loading error cannot be thrown 2020-02-27 19:02:49 +08:00
王劲鹏
e9197ec173 remove reInit method 2020-02-27 17:24:22 +08:00
pengfei.zhou
1a6b730146 feat:remove Context instance before js destory 2020-02-27 13:42:54 +08:00
pengfei.zhou
abb1873b49 feat:doric android and iOS's monitor add source parameter when exception 2020-02-22 15:47:10 +08:00
pengfei.zhou
0c42dba80d android:Okhttp's method must be uppercased 2020-02-19 19:54:10 +08:00
pengfei.zhou
0961cb9fc9 refact:change field name from scheme to source 2020-02-19 19:54:10 +08:00
pengfei.zhou
251cb7770c android:fix StatusBar background color not transparent 2020-02-19 19:54:10 +08:00
pengfei.zhou
a75d132e2c android:fix import error 2020-02-19 19:54:10 +08:00
pengfei.zhou
6bf61b3769 feat:iOS implement coordinator plugin 2020-02-13 22:25:13 +08:00
pengfei.zhou
630ec51504 feature:add coordinatorPlugin and Android part 2020-02-13 22:25:13 +08:00
pengfei.zhou
5b0e4959e1 android:implement IDoricScrollable for Scroller,List and Flowlayout 2020-02-13 22:25:13 +08:00
pengfei.zhou
00a5020847 add copyright for some files 2020-02-13 22:25:13 +08:00
pengfei.zhou
81cbc27c5a android:add setBackIconVisible for BaseTitleBar 2020-02-13 22:25:13 +08:00
pengfei.zhou
65f7d0b9ec Android asset load add IO Exception check 2020-02-07 17:05:47 +08:00
pengfei.zhou
4363ef17eb feat:add statusBarHeight in Environment 2020-01-21 15:34:02 +08:00
pengfei.zhou
7c2af8d1aa android:add api for costomization of DoricActivity 2020-01-21 10:49:16 +08:00
王劲鹏
93a207db9f fix HVScrollView fling 2020-01-20 14:02:03 +08:00
pengfei.zhou
5a68f10cb5 iOS:DoricViewController add loadingView and errorView 2020-01-19 18:26:36 +08:00
pengfei.zhou
7c83581c1e android:mask show error and loading 2020-01-19 18:26:36 +08:00
pengfei.zhou
5586c8f189 android:add mask for DoricActivity,show loading view 2020-01-19 18:26:36 +08:00
王劲鹏
7140190adf HVScrollView fling changed 2020-01-15 14:13:19 +08:00
王劲鹏
3855227e74 revert old HVScrollView 2020-01-15 14:13:19 +08:00
pengfei.zhou
5e166de77b android:fix naviator pop when stack is null,finish the activity 2020-01-15 11:26:52 +08:00
pengfei.zhou
c92435f1e0 Text add fontStype property 2020-01-15 09:55:48 +08:00
王劲鹏
8d0a64090c enhance HVScrollView 2020-01-15 09:40:26 +08:00
王劲鹏
6f635a6786 fix h&v scrollview on measure 2020-01-14 19:48:51 +08:00
王劲鹏
6664d8d988 remove old h&v scrollview 2020-01-14 19:13:08 +08:00
王劲鹏
713947e721 h&v scroll view enhancement 2020-01-14 19:13:08 +08:00
王劲鹏
455d7c5402 set margin via navbar instead of decor view 2020-01-14 19:09:48 +08:00
王劲鹏
12bfb16ea1 fix android & iOS consistency 2020-01-14 19:09:48 +08:00
王劲鹏
7f20103148 default immersive status bar in android 2020-01-14 19:09:48 +08:00
王劲鹏
1e167f541b bug fix 2020-01-14 19:09:48 +08:00
王劲鹏
2de57ff317 android status bar api implement 2020-01-14 19:09:48 +08:00
王劲鹏
e6db23d77c fix context teardown multiple times 2020-01-11 13:51:42 +08:00
pengfei.zhou
caea154377 iOS:add monitor 2020-01-11 11:05:34 +08:00
pengfei.zhou
0aaf105f53 android:renanme method 2020-01-11 11:05:34 +08:00
pengfei.zhou
da6afad30d android:add monitor 2020-01-11 11:05:34 +08:00
王劲鹏
894f23cd5b implement android navbar custom left & right view 2020-01-10 17:45:01 +08:00
pengfei.zhou
d4b19eb4ea android:JSLoader move to JSLoaderManager,not hold by DoricRegistry 2020-01-10 15:11:56 +08:00
pengfei.zhou
b9a2065f8a android:custimze Environment 2020-01-10 15:11:56 +08:00
王劲鹏
9a77578b9b android head node logic changed 2020-01-10 11:23:28 +08:00
pengfei.zhou
88d45c2967 add Notification demo,and pass 2020-01-09 11:51:14 +08:00
pengfei.zhou
9dabd3b1db iOS:notification plugin 2020-01-09 11:51:14 +08:00
pengfei.zhou
0087c5bda4 android&iOS:create context set this to undefined 2020-01-09 11:51:14 +08:00
pengfei.zhou
cdaebe46cd android:add notification 2020-01-09 11:51:14 +08:00
王劲鹏
8f0457101c move logic to native 2020-01-04 14:48:50 +08:00
王劲鹏
e06b305eb8 complete Android & iOS with same logic 2020-01-04 14:48:50 +08:00
王劲鹏
ece2e0cac2 add draggable in js & android 2020-01-04 14:48:50 +08:00
pengfei.zhou
7c88eebeb8 js:adjust hook timing for nested situation 2019-12-26 11:26:11 +08:00
pengfei.zhou
9677207844 feat:In Android,after context finished,the popovered view must be removed 2019-12-24 17:11:19 +08:00
pengfei.zhou
b88e3605b0 fix DoricPanelFragment back to recreate view,recreate context error 2019-12-23 19:38:49 +08:00
osborn
25ba991893
Feature/prepare publish (#2)
* add doric-js bundle into vcs

* android project read js bundle directly

* update iOS project config

* update version
2019-12-23 15:29:38 +08:00
pengfei.zhou
8c1354839c delete debugger 2019-12-22 00:25:36 +08:00
pengfei.zhou
55334a11b2 Merge branch 'android_master' into combine 2019-12-21 21:35:28 +08:00
pengfei.zhou
1d98479c07 rename dir 2019-12-21 20:17:45 +08:00
pengfei.zhou
2a0b33151b rename dirs 2019-12-21 20:14:23 +08:00