Commit Graph

411 Commits

Author SHA1 Message Date
王劲鹏
d060e1427c iOS: ensure start & end are not nil 2020-05-11 09:53:28 +08:00
王劲鹏
6406bfdcef iOS: implements multiple segments as gradient color 2020-05-11 09:53:28 +08:00
pengfei.zhou
6c21866d39 iOS:fix when input hans limit length error 2020-05-09 16:23:05 +08:00
pengfei.zhou
c51fc83537 iOS:fix NSTimer invalidate in main queue 2020-05-08 16:53:29 +08:00
pengfei.zhou
cb9f377a90 iOS:fix emoji cause substring error 2020-05-08 16:00:25 +08:00
pengfei.zhou
7828b24cd5 fix iOS crash when call Destory 2020-05-06 17:52:06 +08:00
pengfei.zhou
8f693b451d feat:fix lifecycle call not exactly right 2020-05-06 16:22:13 +08:00
pengfei.zhou
112952d379 feat:input align the affect to android 2020-05-06 15:13:00 +08:00
pengfei.zhou
931c06393e iOS:fix default gravity to be center 2020-05-06 15:13:00 +08:00
pengfei.zhou
87d9039b27 iOS:fix input show hintText 2020-05-06 15:13:00 +08:00
pengfei.zhou
fd762bac86 iOS:Input support maxLength 2020-05-06 15:13:00 +08:00
王劲鹏
0c6fa027b1 new DoricLayout bug fix 2020-04-30 18:52:28 +08:00
王劲鹏
2e9459f80f iOS: implements navbar set center 2020-04-30 18:52:28 +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
a23aa8df0f iOS:default set clipToBounds = YES 2020-04-27 18:58:41 +08:00
pengfei.zhou
57b5c7596b feat:when reload doriccontext,release the js resource 2020-04-27 16:03:16 +08:00
pengfei.zhou
cabb1b1f82 iOS:fix layouts error 2020-04-26 19:00:36 +08:00
pengfei.zhou
391060f72e iOS:When set doriccontext's vc,toast will show on it 2020-04-26 11:22:23 +08:00
pengfei.zhou
cffb3fb0e9 iOS:Change the behaviour only in VLayout and HLayout and Stack 2020-04-26 09:48:03 +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
王劲鹏
d32f714050 change destroy order 2020-04-22 13:56:14 +08:00
pengfei.zhou
a1c0e8e30c iOS:fix when reuse viewnode,gradientColor display none 2020-04-22 13:42:33 +08:00
pengfei.zhou
aa368d2e4b iOS:update js property 2020-04-22 13:09:24 +08:00
wangwang
5c1714c15b Update DoricModalPlugin.m
iOS的Alert风格是,左边“取消”,右边“确定”
2020-04-22 13:05:34 +08:00
pengfei.zhou
2821d42ebd iOS:fix when DoricContext is nil 2020-04-22 11:40:54 +08:00
pengfei.zhou
bce9350959 iOS:fetch batchedItems move to previous until not empty 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
2541a13d74 iOS:DoricContext add vc 2020-04-21 20:38:08 +08:00
pengfei.zhou
d4bf1245dd iOS:fix missing call of requestLayout 2020-04-21 11:14:31 +08:00
pengfei.zhou
c56c58423b iOS:fix layout error 2020-04-21 11:13:06 +08:00
pengfei.zhou
f6ce6843e3 iOS:fix Image async load in FlexLayout 2020-04-20 20:50:32 +08:00
pengfei.zhou
2c2d3e4113 iOS:fix timer invalid 2020-04-20 15:14:41 +08:00
pengfei.zhou
de9b96c490 iOS:add protection for SIGSEGV 2020-04-20 11:53:16 +08:00
王劲鹏
4ef508d3a7 align userinfo access in js thread 2020-04-20 11:43:51 +08:00
pengfei.zhou
4376e37836 iOS:fix Collection <__NSDictionaryM: XX> was mutated while being enumerated 2020-04-20 09:37:31 +08:00
王劲鹏
bc8e815b05 strong context 2020-04-18 18:19:00 +08:00
王劲鹏
4c18171a2b change px to proportion 2020-04-17 17:01:10 +08:00
王劲鹏
36eaf35cd0 iOS: add stretch inset dictionary 2020-04-17 17:01:10 +08:00
王劲鹏
afff5b9be0 add scale 2020-04-17 17:01:10 +08:00
王劲鹏
5d85bc86d1 iOS: implement stretchInset for ImageNode 2020-04-17 17:01:10 +08:00
pengfei.zhou
357fbd8e66 iOS:Base64 image add scale 2020-04-17 12:07:44 +08:00
pengfei.zhou
5dd4724e3c iOS:Text Font cannot be applied propertily 2020-04-15 19:10:46 +08:00
pengfei.zhou
6f89cf440b iOS:subviews in flexnode cannot be applied 2020-04-15 19:10:46 +08:00
pengfei.zhou
5d306bbf67 iOS:fix yoga layout when is leaf,cause assertion 2020-04-15 19:10:46 +08:00
pengfei.zhou
380673ef03 iOS:fix getLocationOnScreen 2020-04-15 16:38:17 +08:00
pengfei.zhou
9e0b3e067b feat:Text add htmlText 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
5a8a855f89 iOS:Fix nested use of FlexLayout 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
34ff0ea7d9 Revert "iOS:move yoga transform to DoricViewNode"
This reverts commit 6bcc6d014c.
2020-04-11 13:40:34 +08:00
pengfei.zhou
4f2802a55c fix header problem 2020-04-11 13:40:34 +08:00
pengfei.zhou
71154ad640 remove flexSlider 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
4e537eed47 add flexscroller 2020-04-11 13:02:16 +08:00
pengfei.zhou
6bcc6d014c iOS:move yoga transform to DoricViewNode 2020-04-11 13:02:16 +08:00
pengfei.zhou
4ea7683003 iOS:add minWidth and minHeight for DoricLayout 2020-04-11 13:02:16 +08:00
pengfei.zhou
c70e1cb20c upodate flexnode settings 2020-04-11 13:02:16 +08:00
pengfei.zhou
b266fdaa20 iOS:fix when LayoutSpec.MOST and weight both setted 2020-04-10 16:17:37 +08:00
pengfei.zhou
ada2380b95 iOS:update project setting,resolve C++ compile problem 2020-04-10 14:35:21 +08:00
pengfei.zhou
d5208c9d9e update DoricCore dependency 2020-04-10 14:35:21 +08:00
pengfei.zhou
89333e2252 iOS:keep iOS behavior align to android 2020-04-10 14:35:21 +08:00
pengfei.zhou
6f09341723 iOS:add FlexLayoutNode 2020-04-10 14:35:21 +08:00
pengfei.zhou
404b4b594f add ts define 2020-04-10 14:35:21 +08:00
pengfei.zhou
dd06675253 add yoga dependency 2020-04-10 14:35:21 +08:00
pengfei.zhou
34bb6cc391 iOS:fix coordinator cannot change view layout 2020-04-10 11:44:37 +08:00
王劲鹏
f8a5e29c83 iOS: add loop in slider 2020-04-10 11:08:39 +08:00
pengfei.zhou
ab11ee3372 iOS:use image to implement gradient background color 2020-04-09 13:32:14 +08:00
pengfei.zhou
410c01ba1c iOS:avoid requestLayout before blend finished 2020-04-09 13:32:14 +08:00
pengfei.zhou
c7f3f74b69 iOS:fix weight problem 2020-04-09 13:32:14 +08:00
pengfei.zhou
5d3ef0edb5 iOS:fix draggable 2020-04-08 20:33:20 +08:00
pengfei.zhou
84d19230e4 iOS:avoid reset margin while prop is nil 2020-04-08 20:33:20 +08:00
pengfei.zhou
8e6b4dd024 iOS:fix NestedScroll 2020-04-08 20:33:20 +08:00
pengfei.zhou
a9608506f5 iOS:fix Transform situation when apply layout 2020-04-08 20:33:20 +08:00
pengfei.zhou
f530256d05 iOS:fix slider requestLayout 2020-04-08 20:33:20 +08:00
pengfei.zhou
8b66c7d4be iOS:fix popover view 2020-04-08 20:33:20 +08:00
pengfei.zhou
7f26910f0c iOS:when measure child ,remove margin 2020-04-08 20:33:20 +08:00
pengfei.zhou
317cd115ab iOS:fix ImageNode requestLayout 2020-04-08 20:33:20 +08:00
pengfei.zhou
e689d52f26 iOS:DoricLayout use marginLeft and marginTop instead of x or y 2020-04-08 20:33:20 +08:00
pengfei.zhou
2a7c7bd27d iOS:fix Refreshable cannot sizeToFit 2020-04-08 20:33:20 +08:00
pengfei.zhou
277a49ed49 iOS:fix animate plugin 2020-04-08 20:33:20 +08:00
pengfei.zhou
5babfb4c9c iOS:fix Refreshable 2020-04-08 20:33:20 +08:00
pengfei.zhou
b17ff48c59 iOS:refact requestLayout logic 2020-04-08 20:33:20 +08:00
pengfei.zhou
95d9158fac iOS:fix Flowlayout loadmore then cell's framesize set to zero 2020-04-08 20:33:20 +08:00
pengfei.zhou
49df8d4970 iOS:fix FlowLayout show 2020-04-08 20:33:20 +08:00
pengfei.zhou
e4e5103d7b iOS:fix GradientLayer 2020-04-08 20:33:20 +08:00
pengfei.zhou
f3c8d1be31 iOS:fix Slider and rotation 2020-04-08 20:33:20 +08:00
pengfei.zhou
102f570fb4 iOS:fix List 2020-04-08 20:33:20 +08:00
pengfei.zhou
eb78e3e201 iOS:fix Scroller 2020-04-08 20:33:20 +08:00
pengfei.zhou
2e0bbcfb89 iOS:UIImageView resize when one dimension is just or most,anothor is fit. 2020-04-08 20:33:20 +08:00
pengfei.zhou
870a7e74af iOS:implement MaxWidth and MaxHeight 2020-04-08 20:33:20 +08:00
pengfei.zhou
91787fb0af iOS:DoricLayout add weight support 2020-04-08 20:33:20 +08:00
pengfei.zhou
abbe0ba377 iOS refact DoricLayout 2020-04-08 20:33:20 +08:00
pengfei.zhou
ca6a3284f2 refact some code 2020-04-08 20:33:20 +08:00
pengfei.zhou
78d4f51314 navigator add openUrl 2020-04-01 18:00:04 +08:00
pengfei.zhou
3bbf671420 feat:Image localRes and base64 support animation image 2020-04-01 14:15:01 +08:00
pengfei.zhou
a2653711f8 iOS:fix when reblend groupNode,subviews will not be created properly 2020-03-31 11:08:22 +08:00
pengfei.zhou
050dfc46ae iOS:Fix onFrameChangedCallback not functional right 2020-03-28 12:04:37 +08:00
pengfei.zhou
2f0f0494df feat:devkit connect directly 2020-03-28 12:04:37 +08:00
pengfei.zhou
0516ad0f5a iOS:fix localPath cannot load animated image 2020-03-27 16:08:36 +08:00
pengfei.zhou
438f729ec6 iOS:Change DoricGravity enum name 2020-03-27 10:08:54 +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
61c74e1c25 iOS:fix crash for command view 2020-03-25 19:33:00 +08:00
pengfei.zhou
1f1ef17ca7 iOS:remove unused reloadData 2020-03-25 15:05:50 +08:00
pengfei.zhou
d088e30f38 iOS:Text's max width and max height can only be affected while >0 2020-03-25 15:05:50 +08:00
pengfei.zhou
139a8775d4 android:add JSDispatcher to optimize scrollchange callback 2020-03-25 15:05:50 +08:00
pengfei.zhou
2b7ff95de6 iOS:use JSDispatcher to avoid overstock too many js tasks 2020-03-25 15:05:50 +08:00
pengfei.zhou
90e494222d add text lineSpacing 2020-03-24 16:25:14 +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
2046baa23d feat:fix command view cannot find view,let find on UI Thread 2020-03-23 13:38:11 +08:00
pengfei.zhou
7408d9cfed iOS:fix gradiantlayer frame nil 2020-03-23 13:38:11 +08:00
pengfei.zhou
9335df620f iOS:fix memory leak 2020-03-21 19:14:44 +08:00
pengfei.zhou
29402662ef iOS avoid set frame twice 2020-03-21 19:14:44 +08:00
pengfei.zhou
201278629a iOS:Gravity and Margin shold affect at the same time 2020-03-21 19:14:44 +08:00
pengfei.zhou
e9d8018a09 feat:DevKit add disconnect action 2020-03-21 19:14:44 +08:00
pengfei.zhou
4d6884098c iOS:fix NSNull Crash 2020-03-21 19:14:44 +08:00
pengfei.zhou
3eda0358d1 iOS:fix when set weight error 2020-03-21 19:14:44 +08:00
pengfei.zhou
2b62e8bd3b feat:adjust the inject timing of panel's initData 2020-03-19 15:36:23 +08:00
王劲鹏
c8f9e7dd33 iOS: notch plugin implementation 2020-03-19 15:11:57 +08:00
王劲鹏
ef0e53a7ac iOS: hasNotch implements 2020-03-19 15:11:57 +08:00
王劲鹏
dad9dd7e9e iOS: devkit log 2020-03-18 20:09:41 +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
pengfei.zhou
38ea6ea7d4 iOS:fix cannot change rootView's layoutconfig or size 2020-03-13 19:38:39 +08:00
pengfei.zhou
e13d926b6c iOS:disable scrollview's adjust contentInset 2020-03-13 19:38:39 +08:00
pengfei.zhou
6cf0f4603e iOS:fix text cannot apply padding properly 2020-03-13 19:38:39 +08:00
王劲鹏
c1f4805444 iOS: add gradient background for view node 2020-03-13 19:08:49 +08:00
王劲鹏
49854cc825 add iOS 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
8db0e8e9f9 iOS:fix blur view cannot be filled 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
ddab261d00 iOS:dont throw exception while debuging 2020-03-09 14:13:08 +08:00
pengfei.zhou
2f93bd6533 iOS:set js exception to nil before throw NSException 2020-03-09 14:13:08 +08:00
pengfei.zhou
3b0a245129 feat:Android and iOS monitor use DoricContext as parameter 2020-03-07 10:41:25 +08:00
pengfei.zhou
5a956950bd iOS:js error format 2020-03-07 10:41:25 +08:00
pengfei.zhou
db1e1279e3 iOS:fix cannot find onDrag error 2020-03-07 10:41:25 +08:00
pengfei.zhou
5053262dd5 feat:add PlcaeHolder and Error setting for Image 2020-03-05 12:53:56 +08:00
pengfei.zhou
e7ac263921 iOS:add onScrollEnd 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
0fa121e54f feat:optimize iOS Transform setting 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
ff84738e03 iOS:do not show scroller indicator 2020-03-03 12:00:24 +08:00
pengfei.zhou
3e2a2038c7 feat:fix scroller sizetofit error 2020-03-03 12:00:24 +08:00
pengfei.zhou
b6eba02496 iOS:Fix padding calculate error 2020-03-03 12:00:24 +08:00
pengfei.zhou
67f27bf367 iOS:fix space error when no child 2020-03-03 12:00:24 +08:00
pengfei.zhou
3ce9d7b69b iOS:fix demo crash 2020-03-03 12:00:24 +08:00
pengfei.zhou
7d2553726d feat:dont show es5 bundle in demo 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
d49f6274f2 feat:for reloading add "__dev__" case 2020-02-29 10:27:44 +08:00
pengfei.zhou
4ca1ba63e6 iOS:fix DoricPromise and DoricContext cycle reference causememory leak 2020-02-28 18:42:03 +08:00
pengfei.zhou
a2f2e74380 iOS:optimize API 2020-02-28 18:42:03 +08:00
pengfei.zhou
1a754b2558 fix publish error 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
pengfei.zhou
03e5376909 iOS:fix sync in main thread 2020-02-27 17:24:40 +08:00
pengfei.zhou
c0c9252fc1 iOS:optimize code 2020-02-27 17:24:40 +08:00
pengfei.zhou
99dd7f9231 iOS:get environment information in main thread 2020-02-27 17:24:40 +08:00
王劲鹏
a5f122b627 remove reInit method 2020-02-27 17:24:22 +08:00
王劲鹏
9764e720fc function complete 2020-02-27 17:24:22 +08:00
王劲鹏
f9f48d9c8a add doric dev vc 2020-02-27 17:24:22 +08:00
王劲鹏
3766c603ba remove debug driver singleton 2020-02-27 17:24:22 +08:00
王劲鹏
d215926387 add different jse in core & devkit pods 2020-02-27 17:24:22 +08:00
王劲鹏
3facc3fdee code refactor 2020-02-27 17:24:22 +08:00
王劲鹏
23b0f93e89 add doric dev kit ios pod 2020-02-27 17:24:22 +08:00
王劲鹏
1d93d5db39 javaValues -> values 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
b1cd69437a iOS:fix crash when source is nil 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
ef2e27f271 iOS:when set corner,apply clipToBounds to yes 2020-02-22 14:14:01 +08:00
pengfei.zhou
3e3e8266d4 iOS:fix when set view's hidden status cannot trigger superview's relayout 2020-02-22 14:14:01 +08:00
pengfei.zhou
3198e6145d iOS:fix iOS DoricLibrary init error 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
6bf61b3769 feat:iOS implement coordinator plugin 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
565998c763 iOS:add ScrollViewDelegate for scroller,list and flowlayout 2020-02-13 22:25:13 +08:00
pengfei.zhou
4363ef17eb feat:add statusBarHeight in Environment 2020-01-21 15:34:02 +08:00
pengfei.zhou
5a68f10cb5 iOS:DoricViewController add loadingView and errorView 2020-01-19 18:26:36 +08:00
pengfei.zhou
c813787318 iOS:Fix List crash on iOS 9.0 2020-01-17 16:51:46 +08:00
pengfei.zhou
7f089b6bcd compat es5 2020-01-17 16:51:46 +08:00
pengfei.zhou
8ed3c42d3a iOS:use es5 lib when under iOS 10 2020-01-17 16:51:46 +08:00
pengfei.zhou
c92435f1e0 Text add fontStype property 2020-01-15 09:55:48 +08:00
王劲鹏
73c06373ad iOS status bar api implement 2020-01-14 19:09:48 +08:00
pengfei.zhou
caea154377 iOS:add monitor 2020-01-11 11:05:34 +08:00
王劲鹏
26d32d788e implement iOS navbar custom left & right view 2020-01-10 17:45:01 +08:00
pengfei.zhou
50147329a4 iOS:Environment support customize 2020-01-10 15:11:56 +08:00
王劲鹏
7378ce8449 iOS 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
王劲鹏
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
pengfei.zhou
31cfdd239f iOS use DoricViewController 2019-12-23 19:38:49 +08:00
Shawn
78e8e47ad7 Feature/master fix path error (#3)
* fix:fix minimum example version

* fix:add target version in example podfile

* fix:change example js source path
2019-12-23 16:48:21 +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
bde3315b2d iOS:change relative path 2019-12-22 00:43:20 +08:00
pengfei.zhou
c30ffc5893 fix merge missing 2019-12-21 23:35:51 +08:00
pengfei.zhou
8fa2b69e5a Merge branch 'iOS_master' into combine 2019-12-21 23:09:37 +08:00
pengfei.zhou
98b3d419ff rename dir 2019-12-21 23:01:45 +08:00
pengfei.zhou
2a0b33151b rename dirs 2019-12-21 20:14:23 +08:00