Merge branch 'xhz_push' of http://git.quyaqu.com/xieshengqi/LoanMarket into xhz_push

app/build.gradle

@@ -15,8 +15,8 @@ android {
         applicationId "com.smileflowpig.money"
         minSdkVersion 19
         targetSdkVersion 28
-        versionCode 5
-        versionName "1.3.0"
+        versionCode 6
+        versionName "1.3.1"
         multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
@@ -95,7 +95,10 @@ android {
             buildConfigField 'String', 'CHANNLE', '"1003"'
         }
 
-
+        search360 {
+            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "4001"]
+            buildConfigField 'String', 'CHANNLE', '"4001"'
+        }
 
 
     }

app/src/main/java/com/smileflowpig/money/moneyplatfrom/activities/MyDatumActivity.java

@@ -48,9 +48,13 @@ public class MyDatumActivity extends PresenterActivity implements View.OnClickLi
         super.onCreate(savedInstanceState);
 
         initview();
-        myphone = getIntent().getStringExtra("myphone");
+        try {
+            myphone = getIntent().getStringExtra("myphone");
         String s = myphone.substring(0, 3) + "****" + myphone.substring(7, myphone.length());
         cardphone.setText(s);
+        }catch (Exception e){
+
+        }
 
     }
     public void initview(){

app/src/main/java/com/smileflowpig/money/moneyplatfrom/frags/main/state/NewMineFragment.java

@@ -152,14 +152,7 @@ public class NewMineFragment extends PresenterFragment<StateContract.Presenter>
     @Override
     protected void initWidget(View root) {
         super.initWidget(root);
-        if (LoginStatusUtil.isLogin()) {
-            //登录先显示缓存的
-            String nick = (String) SPUtil.get(getActivity(), com.smileflowpig.money.factory.Constant.UserInfo.NICK, "");
-            String icon_url = (String) SPUtil.get(getActivity(), com.smileflowpig.money.factory.Constant.UserInfo.ICONURL, "");
-            login.setText(nick);
-            Glide.with(getActivity()).load(icon_url).into(loginicon);
-            mPresenter.start();
-        }
+
 
     }
 
@@ -361,7 +354,17 @@ public class NewMineFragment extends PresenterFragment<StateContract.Presenter>
     @Override
     public void onResume() {
         super.onResume();
-
+        if (LoginStatusUtil.isLogin()) {
+            //登录先显示缓存的
+            String nick = (String) SPUtil.get(getActivity(), com.smileflowpig.money.factory.Constant.UserInfo.NICK, "");
+            String icon_url = (String) SPUtil.get(getActivity(), com.smileflowpig.money.factory.Constant.UserInfo.ICONURL, "");
+            login.setText(nick);
+            Glide.with(getActivity()).load(icon_url).into(loginicon);
+            mPresenter.start();
+        }else{
+            login.setText("注册/登录");
+            loginicon.setImageResource(R.mipmap.loginicon);
+        }
 
     }