From ccad951174bbde78cd2270348b1820c81715c7cf Mon Sep 17 00:00:00 2001
From: 姚旭斌 <15805828761@163.com>
Date: Wed, 21 Mar 2018 16:41:33 +0800
Subject: [PATCH] no message

---
 app/src/main/AndroidManifest.xml                                                                    |  3 ---
 app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java                        |  7 -------
 app/src/main/java/com/shunzhi/parent/ui/activity/LoginAndRegistActivity.java                        | 11 +++++++++++
 app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java                     |  2 +-
 app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java                                  |  2 --
 app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java | 12 ++++++------
 6 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 805b3f7..9add6c7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -127,7 +127,6 @@
             <!--android:windowSoftInputMode="adjustPan|stateAlwaysHidden" />-->
         <activity
             android:name=".ui.activity.MyChildActivity"
-            android:launchMode="singleInstance"
             android:screenOrientation="portrait"/>
         <activity android:name=".ui.activity.consult.ConsultOneLevelActivity"/>
         <!-- <activity android:name=".ui.activity.LoginAndRegistActivity" /> -->
@@ -147,12 +146,10 @@
             android:windowSoftInputMode="adjustPan|stateHidden"/>
         <activity
             android:name=".ui.activity.binding.SelectSchoolActivity"
-            android:launchMode="singleInstance"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateHidden"/>
 
          <activity android:name=".ui.activity.LoginAndRegistActivity"
-             android:launchMode="singleInstance"
          android:screenOrientation="portrait"
          />
         <activity
diff --git a/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java
index 04f9d60..fde3352 100644
--- a/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java
+++ b/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java
@@ -1,8 +1,5 @@
 package com.shunzhi.parent.presenter.consult;
 
-import android.content.res.TypedArray;
-import android.util.Log;
-import android.util.TypedValue;
 import android.view.View;
 import android.widget.LinearLayout;
 
@@ -10,7 +7,6 @@ import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.share.mvpsdk.utils.OkHttpExceptionUtil;
-import com.share.mvpsdk.utils.ToastUtils;
 import com.shunzhi.parent.R;
 import com.shunzhi.parent.bean.GuangGaoBean;
 import com.shunzhi.parent.bean.ToolBean;
@@ -19,12 +15,9 @@ import com.shunzhi.parent.bean.channel.ChannelContextBean;
 import com.shunzhi.parent.bean.channel.ChannelInfo;
 import com.shunzhi.parent.contract.consult.ConsultContract;
 import com.shunzhi.parent.model.consult.ConsultModel;
-import com.shunzhi.parent.ui.activity.consult.ConsultOneLevelActivity;
 import com.shunzhi.parent.util.AttrsUtils;
 import com.shunzhi.parent.views.TextAndImgShowView;
 
-import org.json.JSONObject;
-
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/LoginAndRegistActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/LoginAndRegistActivity.java
index e694b24..5a436da 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/LoginAndRegistActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/LoginAndRegistActivity.java
@@ -1,6 +1,7 @@
 package com.shunzhi.parent.ui.activity;
 
 import android.os.Bundle;
+import android.util.Log;
 
 import com.share.mvpsdk.base.activity.BaseCompatActivity;
 import com.shunzhi.parent.R;
@@ -18,6 +19,7 @@ public class LoginAndRegistActivity extends BaseCompatActivity {
     protected void initView(Bundle savedInstanceState) {
         if (savedInstanceState == null) {
             type = getIntent().getStringExtra("type");
+            Log.e("aaa--==",type);
             mFragments[0] = LoginAndRegistFragment.getInstance(type);
             loadRootFragment(R.id.frame, mFragments[0]);
         } else {
@@ -26,6 +28,15 @@ public class LoginAndRegistActivity extends BaseCompatActivity {
     }
 
     @Override
+    protected void onResume() {
+        super.onResume();
+//        type = getIntent().getStringExtra("type");
+//        Log.e("aaa--==",type);
+//        mFragments[0] = LoginAndRegistFragment.getInstance(type);
+//        loadRootFragment(R.id.frame, mFragments[0]);
+    }
+
+    @Override
     protected int getLayoutId() {
         return R.layout.activity_regist;
     }
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java
index 28a5d00..c4cd985 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java
@@ -102,7 +102,7 @@ public class CheckInfoActivity extends BaseMVPCompatActivity<MyChildContract.MyC
                 @Override
                 public void onClick(View v) {
                     popupWindow.dismiss();
-                    startActivity(new Intent().setFlags(Intent.FLAG_ACTIVITY_NEW_TASK|Intent.FLAG_ACTIVITY_CLEAR_TASK).setClass(CheckInfoActivity.this, MyChildActivity.class));
+                    startActivity(new Intent().setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP).setClass(CheckInfoActivity.this, MyChildActivity.class));
                     finish();
                 }
             });
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 b82f864..a8332e9 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
@@ -11,9 +11,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.bumptech.glide.Glide;
 import com.makeramen.roundedimageview.RoundedImageView;
-import com.netease.nimlib.sdk.NIMClient;
 import com.share.mvpsdk.base.BasePresenter;
 import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
 import com.share.mvpsdk.utils.CacheUtils;
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java
index e363d35..a6d19a6 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java
@@ -126,12 +126,12 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegist
             back_login.setVisibility(View.VISIBLE);
         }
 
-        roundedImageView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                mPresenter.loginResult("18358575337", "575337");
-            }
-        });
+//        roundedImageView.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                mPresenter.loginResult("18358575337", "575337");
+//            }
+//        });
     }
 
 
--
libgit2 0.21.0