From abce02c7a61820f5d580f87364d542e817be429c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 06 七月 2021 15:22:11 +0800
Subject: [PATCH] 1.1.1完善
---
app/src/main/java/com/tejia/lijin/app/ui/invite/ShareBrowserActivity.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/invite/ShareBrowserActivity.java b/app/src/main/java/com/tejia/lijin/app/ui/invite/ShareBrowserActivity.java
index 58ab50f..ddc07b1 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/invite/ShareBrowserActivity.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/invite/ShareBrowserActivity.java
@@ -6,6 +6,7 @@
import android.content.ClipData;
import android.content.Intent;
import android.content.pm.ActivityInfo;
+import android.graphics.Bitmap;
import android.graphics.PixelFormat;
import android.net.Uri;
import android.os.Build;
@@ -105,6 +106,7 @@
String mTitle;
RebateJavaInterface javaInterface;
+ RebateJavaInterfaceBS javaInterface1;
private FrameLayout fl_full_video;
String tag1 = "config/getWebConfig";
@@ -152,7 +154,7 @@
iv_right = findViewById(R.id.iv_top_bar_right);
fl_webview = findViewById(R.id.fl_webview);
fl_full_video = findViewById(R.id.fl_full_video);
- tv_top_bar_left2.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_web_close, 0, 0, 0);
+
tv_top_bar_left.setOnClickListener(this);
tv_top_bar_left2.setOnClickListener(this);
iv_right.setOnClickListener(this);
@@ -217,8 +219,9 @@
CustomNavigationJsObject customNavigation = new CustomNavigationJsObject(this);
webview.addJavascriptInterface(customNavigation, "czb");//绗簩涓弬鏁癱zb涓嶅彲鏇存敼锛�
- RebateJavaInterfaceBS javaInterface1 = new RebateJavaInterfaceBS(ShareBrowserActivity.this,
+ javaInterface1 = new RebateJavaInterfaceBS(ShareBrowserActivity.this,
tv_top_bar_middle, tv_top_bar_left2, new TextView(this), iv_right, webview, pd);
+ javaInterface1.setGeneralBackCallback(this);//鍒嗕韩鍥剧墖鏉冮檺鍥炶皟
webview.addJavascriptObject(javaInterface1, "yestv");
/***
@@ -375,6 +378,16 @@
}
}
return response;
+ }
+
+ @Override
+ public void onPageStarted(WebView view, String url, Bitmap favicon) {
+ super.onPageStarted(view, url, favicon);
+ if (view.canGoBack()) {
+ tv_top_bar_left2.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_web_close, 0, 0, 0);
+ } else {
+ tv_top_bar_left2.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
+ }
}
};
@@ -637,7 +650,6 @@
webview.onResume();
webview.loadUrl("javascript:yestvcallback.resume()");
}
-
}
@Override
@@ -680,6 +692,12 @@
if (mulList.size() == 2 && javaInterface.mList.size() > 0) {
mulList.addAll(0, javaInterface.mList);
}
+
+ if (mulList.size() == 2 && javaInterface1.mList.size() > 0) {
+ mulList.addAll(0, javaInterface1.mList);
+ }
+
+
if (mTopRightPopupWindow != null) {
v_cover_web.setVisibility(View.VISIBLE);
mTopRightPopupWindow.showAsDropDown(iv_right);
@@ -743,6 +761,9 @@
if (javaInterface.mList.size() > 0)
mulList.addAll(0, javaInterface.mList);
+ if (javaInterface1.mList.size() > 0)
+ mulList.addAll(0, javaInterface1.mList);
+
shareFromAdapter = new WebTopRightAdapter(this, mulList);
lv.setAdapter(shareFromAdapter);
--
Gitblit v1.8.0