webpagesources/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Jun 11 18:44:24 GMT 2025
+#Wed Jun 11 13:59:15 HKT 2025
 stageCount=5
 libraryProject=
 baseVersion=15.0
 publishVersion=15.0.4
-buildCount=18
+buildCount=0
 baseBetaVersion=15.0.5

webpagesources/src/main/java/cc/winboll/studio/webpagesources/MainActivity.java

@@ -9,7 +9,6 @@ import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.PersistableBundle;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.webkit.ValueCallback;
@@ -19,13 +18,13 @@ import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.LogView;
 import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 import cc.winboll.studio.webpagesources.R;
 import cc.winboll.studio.webpagesources.activities.AboutActivity;
 import cc.winboll.studio.webpagesources.fragment.SourcesFragment;
 import cc.winboll.studio.webpagesources.fragment.WebFragment;
 import cc.winboll.studio.webpagesources.view.StatusBarView;
-import com.hjq.toast.ToastUtils;
 
 public class MainActivity extends AppCompatActivity implements IWinBoLLActivity {
 
@@ -69,22 +68,23 @@ public class MainActivity extends AppCompatActivity implements IWinBoLLActivity
         ft.show(mWebFragment);
         ft.commit();
         
+        // 处理 onCreate 时的 Intent
+        handleIntent(getIntent());
+        
         mStatusBarView = findViewById(R.id.activitymainStatusBarView1);
         _MainActivity = this;
         postStatusBarMessage("主窗口加载完成。");
-        //ToastUtils.show("Start");
     }
     
-//    @Override
-//    protected void onNewIntent(Intent intent) {
-//        super.onNewIntent(intent);
-//        // 处理 onNewIntent 时的 Intent（Activity 已存在时调用）
-//        handleIntent(intent);
-//    }
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        // 处理 onNewIntent 时的 Intent（Activity 已存在时调用）
+        handleIntent(intent);
+    }
 
-    private String getIntentUrl(Intent intent) {
+    private void handleIntent(Intent intent) {
         if (Intent.ACTION_VIEW.equals(intent.getAction())) {
-            //ToastUtils.show("ACTION_VIEW");
             Uri data = intent.getData();
             if (data != null) {
                 String url = data.toString(); // 获取完整 URL
@@ -93,15 +93,13 @@ public class MainActivity extends AppCompatActivity implements IWinBoLLActivity
 
                 // 在界面显示 URL
                 //tvUrl.setText("接收到的 URL：\n" + url);
-                //ToastUtils.show(String.format("url %s", url));
-                return url;
+                mWebFragment.loadUrl(url);
 
                 // 示例：打开系统浏览器访问该 URL
                 // Intent browserIntent = new Intent(Intent.ACTION_VIEW, data);
                 // startActivity(browserIntent);
             }
         }
-        return null;
     }
     
     public static void postStatusBarMessage(String msg) {
@@ -113,10 +111,6 @@ public class MainActivity extends AppCompatActivity implements IWinBoLLActivity
     @Override
     protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
-        String intentUrl = getIntentUrl(getIntent());
-        if (intentUrl != null && !intentUrl.trim().equals("")) {
-            mWebFragment.loadUrl(intentUrl);
-        } else {
         if (_mIsLoadedHomePage) {
             //ToastUtils.show("重新加载当前页面");
             mWebFragment.reloadLastUrl();
@@ -126,7 +120,6 @@ public class MainActivity extends AppCompatActivity implements IWinBoLLActivity
             _mIsLoadedHomePage = true;
         }
     }
-    }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {

webpagesources/src/main/java/cc/winboll/studio/webpagesources/common/BaseWebView.java

@@ -381,5 +381,18 @@ public class BaseWebView extends WebView {
     public void setOnPageFinished(IOnPageFinished iOnPageFinished) {
         mIOnPageFinished = iOnPageFinished;
     }
+
+    public class JSConsole {
+        private Context mContext;
+
+        public JSConsole(Context context) {
+            this.mContext = context;
+        }
+
+        @JavascriptInterface
+        public void log(String message) {
+            LogUtils.d(TAG, message);
+        }
+    }
 }
 

webpagesources/src/main/java/cc/winboll/studio/webpagesources/fragment/WebFragment.java

@@ -13,7 +13,6 @@ import android.view.ViewParent;
 import android.widget.LinearLayout;
 import androidx.fragment.app.Fragment;
 import cc.winboll.studio.libaes.views.AButton;
-import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.webpagesources.R;
 import cc.winboll.studio.webpagesources.common.BaseWebView;
 import cc.winboll.studio.webpagesources.view.URLAddressView;
@@ -100,10 +99,8 @@ public class WebFragment extends Fragment {
     }
 
     public void loadUrl(String szUrl) {
-        if(mBaseWebView != null) {
         mBaseWebView.loadUrl(szUrl);
     }
-    }
     
     public void reloadLastUrl() {
         mBaseWebView.stopLoading();

webpagesources/src/main/res/xml/network_security_config.xml

@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <network-security-config>
-    <!-- 允许 provider.winboll.cc 及其子域名的明文流量 -->
-    <domain-config cleartextTrafficPermitted="true">
-        <domain includeSubdomains="true">provider.winboll.cc</domain>
-    </domain-config>
-    
     <!-- 允许 winboll.cc 及其子域名的明文流量 -->
     <domain-config cleartextTrafficPermitted="true">
         <domain includeSubdomains="true">winboll.cc</domain>
@@ -19,13 +14,4 @@
     <domain-config cleartextTrafficPermitted="true">
         <domain includeSubdomains="false">192.168.*.*</domain>
     </domain-config>
-
-    <!-- 允许 http://10.8.0.250:456 的明文流量 -->
-    <domain-config cleartextTrafficPermitted="true">
-        <domain includeSubdomains="false">10.8.0.250</domain>
-    </domain-config>
-    <domain-config cleartextTrafficPermitted="true">
-        <domain includeSubdomains="false">10.8.0.250:456</domain>
-    </domain-config>
 </network-security-config>
-