From 22a74751dc2271c793a189b1cd8a8014f5e4b683 Mon Sep 17 00:00:00 2001
From: 姚旭斌 <15805828761@163.com>
Date: Sat, 24 Mar 2018 12:33:28 +0800
Subject: [PATCH] no message

---
 app/src/main/AndroidManifest.xml                                                               |  7 ++++++-
 app/src/main/java/com/shunzhi/parent/AppConfig.java                                            | 12 +++++++++---
 app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java |  2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ff7eb0d..e03b275 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -67,9 +67,14 @@
 
 
         <!-- 家长慧测试APPkey -->
+        <!--<meta-data-->
+            <!--android:name="com.netease.nim.appKey"-->
+            <!--android:value="330158c080acdf4dc1092d6a74576c2c" />-->
+        <!-- 家长慧正式APPkey -->
+
         <meta-data
             android:name="com.netease.nim.appKey"
-            android:value="330158c080acdf4dc1092d6a74576c2c" />
+            android:value="a1ff0bc08fa0d6f95b480d131e55584b" />
         <meta-data
             android:name="android.max_aspect"
             android:value="2.1" />
diff --git a/app/src/main/java/com/shunzhi/parent/AppConfig.java b/app/src/main/java/com/shunzhi/parent/AppConfig.java
index 7c16f0d..c11981e 100644
--- a/app/src/main/java/com/shunzhi/parent/AppConfig.java
+++ b/app/src/main/java/com/shunzhi/parent/AppConfig.java
@@ -37,9 +37,15 @@ public class AppConfig {
     public static String APP_IS_START = "app_is_start";
 
     //http://campus.myjxt.com/
-    public static String BASE_URL="http://60.190.202.57:1000/";
-    public static String BASE_URL_ORDER="http://60.190.202.57:8101/";
-    public static String BASE_URL_FILE="http://60.190.202.57:8196";
+//    public static String BASE_URL="http://60.190.202.57:1000/";
+//    public static String BASE_URL_ORDER="http://60.190.202.57:8101/";
+//    public static String BASE_URL_FILE="http://60.190.202.57:8196";
+
+
+    //正式
+    public static String BASE_URL="http://campus.myjxt.com/";
+    public static String BASE_URL_ORDER="http://parent.myjxt.com/";
+    public static String BASE_URL_FILE="http://manage.myjxt.com ";
 
 
     //默认日志保存的路径
diff --git a/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
index 24d2c02..1f40538 100644
--- a/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
+++ b/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
@@ -104,7 +104,7 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
             public void accept(JsonObject jsonObject) throws Exception {
                 //TODO 注册成功返回
                 AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, adminName);
-//                AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_PWD, password);
+                AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_PWD, password);
                 mIView.getUserInfo(1);
             }
         }, new Consumer<Throwable>() {
--
libgit2 0.21.0