diff --git a/TabLayout/build.gradle b/TabLayout/build.gradle index 2603e2d62..d5b6e0cfd 100644 --- a/TabLayout/build.gradle +++ b/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" \ No newline at end of file diff --git a/TabLayout/src/main/java/com/angcyo/tablayout/DslTabLayout.kt b/TabLayout/src/main/java/com/angcyo/tablayout/DslTabLayout.kt index d915fd1b2..b2c6050fe 100644 --- a/TabLayout/src/main/java/com/angcyo/tablayout/DslTabLayout.kt +++ b/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 diff --git a/common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java b/common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java index b81e24e52..67cbc7d56 100644 --- a/common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java +++ b/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) { diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml index 79684c5a6..74319d103 100644 --- a/common/src/main/res/values-zh/strings.xml +++ b/common/src/main/res/values-zh/strings.xml @@ -1535,4 +1535,6 @@ 已隐藏 等待冠名 等待助力 + 助力用户 + 助力值 diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 1c6336b3c..04979c6a8 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -1541,7 +1541,8 @@ Waiting for assistance Use Not use - + Assist users + Value *10% of the threshold will be charged as ticket