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 @@
Harvest
Number of visitors
Guan Zhong
- Tell you something
+ Let\'s have a chat~
Open the barrage,
strip
Please enter the room password
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 @@
收穫
觀看人數
關播中
- 和大家說點什麼…
+ 一起来聊聊天吧～
開啟彈幕，
條
請輸入房間密碼
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 processRankData(JSONObject json){
JSONArray rank=Integer.parseInt(Tips)==4?json.getJSONArray("listDay"):json.getJSONArray("listWeek");
List 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" />
-
+ android:visibility="visible" />