Merge branch 'winboll' into aes

2025-12-09 15:10:11 +08:00
parent 10b8cc63ed bb94f87597
commit 2c0a8f2d9f
34 changed files with 217 additions and 329 deletions
--- a/README.md
+++ b/README.md
@@ -5,10 +5,11 @@
 ## ☁ ☁ ☁ WinBoLL APP ☁ ☁ ☁ ☁ ☁ ☁   ☁ ☁   ☁  ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁ ☁ ☁ 
 # ☁    ☁ WinBoLL Studio Android 应用开源项目。☁ ☁   ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁ ☁  ☁ ☁ 
 # ☁ ☁ ☁ WinBoLL 网站地址 https://www.winboll.cc/ ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁
-# ☁ ☁ ☁ WinBoLL 源码地址 <https://gitea.winboll.cc/Studio/APPBase> ☁ ☁ ☁ ☁  ☁ ☁ ☁
-# ☁ ☁ ☁ GitHub 源码地址 <https://github.com/ZhanGSKen/APPBase.git> ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁
-# ☁ ☁ ☁ 码云 源码地址 <https://gitee.com/zhangsken/appbase.git> ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁
-
+# ☁ ☁ ☁ WinBoLL 源码地址 <https://gitea.winboll.cc/Studio/WinBoLL.git> ☁ ☁ ☁ ☁  ☁ ☁ ☁
+# ☁ ☁ ☁ GitHub 源码地址 <https://github.com/ZhanGSKen/WinBoLL.git> ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁
+# ☁ ☁ ☁ 码云 源码地址 <https://gitee.com/zhangsken/winboll.git> ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁
+# ☁ ☁ ☁ 在 jitpack.io 托管的 APPBase 类库源码<https://github.com/ZhanGSKen/APPBase.git> ☁ ☁ ☁ ☁  
+# ☁ ☁ ☁ 在 jitpack.io 托管的 AES 类库源码<https://github.com/ZhanGSKen/AES.git> ☁ ☁ ☁ ☁  
 ## WinBoLL 提问
 同样是 /sdcard 目录，在开发 Android 应用时，
 能否实现手机编译与电脑编译的源码同步。
--- a/winboll/README.md
+++ b/winboll/README.md
@@ -0,0 +1,34 @@
+# WinBoLL
+
+#### 介绍
+WinBoLL 网站浏览器。
+
+#### 软件架构
+适配安卓应用 [AIDE Pro] 的 Gradle 编译结构。
+也适配安卓应用 [AndroidIDE] 的 Gradle 编译结构。
+
+
+#### Gradle 编译说明
+调试版编译命令 ：gradle assembleBetaDebug
+阶段版编译命令 ：bash .winboll/bashPublishAPKAddTag.sh winboll
+
+#### 使用说明
+
+#### 参与贡献
+
+1.  Fork 本仓库
+2.  新建 Feat_xxx 分支
+3.  提交代码 : ZhanGSKen(ZhanGSKen<zhangsken@188.com>)
+4.  新建 Pull Request
+
+
+#### 特技
+
+1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
+2.  Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com)
+3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目
+4.  [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目
+5.  Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
+6.  Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
+
+#### 参考文档
--- a/winboll/build.gradle
+++ b/winboll/build.gradle
@@ -81,10 +81,12 @@ dependencies {
    api 'com.github.bumptech.glide:glide:4.9.0'
    //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
 	
-	api 'cc.winboll.studio:libaes:15.11.8'
 	// WinBoLL库 nexus.winboll.cc 地址
+	//api 'cc.winboll.studio:libaes:15.12.0'
    //api 'cc.winboll.studio:libappbase:15.12.2'
-	// 备用库 jitpack.io 地址
+	
+	// WinBoLL备用库 jitpack.io 地址
+	api 'com.github.ZhanGSKen:AES:aes-v15.12.1'
 	api 'com.github.ZhanGSKen:APPBase:appbase-v15.12.2'
 	
 	api fileTree(dir: 'libs', include: ['*.jar'])
--- a/winboll/build.properties
+++ b/winboll/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat Dec 06 07:15:29 GMT 2025
-stageCount=6
+#Sun Dec 07 04:17:43 GMT 2025
+stageCount=8
 libraryProject=
 baseVersion=15.11
-publishVersion=15.11.5
-buildCount=25
-baseBetaVersion=15.11.6
+publishVersion=15.11.7
+buildCount=1
+baseBetaVersion=15.11.8
--- a/winboll/src/main/AndroidManifest.xml
+++ b/winboll/src/main/AndroidManifest.xml
@@ -14,8 +14,8 @@

    <application
        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher_stage"
-        android:roundIcon="@drawable/ic_launcher_stage"
+        android:icon="@drawable/ic_launcher"
+        android:roundIcon="@drawable/ic_launcher"
        android:label="@string/app_name"
        android:theme="@style/MyAppTheme"
        android:resizeableActivity="true"
@@ -37,7 +37,7 @@
            android:targetActivity=".MainActivity"
            android:exported="true"
            android:label="@string/app_name"
-            android:icon="@drawable/ic_launcher_stage"
+            android:icon="@drawable/ic_launcher"
            android:enabled="true">

            <intent-filter>
@@ -280,4 +280,4 @@

    </application>

-</manifest>
+</manifest>
--- a/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java
@@ -2,6 +2,7 @@ package cc.winboll.studio.winboll;

 import android.app.Activity;
 import android.os.Bundle;
+import android.os.Handler;
 import android.os.Message;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -9,37 +10,38 @@ import android.view.View;
 import android.widget.AdapterView;
 import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
 import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
+import cc.winboll.studio.libaes.models.APPInfo;
 import cc.winboll.studio.libaes.models.DrawerMenuBean;
 import cc.winboll.studio.libaes.unittests.TestAButtonFragment;
 import cc.winboll.studio.libaes.unittests.TestViewPageFragment;
 import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.winboll.R;
-import cc.winboll.studio.winboll.activities.AboutActivity;
 import cc.winboll.studio.winboll.activities.SettingsActivity;
 import cc.winboll.studio.winboll.fragments.BrowserFragment;
 import java.util.ArrayList;
+import android.content.Intent;
+import cc.winboll.studio.libaes.activitys.AboutActivity;

-public class MainActivity extends DrawerFragmentActivity implements IWinBoLLActivity {
+public class MainActivity extends DrawerFragmentActivity {


    public static final String TAG = "MainActivity";

    BrowserFragment mBrowserFragment;

-    @Override
-    public Activity getActivity() {
-        return null;
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
+    // ------------------- 新增：Handler 消息定义（接收URL历史更新消息） -------------------
+    // 消息标识：URL加载历史更新（刷新抽屉菜单的历史列表）
+    public static final int MSG_URLLOADHISTORY_UPDATE = 1002;
+    // 自定义Handler（接收应用内消息，如BrowserFragment发送的历史更新消息）
+    private static Handler _mMainHandler;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
+        // ------------------- 新增：初始化MainActivity的Handler（关键） -------------------
+        initMainHandler();
+
        if (mBrowserFragment == null) {
            mBrowserFragment = new BrowserFragment();
            addFragment(mBrowserFragment);
@@ -47,28 +49,75 @@ public class MainActivity extends DrawerFragmentActivity implements IWinBoLLActi
        showFragment(mBrowserFragment);
    }

+	public static void sendMessage(Message msg) {
+		_mMainHandler.sendMessage(msg);
+	}
+
+    /**
+     * 初始化Handler（接收MSG_URLLOADHISTORY_UPDATE消息，刷新抽屉历史菜单）
+     */
+    private void initMainHandler() {
+		// 清理旧数据
+		if (_mMainHandler != null) {
+            _mMainHandler.removeCallbacksAndMessages(null);
+            _mMainHandler = null;
+        }
+
+        // Java 7 匿名内部类实现Handler（主线程创建，安全更新UI/抽屉菜单）
+        _mMainHandler = new Handler() {
+            @Override
+            public void handleMessage(Message msg) {
+                super.handleMessage(msg);
+                switch (msg.what) {
+                    case MSG_URLLOADHISTORY_UPDATE:
+                        // 处理URL历史更新消息：刷新抽屉菜单的历史列表
+                        LogUtils.d(TAG, "收到URL历史更新消息，刷新抽屉菜单");
+                        refreshUrlHistoryDrawerMenu();
+                        break;
+                    default:
+                        break;
+                }
+            }
+        };
+    }
+
    @Override
    public void initDrawerMenuItemList(ArrayList<DrawerMenuBean> listDrawerMenu) {
        super.initDrawerMenuItemList(listDrawerMenu);
-        LogUtils.d(TAG, "initDrawerMenuItemList");
-        //listDrawerMenu.clear();
-        // 添加抽屉菜单项
-        listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestAButtonFragment.TAG));
-        listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestViewPageFragment.TAG));
+        //LogUtils.d(TAG, "initDrawerMenuItemList");
+        // 加载URL历史菜单（初始化时加载）
+        refreshUrlHistoryDrawerMenu();
        notifyDrawerMenuDataChanged();
    }

    @Override
    public void reinitDrawerMenuItemList(ArrayList<DrawerMenuBean> listDrawerMenu) {
        super.reinitDrawerMenuItemList(listDrawerMenu);
-        LogUtils.d(TAG, "reinitDrawerMenuItemList");
-        //listDrawerMenu.clear();
-        // 添加抽屉菜单项
-        listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestAButtonFragment.TAG));
-        listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestViewPageFragment.TAG));
+        //LogUtils.d(TAG, "reinitDrawerMenuItemList");
+        // 重新加载URL历史菜单（菜单重置时加载）
+        refreshUrlHistoryDrawerMenu();
        notifyDrawerMenuDataChanged();
    }

+	void loadUrlLoadHistotyMenu(ArrayList<DrawerMenuBean> listDrawerMenu) {
+		listDrawerMenu.clear();
+		if (BrowserFragment._mUrlLoadHistory != null) {
+			for (String url : BrowserFragment._mUrlLoadHistory) {
+				listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, url));
+			}
+		}
+	}
+
+    // ------------------- 新增：刷新URL历史抽屉菜单（提取独立方法，复用） -------------------
+    private void refreshUrlHistoryDrawerMenu() {
+        // 获取抽屉菜单列表，重新加载历史数据并刷新
+        ArrayList<DrawerMenuBean> drawerMenuList = super.malDrawerMenuItem; // 假设父类提供获取菜单列表的方法
+        if (drawerMenuList != null) {
+            loadUrlLoadHistotyMenu(drawerMenuList); // 重新加载更新后的历史数据
+            notifyDrawerMenuDataChanged(); // 通知抽屉菜单刷新UI
+        }
+    }
+
    @Override
    public DrawerFragmentActivity.ActivityType initActivityType() {
        return DrawerFragmentActivity.ActivityType.Main;
@@ -83,39 +132,69 @@ public class MainActivity extends DrawerFragmentActivity implements IWinBoLLActi
    @Override
    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
        super.onItemClick(parent, view, position, id);
-        switch (position) {
-            case 0 : {
-                    if (mBrowserFragment == null) {
-                        mBrowserFragment = new BrowserFragment();
-                        addFragment(mBrowserFragment);
-                    }
-                    showFragment(mBrowserFragment);
-                    break;
-                }
+		if (mBrowserFragment != null && mBrowserFragment.getBrowserHandler() != null) {
+			Message msg = Message.obtain();
+			msg.what = BrowserFragment.MSG_HISTORY_POSITION;
+			msg.obj = position;
+			mBrowserFragment.getBrowserHandler().sendMessage(msg);
        }
    }

    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
        int nItemId = item.getItemId();
-		if(item.getItemId() == R.id.item_home) {
-			// 关键：获取BrowserFragment的Handler
+		if (nItemId == R.id.item_home) {
+			// 发送MSG_HOMEPAGE消息给BrowserFragment
 			if (mBrowserFragment != null && mBrowserFragment.getBrowserHandler() != null) {
-				// 创建消息（Java 7 显式创建Message）
 				Message msg = Message.obtain();
-				msg.what = BrowserFragment.MSG_HOMEPAGE; // 指定消息标识
-				// 发送消息（可携带数据，如msg.obj = "额外参数";）
+				msg.what = BrowserFragment.MSG_HOMEPAGE;
 				mBrowserFragment.getBrowserHandler().sendMessage(msg);
 			}
-		}if (item.getItemId() == R.id.item_settings) {
+		} else if (nItemId == R.id.item_settings) {
 			WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), SettingsActivity.class);
-        } else if (nItemId ==  R.id.item_about) {
-			WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), AboutActivity.class);
-            return true;
-        }
+        } else if (nItemId == cc.winboll.studio.libaes.R.id.item_about) {
+			Intent intent = new Intent(getApplicationContext(), AboutActivity.class);
+			APPInfo appInfo = genDefaultAPPInfo();
+			intent.putExtra(AboutActivity.EXTRA_APPINFO, appInfo);
+			WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class);
+        } else {
+			return super.onOptionsItemSelected(item);
+		}

-        return super.onOptionsItemSelected(item);
+        return true;
    }


+	APPInfo genDefaultAPPInfo() {
+		String szBranchName = "winboll";
+		APPInfo appInfo = new APPInfo();
+		appInfo.setAppName("WinBoLL");
+		appInfo.setAppIcon(cc.winboll.studio.libaes.R.drawable.ic_winboll);
+		appInfo.setAppDescription("WinBoLL 网站浏览器。");
+		appInfo.setAppGitName("WinBoLL");
+		appInfo.setAppGitOwner("Studio");
+		appInfo.setAppGitAPPBranch(szBranchName);
+		appInfo.setAppGitAPPSubProjectFolder(szBranchName);
+		appInfo.setAppHomePage("https://www.winboll.cc/apks/index.php?project=WinBoLL");
+		appInfo.setAppAPKName("WinBoLL");
+		appInfo.setAppAPKFolderName("WinBoLL");
+		return appInfo;
+	}
+
+    // ------------------- 新增：对外提供Handler（供其他组件发送消息，如BrowserFragment） -------------------
+    public Handler getMainHandler() {
+        return _mMainHandler;
+    }
+
+    // ------------------- 新增：生命周期管理（防止Handler内存泄漏） -------------------
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        // 清除Handler所有消息和回调，避免内存泄漏
+        if (_mMainHandler != null) {
+            _mMainHandler.removeCallbacksAndMessages(null);
+            _mMainHandler = null;
+        }
+    }
 }
+
--- a/winboll/src/main/java/cc/winboll/studio/winboll/activities/AboutActivity.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/activities/AboutActivity.java
@@ -1,103 +0,0 @@
-package cc.winboll.studio.winboll.activities;
-
-/**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/09/29 13:30
- * @Describe 应用介绍窗口
- */
-import android.content.Context;
-import android.os.Bundle;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import androidx.appcompat.widget.Toolbar;
-import cc.winboll.studio.winboll.BuildConfig;
-import cc.winboll.studio.winboll.R;
-
-import android.app.Activity;
-import android.content.Context;
-import android.os.Bundle;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
-import cc.winboll.studio.libaes.models.APPInfo;
-import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
-import cc.winboll.studio.libaes.views.AboutView;
-
-public class AboutActivity extends WinBoLLActivity implements IWinBoLLActivity {
-
-    public static final String TAG = "AboutActivity";
-
-    Context mContext;
-    Toolbar mToolbar;
-
-    @Override
-    public Activity getActivity() {
-        return this;
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        mContext = this;
-        setContentView(R.layout.activity_about);
-
-        mToolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(mToolbar);
-        mToolbar.setSubtitle(TAG);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
-        AboutView aboutView = CreateAboutView();
-        // 在 Activity 的 onCreate 或其他生命周期方法中调用
-//        LinearLayout layout = new LinearLayout(this);
-//        layout.setOrientation(LinearLayout.VERTICAL);
-//        // 创建布局参数（宽度和高度）
-//        ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(
-//            ViewGroup.LayoutParams.MATCH_PARENT,
-//            ViewGroup.LayoutParams.MATCH_PARENT
-//        );
-//        addContentView(aboutView, params);
-
-        LinearLayout layout = findViewById(R.id.aboutviewroot_ll);
-        // 创建布局参数（宽度和高度）
-        ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(
-            ViewGroup.LayoutParams.MATCH_PARENT,
-            ViewGroup.LayoutParams.MATCH_PARENT
-        );
-        layout.addView(aboutView, params);
-
-        WinBoLLActivityManager.getInstance().add(this);
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        WinBoLLActivityManager.getInstance().registeRemove(this);
-    }
-
-    
-
-    public AboutView CreateAboutView() {
-        String szBranchName = "winboll";
-        APPInfo appInfo = new APPInfo();
-        appInfo.setAppName("WinBoLL");
-        appInfo.setAppIcon(cc.winboll.studio.libaes.R.drawable.ic_winboll);
-        appInfo.setAppDescription("WinBoLL Description");
-        appInfo.setAppGitName("APPBase");
-        appInfo.setAppGitOwner("Studio");
-        appInfo.setAppGitAPPBranch(szBranchName);
-        appInfo.setAppGitAPPSubProjectFolder(szBranchName);
-        appInfo.setAppHomePage("https://discuz.winboll.cc/forum.php?mod=viewthread&tid=3&extra=page%3D1");
-        appInfo.setAppAPKName("WinBoLL");
-        appInfo.setAppAPKFolderName("WinBoLL");
-        //appInfo.setIsAddDebugTools(false);
-        //appInfo.setIsAddDebugTools(BuildConfig.DEBUG);
-        return new AboutView(mContext, appInfo);
-    }
-}
--- a/winboll/src/main/java/cc/winboll/studio/winboll/fragments/BrowserFragment.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/fragments/BrowserFragment.java
@@ -15,8 +15,11 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
+import cc.winboll.studio.winboll.MainActivity;
 import cc.winboll.studio.winboll.R;
 import cc.winboll.studio.winboll.views.WinBoLLView;
+import java.util.ArrayList;
+import android.app.Activity;

 /**
 * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
@@ -35,10 +38,13 @@ public class BrowserFragment extends Fragment implements View.OnClickListener, W
    private Button mBtnBack;
    private ProgressBar mProgressBar;
    private WinBoLLView mWinBoLLView;
+	public static ArrayList<String> _mUrlLoadHistory = new ArrayList<String>();

    // ------------------- 新增：Handler 消息定义（应用内通信） -------------------
    // 消息标识：跳转首页（winboll.cc）
    public static final int MSG_HOMEPAGE = 1001;
+	// 跳转到历史记录位置
+	public static final int MSG_HISTORY_POSITION = 1002;
    // 自定义Handler（接收应用内其他页面发送的消息）
    private Handler mBrowserHandler;

@@ -52,6 +58,9 @@ public class BrowserFragment extends Fragment implements View.OnClickListener, W
    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
        // 加载布局（Java 7 显式强转，无菱形语法）
        View view = inflater.inflate(R.layout.fragment_browser, container, false);
+		// 清理旧历史记录
+		_mUrlLoadHistory.clear();
+
        // 初始化控件
        initViews(view);
        // 绑定事件
@@ -129,7 +138,16 @@ public class BrowserFragment extends Fragment implements View.OnClickListener, W
                        mEtUrl.setText(homeUrl);
                        showToast("已跳转至首页");
                        break;
-						// 可扩展：添加其他消息标识（如MSG_OPEN_URL、MSG_REFRESH等）
+					case MSG_HISTORY_POSITION:
+						int position = (int)msg.obj;
+						if(-1 < position && position < _mUrlLoadHistory.size()) {
+							// 处理“跳转首页”消息：加载winboll.cc
+							String historyUrl = _mUrlLoadHistory.get(position);
+							mWinBoLLView.loadUrlSafe(historyUrl);
+							mEtUrl.setText(historyUrl);
+							//showToast("已跳转至" + historyUrl);
+						}
+                        break;
                    default:
                        break;
                }
@@ -221,6 +239,7 @@ public class BrowserFragment extends Fragment implements View.OnClickListener, W
        // 页面加载完成：更新输入框URL
        if (mEtUrl != null && url != null) {
            mEtUrl.setText(url);
+			addUrlToHistory(url);
        }
    }

@@ -273,5 +292,28 @@ public class BrowserFragment extends Fragment implements View.OnClickListener, W
            mBrowserHandler = null;
        }
    }
+
+	// 在 BrowserFragment 中添加以下代码（Java 7 语法）
+	/**
+	 * 发送URL历史更新消息给MainActivity（当历史列表变化时调用）
+	 */
+	private void sendUrlHistoryUpdateMsg() {
+		Message msg = Message.obtain();
+	    msg.what = MainActivity.MSG_URLLOADHISTORY_UPDATE;
+		MainActivity.sendMessage(msg);
+	}
+
+	// 调用时机示例（在BrowserFragment加载URL并更新历史列表后调用）
+	// 假设BrowserFragment中有添加URL到历史的方法：
+	private void addUrlToHistory(String url) {
+		if (_mUrlLoadHistory == null) {
+			_mUrlLoadHistory = new ArrayList<String>();
+		}
+		if (!_mUrlLoadHistory.contains(url)) {
+			_mUrlLoadHistory.add(0, url);
+			// 关键：添加历史后发送更新消息，通知MainActivity刷新抽屉菜单
+			sendUrlHistoryUpdateMsg();
+		}
+	}
 }

--- a/winboll/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ b/winboll/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -1,34 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-    <path
-        android:fillType="evenOdd"
-        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="78.5885"
-                android:endY="90.9159"
-                android:startX="48.7653"
-                android:startY="61.0927"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1" />
-</vector>
--- a/winboll/src/main/res/drawable/ic_dev_connected.xml
+++ b/winboll/src/main/res/drawable/ic_dev_connected.xml
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#ff000000"
-        android:pathData="M4,1C2.89,1 2,1.89 2,3V7C2,8.11 2.89,9 4,9H1V11H13V9H10C11.11,9 12,8.11 12,7V3C12,1.89 11.11,1 10,1H4M4,3H10V7H4V3M3,12V14H5V12H3M14,13C12.89,13 12,13.89 12,15V19C12,20.11 12.89,21 14,21H11V23H23V21H20C21.11,21 22,20.11 22,19V15C22,13.89 21.11,13 20,13H14M3,15V17H5V15H3M14,15H20V19H14V15M3,18V20H5V18H3M6,18V20H8V18H6M9,18V20H11V18H9Z"/>
-
-</vector>
--- a/winboll/src/main/res/drawable/ic_dev_disconnected.xml
+++ b/winboll/src/main/res/drawable/ic_dev_disconnected.xml
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#ff000000"
-        android:pathData="M4,1C2.89,1 2,1.89 2,3V7C2,8.11 2.89,9 4,9H1V11H13V9H10C11.11,9 12,8.11 12,7V3C12,1.89 11.11,1 10,1H4M4,3H10V7H4V3M14,13C12.89,13 12,13.89 12,15V19C12,20.11 12.89,21 14,21H11V23H23V21H20C21.11,21 22,20.11 22,19V15C22,13.89 21.11,13 20,13H14M3.88,13.46L2.46,14.88L4.59,17L2.46,19.12L3.88,20.54L6,18.41L8.12,20.54L9.54,19.12L7.41,17L9.54,14.88L8.12,13.46L6,15.59L3.88,13.46M14,15H20V19H14V15Z"/>
-
-</vector>
--- a/winboll/src/main/res/drawable/ic_email.xml
+++ b/winboll/src/main/res/drawable/ic_email.xml
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#ff000000"
-        android:pathData="M22,6C22,4.9 21.1,4 20,4H4C2.9,4 2,4.9 2,6V18C2,19.1 2.9,20 4,20H20C21.1,20 22,19.1 22,18V6M20,6L12,11L4,6H20M20,18H4V8L12,13L20,8V18Z"/>
-
-</vector>
--- a/winboll/src/main/res/drawable/ic_email_alert.xml
+++ b/winboll/src/main/res/drawable/ic_email_alert.xml
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#ff000000"
-        android:pathData="M24,7H22V13H24V7M24,15H22V17H24V15M20,6C20,4.9 19.1,4 18,4H2C0.9,4 0,4.9 0,6V18C0,19.1 0.9,20 2,20H18C19.1,20 20,19.1 20,18V6M18,6L10,11L2,6H18M18,18H2V8L10,13L18,8V18Z"/>
-
-</vector>
--- a/winboll/src/main/res/drawable/ic_iw.xml
+++ b/winboll/src/main/res/drawable/ic_iw.xml
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="1565dp"
-    android:height="1565dp"
-    android:viewportWidth="1565"
-    android:viewportHeight="1565">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:strokeColor="#FFFFFFFF"
-        android:strokeWidth="4.0"
-        android:strokeLineCap="round"
-        android:strokeMiterLimit="10"
-        android:pathData="M793.8 222.7C782.5 239.2 736.3 298.6 685.6 361.9 647 410.2 633.3 428.9 633.6 432.7 633.7 433.4 633.8 434.6 633.9 435.3 634.1 437.8 647.9 440.7 663.8 441.5 706.7 443.8 717 445.3 724.9 450.6 733.7 456.4 735.9 467.4 736 504.2 736 504.2 736 521.9 736 521.9 736 521.9 730.8 522.4 730.8 522.4 727.9 522.8 691.8 525.3 650.5 528 609.3 530.8 571.9 533.3 567.5 533.6 531.8 536 503.4 540.5 487.4 546 475 550.3 442.2 566.5 428.2 575.2 392.1 597.6 360.1 629.2 338 664.3 317 697.7 304.6 729.6 292.5 781 287.8 801 283.9 805.6 267.2 811 255.1 814.9 248.7 818.3 243.4 823.5 239.7 827.2 239.2 828.4 237.7 836.5 236.7 841.5 235.5 850 235 855.5 234.3 863.9 232.6 911.1 232.6 924.5 232.6 934.6 234.2 959.8 235 963 237.4 972 242.3 975.8 258.7 981.7 271.7 986.3 277.4 989.5 280.4 993.9 283.1 997.9 286.5 1008.7 287.4 1016.5 289.3 1031.7 293.3 1050.2 297.7 1064 306.4 1091.9 317.6 1107.7 330 1109.5 332.4 1109.9 334.7 1110.3 335 1110.5 335.3 1110.6 339.1 1111.1 343.5 1111.4 347.9 1111.8 353.8 1112.3 356.5 1112.5 370 1113.7 407.8 1115.8 430 1116.5 439.6 1116.8 453.4 1117.3 460.5 1117.5 467.7 1117.8 482.3 1118.2 493 1118.5 503.7 1118.8 520.8 1119.2 531 1119.5 587.8 1121.1 683 1122 794.5 1122 918.8 1122 996.1 1121 1075 1118.5 1083.5 1118.2 1098.6 1117.8 1108.5 1117.4 1118.4 1117.1 1129.4 1116.7 1133 1116.5 1136.6 1116.3 1144.7 1115.8 1151 1115.5 1183.3 1114 1207.5 1110.9 1221.5 1106.3 1235.3 1101.9 1244.8 1094.1 1249.9 1083.2 1253.5 1075.4 1253.7 1074.4 1259 1044 1266.4 1001.7 1269.1 993.5 1276.9 989.2 1278.9 988.1 1284.7 986.1 1289.9 984.6 1305.8 980.1 1313.3 975.5 1314.4 969.7 1316.2 959.5 1317.1 881.4 1315.7 859.5 1314 834.8 1313.1 831.4 1307 824.7 1301.2 818.3 1295 814.8 1283 811 1278 809.5 1272.4 807 1270.5 805.6 1264 800.6 1259.5 790.1 1252.5 763 1243.5 728.4 1235.9 706.8 1224.6 683.5 1202.3 637.7 1167.5 602.5 1111.8 569.1 1087.6 554.7 1054.4 542.7 1028.1 539 1024.1 538.4 1020.5 537.8 1020.1 537.6 1019.8 537.4 1016.4 536.9 1012.7 536.5 1009 536.2 1005.1 535.7 1004.2 535.5 999.7 534.7 988.4 533.6 973.5 532.5 969.7 532.2 964.5 531.8 962 531.5 959.5 531.2 940.4 530.1 919.5 529 851.7 525.4 836.1 523.7 829.5 519.4 821.2 514 825.2 495.6 837.6 481.8 843.8 474.9 844.2 474.3 856.8 448 862.6 436 868.9 425.2 879.9 408.7 888.2 396.2 895 385.5 895 385.1 895 384.6 889.7 383.3 883.3 382 851.1 375.9 812.7 367.8 806.9 365.9 792.4 361.2 790.7 358.7 790.2 342.5 789.7 326.8 792.4 303.4 800 258.5 802.1 246.1 803.3 220.9 801.9 219.6 801.7 219.4 800.5 218.9 799.3 218.6 797.4 218 796.5 218.7 793.8 222.7Z"/>
-    <path
-        android:fillColor="#FF62686C"
-        android:strokeColor="#FF62686C"
-        android:strokeWidth="4.0"
-        android:strokeLineCap="round"
-        android:strokeMiterLimit="10"
-        android:pathData="M570.4 704.1C553.5 706.1 539.7 713 532.9 722.7 523.5 736.3 519.9 764.2 519.6 826 519.5 859.4 519.7 860.6 530.1 872.9 543.4 888.6 560.4 900 574.1 902.1 586.7 904 601.5 898.9 615.7 887.5 632.5 874.1 633.5 868.9 632.7 793.6 632.2 742.5 631.6 736 627 725.2 620.5 710 596.2 700.9 570.4 704.1Z"/>
-    <path
-        android:fillColor="#FF62686C"
-        android:strokeColor="#FF62686C"
-        android:strokeWidth="4.0"
-        android:strokeLineCap="round"
-        android:strokeMiterLimit="10"
-        android:pathData="M949.2 705.5C935.1 708.7 927 716.8 922.6 732.4 918.4 746.7 917.8 757.3 917.3 816.5 917.1 847.8 917.3 874 917.7 874.6 919.2 876.7 945.3 892.3 955.5 897.1 973.4 905.5 983.5 905.4 978.9 896.8 977.1 893.4 979.1 892.6 985.9 893.9 993.6 895.4 997.8 894.3 1005.2 889.1 1010.9 885 1020.2 873.6 1023.8 866.5 1029.6 854.9 1031.1 841.6 1031.1 800.5 1031.1 750.1 1028.6 737.6 1014.9 720.4 1009.4 713.5 1004.6 709.8 996.9 706.8 992.2 704.9 989.1 704.6 973.5 704.4 960.6 704.1 953.7 704.5 949.2 705.5Z"/>
-    <path
-        android:fillColor="#FF62686C"
-        android:strokeColor="#FF62686C"
-        android:strokeWidth="4.0"
-        android:strokeLineCap="round"
-        android:strokeMiterLimit="10"
-        android:pathData="M717 988.7C671.1 990.4 640.9 994.2 635.6 998.8 631.5 1002.5 636.3 1017.5 643.6 1024 650.9 1030.3 661.7 1032.5 694 1034 721.9 1035.3 829.3 1035.3 857 1034 891.4 1032.4 901.4 1029.9 908.9 1021.3 914.5 1015 917.9 1003.4 915.2 999.4 910.4 992.1 856 987.9 772 988.2 745.9 988.3 721.1 988.5 717 988.7Z"/>
-</vector>
--- a/winboll/src/main/res/drawable/ic_launcher_beta.xml
+++ b/winboll/src/main/res/drawable/ic_launcher_beta.xml
@@ -9,5 +9,5 @@
        android:top="0dp" 
        android:right="0dp" 
        android:bottom="0dp"
-        android:drawable="@drawable/ic_iw"/>
+        android:drawable="@drawable/ic_launcher"/>
 </layer-list>
--- a/winboll/src/main/res/drawable/ic_launcher_disable.xml
+++ b/winboll/src/main/res/drawable/ic_launcher_disable.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
-    android:clickable="true"
-    android:layout_width="24dp"
-	android:layout_height="24dp">
-    <item android:drawable="@drawable/ic_launcher_background"/> 
-    <item 
-        android:left="0dp" 
-        android:top="0dp" 
-        android:right="0dp" 
-        android:bottom="0dp"
-        android:drawable="@drawable/ic_launcher_foreground_disable"/>
-</layer-list>
--- a/winboll/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/winboll/src/main/res/drawable/ic_launcher_foreground.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M16.61,15.15C16.15,15.15 15.77,14.78 15.77,14.32S16.15,13.5 16.61,13.5H16.61C17.07,13.5 17.45,13.86 17.45,14.32C17.45,14.78 17.07,15.15 16.61,15.15M7.41,15.15C6.95,15.15 6.57,14.78 6.57,14.32C6.57,13.86 6.95,13.5 7.41,13.5H7.41C7.87,13.5 8.24,13.86 8.24,14.32C8.24,14.78 7.87,15.15 7.41,15.15M16.91,10.14L18.58,7.26C18.67,7.09 18.61,6.88 18.45,6.79C18.28,6.69 18.07,6.75 18,6.92L16.29,9.83C14.95,9.22 13.5,8.9 12,8.91C10.47,8.91 9,9.24 7.73,9.82L6.04,6.91C5.95,6.74 5.74,6.68 5.57,6.78C5.4,6.87 5.35,7.08 5.44,7.25L7.1,10.13C4.25,11.69 2.29,14.58 2,18H22C21.72,14.59 19.77,11.7 16.91,10.14H16.91Z"/>
-</vector>
--- a/winboll/src/main/res/drawable/ic_launcher_foreground_disable.xml
+++ b/winboll/src/main/res/drawable/ic_launcher_foreground_disable.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#FF808080"
-        android:pathData="M16.61,15.15C16.15,15.15 15.77,14.78 15.77,14.32S16.15,13.5 16.61,13.5H16.61C17.07,13.5 17.45,13.86 17.45,14.32C17.45,14.78 17.07,15.15 16.61,15.15M7.41,15.15C6.95,15.15 6.57,14.78 6.57,14.32C6.57,13.86 6.95,13.5 7.41,13.5H7.41C7.87,13.5 8.24,13.86 8.24,14.32C8.24,14.78 7.87,15.15 7.41,15.15M16.91,10.14L18.58,7.26C18.67,7.09 18.61,6.88 18.45,6.79C18.28,6.69 18.07,6.75 18,6.92L16.29,9.83C14.95,9.22 13.5,8.9 12,8.91C10.47,8.91 9,9.24 7.73,9.82L6.04,6.91C5.95,6.74 5.74,6.68 5.57,6.78C5.4,6.87 5.35,7.08 5.44,7.25L7.1,10.13C4.25,11.69 2.29,14.58 2,18H22C21.72,14.59 19.77,11.7 16.91,10.14H16.91Z"/>
-</vector>
--- a/winboll/src/main/res/drawable/ic_launcher_stage.jpg
+++ b/winboll/src/main/res/drawable/ic_launcher_stage.jpg
--- a/winboll/src/main/res/drawable/ic_miapp.png
+++ b/winboll/src/main/res/drawable/ic_miapp.png
--- a/winboll/src/main/res/layout/activity_about.xml
+++ b/winboll/src/main/res/layout/activity_about.xml
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:orientation="vertical"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:id="@+id/aboutviewroot_ll">
-
-</LinearLayout>
-
--- a/winboll/src/main/res/layout/view_toolbar.xml
+++ b/winboll/src/main/res/layout/view_toolbar.xml
@@ -9,7 +9,7 @@
        android:id="@+id/toolbar_icon"
        android:layout_width="48dp"
        android:layout_height="48dp"
-        android:src="@drawable/ic_iw"
+        android:src="@drawable/ic_launcher"
        android:layout_alignParentStart="true"
        android:layout_centerVertical="true"
        android:layout_marginStart="6dp"
--- a/winboll/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/winboll/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
--- a/winboll/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/winboll/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
--- a/winboll/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/winboll/src/main/res/mipmap-hdpi/ic_launcher.png
--- a/winboll/src/main/res/mipmap-hdpi/ic_launcher_round.png
+++ b/winboll/src/main/res/mipmap-hdpi/ic_launcher_round.png
--- a/winboll/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/winboll/src/main/res/mipmap-mdpi/ic_launcher.png
--- a/winboll/src/main/res/mipmap-mdpi/ic_launcher_round.png
+++ b/winboll/src/main/res/mipmap-mdpi/ic_launcher_round.png
--- a/winboll/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/winboll/src/main/res/mipmap-xhdpi/ic_launcher.png
--- a/winboll/src/main/res/mipmap-xhdpi/ic_launcher_round.png
+++ b/winboll/src/main/res/mipmap-xhdpi/ic_launcher_round.png
--- a/winboll/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/winboll/src/main/res/mipmap-xxhdpi/ic_launcher.png
--- a/winboll/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
+++ b/winboll/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
--- a/winboll/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/winboll/src/main/res/mipmap-xxxhdpi/ic_launcher.png
--- a/winboll/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
+++ b/winboll/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png