陶汉栋 / ParentWork

Download as
Browse Code »

Commit b4a2cc2630d408954d55fc68b3c28e1aa03b47d1

Authored by 姚旭斌
2 parents d4f3a486 22a74751
Exists in yxb_dev and in 2 other branches developer, wwx

Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer

Showing 2 changed files with 7 additions and 2 deletions   Show diff stats
app/src/main/AndroidManifest.xml
  Diff comments   View file @b4a2cc2
... ... @@ -67,9 +67,14 @@
67 67  
68 68  
69 69 <!-- 家长慧测试APPkey -->
  70 + <!--<meta-data-->
  71 + <!--android:name="com.netease.nim.appKey"-->
  72 + <!--android:value="330158c080acdf4dc1092d6a74576c2c" />-->
  73 + <!-- 家长慧正式APPkey -->
  74 +
70 75 <meta-data
71 76 android:name="com.netease.nim.appKey"
72   - android:value="330158c080acdf4dc1092d6a74576c2c" />
  77 + android:value="a1ff0bc08fa0d6f95b480d131e55584b" />
73 78 <meta-data
74 79 android:name="android.max_aspect"
75 80 android:value="2.1" />
... ...
app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
  Diff comments   View file @b4a2cc2
... ... @@ -90,7 +90,7 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
90 90 public void accept(JsonObject jsonObject) throws Exception {
91 91 //TODO 注册成功返回
92 92 AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, adminName);
93   -// AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_PWD, password);
  93 + AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_PWD, password);
94 94 mIView.getUserInfo(1);
95 95 }
96 96 }, new Consumer<Throwable>() {
... ...