d

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

@@ -81,7 +81,7 @@
     <string name="sure_consume">إعادة تقديم الطلب الآن</string>
     <string name="send">ارسال</string>
     <string name="hot">حار</string>
-    <string name="luxury">هدايا مميزة</string>
+    <string name="luxury">جدار الشهرة</string>
     <string name="pay_cancel">إلغاء الدفع</string>
     <string name="pay_fail">استثناء دفع جوجل</string>
     <string name="send_to">ارسال إلى%s</string>
@@ -225,4 +225,11 @@
     <string name="notice">النشرة</string>
     <string name="not_exceed_char">الحد الأقصى لا يتجاوز 150 حرفا</string>
     <string name="no_send_people">لا يوجد مستخدم يقبل الهدايا</string>
+    <string name="change_password">تغيير الباسورد</string>
+    <string name="pwd_change_success">تغيير الباسورد</string>
+    <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>
 </resources>

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

@@ -81,7 +81,7 @@
     <string name="sure_consume">kirim ulang sekarang</string>
     <string name="send">Memberikan</string>
     <string name="hot">Hot</string>
-    <string name="luxury">Premium Hadiah</string>
+    <string name="luxury">Tembok selebriti</string>
     <string name="pay_cancel">Pembatalan pembayaran</string>
     <string name="pay_fail">Eror pembayaran Google</string>
     <string name="send_to">Hadiah untuk %s</string>
@@ -229,4 +229,11 @@
     <string name="notice">Pengumuman</string>
     <string name="not_exceed_char">Tidak lebih dari 150 karakter</string>
     <string name="no_send_people">Pengguna yang tidak menerima hadiah</string>
+    <string name="change_password">Reset pw</string>
+    <string name="pwd_change_success">Sukses reset pw</string>
+    <string name="do_you_confirm_change_pwd">Yakin ubah kata sandi?</string>
+    <string name="red_bag_detail">Detail ampau</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>
 </resources>

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

@@ -81,7 +81,7 @@
     <string name="sure_consume">Hantar semula pesanan sekarang</string>
     <string name="send">Memberi</string>
     <string name="hot">kegemaran</string>
-    <string name="luxury">Hadiah premium</string>
+    <string name="luxury">Dinding kemasyhuran</string>
     <string name="pay_cancel">pembayaran di batalkan</string>
     <string name="pay_fail">Pengecualian pembayaran Google</string>
     <string name="send_to">hadiah kepada %s</string>
@@ -226,4 +226,11 @@
     <string name="notice">Pengumuman</string>
     <string name="not_exceed_char">Saiz maksimum ialah 150 aksara</string>
     <string name="no_send_people">Pengguna yang tidak menerima hadiah</string>
+    <string name="change_password">tukar kata laluan</string>
+    <string name="pwd_change_success">Kata laluan berjaya ditukar</string>
+    <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>
 </resources>

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

@@ -225,4 +225,11 @@
     <string name="notice">公告</string>
     <string name="not_exceed_char">不超过150个字符</string>
     <string name="no_send_people">麦位无可送礼人</string>
+    <string name="change_password">修改密码</string>
+    <string name="pwd_change_success">密码修改成功</string>
+    <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>
 </resources>

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

@@ -85,7 +85,7 @@
     <string name="sure_consume">Resubmit order now</string>
     <string name="send">Send</string>
     <string name="hot">Hot</string>
-    <string name="luxury">Luxury</string>
+    <string name="luxury">Wall of fame</string>
     <string name="pay_cancel">Pay Cancel</string>
     <string name="pay_fail">GooglePay is error</string>
     <string name="send_to">Gift to %s</string>
@@ -247,12 +247,12 @@
     <string name="notice">Notice</string>
     <string name="not_exceed_char">A maximum of 150 characters</string>
     <string name="no_send_people">No users accept gifts</string>
-    <string name="change_password">修改密码</string>
-    <string name="pwd_change_success">密码修改成功</string>
-    <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="change_password">Change password</string>
+    <string name="pwd_change_success">Password reset successfully</string>
+    <string name="do_you_confirm_change_pwd">sure you want to change your password?</string>
+    <string name="red_bag_detail">Red envelope details</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>
 
 </resources>

home/src/main/java/com/swago/home/MineFragment.kt

@@ -33,13 +33,6 @@ class MineFragment : BaseXFragment<FragmentMineBinding>() {
         }else{
             binding.tvXWithdrawal.visibility = View.VISIBLE
         }
-        UserInfo.getUserInfo()?.let {
-            if (it.user_wealth_level.toInt()>=10 || it.user_level.toInt() >= 10){
-                binding.tvModifyPassword.visibility = View.VISIBLE
-            }else{
-                binding.tvModifyPassword.visibility = View.GONE
-            }
-        }
 
 
         binding.llFans.setOnClickListener(object: NoDoubleClickListener(){
@@ -202,6 +195,12 @@ class MineFragment : BaseXFragment<FragmentMineBinding>() {
             }else{
                 binding.tvRoomManager.visibility = View.GONE
             }
+
+            if (it.user_wealth_level.toInt()>=10 || it.user_level.toInt() >= 10){
+                binding.tvModifyPassword.visibility = View.VISIBLE
+            }else{
+                binding.tvModifyPassword.visibility = View.GONE
+            }
         }
 
         payVm.benefitLiveData.observe(this){

room/src/main/java/com/swago/room/piaotiao/HongbaoPiaoTiaoView.kt

@@ -9,6 +9,7 @@ import android.text.Html
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
+import android.widget.LinearLayout
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.fragment.app.FragmentActivity
 import com.swago.baseswago.baseroom.IRoomActiveListener
@@ -24,7 +25,7 @@ import com.swago.room.databinding.ViewWaftBinding
 import java.util.concurrent.ConcurrentLinkedQueue
 
 //红包飘条
-class HongbaoPiaoTiaoView : ConstraintLayout, IRoomActiveListener {
+class HongbaoPiaoTiaoView : LinearLayout, IRoomActiveListener {
 
     private var binding : ViewHongBaoBinding? = null
     private var isBusy = false

room/src/main/java/com/swago/room/vm/MsgVm.kt

@@ -301,7 +301,7 @@ class MsgVm(application: Application) : AbsMsgVm(application) {
         imGroupNewMsgListener.handleMsgType<CusNewMsgBean<RedEnvelope>>(red_envelope_broadcast) {
             SwagoRoomManager.iRoomInfo?.let { iRoomInfo ->
                 it.data?.let {
-                    if (isReady && it.roomId != iRoomInfo.getRoomId() && SwagoRoomManager.roleType == RoleType.user) {
+                    if (isReady && it.roomId != iRoomInfo.getRoomId()) {
                         //其他直播间用户收到这个全局红包的通知触发弹窗
                         openRedEnvelopPortal?.invoke(it)
                         it.bigNotice = 1