Parcourir la source

1、修改版本更新逻辑

LAPTOP-AMA5TPO8\zhongyi il y a 4 ans
Parent
commit
4220f22b0a

+ 36 - 31
app/src/main/java/com/zy/bvvm/ui/My/MyFragment.java

@@ -4,12 +4,14 @@ import android.app.Dialog;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.os.Looper;
 import android.os.Message;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
@@ -64,8 +66,12 @@ public class MyFragment extends MyLazyFragment<HomeActivity> {
     SettingBar my_sb_information;
     @BindView(R.id.sb_setting_explain)
     SettingBar sb_setting_explain;
+    @BindView(R.id.sb_setting_abouts)
+    SettingBar settingBar;
 
     String switch_state = "close";
+    int verson_code = 0;
+    String verson_name = "";
 
 
     private List<String> logOutList = new ArrayList<>();
@@ -86,7 +92,20 @@ public class MyFragment extends MyLazyFragment<HomeActivity> {
 
     @Override
     protected void initView() {
+        //本地版本信息
+        PackageManager packageManager = Objects.requireNonNull(getActivity()).getPackageManager();
+        PackageInfo info = null;
+
+        try {
+            info = packageManager.getPackageInfo(getActivity().getPackageName(), 0);
+            verson_code = info.versionCode;
+            verson_name = info.versionName.toString();
+//            tv_sb_versioninfo.text = "V$verson_name"
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
+        settingBar.setRightText("V " + verson_name);
     }
 
     @Override
@@ -128,7 +147,7 @@ public class MyFragment extends MyLazyFragment<HomeActivity> {
     }
 
     @OnClick(value = {R.id.my_img_head, R.id.my_sb_information, R.id.sb_setting_explain, R.id.sb_setting_about, R.id.my_btn_exit,
-            R.id.sb_vaccinate_people, R.id.iv_switch_close, R.id.sb_privacy_agreement1,R.id.sb_privacy_agreement2, R.id.iv_title_return,
+            R.id.sb_vaccinate_people, R.id.iv_switch_close, R.id.sb_privacy_agreement1, R.id.sb_privacy_agreement2, R.id.iv_title_return,
             R.id.sb_setting_abouts})
     public void onViewClicked(View view) {
         switch (view.getId()) {
@@ -170,7 +189,7 @@ public class MyFragment extends MyLazyFragment<HomeActivity> {
                 //关于
                 startActivity(AboutActivity.class);
                 break;
-            case R.id.sb_setting_abouts:
+            case R.id.sb_setting_abouts:            //版本更新
                 getVersonInfoApk();
                 break;
             case R.id.sb_privacy_agreement1:     //隐私政策
@@ -218,12 +237,9 @@ public class MyFragment extends MyLazyFragment<HomeActivity> {
      * 获取网络版本信息
      */
     private void getVersonInfoApk() {
-
         HashMap<String, String> map = new HashMap();
-        map.put("os", "3");
-
-
-        String url = HttpUtils.attachHttpGetParams("http://125.124.132.156:81/prod-api/vvm/version/checkUpdate", map);
+        map.put("os", "4");
+        String url = HttpUtils.attachHttpGetParams("http://vvm.vandh.org:81/prod-api/vvm/version/checnUpdateAndorid", map);
         HttpUtils.doGet(url, new Callback() {
             @Override
             public void onFailure(Call call, IOException e) {
@@ -239,7 +255,7 @@ public class MyFragment extends MyLazyFragment<HomeActivity> {
                 Gson gson = new Gson();
                 VersionBean versionBean = gson.fromJson(aa, VersionBean.class);
                 if (versionBean.getCode() == 200) {
-                    ifUpApk(versionBean.getData().getVersion(), versionBean.getData().getUrl());
+                    ifUpApk(versionBean.getData().getVersion(), versionBean.getData().getUrl(), versionBean.getData().getNum());
                 } else {
                     try {
                         toast(versionBean.getMsg());
@@ -251,24 +267,9 @@ public class MyFragment extends MyLazyFragment<HomeActivity> {
         });
     }
 
-    private void ifUpApk(String version, String url) {
-        //本地版本信息
-        PackageManager packageManager = Objects.requireNonNull(getActivity()).getPackageManager();
-        PackageInfo info = null;
-        int verson_code;
-        String verson_name = "";
-        try {
-            info = packageManager.getPackageInfo(getActivity().getPackageName(), 0);
-            verson_code = info.versionCode;
-            verson_name = info.versionName.toString();
-//            tv_sb_versioninfo.text = "V$verson_name"
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-
-        if (verson_name != "" || version != "") {
-            if (verson_name != version) {
+    private void ifUpApk(String version, String url, String number) {
+        if (verson_code != 0 || version != null) {
+            if (verson_code < Integer.valueOf(number)) {
                 UiConfig uiConfig = new UiConfig();
                 uiConfig.setUiType(UiType.CUSTOM);
                 uiConfig.setCustomLayoutId(R.layout.dialog_up_apk_layout);
@@ -283,15 +284,19 @@ public class MyFragment extends MyLazyFragment<HomeActivity> {
                             }
                         })
                         .apkUrl(url)
-                        .updateTitle("V$version_name")
+                        .updateTitle("V " + version)
                         .update();
             } else {
-//                Toast.makeText(activity, "当前已是最新版本!", Toast.LENGTH_LONG).show()
-                toast("当前已是最新版本!");
+                Looper.prepare();
+                Toast.makeText(getActivity(), "当前已是最新版本!", Toast.LENGTH_LONG).show();
+//                toast("当前已是最新版本!");
+                Looper.loop();
             }
         } else {
-//            Toast.makeText(activity, "获取最新版本信息失败!", Toast.LENGTH_LONG).show()
-            toast("获取最新版本信息失败!");
+            Looper.prepare();
+            Toast.makeText(getActivity(), "获取最新版本信息失败!", Toast.LENGTH_LONG).show();
+//            toast("获取最新版本信息失败!");
+            Looper.loop();
         }
     }
 }

+ 2 - 2
app/src/main/res/drawable/view_bg_layout_08.xml

@@ -6,6 +6,6 @@
     <corners
         android:topLeftRadius="0dp"
         android:topRightRadius="0dp"
-        android:bottomLeftRadius="8dp"
-        android:bottomRightRadius="8dp"/>
+        android:bottomLeftRadius="4dp"
+        android:bottomRightRadius="4dp"/>
 </shape>

+ 2 - 2
app/src/main/res/layout/dialog_up_apk_layout.xml

@@ -29,8 +29,8 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="23.5dp"
             android:text=""
-            android:textColor="@color/text_01"
-            android:textSize="20sp" />
+            android:textColor="@color/text_05"
+            android:textSize="15sp" />
     </LinearLayout>
 
     <LinearLayout

+ 1 - 1
app/src/main/res/values/strings.xml

@@ -3,7 +3,7 @@
 
 
     <!--版本更新-->
-    <string name="up_apk_text_01">发现新版本,升级后体验更顺畅!\n不升级当前版本不可使用!</string>
+    <string name="up_apk_text_01">发现新版本,升级后体验更顺畅!\n不升级当前版本会影响部分功能使用!</string>
 
     <!-- 提示 -->
     <string name="hint_layout_no_data">亲,暂无数据</string>