Commit 6cf9c5c9 by 刘鹏

feat : webview去掉右上角menu,im问题修复

parent f785c8bc
...@@ -10,7 +10,7 @@ ext { ...@@ -10,7 +10,7 @@ ext {
"m-fm" : "0.0.30.03", "m-fm" : "0.0.30.03",
"m-user" : "0.0.61.68", "m-user" : "0.0.61.68",
"m-home" : "0.0.22.70", "m-home" : "0.0.22.70",
"m-im" : "0.0.19.87", "m-im" : "0.0.19.89",
"m-dynamic" : "0.0.7.28", "m-dynamic" : "0.0.7.28",
"m-article" : "0.0.0.10", "m-article" : "0.0.0.10",
...@@ -36,7 +36,7 @@ ext { ...@@ -36,7 +36,7 @@ ext {
"ydl-platform" : "0.0.40.44", "ydl-platform" : "0.0.40.44",
//第二步 若干 //第二步 若干
"ydl-webview" : "0.0.38.49", "ydl-webview" : "0.0.38.51",
"ydl-media" : "0.0.21.10", "ydl-media" : "0.0.21.10",
"ydl-pay" : "0.0.18.19", "ydl-pay" : "0.0.18.19",
"m-audioim" : "0.0.49.29.37", "m-audioim" : "0.0.49.29.37",
...@@ -93,7 +93,7 @@ ext { ...@@ -93,7 +93,7 @@ ext {
"m-fm" : "0.0.30.01", "m-fm" : "0.0.30.01",
"m-user" : "0.0.61.68", "m-user" : "0.0.61.68",
"m-home" : "0.0.22.70", "m-home" : "0.0.22.70",
"m-im" : "0.0.19.87", "m-im" : "0.0.19.89",
"m-dynamic" : "0.0.7.28", "m-dynamic" : "0.0.7.28",
"m-article" : "0.0.0.8", "m-article" : "0.0.0.8",
...@@ -118,7 +118,7 @@ ext { ...@@ -118,7 +118,7 @@ ext {
"ydl-platform" : "0.0.40.44", "ydl-platform" : "0.0.40.44",
//第二步 若干 //第二步 若干
"ydl-webview" : "0.0.38.49", "ydl-webview" : "0.0.38.51",
"ydl-media" : "0.0.21.10", "ydl-media" : "0.0.21.10",
"ydl-pay" : "0.0.18.19", "ydl-pay" : "0.0.18.19",
"m-audioim" : "0.0.49.29.37", "m-audioim" : "0.0.49.29.37",
......
...@@ -161,6 +161,8 @@ class MedicalChatActivity : BaseActivity(), XRecyclerView.LoadingListener { ...@@ -161,6 +161,8 @@ class MedicalChatActivity : BaseActivity(), XRecyclerView.LoadingListener {
.subscribe({ it -> .subscribe({ it ->
if (it.before.data.size != 0 || it.nomal.data.size != 0) { if (it.before.data.size != 0 || it.nomal.data.size != 0) {
setData(it) setData(it)
}else{
resetPageShow()
} }
chat_recyclerview?.let { chat_recyclerview?.let {
chat_recyclerview.refreshComplete() chat_recyclerview.refreshComplete()
...@@ -170,6 +172,7 @@ class MedicalChatActivity : BaseActivity(), XRecyclerView.LoadingListener { ...@@ -170,6 +172,7 @@ class MedicalChatActivity : BaseActivity(), XRecyclerView.LoadingListener {
chat_recyclerview?.let { chat_recyclerview?.let {
chat_recyclerview.refreshComplete() chat_recyclerview.refreshComplete()
} }
resetPageShow()
}) })
} }
} }
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
android:gravity="center" android:gravity="center"
android:maxEms="10" android:maxEms="10"
android:maxLines="1" android:maxLines="1"
android:text="私聊" android:text="消息"
android:textColor="#10233a" android:textColor="#10233a"
android:textSize="18sp" android:textSize="18sp"
android:textStyle="bold" /> android:textStyle="bold" />
......
...@@ -606,13 +606,16 @@ public class NewH5Activity extends BaseActivity implements PtrHandler { ...@@ -606,13 +606,16 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
final Intent intent = getIntent(); final Intent intent = getIntent();
purl = intent.getStringExtra("purl"); purl = intent.getStringExtra("purl");
//要加"more"按钮 //要加"more"按钮
if (h5Params.isShowMenu()) { // if (h5Params.isShowMenu()) {
tb_title.setRightImageListener(v -> popupWindow = PopUtils.showMoreItem(this, // tb_title.setRightImageListener(v -> popupWindow = PopUtils.showMoreItem(this,
tb_title.getRootView(), jtoJHandle)); // tb_title.getRootView(), jtoJHandle));
tb_title.setRightImageIfShouldSee(); // tb_title.setRightImageIfShouldSee();
} else { // } else {
tb_title.setRightImageIfNoSee(); // tb_title.setRightImageIfNoSee();
} // }
tb_title.setRightImageVisibility(GONE);
if (h5Params.getShareData() != null && h5Params.getShareData().getShare_url() != null) { if (h5Params.getShareData() != null && h5Params.getShareData().getShare_url() != null) {
shareUrl = h5Params.getShareData().getShare_url(); shareUrl = h5Params.getShareData().getShare_url();
shareTitle = h5Params.getShareData().getTitle(); shareTitle = h5Params.getShareData().getTitle();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment