Merge branch 'google' into qiye

app/src/main/java/com/swago/app/SplashVm.kt

@@ -112,9 +112,9 @@ class SplashVm(application: Application) : BaseViewModel(application) {
 
     private fun setBaseUrl(baseUrl: String) {
         if (BuildConfig.DEBUG) {
-//            UrlConstant.BASE_URL =   "http:test-api.swago.cn"
+            UrlConstant.BASE_URL =   "http:test-api.swago.cn"
 //            UrlConstant.BASE_URL =   "http:huawei.swago.cn"
-            UrlConstant.BASE_URL =   "https://pro-api.swago.cn"
+//            UrlConstant.BASE_URL =   "https://pro-api.swago.cn"
         } else {
             UrlConstant.BASE_URL = baseUrl
         }

baseswago/src/main/java/com/swago/baseswago/constant/UrlConstant.kt

@@ -14,9 +14,9 @@ import java.io.File
 object UrlConstant {
 
     var BASE_URL = if (BuildConfig.DEBUG) {
-//            "http:test-api.swago.cn"
+            "http:test-api.swago.cn"
 //            "http:huawei.swago.cn"
-        "https://pro-api.swago.cn"
+//        "https://pro-api.swago.cn"
     } else {
             "https://pro-api.swago.cn"
         }

baseswago/src/main/java/com/swago/baseswago/model/live/gift/IMGiftModel.java

@@ -48,6 +48,12 @@ public class IMGiftModel implements IPiaoTiao {
     private int multiple;
     private int giftType;
 
+    private String giftArName="";
+
+    private String giftEnName = "";
+
+    private String giftIdName = "";
+
     public String getRoomId() {
         return roomId;
     }
@@ -199,4 +205,28 @@ public class IMGiftModel implements IPiaoTiao {
     public void setGiftType(int giftType) {
         this.giftType = giftType;
     }
+
+    public String getGiftArName() {
+        return giftArName;
+    }
+
+    public void setGiftArName(String giftArName) {
+        this.giftArName = giftArName;
+    }
+
+    public String getGiftEnName() {
+        return giftEnName;
+    }
+
+    public void setGiftEnName(String giftEnName) {
+        this.giftEnName = giftEnName;
+    }
+
+    public String getGiftIdName() {
+        return giftIdName;
+    }
+
+    public void setGiftIdName(String giftIdName) {
+        this.giftIdName = giftIdName;
+    }
 }

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

@@ -248,8 +248,13 @@
     <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="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="please_input_new_pwd">الرجاء إدخال كلمة مرور جديدة</string>
+    <string name="enter_current_password">الرجاء دخل الباسورد القديم</string>
+    <string name="current_password">الباسورد الحالي</string>
+    <string name="new_password">باسورد جديد</string>
+    <string name="confirm_new_password">تأكيد من باسورد جديد</string>
 </resources>

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

@@ -260,8 +260,13 @@
     <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="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="please_input_new_pwd">Masukan pw baru</string>
+    <string name="enter_current_password">Masukkan pw skrg</string>
+    <string name="current_password">Pw skrg</string>
+    <string name="new_password">Pw baru</string>
+    <string name="confirm_new_password">Komfirmasi ketepatan  pw baru</string>
 </resources>

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

@@ -264,4 +264,9 @@
     <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="please_input_new_pwd">请输入新密码</string>
+    <string name="enter_current_password">Enter current password</string>
+    <string name="current_password">Current password</string>
+    <string name="new_password">New password</string>
+    <string name="confirm_new_password">Confirm new password</string>
 </resources>

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

@@ -248,8 +248,13 @@
     <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="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="please_input_new_pwd">请输入新密码</string>
+    <string name="enter_current_password">请输入当前密码</string>
+    <string name="current_password">当前密码</string>
+    <string name="new_password">新密码</string>
+    <string name="confirm_new_password">确认新密码</string>
 </resources>

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

@@ -280,9 +280,14 @@
     <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="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="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>
+    <string name="new_password">New password</string>
+    <string name="confirm_new_password">Confirm new password</string>
 
 </resources>

room/src/main/java/com/swago/room/gift/GiftDialog.kt

@@ -11,6 +11,7 @@ import android.widget.Toast
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager.widget.ViewPager
 import com.alibaba.android.arouter.launcher.ARouter
 import com.facebook.internal.AppCall
@@ -73,11 +74,13 @@ class GiftDialog : BaseXDFragment<DialogGiftBinding>() {
     private var hotFragment: GiftFragment? = null
     private var luxuryFragment: GiftFragment? = null
     private var specialFragment: GiftFragment? = null
+    private var mingRenTangFragment: GiftFragment? = null
 
     private var luckyData = ArrayList<GiftModel>()
     private var hotData = ArrayList<GiftModel>()
     private var luxuryData = ArrayList<GiftModel>()
     private var specialData = ArrayList<GiftModel>()
+    private var mingRenTangData = ArrayList<GiftModel>()
     private var viewPagerAdapter: SwagoAdapter? = null
 
     private var type = 1
@@ -121,6 +124,17 @@ class GiftDialog : BaseXDFragment<DialogGiftBinding>() {
                     //获取语音房麦位用户列表
                     binding.tvSender.visibility = View.GONE
                     binding.rvAudioUser.visibility = View.VISIBLE
+                    binding.rvAudioUser.layoutManager = LinearLayoutManager(activity,RecyclerView.HORIZONTAL,false)
+                    binding.rvAudioUser.adapter = adapter
+                    adapter.setOnItemClickListener { _, view, position ->
+                        adapter.data[position].selected = !adapter.data[position].selected
+                        if (adapter.data[position].selected){
+                            selectedUserList.add(adapter.data[position].user_id)
+                        }else{
+                            selectedUserList.remove(adapter.data[position].user_id)
+                        }
+                        adapter.notifyItemChanged(position)
+                    }
                     getAudioMaiList()
                     json = SpUtil.readString("audioGiftList")
                 }
@@ -159,6 +173,11 @@ class GiftDialog : BaseXDFragment<DialogGiftBinding>() {
                             specialData.clear()
                             specialData.addAll(giftAllModel.data)
                         }
+                        5 -> {
+                            //特殊礼物
+                            mingRenTangData.clear()
+                            mingRenTangData.addAll(giftAllModel.data)
+                        }
                     }
                 }
                 binding.tvToSend.visibility = View.VISIBLE
@@ -172,10 +191,12 @@ class GiftDialog : BaseXDFragment<DialogGiftBinding>() {
             hotFragment = GiftFragment.newInstance(1, hotData)
             luxuryFragment = GiftFragment.newInstance(2, luxuryData)
             specialFragment = GiftFragment.newInstance(4, specialData)
+            mingRenTangFragment = GiftFragment.newInstance(5, mingRenTangData)
 
             giftFragmentList.add(luckyFragment!!)
             giftFragmentList.add(hotFragment!!)
-            giftFragmentList.add(luxuryFragment!!)
+//            giftFragmentList.add(luxuryFragment!!)
+            giftFragmentList.add(mingRenTangFragment!!)
             giftFragmentList.add(specialFragment!!)
 
 
@@ -187,24 +208,35 @@ class GiftDialog : BaseXDFragment<DialogGiftBinding>() {
                 hotFragment?.reset()
                 luxuryFragment?.reset()
                 specialFragment?.reset()
+                mingRenTangFragment?.reset()
             }
             hotFragment?.listener = {
                 resetSendState()
                 luckyFragment?.reset()
                 luxuryFragment?.reset()
                 specialFragment?.reset()
+                mingRenTangFragment?.reset()
             }
             luxuryFragment?.listener = {
                 resetSendState()
                 luckyFragment?.reset()
                 hotFragment?.reset()
                 specialFragment?.reset()
+                mingRenTangFragment?.reset()
             }
             specialFragment?.listener = {
                 resetSendState()
                 luckyFragment?.reset()
                 hotFragment?.reset()
                 luxuryFragment?.reset()
+                mingRenTangFragment?.reset()
+            }
+            mingRenTangFragment?.listener = {
+                resetSendState()
+                luckyFragment?.reset()
+                hotFragment?.reset()
+                luxuryFragment?.reset()
+                specialFragment?.reset()
             }
 
             binding.viewPager.offscreenPageLimit = 3
@@ -288,6 +320,9 @@ class GiftDialog : BaseXDFragment<DialogGiftBinding>() {
                 4 -> {
                     binding.viewPager.currentItem = 3
                 }
+                5 -> {
+                    binding.viewPager.currentItem = 2
+                }
             }
 
             binding.combo.setOnClick(object : ComboView.OnClick {
@@ -334,9 +369,14 @@ class GiftDialog : BaseXDFragment<DialogGiftBinding>() {
                     }
 
                     3 -> {
-                        //高级
+//                        //高级
+//                        val gifModel =
+//                            luxuryData[GiftConfig.giftSelectedPageIndex * 8 + GiftConfig.giftSelectedPageSelectedPosition]
+//                        LogUtil.d("礼物id", "${gifModel.gift_name}")
+//                        sendGift(gifModel, 0)
+
                         val gifModel =
-                            luxuryData[GiftConfig.giftSelectedPageIndex * 8 + GiftConfig.giftSelectedPageSelectedPosition]
+                            mingRenTangData[GiftConfig.giftSelectedPageIndex * 8 + GiftConfig.giftSelectedPageSelectedPosition]
                         LogUtil.d("礼物id", "${gifModel.gift_name}")
                         sendGift(gifModel, 0)
                     }
@@ -452,6 +492,12 @@ class GiftDialog : BaseXDFragment<DialogGiftBinding>() {
                             specialData.clear()
                             specialData.addAll(giftAllModel.data)
                         }
+
+                        5 -> {
+                            //名人堂礼物
+                            mingRenTangData.clear()
+                            mingRenTangData.addAll(giftAllModel.data)
+                        }
                     }
                 }
                 viewPagerAdapter?.notifyDataSetChanged()
@@ -462,7 +508,7 @@ class GiftDialog : BaseXDFragment<DialogGiftBinding>() {
         giftVm.sendResultLiveData.observe(this) {
             if (it != null) {
                 if (it.im_data != null) {
-                    if(it.im_data.giftType==3){
+                    if(it.im_data.giftType==3 || it.im_data.giftType==5){
                         msgVm.showGiftDanDao?.invoke(it.im_data)
                     }
                     msgVm.inComeChange?.invoke(it.im_data.incomeCount)
@@ -508,18 +554,7 @@ class GiftDialog : BaseXDFragment<DialogGiftBinding>() {
                     it.selected = true
                     selectedUserList.add(it.user_id)
                 }
-                binding.rvAudioUser.layoutManager = LinearLayoutManager(it)
-                binding.rvAudioUser.adapter = adapter
                 adapter.setNewData(data)
-                adapter.setOnItemClickListener { _, view, position ->
-                    adapter.data[position].selected = !adapter.data[position].selected
-                    if (adapter.data[position].selected){
-                        selectedUserList.add(adapter.data[position].user_id)
-                    }else{
-                        selectedUserList.remove(adapter.data[position].user_id)
-                    }
-                    adapter.notifyItemChanged(position)
-                }
             }
         }
 

room/src/main/java/com/swago/room/gift/control/SvgDanDaoView.kt

@@ -13,6 +13,7 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import com.bumptech.glide.Glide
 import com.swago.baseswago.model.live.gift.IMGiftModel
 import com.swago.baseswago.util.AppContext
+import com.swago.baseswago.util.SwagoInfo
 import com.swago.room.R
 import com.swago.room.databinding.LayoutSvgDanDaoViewBinding
 import java.util.*
@@ -58,8 +59,27 @@ class SvgDanDaoView : ConstraintLayout {
                 .placeholder(R.mipmap.default_avatar)
                 .error(R.mipmap.default_avatar)
                 .into(ivAvatar)
+            var localName = ""
+            when(SwagoInfo.getLanguageCode()){
+                "id" -> {
+                    localName = next.giftIdName
+                }
+                "zh" -> {
+                    localName = next.giftName
+                }
+                "ar" -> {
+                    if(next.giftArName.isNotEmpty()){
+                        localName = next.giftArName
+                    }else{
+                        localName = next.giftEnName
+                    }
+                }
+                else -> {
+                    localName = next.giftEnName
+                }
+            }
             val sendName = "<font color='#FFDB43'>${next.senderName}</font>"
-            val giftName = "<font color='#FFDB43'>${next.giftName}</font>"
+            val giftName = "<font color='#FFDB43'>${localName}</font>"
             val receiverName = "<font color='#FFDB43'>${next.receiverName}</font>"
             marqueeTextView.text = Html.fromHtml("\u200E${AppContext.getContext().resources.getString(R.string.big_gift) .format(sendName, giftName, receiverName)}")
             marqueeTextView.post {

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

@@ -10,7 +10,6 @@ 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
 import com.swago.baseswago.baseroom.IRoomInfo
@@ -21,7 +20,6 @@ import com.swago.baseswago.util.DpPxUtil
 import com.swago.baseswago.util.NoDoubleClickListener
 import com.swago.room.R
 import com.swago.room.databinding.ViewHongBaoBinding
-import com.swago.room.databinding.ViewWaftBinding
 import java.util.concurrent.ConcurrentLinkedQueue
 
 //红包飘条
@@ -104,9 +102,6 @@ class HongbaoPiaoTiaoView : LinearLayout, IRoomActiveListener {
                 override fun onAnimationCancel(animation: Animator) {}
                 override fun onAnimationRepeat(animation: Animator) {}
             })
-            binding?.marqueeTextView?.post {
-                binding?.marqueeTextView?.startScroll()
-            }
         }
     }
 

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

@@ -96,15 +96,34 @@ class WaftView : FrameLayout {
         val next = imGiftModelList.pop()
         when(next){
             is IMGiftModel -> {
+                var localName = ""
+                when(SwagoInfo.getLanguageCode()){
+                    "id" -> {
+                        localName = next.giftIdName
+                    }
+                    "zh" -> {
+                        localName = next.giftName
+                    }
+                    "ar" -> {
+                        if(next.giftArName.isNotEmpty()){
+                            localName = next.giftArName
+                        }else{
+                            localName = next.giftEnName
+                        }
+                    }
+                    else -> {
+                        localName = next.giftEnName
+                    }
+                }
                 if (next.multiple>=500){
                     val sendName = "<font color='#FFDB43'>${next.senderName}</font>"
-                    val giftName = "<font color='#FFDB43'>${next.giftName}</font>"
+                    val giftName = "<font color='#FFDB43'>${localName}</font>"
                     val multiple = "<font color='#FFDB43'>${next.multiple}</font>"
                     binding?.ll?.setBackgroundResource(R.mipmap.waft_big_prize)
                     binding?.marqueeTextView?.text = Html.fromHtml("\u200E${AppContext.getContext().resources.getString(R.string.big_prize).format(sendName,giftName,multiple)}")
                 }else{
                     val sendName = "<font color='#FFDB43'>${next.senderName}</font>"
-                    val giftName = "<font color='#FFDB43'>${next.giftName}</font>"
+                    val giftName = "<font color='#FFDB43'>${localName}</font>"
                     val receiverName = "<font color='#FFDB43'>${next.receiverName}</font>"
                     binding?.ll?.setBackgroundResource(R.mipmap.waft_bg)
                     binding?.marqueeTextView?.text = Html.fromHtml("\u200E${AppContext.getContext().resources.getString(R.string.big_gift_msg).format(sendName,giftName,receiverName)}")

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

@@ -115,7 +115,7 @@
 
         <com.swago.baseswago.cusview.MediumTextView
             android:id="@+id/tvReceiveDetail"
-            android:text="查看领取详情"
+            android:text="@string/red_bag_detail"
             android:textColor="#fff"
             android:textSize="12dp"
             android:drawableEnd="@mipmap/icon_arrow_right"

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

@@ -23,7 +23,7 @@
 
     <androidx.recyclerview.widget.RecyclerView
         app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginTop="120dp"
+        android:layout_marginTop="180dp"
         android:id="@+id/rvAudio"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"/>
@@ -88,7 +88,7 @@
 
     <com.swago.room.widget.BannerView
         android:id="@+id/bannerView"
-        android:layout_marginTop="150dp"
+        android:layout_marginTop="100dp"
         android:visibility="gone"
         tools:visibility="visible"
         app:layout_constraintEnd_toEndOf="parent"

user/src/main/res/layout/activity_modify_pwd.xml

@@ -2,7 +2,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <include
         android:id="@+id/toolbar"
@@ -57,7 +58,8 @@
         android:layout_marginTop="43dp"
         android:textColor="#131B23"
         android:visibility="gone"
-        android:text="Current password"
+        tools:visibility="visible"
+        android:text="@string/current_password"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
@@ -66,9 +68,10 @@
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
         android:layout_marginTop="8dp"
-        android:hint="Enter current password"
+        android:hint="@string/enter_current_password"
         android:visibility="gone"
         android:paddingStart="5dp"
+        tools:visibility="visible"
         android:background="@drawable/shape_f1f4f8_12"
         app:layout_constraintTop_toBottomOf="@+id/tvCurrentPwd"
         app:layout_constraintStart_toStartOf="parent"
@@ -84,7 +87,7 @@
         android:textSize="12dp"
         android:layout_marginTop="16dp"
         android:textColor="#131B23"
-        android:text="New password"
+        android:text="@string/new_password"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
@@ -94,7 +97,7 @@
         android:layout_marginEnd="16dp"
         android:layout_marginTop="8dp"
         android:inputType="textPassword"
-        android:hint="请输入新密码"
+        android:hint="@string/please_input_new_pwd"
         android:paddingStart="5dp"
         android:background="@drawable/shape_f1f4f8_12"
         app:layout_constraintTop_toBottomOf="@+id/tvNewPwd"
@@ -111,7 +114,7 @@
         android:textSize="12dp"
         android:layout_marginTop="16dp"
         android:textColor="#131B23"
-        android:text="Confirm new password"
+        android:text="@string/confirm_new_password"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
@@ -121,7 +124,7 @@
         android:layout_marginEnd="16dp"
         android:layout_marginTop="8dp"
         android:inputType="textPassword"
-        android:hint="请输入新密码"
+        android:hint="@string/please_input_new_pwd"
         android:paddingStart="5dp"
         android:background="@drawable/shape_f1f4f8_12"
         app:layout_constraintTop_toBottomOf="@+id/tvConfirmPwd"