fix:小时榜多次跳转后返回是回到主页

update:调整UI

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>

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>

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);
-
                             }
                         });
                     }

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){

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")){
+                        if (peopleInfo.getLink().startsWith("http")){
-                            newPeopleUrl = peopleInfo.getLink();
+                            newPeopleUrl=peopleInfo.getLink()+"?";
-                            if(!newPeopleUrl.contains("?")){
-                                newPeopleUrl+="?";
-                            }
                         }else {
-                            newPeopleUrl = CommonAppConfig.HOST + peopleInfo.getLink();
+                            newPeopleUrl = CommonAppConfig.HOST + "/" + peopleInfo.getLink();
                         }
                     }
                 }, Throwable::printStackTrace).isDisposed();

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 + "")+"名");
             }
         }
     }

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"

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="visible" />
-                android:visibility="gone" />
 
             <ImageView
                 android:id="@+id/view_medal"