修改游戏的new图标展示，网页中英文检测

common/src/main/java/com/yunbao/common/adapter/InteractionGamesAdapter.java

@@ -31,7 +31,7 @@ public class InteractionGamesAdapter extends RecyclerView.Adapter {
     @NonNull
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View runGamesView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_fun_games_child_view, parent, false);
+        View runGamesView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_live_new_role_fun_games_child_view3, parent, false);
         return new InteractionGamesChildViewHolder(runGamesView);
     }
 
@@ -46,7 +46,7 @@ public class InteractionGamesAdapter extends RecyclerView.Adapter {
                 long activityID = TextUtils.isEmpty(model.getSrc()) ? 0 : Long.parseLong(model.getSrc());
                 if (activityID != 0) {
                     Bus.get().post(new CustomDrawerPopupEvent()
-                            .setDisMiss(true).setInteractionID(activityID).setInteraction(true));
+                            .setDisMiss(true).setInteractionID(activityID).setInteraction(true).setChild(child));
                 }
 
 

common/src/main/java/com/yunbao/common/bean/CustomSidebarChildModel.java

@@ -34,6 +34,17 @@ public class CustomSidebarChildModel extends BaseModel {
     private String flag = "";
     @SerializedName("is_show")
     private String isShow;
+    @SerializedName("sud_game_is_new")
+    private String sudGameIsNew;
+
+    public String getSudGameIsNew() {
+        return sudGameIsNew;
+    }
+
+    public CustomSidebarChildModel setSudGameIsNew(String sudGameIsNew) {
+        this.sudGameIsNew = sudGameIsNew;
+        return this;
+    }
 
     public String getIsShow() {
         return isShow;

common/src/main/java/com/yunbao/common/bean/CustomSidebarInfoModel.java

@@ -26,6 +26,8 @@ public class CustomSidebarInfoModel extends BaseModel {
     private String src;
     @SerializedName("type")
     private String type;
+    @SerializedName("sud_game_is_new")
+    private String sudGameIsNew;
     @SerializedName("child")
     private List<CustomSidebarChildModel> child;
 
@@ -38,6 +40,15 @@ public class CustomSidebarInfoModel extends BaseModel {
         return this;
     }
 
+    public String getSudGameIsNew() {
+        return sudGameIsNew;
+    }
+
+    public CustomSidebarInfoModel setSudGameIsNew(String sudGameIsNew) {
+        this.sudGameIsNew = sudGameIsNew;
+        return this;
+    }
+
     public String getTitle() {
         return title;
     }

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

@@ -34,7 +34,11 @@ public class InteractionGamesChildViewHolder extends RecyclerView.ViewHolder {
 
 
         funGameName.setText(model.getTitle());
-
+        if (!TextUtils.isEmpty(model.getSudGameIsNew())||TextUtils.equals(model.getSudGameIsNew(),"1")){
+            itemView.findViewById(R.id.icon_new_game).setVisibility(View.VISIBLE);
+        }else {
+            itemView.findViewById(R.id.icon_new_game).setVisibility(View.GONE);
+        }
         ViewClicksAntiShake.clicksAntiShake(itemView, new ViewClicksAntiShake.ViewClicksCallBack() {
             @Override
             public void onViewClicks() {

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

@@ -47,6 +47,7 @@
         <TextView
             android:layout_width="120dp"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="5dp"
             android:gravity="end"
             android:text="@string/interactive_game_create_room_name"
             android:textColor="@color/white"
@@ -76,6 +77,7 @@
         <TextView
             android:layout_width="120dp"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="5dp"
             android:gravity="end"
             android:text="@string/interactive_game_create_game_type"
             android:textColor="@color/white"
@@ -104,6 +106,7 @@
         <TextView
             android:layout_width="120dp"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="5dp"
             android:gravity="end"
             android:text="@string/interactive_game_create_game_sill"
             android:textColor="@color/white"
@@ -114,13 +117,14 @@
             android:layout_width="175dp"
             android:layout_height="32dp"
             android:background="@drawable/bg_live_sud_list_input"
+            android:ellipsize="end"
             android:hint="@string/interactive_game_create_gold_bean_quantity"
             android:inputType="numberDecimal"
+            android:maxEms="5"
             android:paddingStart="12dp"
             android:paddingTop="9dp"
-            android:maxEms="5"
-            android:ellipsize="end"
             android:paddingBottom="9dp"
+            android:digits="123456789"
             android:textColor="@color/white"
             android:textColorHint="#FFFFFF"
             android:textSize="10sp" />

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

@@ -51,6 +51,7 @@
             android:layout_height="wrap_content"
             android:text="@string/interactive_game_create_room_name"
             android:textColor="#000"
+            android:layout_marginEnd="5dp"
             android:textSize="14sp" />
 
         <EditText
@@ -80,6 +81,7 @@
             android:layout_height="wrap_content"
             android:text="@string/interactive_game_create_game_type"
             android:textColor="#000"
+            android:layout_marginEnd="5dp"
             android:textSize="14sp" />
 
         <TextView
@@ -108,12 +110,14 @@
             android:layout_height="wrap_content"
             android:text="@string/interactive_game_create_game_sill"
             android:textColor="#000"
+            android:layout_marginEnd="5dp"
             android:textSize="14sp" />
 
         <EditText
             android:id="@+id/game_sill"
             android:layout_width="175dp"
             android:layout_height="32dp"
+            android:digits="123456789"
             android:background="@drawable/bg_live_sud_list_input_home"
             android:hint="@string/interactive_game_create_gold_bean_quantity"
             android:inputType="numberDecimal"

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

@@ -33,10 +33,12 @@
             tools:visibility="gone" />
 
         <ImageView
+            android:id="@+id/icon_new_game"
             android:layout_width="26dp"
             android:layout_height="13dp"
-            android:layout_marginTop="2dp"
             android:layout_gravity="end"
+            android:layout_marginTop="2dp"
+            android:visibility="gone"
             android:layout_marginEnd="5dp"
             android:src="@mipmap/icon_new_game" />
     </FrameLayout>

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

@@ -41,6 +41,7 @@ import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.ProcessImageUtil;
 import com.yunbao.common.utils.SVGAViewUtils;
 import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.utils.WordUtil;
 import com.yunbao.common.utils.formatBigNum;
 import com.yunbao.live.R;
 import com.yunbao.live.bean.GuardUserBean;
@@ -1452,7 +1453,7 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
      */
     public void openLuckGiftTip() {
         UserBean u = CommonAppConfig.getInstance().getUserBean();
-        String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname=" + u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&anchorUid=" + mLiveUid + "&anchorName=" + mAncherName;
+        String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname=" + u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&anchorUid=" + mLiveUid + "&anchorName=" + mAncherName+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
         startActivity(new Intent(this, ZhuangBanActivity.class).putExtra("url", url).putExtra("title", ""));
     }
 

live/src/main/java/com/yunbao/live/dialog/LiveHDDialogFragment.java

@@ -191,7 +191,8 @@ public class LiveHDDialogFragment extends AbsDialogFragment {
             mWebView.setLayoutParams(params);
         }
         String url = bundle.getString("url");
-        url += "&anchorUid=" + mLiveUid+"&stream="+mStream;
+        url += "&anchorUid=" + mLiveUid+"&stream="+mStream+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
+        Log.e("H5--半屏",url);
         mWebView.loadUrl(url);
         mWebView.setWebViewClient(new WebViewClient() {
             @Override

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

@@ -2046,13 +2046,13 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                                     if (link.equals("sc")) {
                                         String url;
                                         if (!"".equals(bean.getmIntoUrl()) && bean.getmIntoUrl() != null) {
-                                            url = CommonAppConfig.HOST + bean.getmIntoUrl() + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
+                                            url = CommonAppConfig.HOST + bean.getmIntoUrl() + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
                                         } else {
-                                            url = CommonAppConfig.HOST + "/h5/activity/firstTopUp/newUp.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
+                                            url = CommonAppConfig.HOST + "/h5/activity/firstTopUp/newUp.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
                                         }
                                         ZhuangBanActivity.forward(mContext, url, false, 1);
                                     } else if (link.equals("zxb")) {
-                                        String url = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid;
+                                        String url = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
                                         ZhuangBanActivity.forward(mContext, url, false, 1);
                                     } else if (link.equals("xyd")) {
                                         openWishListWindow();
@@ -2317,7 +2317,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                                         url += "&";
                                     }
                                     url += "uid=" + CommonAppConfig.getInstance().getUid() + "&token="
-                                            + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid;
+                                            + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
                                     bundle.putString("url", url);
                                     bundle.putInt("height", DpUtil.dp2px(500));
                                     bundle.putInt("show_type", 0);