<contacts>APK 15.3.19 release Publish.

aes/build.gradle

@@ -29,7 +29,7 @@ android {
         // versionName 更新后需要手动设置 
         // 项目模块目录的 build.gradle 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.10" 
+        versionName "15.9" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }

aes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Sep 29 13:04:18 HKT 2025
-stageCount=3
+#Sun Aug 31 23:40:17 HKT 2025
+stageCount=4
 libraryProject=libaes
-baseVersion=15.10
-publishVersion=15.10.2
+baseVersion=15.9
+publishVersion=15.9.3
 buildCount=0
-baseBetaVersion=15.10.3
+baseBetaVersion=15.9.4

aes/src/main/AndroidManifest.xml

@@ -33,8 +33,6 @@
 
         <activity android:name=".AboutActivity"/>
 
-        <activity android:name=".TestActivityManagerActivity"/>
-
     </application>
 
-</manifest>
+</manifest>

aes/src/main/java/cc/winboll/studio/aes/AboutActivity.java

@@ -12,18 +12,18 @@ 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;
+import cc.winboll.studio.libaes.winboll.APPInfo;
+import cc.winboll.studio.libaes.winboll.AboutView;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 
-public class AboutActivity extends WinBoLLActivity implements IWinBoLLActivity {
+public class AboutActivity extends AppCompatActivity implements IWinBoLLActivity {
 
     public static final String TAG = "AboutActivity";
 
     Context mContext;
     Toolbar mToolbar;
-
+    
     @Override
     public Activity getActivity() {
         return this;
@@ -33,7 +33,7 @@ public class AboutActivity extends WinBoLLActivity implements IWinBoLLActivity {
     public String getTag() {
         return TAG;
     }
-	
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -64,13 +64,13 @@ public class AboutActivity extends WinBoLLActivity implements IWinBoLLActivity {
         );
         layout.addView(aboutView, params);
 
-        WinBoLLActivityManager.getInstance().add(this);
+        GlobalApplication.getWinBoLLActivityManager().add(this);
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        WinBoLLActivityManager.getInstance().registeRemove(this);
+        GlobalApplication.getWinBoLLActivityManager().registeRemove(this);
     }
 
     public AboutView CreateAboutView() {

aes/src/main/java/cc/winboll/studio/aes/App.java

@@ -6,7 +6,6 @@ package cc.winboll.studio.aes;
  * @Describe AES应用类
  */
 import android.view.Gravity;
-import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import com.hjq.toast.ToastUtils;
 import com.hjq.toast.style.WhiteToastStyle;
@@ -19,7 +18,6 @@ public class App extends GlobalApplication {
     @Override
     public void onCreate() {
         super.onCreate();
-		WinBoLLActivityManager.init(this);
 
         // 初始化 Toast 框架
         ToastUtils.init(this);

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

@@ -15,10 +15,9 @@ import android.widget.AdapterView;
 import android.widget.Toast;
 import cc.winboll.studio.aes.R;
 import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
+import cc.winboll.studio.libaes.beans.DrawerMenuBean;
 import cc.winboll.studio.libaes.dialogs.LocalFileSelectDialog;
 import cc.winboll.studio.libaes.dialogs.StoragePathDialog;
-import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
-import cc.winboll.studio.libaes.models.DrawerMenuBean;
 import cc.winboll.studio.libaes.unittests.SecondaryLibraryActivity;
 import cc.winboll.studio.libaes.unittests.TestAButtonFragment;
 import cc.winboll.studio.libaes.unittests.TestASupportToolbarActivity;
@@ -26,10 +25,10 @@ import cc.winboll.studio.libaes.unittests.TestAToolbarActivity;
 import cc.winboll.studio.libaes.unittests.TestDrawerFragmentActivity;
 import cc.winboll.studio.libaes.unittests.TestViewPageFragment;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.ToastUtils;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 import com.a4455jkjh.colorpicker.ColorPickerDialog;
+import com.hjq.toast.ToastUtils;
 import java.util.ArrayList;
-import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 
 public class MainActivity extends DrawerFragmentActivity implements IWinBoLLActivity {
 
@@ -123,10 +122,9 @@ public class MainActivity extends DrawerFragmentActivity implements IWinBoLLActi
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         int nItemId = item.getItemId();
-        if (item.getItemId() == R.id.item_testactivitymanager) {
-            WinBoLLActivityManager.getInstance().startWinBoLLActivity(this, TestActivityManagerActivity.class);
-			//ToastUtils.show("item_testactivitymanager");
-        } else 
+//        if (item.getItemId() == R.id.item_log) {
+//            WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(getApplicationContext(), LogActivity.class);
+//        } else 
         if (nItemId == R.id.item_atoast) {
             Toast.makeText(getApplication(), "item_testatoast", Toast.LENGTH_SHORT).show();
         } else if (nItemId == R.id.item_atoolbar) {

aes/src/main/java/cc/winboll/studio/aes/TestActivityManagerActivity.java

@@ -1,33 +0,0 @@
-package cc.winboll.studio.aes;
-
-import android.app.Activity;
-import android.os.Bundle;
-import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
-
-/**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/09/28 21:07
- * @Describe 窗口管理类测试窗口
- */
-public class TestActivityManagerActivity extends WinBoLLActivity implements IWinBoLLActivity {
-    
-    public static final String TAG = "TestActivityManagerActivity";
-
-    @Override
-    public Activity getActivity() {
-        return this;
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-	
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_testactivitymanager);
-        
-    }
-    
-}

aes/src/main/java/cc/winboll/studio/aes/WinBoLLActivity.java

@@ -1,60 +0,0 @@
-package cc.winboll.studio.aes;
-
-/**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/09/29 00:11
- * @Describe WinBoLL 窗口基础类
- */
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.MenuItem;
-import androidx.appcompat.app.AppCompatActivity;
-import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
-import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
-import cc.winboll.studio.libappbase.LogUtils;
-
-public class WinBoLLActivity extends AppCompatActivity implements IWinBoLLActivity {
-
-    public static final String TAG = "WinBoLLActivity";
-
-    @Override
-    public Activity getActivity() {
-        return this;
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        LogUtils.d(TAG, String.format("onResume %s", getTag()));
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        /*if (item.getItemId() == R.id.item_log) {
-            WinBoLLActivityManager.getInstance().startLogActivity(this);
-            return true;
-        } else if (item.getItemId() == R.id.item_home) {
-			startActivity(new Intent(this, MainActivity.class));
-            return true;
-        }*/
-        // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
-    protected void onPostCreate(Bundle savedInstanceState) {
-        super.onPostCreate(savedInstanceState);
-        WinBoLLActivityManager.getInstance().add(this);
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        WinBoLLActivityManager.getInstance().registeRemove(this);
-    }
-}

aes/src/main/res/layout/activity_testactivitymanager.xml

@@ -1,15 +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">
-
-	<TextView
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="窗口管理类测试窗口"/>
-
-</LinearLayout>
-

aes/src/main/res/menu/toolbar_library.xml

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-	<item
-		android:id="@+id/item_testactivitymanager"
-		android:title="TestActivityManager"/>
     <item
         android:id="@+id/item_log"
         android:title="LogActivity"/>

contacts/build.gradle

@@ -18,8 +18,8 @@ def genVersionName(def versionName){
 }
 
 android {
-    compileSdkVersion 32
-    buildToolsVersion "32.0.0"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "cc.winboll.studio.contacts"

contacts/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Aug 31 06:05:42 CST 2025
-stageCount=17
+#Sat Oct 18 13:05:19 HKT 2025
+stageCount=20
 libraryProject=
 baseVersion=15.3
-publishVersion=15.3.16
+publishVersion=15.3.19
 buildCount=0
-baseBetaVersion=15.3.17
+baseBetaVersion=15.3.20

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

@@ -8,6 +8,7 @@ package cc.winboll.studio.contacts;
 import android.Manifest;
 import android.app.Activity;
 import android.app.ActivityManager;
+import android.app.AlertDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -31,6 +32,8 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentPagerAdapter;
 import androidx.viewpager.widget.ViewPager;
+import // 新增：导入 AppGoToSettingsUtil 工具类（确保包路径与项目实际一致）
+cc.winboll.studio.contacts.utils.AppGoToSettingsUtil;
 import cc.winboll.studio.contacts.R;
 import cc.winboll.studio.contacts.activities.SettingsActivity;
 import cc.winboll.studio.contacts.beans.MainServiceBean;
@@ -48,10 +51,9 @@ import java.util.List;
 final public class MainActivity extends AppCompatActivity implements IWinBoLLActivity, ViewPager.OnPageChangeListener, View.OnClickListener {
 
     public static final String TAG = "MainActivity";
-
     public static final int REQUEST_HOME_ACTIVITY = 0;
     public static final int REQUEST_ABOUT_ACTIVITY = 1;
-
+    public static final int REQUEST_APP_SETTINGS = 2;
     public static final String ACTION_SOS = "cc.winboll.studio.libappbase.WinBoLL.ACTION_SOS";
 
     static MainActivity _MainActivity;
@@ -72,6 +74,13 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct
     List<String> tabTitleList;
 
     private static final int DIALER_REQUEST_CODE = 1;
+    private static final int REQUEST_REQUIRED_PERMISSIONS = 1002;
+    // 关键修改1：新增 READ_CALL_LOG 权限到必需权限列表（解决通话记录读取崩溃）
+    private String[] REQUIRED_PERMISSIONS = new String[]{
+		Manifest.permission.READ_CONTACTS,  // 通讯录读取（原）
+		Manifest.permission.CALL_PHONE,     // 电话拨号（原）
+		Manifest.permission.READ_CALL_LOG   // 通话记录读取（新增，核心修复）
+    };
 
 
     @Override
@@ -88,9 +97,86 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         _MainActivity = this;
+
+        // 优先检查所有必需权限（含新增的 READ_CALL_LOG）
+        if (!checkAllRequiredPermissions()) {
+            requestAllRequiredPermissions();
+        } else {
+            initUIAndLogic(savedInstanceState);
+        }
+    }
+
+    // 权限检查方法（无需修改，自动包含新增的 READ_CALL_LOG）
+    private boolean checkAllRequiredPermissions() {
+        for (String permission : REQUIRED_PERMISSIONS) {
+            if (ActivityCompat.checkSelfPermission(this, permission) 
+				!= PackageManager.PERMISSION_GRANTED) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    // 权限申请方法（无需修改，自动申请新增的 READ_CALL_LOG）
+    private void requestAllRequiredPermissions() {
+        ActivityCompat.requestPermissions(this, REQUIRED_PERMISSIONS, REQUEST_REQUIRED_PERMISSIONS);
+    }
+
+    // 权限结果回调（无需修改，确保所有权限（含 READ_CALL_LOG）都通过才加载UI）
+    @Override
+    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+
+        if (requestCode == REQUEST_REQUIRED_PERMISSIONS) {
+            boolean allPermissionsGranted = true;
+            for (int result : grantResults) {
+                if (result != PackageManager.PERMISSION_GRANTED) {
+                    allPermissionsGranted = false;
+                    break;
+                }
+            }
+
+            if (allPermissionsGranted) {
+                initUIAndLogic(null);
+            } else {
+                // 关键修改2：更新提示文案，告知用户新增的“通话记录权限”
+                showPermissionDeniedDialogAndExit();
+            }
+        }
+    }
+
+    // 核心修改：新增“设置权限”按钮，点击调用 AppGoToSettingsUtil 跳转设置页
+    private void showPermissionDeniedDialogAndExit() {
+        new AlertDialog.Builder(this)
+			.setTitle("权限不足，无法使用")
+			// 文案修改：明确新增“通话记录读取”权限
+			.setMessage("应用需要「通讯录读取」、「电话」和「通话记录读取」权限才能正常运行，请授予权限后重新打开应用。")
+			.setCancelable(false)
+			// 新增：左侧“设置权限”按钮（先添加的按钮在左侧）
+			.setNegativeButton("设置权限", new AlertDialog.OnClickListener() {
+				@Override
+				public void onClick(android.content.DialogInterface dialog, int which) {
+					dialog.dismiss();
+					// 调用工具类跳转应用设置页（按需求实现）
+					AppGoToSettingsUtil appGoToSettingsUtil = new AppGoToSettingsUtil();
+					appGoToSettingsUtil.GoToSetting(MainActivity.this);
+				}
+			})
+			// 原有：右侧“确定退出”按钮（后添加的按钮在右侧）
+			.setPositiveButton("确定退出", new AlertDialog.OnClickListener() {
+				@Override
+				public void onClick(android.content.DialogInterface dialog, int which) {
+					dialog.dismiss();
+					finishAndRemoveTask();
+				}
+			})
+			.show();
+    }
+
+    // 初始化UI和逻辑（无需修改，权限通过后才加载 CallLogFragment）
+    private void initUIAndLogic(Bundle savedInstanceState) {
         setContentView(R.layout.activity_main);
 
-        // 初始化工具栏（仅加载基础UI）
         mToolbar = (Toolbar) findViewById(R.id.activitymainToolbar1);
         setSupportActionBar(mToolbar);
         getSupportActionBar().setSubtitle(TAG);
@@ -98,34 +184,28 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct
         tabLayout = (TabLayout) findViewById(R.id.tabLayout);
         viewPager = (ViewPager) findViewById(R.id.viewPager);
 
-        // 创建Fragment列表（仅实例化，不加载数据）
         fragmentList = new ArrayList<Fragment>();
         tabTitleList = new ArrayList<String>();
+        // CallLogFragment 仅在权限通过后才实例化（避免提前触发读取）
         fragmentList.add(CallLogFragment.newInstance(0));
-        fragmentList.add(ContactsFragment.newInstance(1)); // 延迟加载联系人数据
+        fragmentList.add(ContactsFragment.newInstance(1));
         fragmentList.add(LogFragment.newInstance(2));
         tabTitleList.add("通话记录");
         tabTitleList.add("联系人");
         tabTitleList.add("应用日志");
 
-        // 设置ViewPager适配器
         MyPagerAdapter adapter = new MyPagerAdapter(getSupportFragmentManager(), fragmentList, tabTitleList);
         viewPager.setAdapter(adapter);
-
-        // 关键：关闭预加载，仅当前页初始化
-        viewPager.setOffscreenPageLimit(0);
-
-        // 关联TabLayout和ViewPager
+        viewPager.setOffscreenPageLimit(0); // 关闭预加载，避免提前初始化 CallLogFragment
         tabLayout.setupWithViewPager(viewPager);
 
-        // 初始化服务状态（延迟启动非核心服务）
+        // 原有服务启动、电话监听等逻辑...
         MainServiceBean mMainServiceBean = MainServiceBean.loadBean(this, MainServiceBean.class);
         if (mMainServiceBean == null) {
             mMainServiceBean = new MainServiceBean();
             MainServiceBean.saveBean(this, mMainServiceBean);
         }
         if (mMainServiceBean.isEnable()) {
-            // 延迟1秒启动服务，避免阻塞启动
             new Handler().postDelayed(new Runnable() {
 					@Override
 					public void run() {
@@ -134,16 +214,14 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct
 				}, 1000);
         }
 
-        // 初始化电话状态监听（基础功能保留）
         telephonyManager = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
         phoneStateListener = new MyPhoneStateListener();
         telephonyManager.listen(phoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
     }
 
 
-    // ViewPager适配器（Java 7语法）
+    // 以下为原有代码（无需修改）
     private class MyPagerAdapter extends FragmentPagerAdapter {
-
         private List<Fragment> fragmentList;
         private List<String> tabTitleList;
 
@@ -173,21 +251,18 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct
         Intent intent = new Intent(Intent.ACTION_DIAL);
         intent.setData(android.net.Uri.parse("tel:" + phoneNumber));
         if (ActivityCompat.checkSelfPermission(_MainActivity, Manifest.permission.CALL_PHONE) != PackageManager.PERMISSION_GRANTED) {
+            Toast.makeText(_MainActivity, "拨号权限不足", Toast.LENGTH_SHORT).show();
             return;
         }
         _MainActivity.startActivity(intent);
     }
 
-    // OnPageChangeListener接口实现
     @Override
     public void onPageScrollStateChanged(int state) {}
-
     @Override
     public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {}
-
     @Override
     public void onPageSelected(int position) {}
-
     @Override
     public void onClick(View v) {}
 
@@ -239,9 +314,6 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct
         super.onResume();
     }
 
-    /**
-     * 检查是否是系统默认电话应用
-     */
     public boolean isDefaultPhoneCallApp() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             TelecomManager manger = (TelecomManager) getSystemService(TELECOM_SERVICE);
@@ -272,7 +344,9 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct
                 Toast.makeText(MainActivity.this, getString(R.string.app_name) + " 已成为默认电话应用",
 							   Toast.LENGTH_SHORT).show();
             }
-        }
+        } else if (requestCode == REQUEST_APP_SETTINGS) {
+			recreate();
+		}
     }
 }
 

contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java

@@ -76,6 +76,9 @@ public class CallLogAdapter extends RecyclerView.Adapter<CallLogAdapter.CallLogV
 									// Set the clipboard's primary clip.
 									clipboard.setPrimaryClip(clip);
 									Toast.makeText(mContext, "Copy to clipboard.", Toast.LENGTH_SHORT).show();
+								} else if (nItemId == R.id.item_calllog_phonenumber_add_contact) {
+									//ToastUtils.show(callLog.getPhoneNumber());
+									ContactUtils.jumpToAddContact(mContext, callLog.getPhoneNumber());
 								}
 
 								return true;

contacts/src/main/java/cc/winboll/studio/contacts/adapters/ContactAdapter.java

@@ -24,6 +24,7 @@ import cc.winboll.studio.contacts.beans.ContactModel;
 import cc.winboll.studio.libaes.views.AOHPCTCSeekBar;
 import com.hjq.toast.ToastUtils;
 import java.util.List;
+import cc.winboll.studio.contacts.utils.ContactUtils;
 
 public class ContactAdapter extends RecyclerView.Adapter<ContactAdapter.ContactViewHolder> {
 
@@ -69,6 +70,9 @@ public class ContactAdapter extends RecyclerView.Adapter<ContactAdapter.ContactV
 									// Set the clipboard's primary clip.
 									clipboard.setPrimaryClip(clip);
 									Toast.makeText(mContext, "Copy to clipboard.", Toast.LENGTH_SHORT).show();
+								} else if (nItemId == R.id.item_calllog_phonenumber_edit_contact) {
+									Long nContactId = ContactUtils.getContactIdByPhone(mContext, contact.getNumber());
+									ContactUtils.jumpToEditContact(mContext, contact.getNumber(), nContactId);
 								}
 
 								return true;
@@ -112,7 +116,7 @@ public class ContactAdapter extends RecyclerView.Adapter<ContactAdapter.ContactV
         TextView contactName;
         TextView contactNumber;
         AOHPCTCSeekBar dialAOHPCTCSeekBar;
-        
+
         public ContactViewHolder(@NonNull View itemView) {
             super(itemView);
 			llPhoneNumberMain = itemView.findViewById(R.id.itemcontactLinearLayout1);

contacts/src/main/java/cc/winboll/studio/contacts/fragments/CallLogFragment.java

@@ -25,7 +25,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import cc.winboll.studio.contacts.R;
 import cc.winboll.studio.contacts.adapters.CallLogAdapter;
 import cc.winboll.studio.contacts.beans.CallLogModel;
-import com.hjq.toast.ToastUtils;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -161,7 +160,7 @@ public class CallLogFragment extends Fragment {
             _CallLogFragment.triggerUpdate();
         }
     }
-	
+
 	@Override
 	public void onResume() {
 		super.onResume();

contacts/src/main/java/cc/winboll/studio/contacts/utils/AppGoToSettingsUtil.java

@@ -0,0 +1,270 @@
+package cc.winboll.studio.contacts.utils;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/09/27 14:27
+ * @Describe 调用应用属性设置页工具类
+ *  来源：https://blog.csdn.net/zhuhai__yizhi/article/details/78737593
+ *  Created by zyy on 2018/3/12.
+ *  直接跳转到权限后返回，可以监控权限授权情况，但是，跳转到应用详情页，无法监测权限情况
+ *  是否要加以区分，若是应用详情页，则跳转回来后，onRestart检测所求权限，如果授权，则收回提示，如果没授权，则继续提示
+ */
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Build;
+import android.provider.Settings;
+import cc.winboll.studio.contacts.MainActivity;
+
+public class AppGoToSettingsUtil {
+
+    public static final String TAG = "AppGoToSettingsUtil";
+
+    public static final int ACTIVITY_RESULT_APP_SETTINGS = MainActivity.REQUEST_APP_SETTINGS;
+
+    /**
+     * Build.MANUFACTURER判断各大手机厂商品牌
+     */
+    private static final String MANUFACTURER_HUAWEI = "Huawei";//华为
+    private static final String MANUFACTURER_MEIZU = "Meizu";//魅族
+    private static final String MANUFACTURER_XIAOMI = "Xiaomi";//小米
+    private static final String MANUFACTURER_SONY = "Sony";//索尼
+    private static final String MANUFACTURER_OPPO = "OPPO";
+    private static final String MANUFACTURER_LG = "LG";
+    private static final String MANUFACTURER_VIVO = "vivo";
+    private static final String MANUFACTURER_SAMSUNG = "samsung";//三星
+    private static final String MANUFACTURER_LETV = "Letv";//乐视
+    private static final String MANUFACTURER_ZTE = "ZTE";//中兴
+    private static final String MANUFACTURER_YULONG = "YuLong";//酷派
+    private static final String MANUFACTURER_LENOVO = "LENOVO";//联想
+
+    public static boolean isAppSettingOpen=false;
+    /**
+     * 跳转到相应品牌手机系统权限设置页，如果跳转不成功，则跳转到应用详情页
+     * 这里需要改造成返回true或者false，应用详情页:true，应用权限页:false
+     * @param activity
+     */
+    public static void GoToSetting(Activity activity) {
+        switch (Build.MANUFACTURER) {
+            case MANUFACTURER_HUAWEI://华为
+                Huawei(activity);
+                break;
+            case MANUFACTURER_MEIZU://魅族
+                Meizu(activity);
+                break;
+            case MANUFACTURER_XIAOMI://小米
+                Xiaomi(activity);
+                break;
+            case MANUFACTURER_SONY://索尼
+                Sony(activity);
+                break;
+            case MANUFACTURER_OPPO://oppo
+                OPPO(activity);
+                break;
+            case MANUFACTURER_LG://lg
+                LG(activity);
+                break;
+            case MANUFACTURER_LETV://乐视
+                Letv(activity);
+                break;
+            default://其他
+                try {//防止应用详情页也找不到，捕获异常后跳转到设置，这里跳转最好是两级，太多用户也会觉得麻烦，还不如不跳
+                    openAppDetailSetting(activity);
+                    //activity.startActivityForResult(getAppDetailSettingIntent(activity), PERMISSION_SETTING_FOR_RESULT);
+                } catch (Exception e) {
+                    SystemConfig(activity);
+                }
+                break;
+        }
+    }
+
+    /**
+     * 华为跳转权限设置页
+     * @param activity
+     */
+    public static void Huawei(Activity activity) {
+        try {
+            Intent intent = new Intent();
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.putExtra("packageName", activity.getPackageName());
+            ComponentName comp = new ComponentName("com.huawei.systemmanager", "com.huawei.permissionmanager.ui.MainActivity");
+            intent.setComponent(comp);
+            activity.startActivityForResult(intent, ACTIVITY_RESULT_APP_SETTINGS);
+            isAppSettingOpen = false;
+        } catch (Exception e) {
+            openAppDetailSetting(activity);
+            //activity.startActivityForResult(getAppDetailSettingIntent(activity), PERMISSION_SETTING_FOR_RESULT);
+        }
+    }
+
+    /**
+     * 魅族跳转权限设置页，测试时，点击无反应，具体原因不明
+     * @param activity
+     */
+    public static void Meizu(Activity activity) {
+        try {
+            Intent intent = new Intent("com.meizu.safe.security.SHOW_APPSEC");
+            intent.addCategory(Intent.CATEGORY_DEFAULT);
+            intent.putExtra("packageName", activity.getPackageName());
+            activity.startActivity(intent);
+            isAppSettingOpen = false;
+        } catch (Exception e) {
+            openAppDetailSetting(activity);
+            //activity.startActivityForResult(getAppDetailSettingIntent(activity), PERMISSION_SETTING_FOR_RESULT);
+        }
+    }
+
+    /**
+     * 小米，功能正常
+     * @param activity
+     */
+    public static void Xiaomi(Activity activity) {
+        try { //MIUI 8 9
+            Intent localIntent = new Intent("miui.intent.action.APP_PERM_EDITOR");
+            localIntent.setClassName("com.miui.securitycenter", "com.miui.permcenter.permissions.PermissionsEditorActivity");
+            localIntent.putExtra("extra_pkgname", activity.getPackageName());
+            activity.startActivityForResult(localIntent, ACTIVITY_RESULT_APP_SETTINGS);
+            isAppSettingOpen = false;
+            //activity.startActivity(localIntent);
+        } catch (Exception e) {
+            try { //MIUI 5/6/7
+                Intent localIntent = new Intent("miui.intent.action.APP_PERM_EDITOR");
+                localIntent.setClassName("com.miui.securitycenter", "com.miui.permcenter.permissions.AppPermissionsEditorActivity");
+                localIntent.putExtra("extra_pkgname", activity.getPackageName());
+                activity.startActivityForResult(localIntent, ACTIVITY_RESULT_APP_SETTINGS);
+                isAppSettingOpen = false;
+                //activity.startActivity(localIntent);
+            } catch (Exception e1) { //否则跳转到应用详情
+                openAppDetailSetting(activity);
+                //activity.startActivityForResult(getAppDetailSettingIntent(activity), PERMISSION_SETTING_FOR_RESULT);
+                //这里有个问题，进入活动后需要再跳一级活动，就检测不到返回结果
+                //activity.startActivity(getAppDetailSettingIntent());
+            }
+        }
+    }
+
+    /**
+     * 索尼，6.0以上的手机非常少，基本没看见
+     * @param activity
+     */
+    public static void Sony(Activity activity) {
+        try {
+            Intent intent = new Intent();
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.putExtra("packageName", activity.getPackageName());
+            ComponentName comp = new ComponentName("com.sonymobile.cta", "com.sonymobile.cta.SomcCTAMainActivity");
+            intent.setComponent(comp);
+            activity.startActivity(intent);
+            isAppSettingOpen = false;
+        } catch (Exception e) {
+            openAppDetailSetting(activity);
+            //activity.startActivityForResult(getAppDetailSettingIntent(activity), PERMISSION_SETTING_FOR_RESULT);
+        }
+    }
+
+    /**
+     * OPPO
+     * @param activity
+     */
+    public static void OPPO(Activity activity) {
+        try {
+            Intent intent = new Intent();
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.putExtra("packageName", activity.getPackageName());
+            ComponentName comp = new ComponentName("com.color.safecenter", "com.color.safecenter.permission.PermissionManagerActivity");
+            intent.setComponent(comp);
+            activity.startActivity(intent);
+            isAppSettingOpen = false;
+        } catch (Exception e) {
+            openAppDetailSetting(activity);
+            //activity.startActivityForResult(getAppDetailSettingIntent(activity), PERMISSION_SETTING_FOR_RESULT);
+        }
+    }
+
+    /**
+     * LG经过测试，正常使用
+     * @param activity
+     */
+    public static void LG(Activity activity) {
+        try {
+            Intent intent = new Intent("android.intent.action.MAIN");
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.putExtra("packageName", activity.getPackageName());
+            ComponentName comp = new ComponentName("com.android.settings", "com.android.settings.Settings$AccessLockSummaryActivity");
+            intent.setComponent(comp);
+            activity.startActivity(intent);
+            isAppSettingOpen = false;
+        } catch (Exception e) {
+            openAppDetailSetting(activity);
+            //activity.startActivityForResult(getAppDetailSettingIntent(activity), PERMISSION_SETTING_FOR_RESULT);
+        }
+    }
+
+    /**
+     * 乐视6.0以上很少，基本都可以忽略了，现在乐视手机不多
+     * @param activity
+     */
+    public static void Letv(Activity activity) {
+        try {
+            Intent intent = new Intent();
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.putExtra("packageName", activity.getPackageName());
+            ComponentName comp = new ComponentName("com.letv.android.letvsafe", "com.letv.android.letvsafe.PermissionAndApps");
+            intent.setComponent(comp);
+            activity.startActivity(intent);
+            isAppSettingOpen = false;
+        } catch (Exception e) {
+            openAppDetailSetting(activity);
+            //activity.startActivityForResult(getAppDetailSettingIntent(activity), PERMISSION_SETTING_FOR_RESULT);
+        }
+    }
+
+    /**
+     * 只能打开到自带安全软件
+     * @param activity
+     */
+    public static void _360(Activity activity) {
+        try {
+            Intent intent = new Intent("android.intent.action.MAIN");
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.putExtra("packageName", activity.getPackageName());
+            ComponentName comp = new ComponentName("com.qihoo360.mobilesafe", "com.qihoo360.mobilesafe.ui.index.AppEnterActivity");
+            intent.setComponent(comp);
+            activity.startActivity(intent);
+        } catch (Exception e) {
+            openAppDetailSetting(activity);
+            //activity.startActivityForResult(getAppDetailSettingIntent(activity), PERMISSION_SETTING_FOR_RESULT);
+        }
+    }
+    /**
+     * 系统设置界面
+     * @param activity
+     */
+    public static void SystemConfig(Activity activity) {
+        Intent intent = new Intent(Settings.ACTION_SETTINGS);
+        activity.startActivity(intent);
+    }
+    /**
+     * 获取应用详情页面
+     * @return
+     */
+    private static Intent getAppDetailSettingIntent(Activity activity) {
+        Intent localIntent = new Intent();
+        localIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        //if (Build.VERSION.SDK_INT >= 9) {
+        localIntent.setAction("android.settings.APPLICATION_DETAILS_SETTINGS");
+        localIntent.setData(Uri.fromParts("package", activity.getPackageName(), null));
+        /*} else if (Build.VERSION.SDK_INT <= 8) {
+         localIntent.setAction(Intent.ACTION_VIEW);
+         localIntent.setClassName("com.android.settings", "com.android.settings.InstalledAppDetails");
+         localIntent.putExtra("com.android.settings.ApplicationPkgName", activity.getPackageName());
+         }*/
+        return localIntent;
+    }
+
+    public static void openAppDetailSetting(Activity activity) {
+        activity.startActivityForResult(getAppDetailSettingIntent(activity), ACTIVITY_RESULT_APP_SETTINGS);
+        isAppSettingOpen = true;
+    }
+}

contacts/src/main/java/cc/winboll/studio/contacts/utils/ContactUtils.java

@@ -6,8 +6,11 @@ package cc.winboll.studio.contacts.utils;
  * @Describe 联系人工具集
  */
 import android.content.ContentResolver;
+import android.content.ContentUris;
 import android.content.Context;
+import android.content.Intent;
 import android.database.Cursor;
+import android.net.Uri;
 import android.provider.ContactsContract;
 import cc.winboll.studio.libappbase.LogUtils;
 import java.util.HashMap;
@@ -120,4 +123,97 @@ public class ContactUtils {
         }
         return sbSpaceNumber.toString();
     }
+
+
+	/**
+	 * 跳转至系统添加联系人界面的工具函数
+	 * @param context 上下文（如 PhoneCallService、Activity、Fragment 均可，需传入有效上下文）
+	 * @param phoneNumber 可选参数：预填的联系人电话（传 null 则跳转空表单）
+	 */
+	public static void jumpToAddContact(Context mContext, String phoneNumber) {
+		Intent intent = new Intent(Intent.ACTION_INSERT);
+		intent.setType("vnd.android.cursor.dir/person");
+		intent.putExtra(android.provider.ContactsContract.Intents.Insert.PHONE, phoneNumber);
+		mContext.startActivity(intent);
+	}
+	
+	/**
+	 * 跳转至系统编辑联系人界面（适配小米等定制机型）
+	 * @param context 上下文（Activity/Service/Fragment）
+	 * @param phoneNumber 待编辑联系人的电话号码（用于匹配已有联系人，必传）
+	 * @param contactId 可选：已有联系人的ID（通过 ContactsContract 获取，传null则自动匹配号码）
+	 */
+	public static void jumpToEditContact(Context context, String phoneNumber, Long contactId) {
+		Intent intent = new Intent(Intent.ACTION_EDIT);
+		// 关键：小米等机型需明确设置数据类型为“单个联系人”，避免参数丢失
+		intent.setType(ContactsContract.Contacts.CONTENT_ITEM_TYPE);
+
+		// 场景A：已知联系人ID（精准定位，优先用此方式，参数传递最稳定）
+		if (contactId != null && contactId > 0) {
+			// 构建联系人的Uri（格式：content://contacts/people/[contactId]，系统标准格式）
+			Uri contactUri = ContentUris.withAppendedId(ContactsContract.Contacts.CONTENT_URI, contactId);
+			intent.setData(contactUri);
+		} 
+		// 场景B：未知ID，通过电话号码匹配（需系统支持号码匹配，小米机型兼容）
+		else if (phoneNumber != null && !phoneNumber.isEmpty()) {
+			// 方式1：小米等机型兼容的“通过号码定位联系人”参数（部分系统认此参数）
+			//intent.putExtra(ContactsContract.Intents.Insert.PHONE_NUMBER, phoneNumber);
+			// 方式2：补充系统标准的“数据Uri”，强化匹配（避免参数被定制系统忽略）
+			Uri phoneUri = Uri.withAppendedPath(ContactsContract.CommonDataKinds.Phone.CONTENT_FILTER_URI, Uri.encode(phoneNumber));
+			intent.setData(phoneUri);
+		} else {
+			LogUtils.d(TAG, "编辑联系人失败：电话号码和联系人ID均为空");
+			return;
+		}
+
+		// 可选：预填最新号码（覆盖原有号码，若用户修改了号码，编辑时自动更新）
+		if (phoneNumber != null && !phoneNumber.isEmpty()) {
+			intent.putExtra(ContactsContract.CommonDataKinds.Phone.NUMBER, phoneNumber);
+			intent.putExtra(ContactsContract.CommonDataKinds.Phone.TYPE, ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE);
+		}
+
+		// 启动活动（加防护，避免无联系人应用崩溃）
+		if (intent.resolveActivity(context.getPackageManager()) != null) {
+			// 小米机型在Service/非Activity中调用，需加NEW_TASK标志，否则可能无法启动
+			intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+			context.startActivity(intent);
+		} else {
+			LogUtils.d(TAG, "编辑联系人失败：设备未安装联系人应用");
+		}
+	}
+	
+	/**
+	 * 通过电话号码查询联系人ID（适配小米机型，解决编辑时匹配不稳定问题）
+	 * @param context 上下文
+	 * @param phoneNumber 待查询的电话号码
+	 * @return 联系人ID（无匹配时返回-1）
+	 */
+	public static Long getContactIdByPhone(Context context, String phoneNumber) {
+		if (phoneNumber == null || phoneNumber.isEmpty()) {
+			return -1L;
+		}
+
+		ContentResolver cr = context.getContentResolver();
+		// 1. 构建电话查询Uri（系统标准：通过号码过滤联系人数据）
+		Uri queryUri = Uri.withAppendedPath(ContactsContract.CommonDataKinds.Phone.CONTENT_FILTER_URI, Uri.encode(phoneNumber));
+		// 2. 只查询“联系人ID”字段（高效，避免冗余数据）
+		String[] projection = {ContactsContract.CommonDataKinds.Phone.CONTACT_ID};
+		Cursor cursor = null;
+
+		try {
+			cursor = cr.query(queryUri, projection, null, null, null);
+			if (cursor != null && cursor.moveToFirst()) {
+				// 3. 读取联系人ID（返回Long类型，避免int溢出）
+				return cursor.getLong(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.CONTACT_ID));
+			}
+		} catch (Exception e) {
+			LogUtils.d(TAG, "查询联系人ID失败。" + e);
+		} finally {
+			if (cursor != null) {
+				cursor.close(); // 关闭游标，避免内存泄漏
+			}
+		}
+		return -1L; // 无匹配联系人
+	}
+	
 }

contacts/src/main/res/menu/toolbar_calllog_phonenumber.xml

@@ -5,5 +5,8 @@
     <item
         android:id="@+id/item_calllog_phonenumber_copy"
         android:title="Copy"/>
+    <item
+        android:id="@+id/item_calllog_phonenumber_add_contact"
+        android:title="Add Contact"/>
     
 </menu>

contacts/src/main/res/menu/toolbar_contact_phonenumber.xml

@@ -5,5 +5,8 @@
     <item
         android:id="@+id/item_contact_phonenumber_copy"
         android:title="Copy"/>
+    <item
+        android:id="@+id/item_calllog_phonenumber_edit_contact"
+        android:title="Edit Contact"/>
     
 </menu>

libaes/build.gradle

@@ -21,8 +21,8 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    api 'cc.winboll.studio:libapputils:15.10.2'
-	api 'cc.winboll.studio:libappbase:15.10.9'
+    api 'cc.winboll.studio:libapputils:15.8.5'
+	api 'cc.winboll.studio:libappbase:15.9.5'
     
     // 吐司类库
     api 'com.github.getActivity:ToastUtils:10.5'

libaes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Sep 29 13:04:07 HKT 2025
-stageCount=3
+#Sun Aug 31 05:00:43 CST 2025
+stageCount=4
 libraryProject=libaes
-baseVersion=15.10
-publishVersion=15.10.2
+baseVersion=15.9
+publishVersion=15.9.3
 buildCount=0
-baseBetaVersion=15.10.3
+baseBetaVersion=15.9.4

libaes/src/main/java/cc/winboll/studio/libaes/activitys/DrawerFragmentActivity.java

@@ -23,16 +23,17 @@ import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 import cc.winboll.studio.libaes.DrawerMenuDataAdapter;
 import cc.winboll.studio.libaes.R;
-import cc.winboll.studio.libaes.models.AESThemeBean;
-import cc.winboll.studio.libaes.models.DrawerMenuBean;
+import cc.winboll.studio.libaes.beans.AESThemeBean;
+import cc.winboll.studio.libaes.beans.DrawerMenuBean;
 import cc.winboll.studio.libaes.utils.AESThemeUtil;
 import cc.winboll.studio.libaes.views.ADrawerMenuListView;
+import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 import com.baoyz.widget.PullRefreshLayout;
 import java.util.ArrayList;
-import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 
-public abstract class DrawerFragmentActivity extends AppCompatActivity implements AdapterView.OnItemClickListener {
+public abstract class DrawerFragmentActivity extends AppCompatActivity implements IWinBoLLActivity,AdapterView.OnItemClickListener {
 
     public static final String TAG = "DrawerFragmentActivity";
 
@@ -175,6 +176,8 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
             for (int i = Integer.MIN_VALUE; i < Integer.MAX_VALUE; i++) {
                 getString(i);
             }
+//        } else if (R.id.item_log == item.getItemId()) {
+//            GlobalApplication.getWinBoLLActivityManager().startLogActivity(this);
         } else if (R.id.item_about == item.getItemId()) {
             LogUtils.d(TAG, "onAbout");
         } else if (android.R.id.home == item.getItemId()) {

libaes/src/main/java/cc/winboll/studio/libaes/beans/AESThemeBean.java

@@ -1,4 +1,4 @@
-package cc.winboll.studio.libaes.models;
+package cc.winboll.studio.libaes.beans;
 
 /**
  * @Author ZhanGSKen<zhangsken@qq.com>

libaes/src/main/java/cc/winboll/studio/libaes/beans/DrawerMenuBean.java

@@ -1,4 +1,4 @@
-package cc.winboll.studio.libaes.models;
+package cc.winboll.studio.libaes.beans;
 
 /**
  * @Author ZhanGSKen<zhangsken@qq.com>

libaes/src/main/java/cc/winboll/studio/libaes/beans/WinBoLLClientServiceBean.java

@@ -1,4 +1,4 @@
-package cc.winboll.studio.libaes.models;
+package cc.winboll.studio.libaes.beans;
 
 /**
  * @Author ZhanGSKen

libaes/src/main/java/cc/winboll/studio/libaes/dialogs/YesNoAlertDialog.java

@@ -1,60 +0,0 @@
-package cc.winboll.studio.libaes.dialogs;
-
-/**
- * @Author ZhanGSKen<zhangsken@qq.com>
- * @Date 2025/03/28 17:40:47
- * @Date 2024/08/12 14:46:25
- * @Describe 询问用户确定与否的选择框
- */
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-
-public class YesNoAlertDialog {
-
-    public static final String TAG = "YesNoAlertDialog";
-
-    public static void show(Context context, String szTitle, String szMessage, final OnDialogResultListener listener) {
-        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(
-            context);
-
-        // set title
-        alertDialogBuilder.setTitle(szTitle);
-
-        // set dialog message
-        alertDialogBuilder
-            .setMessage(szMessage)
-            .setCancelable(true)
-            .setOnCancelListener(new DialogInterface.OnCancelListener(){
-                @Override
-                public void onCancel(DialogInterface dialog) {
-                    listener.onNo();
-                }
-            })
-            .setPositiveButton("YES", new DialogInterface.OnClickListener() {
-                public void onClick(DialogInterface dialog, int id) {
-                    // if this button is clicked, close
-                    // current activity
-                    listener.onYes();
-                }
-            })
-            .setNegativeButton("NO", new DialogInterface.OnClickListener() {
-                public void onClick(DialogInterface dialog, int id) {
-                    // if this button is clicked, just close
-                    // the dialog box and do nothing
-                    dialog.cancel();
-                }
-            });
-
-        // create alert dialog
-        AlertDialog alertDialog = alertDialogBuilder.create();
-
-        // show it
-        alertDialog.show();
-    }
-
-    public interface OnDialogResultListener {
-        abstract void onYes();
-        abstract void onNo();
-    }
-}

libaes/src/main/java/cc/winboll/studio/libaes/interfaces/IWinBoLLActivity.java

@@ -1,18 +0,0 @@
-package cc.winboll.studio.libaes.interfaces;
-
-/**
- * @Author ZhanGSKen<zhangsken@qq.com>
- * @Date 2025/05/10 09:34
- * @Describe WinBoLL 窗口操作接口
- */
- import android.app.Activity;
- 
-public abstract interface IWinBoLLActivity {
-
-    public static final String TAG = "IWinBoLLActivity";
-
-    public static final String ACTION_BIND = IWinBoLLActivity.class.getName() + ".ACTION_BIND";
-
-    public Activity getActivity();
-    public String getTag();
-}

libaes/src/main/java/cc/winboll/studio/libaes/unittests/SecondaryLibraryActivity.java

@@ -7,7 +7,7 @@ import android.view.MenuItem;
 import android.widget.Toast;
 import cc.winboll.studio.libaes.R;
 import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
-import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 
 /**
  * @Author ZhanGSKen<zhangsken@qq.com>

libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestASupportToolbarActivity.java

@@ -10,8 +10,8 @@ import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import cc.winboll.studio.libaes.R;
-import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
 import cc.winboll.studio.libaes.utils.AESThemeUtil;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 
 public class TestASupportToolbarActivity extends AppCompatActivity implements IWinBoLLActivity  {
 

libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAToolbarActivity.java

@@ -10,11 +10,22 @@ import android.os.Bundle;
 import android.widget.Toolbar;
 import cc.winboll.studio.libaes.R;
 import cc.winboll.studio.libaes.utils.AESThemeUtil;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 
-public class TestAToolbarActivity extends Activity {
+public class TestAToolbarActivity extends Activity implements IWinBoLLActivity {
 
     public static final String TAG = "TestAToolbarActivity";
     
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+    
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         AESThemeUtil.applyAppTheme(this);

libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestDrawerFragmentActivity.java

@@ -14,9 +14,9 @@ import android.widget.Toast;
 import androidx.fragment.app.Fragment;
 import cc.winboll.studio.libaes.R;
 import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
-import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
-import cc.winboll.studio.libaes.models.DrawerMenuBean;
+import cc.winboll.studio.libaes.beans.DrawerMenuBean;
 import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 import java.util.ArrayList;
 
 public class TestDrawerFragmentActivity extends DrawerFragmentActivity implements IWinBoLLActivity {

libaes/src/main/java/cc/winboll/studio/libaes/utils/AESThemeUtil.java

@@ -12,7 +12,7 @@ import android.view.MenuItem;
 import androidx.appcompat.app.AppCompatActivity;
 import cc.winboll.studio.libaes.R;
 import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
-import cc.winboll.studio.libaes.models.AESThemeBean;
+import cc.winboll.studio.libaes.beans.AESThemeBean;
 
 public class AESThemeUtil {
 

libaes/src/main/java/cc/winboll/studio/libaes/utils/MyActivityLifecycleCallbacks.java

@@ -1,97 +0,0 @@
-package cc.winboll.studio.libaes.utils;
-
-/**
- * @Author ZhanGSKen<zhangsken@qq.com>
- * @Date 2025/03/25 04:29:19
- */
-import android.app.Activity;
-import android.app.Application;
-import android.content.Intent;
-import android.os.Bundle;
-import cc.winboll.studio.libappbase.LogUtils; 
-
-public class MyActivityLifecycleCallbacks implements Application.ActivityLifecycleCallbacks { 
-
-    public static final String TAG = "MyActivityLifecycleCallbacks";
-
-    public String mInfo = "";
-
-    public MyActivityLifecycleCallbacks() {
-
-    }
-
-    void createActivityeInfo(Activity activity) {
-        StringBuilder sb = new StringBuilder();
-        Intent receivedIntent = activity.getIntent();
-        sb.append("\nCallingActivity : \n");
-        if (activity.getCallingActivity() != null) {
-            sb.append(activity.getCallingActivity().getPackageName());
-        }
-        sb.append("\nReceived Intent Package : \n");
-        sb.append(receivedIntent.getPackage());
-
-        Bundle extras = receivedIntent.getExtras();
-        if (extras != null) {
-            for (String key : extras.keySet()) {
-                sb.append("\nIntentInfo");
-                sb.append("\n键: ");
-                sb.append(key);
-                sb.append(", 值: ");
-                sb.append(extras.get(key));
-                //Log.d("IntentInfo", "键: " + key + ", 值: " + extras.get(key));
-            }
-        }
-        mInfo = sb.toString();
-        //Log.d("IntentInfo", "发送Intent的应用包名: " + senderPackage);
-    }
-
-    public void showActivityeInfo() {
-        //ToastUtils.show("ActivityeInfo : " + mInfo);
-        LogUtils.d(TAG, "ActivityeInfo : " + mInfo);
-    }
-
-    @Override 
-    public void onActivityCreated(Activity activity, Bundle savedInstanceState) { 
-        // 在这里可以做一些初始化相关的操作，例如记录Activity的创建时间等 
-        //System.out.println(activity.getLocalClassName() + " was created"); 
-        LogUtils.d(TAG, activity.getLocalClassName() + " was created");
-        createActivityeInfo(activity);
-    } 
-
-    @Override 
-    public void onActivityStarted(Activity activity) { 
-        //System.out.println(activity.getLocalClassName() + " was started");
-        LogUtils.d(TAG, activity.getLocalClassName() + " was started");
-        //createActivityeInfo(activity);
-    } 
-
-    @Override 
-    public void onActivityResumed(Activity activity) { 
-        //System.out.println(activity.getLocalClassName() + " was resumed");
-        LogUtils.d(TAG, activity.getLocalClassName() + " was resumed");
-        //createActivityeInfo(activity);
-    } 
-
-    @Override 
-    public void onActivityPaused(Activity activity) { 
-        //System.out.println(activity.getLocalClassName() + " was paused");
-        LogUtils.d(TAG, activity.getLocalClassName() + " was paused");
-    } 
-
-    @Override 
-    public void onActivityStopped(Activity activity) { 
-        //System.out.println(activity.getLocalClassName() + " was stopped");
-        LogUtils.d(TAG, activity.getLocalClassName() + " was stopped");
-    } 
-
-    @Override 
-    public void onActivitySaveInstanceState(Activity activity, Bundle outState) { 
-        // 可以在这里添加保存状态的自定义逻辑 
-    } 
-
-    @Override 
-    public void onActivityDestroyed(Activity activity) { 
-        //System.out.println(activity.getLocalClassName() + " was destroyed");
-        LogUtils.d(TAG, activity.getLocalClassName() + " was destroyed");
-    } 
-}

libaes/src/main/java/cc/winboll/studio/libaes/utils/WinBoLLActivityManager.java

@@ -1,292 +0,0 @@
-package cc.winboll.studio.libaes.utils;
-
-/**
- * @Author ZhanGSKen<zhangsken@qq.com>
- * @Date 2025/05/10 10:02
- * @Describe 应用活动窗口管理器
- * 参考 ：
- * android 类似微信小程序多任务窗口 及 设置 TaskDescription 修改 icon 和 label
- * https://blog.csdn.net/qq_29364417/article/details/109379915?app_version=6.4.2&code=app_1562916241&csdn_share_tail=%7B%22type%22%3A%22blog%22%2C%22rType%22%3A%22article%22%2C%22rId%22%3A%22109379915%22%2C%22source%22%3A%22weixin_38986226%22%7D&uLinkId=usr1mkqgl919blen&utm_source=app
- */
-import android.app.Activity;
-import android.app.ActivityManager;
-import android.content.Context;
-import android.content.Intent;
-import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
-import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.LogActivity;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.ToastUtils;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-public class WinBoLLActivityManager {
-
-    public static final String TAG = "WinBoLLActivityManager";
-
-    public static final String EXTRA_TAG = "EXTRA_TAG";
-
-
-    public enum WinBoLLUI_TYPE { Aplication, Service }
-
-    GlobalApplication mGlobalApplication;
-    volatile static WinBoLLActivityManager _mIWinBoLLActivityManager;
-    Map<String, IWinBoLLActivity> mActivityListMap;
-
-    volatile static WinBoLLUI_TYPE _WinBoLLUI_TYPE = WinBoLLUI_TYPE.Service;
-    public static void setWinBoLLUI_TYPE(WinBoLLUI_TYPE winBoLLUI_TYPE) {
-        _WinBoLLUI_TYPE = winBoLLUI_TYPE;
-    }
-
-    public static WinBoLLUI_TYPE getWinBoLLUI_TYPE() {
-        return _WinBoLLUI_TYPE;
-    }
-	
-    WinBoLLActivityManager(GlobalApplication application) {
-        mGlobalApplication = application;
-        mActivityListMap = new HashMap<String, IWinBoLLActivity>();
-    }
-
-    public static WinBoLLActivityManager getInstance() {
-        return _mIWinBoLLActivityManager;
-    }
-	
-	public static synchronized <T extends GlobalApplication> void init(T application) {
-        if (_mIWinBoLLActivityManager == null) {
-            _mIWinBoLLActivityManager = new WinBoLLActivityManager(application);
-        }
-    }
-
-    /**
-     * 把Activity添加到管理中
-     */
-    public <T extends IWinBoLLActivity> void add(T activity) {
-        if (isActivityActive(activity.getTag())) {
-            LogUtils.d(TAG, String.format("add(...) %s is active.", activity.getTag()));
-        } else {
-            mActivityListMap.put(activity.getTag(), activity);
-            LogUtils.d(TAG, String.format("Add activity : %s\n_mapActivityList.size() : %d", activity.getTag(), mActivityListMap.size()));
-        }
-    }
-
-    //
-    // activity: 为 null 时，
-    // intent.putExtra 函数 "tag" 参数为 tag
-    // activity: 不为 null 时，
-    // intent.putExtra 函数 "tag" 参数为 activity.getTag()
-    //
-    public <T extends IWinBoLLActivity> void startWinBoLLActivity(Context context, Class<T> clazz) {
-        // 如果窗口已存在就重启窗口
-        if (!resumeActivity(clazz)) {
-            // 新建一个任务窗口
-            Intent intent = new Intent(context, clazz);
-            //打开多任务窗口 flags
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
-            intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
-            //intent.putExtra("tag", tag);
-            context.startActivity(intent);
-        }
-    }
-
-    public <T extends IWinBoLLActivity> void startWinBoLLActivity(Context context, Intent intent, Class<T> clazz) {
-        // 如果窗口已存在就重启窗口
-        if (!resumeActivity(clazz)) {
-            // 新建一个任务窗口
-            //Intent intent = new Intent(context, clazz);
-            //打开多任务窗口 flags
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
-            intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
-            //intent.putExtra("tag", tag);
-            context.startActivity(intent);
-        }
-    }
-
-    public <T extends IWinBoLLActivity> void startLogActivity(Context context) {
-        // 如果窗口已存在就重启窗口
-        //if (!resumeActivity(LogActivity.class)) {
-        // 新建一个任务窗口
-        Intent intent = new Intent(context, LogActivity.class);
-        //打开多任务窗口 flags
-        // Define the bounds.
-//        Rect bounds = new Rect(0, 0, 800, 200);
-//        // Set the bounds as an activity option.
-//        ActivityOptions options = ActivityOptions.makeBasic();
-//        options.setLaunchBounds(bounds);
-        intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
-        intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
-
-        //intent.putExtra(EXTRA_TAG, tag);
-
-        //context.startActivity(intent, options.toBundle());
-        context.startActivity(intent);
-        //}
-    }
-
-    //
-    // 判断 tag 绑定的 Activity 是否已经创建
-    //
-    public boolean isActivityActive(String tag) {
-        return mActivityListMap.get(tag) != null;
-    }
-
-    Activity getActivityByTag(String tag) {
-        return (mActivityListMap.get(tag) == null) ?null: mActivityListMap.get(tag).getActivity();
-    }
-
-
-    //
-    // 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台
-    //
-    public <T extends IWinBoLLActivity> boolean resumeActivity(Class<T> clazz) {
-        try {
-            Activity activity = getActivityByTag(clazz.newInstance().getTag());
-            if (activity != null) {
-                return resumeActivity(activity);
-            }
-        } catch (InstantiationException | IllegalAccessException e) {
-            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-        }
-        return false;
-    }
-
-    //
-    // 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台
-    //
-    public <T extends IWinBoLLActivity> boolean resumeActivity(String tag) {
-        Activity activity = getActivityByTag(tag);
-        if (activity != null) {
-            return resumeActivity(activity);
-        }
-        return false;
-    }
-
-    //
-    // 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台
-    //
-    public <T extends IWinBoLLActivity> boolean resumeActivity(Activity activity) {
-        ActivityManager am = (ActivityManager) activity.getSystemService(Context.ACTIVITY_SERVICE);
-        //返回启动它的根任务（home 或者 MainActivity）
-        //Intent intent = new Intent(mContext, activity.getClass());
-        //TaskStackBuilder stackBuilder = TaskStackBuilder.create(mContext);
-        //stackBuilder.addNextIntentWithParentStack(intent);
-        //stackBuilder.startActivities();
-        am.moveTaskToFront(activity.getTaskId(), ActivityManager.MOVE_TASK_NO_USER_ACTION);
-        //ToastUtils.show("resumeActivity");
-        return true;
-    }
-
-
-    /**
-     * 结束所有 Activity
-     */
-    public void finishAll() {
-        try {
-            //ToastUtils.show(String.format("finishAll() size : %d", _mIWinBoLLActivityList.size()));
-            for (int i = mActivityListMap.size() - 1; i > -1; i--) {
-                IWinBoLLActivity iWinBoLLActivity = mActivityListMap.get(i);
-                ToastUtils.show("finishAll() activity");
-                if (iWinBoLLActivity != null && iWinBoLLActivity.getActivity() != null && !iWinBoLLActivity.getActivity().isFinishing() && !iWinBoLLActivity.getActivity().isDestroyed()) {
-                    //ToastUtils.show("activity != null ...");
-                    if (getWinBoLLUI_TYPE() == WinBoLLUI_TYPE.Service) {
-                        // 结束窗口和最近任务栏, 建议前台服务类应用使用，可以方便用户再次调用 UI 操作。
-                        iWinBoLLActivity.getActivity().finishAndRemoveTask();
-                        //ToastUtils.show("finishAll() activity.finishAndRemoveTask();");
-                    } else if (getWinBoLLUI_TYPE() == WinBoLLUI_TYPE.Aplication) {
-                        // 结束窗口保留最近任务栏，建议前台服务类应用使用，可以保持应用的系统自觉性。
-                        iWinBoLLActivity.getActivity().finish();
-                        //ToastUtils.show("finishAll() activity.finish();");
-                    } else {
-                        ToastUtils.show("WinBollApplication.WinBollUI_TYPE error.");
-                    }
-                }
-            }
-        } catch (Exception e) {
-            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-        }
-    }
-
-    /**
-     * 结束指定Activity
-     */
-    public <T extends IWinBoLLActivity> void finish(T iWinBoLLActivity) {
-        try {
-            if (iWinBoLLActivity != null && iWinBoLLActivity.getActivity() != null && !iWinBoLLActivity.getActivity().isFinishing() && !iWinBoLLActivity.getActivity().isDestroyed()) {
-                //根据tag 移除 MyActivity
-                //String tag= activity.getTag();
-                //_mIWinBoLLActivityList.remove(tag);
-                //ToastUtils.show("remove");
-                //ToastUtils.show("_mIWinBoLLActivityArrayMap.size() " + Integer.toString(_mIWinBoLLActivityArrayMap.size()));
-
-                // 窗口回调规则：
-                // [] 当前窗口位置 >> 调度出的窗口位置
-                // ★：[0] 1 2 3 4 >> 1
-                // ★：0 1 [2] 3 4 >> 1
-                // ★：0 1 2 [3] 4 >> 2
-                // ★：0 1 2 3 [4] >> 3
-                // ★：[0] >> 直接关闭当前窗口
-                Activity preActivity = getPreActivity(iWinBoLLActivity);
-                iWinBoLLActivity.getActivity().finish();
-                if (preActivity != null) {
-                    resumeActivity(preActivity);
-                }
-            }
-
-        } catch (Exception e) {
-            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-        }
-    }
-
-    Activity getPreActivity(IWinBoLLActivity iWinBoLLActivity) {
-        try {
-            boolean bingo = false;
-            IWinBoLLActivity preIWinBoLLActivity = null;
-            for (Map.Entry<String, IWinBoLLActivity> entity : mActivityListMap.entrySet()) {
-                if (entity.getKey().equals(iWinBoLLActivity.getTag())) {
-                    bingo = true;
-                    LogUtils.d(TAG, "bingo");
-                    break;
-                }
-                preIWinBoLLActivity = entity.getValue();
-            }
-
-            if (bingo) {
-                return preIWinBoLLActivity.getActivity();
-            }
-        } catch (Exception e) {
-            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-        }
-
-        return null;
-    }
-
-    public <T extends IWinBoLLActivity> boolean registeRemove(T iWinBoLLActivity) {
-        IWinBoLLActivity iWinBoLLActivityTest = mActivityListMap.get(iWinBoLLActivity.getTag());
-        if (iWinBoLLActivityTest != null) {
-            mActivityListMap.remove(iWinBoLLActivity.getTag());
-            return true;
-        }
-        return false;
-    }
-
-    public void printAvtivityListInfo() {
-        if (!mActivityListMap.isEmpty()) {
-            StringBuilder sb = new StringBuilder("Map entries : " + Integer.toString(mActivityListMap.size()));
-            Iterator<Map.Entry<String, IWinBoLLActivity>> iterator = mActivityListMap.entrySet().iterator();
-            while (iterator.hasNext()) {
-                Map.Entry<String, IWinBoLLActivity> entry = iterator.next();
-                sb.append("\nKey: " + entry.getKey() + ", \nValue: " + entry.getValue().getTag());
-                //ToastUtils.show("\nKey: " + entry.getKey() + ", Value: " + entry.getValue().getTag());
-            }
-            sb.append("\nMap entries end.");
-            LogUtils.d(TAG, sb.toString());
-        } else {
-            LogUtils.d(TAG, "The map is empty.");
-        }
-    }
-}
-

libaes/src/main/java/cc/winboll/studio/libaes/winboll/APPInfo.java

@@ -1,4 +1,4 @@
-package cc.winboll.studio.libaes.models;
+package cc.winboll.studio.libaes.winboll;
 
 /**
  * @Author ZhanGSKen<zhangsken@qq.com>

libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutView.java

@@ -1,4 +1,4 @@
-package cc.winboll.studio.libaes.views;
+package cc.winboll.studio.libaes.winboll;
 
 /**
  * @Author ZhanGSKen<zhangsken@qq.com>
@@ -17,12 +17,10 @@ import android.view.View;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import cc.winboll.studio.libaes.R;
-import cc.winboll.studio.libaes.dialogs.YesNoAlertDialog;
-import cc.winboll.studio.libaes.models.APPInfo;
 import cc.winboll.studio.libaes.utils.AppVersionUtils;
-import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.dialogs.YesNoAlertDialog;
 import cc.winboll.studio.libapputils.utils.PrefUtils;
 import com.hjq.toast.ToastUtils;
 import java.io.IOException;
@@ -34,6 +32,7 @@ import okhttp3.Credentials;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
+import mehdi.sakout.aboutpage.BuildConfig;
 
 public class AboutView extends LinearLayout {
 
@@ -41,10 +40,10 @@ public class AboutView extends LinearLayout {
 
     public static final int MSG_APPUPDATE_CHECKED = 0;
 
-    static Context _mContext;
+    Context mContext;
     APPInfo mAPPInfo;
 
-    //WinBoLLServiceStatusView mWinBoLLServiceStatusView;
+    WinBoLLServiceStatusView mWinBoLLServiceStatusView;
     OnRequestDevUserInfoAutofillListener mOnRequestDevUserInfoAutofillListener;
     String mszAppName = "";
     String mszAppAPKFolderName = "";
@@ -65,7 +64,7 @@ public class AboutView extends LinearLayout {
 
     public AboutView(Context context, APPInfo appInfo) {
         super(context);
-        _mContext = context;
+        mContext = context;
 
         setAPPInfo(appInfo);
         initView(context);
@@ -73,7 +72,7 @@ public class AboutView extends LinearLayout {
 
     public AboutView(Context context, AttributeSet attrs) {
         super(context, attrs);
-        _mContext = context;
+        mContext = context;
 
         initView(context, attrs);
     }
@@ -111,7 +110,7 @@ public class AboutView extends LinearLayout {
         mszWinBoLLServerHost = GlobalApplication.isDebuging() ?  "https://yun-preivew.winboll.cc": "https://yun.winboll.cc";
 
         try {
-            mszAppVersionName = _mContext.getPackageManager().getPackageInfo(_mContext.getPackageName(), 0).versionName;
+            mszAppVersionName = mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0).versionName;
         } catch (PackageManager.NameNotFoundException e) {
             LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
         }
@@ -123,8 +122,35 @@ public class AboutView extends LinearLayout {
         } else {
             mszGitea = "https://gitea.winboll.cc/" + mAPPInfo.getAppGitOwner() + "/" + mszAppGitName + "/src/branch/" + mAPPInfo.getAppGitAPPBranch() + "/" + mAPPInfo.getAppGitAPPSubProjectFolder();
         }
-		
-		addView(createAboutPage());
+
+
+        if (GlobalApplication.isDebuging()) {
+            LayoutInflater inflater = LayoutInflater.from(mContext);
+            View addedView = inflater.inflate(R.layout.view_about_dev, this, false);
+            LinearLayout llMain = addedView.findViewById(R.id.viewaboutdevLinearLayout1);
+            metDevUserName = addedView.findViewById(R.id.viewaboutdevEditText1);
+            metDevUserPassword = addedView.findViewById(R.id.viewaboutdevEditText2);
+            metDevUserName.setText(PrefUtils.getString(mContext, "metDevUserName", ""));
+            metDevUserPassword.setText(PrefUtils.getString(mContext, "metDevUserPassword", ""));
+            //mDevelopHostConnectionStatusView = new DevelopHostConnectionStatusView(context);
+            mWinBoLLServiceStatusView = addedView.findViewById(R.id.viewaboutdevWinBoLLServiceStatusView1);
+            mWinBoLLServiceStatusView.setServerHost(mszWinBoLLServerHost);
+            mWinBoLLServiceStatusView.setAuthInfo(metDevUserName.getText().toString(), metDevUserPassword.getText().toString());
+            //llMain.addView(mDevelopHostConnectionStatusView);
+            llMain.addView(createAboutPage());
+            addView(addedView);
+        } else {
+            LayoutInflater inflater = LayoutInflater.from(mContext);
+            View addedView = inflater.inflate(R.layout.view_about_www, this, false);
+            LinearLayout llMain = addedView.findViewById(R.id.viewaboutwwwLinearLayout1);
+            //mDevelopHostConnectionStatusView = new DevelopHostConnectionStatusView(context);
+            mWinBoLLServiceStatusView = addedView.findViewById(R.id.viewaboutwwwWinBoLLServiceStatusView1);
+            mWinBoLLServiceStatusView.setServerHost(mszWinBoLLServerHost);
+            mWinBoLLServiceStatusView.setAuthInfo("", "");
+            //llMain.addView(mDevelopHostConnectionStatusView);
+            llMain.addView(createAboutPage());
+            addView(addedView);
+        }
 
         // 初始化标题栏
         //setSubtitle(getContext().getString(R.string.text_about));
@@ -136,9 +162,9 @@ public class AboutView extends LinearLayout {
         String szReleaseAppVersionName = "";
         try {
             //LogUtils.d(TAG, String.format("mContext.getPackageName() %s", mContext.getPackageName()));
-            String szSubBetaSuffix = subBetaSuffix(_mContext.getPackageName());
+            String szSubBetaSuffix = subBetaSuffix(mContext.getPackageName());
             //LogUtils.d(TAG, String.format("szSubBetaSuffix : %s", szSubBetaSuffix));
-            szReleaseAppVersionName = _mContext.getPackageManager().getPackageInfo(szSubBetaSuffix, 0).versionName;
+            szReleaseAppVersionName = mContext.getPackageManager().getPackageInfo(szSubBetaSuffix, 0).versionName;
         } catch (PackageManager.NameNotFoundException e) {
             LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
         }
@@ -179,7 +205,7 @@ public class AboutView extends LinearLayout {
                             String szMsg = "Current app is :\n[ " + mszCurrentAppPackageName
                                 + " ]\nThe last app is :\n[ " + mszNewestAppPackageName
                                 + " ]\nIs download the last app?";
-                            YesNoAlertDialog.show(_mContext, "Application Update Prompt", szMsg, mIsDownlaodUpdateListener);
+                            YesNoAlertDialog.show(mContext, "Application Update Prompt", szMsg, mIsDownlaodUpdateListener);
                         }
                         break;
                     }
@@ -190,22 +216,22 @@ public class AboutView extends LinearLayout {
     protected View createAboutPage() {
         // 定义 GitWeb 按钮
         //
-        Element elementGitWeb = new Element(_mContext.getString(R.string.gitea_home), R.drawable.ic_winboll);
+        Element elementGitWeb = new Element(mContext.getString(R.string.gitea_home), R.drawable.ic_winboll);
         elementGitWeb.setOnClickListener(mGitWebOnClickListener);
         // 定义检查更新按钮
         //
-        Element elementAppUpdate = new Element(_mContext.getString(R.string.app_update), R.drawable.ic_winboll);
+        Element elementAppUpdate = new Element(mContext.getString(R.string.app_update), R.drawable.ic_winboll);
         elementAppUpdate.setOnClickListener(mAppUpdateOnClickListener);
 
         String szAppInfo = "";
         try {
             szAppInfo = mszAppName + " "
-                + _mContext.getPackageManager().getPackageInfo(_mContext.getPackageName(), 0).versionName
+                + mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0).versionName
                 + "\n" + mszAppDescription;
         } catch (PackageManager.NameNotFoundException e) {
             LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
         }
-        AboutPage aboutPage = new AboutPage(_mContext);
+        AboutPage aboutPage = new AboutPage(mContext);
         aboutPage.setDescription(szAppInfo)
             //.isRTL(false)
             //.setCustomFont(String) // or Typeface
@@ -230,10 +256,10 @@ public class AboutView extends LinearLayout {
             //
             Element elementAppMode;
             if (GlobalApplication.isDebuging()) {
-                elementAppMode = new Element(_mContext.getString(R.string.app_normal), R.drawable.ic_winboll);
+                elementAppMode = new Element(mContext.getString(R.string.app_normal), R.drawable.ic_winboll);
                 elementAppMode.setOnClickListener(mAppNormalOnClickListener);
             } else {
-                elementAppMode = new Element(_mContext.getString(R.string.app_debug), R.drawable.ic_winboll);
+                elementAppMode = new Element(mContext.getString(R.string.app_debug), R.drawable.ic_winboll);
                 elementAppMode.setOnClickListener(mAppDebugOnClickListener);
             }
             aboutPage.addItem(elementAppMode);
@@ -246,7 +272,7 @@ public class AboutView extends LinearLayout {
         @Override
         public void onClick(View view) {
             //ToastUtils.show("mAppDebugOnClickListener");
-            setApp2DebugMode(_mContext);
+            setApp2DebugMode(mContext);
         }
     };
 
@@ -254,7 +280,7 @@ public class AboutView extends LinearLayout {
         @Override
         public void onClick(View view) {
             //ToastUtils.show("mAppNormalOnClickListener");
-            setApp2NormalMode(_mContext);
+            setApp2NormalMode(mContext);
         }
     };
 
@@ -264,9 +290,9 @@ public class AboutView extends LinearLayout {
             //intent.setAction(cc.winboll.studio.libapputils.intent.action.DEBUGVIEW);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             GlobalApplication.setIsDebuging(true);
-            GlobalApplication.saveDebugStatus(_mContext);
+            GlobalApplication.saveDebugStatus();
 
-            WinBoLLActivityManager.getInstance().finishAll();
+            GlobalApplication.getWinBoLLActivityManager().finishAll();
             context.startActivity(intent);
         } 
     }
@@ -276,9 +302,9 @@ public class AboutView extends LinearLayout {
         if (intent != null) {
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             GlobalApplication.setIsDebuging(false);
-            GlobalApplication.saveDebugStatus(_mContext);
+            GlobalApplication.saveDebugStatus();
 
-            WinBoLLActivityManager.getInstance().finishAll();
+            GlobalApplication.getWinBoLLActivityManager().finishAll();
             context.startActivity(intent);
         } 
     }
@@ -287,7 +313,7 @@ public class AboutView extends LinearLayout {
         @Override
         public void onClick(View view) {
             Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(mszGitea));
-            _mContext.startActivity(browserIntent);
+            mContext.startActivity(browserIntent);
         }
     };
 
@@ -303,8 +329,8 @@ public class AboutView extends LinearLayout {
                         String credential = "";
                         if (GlobalApplication.isDebuging()) {
                             credential = Credentials.basic(metDevUserName.getText().toString(), metDevUserPassword.getText().toString());
-                            PrefUtils.saveString(_mContext, "metDevUserName", metDevUserName.getText().toString());
-                            PrefUtils.saveString(_mContext, "metDevUserPassword", metDevUserPassword.getText().toString());
+                            PrefUtils.saveString(mContext, "metDevUserName", metDevUserName.getText().toString());
+                            PrefUtils.saveString(mContext, "metDevUserPassword", metDevUserPassword.getText().toString());
                         } else {
                             String username = "WinBoLL";
                             String password = "WinBoLLPowerByZhanGSKen";
@@ -361,7 +387,7 @@ public class AboutView extends LinearLayout {
         public void onYes() {
             String szUrl = mszWinBoLLServerHost + "/studio/download.php?appname=" + mszAppAPKFolderName + "&apkname=" + mszNewestAppPackageName;
             Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(szUrl));
-            _mContext.startActivity(browserIntent);
+            mContext.startActivity(browserIntent);
         }
 
         @Override

libaes/src/main/java/cc/winboll/studio/libaes/winboll/AssistantService.java

@@ -0,0 +1,97 @@
+package cc.winboll.studio.libaes.winboll;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/03/28 19:12:12
+ * @Describe 应用主要服务组件类守护进程服务组件类
+ */
+import android.app.Service;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.IBinder;
+import cc.winboll.studio.libaes.beans.WinBoLLClientServiceBean;
+import cc.winboll.studio.libaes.winboll.AssistantService;
+import cc.winboll.studio.libappbase.utils.ServiceUtils;
+
+public class AssistantService extends Service {
+
+    public final static String TAG = "AssistantService";
+
+    WinBoLLClientServiceBean mWinBoLLServiceBean;
+    MyServiceConnection mMyServiceConnection;
+    volatile boolean mIsServiceRunning;
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        mWinBoLLServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(this);
+        if (mMyServiceConnection == null) {
+            mMyServiceConnection = new MyServiceConnection();
+        }
+        // 设置运行参数
+        mIsServiceRunning = false;
+        run();
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        run();
+        return START_STICKY;
+    }
+
+    @Override
+    public void onDestroy() {
+        mIsServiceRunning = false;
+        super.onDestroy();
+    }
+
+    //
+    // 运行服务内容
+    //
+    void run() {
+        mWinBoLLServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(this);
+        if (mWinBoLLServiceBean.isEnable()) {
+            if (mIsServiceRunning == false) {
+                // 设置运行状态
+                mIsServiceRunning = true;
+                // 唤醒和绑定主进程
+                wakeupAndBindMain();
+            }
+        }
+    }
+
+    //
+    // 唤醒和绑定主进程
+    //
+    void wakeupAndBindMain() {
+        if (ServiceUtils.isServiceRunning(getApplicationContext(), WinBoLLClientService.class.getName()) == false) {
+            startForegroundService(new Intent(AssistantService.this, WinBoLLClientService.class));
+        }
+
+        bindService(new Intent(AssistantService.this, WinBoLLClientService.class), mMyServiceConnection, Context.BIND_IMPORTANT);
+    }
+
+    //
+    // 主进程与守护进程连接时需要用到此类
+    //
+    class MyServiceConnection implements ServiceConnection {
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+            mWinBoLLServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(AssistantService.this);
+            if (mWinBoLLServiceBean.isEnable()) {
+                wakeupAndBindMain();
+            }
+        }
+    }
+}

libaes/src/main/java/cc/winboll/studio/libaes/winboll/EWUIStatusIconDrawable.java

@@ -0,0 +1,35 @@
+package cc.winboll.studio.libaes.winboll;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/03/28 19:11:27
+ * @Describe WinBoLL UI 状态图标枚举
+ */
+import cc.winboll.studio.libaes.R;
+
+public enum EWUIStatusIconDrawable {
+    NORMAL(0),
+    NEWS(1)
+    ;
+
+    static final String TAG = "WUIStatusIconDrawable";
+
+    static String[] _mlistCNName = { "正常", "新的消息" };
+
+    private int value = 0;
+    private EWUIStatusIconDrawable(int value) {    //必须是private的，否则编译错误
+        this.value = value;
+    }
+
+    public static int getIconDrawableId(EWUIStatusIconDrawable drawableId) {
+        int res;
+        switch(drawableId){
+            case NEWS :
+                res = R.drawable.ic_winbollbeta;
+                break;
+            default :
+                res = R.drawable.ic_winboll;
+        }
+        return res;
+    }
+}

libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLClientService.java

@@ -0,0 +1,21 @@
+package cc.winboll.studio.libaes.winboll;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+
+/**
+ * @Author ZhanGSKen
+ * @Date 2025/05/03 19:28
+ */
+public class WinBoLLClientService extends Service {
+    
+    public static final String TAG = "WinBoLLClientService";
+    
+    @Override
+    public IBinder onBind(Intent intent) {
+        
+        return null;
+    }
+    
+}

libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLServiceStatusView.java

@@ -0,0 +1,38 @@
+package cc.winboll.studio.libaes.winboll;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.LinearLayout;
+
+/**
+ * @Author ZhanGSKen
+ * @Date 2025/05/03 19:14
+ */
+public class WinBoLLServiceStatusView extends LinearLayout {
+    
+    public static final String TAG = "WinBoLLServiceStatusView";
+    
+    public WinBoLLServiceStatusView(Context context) {
+        super(context);
+    }
+
+    public WinBoLLServiceStatusView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public WinBoLLServiceStatusView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public WinBoLLServiceStatusView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+    
+    
+    void setServerHost(String szWinBoLLServerHost) {
+        
+    }
+    
+    void setAuthInfo(String szDevUserName, String szDevUserPassword) {
+        
+    }
+}

libaes/src/main/res/layout/view_about_dev.xml

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/viewaboutdevLinearLayout1">
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical">
+
+        <TextView
+            android:layout_width="180dp"
+            android:layout_height="wrap_content"
+            android:text="DevelopUserName :"/>
+
+        <EditText
+            android:layout_width="0dp"
+            android:ems="10"
+            android:layout_height="wrap_content"
+            android:layout_weight="1.0"
+            android:id="@+id/viewaboutdevEditText1"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical">
+
+        <TextView
+            android:layout_width="180dp"
+            android:layout_height="wrap_content"
+            android:text="DevelopUserPassword :"/>
+
+        <EditText
+            android:layout_width="0dp"
+            android:inputType="textPassword"
+            android:layout_height="wrap_content"
+            android:ems="10"
+            android:layout_weight="1.0"
+            android:id="@+id/viewaboutdevEditText2"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal">
+
+        <cc.winboll.studio.libaes.winboll.WinBoLLServiceStatusView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/viewaboutdevWinBoLLServiceStatusView1"/>
+
+    </LinearLayout>
+
+</LinearLayout>
+

libaes/src/main/res/layout/view_about_www.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/viewaboutwwwLinearLayout1">
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal">
+
+        <cc.winboll.studio.libaes.winboll.WinBoLLServiceStatusView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/viewaboutwwwWinBoLLServiceStatusView1"/>
+
+    </LinearLayout>
+
+</LinearLayout>

regexputils/.gitignore

@@ -1 +0,0 @@
-/build

regexputils/README.md

@@ -1,34 +0,0 @@
-# RegExpUtils
-
-#### 介绍
-正则表达式工具集。这个工具可以用来测试正则表达式的匹配规则是否正确。
-
-#### 软件架构
-适配安卓应用 [AIDE Pro] 的 Gradle 编译结构。
-也适配安卓应用 [AndroidIDE] 的 Gradle 编译结构。
-
-
-#### Gradle 编译说明
-调试版编译命令 ：gradle assembleBetaDebug
-阶段版编译命令 ：bash .winboll/bashPublishAPKAddTag.sh regexputils
-
-#### 使用说明
-
-#### 参与贡献
-
-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/)
-
-#### 参考文档

regexputils/app_update_description.txt

@@ -1 +0,0 @@
-

regexputils/build.gradle

@@ -1,49 +0,0 @@
-apply plugin: 'com.android.application'
-apply from: '../.winboll/winboll_app_build.gradle'
-apply from: '../.winboll/winboll_lint_build.gradle'
-
-def genVersionName(def versionName){
-    // 检查编译标志位配置
-    assert (winbollBuildProps['stageCount'] != null)
-    assert (winbollBuildProps['baseVersion'] != null)
-    // 保存基础版本号
-    winbollBuildProps.setProperty("baseVersion", "${versionName}");
-    //保存编译标志配置
-    FileOutputStream fos = new FileOutputStream(winbollBuildPropsFile)
-    winbollBuildProps.store(fos, "${winbollBuildPropsDesc}");
-    fos.close();
-    
-    // 返回编译版本号
-    return "${versionName}." + winbollBuildProps['stageCount']
-}
-
-android {
-
-    compileSdkVersion 32
-    buildToolsVersion "32.0.0"
-
-    defaultConfig {
-        applicationId "cc.winboll.studio.regexputils"
-        minSdkVersion 24
-        targetSdkVersion 30
-        versionCode 1
-        // versionName 更新后需要手动设置 
-        // 项目模块目录的 build.gradle 文件的 stageCount=0
-        // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.10" 
-        if(true) {
-            versionName = genVersionName("${versionName}")
-        }
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-}
-
-dependencies {
-    api fileTree(dir: 'libs', include: ['*.jar'])
-}

regexputils/build.properties

@@ -1,8 +0,0 @@
-#Created by .winboll/winboll_app_build.gradle
-#Tue Oct 07 20:47:24 HKT 2025
-stageCount=2
-libraryProject=
-baseVersion=15.10
-publishVersion=15.10.1
-buildCount=0
-baseBetaVersion=15.10.2

regexputils/proguard-rules.pro

@@ -1,17 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in C:\tools\adt-bundle-windows-x86_64-20131030\sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}

regexputils/src/beta/AndroidManifest.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" >
-
-    <application
-		tools:replace="android:icon"
-        android:icon="@drawable/ic_launcher_beta">
-
-        <!-- Put flavor specific code here -->
-
-    </application>
-
-</manifest>
-

regexputils/src/beta/res/values-zh/strings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="app_name">正则工具☆</string>
-
-</resources>

regexputils/src/beta/res/values/strings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="app_name">RegExpUtils+</string>
-
-</resources>

regexputils/src/main/AndroidManifest.xml

@@ -1,39 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cc.winboll.studio.regexputils">
-
-    <!-- 拥有完全的网络访问权限 -->
-    <uses-permission android:name="android.permission.INTERNET"/>
-
-    <application
-        android:name="cc.winboll.studio.regexputils.App"
-        android:allowBackup="true"
-        android:icon="@drawable/ic_regexputils"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme"
-        android:resizeableActivity="true">
-
-        <activity
-            android:name=".MainActivity"
-            android:label="@string/app_name">
-
-            <intent-filter>
-
-                <action android:name="android.intent.action.MAIN"/>
-
-                <category android:name="android.intent.category.LAUNCHER"/>
-
-            </intent-filter>
-
-        </activity>
-        
-        <activity android:name="cc.winboll.studio.regexputils.develop.CrashHandler$CrashActiviy"/>
-
-        <meta-data
-            android:name="android.max_aspect"
-            android:value="4.0"/>
-
-    </application>
-
-</manifest>

regexputils/src/main/java/cc/winboll/studio/regexputils/App.java

@@ -1,11 +0,0 @@
-package cc.winboll.studio.regexputils;
-
-import cc.winboll.studio.regexputils.develop.WinBollBase;
-
-public class App extends WinBollBase {
-    
-    public static final String TAG = "App";
-    
-    
-    
-}

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

@@ -1,446 +0,0 @@
-package cc.winboll.studio.regexputils;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.graphics.Bitmap;
-import android.icu.text.SimpleDateFormat;
-import android.os.Bundle;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.ViewGroup.LayoutParams;
-import android.view.inputmethod.EditorInfo;
-import android.view.inputmethod.InputMethodManager;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.ListPopupWindow;
-import android.widget.TextView;
-import android.widget.Toast;
-import cc.winboll.studio.regexputils.develop.LogUtils;
-import cc.winboll.studio.regexputils.develop.LogView;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class MainActivity extends Activity {
-
-    public static final String TAG = MainActivity.class.getSimpleName();
-
-    TextView mtvPattern;
-    EditText metPattern;
-    TextView mtvRewrite;
-    EditText metRewrite;
-    TextView mtvMatchText;
-    EditText metMatchText;
-    TextView mtvResult;
-    TextView mtvOnlineHelp;
-    Button mbtnFavorite;
-    WebView mWebView;
-    URLEditText mURLEditText;
-    SharedPreferences mSharedPreferences;
-    Set<String> mSetStringFavorite;
-    String mszDefaultOnlineHelp;
-    LogView mLogView;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
-        mLogView = new LogView(this);
-        LinearLayout mllLog = findViewById(R.id.activitymainLinearLayout1);
-        mllLog.addView(mLogView);
-        mLogView.startWatching();
-
-        initView();
-
-        LogUtils.d(TAG, "Created");
-
-    }
-
-    void initView() {
-        //Toolbar toolbar= findViewById(R.id.toolbar);
-        //setSupportActionBar(toolbar);
-
-        mSharedPreferences = getSharedPreferences("SP", Context.MODE_PRIVATE);
-
-        mtvPattern = findViewById(R.id.activitymainTextView2);
-        metPattern = findViewById(R.id.activitymainEditText1);
-        mtvRewrite = findViewById(R.id.activitymainTextView3);
-        metRewrite = findViewById(R.id.activitymainEditText3);
-        mtvMatchText = findViewById(R.id.activitymainTextView5);
-        metMatchText = findViewById(R.id.activitymainEditText2);
-        mtvResult = findViewById(R.id.activitymainTextView1);
-        mWebView = findViewById(R.id.activitymainWebView1);
-        mtvOnlineHelp = findViewById(R.id.activitymainTextView4);
-        mURLEditText = findViewById(R.id.activitymainURLEditText1);
-        mbtnFavorite = findViewById(R.id.activitymainButton1);
-
-        mtvOnlineHelp.setText(getString(R.string.tv_onlinehelp));
-        //系统默认会通过手机浏览器打开网页，为了能够直接通过WebView显示网页，则必须设置
-        mWebView.setWebViewClient(new WebViewClient(){
-                @Override
-                public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                    //使用WebView加载显示url
-                    view.loadUrl(url);
-                    //返回true
-                    return true;
-                }
-            });
-
-        mSetStringFavorite = mSharedPreferences.getStringSet("mListFavorite", new HashSet<String>());
-        String szURL = mSharedPreferences.getString("mWebView", getString(R.string.sz_defaultonlinehelp));
-        addDefaultURLFavorite();
-        mWebView.loadUrl(szURL);
-        mWebView.setWebViewClient(new WebViewClient(){
-                @Override
-                public void onPageStarted(WebView view, String url, Bitmap favicon) {
-                    //设定加载开始的操作
-                    mURLEditText.setText(url);
-                    for (String sz : mSetStringFavorite) {
-                        if (sz.equals(url)) {
-                            //mURLEditText.setFavoriteYes();
-                            mbtnFavorite.setText("★");
-                            return;
-                        }
-                    }
-                    mbtnFavorite.setText("☆");
-                    //mURLEditText.setFavoriteNo();
-                }
-
-            });
-        mURLEditText.setText(szURL);
-        mURLEditText.setOnEditorActionListener(
-            new TextView.OnEditorActionListener() {
-                @Override
-                public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                    if (actionId == EditorInfo.IME_ACTION_DONE) {
-                        onGoto(null);
-                    }
-                    return false;
-                }
-            });
-        /* mURLEditText.setOnTouchListener(new View.OnTouchListener() {
-         @Override
-         public boolean onTouch(View view, MotionEvent event) {
-         final int DRAWABLE_LEFT = 0;
-         //final int DRAWABLE_TOP = 1;
-         final int DRAWABLE_RIGHT = 2;
-         //final int DRAWABLE_BOTTOM = 3;
-         if (event.getAction() == MotionEvent.ACTION_UP) {
-         if (event.getX() >= (mURLEditText.getWidth() - mURLEditText
-         .getCompoundDrawables()[DRAWABLE_RIGHT].getBounds().width())) {
-
-         return true;
-         } else if (event.getX() <= (mURLEditText
-         .getCompoundDrawables()[DRAWABLE_LEFT].getBounds().width())) {
-
-         return true;
-         }
-         }
-         return false;
-         }
-         });*/
-        mtvPattern.setText(getString(R.string.tv_pattern));
-        metPattern.setText(mSharedPreferences.getString("metPattern", "[^n]"));
-        metPattern.setOnEditorActionListener(
-            new TextView.OnEditorActionListener() {
-                @Override
-                public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                    if (actionId == EditorInfo.IME_ACTION_DONE) {
-                        onRegExp(null);
-                    }
-                    return false;
-                }
-            });
-        mtvRewrite.setText(getString(R.string.tv_rewrite));
-        metRewrite.setText(mSharedPreferences.getString("metRewrite", ""));
-        metRewrite.setOnEditorActionListener(
-            new TextView.OnEditorActionListener() {
-                @Override
-                public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                    if (actionId == EditorInfo.IME_ACTION_DONE) {
-                        onRegExpRewrite(null);
-                    }
-                    return false;
-                }
-            });
-        mtvMatchText.setText(getString(R.string.tv_matchtext));
-        metMatchText.setText(mSharedPreferences.getString("metMatchText", "Test string 123."));
-        metMatchText.setOnEditorActionListener(
-            new TextView.OnEditorActionListener() {
-                @Override
-                public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                    if (actionId == EditorInfo.IME_ACTION_DONE) {
-                        onRegExp(null);
-                    }
-                    return false;
-                }
-            });
-
-    }
-
-    public void onEnableFavorite(View v) {
-        changeURLFavorite();
-    }
-
-    public void onShowFavoriteList(View v) {
-        showListPopulWindow();
-    }
-
-    void showListPopulWindow() {
-        final String[] list = (String[])mSetStringFavorite.toArray(new String[0]);
-        final ListPopupWindow listPopupWindow;
-        listPopupWindow = new ListPopupWindow(this);
-        listPopupWindow.setWidth(LayoutParams.WRAP_CONTENT);
-        listPopupWindow.setHeight(LayoutParams.WRAP_CONTENT);
-        listPopupWindow.setAdapter(new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, list));//用android内置布局，或设计自己的样式
-        //设置下拉列表基准控件
-        listPopupWindow.setAnchorView(mURLEditText);
-        listPopupWindow.setModal(true);
-        // 透明度
-        //listPopupWindow.setBackgroundDrawable(new ColorDrawable(0x00ffffff));
-        listPopupWindow.setBackgroundDrawable(getDrawable(R.drawable.bg_shadow));
-
-        listPopupWindow.setOnItemClickListener(new AdapterView.OnItemClickListener() {//设置项点击监听
-                @Override
-                public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
-                    mURLEditText.setText(list[i]);//展示选择的内容
-                    setWebViewURL(list[i]);
-                    listPopupWindow.dismiss();//如果已经选择了，隐藏起来
-                }
-            });
-        listPopupWindow.show();//下拉列表展示出来
-    }
-
-    public void onRegExp(View v) {
-        mtvResult.setText("");
-        regExp();
-        hideKeyboard(v);
-    }
-
-    public void onRegExpRewrite(View v) {
-        mtvResult.setText("");
-        regExpRewrite();
-        hideKeyboard(v);
-    }
-
-    //隐藏虚拟键盘
-    //
-    public static void hideKeyboard(View v) {
-        InputMethodManager imm = ( InputMethodManager ) v.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
-        if (imm.isActive()) {
-            imm.hideSoftInputFromWindow(v.getApplicationWindowToken() , 0);
-
-        }
-    }
-
-    // 获取当前时间格式化后的字符串
-    //
-    String getCurrentTimeString() {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:SS");
-        return sdf.format(System.currentTimeMillis());
-    }
-
-    ArrayList<String> regExp() {
-        ArrayList<String> listResult = new ArrayList<String>();
-
-        StringBuilder sbPrint = new StringBuilder();
-        sbPrint.append(getString(R.string.sz_patternresult));
-        sbPrint.append(" : ");
-        sbPrint.append(getCurrentTimeString());
-
-        // 输出当前累积的消息并清理 sbPrint
-        mtvResult.append(sbPrint.toString());
-        sbPrint = new StringBuilder("\n");
-
-        try {
-            String szMatchText = metMatchText.getText().toString();
-            String szPattern = metPattern.getText().toString();
-            mSharedPreferences = getSharedPreferences("SP", Context.MODE_PRIVATE);
-            mSharedPreferences.edit().putString("metPattern", metPattern.getText().toString()).commit();
-            mSharedPreferences.edit().putString("metMatchText", metMatchText.getText().toString()).commit();
-            listResult = buildRegExpList(szMatchText, szPattern);
-            if (listResult.size() > 0) {
-                sbPrint.append("\nRegExp Result : ");
-                sbPrint.append(listResult.size());
-            } else {
-                sbPrint.append("\nRegExp Result : 0");
-            }
-        } catch (Exception e) {
-            LogUtils.d(TAG, "Exception : " + e.getMessage());
-        }
-
-        mtvResult.append(sbPrint.toString());
-
-        LogUtils.d(TAG, "RegExp Done.");
-        return listResult;
-    }
-
-    void regExpRewrite() {
-        StringBuilder sbPrint = new StringBuilder("\n");
-        try {
-            String szMatchText = metMatchText.getText().toString();
-            String szPattern = metPattern.getText().toString();
-            String szRewrite = metRewrite.getText().toString();
-            mSharedPreferences = getSharedPreferences("SP", Context.MODE_PRIVATE);
-            mSharedPreferences.edit().putString("metPattern", metPattern.getText().toString()).commit();
-            mSharedPreferences.edit().putString("metMatchText", metMatchText.getText().toString()).commit();
-            mSharedPreferences.edit().putString("metRewrite", metRewrite.getText().toString()).commit();
-            int nRewriteCount = regExpRewrite(szMatchText, szPattern, szRewrite);
-            if (nRewriteCount > 0) {
-                sbPrint.append("\nRewrite Result : ");
-                sbPrint.append(nRewriteCount);
-            } else {
-                sbPrint.append("\nRewrite Result : 0");
-            }
-        } catch (Exception e) {
-            LogUtils.d(TAG, "Exception : " + e.getMessage());
-        }
-        mtvResult.append(sbPrint);
-        LogUtils.d(TAG, "RegExp Rewrite Done.");
-    }
-
-    // 
-    // 生成语法模板匹配到的所有字符串数组
-    //
-    ArrayList<String> buildRegExpList(String szMatchText, String szPattern) {
-        ArrayList<String> listResult = new ArrayList<String>();
-        StringBuilder sbPrint = new StringBuilder("\n");
-
-        Pattern pattern = Pattern.compile(szPattern, Pattern.MULTILINE);
-        Matcher matcher = pattern.matcher(szMatchText);
-
-        boolean isNull = true;
-        int nStart = 0;
-        while (matcher.find(nStart)) {
-            isNull = false;
-            int start = matcher.start();
-            int end = matcher.end();
-            String group = matcher.group();
-            sbPrint.append("\n");
-            sbPrint.append(getString(R.string.sz_start));
-            sbPrint.append("(");
-            sbPrint.append(Integer.toString(start));
-            sbPrint.append(") ");
-            sbPrint.append(getString(R.string.sz_end));
-            sbPrint.append("(");
-            sbPrint.append(Integer.toString(end));
-            sbPrint.append(") >>> ");
-            sbPrint.append(group);
-
-            listResult.add(group);
-            nStart = matcher.end();
-        }
-
-        mtvResult.append(sbPrint.toString());
-
-        return listResult;
-    }
-
-    int regExpRewrite(String szMatchText, String szPattern, String szRewrite) {
-        int nRewriteCount = 0;
-        ArrayList<String> listResult = regExp();
-
-        StringBuilder sbPrint = new StringBuilder("\n\n\n\n\n####################\n");
-        sbPrint.append(getString(R.string.sz_rewriteresult));
-        sbPrint.append(" : ");
-        sbPrint.append(getCurrentTimeString());
-
-        // 输出当前累积的消息并清理 sbPrint
-        mtvResult.append(sbPrint.toString());
-        sbPrint = new StringBuilder();
-
-        for (int i = 0; i < listResult.size(); i++) {
-            Pattern pattern = Pattern.compile(szPattern, Pattern.MULTILINE);
-            Matcher matcher = pattern.matcher(listResult.get(i));
-            if (matcher.find()) {
-                nRewriteCount++;
-                sbPrint.append("\n Rewrite ");
-                sbPrint.append(nRewriteCount);
-                sbPrint.append(" : \n");
-                sbPrint.append(matcher.replaceAll(szRewrite));
-                sbPrint.append(" \n");
-            }
-        }
-
-        mtvResult.append(sbPrint.toString());
-        return nRewriteCount;
-    }
-
-    @Override
-    protected void onDestroy() {
-        mLogView.stopWatching();
-
-        mSharedPreferences.edit().putString("metPattern", metPattern.getText().toString()).commit();
-        mSharedPreferences.edit().putString("metMatchText", metMatchText.getText().toString()).commit();
-        mSharedPreferences.edit().putStringSet("mListFavorite", mSetStringFavorite).commit();
-
-        super.onDestroy();
-    }
-
-    void changeURLFavorite() {
-        //String szURL = getString(R.string.webview_helpurl);
-        //setWebViewURL(szURL);
-        String url = mURLEditText.getText().toString();
-
-        // 转换收藏开关
-        for (String sz : mSetStringFavorite) {
-            if (sz.equals(url)) {
-                // 保护默认URL
-                if (!getString(R.string.sz_defaultonlinehelp).equals(url)) {
-                    mSetStringFavorite.remove(sz);
-                    //mURLEditText.setFavoriteNo();
-                    mbtnFavorite.setText("☆");
-                    mSharedPreferences.edit().putStringSet("mListFavorite", mSetStringFavorite).commit();
-                    return;
-                } else {
-                    Toast.makeText(getApplication(), "!☆", Toast.LENGTH_SHORT).show();
-                }
-            }
-        }
-        mSetStringFavorite.add(url);
-        mbtnFavorite.setText("★");
-        //mURLEditText.setFavoriteYes();
-        mSharedPreferences.edit().putStringSet("mListFavorite", mSetStringFavorite).commit();
-    }
-
-    void addDefaultURLFavorite() {
-        //String szURL = getString(R.string.webview_helpurl);
-        //setWebViewURL(szURL);
-        String szDefault = getString(R.string.sz_defaultonlinehelp);
-
-        // 转换收藏开关
-        for (String sz : mSetStringFavorite) {
-            if (sz.equals(szDefault)) {
-                return;
-            }
-        }
-        mSetStringFavorite.add(szDefault);
-        //mURLEditText.setFavoriteYes();
-        mbtnFavorite.setText("★");
-        mSharedPreferences.edit().putStringSet("mListFavorite", mSetStringFavorite).commit();
-    }
-
-    public void onGoto(View v) {
-        setWebViewURL(mURLEditText.getText().toString());
-    }
-
-    void setWebViewURL(String szURL) {
-        mSharedPreferences.edit().putString("mWebView", szURL).commit();
-        mWebView.loadUrl(szURL);
-        mURLEditText.setText(szURL);
-    }
-
-    public void onCleanLog(View view) {
-        LogUtils.cleanLog();
-        LogUtils.d(TAG, "Log cleaned");
-    }
-}

regexputils/src/main/java/cc/winboll/studio/regexputils/RegExpUtils.java

@@ -1,13 +0,0 @@
-package cc.winboll.studio.regexputils;
-
-import cc.winboll.studio.regexputils.develop.WinBollBase;
-
-public class RegExpUtils extends WinBollBase {
-
-    public static final String TAG = RegExpUtils.class.getSimpleName();
-
-    @Override
-    public void onCreate() {
-        super.onCreate();  
-    }
-}

regexputils/src/main/java/cc/winboll/studio/regexputils/URLEditText.java

@@ -1,83 +0,0 @@
-package cc.winboll.studio.regexputils;
-
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.util.AttributeSet;
-import android.widget.EditText;
-
-public class URLEditText extends EditText {
-    //Drawable drawable_r;
-    //Drawable drawable_l_no;
-    //Drawable drawable_l_yes;
-    
-    public static final String TAG = URLEditText.class.getSimpleName();
-
-    /**
-     * 在java代码里new的时候会用到
-     * @param context
-     */
-    public URLEditText(Context context) {
-        super(context);
-
-    }
-
-    /**
-     * 在xml布局文件中使用时自动调用
-     * @param context
-     */
-    public URLEditText(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        /*TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.test);
-         String text = ta.getString(R.styleable.test_text);
-         setText(text + " ZhanGSKen.CN");
-         ta.recycle();*/
-        /*drawable_r = getResources().getDrawable(R.mipmap.dropdown);
-        //drawable_n.setBounds(0, 0, drawable_n.getMinimumWidth(),drawable_n.getMinimumHeight());  //此为必须写的
-        drawable_r.setBounds(0, 0, 80, 80);  //此为必须写的
-        
-        drawable_l_no = getResources().getDrawable(R.mipmap.favorite_no);
-        //drawable_n.setBounds(0, 0, drawable_n.getMinimumWidth(),drawable_n.getMinimumHeight());  //此为必须写的
-        drawable_l_no.setBounds(0, 0, 80, 80);  //此为必须写的
-        
-        drawable_l_yes = getResources().getDrawable(R.mipmap.favorite_yes);
-        //drawable_n.setBounds(0, 0, drawable_n.getMinimumWidth(),drawable_n.getMinimumHeight());  //此为必须写的
-        drawable_l_yes.setBounds(0, 0, 80, 80);  //此为必须写的
-        
-        setFavoriteNo();*/
-        //setMinWidth(100);
-        //setPadding(10,0,10,0);
-        //setPaddingRelative(0,0,0,0);
-    }
-
-    /**
-     * 不会自动调用，如果有默认style时，在第二个构造函数中调用
-     * @param context
-     * @param attrs
-     * @param defStyleAttr
-     */
-    public URLEditText(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-
-    /**
-     * 只有在API版本>21时才会用到
-     * 不会自动调用，如果有默认style时，在第二个构造函数中调用
-     * @param context
-     * @param attrs
-     * @param defStyleAttr
-     * @param defStyleRes
-     */
-    //@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-    public URLEditText(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-    }
-    
-   /* public void setFavoriteNo() {
-        setCompoundDrawables(drawable_l_no, null, drawable_r, null);
-    }
-    public void setFavoriteYes() {
-        setCompoundDrawables(drawable_l_yes, null, drawable_r, null);
-    }*/
-}

regexputils/src/main/java/cc/winboll/studio/regexputils/develop/CrashHandler.java

@@ -1,237 +0,0 @@
-package cc.winboll.studio.regexputils.develop;
-
-/*
- * 应用异常处理类
- * 源码提供：AIDE
- * 源码维护：ZhanGSKen@QQ.COM
- */
-
-import android.app.Activity;
-import android.app.Application;
-import android.content.ActivityNotFoundException;
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.res.Resources;
-import android.os.Build;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.ViewGroup;
-import android.widget.HorizontalScrollView;
-import android.widget.ScrollView;
-import android.widget.TextView;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.lang.Thread.UncaughtExceptionHandler;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-public final class CrashHandler
-{
-
-    public static final UncaughtExceptionHandler DEFAULT_UNCAUGHT_EXCEPTION_HANDLER = Thread.getDefaultUncaughtExceptionHandler();
-
-    public static void init(Application app)
-	{
-        init(app, null);
-    }
-
-    public static void init(final Application app, final String crashDir)
-	{
-        Thread.setDefaultUncaughtExceptionHandler(new UncaughtExceptionHandler(){
-
-                @Override
-                public void uncaughtException(Thread thread, Throwable throwable)
-				{
-                    try
-					{
-                        tryUncaughtException(thread, throwable);
-                    }
-					catch (Throwable e)
-					{
-                        e.printStackTrace();
-                        if (DEFAULT_UNCAUGHT_EXCEPTION_HANDLER != null)
-                            DEFAULT_UNCAUGHT_EXCEPTION_HANDLER.uncaughtException(thread, throwable);
-                    }
-                }
-
-                private void tryUncaughtException(Thread thread, Throwable throwable)
-				{
-                    final String time = new SimpleDateFormat("yyyy_MM_dd-HH_mm_ss").format(new Date());
-                    File crashFile = new File(TextUtils.isEmpty(crashDir) ? new File(app.getExternalFilesDir(null), "crash")
-                                              : new File(crashDir), "crash_" + time + ".txt");
-
-                    String versionName = "unknown";
-                    long versionCode = 0;
-                    try
-					{ 
-                        PackageInfo packageInfo = app.getPackageManager().getPackageInfo(app.getPackageName(), 0);
-                        versionName = packageInfo.versionName;
-                        versionCode = Build.VERSION.SDK_INT >= 28 ? packageInfo.getLongVersionCode()
-                            : packageInfo.versionCode;
-                    }
-					catch (PackageManager.NameNotFoundException ignored)
-					{}
-
-                    String fullStackTrace; {
-                        StringWriter sw = new StringWriter(); 
-                        PrintWriter pw = new PrintWriter(sw);
-                        throwable.printStackTrace(pw);
-                        fullStackTrace = sw.toString();
-                        pw.close();
-                    }
-
-                    StringBuilder sb = new StringBuilder();
-                    sb.append("************* Crash Head ****************\n");
-                    sb.append("Time Of Crash      : ").append(time).append("\n");
-                    sb.append("Device Manufacturer: ").append(Build.MANUFACTURER).append("\n");
-                    sb.append("Device Model       : ").append(Build.MODEL).append("\n");
-                    sb.append("Android Version    : ").append(Build.VERSION.RELEASE).append("\n");
-                    sb.append("Android SDK        : ").append(Build.VERSION.SDK_INT).append("\n");
-                    sb.append("App VersionName    : ").append(versionName).append("\n");
-                    sb.append("App VersionCode    : ").append(versionCode).append("\n");
-                    sb.append("************* Crash Head ****************\n");
-                    sb.append("\n").append(fullStackTrace);
-
-                    String errorLog = sb.toString();
-
-                    try
-					{
-                        writeFile(crashFile, errorLog);
-                    }
-					catch (IOException ignored)
-					{}
-
-                    gotoCrashActiviy:
-					{
-                        Intent intent = new Intent(app, CrashActiviy.class);
-                        intent.addFlags(
-                            Intent.FLAG_ACTIVITY_NEW_TASK
-                            | Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_CLEAR_TASK
-                        );
-                        intent.putExtra(CrashActiviy.EXTRA_CRASH_INFO, errorLog);
-                        try
-						{
-                            app.startActivity(intent);
-                            android.os.Process.killProcess(android.os.Process.myPid());
-                            System.exit(0);
-                        }
-						catch (ActivityNotFoundException e)
-						{
-                            e.printStackTrace();
-                            if (DEFAULT_UNCAUGHT_EXCEPTION_HANDLER != null)
-                                DEFAULT_UNCAUGHT_EXCEPTION_HANDLER.uncaughtException(thread, throwable);
-                        }
-                    }
-                }
-
-                private void writeFile(File file, String content) throws IOException
-				{
-                    File parentFile = file.getParentFile();
-                    if (parentFile != null && !parentFile.exists())
-					{
-                        parentFile.mkdirs();
-                    }
-                    file.createNewFile();
-                    FileOutputStream fos = new FileOutputStream(file);
-                    fos.write(content.getBytes());
-                    try
-					{
-                        fos.close();
-                    }
-					catch (IOException e)
-					{}
-                }
-
-            });
-    }
-
-    public static final class CrashActiviy extends Activity implements MenuItem.OnMenuItemClickListener
-	{
-
-        private static final String EXTRA_CRASH_INFO = "crashInfo";
-
-        private String mLog;
-
-        @Override
-        protected void onCreate(Bundle savedInstanceState)
-		{
-            super.onCreate(savedInstanceState);
-            mLog = getIntent().getStringExtra(EXTRA_CRASH_INFO);
-            setContentView:
-			{
-                ScrollView contentView = new ScrollView(this);
-                contentView.setFillViewport(true);
-                HorizontalScrollView hw = new HorizontalScrollView(this);
-                TextView message = new TextView(this); {
-                    int padding = dp2px(16);
-                    message.setPadding(padding, padding, padding, padding);
-                    message.setText(mLog);
-                    message.setTextIsSelectable(true);
-                }
-                hw.addView(message);
-                contentView.addView(hw, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
-                setContentView(contentView);
-            }
-        }
-
-        @Override
-        public void onBackPressed()
-		{
-            restart();
-        }
-
-        private void restart()
-		{
-            PackageManager pm = getPackageManager();
-            Intent intent = pm.getLaunchIntentForPackage(getPackageName());
-            if (intent != null)
-			{
-                intent.addFlags(
-                    Intent.FLAG_ACTIVITY_NEW_TASK
-                    | Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_CLEAR_TASK
-                );
-                startActivity(intent);
-            }
-            finish();
-            android.os.Process.killProcess(android.os.Process.myPid());
-            System.exit(0);
-        }
-
-        private int dp2px(final float dpValue)
-		{
-            final float scale = Resources.getSystem().getDisplayMetrics().density;
-            return (int) (dpValue * scale + 0.5f);
-        }
-
-        @Override
-        public boolean onMenuItemClick(MenuItem item)
-		{
-            switch (item.getItemId())
-			{
-                case android.R.id.copy: 
-                    ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
-                    cm.setPrimaryClip(ClipData.newPlainText(getPackageName(), mLog));
-                    break;
-            }
-            return false;
-        }
-
-        @Override
-        public boolean onCreateOptionsMenu(Menu menu)
-		{
-            menu.add(0, android.R.id.copy, 0, android.R.string.copy).setOnMenuItemClickListener(this)
-                .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-            return true;
-        }
-    }
-}
-

regexputils/src/main/java/cc/winboll/studio/regexputils/develop/LogListener.java

@@ -1,95 +0,0 @@
-package cc.winboll.studio.regexputils.develop;
-
-/*
- * 应用日志监听类
- * 源码提供：https://blog.csdn.net/wuxueshuan/article/details/121852698?app_version=5.15.2&code=app_1562916241&csdn_share_tail=%7B%22type%22%3A%22blog%22%2C%22rType%22%3A%22article%22%2C%22rId%22%3A%22121852698%22%2C%22source%22%3A%22weixin_38986226%22%7D&uLinkId=usr1mkqgl919blen&utm_source=app
- * 源码维护：ZhanGSKen@QQ.COM
- */
- 
-import android.os.FileObserver;
-import android.util.Log;
-
-public class LogListener extends FileObserver {
-	public final static String TAG = "LogListener";
-
-    public EventCallback callback;
-    
-    public String mLogPath;
-
-    public LogListener(String path) {
-		super(path);
-        //Log.d(TAG, "LogListener(String path) path : " + path);
-        mLogPath = path;
-    }
-    public void setEventCallback(EventCallback callback) {
-        this.callback = callback;
-    }
-
-    @Override
-    public void onEvent(int event, String path) {
-        if (null != path && !"".equals(path)) {
-            //String substring = path.substring(path.lastIndexOf(".") + 1);
-            //Log.d(TAG, "path : " + path);
-            //Log.d(TAG, "substring : " + substring);
-            //Log.d(TAG, "event : " + event);
-
-        } else {
-            return;
-        }
-
-        int e = event & FileObserver.ALL_EVENTS;
-        //Log.d(TAG, "event->e:" + e);
-        switch (e) {
-            case FileObserver.ACCESS:
-                //Log.d(TAG, "文件操作___" + e + "__1打开文件后读取文件的操作");
-                break;
-            case FileObserver.MODIFY:
-                //Log.d(TAG, "文件操作___" + e + "__2文件被修改");
-                break;
-            case FileObserver.ATTRIB:
-                //Log.d(TAG, "文件操作___" + e + "__4属性变化");
-                break;
-            case FileObserver.CLOSE_WRITE:
-                //Log.d(TAG, "文件操作___" + e + "__8文件写入或编辑后关闭");
-				callback.onEvent(path);
-                break;
-            case FileObserver.CLOSE_NOWRITE:
-                //录音时，最后一个有效回调是这个
-                //Log.d(TAG, "文件操作___" + e + "__16只读文件被关闭");
-
-                //callback.onEvent(path);
-
-
-                break;
-            case FileObserver.OPEN:
-                //Log.d(TAG, "文件操作___" + e + "__32文件被打开");
-                break;
-            case FileObserver.MOVED_FROM:
-                //Log.d(TAG, "文件操作___" + e + "__64移出事件");//试了重命名先MOVED_FROM再MOVED_TO
-                break;
-            case FileObserver.MOVED_TO:
-                //Log.d(TAG, "文件操作___" + e + "__128移入事件");
-                break;
-            case FileObserver.CREATE:
-                //Log.d(TAG, "文件操作___" + e + "__256新建文件");//把文件移动给自己先CREATE在DELETE
-                break;
-            case FileObserver.DELETE:
-                //Log.d(TAG, "文件操作___" + e + "__512有删除文件");//把文件移出去DELETE
-                break;
-            case FileObserver.DELETE_SELF:
-                //Log.d(TAG, "文件操作___" + e + "__1024监听的这个文件夹被删除");
-                break;
-            case FileObserver.MOVE_SELF:
-                //Log.d(TAG, "文件操作___" + e + "__2048监听的这个文件夹被移走");
-                break;
-            case FileObserver.ALL_EVENTS:
-                //Log.d(TAG, "文件操作___" + e + "__4095全部操作");
-                break;
-        }
-    }
-
-	public interface EventCallback {
-        void onEvent(String path);
-    }
-
-}

regexputils/src/main/java/cc/winboll/studio/regexputils/develop/LogUtils.java

@@ -1,74 +0,0 @@
-package cc.winboll.studio.regexputils.develop;
-
-/*
- * 应用日志类
- * 源码维护：ZhanGSKen@QQ.COM
- */
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.text.SimpleDateFormat;
-
-public class LogUtils {
-
-    public static final String TAG = "BaseApplication";
-
-    static SimpleDateFormat mSimpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:SS");
-
-    public static void d(String szTAG, String szMessage) {
-        saveLog(szTAG, szMessage);
-    }
-
-    static void saveLog(String szTAG, String szMessage) {
-        try {
-            File fLog = new File(WinBollBase._mszLogFilePath);
-            //FileWriter fw = new FileWriter(fLog, Charset.defaultCharset(), true);
-            //fw.append(mSimpleDateFormat.format(System.currentTimeMillis()) + "[" + szTAG + "]: " + szMessage + "\n");
-            //fw.close();
-            BufferedWriter out = null;
-            out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(fLog, true), "UTF-8"));
-            out.write(mSimpleDateFormat.format(System.currentTimeMillis()) + "[" + szTAG + "]: " + szMessage + "\n");
-            out.close();
-
-        } catch (IOException e) {
-            LogUtils.d(TAG, "IOException : " + e.getMessage());
-        }
-    }
-
-    public static String loadLog() {
-        File fLog = new File(WinBollBase._mszLogFilePath);
-        StringBuffer sb = new StringBuffer();
-        try {
-            //FileInputStream fileInputStream = new FileInputStream(fLog);
-            //int size = fileInputStream.available();
-            //for (int i = 0; i < size; i++) {
-            //    sb.append((char) fileInputStream.read());
-            //}
-            BufferedReader in = null;
-            in = new BufferedReader(new InputStreamReader(new FileInputStream(fLog), "UTF-8"));
-            String line = "";
-            while ((line = in.readLine()) != null) {
-                sb.append(line);
-                sb.append("\n");
-            }
-
-        } catch (IOException e) {
-            LogUtils.d(TAG, "IOException : " + e.getMessage());
-        } 
-        return sb.toString();
-    }
-
-    public static void cleanLog() {
-        File fLog = new File(WinBollBase._mszLogFilePath);
-        if (fLog.exists()) {
-            fLog.delete();
-        }
-    }
-
-}

regexputils/src/main/java/cc/winboll/studio/regexputils/develop/LogView.java

@@ -1,91 +0,0 @@
-package cc.winboll.studio.regexputils.develop;
-
-import android.content.Context;
-import android.graphics.Color;
-import android.os.Handler;
-import android.os.Message;
-import android.util.AttributeSet;
-import android.widget.LinearLayout;
-import android.widget.ScrollView;
-import android.widget.TextView;
-import cc.winboll.studio.regexputils.develop.LogUtils;
-import java.lang.ref.WeakReference;
-
-public class LogView extends LinearLayout {
-
-    public static final String TAG = "LogView";
-    
-    final static int MSG_SHOW_LOG = 0;
-
-    LogListener mLogListener;
-    ScrollView mScrollView;
-    TextView mTextView;
-    MyHandler mMyHandler;
-
-    public LogView(Context context) {
-        super(context);
-        initView(context);
-    }
-
-    public LogView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        initView(context);
-    }
-
-    void initView(Context context) {
-        mScrollView = new ScrollView(context);
-        mTextView = new TextView(context);
-        mTextView.setTextColor(Color.GREEN);
-        mTextView.setTextIsSelectable(true);
-
-        mScrollView.addView(mTextView);
-        addView(mScrollView);
-        
-        mMyHandler = new MyHandler(this);
-
-        mLogListener = new LogListener(WinBollBase._mszLogFolderPath);
-        mLogListener.setEventCallback(new LogListener.EventCallback(){
-                @Override
-                public void onEvent(String path) {
-                    Message message = mMyHandler.obtainMessage(MSG_SHOW_LOG);
-                    mMyHandler.sendMessage(message);
-                    
-                }
-            });
-    }
-
-    public void startWatching() {
-        mLogListener.startWatching();
-    }
-
-    public void stopWatching() {
-        mLogListener.stopWatching();
-    }
-    
-    static class MyHandler extends Handler {
-        WeakReference<LogView> rv;  
-        MyHandler(LogView view) {  
-            rv = new WeakReference<LogView>(view);  
-        }
-        public void handleMessage(Message msg) {
-            final LogView view = rv.get();
-            switch (msg.what) {
-                case MSG_SHOW_LOG:{
-                        view.mTextView.setText(LogUtils.loadLog());
-                        view.mScrollView.post(new Runnable() {
-                                @Override
-                                public void run() {
-                                    view.mScrollView.fullScroll(ScrollView.FOCUS_DOWN);
-                                }
-                            });
-                        break;
-                }
-                    
-                    
-                default:
-                    break;
-            }
-            super.handleMessage(msg);
-        }
-	}
-}

regexputils/src/main/java/cc/winboll/studio/regexputils/develop/WinBollBase.java

@@ -1,31 +0,0 @@
-package cc.winboll.studio.regexputils.develop;
-
-/*
- * WinBollBase
- * WINBOLL 安卓应用基础类
- * 源码提供：AIDE
- * 源码维护：ZhanGSKen@QQ.COM
- */
-
-import android.app.Application;
-
-public class WinBollBase extends Application {
-    
-    public static String _mszLogFolderPath;
-    public static String _mszLogFilePath;
-    public static String _mszLogFileName = "WinBollBase.log";
-    public static String _mszHtmlFolderPath;
-    public static String _mszHtmlFilePath;
-    public static String _mszHtmlFileName = "BaseWebViewBody.txt";
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        CrashHandler.init(this);
-        _mszLogFolderPath = getExternalFilesDir("logs").toString();
-        _mszLogFilePath = _mszLogFolderPath + "/" + _mszLogFileName;
-        _mszHtmlFolderPath = getExternalFilesDir("webviews").toString();
-        _mszHtmlFilePath = _mszHtmlFolderPath + "/" + _mszHtmlFileName;
-    }
-
-}

regexputils/src/main/res/drawable/bg_shadow.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?> 
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" > 
-    <!-- 阴影部分 --> 
-    <!-- 个人觉得更形象的表达：top代表下边的阴影高度，left代表右边的阴影宽度。其实也就是相对应的offset，solid中的颜色是阴影的颜色，也可以设置角度等等 --> 
-    <item 
-        android:left="2dp" 
-        android:top="2dp" 
-        android:right="2dp" 
-        android:bottom="2dp"> 
-        <shape android:shape="rectangle" > 
-            <gradient 
-                android:angle="270" 
-                android:endColor="#0F000000" 
-                android:startColor="#0F000000" /> 
-            <corners 
-                android:bottomLeftRadius="6dip" 
-                android:bottomRightRadius="6dip" 
-                android:topLeftRadius="6dip" 
-                android:topRightRadius="6dip" /> 
-        </shape> 
-    </item> 
-    <!-- 背景部分 --> 
-    <!-- 形象的表达：bottom代表背景部分在上边缘超出阴影的高度，right代表背景部分在左边超出阴影的宽度（相对应的offset） --> 
-    <item 
-        android:left="3dp" 
-        android:top="3dp" 
-        android:right="3dp" 
-        android:bottom="5dp"> 
-        <shape android:shape="rectangle" > 
-            <gradient 
-                android:angle="270" 
-                android:endColor="#FFFFFF" 
-                android:startColor="#FFFFFF" /> 
-            <corners 
-                android:bottomLeftRadius="6dip" 
-                android:bottomRightRadius="6dip" 
-                android:topLeftRadius="6dip" 
-                android:topRightRadius="6dip" /> 
-        </shape> 
-    </item> 
-</layer-list>

regexputils/src/main/res/drawable/ic_launcher.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
-    android:clickable="true">
-	<item 
-        android:left="15dp" 
-        android:top="15dp" 
-        android:right="15dp" 
-        android:bottom="15dp"
-        android:drawable="@drawable/ic_regexputils"/>
-</layer-list>

regexputils/src/main/res/drawable/ic_launcher_background.xml

@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-    <path
-        android:fillColor="#26A69A"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-</vector>

regexputils/src/main/res/drawable/ic_launcher_beta.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
-    android:clickable="true">
-    <item android:drawable="@drawable/ic_launcher_background"/> 
-    <item 
-        android:left="15dp" 
-        android:top="15dp" 
-        android:right="15dp" 
-        android:bottom="15dp"
-        android:drawable="@drawable/ic_regexputils"/>
-</layer-list>

regexputils/src/main/res/layout/activity_main.xml

@@ -1,200 +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:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:orientation="vertical"
-	android:padding="10dp">
-
-	<LinearLayout
-		xmlns:app="http://schemas.android.com/apk/res-auto"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:orientation="vertical"
-		android:focusable="true"
-		android:focusableInTouchMode="true">
-
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:id="@+id/activitymainTextView2"
-			style="@style/columnTitleStyle"/>
-
-		<LinearLayout
-			android:orientation="horizontal"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:gravity="center_vertical">
-
-			<EditText
-				android:layout_width="0dp"
-				android:ems="10"
-				android:layout_height="wrap_content"
-				android:id="@+id/activitymainEditText1"
-				android:layout_weight="1.0"
-				android:singleLine="true"
-				android:imeOptions="actionDone"
-				style="@style/contentEditBoxStyle"/>
-
-			<Button
-				android:layout_width="40dp"
-				android:layout_height="40dp"
-				android:text="!"
-				android:onClick="onRegExp"/>
-
-		</LinearLayout>
-
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:id="@+id/activitymainTextView3"
-			style="@style/columnTitleStyle"/>
-
-		<LinearLayout
-			android:orientation="horizontal"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content">
-
-			<EditText
-				android:layout_width="0dp"
-				android:ems="10"
-				android:layout_height="wrap_content"
-				android:layout_weight="1.0"
-				android:singleLine="true"
-				android:imeOptions="actionDone"
-				android:id="@+id/activitymainEditText3"
-				style="@style/contentEditBoxStyle"/>
-
-			<Button
-				android:layout_width="40dp"
-				android:layout_height="40dp"
-				android:text="! $"
-				android:onClick="onRegExpRewrite"/>
-
-		</LinearLayout>
-
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:id="@+id/activitymainTextView5"
-			style="@style/columnTitleStyle"/>
-
-		<LinearLayout
-			android:orientation="horizontal"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content">
-
-			<EditText
-				android:layout_width="match_parent"
-				android:ems="10"
-				android:layout_height="64dp"
-				android:singleLine="false"
-				android:imeOptions="actionDone"
-				android:id="@+id/activitymainEditText2"
-				style="@style/contentEditBoxStyle"/>
-
-		</LinearLayout>
-
-		<ScrollView
-			android:layout_width="match_parent"
-			android:layout_height="150dp"
-			android:background="#FFDBDBDB">
-
-			<TextView
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:textIsSelectable="true"
-				android:id="@+id/activitymainTextView1"
-				style="@style/columnTitleStyle"/>
-
-		</ScrollView>
-
-		<LinearLayout
-			android:orientation="horizontal"
-			android:layout_width="match_parent"
-			android:layout_height="65dp"
-			android:gravity="center_vertical">
-
-			<LinearLayout
-				android:orientation="vertical"
-				android:layout_width="0dp"
-				android:layout_height="match_parent"
-				android:layout_weight="1.0"
-				android:background="#FF000000"
-				android:id="@+id/activitymainLinearLayout1">
-
-			</LinearLayout>
-
-			<Button
-				android:layout_width="40dp"
-				android:layout_height="40dp"
-				android:text="↻"
-				android:onClick="onCleanLog"/>
-
-		</LinearLayout>
-
-		<ScrollView
-			android:layout_width="match_parent"
-			android:layout_height="0dp"
-			android:layout_weight="1.0">
-
-			<LinearLayout
-				android:orientation="vertical"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content">
-
-				<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:id="@+id/activitymainTextView4"
-					style="@style/columnTitleStyle"/>
-
-				<LinearLayout
-					android:orientation="horizontal"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content">
-
-					<Button
-						android:layout_width="40dp"
-						android:layout_height="40dp"
-						android:text="☆"
-						android:id="@+id/activitymainButton1"
-						android:onClick="onEnableFavorite"/>
-
-					<cc.winboll.studio.regexputils.URLEditText
-						android:layout_width="0dp"
-						android:ems="10"
-						android:layout_height="wrap_content"
-						android:singleLine="true"
-						android:imeOptions="actionDone"
-						android:id="@+id/activitymainURLEditText1"
-						android:layout_weight="1.0"/>
-
-					<Button
-						android:layout_width="40dp"
-						android:layout_height="40dp"
-						android:text="▼"
-						android:onClick="onShowFavoriteList"/>
-
-					<Button
-						android:layout_width="40dp"
-						android:layout_height="40dp"
-						android:text="→"
-						android:onClick="onGoto"/>
-
-				</LinearLayout>
-
-				<WebView
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:id="@+id/activitymainWebView1"/>
-
-			</LinearLayout>
-
-		</ScrollView>
-
-	</LinearLayout>
-
-</LinearLayout>
-

regexputils/src/main/res/values-v21/styles.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="AppTheme" parent="@android:style/Theme.Material.Light.DarkActionBar">
-        <item name="android:colorPrimary">@color/colorPrimary</item>
-        <item name="android:colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="android:colorAccent">@color/colorAccent</item>
-        <item name="android:navigationBarColor">?android:colorPrimary</item>
-	</style>
-</resources>

regexputils/src/main/res/values-zh/strings.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">正则工具</string>
-    <string name="tv_pattern">语法模板</string>
-    <string name="tv_rewrite">替换模板</string>
-    <string name="tv_matchtext">匹配文本</string>
-    <string name="tv_onlinehelp">联机帮助</string>
-    <string name="sz_patternresult">匹配结果</string>
-    <string name="sz_rewriteresult">替换结果</string>
-    <string name="sz_isnull">为空。</string>
-    <string name="sz_nomatcherfind">没有匹配的字符。</string>
-    <string name="sz_start">开始</string>
-    <string name="sz_end">结束</string>
-</resources>

regexputils/src/main/res/values/colors.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF5771FF</color>
-    <color name="color_2C2C2C">#2C2C2C</color>
-    <color name="color_4C4E55">#4C4E55</color>
-    <color name="black">#FF000000</color>
-    <color name="white">#FFFFFFFF</color>
-</resources>

regexputils/src/main/res/values/strings.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">RegExpUtils</string>
-    <string name="tv_pattern">Pattern</string>
-    <string name="tv_rewrite">Rewrite</string>
-    <string name="tv_matchtext">MatchText</string>
-    <string name="tv_onlinehelp">OnlineHelp</string>
-    <string name="sz_patternresult">PatternResult</string>
-    <string name="sz_rewriteresult">RewriteResult</string>
-    <string name="sz_isnull">is null.</string>
-    <string name="sz_nomatcherfind">No matcher find.</string>
-    <string name="sz_start">Start</string>
-    <string name="sz_end">End</string>
-    <string name="sz_Source">https://toscode.gitee.com/zhangsken/RegExpUtils</string>
-    <string name="sz_defaultonlinehelp">https://tool.oschina.net/uploads/apidocs/jquery/regexp.html</string>
-</resources>

regexputils/src/main/res/values/styles.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="android:Theme.Material.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="android:colorPrimary">@color/colorPrimary</item>
-        <item name="android:colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="android:colorAccent">@color/colorAccent</item>
-    </style>
-    <!--popMenu的Style-->
-    <style name="customPopMenuStyle" >
-        <item name="android:itemBackground">@color/color_2C2C2C</item>
-        <item name="android:dropDownListViewStyle">@style/popmenuDivier</item>
-        <item name="android:textAppearanceSmallPopupMenu">@style/popmeuText</item>
-        <item name="android:textAppearanceLargePopupMenu">@style/popmeuText</item>
-    </style>
-    <!-- popMenu的背景色-->
-    <style name="popmenuStyle" >
-    </style>
-    <!--popmenu的字体颜色-->
-    <style name="popmeuText">
-        <item name="android:textColor">@color/white</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:gravity">center</item>
-    </style>
-    <!--popMenu分割线的颜色-->
-    <style name="popmenuDivier">
-        <item name="android:divider">@color/color_4C4E55</item>
-        <item name="android:dividerHeight">1px</item>
-    </style>
-    <!--分栏标题的风格-->
-    <style name="columnTitleStyle" >
-        <item name="android:textSize">12sp</item>
-        <item name="android:textColor">@color/colorAccent</item>
-        <item name="android:gravity">center_vertical</item>
-    </style>
-    <!--内容编辑框的风格-->
-    <style name="contentEditBoxStyle" >
-        <item name="android:textSize">14sp</item>
-    </style>
-</resources>

regexputils/src/stage/AndroidManifest.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" >
-
-    <application>
-
-        <!-- Put flavor specific code here -->
-
-    </application>
-
-</manifest>
-

regexputils/src/stage/res/values/strings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!-- Put flavor specific strings here -->
-
-</resources>

settings.gradle-demo

@@ -64,8 +64,4 @@
 
 // WebPageSources 项目编译设置
 //include ':webpagesources'
-//rootProject.name = "webpagesources"
-
-// RegExpUtils 项目编译设置
-//include ':regexputils'
-//rootProject.name = "regexputils"
+//rootProject.name = "webpagesources"