Commit 22a74751dc2271c793a189b1cd8a8014f5e4b683
1 parent
ce0a88ea
Exists in
yxb_dev
and in
2 other branches
no message
Showing
3 changed files
with
16 additions
and
5 deletions
Show diff stats
app/src/main/AndroidManifest.xml
| @@ -67,9 +67,14 @@ | @@ -67,9 +67,14 @@ | ||
| 67 | 67 | ||
| 68 | 68 | ||
| 69 | <!-- 家长慧测试APPkey --> | 69 | <!-- 家长慧测试APPkey --> |
| 70 | + <!--<meta-data--> | ||
| 71 | + <!--android:name="com.netease.nim.appKey"--> | ||
| 72 | + <!--android:value="330158c080acdf4dc1092d6a74576c2c" />--> | ||
| 73 | + <!-- 家长慧正式APPkey --> | ||
| 74 | + | ||
| 70 | <meta-data | 75 | <meta-data |
| 71 | android:name="com.netease.nim.appKey" | 76 | android:name="com.netease.nim.appKey" |
| 72 | - android:value="330158c080acdf4dc1092d6a74576c2c" /> | 77 | + android:value="a1ff0bc08fa0d6f95b480d131e55584b" /> |
| 73 | <meta-data | 78 | <meta-data |
| 74 | android:name="android.max_aspect" | 79 | android:name="android.max_aspect" |
| 75 | android:value="2.1" /> | 80 | android:value="2.1" /> |
app/src/main/java/com/shunzhi/parent/AppConfig.java
| @@ -37,9 +37,15 @@ public class AppConfig { | @@ -37,9 +37,15 @@ public class AppConfig { | ||
| 37 | public static String APP_IS_START = "app_is_start"; | 37 | public static String APP_IS_START = "app_is_start"; |
| 38 | 38 | ||
| 39 | //http://campus.myjxt.com/ | 39 | //http://campus.myjxt.com/ |
| 40 | - public static String BASE_URL="http://60.190.202.57:1000/"; | ||
| 41 | - public static String BASE_URL_ORDER="http://60.190.202.57:8101/"; | ||
| 42 | - public static String BASE_URL_FILE="http://60.190.202.57:8196"; | 40 | +// public static String BASE_URL="http://60.190.202.57:1000/"; |
| 41 | +// public static String BASE_URL_ORDER="http://60.190.202.57:8101/"; | ||
| 42 | +// public static String BASE_URL_FILE="http://60.190.202.57:8196"; | ||
| 43 | + | ||
| 44 | + | ||
| 45 | + //正式 | ||
| 46 | + public static String BASE_URL="http://campus.myjxt.com/"; | ||
| 47 | + public static String BASE_URL_ORDER="http://parent.myjxt.com/"; | ||
| 48 | + public static String BASE_URL_FILE="http://manage.myjxt.com "; | ||
| 43 | 49 | ||
| 44 | 50 | ||
| 45 | //默认日志保存的路径 | 51 | //默认日志保存的路径 |
app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
| @@ -104,7 +104,7 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre | @@ -104,7 +104,7 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre | ||
| 104 | public void accept(JsonObject jsonObject) throws Exception { | 104 | public void accept(JsonObject jsonObject) throws Exception { |
| 105 | //TODO 注册成功返回 | 105 | //TODO 注册成功返回 |
| 106 | AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, adminName); | 106 | AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, adminName); |
| 107 | -// AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_PWD, password); | 107 | + AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_PWD, password); |
| 108 | mIView.getUserInfo(1); | 108 | mIView.getUserInfo(1); |
| 109 | } | 109 | } |
| 110 | }, new Consumer<Throwable>() { | 110 | }, new Consumer<Throwable>() { |