<webpagesources>APK 15.0.6 release Publish.

webpagesources/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Jun 11 13:42:17 HKT 2025
+#Fri Jun 13 10:04:49 HKT 2025
-stageCount=3
+stageCount=7
 libraryProject=
 baseVersion=15.0
-publishVersion=15.0.2
+publishVersion=15.0.6
 buildCount=0
-baseBetaVersion=15.0.3
+baseBetaVersion=15.0.7

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

@@ -9,6 +9,7 @@ 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;
@@ -18,13 +19,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 {
 
@@ -57,7 +58,7 @@ public class MainActivity extends AppCompatActivity implements IWinBoLLActivity
         setContentView(R.layout.activity_main);
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
-        
+
         FragmentTransaction ft = ((FragmentManager)getSupportFragmentManager()).beginTransaction();
         mSourcesFragment = new SourcesFragment();
         ft.add(R.id.activitymainFrameLayout1, mSourcesFragment, SourcesFragment.TAG);
@@ -67,24 +68,23 @@ public class MainActivity extends AppCompatActivity implements IWinBoLLActivity
         ft.add(R.id.activitymainFrameLayout1, mWebFragment, WebFragment.TAG);
         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);
     }
 
-    private void handleIntent(Intent intent) {
+//    @Override
+//    protected void onNewIntent(Intent intent) {
+//        super.onNewIntent(intent);
+//        // 处理 onNewIntent 时的 Intent（Activity 已存在时调用）
+//        handleIntent(intent);
+//    }
+
+    private String getIntentUrl(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,17 +93,19 @@ public class MainActivity extends AppCompatActivity implements IWinBoLLActivity
 
                 // 在界面显示 URL
                 //tvUrl.setText("接收到的 URL：\n" + url);
-                mWebFragment.loadUrl(url);
+                //ToastUtils.show(String.format("url %s", url));
+                return url;
 
                 // 示例：打开系统浏览器访问该 URL
                 // Intent browserIntent = new Intent(Intent.ACTION_VIEW, data);
                 // startActivity(browserIntent);
             }
         }
+        return null;
     }
-    
+
     public static void postStatusBarMessage(String msg) {
-        if(_MainActivity != null) {
+        if (_MainActivity != null) {
             _MainActivity.mStatusBarView.postMessage(msg);
         }
     }
@@ -111,13 +113,18 @@ public class MainActivity extends AppCompatActivity implements IWinBoLLActivity
     @Override
     protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
-        if (_mIsLoadedHomePage) {
+        String intentUrl = getIntentUrl(getIntent());
-            //ToastUtils.show("重新加载当前页面");
+        if (intentUrl != null && !intentUrl.trim().equals("")) {
-            mWebFragment.reloadLastUrl();
+            mWebFragment.loadUrl(intentUrl);
         } else {
-            //ToastUtils.show("加载默认主页");
+            if (_mIsLoadedHomePage) {
-            mWebFragment.loadUrl(getApplicationContext().getString(R.string.app_homepage));
+                //ToastUtils.show("重新加载当前页面");
-            _mIsLoadedHomePage = true;
+                mWebFragment.reloadLastUrl();
+            } else {
+                //ToastUtils.show("加载默认主页");
+                mWebFragment.loadUrl(getApplicationContext().getString(R.string.app_homepage));
+                _mIsLoadedHomePage = true;
+            }
         }
     }
 

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

@@ -6,6 +6,7 @@ package cc.winboll.studio.webpagesources.common;
  * @Describe 网站登录验证工具类
  */
 import android.content.Context;
+import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.dialogs.YesNoAlertDialog;
 import cc.winboll.studio.webpagesources.models.AuthenticationBean;
 import java.io.File;
@@ -22,10 +23,11 @@ public class AuthenticationUtils {
 
     AuthenticationUtils(Context context) {
         mContext = context;
-        File beanDir = new File(context.getDataDir(), TAG);
+        File beanDir = new File(context.getFilesDir(), "home" + File.separator + TAG);
         if (!beanDir.exists()) {
             beanDir.mkdirs();
         }
+        LogUtils.d(TAG, String.format("beanDir %s", beanDir.toString()));
         _mBeanPath = beanDir.getPath() + "/" + AuthenticationBean.class.getName() + ".json";
         mData = new ArrayList<AuthenticationBean>();
         AuthenticationBean.loadBeanListFromFile(_mBeanPath, mData, AuthenticationBean.class);

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

@@ -37,6 +37,7 @@ import cc.winboll.studio.webpagesources.R;
 import cc.winboll.studio.webpagesources.thread.LinkDownLoadThread;
 import cc.winboll.studio.webpagesources.util.UIUtil;
 import cc.winboll.studio.webpagesources.view.ItemLongClickedPopWindow;
+import com.hjq.toast.ToastUtils;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -309,7 +310,13 @@ public class BaseWebView extends WebView {
 
         @Override
         public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
-            LogUtils.d(TAG, "onReceivedSslError 0\nerror : " + error.toString());
+            //SSL证书错误修复方法：
+            //网站证书下载网站是https://www.ssleye.com/ssltool/certs_down.html
+            //使用该网站访问要获取证书的主机
+            //获取证书后导出证书到 res/raw/<标识名称>.cer
+            //再在res/xml/network_security_config.xml配置网站证书设置。
+            ToastUtils.show("SSL证书错误!");
+            LogUtils.d(TAG, "SSL证书错误! onReceivedSslError 0\nerror : " + error.toString());
         }
 
         @Override
@@ -381,18 +388,5 @@ 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,6 +13,7 @@ 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;
@@ -99,7 +100,9 @@ public class WebFragment extends Fragment {
     }
 
     public void loadUrl(String szUrl) {
-        mBaseWebView.loadUrl(szUrl);
+        if(mBaseWebView != null) {
+            mBaseWebView.loadUrl(szUrl);
+        }
     }
     
     public void reloadLastUrl() {

webpagesources/src/main/res/raw/globalsign_ca.cer

@@ -0,0 +1,37 @@
+-----BEGIN CERTIFICATE-----
+MIIGZDCCBUygAwIBAgIMOwCrRmG0Wi0jBsKXMA0GCSqGSIb3DQEBCwUAMFUxCzAJ
+BgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSswKQYDVQQDEyJH
+bG9iYWxTaWduIEdDQyBSNiBBbHBoYVNTTCBDQSAyMDIzMB4XDTI0MDkxNTA2NTY1
+NVoXDTI1MTAxNzA2NTY1NFowGzEZMBcGA1UEAwwQKi5zdGF0aWNmaWxlLm9yZzCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALydYBhogMuljWzzVydKnNXd
+1QgbSsTM72cf+bhEZT8achjVkiPgrekfXQEMaVcdSeicDjFpC/PmNQnJStWnCr4a
+nybDu65PV2uk0eDpcGDDBeExf7O4I8i9C/yzm5nvhFQQrlr9iWK2pW+ytiUefsSA
+Yq8r+e63UNafv2ShaeKx/APiD5CfD4e2fQJzQkodbPiReaZaG3tTj+gZw1iME1wF
+3Fd1WFgn3E7d93iy4LR45073pt+W/qD899iOc+o6kic+xFG+UjsBsfwKmzYZO75A
+qad3TxtNkwHM3LWxttyQbckOQRlLjEMN0hZ2GpJ36sHeC/WyVGsDogitvllJ+KUC
+AwEAAaOCA2wwggNoMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMIGZBggr
+BgEFBQcBAQSBjDCBiTBJBggrBgEFBQcwAoY9aHR0cDovL3NlY3VyZS5nbG9iYWxz
+aWduLmNvbS9jYWNlcnQvZ3NnY2NyNmFscGhhc3NsY2EyMDIzLmNydDA8BggrBgEF
+BQcwAYYwaHR0cDovL29jc3AuZ2xvYmFsc2lnbi5jb20vZ3NnY2NyNmFscGhhc3Ns
+Y2EyMDIzMFcGA1UdIARQME4wCAYGZ4EMAQIBMEIGCisGAQQBoDIKAQMwNDAyBggr
+BgEFBQcCARYmaHR0cHM6Ly93d3cuZ2xvYmFsc2lnbi5jb20vcmVwb3NpdG9yeS8w
+RAYDVR0fBD0wOzA5oDegNYYzaHR0cDovL2NybC5nbG9iYWxzaWduLmNvbS9nc2dj
+Y3I2YWxwaGFzc2xjYTIwMjMuY3JsMCsGA1UdEQQkMCKCECouc3RhdGljZmlsZS5v
+cmeCDnN0YXRpY2ZpbGUub3JnMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+AjAfBgNVHSMEGDAWgBS9BbfzipM8c8t5+g+FEqF3lhiRdDAdBgNVHQ4EFgQUduaF
+/hF7hb1ofiF58NiodcpFJjgwggF/BgorBgEEAdZ5AgQCBIIBbwSCAWsBaQB3AK8Y
+GijWjKPgqYpMnGerCfi7vCK6rryxOKOhndP5tgMNAAABkfR4Z+gAAAQDAEgwRgIh
+AOpyIQTSOF1422Dn64GHE59XsbVeeThUgCqpiE60BjKQAiEA0FJlalS44WJg82+P
+4PuZijKkTY99/YG8Ut79TjHafGMAdgAaBP9J0FQdQK/2oMO/8djEZy9O7O4jQGiY
+axdALtyJfQAAAZH0eGidAAAEAwBHMEUCIFkh8nff1OVMNzA/by8c3ERjHgwdo7jm
+6DYJUaY2EJ78AiEAwJFOCANEUNl6nGNSTxzkQGUEAcfDNayztyhqFwJ4TUYAdgAS
+8U40vVNyTIQGGcOPP3oT+Oe1YoeInG0wBYTr5YYmOgAAAZH0eGjLAAAEAwBHMEUC
+IGDdjzgfLgdHzXYEWKfEEvNmiLPS1I/3N6IQF9SwVQ7pAiEAp+6BQtg8OUgwWwWh
+CBZh2Bnna5/RMOU8avlVXn/besgwDQYJKoZIhvcNAQELBQADggEBAJaNrbJ5ArwZ
+9oI2mu9I0pfZGhCFB3v6T8YTDNMnEq4JR0tngbrbrP5zbpbhNJwwvEA8uzbYClan
+axEOf4f3besEyPwKAq8yZUqYDLSTNjT+f0xnVNxOBElA5r5zo18Pw0nqATdfrezC
+U+CoejR8lk4RRvg0zPda8f+OhYP3ERbZ0Cm2YDJtVT59+Idyp2BbzCpsRJPLvjlt
+yWKkfcx/41tbcdKhNZFM3xszCz8vfy23yLv8zotY00rCT3F+NwMh2Kuqg9p+htCE
+/9SLNPLlBgkHK6wzQBTJoWWXKWTk3A1iPP/+MeBcN1OlKt/Zurbrka4DoEqRAyBn
+v0FDEHbg0oU=
+-----END CERTIFICATE-----

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

@@ -4,14 +4,18 @@
     <domain-config cleartextTrafficPermitted="true">
         <domain includeSubdomains="true">winboll.cc</domain>
     </domain-config>
-
+    <!-- 允许 http://10.8.0.250 的明文流量 -->
-    <!-- 允许 10.8.0.* 网段的明文流量（IPv4 通配符） -->
     <domain-config cleartextTrafficPermitted="true">
-        <domain includeSubdomains="false">10.8.0.*</domain>
+        <domain includeSubdomains="false">10.8.0.250</domain>
     </domain-config>
-
-    <!-- 允许 192.168.*.* 网段的明文流量（IPv4 通配符） -->
     <domain-config cleartextTrafficPermitted="true">
-        <domain includeSubdomains="false">192.168.*.*</domain>
+        <domain includeSubdomains="false">8.217.250.205</domain>
+    </domain-config>
+    <domain-config>
+        <domain includeSubdomains="true">staticfile.org</domain>
+        <trust-anchors>
+            <certificates src="@raw/globalsign_ca" />
+        </trust-anchors>
     </domain-config>
 </network-security-config>
+