添加更新版本与清除缓存的对话框；认证界面优化

app/build.gradle

@@ -65,7 +65,7 @@ android {
     }
     productFlavors {
         sheeptest {
-            applicationId "com.sheep.jiuyan.samllsheep.test"
+            applicationId "com.sheep.jiuyan.samllsheep"
             manifestPlaceholders = [DUANDUAN_GRAPH     : "sheeptest",
                                     DUANDUAN_DATASHARE : "sheeptest",
                                     jpush_appkey       : "4fea09bdbf9661a9689ee306",
@@ -73,6 +73,7 @@ android {
             ]
             buildConfigField "String", "DUANDUAN_DATASHARE", '"sheeptest"'
             buildConfigField "String", "DUANDUAN_GRAPH", '"sheeptest"'
+            buildConfigField "String", "app_name", '"小绵羊测试"'
             buildConfigField "boolean", "XXTEA_ENCRYPT", 'true'
             buildConfigField "String", "API_DOMAIN", '"app.ss.kfzs.com"'
             signingConfig signingConfigs.config
@@ -86,6 +87,7 @@ android {
             ]
             buildConfigField "String", "DUANDUAN_DATASHARE", '"sheep"'
             buildConfigField "String", "DUANDUAN_GRAPH", '"sheep"'
+            buildConfigField "String", "app_name", '"小绵羊"'
             buildConfigField "boolean", "XXTEA_ENCRYPT", 'true'
             buildConfigField "String", "API_DOMAIN", '"app.ss.kfzs.com"'
             signingConfig signingConfigs.config

app/src/main/java/com/kfzs/duanduan/fragment/FgtPersonalCenter.java

@@ -16,6 +16,7 @@ import com.kfzs.duanduan.BaseCompatFragment;
 import com.kfzs.duanduan.utils.ApkUtils;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.entity.Ext;
 import com.sheep.gamegroup.model.entity.FriendAndAwardEntity;
 import com.sheep.gamegroup.model.entity.UserEntity;
@@ -133,8 +134,9 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                             LogUtil.println("baseMessage onError " + JSON.toJSONString(baseMessage));
                         }
                     });
-        if(ConnectAddress.sheepxiexing.isThisService())
-            getVersionInfo();
+        String appVersonName = ApkUtils.getCurrentPkgVersionName(SheepApp.getInstance());
+        version_item_tv.setText("小绵羊V");
+        version_item_tv.append(appVersonName);
         getShardData();
         initCacheSize();
 
@@ -145,26 +147,7 @@ public class FgtPersonalCenter extends BaseCompatFragment {
         clear_item_tv.setText(TextUtils.isEmpty(size) || TextUtils.equals("0K",size) ? "无需清理" : size);
     }
 
-    private VersionInfo versionInfo;
-
-    private void loadVersionInfo() {
-        if(version_item_tv == null){
-            return;
-        }
-        String appVersonName = ApkUtils.getCurrentPkgVersionName(SheepApp.getInstance());
-        String serviceVersionName;
-        if (versionInfo == null || TextUtils.isEmpty(serviceVersionName = versionInfo.getVersion_number())) {
-            version_item_tv.setText("小绵羊");
-            version_item_tv.append(appVersonName);
-        } else {
-            version_item_tv.setText(TextUtils.equals(appVersonName, serviceVersionName) ? "" : "有新版本：");
-            version_item_tv.append("小绵羊");
-            version_item_tv.append(serviceVersionName);
-        }
-    }
-
-    private void getVersionInfo() {
-        version_item_tv.setText("");
+    private void showVersionInfo() {
         SheepApp.getInstance().getNetComponent().getApiService().getVersionInfo("")
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -173,16 +156,30 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                     public void onNext(BaseMessage baseMessage) {
                         LogUtil.println("baseMessage onNext " + JSON.toJSONString(baseMessage));
                         VersionInfo newVersionInfo = baseMessage.getData(VersionInfo.class);
-                        if (newVersionInfo != null) {
-                            versionInfo = newVersionInfo;
+                        if(newVersionInfo == null){
+                            G.showToast(baseMessage);
+                            return;
+                        }
+                        DialogConfig dialogConfig = new DialogConfig().setTitle("小绵羊V"+newVersionInfo.getVersion_number());
+                        String appVersonName = ApkUtils.getCurrentPkgVersionName(SheepApp.getInstance());
+                        if(TextUtils.equals(newVersionInfo.getVersion_number(), appVersonName)){//已经是最新版本
+                            dialogConfig.setMsg("当前版本为最新版本，无需更新");
+                        } else {//有新版本
+                            dialogConfig.setMsg("当前版本小绵羊V"+appVersonName).setBtnRightText("下次更新")
+                                    .setBtnLeftText("立即更新").setBtnLeftOnClickListener(new View.OnClickListener() {
+                                @Override
+                                public void onClick(View view) {
+                                    Beta.checkUpgrade();//检查版本号
+                                }
+                            });
                         }
-                        loadVersionInfo();
+                        ViewUtil.showMsgDialog(getActivity(), dialogConfig);
                     }
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
                         LogUtil.println("baseMessage onError " + JSON.toJSONString(baseMessage));
-                        loadVersionInfo();
+                        G.showToast(baseMessage);
                     }
                 });
     }
@@ -263,12 +260,6 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                 break;
             case R.id.abourt_us_layout://关于我们
                 Jump2View.getInstance().goNewAboutUs(getActivity());
-//                Jump2View.getInstance()
-//                        .goWebview(
-//                                getActivity(),
-//                                new WebviewEntity(
-//                                        1,
-//                                        "关于我们"));
                 break;
             case R.id.feedbook_layout://意见反馈
                 Jump2View.getInstance()
@@ -281,20 +272,25 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                 }
                 break;
             case R.id.version_layout://版本更新
-                Beta.checkUpgrade();//检查版本号
+                showVersionInfo();
                 break;
             case R.id.clear_layout://清除缓存
-                SysAppUtil.clearCache(new Action1<Object>() {
-                    @Override
-                    public void call(Object o) {
-                        G.showToast("清理缓存完成");
-                        initCacheSize();
-                    }
-                });
+                ViewUtil.showMsgDialog(getActivity(), new DialogConfig().setTitle("清除缓存").setMsg("所有本地的缓存都会被清理").setBtnRightText("取消")
+                .setBtnLeftText("确定").setBtnLeftOnClickListener(new View.OnClickListener() {
+                            @Override
+                            public void onClick(View view) {
+                                SysAppUtil.clearCache(new Action1<Object>() {
+                                    @Override
+                                    public void call(Object o) {
+                                        G.showToast("清理缓存完成");
+                                        initCacheSize();
+                                    }
+                                });
+                            }
+                        }));
                 break;
             case R.id.change_layout://新功能介绍
-                if(ConnectAddress.sheepxiexing.isThisService())
-                    Jump2View.getInstance().goVersionChange(getActivity(), ApkUtils.getCurrentPkgVersionName(SheepApp.getInstance()));
+                Jump2View.getInstance().goVersionChange(getActivity(), ApkUtils.getCurrentPkgVersionName(SheepApp.getInstance()));
                 break;
             case R.id.tv_submit://注销
                 CommonUtil.getInstance()

app/src/main/java/com/sheep/gamegroup/util/TestUtil.java

@@ -230,7 +230,7 @@ public class TestUtil {
                                 break;
                             case "提交身份认证时的提示":
                                 ViewUtil.showMsgDialog(activity, new DialogConfig().setTitle("重要提示").setMsgMore(String.format(Locale.CHINA,"你已执行%d次实名认证操作", 0))
-                                        .setMsg("实名认证首次免费。请务必确认您所提交的认证信息真实有效。若因信息填写错误造成认证失败。再次申请认证时需扣除您0.5元绵阳币作为认证费用，请务必谨慎填写认证信息。")
+                                        .setMsg("实名认证首次免费。请务必确认您所提交的认证信息真实有效。若因信息填写错误造成认证失败。再次申请认证时需扣除您0.5元绵羊币作为认证费用，请务必谨慎填写认证信息。")
                                         .setBtnLeftText("返回修改").setBtnRightText("确认提交")
                                         .setBtnRightOnClickListener(new View.OnClickListener() {
                                             @Override

app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java

@@ -7,6 +7,7 @@ import android.graphics.Bitmap;
 import android.media.MediaPlayer;
 import android.net.Uri;
 import android.provider.MediaStore;
+import android.support.v4.app.FragmentActivity;
 import android.support.v7.app.AlertDialog;
 import android.text.Html;
 import android.text.TextUtils;
@@ -32,6 +33,7 @@ import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import com.sheep.jiuyan.samllsheep.utils.G;
+import com.tencent.bugly.beta.Beta;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -491,4 +493,5 @@ public class ViewUtil {
         }
 
     }
+
 }

app/src/main/java/com/sheep/gamegroup/view/activity/RealNameAuthenAct.java

@@ -122,8 +122,7 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
                     et_bank_mobile.setEnabled(false);
                 }
                 if (count >= 4) {
-                    tvSubmit.setEnabled(false);
-                    tvSubmit.setBackgroundColor(getResources().getColor(R.color.txt_black_9e9c9c));
+                    tvSubmit.setVisibility(View.GONE);
                 } else {
                     DialogRealNameAuther.showDialog(this);
                 }
@@ -137,7 +136,7 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
     @Override
     public void NetSuccess(int code, String msg, String s) {
         hideProgress();
-        G.showToast(mEntity.getCertification_count() == 0 ? "认证信息已提交审核，请耐心等待" : "已成功扣除0.5元绵羊币，认证审核中");
+        G.showToast(msg);
         RealNameAutehrChange change = new RealNameAutehrChange();
         for (String key : map.keySet()) {
             if (key.equals("real_name") && !TextUtils.isEmpty(map.get(key))) {
@@ -277,11 +276,13 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
         map.put("bank_card_mobile", bankCardMobile);
 
         ViewUtil.showMsgDialog(this, new DialogConfig().setTitle("重要提示").setMsgMore(String.format(Locale.CHINA,"你已执行%d次实名认证操作",mEntity.getCertification_count()))
-                .setMsg("实名认证首次免费。请务必确认您所提交的认证信息真实有效。若因信息填写错误造成认证失败。再次申请认证时需扣除您0.5元绵阳币作为认证费用，请务必谨慎填写认证信息。")
+                .setMsg("实名认证首次免费。请务必确认您所提交的认证信息真实有效。若因信息填写错误造成认证失败。再次申请认证时需扣除您0.5元绵羊币作为认证费用，请务必谨慎填写认证信息。")
                 .setBtnLeftText("返回修改").setBtnRightText("确认提交")
                 .setBtnRightOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
+                        if(mEntity != null)
+                            mEntity.setCertification_count(mEntity.getCertification_count()+1);
                         presenter.getTask(map);
                         UMConfigUtils.onEvent(UMConfigUtils.Event.USER_AUTHENTICATION);
                     }

app/src/main/res/layout/x_msg_dialog.xml

@@ -13,7 +13,7 @@
         android:layout_marginBottom="@dimen/content_padding_20"
         android:lineSpacingExtra="2dp"
         android:text="内容"
-        android:gravity="start"
+        android:gravity="center"
         android:textColor="@color/black_text_deep"
         android:textSize="20sp" />
     <TextView