From 0e9edef2b0dd448ade4ac720c29438cef8302557 Mon Sep 17 00:00:00 2001
From: 张道锋 <1050130019@qq.com>
Date: Mon, 19 Mar 2018 18:04:37 +0800
Subject: [PATCH] no message

---
 app/build.gradle                                                                               | 2 ++
 app/proguard-rules.pro                                                                         | 7 +++++++
 app/src/main/java/com/shunzhi/parent/bean/message/PHMessage.java                               | 8 ++++++++
 app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java | 8 +++++---
 app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java                             | 3 +--
 build.gradle                                                                                   | 2 ++
 6 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/java/com/shunzhi/parent/bean/message/PHMessage.java

diff --git a/app/build.gradle b/app/build.gradle
index 36b4dfa..ae8764c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,4 +1,5 @@
 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
 }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index f1b4245..b693699 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -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.**
diff --git a/app/src/main/java/com/shunzhi/parent/bean/message/PHMessage.java b/app/src/main/java/com/shunzhi/parent/bean/message/PHMessage.java
new file mode 100644
index 0000000..5498a55
--- /dev/null
+++ b/app/src/main/java/com/shunzhi/parent/bean/message/PHMessage.java
@@ -0,0 +1,8 @@
+package com.shunzhi.parent.bean.message;
+
+/**
+ * Created by 10501 on 2018/3/19.
+ */
+
+public class PHMessage  {
+}
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 a83009b..e06a9a8 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
@@ -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
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
index 3a5403b..8cd643d 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
@@ -59,7 +59,7 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
 
     }
 
-    private void setPersonInfo() {
+    private void  setPersonInfo() {
         if (AppConfig.ISLOGIN) {
             String url = AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_IMAGE);
             ToastUtils.showToast(url);
@@ -103,7 +103,6 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
             default:
                 break;
         }
-
     }
 
     @Override
diff --git a/build.gradle b/build.gradle
index 25e135d..9f6e9cc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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
--
libgit2 0.21.0