Merge remote-tracking branch 'origin/dev_680_礼物展馆' into dev_680_礼物展馆

TabLayout/build.gradle

@@ -23,10 +23,15 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_18
+        targetCompatibility JavaVersion.VERSION_18
+    }
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.core:core-ktx:1.10.1'
+
 }
 
 //apply from: "$gradleHost/master/publish.gradle"

TabLayout/src/main/java/com/angcyo/tablayout/DslTabLayout.kt

@@ -1489,7 +1489,7 @@ open class DslTabLayout(
     val _gestureDetector: GestureDetectorCompat by lazy {
         GestureDetectorCompat(context, object : GestureDetector.SimpleOnGestureListener() {
             override fun onFling(
-                e1: MotionEvent,
+                e1: MotionEvent?,
                 e2: MotionEvent,
                 velocityX: Float,
                 velocityY: Float
@@ -1510,7 +1510,7 @@ open class DslTabLayout(
             }
 
             override fun onScroll(
-                e1: MotionEvent,
+                e1: MotionEvent?,
                 e2: MotionEvent,
                 distanceX: Float,
                 distanceY: Float

common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java

@@ -185,6 +185,9 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow {
             tab2.setBackgroundResource(R.drawable.gift_wall_gift_info_list_btn_down);
             tab2.setTextColor(Color.parseColor("#FFFFFF"));
             list_type = 1;
+
+            ((TextView) findViewById(R.id.user_name)).setText(WordUtil.getNewString(R.string.dialog_gift_wall_list_info_list_header_rename1));
+            ((TextView) findViewById(R.id.tv_rename)).setText(WordUtil.getNewString(R.string.dialog_gift_wall_list_info_list_header_rename_value1));
             initData();
         });
         ViewClicksAntiShake.clicksAntiShake(tab2, () -> {
@@ -355,7 +358,7 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow {
         btn_one_tips.setText(String.format(Locale.getDefault(), "%s%s%s"
                 , WordUtil.isNewZh() ? "需" : "Need",
                 tmp,
-                WordUtil.isNewZh() ? "個" : ""));
+                WordUtil.isNewZh() ? "" : ""));
     }
 
     private void loadChampion(GiftWallInfoBean giftBean) {

common/src/main/res/values-zh/strings.xml

@@ -1535,4 +1535,6 @@
     <string name="dialog_gift_wall_hide">已隐藏</string>
     <string name="dialog_gift_wall_classic_wait">等待冠名</string>
     <string name="dialog_gift_wall_assistance_wait">等待助力</string>
+    <string name="dialog_gift_wall_assistance_user">助力用户</string>
+    <string name="dialog_gift_wall_assistance_star">助力值</string>
 </resources>

common/src/main/res/values/strings.xml

@@ -1541,7 +1541,8 @@
     <string name="dialog_gift_wall_assistance_wait">Waiting for assistance</string>
     <string name="live_guard_buy_coupon_tips_use">Use</string>
     <string name="live_guard_buy_coupon_tips_cancel">Not use</string>
-
+    <string name="dialog_gift_wall_assistance_user">Assist users</string>
+    <string name="dialog_gift_wall_assistance_star">Value</string>
 
     <string name="sub_admission_fee">*10% of the threshold will be charged as ticket</string>
 </resources>