提交 c1846489 authored 作者: 吴强's avatar 吴强

Merge branch 'master' of ssh://192.168.1.116:29418/bolan-root/frontend/manager-app-sz into wq

# Conflicts: # android/app/src/main/java/com/bolanmanagerapp/MainApplication.java # src/utils/config.js
上级 12179a38
...@@ -43,7 +43,7 @@ public class MainApplication extends Application implements ReactApplication { ...@@ -43,7 +43,7 @@ public class MainApplication extends Application implements ReactApplication {
new CodePush(BuildConfig.CODEPUSH_KEY, getApplicationContext(), BuildConfig.DEBUG, "http://192.168.1.2:3000"), new CodePush(BuildConfig.CODEPUSH_KEY, getApplicationContext(), BuildConfig.DEBUG, "http://192.168.1.2:3000"),
new RNDeviceInfo(), new RNDeviceInfo(),
new IDCardReactPackage(), new IDCardReactPackage(),
//new UpdaterReactPackage(), new UpdaterReactPackage(),
new VectorIconsPackage(), new VectorIconsPackage(),
new SplashScreenReactPackage() new SplashScreenReactPackage()
); );
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论