Merge branch 'google' into qiye

baseswago/src/main/java/com/swago/baseswago/model/UserInfoModel.java

@@ -48,6 +48,11 @@ public class UserInfoModel {
      */
     private int is_pretty_account;
 
+    /**
+     * 家族长id
+     */
+    private int user_agent_id;
+
 
 
 
@@ -258,4 +263,12 @@ public class UserInfoModel {
     public void setIs_pretty_account(int is_pretty_account) {
         this.is_pretty_account = is_pretty_account;
     }
+
+    public int getUser_agent_id() {
+        return user_agent_id;
+    }
+
+    public void setUser_agent_id(int user_agent_id) {
+        this.user_agent_id = user_agent_id;
+    }
 }

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

@@ -182,15 +182,17 @@
     <string name="got_it">Paham</string>
     <string name="force_closed_by_admin">Ruang siaran Anda telah ditutup oleh administrator</string>
     <string name="game_prize">%s baru saja memenangkan %s koin dalam %s, luar biasa!</string>
-    <string name="select_pk_anchor">Select PK Anchor</string>
-    <string name="please_enter_the_host_id_name">Please enter the host ID / name</string>
-    <string name="invite_pk">Invite PK</string>
-    <string name="initiate_invitation">Initiate invitation</string>
-    <string name="inviting_time">Inviting…(%ss)</string>
-    <string name="invites_you_to_pk">%s invites you to PK</string>
-    <string name="accept_swago">Accept</string>
-    <string name="refuse_swago">Refuse</string>
-    <string name="peer_liver_refuse_pk">对方拒绝您的PK</string>
-    <string name="send_pk_liver_cancel">发起方取消了PK</string>
+
+    <string name="select_pk_anchor">Silakan pilih host PK</string>
+    <string name="please_enter_the_host_id_name">Silakan masukkan ID host</string>
+    <string name="invite_pk">Undang PK</string>
+    <string name="initiate_invitation">Memulai undangan</string>
+    <string name="inviting_time">Mengundang…(%ss)</string>
+    <string name="invites_you_to_pk">%s mengundang Anda PK</string>
+    <string name="accept_swago">Terima</string>
+    <string name="refuse_swago">Menolak</string>
+    <string name="fans_x">Penggemar:%s</string>
+    <string name="peer_liver_refuse_pk">Dia menolak undangan Anda</string>
+    <string name="send_pk_liver_cancel">Pemrakarsa membatalkan undangan</string>
 
 </resources>

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

@@ -182,14 +182,15 @@
     <string name="got_it">Okay!</string>
     <string name="force_closed_by_admin">Ruang langsung anda telah ditutup oleh admin</string>
     <string name="game_prize">%s baru sahaja memenangi %s syiling dalam %s, itu hebat!</string>
-    <string name="select_pk_anchor">Select PK Anchor</string>
-    <string name="please_enter_the_host_id_name">Please enter the host ID / name</string>
-    <string name="invite_pk">Invite PK</string>
-    <string name="initiate_invitation">Initiate invitation</string>
-    <string name="inviting_time">Inviting…(%ss)</string>
-    <string name="invites_you_to_pk">%s invites you to PK</string>
-    <string name="accept_swago">Accept</string>
-    <string name="refuse_swago">Refuse</string>
-    <string name="peer_liver_refuse_pk">对方拒绝您的PK</string>
-    <string name="send_pk_liver_cancel">发起方取消了PK</string>
+
+    <string name="select_pk_anchor">Pilih penyiar PK</string>
+    <string name="please_enter_the_host_id_name">Masukkan ID anda</string>
+    <string name="invite_pk">Menjemput PK</string>
+    <string name="initiate_invitation">Jemputan untuk memulakan</string>
+    <string name="inviting_time">Jemputan masuk…(%ss)</string>
+    <string name="invites_you_to_pk">%s menjemput anda untuk PK bersama</string>
+    <string name="accept_swago">Terima</string>
+    <string name="refuse_swago">Menolak</string>
+    <string name="peer_liver_refuse_pk">Pihak lawan telah menolak PK anda</string>
+    <string name="send_pk_liver_cancel">Pengundang telah membatalkan PK</string>
 </resources>

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

@@ -172,14 +172,14 @@
     <string name="got_it">知道了</string>
     <string name="force_closed_by_admin">您的直播间已被管理员关闭</string>
     <string name="game_prize">%s刚刚在%s中赢得了%s金币，真是太厉害了</string>
-    <string name="select_pk_anchor">Select PK Anchor</string>
-    <string name="please_enter_the_host_id_name">Please enter the host ID / name</string>
-    <string name="invite_pk">Invite PK</string>
-    <string name="initiate_invitation">Initiate invitation</string>
-    <string name="inviting_time">Inviting…(%ss)</string>
-    <string name="invites_you_to_pk">%s invites you to PK</string>
-    <string name="accept_swago">Accept</string>
-    <string name="refuse_swago">Refuse</string>
+    <string name="select_pk_anchor">选择PK主播</string>
+    <string name="please_enter_the_host_id_name">请输入主播ID</string>
+    <string name="invite_pk">邀请PK</string>
+    <string name="initiate_invitation">发起邀请</string>
+    <string name="inviting_time">邀请中…(%ss)</string>
+    <string name="invites_you_to_pk">%s邀请你一起PK</string>
+    <string name="accept_swago">接受</string>
+    <string name="refuse_swago">拒绝</string>
     <string name="peer_liver_refuse_pk">对方拒绝您的PK</string>
     <string name="send_pk_liver_cancel">发起方取消了PK</string>
 

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

@@ -201,8 +201,8 @@
     <string name="game_prize">%s just won %s coins in %s, that\'s awesome!</string>
 
 
-    <string name="select_pk_anchor">Select PK Anchor</string>
-    <string name="please_enter_the_host_id_name">Please enter the host ID / name</string>
+    <string name="select_pk_anchor">Choose PK host</string>
+    <string name="please_enter_the_host_id_name">Please enter the host ID</string>
     <string name="invite_pk">Invite PK</string>
     <string name="initiate_invitation">Initiate invitation</string>
     <string name="inviting_time">Inviting…(%ss)</string>
@@ -210,7 +210,7 @@
     <string name="accept_swago">Accept</string>
     <string name="refuse_swago">Refuse</string>
     <string name="fans_x">Fans:%s</string>
-    <string name="peer_liver_refuse_pk">对方拒绝您的PK</string>
-    <string name="send_pk_liver_cancel">发起方取消了PK</string>
+    <string name="peer_liver_refuse_pk">The other party rejected your PK</string>
+    <string name="send_pk_liver_cancel">The initiator cancels the PK</string>
 
 </resources>

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

@@ -45,7 +45,7 @@ class AnchorFooterView : ConstraintLayout, IFooter, IRoomActiveListener {
         binding = LayoutAnchorFooterViewBinding.inflate(LayoutInflater.from(context), this, true)
 
         UserInfo.getUserInfo()?.let {
-            if (it.user_type == 1){
+            if (it.user_type == 1&&it.user_agent_id>0){
                 binding.ivPK.visibility = View.VISIBLE
             }else{
                 binding.ivPK.visibility = View.GONE