1.藏品合成修改。

2.藏品兑换

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

@@ -116,7 +116,7 @@
                                     android:layout_marginEnd="15dp"
                                     android:paddingEnd="9dp"
                                     android:paddingBottom="2dp"
-                                    android:text="@{vm.data.inventory+`份`}"
+                                    android:text="@{vm.data.nowInventory+`份`}"
                                     android:textColor="#54D7E9"
                                     android:textColorHint="#54D7E9"
                                     android:textSize="@dimen/dp_11" />

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

@@ -153,16 +153,15 @@
                     android:layout_width="match_parent"
                     android:layout_height="130dp">
 
-                <com.zswc.creativity.view.AspectRatioImageView
-                    android:id="@+id/img_bg_to"
-                    android:src="@drawable/bg_need_error"
-                    android:layout_height="130dp"
-                    android:layout_width="match_parent"
-                    android:layout_gravity="center"
-                    android:scaleType="centerInside"
-                    />
+                    <com.zswc.creativity.view.AspectRatioImageView
+                        android:id="@+id/img_bg_to"
+                        android:layout_width="match_parent"
+                        android:layout_height="130dp"
+                        android:layout_gravity="center"
+                        android:scaleType="centerInside"
+                        android:src="@drawable/bg_need_error" />
 
-                <androidx.appcompat.widget.AppCompatImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/img_cover_gif_to"
                     android:layout_width="match_parent"
                     android:layout_height="130dp"

base/src/main/java/com/ysnows/base/net/BOkhttpClient.kt

@@ -18,7 +18,7 @@ object BOkhttpClient {
                     .retryOnConnectionFailure(true)
 //                    .addInterceptor(CommonInterceptor())//设置公共参数
                     //上线的时候注释掉 12 不支持
-//                    .addInterceptor(ChuckInterceptor(BApp.instance()?.applicationContext))
+//                   .addInterceptor(ChuckInterceptor(BApp.instance()?.applicationContext))
                     .cookieJar(BCookieJar())
                     .addInterceptor(BHeaderInterceptor())
 

build.gradle

@@ -10,8 +10,8 @@ buildscript {
     ext.coroutines = '1.3.4'
 
     ext.application_id = "com.zswc.creativity"
-    ext.application_version_code = 2
-    ext.application_version_name = "1.0.1"
+    ext.application_version_code = 3
+    ext.application_version_name = "1.0.2"
     ext.support_version = "29.0.2"
     ext.min_sdk_version = 23
     ext.target_sdk_version = 30

update/src/main/java/com/ysnows/update/StormUpgradeActivity.java

@@ -1,5 +1,7 @@
 package com.ysnows.update;
 
+import android.view.KeyEvent;
+import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -26,10 +28,14 @@ public class StormUpgradeActivity extends UpgradeActivity {
     private TextView tvLeft;
     private LinearLayout buttonRight;
     private TextView tvRight;
+    private int updateType = 0;//升级策略 1建议 2强制 3手工
+
 
 
     @Override
     protected void initData() {
+        setFinishOnTouchOutside(false);
+
         /*获取下载任务，初始化界面信息*/
         updateBtn(Beta.getStrategyTask());
         tvVersion.setText(Beta.getUpgradeInfo().title + getString(R.string.version_online));
@@ -45,6 +51,10 @@ public class StormUpgradeActivity extends UpgradeActivity {
        // String time = times(String.valueOf(Beta.getUpgradeInfo().publishTime));
         tvUpdatetime.setText(getString(R.string.update_time) + time);
         tvUpdatecontent.setText(Beta.getUpgradeInfo().newFeature);
+        if (Beta.getUpgradeInfo().upgradeType == 2) {//强制
+            updateType = 2;
+            buttonLeft.setVisibility(View.GONE);
+        }
 
 
     }
@@ -140,4 +150,15 @@ public class StormUpgradeActivity extends UpgradeActivity {
         });
 
     }
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+            if (updateType == 2) {//强制升级
+                return false;
+            }
+
+        }
+        return super.onKeyDown(keyCode, event);
+    }
+
 }