Merge branch 'v2.2.0/float_gift' into v2.2.0/test

# Conflicts:
#	gradle.properties

app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftGoRoomTipsDialog.kt

@@ -49,6 +49,7 @@ class AllServiceGiftGoRoomTipsDialog(
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        setCancelable(false)
         requestWindowFeature(Window.FEATURE_NO_TITLE)
         val inflate =
             LayoutInflater.from(context)
@@ -75,6 +76,9 @@ class AllServiceGiftGoRoomTipsDialog(
             dismiss()
         }
         binding?.tvCancel?.singleClick {
+            if (isCheck) {
+                ignoreTips()
+            }
             dismiss()
         }
         updateCheckbox(false)

gradle.properties

@@ -32,7 +32,7 @@ MIN_SDK_VERSION=21
 TARGET_SDK_VERSION=33
 
 version_name=2.2.0
-version_code=2220
+version_code=2200
 
 #systemProp.https.proxyHost=127.0.0.1
 #systemProp.https.proxyPort=7890