修改中英文

common/src/main/java/com/yunbao/common/activity/SudGameActivity.java

@@ -100,6 +100,7 @@ public class SudGameActivity extends AbsActivity {
 
         gameConfigModel.ui.lobby_players.custom = true;
         gameConfigModel.ui.join_btn.custom = true;
+        gameConfigModel.ui.lobby_game_setting.hide = true; // 配置不隐藏ping值
 
         // SudMGP平台64bit游戏ID
         gameViewModel.switchGame((Activity) mContext, mLiveUid, mInteractionID);

common/src/main/java/com/yunbao/common/sud/BaseGameViewModel.java

@@ -104,8 +104,9 @@ public abstract class BaseGameViewModel implements SudFSMMGListener {
     private void initSdk(Activity activity, long gameId, String code) {
         String appId = getAppId();
         String appKey = getAppKey();
+        boolean testEnv = isTestEnv();
         // 初始化sdk
-        SudMGP.initSDK(activity, appId, appKey, isTestEnv(), new ISudListenerInitSDK() {
+        SudMGP.initSDK(activity, appId, appKey,testEnv, new ISudListenerInitSDK() {
             @Override
             public void onSuccess() {
                 loadGame(activity, code, gameId);

common/src/main/java/com/yunbao/common/sud/QuickStartGameViewModel.java

@@ -6,6 +6,7 @@ import android.view.View;
 
 import androidx.lifecycle.MutableLiveData;
 
+import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.CommonAppContext;
 import com.yunbao.common.bean.SudgameCodeModel;
 import com.yunbao.common.http.base.HttpCallback;
@@ -40,7 +41,6 @@ public class QuickStartGameViewModel extends BaseGameViewModel {
     /**
      * true 加载游戏时为测试环境 false 加载游戏时为生产环境
      */
-    public static final boolean GAME_IS_TEST_ENV = true;
 
     /**
      * 使用的UserId。这里随机生成作演示，开发者将其修改为业务使用的唯一userId
@@ -208,7 +208,7 @@ public class QuickStartGameViewModel extends BaseGameViewModel {
      */
     @Override
     protected boolean isTestEnv() {
-        return GAME_IS_TEST_ENV;
+        return CommonAppConfig.HOST.contains("ceshi");
     }
 
     /**

common/src/main/java/com/yunbao/common/views/LiveSudGamePopup.java

@@ -21,7 +21,6 @@ import com.yunbao.common.http.live.LiveNetManager;
 import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.sud.QuickStartGameViewModel;
 import com.yunbao.common.sud.model.GameConfigModel;
-import com.yunbao.common.sud.model.GameViewInfoModel;
 import com.yunbao.common.utils.Bus;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
@@ -108,7 +107,10 @@ public class LiveSudGamePopup extends BottomPopupView {
         GameConfigModel gameConfigModel = gameViewModel.getGameConfigModel();
         gameConfigModel.ui.ping.hide = true; // 配置不隐藏ping值
         gameConfigModel.ui.level.hide = true; // 配置不隐藏ping值
+        gameConfigModel.ui.lobby_game_setting.hide = true; // 配置不隐藏ping值
 
+        gameConfigModel.ui.lobby_players.custom = true;
+        gameConfigModel.ui.join_btn.custom = true;
         // SudMGP平台64bit游戏ID
         gameViewModel.switchGame((Activity) getContext(), mLiveUid, mInteractionID);
     }

common/src/main/res/layout/hint_custom_popup.xml

@@ -41,7 +41,7 @@
             <TextView
                 android:id="@+id/live_open_cancel"
                 android:layout_width="120dp"
-                android:layout_height="40dp"
+                android:layout_height="50dp"
                 android:layout_marginStart="10dp"
                 android:background="@drawable/backgroud_live_open_lfet"
                 android:gravity="center"
@@ -49,7 +49,7 @@
                 android:paddingEnd="5dp"
                 android:text="@string/back"
                 android:textColor="#FFC621"
-                android:textSize="14sp" />
+                android:textSize="12sp" />
 
             <View
                 android:layout_width="match_parent"
@@ -59,7 +59,7 @@
             <TextView
                 android:id="@+id/live_open_ok"
                 android:layout_width="120dp"
-                android:layout_height="40dp"
+                android:layout_height="50dp"
                 android:layout_marginEnd="10dp"
                 android:background="@drawable/backgroud_live_open_right"
                 android:gravity="center"

config.gradle

@@ -4,14 +4,14 @@ ext {
             buildToolsVersion: "29.0.2",
             minSdkVersion    : 21,
             targetSdkVersion : 33,
-            versionCode      : 450,
+            versionCode      : 453,
             versionName      : "6.6.0"
     ]
     manifestPlaceholders = [
             //正式、
-//            serverHost       : "https://napi.yaoulive.com",
+            serverHost       : "https://napi.yaoulive.com",
 //             测试
-            serverHost       : " https://ceshi.yaoulive.com",
+//            serverHost       : " https://ceshi.yaoulive.com",
 
 
 
@@ -22,10 +22,10 @@ ext {
 
             baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
 //            true表示谷歌支付 false
-            isGooglePlay     :  false,
+            isGooglePlay     :  true,
             //是否上报异常日志
             isUploadLog      :  true,
             //是否打包成插件包模式
-            isPluginModel    :  true,
+            isPluginModel    :  false,
     ]
 }

live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java

@@ -1621,6 +1621,10 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
                 if (mLiveRyLinkMicPkPresenter != null) {
                     mLiveRyLinkMicPkPresenter.leaveDRRoom();
                 }
+                if (mLiveRoomViewHolder != null) {
+                    mLiveRoomViewHolder.seisShowGif(true);
+                    mLiveRoomViewHolder.endDRGif();
+                }
 //                if (mLiveRoomViewHolder != null) {
 //                    mLiveRoomViewHolder.hotAddVisibility(false);
 //                }

live/src/main/java/com/yunbao/live/adapter/FrameGiftAdapter.java

@@ -51,6 +51,7 @@ public class FrameGiftAdapter extends RecyclerView.Adapter {
             public void onCallBack(int position, LiveGiftBean model) {
                 Bus.get().post(new LiveGiftItemEvent().setLiveGiftModel(model));
                 wishGiftId = null;
+                giftSelect(model);
             }
         });
     }

live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java

@@ -88,6 +88,12 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
     private int mPosition;
     private boolean isBottom = false;
     private int fountSize = 13;
+    private String isFans;
+
+    public LiveChatAdapter setFans(String fans) {
+        isFans = fans;
+        return this;
+    }
 
     public LiveChatAdapter(Context context) {
         mContext = context;
@@ -427,7 +433,12 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
                 bean.setHeart(position);
                 ImgLoader.display(mContext, bean.getId(), clipImage2);
                 attentionLayout.setVisibility(View.VISIBLE);
+                if (TextUtils.isEmpty(isFans)) {
                     btnAttention.setVisibility(bean.isAttention() ? View.GONE : View.VISIBLE);
+                } else {
+                    btnAttention.setVisibility(TextUtils.equals(isFans, "1") ? View.GONE : View.VISIBLE);
+                }
+
 //                btnAttention.setOnClickListener(new View.OnClickListener() {
 //                    @Override
 //                    public void onClick(View v) {

live/src/main/java/com/yunbao/live/adapter/LiveParcelItemAdapter.java

@@ -43,6 +43,7 @@ public class LiveParcelItemAdapter extends RecyclerView.Adapter {
             @Override
             public void onCallBack(int position, LiveGiftBean model) {
                 Bus.get().post(new LiveGiftItemEvent().setLiveGiftModel(model));
+                giftSelect(model);
             }
         });
     }

live/src/main/java/com/yunbao/live/utils/LiveTextRender.java

@@ -43,6 +43,7 @@ import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.manager.NewLevelManager;
 import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.StringUtil;
+import com.yunbao.common.utils.WordUtil;
 import com.yunbao.live.R;
 import com.yunbao.live.bean.LiveChatBean;
 
@@ -795,7 +796,7 @@ public class LiveTextRender {
 
     public SpannableStringBuilder renderGiftInfo2(String giftName) {
         SpannableStringBuilder builder = new SpannableStringBuilder();
-        String s1 = CommonAppContext.sInstance.getBaseContext().getString(R.string.live_send_gift_1);
+        String s1 = WordUtil.isNewZh() ? "送" : "sent";
         String content = s1 + " " + giftName;
         int index1 = s1.length();
         builder.append(content);

live/src/main/java/com/yunbao/live/views/LiveGiftItemFragment.java

@@ -78,7 +78,7 @@ public class LiveGiftItemFragment extends BaseFragment {
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onLiveGiftItemEvent(LiveGiftItemEvent event) {
-        frameGiftAdapter.giftSelect(event.getLiveGiftModel());
+//        frameGiftAdapter.giftSelect(event.getLiveGiftModel());
     }
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onLiveGiftItemRefreshEvent(LiveGiftItemRefreshEvent event) {

live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java

@@ -1185,7 +1185,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                     LiveRoomViewHolder.follow();
                     mLiveChatAdapter.removetItem(bean);
                 } else if (bean.getType() == -2) {
-                    if (!bean.isAttention()) {
+
+                    if (mBtnFollow.getVisibility() == View.VISIBLE && !bean.isAttention()) {
                         LiveRoomViewHolder.follow();
                     }
                     mLiveChatAdapter.removetItem(bean);
@@ -2732,10 +2733,16 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
             if (attention == 0) {
                 mBtnFollow.setVisibility(View.VISIBLE);
                 mViewMedal.setVisibility(View.GONE);
+                if (mLiveChatAdapter != null) {
+                    mLiveChatAdapter.setFans("0");
+                }
             } else {
                 if (mBtnFollow.getVisibility() == View.VISIBLE) {
                     mBtnFollow.setVisibility(View.GONE);
                     mViewMedal.setVisibility(View.VISIBLE);
+                    if (mLiveChatAdapter != null) {
+                        mLiveChatAdapter.setFans("1");
+                    }
                 }
             }
         }
@@ -3193,6 +3200,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
      * 关注主播
      */
     public static void follow() {
+
         EventBus.getDefault().post("stop_svga_new_user_follow");
 
         LiveHttpUtil.setFrontTask("attent", new HttpCallback() {
@@ -4036,6 +4044,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
 
     public void setFansGroup(String isFans) {
         this.isFans = isFans.equals("1");
+
     }
 
 

live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java

@@ -1135,6 +1135,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
                             .dismissOnBackPressed(false)
                             .asCustom(new LiveSudGamePopup(mContext, createSudRoomModel))
                             .show();
+                    createSudRoomModel = null;
                 }
 //                String jsonCreateSudRoom = IMLoginManager.get(mContext).getSudGame();
 //                if (!TextUtils.isEmpty(jsonCreateSudRoom)) {

live/src/main/res/layout/item_live_chat.xml

@@ -206,12 +206,13 @@
 
         <TextView
             android:id="@+id/automatic_chat"
-            android:layout_weight="0.5"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_marginTop="3dp"
+            android:layout_marginEnd="10dp"
             android:layout_marginBottom="3dp"
+            android:layout_weight="0.5"
             android:clickable="false"
             android:enabled="false"
             android:gravity="start"
@@ -220,13 +221,12 @@
             android:textSize="12sp" />
 
         <ImageView
-            android:layout_weight="0"
             android:id="@+id/btn_attention"
             android:layout_width="54dp"
             android:layout_height="26dp"
             android:layout_gravity="end|center_vertical"
-            android:layout_marginStart="10dp"
             android:layout_marginEnd="11dp"
+            android:layout_weight="0"
             android:clickable="false"
             android:src="@mipmap/btn_attention" />
 

live/src/main/res/layout/view_hight_nobility.xml

@@ -19,15 +19,19 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="14dp"
+        android:paddingStart="20dp"
+        android:paddingEnd="20dp"
         android:text="@string/site_wide_news_hint1"
         android:textColor="#FFAAAAAA"
         android:textSize="14sp" />
 
     <TextView
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="12dp"
+        android:paddingStart="20dp"
+        android:paddingEnd="20dp"
         android:text="@string/site_wide_news_hint2"
         android:textColor="#FFAAAAAA"
         android:textSize="14sp" />
@@ -37,8 +41,8 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="22dp"
-        android:layout_marginBottom="15dp"
         android:layout_marginEnd="16dp"
+        android:layout_marginBottom="15dp"
         android:gravity="center_horizontal">
 
         <TextView

live/src/main/res/layout/view_live_end.xml

@@ -300,8 +300,8 @@
 
                 <ImageView
                     android:id="@+id/change_batch_user"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="90dp"
+                    android:layout_height="30dp"
                     android:layout_gravity="center_vertical|right"
                     android:background="@mipmap/icon_cange" />
 

main/src/main/java/com/yunbao/main/activity/BindUserActivity.java

@@ -273,9 +273,9 @@ public class BindUserActivity extends AbsActivity {
         } else if (i == R.id.btn_register) {
             register();
         } else if (i == R.id.btn_tip2) {
-            WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY1,false);
+            WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY1+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"),false);
         } else if (i == R.id.btn_tip3) {
-            WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY2,false);
+            WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY2+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"),false);
         } else if (i == R.id.btn_goto_updata) {
             lt_now_bind.setVisibility(View.GONE);
             lt_first_bind.setVisibility(View.VISIBLE);

main/src/main/java/com/yunbao/main/activity/EntryActivity.java

@@ -209,14 +209,14 @@ public class EntryActivity extends AppCompatActivity {
         btn_tip1.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                WebViewActivity.forward(EntryActivity.this, HtmlConfig.LOGIN_PRIVCAY,false);
+                WebViewActivity.forward(EntryActivity.this, HtmlConfig.LOGIN_PRIVCAY+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"),false);
             }
         });
 
         btn_tip.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                WebViewActivity.forward(EntryActivity.this, HtmlConfig.LOGIN_PRIVCAY1,false);
+                WebViewActivity.forward(EntryActivity.this, HtmlConfig.LOGIN_PRIVCAY1+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"),false);
 
             }
         });

main/src/main/java/com/yunbao/main/activity/LoginActivity.java

@@ -50,6 +50,7 @@ import com.yunbao.common.manager.NoviceInstructorManager;
 import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.utils.WordUtil;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
 import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
@@ -239,7 +240,7 @@ public class LoginActivity extends AbsActivity {
 
     //登录即代表同意服务和隐私条款
     private void forwardTip() {
-        WebViewActivity.forward(mContext, HtmlConfig.LOGIN_PRIVCAY,false);
+        WebViewActivity.forward(mContext, HtmlConfig.LOGIN_PRIVCAY+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"),false);
     }
 
 

main/src/main/java/com/yunbao/main/activity/RegisterActivity.java

@@ -282,9 +282,9 @@ public class RegisterActivity extends AbsActivity {
         } else if (i == R.id.btn_register) {
             register();
         } else if (i == R.id.btn_tip2) {
-            WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY1,false);
+            WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY1+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"),false);
         } else if (i == R.id.btn_tip3) {
-            WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY2,false);
+            WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY2+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"),false);
         }
     }
 

main/src/main/java/com/yunbao/main/views/SearchResultsViewHolder.java

@@ -20,6 +20,7 @@ import com.yunbao.common.bean.SearchModel;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.manager.NewLevelManager;
 import com.yunbao.common.utils.Bus;
+import com.yunbao.common.utils.WordUtil;
 import com.yunbao.common.utils.WordsTypeUtil;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
 import com.yunbao.main.R;
@@ -71,7 +72,7 @@ public class SearchResultsViewHolder extends RecyclerView.ViewHolder {
         ImgLoader.displayAvatar(itemView.getContext(), model.getAvatar(), avatar);
         Glide.with(itemView.getContext())
                 .asGif()
-                .load(R.mipmap.icon_user_home_living).skipMemoryCache(false)
+                .load(WordUtil.isNewZh()?R.mipmap.icon_user_home_living:R.mipmap.icon_user_home_living_en).skipMemoryCache(false)
                 .into(isLive);
         //用戶直接隱藏
         if (type == 3) {

main/src/main/res/layout/item_main_home_lives_class.xml

@@ -11,7 +11,7 @@
 
     <TextView
         android:id="@+id/tv_class_name"
-        android:layout_width="56dp"
+        android:layout_width="65dp"
         android:layout_height="26dp"
         android:text="音乐"
         android:textSize="16sp"

main/src/main/res/layout/item_main_me_2.xml

@@ -18,6 +18,8 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="6dp"
         android:text=""
+        android:singleLine="true"
+        android:ellipsize="end"
         android:textColor="@color/textColor"
         android:textSize="12sp" />