From 11854ba95a2aabc39dd9cbf544457a2b5fc72ebc Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Tue, 30 Aug 2022 18:57:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=B0=8F=E6=97=B6=E6=A6=9C=E5=A4=9A?=
 =?UTF-8?q?=E6=AC=A1=E8=B7=B3=E8=BD=AC=E5=90=8E=E8=BF=94=E5=9B=9E=E6=98=AF?=
 =?UTF-8?q?=E5=9B=9E=E5=88=B0=E4=B8=BB=E9=A1=B5=20update:=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/src/main/res/values-en/strings.xml     |   2 +-
 common/src/main/res/values/strings.xml        |   2 +-
 .../live/dialog/LiveHDDialogFragment.java     |  17 ++++++++++++++++-
 .../dialog/LiveUserMoreDialogFragment.java    |   2 +-
 .../live/views/LiveAudienceViewHolder.java    |   9 +++------
 .../yunbao/live/views/LiveRoomViewHolder.java |   2 +-
 .../main/res/layout/view_live_audience.xml    |   4 +++-
 live/src/main/res/layout/view_live_room.xml   |  14 ++++++--------
 live/src/main/res/mipmap-mdpi/messagesss.png  | Bin 3351 -> 5243 bytes
 .../res/mipmap-xxxhdpi/live_icon_focus.png    | Bin 0 -> 1684 bytes
 10 files changed, 32 insertions(+), 20 deletions(-)
 create mode 100644 live/src/main/res/mipmap-xxxhdpi/live_icon_focus.png

diff --git a/common/src/main/res/values-en/strings.xml b/common/src/main/res/values-en/strings.xml
index c2a83a0bb..7ef2d21bc 100644
--- a/common/src/main/res/values-en/strings.xml
+++ b/common/src/main/res/values-en/strings.xml
@@ -306,7 +306,7 @@
     <string name="live_votes">Harvest</string>
     <string name="live_watch_num">Number of visitors</string>
     <string name="live_end_ing">Guan Zhong</string>
-    <string name="live_say_something">Tell you something</string>
+    <string name="live_say_something">Let\'s have a chat~</string>
     <string name="live_open_alba">Open the barrage,</string>
     <string name="live_tiao">strip</string>
     <string name="live_input_password">Please enter the room password</string>
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index b2d33fa3c..475578cd1 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -243,7 +243,7 @@
     <string name="live_votes">收穫</string>
     <string name="live_watch_num">觀看人數</string>
     <string name="live_end_ing">關播中</string>
-    <string name="live_say_something">和大家說點什麼…</string>
+    <string name="live_say_something">一起来聊聊天吧～</string>
     <string name="live_open_alba">開啟彈幕，</string>
     <string name="live_tiao">條</string>
     <string name="live_input_password">請輸入房間密碼</string>
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveHDDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveHDDialogFragment.java
index e1b6b4d16..72ea9c55b 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveHDDialogFragment.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveHDDialogFragment.java
@@ -4,6 +4,7 @@ import static com.yunbao.common.CommonAppContext.logger;
 import static com.yunbao.common.CommonAppContext.mFirebaseAnalytics;
 import static com.yunbao.common.utils.RouteUtil.PATH_COIN;
 
+import android.content.Intent;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
@@ -26,6 +27,7 @@ import com.adjust.sdk.Adjust;
 import com.adjust.sdk.AdjustEvent;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.alibaba.fastjson.JSON;
+import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.Constants;
 import com.yunbao.common.bean.JsWishBean;
 import com.yunbao.common.dialog.AbsDialogFragment;
@@ -35,6 +37,7 @@ import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.live.R;
 import com.yunbao.live.activity.LiveActivity;
 import com.yunbao.live.activity.LiveAudienceActivity;
+import com.yunbao.live.activity.ZhuangBanActivity;
 import com.yunbao.live.bean.LiveBean;
 import com.yunbao.live.http.LiveHttpUtil;
 import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
@@ -230,6 +233,18 @@ public class LiveHDDialogFragment extends AbsDialogFragment {
             //看直播
             gotoLive(liveId);
         }
+        @JavascriptInterface
+        public void androidClickToNewH5PageView(String url){
+            url = CommonAppConfig.HOST + url;
+            url += "?uid=" + CommonAppConfig.getInstance().getUid() + "&token="
+                    + CommonAppConfig.getInstance().getToken();
+            Log.i("tag", url);
+            Intent intent = new Intent(mContext, ZhuangBanActivity.class);
+            intent.putExtra("url", url);
+            intent.putExtra("isFull", false);
+            mContext.startActivity(intent);
+
+        }
     }
     private LiveRoomCheckLivePresenter mCheckLivePresenter;    private void gotoLive(final String live_id) {
         LiveHttpUtil.getLiveInfo(live_id, new HttpCallback() {
@@ -246,8 +261,8 @@ public class LiveHDDialogFragment extends AbsDialogFragment {
                                     return;
                                 }
 
+                                ((LiveAudienceActivity) mContext).finish();
                                 LiveAudienceActivity.forward(mContext, liveBean, liveType, liveTypeVal, "", 0, liveSdk);
-
                             }
                         });
                     }
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java
index 7fdb556c3..0d8a630d0 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java
@@ -302,7 +302,7 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
             private List<LiveUserRankBean> processRankData(JSONObject json){
                 JSONArray rank=Integer.parseInt(Tips)==4?json.getJSONArray("listDay"):json.getJSONArray("listWeek");
                 List<LiveUserRankBean> data =new ArrayList<>();
-                /**
+                /*
                  * 由于在线观众和粉丝列表实体结构与榜单结构不一致，做个兼容操作
                  */
                 if(rank==null){
diff --git a/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java
index c21050c40..07dc54aed 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java
@@ -377,13 +377,10 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
                     NewPeopleInfo peopleInfo = stringResponseModel.getData().getInfo();
                     if (peopleInfo.getIsShow()) {
                         liveNewPeople.setVisibility(View.VISIBLE);
-                        if(peopleInfo.getLink().startsWith("http")){
-                            newPeopleUrl = peopleInfo.getLink();
-                            if(!newPeopleUrl.contains("?")){
-                                newPeopleUrl+="?";
-                            }
+                        if (peopleInfo.getLink().startsWith("http")){
+                            newPeopleUrl=peopleInfo.getLink()+"?";
                         }else {
-                            newPeopleUrl = CommonAppConfig.HOST + peopleInfo.getLink();
+                            newPeopleUrl = CommonAppConfig.HOST + "/" + peopleInfo.getLink();
                         }
                     }
                 }, Throwable::printStackTrace).isDisposed();
diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
index 80ab25921..28984b08a 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -1155,7 +1155,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
             if (rank == 0) {
                 mHourRank.setText(R.string.no_rank_data);
             } else {
-                mHourRank.setText(formatBigNum.formatBigNum(rank + ""));
+                mHourRank.setText("第"+formatBigNum.formatBigNum(rank + "")+"名");
             }
         }
     }
diff --git a/live/src/main/res/layout/view_live_audience.xml b/live/src/main/res/layout/view_live_audience.xml
index a8456272c..591ced895 100644
--- a/live/src/main/res/layout/view_live_audience.xml
+++ b/live/src/main/res/layout/view_live_audience.xml
@@ -304,14 +304,16 @@
                     android:layout_height="25dp"
                     android:layout_gravity="center"
                     android:layout_marginLeft="5dp"
+                    android:visibility="gone"
                     android:src="@mipmap/icon_live_msg" />
 
                 <TextView
                     android:id="@+id/et_input"
                     android:layout_width="match_parent"
                     android:layout_height="30dp"
+                    android:layout_gravity="center"
                     android:alpha="0.5"
-                    android:gravity="center_vertical"
+                    android:gravity="center"
                     android:hint="@string/live_say_something"
                     android:singleLine="true"
                     android:textColor="@color/textColor"
diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml
index bd3b5f29f..4025e3d09 100644
--- a/live/src/main/res/layout/view_live_room.xml
+++ b/live/src/main/res/layout/view_live_room.xml
@@ -89,7 +89,7 @@
         <LinearLayout
             android:id="@+id/group_1"
             android:layout_width="wrap_content"
-            android:layout_height="33dp"
+            android:layout_height="34dp"
             android:layout_marginLeft="8dp"
             android:layout_marginTop="4dp"
             android:background="@drawable/bg_live_ico"
@@ -118,7 +118,7 @@
             </RelativeLayout>
 
             <LinearLayout
-                android:layout_width="wrap_content"
+                android:layout_width="60dp"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="5dp"
                 android:layout_marginRight="5dp"
@@ -148,19 +148,17 @@
 
             </LinearLayout>
 
-            <TextView
+            <ImageView
                 android:id="@+id/btn_follow"
                 android:layout_width="23dp"
                 android:layout_height="23dp"
                 android:layout_marginTop="3dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginEnd="5dp"
                 android:layout_marginBottom="3dp"
-                android:background="@drawable/bg_live_anchor_follow"
+                android:src="@mipmap/live_icon_focus"
                 android:gravity="center"
-                android:text="+"
                 android:textColor="@color/white"
-                android:textSize="16sp"
-                android:visibility="gone" />
+                android:visibility="visible" />
 
             <ImageView
                 android:id="@+id/view_medal"
diff --git a/live/src/main/res/mipmap-mdpi/messagesss.png b/live/src/main/res/mipmap-mdpi/messagesss.png
index 6ca311f03a20d83ddf353a155c1af488d0335603..5b62ecd0a79be253a4a16d6b9c8edc6af9bbdcf7 100644
GIT binary patch
literal 5243
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
BF#!Mo

literal 3351
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

diff --git a/live/src/main/res/mipmap-xxxhdpi/live_icon_focus.png b/live/src/main/res/mipmap-xxxhdpi/live_icon_focus.png
new file mode 100644
index 0000000000000000000000000000000000000000..0126cf0b59f0a8f45cf0f6134addd4fed12589e9
GIT binary patch
literal 1684
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

literal 0
HcmV?d00001