Commit 404096c7 by konghaorui

Merge branch 'feature/v3' of…

Merge branch 'feature/v3' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/v3
parents 3bcdb518 5b4c5e73
...@@ -379,7 +379,9 @@ public class WVClickAbstractListener implements WebViewClientClickListener { ...@@ -379,7 +379,9 @@ public class WVClickAbstractListener implements WebViewClientClickListener {
@Override @Override
public void openRightTopMenu() { public void openRightTopMenu() {
if (mContext instanceof NewH5Activity) {
((NewH5Activity) mContext).openRightTopMenu();
}
} }
@Override @Override
...@@ -403,7 +405,7 @@ public class WVClickAbstractListener implements WebViewClientClickListener { ...@@ -403,7 +405,7 @@ public class WVClickAbstractListener implements WebViewClientClickListener {
final StringBuffer sb = new StringBuffer(); final StringBuffer sb = new StringBuffer();
sb.append(callbackFuncName); sb.append(callbackFuncName);
sb.append("('"); sb.append("('");
sb.append("333"); sb.append("33,125");
sb.append("')"); sb.append("')");
if (mContext instanceof NewH5Activity) { if (mContext instanceof NewH5Activity) {
((NewH5Activity) mContext).callJSFunc(sb.toString()); ((NewH5Activity) mContext).callJSFunc(sb.toString());
......
...@@ -74,7 +74,7 @@ ext { ...@@ -74,7 +74,7 @@ ext {
"ydl-platform" : "0.0.29.3", "ydl-platform" : "0.0.29.3",
//第二步 若干 //第二步 若干
"ydl-webview" : "0.0.28.11", "ydl-webview" : "0.0.28.12",
"ydl-media" : "0.0.14.4", "ydl-media" : "0.0.14.4",
"ydl-pay" : "0.0.11.5", "ydl-pay" : "0.0.11.5",
"m-audioim" : "0.0.40.4", "m-audioim" : "0.0.40.4",
......
...@@ -173,7 +173,7 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView, ...@@ -173,7 +173,7 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView,
} }
override fun afterViewCreated(savedInstanceState: Bundle) { override fun afterViewCreated(savedInstanceState: Bundle?) {
isPrepared = true //View创建完成 isPrepared = true //View创建完成
lazyLoad() lazyLoad()
} }
......
...@@ -50,7 +50,11 @@ class MoreClickView @JvmOverloads constructor(private val mContext: Context, att ...@@ -50,7 +50,11 @@ class MoreClickView @JvmOverloads constructor(private val mContext: Context, att
un_read_num.visibility = View.GONE un_read_num.visibility = View.GONE
} }
else { else {
un_read_num.text = unreadNum.toString() if (unreadNum > 99) {
un_read_num.text = "${unreadNum}+"
} else {
un_read_num.text = unreadNum.toString()
}
} }
} }
......
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