Procházet zdrojové kódy

提交1.3.1版本,修改bug

Xieshengqi %!s(int64=5) %!d(string=před) roky
rodič
revize
7a87c8d0bb

+ 6 - 3
app/build.gradle

@@ -15,8 +15,8 @@ android {
15 15
         applicationId "com.smileflowpig.money"
16 16
         minSdkVersion 19
17 17
         targetSdkVersion 28
18
-        versionCode 5
19
-        versionName "1.3.0"
18
+        versionCode 6
19
+        versionName "1.3.1"
20 20
         multiDexEnabled true
21 21
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
22 22
     }
@@ -95,7 +95,10 @@ android {
95 95
             buildConfigField 'String', 'CHANNLE', '"1003"'
96 96
         }
97 97
 
98
-
98
+        search360 {
99
+            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "4001"]
100
+            buildConfigField 'String', 'CHANNLE', '"4001"'
101
+        }
99 102
 
100 103
 
101 104
     }

+ 5 - 1
app/src/main/java/com/smileflowpig/money/moneyplatfrom/activities/MyDatumActivity.java

@@ -48,9 +48,13 @@ public class MyDatumActivity extends PresenterActivity implements View.OnClickLi
48 48
         super.onCreate(savedInstanceState);
49 49
 
50 50
         initview();
51
-        myphone = getIntent().getStringExtra("myphone");
51
+        try {
52
+            myphone = getIntent().getStringExtra("myphone");
52 53
         String s = myphone.substring(0, 3) + "****" + myphone.substring(7, myphone.length());
53 54
         cardphone.setText(s);
55
+        }catch (Exception e){
56
+
57
+        }
54 58
 
55 59
     }
56 60
     public void initview(){

+ 12 - 9
app/src/main/java/com/smileflowpig/money/moneyplatfrom/frags/main/state/NewMineFragment.java

@@ -152,14 +152,7 @@ public class NewMineFragment extends PresenterFragment<StateContract.Presenter>
152 152
     @Override
153 153
     protected void initWidget(View root) {
154 154
         super.initWidget(root);
155
-        if (LoginStatusUtil.isLogin()) {
156
-            //登录先显示缓存的
157
-            String nick = (String) SPUtil.get(getActivity(), com.smileflowpig.money.factory.Constant.UserInfo.NICK, "");
158
-            String icon_url = (String) SPUtil.get(getActivity(), com.smileflowpig.money.factory.Constant.UserInfo.ICONURL, "");
159
-            login.setText(nick);
160
-            Glide.with(getActivity()).load(icon_url).into(loginicon);
161
-            mPresenter.start();
162
-        }
155
+
163 156
 
164 157
     }
165 158
 
@@ -365,7 +358,17 @@ public class NewMineFragment extends PresenterFragment<StateContract.Presenter>
365 358
     @Override
366 359
     public void onResume() {
367 360
         super.onResume();
368
-
361
+        if (LoginStatusUtil.isLogin()) {
362
+            //登录先显示缓存的
363
+            String nick = (String) SPUtil.get(getActivity(), com.smileflowpig.money.factory.Constant.UserInfo.NICK, "");
364
+            String icon_url = (String) SPUtil.get(getActivity(), com.smileflowpig.money.factory.Constant.UserInfo.ICONURL, "");
365
+            login.setText(nick);
366
+            Glide.with(getActivity()).load(icon_url).into(loginicon);
367
+            mPresenter.start();
368
+        }else{
369
+            login.setText("注册/登录");
370
+            loginicon.setImageResource(R.mipmap.loginicon);
371
+        }
369 372
 
370 373
     }
371 374