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

陶汉栋
2 parents 2c964317 3ad71d87
Showing 6 changed files with 25 additions and 5 deletions Show diff stats
app/build.gradle
app/proguard-rules.pro
app/src/main/java/com/shunzhi/parent/bean/message/PHMessage.java
app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
build.gradle
 apply plugin: 'com.android.application'
+apply plugin: 'org.greenrobot.greendao' // apply plugin
 android {
     signingConfigs {
@@ -43,4 +44,5 @@ dependencies {
     implementation project(':mvpsdk')
     implementation project(':roundedimageview-2.2.1')
     implementation files('libs/AMap_Location_V3.8.0_20180201.jar')
+    implementation 'org.greenrobot:greendao:3.2.2' // add library
 }
@@ -19,3 +19,10 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+-keepclassmembers class * extends org.greenrobot.greendao.AbstractDao {
+public static java.lang.String TABLENAME;
+}
+-keep class **$Properties
+
+# If you do not use SQLCipher:
+-dontwarn org.greenrobot.greendao.database.**
@@ -0,0 +1,8 @@
+package com.shunzhi.parent.bean.message;
+
+/**
+ * Created by 10501 on 2018/3/19.
+ */
+
+public class PHMessage  {
+}
@@ -46,13 +46,12 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
         mRxManager.register(mIModel.getLoginResult(loginName, loginPwd).subscribe(new Consumer<JsonObject>() {
             @Override
             public void accept(JsonObject jsonObject) throws Exception {
-                Timber.i("---=== loginResult :%s",jsonObject);
+                Timber.i("---=== loginResult :%s", jsonObject);
                 try {
                     if (jsonObject != null && !TextUtils.isEmpty(jsonObject.get("access_token").getAsString())) {
                         AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.ACCESS_TOKEN, jsonObject.get("access_token").getAsString());
                         AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, loginName);
                         AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_PWD, loginPwd);
-                        AppConfig.ISLOGIN = true;
                         RetrofitCreateHelper.getInstance().setAuthorization("Bearer " + jsonObject.get("access_token").getAsString());
                         getUserInfo(loginName, 0, "");
                     } else {
@@ -168,11 +167,14 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
         mRxManager.register(mIModel.nimLoginResult(account, password).subscribe(new Consumer<NIMLoginResultBean>() {
             @Override
             public void accept(NIMLoginResultBean bean) throws Exception {
-                if (bean.isSuccess())
+                if (bean.isSuccess()) {
+                    AppConfig.ISLOGIN = true;
                     mIView.getUserInfo(0);
+                }
             }
         }));
     }
+
     public void reSetpassResult(final String adminName, String idCode, String password) {
         mRxManager.register(mIModel.reSetpass(adminName, idCode, password).subscribe(new Consumer<JsonObject>() {
             @Override
@@ -61,7 +61,7 @@ public class MineFragment extends BaseMVPCompatFragment&lt;LoginAndRegisterContract
     }
-    private void setPersonInfo() {
+    private void  setPersonInfo() {
         if (AppConfig.ISLOGIN) {
             String url = AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_IMAGE);
             ToastUtils.showToast(url);
@@ -108,7 +108,6 @@ public class MineFragment extends BaseMVPCompatFragment&lt;LoginAndRegisterContract
             default:
                 break;
         }
-
     }
     private void clearUerinfo() {
@@ -5,9 +5,11 @@ buildscript {
     repositories {
         google()
         jcenter()
+        mavenCentral() // add repository
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'org.greenrobot:greendao-gradle-plugin:3.2.2' // add plugin
         // NOTE: Do not place your application dependencies here; they belong
	@@ -19,3 +19,10 @@		@@ -19,3 +19,10 @@
19	# If you keep the line number information, uncomment this to	19	# If you keep the line number information, uncomment this to
20	# hide the original source file name.	20	# hide the original source file name.
21	#-renamesourcefileattribute SourceFile	21	#-renamesourcefileattribute SourceFile
		22	+-keepclassmembers class * extends org.greenrobot.greendao.AbstractDao {
		23	+public static java.lang.String TABLENAME;
		24	+}
		25	+-keep class **$Properties
		26	+
		27	+# If you do not use SQLCipher:
		28	+-dontwarn org.greenrobot.greendao.database.**
@@ -0,0 +1,8 @@		@@ -0,0 +1,8 @@
	1	+package com.shunzhi.parent.bean.message;
	2	+
	3	+/**
	4	+ * Created by 10501 on 2018/3/19.
	5	+ */
	6	+
	7	+public class PHMessage {
	8	+}