From 399ac289f80b7a40aa4210341db6b447cacdcf14 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 09 八月 2022 17:42:33 +0800
Subject: [PATCH] 广告升级,隐私政策整改

---
 app/src/main/java/com/tejia/lijin/app/ui/invite/ShareBrowserActivity.java |   31 +++++++++++++++++++++++++------
 1 files changed, 25 insertions(+), 6 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..14e1d73 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);
@@ -182,7 +184,7 @@
 
         mPermissionsChecker = new PermissionHelper(this, this);
 //        webview.loadUrl("http://mp.weixin.qq.com/s/mu3lJ1DYEc0MxgnMHArHYA");
-//        String url = "http://192.168.1.122:8848/test/WKWebView.html";
+        //url = "https://amcn.bytedance.com/ug/armor/623040fd8df75a02420060e1?show_loading=1&pull_down_close=0&enter_from=UG_CF_CSJ_2022&ug_feed_type=1&ug_app=0&plan_id=7106425777876369677&ug_app=0&page_id=F618&ecom_pid=dy_107062945313497465096_11642_3276765365";
         if (!StringUtils.isEmpty(url)) {
             getWebConfig(url);
         }
@@ -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);
+            }
         }
     };
 
@@ -632,18 +645,15 @@
     @Override
     public void onResume() {
         super.onResume();
-        MobclickAgent.onPageStart("缃戦〉");
         if (webview != null) {
             webview.onResume();
             webview.loadUrl("javascript:yestvcallback.resume()");
         }
-
     }
 
     @Override
     public void onPause() {
         super.onPause();
-        MobclickAgent.onPageEnd("缃戦〉");
         if (webview != null) {
             webview.onPause();
         }
@@ -680,6 +690,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 +759,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