fix: hongbao 60

baseswago/src/main/res/values-ar/strings.xml

@@ -230,8 +230,8 @@
     <string name="do_you_confirm_change_pwd">هل تتأكد من تغيير الباسورد؟</string>
     <string name="red_bag_detail">تلقي تفاصيل المغلف الأحمر</string>
     <string name="lucky_best">تسليم اكثر</string>
-    <string name="red_bg_piao_tiao">أرسل %s مظروفًا أحمر، وسيكون جاهزًا للتسليم في 30 ثانية، يرجى الاستعداد!</string>
-    <string name="red_bg_piao_tiao_big">أرسل %s مظروفًا أحمر في روم %s، وسيكون جاهزًا للتسليم في 30 ثانية، يرجى الاستعداد!</string>
+    <string name="red_bg_piao_tiao">أرسل %s مظروفًا أحمر، وسيكون جاهزًا للتسليم في 60 ثانية، يرجى الاستعداد!</string>
+    <string name="red_bg_piao_tiao_big">أرسل %s مظروفًا أحمر في روم %s، وسيكون جاهزًا للتسليم في 60 ثانية، يرجى الاستعداد!</string>
     <string name="please_input_new_pwd">الرجاء إدخال كلمة مرور جديدة</string>
     <string name="enter_current_password">الرجاء دخل الباسورد القديم</string>
     <string name="current_password">الباسورد الحالي</string>

baseswago/src/main/res/values-in/strings.xml

@@ -234,8 +234,8 @@
     <string name="do_you_confirm_change_pwd">Yakin ubah kata sandi?</string>
     <string name="red_bag_detail">Rincian ampau yg diterima</string>
     <string name="lucky_best">Paling beruntung</string>
-    <string name="red_bg_piao_tiao">%s bagi ampau,stlh 30 detik mulai rebut,siapkan dlu.</string>
-    <string name="red_bg_piao_tiao_big">%s bagi satu ampau di room %s,stlh 30 detik mulai rebut,siapkan dlu.</string>
+    <string name="red_bg_piao_tiao">%s bagi ampau,stlh 60 detik mulai rebut,siapkan dlu.</string>
+    <string name="red_bg_piao_tiao_big">%s bagi satu ampau di room %s,stlh 60 detik mulai rebut,siapkan dlu.</string>
     <string name="please_input_new_pwd">Masukan pw baru</string>
     <string name="enter_current_password">Masukkan pw skrg</string>
     <string name="current_password">Pw skrg</string>

baseswago/src/main/res/values-ms/strings.xml

@@ -231,8 +231,8 @@
     <string name="do_you_confirm_change_pwd">Adakah anda pasti mahu menukar kata laluan anda?</string>
     <string name="red_bag_detail">Butiran sampul merah</string>
     <string name="lucky_best">paling bertuah</string>
-    <string name="red_bg_piao_tiao">%s menghantar sampul merah, dan ia akan direbut dalam masa 30-an, sila bersedia!</string>
-    <string name="red_bg_piao_tiao_big">%s menghantar sampul merah dalam bilik siaran langsung %s, dan ia akan mula meraih selepas 30-an, sila bersedia!</string>
+    <string name="red_bg_piao_tiao">%s menghantar sampul merah, dan ia akan direbut dalam masa 60-an, sila bersedia!</string>
+    <string name="red_bg_piao_tiao_big">%s menghantar sampul merah dalam bilik siaran langsung %s, dan ia akan mula meraih selepas 60-an, sila bersedia!</string>
     <string name="please_input_new_pwd">请输入新密码</string>
     <string name="enter_current_password">Enter current password</string>
     <string name="current_password">Current password</string>

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

@@ -230,8 +230,8 @@
     <string name="do_you_confirm_change_pwd">您确定要修改您的密码么?</string>
     <string name="red_bag_detail">查看红包领取详情</string>
     <string name="lucky_best">手气最佳</string>
-    <string name="red_bg_piao_tiao">%s发出了一个红包，30s后开抢，请做好准备!</string>
-    <string name="red_bg_piao_tiao_big">%s在%s的直播间发出了一个红包，30s后开抢，请做好准备!</string>
+    <string name="red_bg_piao_tiao">%s发出了一个红包，60s后开抢，请做好准备!</string>
+    <string name="red_bg_piao_tiao_big">%s在%s的直播间发出了一个红包，60s后开抢，请做好准备!</string>
     <string name="please_input_new_pwd">请输入新密码</string>
     <string name="enter_current_password">请输入当前密码</string>
     <string name="current_password">当前密码</string>

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

@@ -252,8 +252,8 @@
     <string name="do_you_confirm_change_pwd">sure you want to change your password?</string>
     <string name="red_bag_detail">View details of red envelope receivement </string>
     <string name="lucky_best">luckiest</string>
-    <string name="red_bg_piao_tiao">%s sent out a red envelope, and it will be up for grabs in 30s, please get ready!</string>
-    <string name="red_bg_piao_tiao_big">%s sent out a red envelope in %s\'s live broadcast room, it will be up for grabs in 30s, please get ready!</string>
+    <string name="red_bg_piao_tiao">%s sent out a red envelope, and it will be up for grabs in 60s, please get ready!</string>
+    <string name="red_bg_piao_tiao_big">%s sent out a red envelope in %s\'s live broadcast room, it will be up for grabs in 60s, please get ready!</string>
     <string name="please_input_new_pwd">please input new password </string>
     <string name="enter_current_password">Enter current password</string>
     <string name="current_password">Current password</string>

room/src/main/java/com/swago/room/game/GamePlayDialog.kt

@@ -29,6 +29,7 @@ import com.swago.baseswago.util.*
 import com.swago.room.R
 import com.swago.room.bean.UserRoomModel
 import com.swago.room.databinding.DialogGamePlayBinding
+import com.tencent.qcloud.tim.uikit.utils.ScreenUtil
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -96,9 +97,9 @@ class GamePlayDialog : BaseXDFragment<DialogGamePlayBinding>(), IRoomActiveListe
                 imageViewLayoutParams.leftToLeft = R.id.cl
                 imageViewLayoutParams.leftMargin = DpPxUtil.dip2px(10f)
                 if (gameType == "9"){
-                    imageViewLayoutParams.bottomMargin = DpPxUtil.dip2px(390f)
+                    imageViewLayoutParams.bottomMargin =  ScreenUtil.getScreenWidth(getActivity())
                 } else {
-                    imageViewLayoutParams.bottomMargin = DpPxUtil.dip2px(340f)
+                    imageViewLayoutParams.bottomMargin = ScreenUtil.getScreenWidth(getActivity()) - ScreenUtil.getPxByDp(40f)
                 }
                 val imageView = ImageView(activity)
                 imageView.setBackgroundResource(R.drawable.shape_80000000_20)

room/src/main/java/com/swago/room/pk/PkVm.kt

@@ -97,6 +97,7 @@ class PkVm(application: Application) : AbsMsgVm(application) {
                             ipkListener.stopPK(stopPKModel)
                         }
                     }
+                    pkState?.invoke(false)
                 }
                 2 -> {
                     if (PKStateManager.roomState != PKStateManager.PK) {
@@ -129,6 +130,7 @@ class PkVm(application: Application) : AbsMsgVm(application) {
                             ipkListener.processChangePK(processPKModel, false)
                         }
                     }
+                    pkState?.invoke(true)
                 }
                 3, 4, 5 -> {
                     if (PKStateManager.roomState != PKStateManager.PUNISH) {
@@ -160,6 +162,7 @@ class PkVm(application: Application) : AbsMsgVm(application) {
                             ipkListener.processChangePK(processPKModel, false)
                         }
                     }
+                    pkState?.invoke(true)
                 }
             }
         }

room/src/main/java/com/swago/room/widget/UserFooterView.kt

@@ -45,7 +45,7 @@ class UserFooterView : ConstraintLayout, IFooter,IRoomActiveListener {
     }
 
     private fun initView() {
-        visibility = View.GONE
+        visibility = View.INVISIBLE
         SwagoRoomManager.addListener(this)
         binding = LayoutUserFooterViewBinding.inflate(LayoutInflater.from(context), this, true)
         binding.ivChat.setOnClickListener(object : NoDoubleClickListener() {
@@ -100,7 +100,7 @@ class UserFooterView : ConstraintLayout, IFooter,IRoomActiveListener {
 
 
     override fun changeRoom(iRoomInfo: IRoomInfo) {
-        visibility = View.GONE
+        visibility = View.INVISIBLE
     }
 
     override fun leaveRoom(iRoomInfo: IRoomInfo) {

room/src/main/res/layout/view_waft.xml

@@ -19,7 +19,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         android:layout_marginEnd="10dp"
-        android:background="@mipmap/ic_waft_big_prize"/>
+        android:src="@mipmap/ic_waft_big_prize"/>
     <ImageView
         android:id="@+id/iv_function"
         android:layout_width="wrap_content"
@@ -30,7 +30,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        android:background="@mipmap/ic_waft_big_prize"/>
+        android:src="@mipmap/ic_waft_big_prize"/>
 
     <TextView
         android:id="@+id/tv_prize"