<autoinstaller>APK 15.2.3 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"/>

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Fri Sep 26 05:36:14 HKT 2025
-stageCount=9
+#Sat Sep 27 21:03:20 HKT 2025
+stageCount=10
 libraryProject=libappbase
 baseVersion=15.10
-publishVersion=15.10.8
+publishVersion=15.10.9
 buildCount=0
-baseBetaVersion=15.10.9
+baseBetaVersion=15.10.10

autoinstaller/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Jun 24 09:54:47 HKT 2025
-stageCount=3
+#Sun Sep 28 12:44:55 HKT 2025
+stageCount=4
 libraryProject=
 baseVersion=15.2
-publishVersion=15.2.2
+publishVersion=15.2.3
 buildCount=0
-baseBetaVersion=15.2.3
+baseBetaVersion=15.2.4

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>

libappbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Fri Sep 26 05:36:14 HKT 2025
-stageCount=9
+#Sat Sep 27 21:03:08 HKT 2025
+stageCount=10
 libraryProject=libappbase
 baseVersion=15.10
-publishVersion=15.10.8
+publishVersion=15.10.9
 buildCount=0
-baseBetaVersion=15.10.9
+baseBetaVersion=15.10.10

libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java

@@ -22,12 +22,12 @@ public class GlobalApplication extends Application {
         GlobalApplication.isDebuging = isDebuging;
     }
     
-    public static void saveDebugStatus(GlobalApplication application) {
-        APPModel.saveBeanToFile(application.getAPPModelFilePath(application), new APPModel(GlobalApplication.isDebuging));
+    public static void saveDebugStatus(Context context) {
+        APPModel.saveBeanToFile(getAPPModelFilePath(context), new APPModel(GlobalApplication.isDebuging));
     }
 	
-    static String getAPPModelFilePath(GlobalApplication application) {
-        return application.getDataDir().getPath() + "/APPModel.json";
+    static String getAPPModelFilePath(Context context) {
+        return context.getDataDir().getPath() + "/APPModel.json";
     }
 
     public static boolean isDebuging() {

positions/.gitignore

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

positions/README.md

@@ -1,34 +0,0 @@
-# Positions
-
-#### 介绍
-安卓位置应用，有关于地理位置的相关应用。
-
-#### 软件架构
-适配安卓应用 [AIDE Pro] 的 Gradle 编译结构。
-也适配安卓应用 [AndroidIDE] 的 Gradle 编译结构。
-
-
-#### Gradle 编译说明
-调试版编译命令 ：gradle assembleBetaDebug
-阶段版编译命令 ：bash .winboll/bashPublishAPKAddTag.sh positions
-
-#### 使用说明
-
-#### 参与贡献
-
-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/)
-
-#### 参考文档

positions/app_update_description.txt

@@ -1 +0,0 @@
-

positions/build.gradle

@@ -1,76 +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.positions"
-        minSdkVersion 24
-        targetSdkVersion 30
-        versionCode 1
-        // versionName 更新后需要手动设置 
-        // .winboll/winbollBuildProps.properties 文件的 stageCount=0
-        // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.0"
-        if(true) {
-            versionName = genVersionName("${versionName}")
-        }
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-}
-
-dependencies {
-    api fileTree(dir: 'libs', include: ['*.jar'])
-	
-	// 谷歌定位服务核心依赖（FusedLocationProviderClient所在库）
-    api 'com.google.android.gms:play-services-location:21.0.1'
-    
-    // SSH
-    api 'com.jcraft:jsch:0.1.55'
-    // Html 解析
-    api 'org.jsoup:jsoup:1.13.1'
-    // 二维码类库
-    api 'com.google.zxing:core:3.4.1'
-    api 'com.journeyapps:zxing-android-embedded:3.6.0'
-    // 应用介绍页类库
-    api 'io.github.medyo:android-about-page:2.0.0'
-    // 吐司类库
-    api 'com.github.getActivity:ToastUtils:10.5'
-    // 网络连接类库
-    api 'com.squareup.okhttp3:okhttp:4.4.1'
-    // AndroidX 类库
-    api 'androidx.appcompat:appcompat:1.1.0'
-    api 'com.google.android.material:material:1.4.0'
-    //api 'androidx.viewpager:viewpager:1.0.0'
-    //api 'androidx.vectordrawable:vectordrawable:1.1.0'
-    //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
-    //api 'androidx.fragment:fragment:1.1.0'
-    
-    api 'cc.winboll.studio:libaes:15.9.3'
-    api 'cc.winboll.studio:libapputils:15.8.5'
-    api 'cc.winboll.studio:libappbase:15.9.5'
-}

positions/build.properties

@@ -1,8 +0,0 @@
-#Created by .winboll/winboll_app_build.gradle
-#Tue Sep 30 17:50:26 HKT 2025
-stageCount=4
-libraryProject=
-baseVersion=15.0
-publishVersion=15.0.3
-buildCount=0
-baseBetaVersion=15.0.4

positions/proguard-rules.pro

@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# 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 *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile

positions/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>
-

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

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

positions/src/main/AndroidManifest.xml

@@ -1,55 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cc.winboll.studio.positions">
-	
-	<!-- 1. 定位必需权限声明 -->
-    <!-- 精确定位权限（GPS+网络定位，核心） -->
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <!-- 粗略定位权限（仅安卓12+需要，兼容低版本可加） -->
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <!-- 网络权限（可选，用于网络定位，提升室内定位精度） -->
-    <uses-permission android:name="android.permission.INTERNET" />
-
-    <!-- 2. 声明定位硬件支持（可选，告诉系统应用需要定位功能） -->
-    <uses-feature
-        android:name="android.hardware.location.gps"
-        android:required="false" /> <!-- false=无GPS也能使用（网络定位） -->
-		
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/MyAppTheme"
-        android:resizeableActivity="true"
-        android:name=".App">
-
-        <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>
-
-        <meta-data
-            android:name="android.max_aspect"
-            android:value="4.0"/>
-
-        <activity android:name=".GlobalApplication$CrashActivity"/>
-
-        <activity android:name="cc.winboll.studio.positions.activities.LocationActivity"/>
-			
-		<!-- 4. 谷歌定位服务版本声明（避免版本兼容问题） -->
-        <meta-data
-            android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version" />
-    </application>
-
-</manifest>

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

@@ -1,345 +0,0 @@
-package cc.winboll.studio.positions;
-
-import android.app.Activity;
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.res.Resources;
-import android.graphics.Typeface;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.Gravity;
-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 android.widget.Toast;
-import cc.winboll.studio.libappbase.GlobalApplication;
-import com.hjq.toast.ToastUtils;
-import com.hjq.toast.style.WhiteToastStyle;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.Thread.UncaughtExceptionHandler;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-public class App extends GlobalApplication {
-
-    private static Handler MAIN_HANDLER = new Handler(Looper.getMainLooper());
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        
-        // 初始化 Toast 框架
-        ToastUtils.init(this);
-        // 设置 Toast 布局样式
-        //ToastUtils.setView(R.layout.view_toast);
-        ToastUtils.setStyle(new WhiteToastStyle());
-        ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
-        
-        //CrashHandler.getInstance().registerGlobal(this);
-        //CrashHandler.getInstance().registerPart(this);
-    }
-
-    public static void write(InputStream input, OutputStream output) throws IOException {
-        byte[] buf = new byte[1024 * 8];
-        int len;
-        while ((len = input.read(buf)) != -1) {
-            output.write(buf, 0, len);
-        }
-    }
-
-    public static void write(File file, byte[] data) throws IOException {
-        File parent = file.getParentFile();
-        if (parent != null && !parent.exists()) parent.mkdirs();
-
-        ByteArrayInputStream input = new ByteArrayInputStream(data);
-        FileOutputStream output = new FileOutputStream(file);
-        try {
-            write(input, output);
-        } finally {
-            closeIO(input, output);
-        }
-    }
-
-    public static String toString(InputStream input) throws IOException {
-        ByteArrayOutputStream output = new ByteArrayOutputStream();
-        write(input, output);
-        try {
-            return output.toString("UTF-8");
-        } finally {
-            closeIO(input, output);
-        }
-    }
-
-    public static void closeIO(Closeable... closeables) {
-        for (Closeable closeable : closeables) {
-            try {
-                if (closeable != null) closeable.close();
-            } catch (IOException ignored) {}
-        }
-    }
-
-    public static class CrashHandler {
-
-        public static final UncaughtExceptionHandler DEFAULT_UNCAUGHT_EXCEPTION_HANDLER = Thread.getDefaultUncaughtExceptionHandler();
-
-        private static CrashHandler sInstance;
-
-        private PartCrashHandler mPartCrashHandler;
-
-        public static CrashHandler getInstance() {
-            if (sInstance == null) {
-                sInstance = new CrashHandler();
-            }
-            return sInstance;
-        }
-
-        public void registerGlobal(Context context) {
-            registerGlobal(context, null);
-        }
-
-        public void registerGlobal(Context context, String crashDir) {
-            Thread.setDefaultUncaughtExceptionHandler(new UncaughtExceptionHandlerImpl(context.getApplicationContext(), crashDir));
-        }
-
-        public void unregister() {
-            Thread.setDefaultUncaughtExceptionHandler(DEFAULT_UNCAUGHT_EXCEPTION_HANDLER);
-        }
-
-        public void registerPart(Context context) {
-            unregisterPart(context);
-            mPartCrashHandler = new PartCrashHandler(context.getApplicationContext());
-            MAIN_HANDLER.postAtFrontOfQueue(mPartCrashHandler);
-        }
-
-        public void unregisterPart(Context context) {
-            if (mPartCrashHandler != null) {
-                mPartCrashHandler.isRunning.set(false);
-                mPartCrashHandler = null;
-            }
-        }
-
-        private static class PartCrashHandler implements Runnable {
-
-            private final Context mContext;
-
-            public AtomicBoolean isRunning = new AtomicBoolean(true);
-
-            public PartCrashHandler(Context context) {
-                this.mContext = context;
-            }
-
-            @Override
-            public void run() {
-                while (isRunning.get()) {
-                    try {
-                        Looper.loop();
-                    } catch (final Throwable e) {
-                        e.printStackTrace();
-                        if (isRunning.get()) {
-                            MAIN_HANDLER.post(new Runnable(){
-
-                                    @Override
-                                    public void run() {
-                                        Toast.makeText(mContext, e.toString(), Toast.LENGTH_LONG).show();
-                                    }
-                                });
-                        } else {
-                            if (e instanceof RuntimeException) {
-                                throw (RuntimeException)e;
-                            } else {
-                                throw new RuntimeException(e);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        private static class UncaughtExceptionHandlerImpl implements UncaughtExceptionHandler {
-
-            private static DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy_MM_dd-HH_mm_ss");
-
-            private final Context mContext;
-
-            private final File mCrashDir;
-
-            public UncaughtExceptionHandlerImpl(Context context, String crashDir) {
-                this.mContext = context;
-                this.mCrashDir = TextUtils.isEmpty(crashDir) ? new File(mContext.getExternalCacheDir(), "crash") : new File(crashDir);
-            }
-
-            @Override
-            public void uncaughtException(Thread thread, Throwable throwable) {
-                try {
-
-                    String log = buildLog(throwable);
-                    writeLog(log);
-
-                    try {
-                        Intent intent = new Intent(mContext, CrashActivity.class);
-                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                        intent.putExtra(Intent.EXTRA_TEXT, log);
-                        mContext.startActivity(intent);
-                    } catch (Throwable e) {
-                        e.printStackTrace();
-                        writeLog(e.toString());
-                    }
-
-                    throwable.printStackTrace();
-                    android.os.Process.killProcess(android.os.Process.myPid());
-                    System.exit(0);
-
-                } catch (Throwable e) {
-                    if (DEFAULT_UNCAUGHT_EXCEPTION_HANDLER != null) DEFAULT_UNCAUGHT_EXCEPTION_HANDLER.uncaughtException(thread, throwable);
-                }
-            }
-
-            private String buildLog(Throwable throwable) {
-                String time = DATE_FORMAT.format(new Date());
-
-                String versionName = "unknown";
-                long versionCode = 0;
-                try {
-                    PackageInfo packageInfo = mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0);
-                    versionName = packageInfo.versionName;
-                    versionCode = Build.VERSION.SDK_INT >= 28 ? packageInfo.getLongVersionCode() : packageInfo.versionCode;
-                } catch (Throwable ignored) {}
-
-                LinkedHashMap<String, String> head = new LinkedHashMap<String, String>();
-                head.put("Time Of Crash", time);
-                head.put("Device", String.format("%s, %s", Build.MANUFACTURER, Build.MODEL));
-                head.put("Android Version", String.format("%s (%d)", Build.VERSION.RELEASE, Build.VERSION.SDK_INT));
-                head.put("App Version", String.format("%s (%d)", versionName, versionCode));
-                head.put("Kernel", getKernel());
-                head.put("Support Abis", Build.VERSION.SDK_INT >= 21 && Build.SUPPORTED_ABIS != null ? Arrays.toString(Build.SUPPORTED_ABIS): "unknown");
-                head.put("Fingerprint", Build.FINGERPRINT);
-
-                StringBuilder builder = new StringBuilder();
-
-                for (String key : head.keySet()) {
-                    if (builder.length() != 0) builder.append("\n");
-                    builder.append(key);
-                    builder.append(" :    ");
-                    builder.append(head.get(key));
-                }
-
-                builder.append("\n\n");
-                builder.append(Log.getStackTraceString(throwable));
-
-                return builder.toString(); 
-            }
-
-            private void writeLog(String log) {
-                String time = DATE_FORMAT.format(new Date());
-                File file = new File(mCrashDir, "crash_" + time + ".txt");
-                try {
-                    write(file, log.getBytes("UTF-8"));
-                } catch (Throwable e) {
-                    e.printStackTrace();
-                } 
-            }
-
-            private static String getKernel() {
-                try {
-                    return App.toString(new FileInputStream("/proc/version")).trim();
-                } catch (Throwable e) {
-                    return e.getMessage();
-                }
-            }
-        }
-    }
-
-    public static final class CrashActivity extends Activity {
-
-        private String mLog;
-
-        @Override
-        protected void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-
-            setTheme(android.R.style.Theme_DeviceDefault);
-            setTitle("App Crash");
-
-            mLog = getIntent().getStringExtra(Intent.EXTRA_TEXT);
-
-            ScrollView contentView = new ScrollView(this);
-            contentView.setFillViewport(true);
-
-            HorizontalScrollView horizontalScrollView = new HorizontalScrollView(this);
-
-            TextView textView = new TextView(this);
-            int padding = dp2px(16);
-            textView.setPadding(padding, padding, padding, padding);
-            textView.setText(mLog);
-            textView.setTextIsSelectable(true);
-            textView.setTypeface(Typeface.DEFAULT);
-            textView.setLinksClickable(true);
-
-            horizontalScrollView.addView(textView);
-            contentView.addView(horizontalScrollView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
-
-            setContentView(contentView);
-        }
-
-        private void restart() {
-            Intent intent = getPackageManager().getLaunchIntentForPackage(getPackageName());
-            if (intent != null) {
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                startActivity(intent);
-            }
-            finish();
-            android.os.Process.killProcess(android.os.Process.myPid());
-            System.exit(0);
-        }
-
-        private static int dp2px(float dpValue) {
-            final float scale = Resources.getSystem().getDisplayMetrics().density;
-            return (int) (dpValue * scale + 0.5f);
-        }
-
-        @Override
-        public boolean onCreateOptionsMenu(Menu menu) {
-            menu.add(0, android.R.id.copy, 0, android.R.string.copy)
-                .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-            return super.onCreateOptionsMenu(menu);
-        }
-
-        @Override
-        public boolean onOptionsItemSelected(MenuItem item) {
-            switch (item.getItemId()) {
-                case android.R.id.copy:
-                    ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
-                    cm.setPrimaryClip(ClipData.newPlainText(getPackageName(), mLog));
-                    return true;
-            }
-            return super.onOptionsItemSelected(item);
-        }
-
-        @Override
-        public void onBackPressed() {
-            restart();
-        }
-    }
-}

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

@@ -1,38 +0,0 @@
-package cc.winboll.studio.positions;
-
-import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-import cc.winboll.studio.libappbase.LogView;
-import com.hjq.toast.ToastUtils;
-import android.view.View;
-import cc.winboll.studio.positions.activities.LocationActivity;
-import android.content.Intent;
-
-public class MainActivity extends AppCompatActivity {
-
-    LogView mLogView;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
-		Toolbar toolbar=(Toolbar)findViewById(R.id.toolbar);
-		setSupportActionBar(toolbar);
-
-        mLogView = findViewById(R.id.logview);
-        
-        ToastUtils.show("onCreate");
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mLogView.start();
-    }
-	
-	public void onPositions(View view) {
-		startActivity(new Intent(this, LocationActivity.class));
-	}
-}

positions/src/main/java/cc/winboll/studio/positions/activities/LocationActivity.java

@@ -1,446 +0,0 @@
-package cc.winboll.studio.positions.activities;
-
-/**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/09/29 18:22
- * @Describe 当前位置实时显示 + 位置列表实时距离计算
- */
-import android.Manifest;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.content.pm.PackageManager;
-import android.location.Location;
-import android.os.Bundle;
-import android.text.InputType;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.widget.Toast;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.app.ActivityCompat;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import cc.winboll.studio.positions.R;
-import cc.winboll.studio.positions.adapters.PositionAdapter;
-import cc.winboll.studio.positions.models.PositionModel;
-import com.google.android.gms.location.FusedLocationProviderClient;
-import com.google.android.gms.location.LocationCallback;
-import com.google.android.gms.location.LocationRequest;
-import com.google.android.gms.location.LocationResult;
-import com.google.android.gms.location.LocationServices;
-import com.google.android.gms.tasks.OnSuccessListener;
-import java.util.ArrayList;
-import cc.winboll.studio.positions.models.PositionTaskModel;
-
-/**
- * 实时定位活动窗口：
- * 1. 申请定位必需权限（精确定位）
- * 2. 初始化FusedLocationProviderClient（谷歌官方定位服务，兼容所有安卓版本）
- * 3. 实时监听位置变化，更新显示经度、纬度 + 同步给Adapter计算实时距离
- * 4. 右下角圆形悬浮按钮（含大写P字母，支持添加位置）
- * 5. 位置列表支持实时距离显示（按isEnableRealPositionDistance控制）
- */
-public class LocationActivity extends AppCompatActivity {
-
-    public static final String TAG = "LocationActivity";
-
-    // 1. 核心组件与常量定义（兼容Java 7，移除不必要final）
-    private static final int REQUEST_LOCATION_PERMISSIONS = 1004; // 定位权限请求码
-    private FusedLocationProviderClient fusedLocationClient; // 定位核心客户端
-    private LocationCallback locationCallback; // 位置变化监听器
-    private LocationRequest locationRequest; // 定位请求配置（频率、精度等）
-    private Location currentLocation; // 存储当前最新位置（用于同步给Adapter）
-
-    // UI控件（Java 7显式声明+强制转换）
-    private TextView tvLongitude; // 经度显示
-    private TextView tvLatitude;  // 纬度显示
-    private Button fabPButton;    // 右下角圆形悬浮按钮（P字母）
-    private RecyclerView rvPositionList; // 位置列表（RecyclerView）
-    private PositionAdapter positionAdapter; // 列表Adapter（含实时距离逻辑）
-    ArrayList<PositionModel> mPositionList = new ArrayList<PositionModel>(); // 位置数据集合
-    ArrayList<PositionTaskModel> mPositionTasksList = new ArrayList<PositionTaskModel>(); // 位置数据集合
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_location);
-
-        // 绑定UI控件（Java 7显式强制转换）
-        tvLongitude = (TextView) findViewById(R.id.tv_longitude);
-        tvLatitude = (TextView) findViewById(R.id.tv_latitude);
-        fabPButton = (Button) findViewById(R.id.fab_p_button);
-        rvPositionList = (RecyclerView) findViewById(R.id.rv_position_list);
-
-        // 初始化核心逻辑：定位配置→悬浮按钮→列表Adapter→加载历史数据
-        initLocationConfig();
-        initFabPButton();
-        initRecyclerViewAndAdapter();
-        loadHistoryPositions();
-
-        // 检查并申请定位权限（权限通过后启动实时定位）
-        if (checkLocationPermissions()) {
-            startRealTimeLocation();
-        } else {
-            requestLocationPermissions();
-        }
-    }
-
-
-    /**
-     * 初始化定位配置（兼容Java 7，用LocationRequest.create()替代Builder）
-     */
-    private void initLocationConfig() {
-        // 初始化定位客户端
-        fusedLocationClient = LocationServices.getFusedLocationProviderClient(this);
-
-        // 定位请求配置（高精度、1秒更新一次，适配旧版Google Play Services）
-        locationRequest = LocationRequest.create();
-        locationRequest.setInterval(1000); // 定位更新间隔（1秒）
-        locationRequest.setFastestInterval(500); // 最快更新间隔（500毫秒）
-        locationRequest.setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY); // 优先GPS高精度定位
-
-        // 位置变化监听器（实时更新UI + 同步位置给Adapter计算距离）
-        locationCallback = new LocationCallback() {
-            @Override
-            public void onLocationResult(@NonNull LocationResult locationResult) {
-                super.onLocationResult(locationResult);
-                currentLocation = locationResult.getLastLocation(); // 更新当前最新位置
-                if (currentLocation != null) {
-                    // 1. 更新页面经度、纬度显示
-                    double longitude = currentLocation.getLongitude();
-                    double latitude = currentLocation.getLatitude();
-                    tvLongitude.setText(String.format("当前经度：%.6f", longitude));
-                    tvLatitude.setText(String.format("当前纬度：%.6f", latitude));
-
-                    // 2. 同步当前位置给Adapter（用于计算列表项实时距离）
-                    if (positionAdapter != null) {
-                        // 创建仅含经纬度的PositionModel（memo空，isEnable无需关注）
-                        PositionModel currentGpsPos = new PositionModel();
-                        currentGpsPos.setLongitude(longitude);
-                        currentGpsPos.setLatitude(latitude);
-                        // 调用Adapter方法传入当前GPS位置
-                        positionAdapter.setCurrentGpsPosition(currentGpsPos);
-                    }
-                } else {
-                    // 位置为空（如GPS信号弱），显示等待提示
-                    tvLongitude.setText("当前经度：等待更新...");
-                    tvLatitude.setText("当前纬度：等待更新...");
-                }
-            }
-        };
-    }
-
-
-    /**
-     * 初始化悬浮按钮（点击弹出备注输入框，添加当前位置到列表）
-     */
-    private void initFabPButton() {
-        fabPButton.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					showLocationRemarkDialog();
-				}
-			});
-    }
-
-
-    /**
-     * 初始化RecyclerView和Adapter（绑定实时距离计算逻辑）
-     */
-    private void initRecyclerViewAndAdapter() {
-        // 1. 配置RecyclerView布局管理器（垂直列表）
-        LinearLayoutManager layoutManager = new LinearLayoutManager(this);
-        layoutManager.setOrientation(LinearLayoutManager.VERTICAL);
-        rvPositionList.setLayoutManager(layoutManager);
-
-        // 2. 初始化Adapter（传入上下文和数据集合，兼容Java 7）
-		PositionModel.loadBeanList(this, this.mPositionList, PositionModel.class);
-		PositionTaskModel.loadBeanList(this, this.mPositionTasksList, PositionTaskModel.class);
-        positionAdapter = new PositionAdapter(this, mPositionList, mPositionTasksList);
-        rvPositionList.setAdapter(positionAdapter);
-
-        // 3. 设置Adapter删除监听（删除列表项并同步本地数据）
-        positionAdapter.setOnDeleteClickListener(new PositionAdapter.OnDeleteClickListener() {
-				@Override
-				public void onDeleteClick(int position) {
-					showDeleteConfirmDialog(position);
-				}
-			});
-
-        // 4. 设置Adapter保存监听（编辑备注后同步本地数据）
-        positionAdapter.setOnSavePositionClickListener(new PositionAdapter.OnSavePositionClickListener() {
-				@Override
-				public void onSavePositionClick() {
-					try {
-						PositionModel.saveBeanList(LocationActivity.this, mPositionList, PositionModel.class);
-						Toast.makeText(LocationActivity.this, "位置信息已保存", Toast.LENGTH_SHORT).show();
-					} catch (Exception e) {
-						e.printStackTrace();
-						Toast.makeText(LocationActivity.this, "数据保存失败", Toast.LENGTH_SHORT).show();
-					}
-				}
-			});
-			
-		positionAdapter.setOnSavePositionTaskClickListener(new PositionAdapter.OnSavePositionTaskClickListener() {
-				@Override
-				public void onSavePositionTaskClick() {
-					try {
-						PositionTaskModel.saveBeanList(LocationActivity.this, mPositionTasksList, PositionTaskModel.class);
-						Toast.makeText(LocationActivity.this, "任务信息已保存", Toast.LENGTH_SHORT).show();
-					} catch (Exception e) {
-						e.printStackTrace();
-						Toast.makeText(LocationActivity.this, "数据保存失败", Toast.LENGTH_SHORT).show();
-					}
-				}
-			});
-    }
-
-
-    /**
-     * 从本地加载历史位置数据（基于BaseBean的持久化逻辑）
-     */
-    private void loadHistoryPositions() {
-        try {
-            ArrayList<PositionModel> historyList = new ArrayList<PositionModel>();
-            // 调用PositionModel加载方法（读取本地保存的位置数据）
-            PositionModel.loadBeanList(LocationActivity.this, historyList, PositionModel.class);
-            if (historyList != null && !historyList.isEmpty()) {
-                mPositionList.clear();
-                mPositionList.addAll(historyList);
-                positionAdapter.notifyDataSetChanged(); // 通知列表刷新
-            }
-        } catch (Exception e) {
-            e.printStackTrace(); // 首次启动无数据时忽略异常
-        }
-    }
-
-
-    /**
-     * 弹出位置备注输入对话框（添加当前位置到列表）
-     */
-    private void showLocationRemarkDialog() {
-        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(LocationActivity.this);
-        dialogBuilder.setTitle("当前位置备注");
-
-        // 创建输入框（配置提示文本和内边距）
-        final EditText remarkInput = new EditText(LocationActivity.this);
-        remarkInput.setHint("请输入备注（如：公司/家/学校）");
-        remarkInput.setInputType(InputType.TYPE_CLASS_TEXT);
-        remarkInput.setPadding(
-			dip2px(16),
-			dip2px(8),
-			dip2px(16),
-			dip2px(8)
-        );
-        dialogBuilder.setView(remarkInput);
-
-        // 确定按钮：添加位置到列表 + 保存本地
-        dialogBuilder.setPositiveButton("确定", new DialogInterface.OnClickListener() {
-				@Override
-				public void onClick(DialogInterface dialog, int which) {
-					String inputRemark = remarkInput.getText().toString().trim();
-					if (inputRemark.isEmpty()) {
-						Toast.makeText(LocationActivity.this, "未输入备注", Toast.LENGTH_SHORT).show();
-						return;
-					}
-
-					// 校验当前位置是否有效（避免无定位时添加空数据）
-					if (currentLocation == null) {
-						Toast.makeText(LocationActivity.this, "未获取到当前位置，请稍后再试", Toast.LENGTH_SHORT).show();
-						return;
-					}
-
-					// 添加位置到列表（isEnableRealPositionDistance默认false，需手动开启）
-					double longitude = currentLocation.getLongitude();
-					double latitude = currentLocation.getLatitude();
-					PositionModel newPosition = new PositionModel(
-					    PositionModel.genPositionId(),
-                        longitude,
-                        latitude,
-                        inputRemark,
-                        false // 默认不启用实时距离，用户可后续通过编辑开启
-					);
-					mPositionList.add(newPosition);
-
-					// 保存到本地 + 刷新列表
-					try {
-						PositionModel.saveBeanList(LocationActivity.this, mPositionList, PositionModel.class);
-						positionAdapter.notifyItemInserted(mPositionList.size() - 1); // 局部刷新（性能更优）
-						Toast.makeText(LocationActivity.this, "位置已添加", Toast.LENGTH_SHORT).show();
-					} catch (Exception e) {
-						e.printStackTrace();
-						Toast.makeText(LocationActivity.this, "位置保存失败", Toast.LENGTH_SHORT).show();
-					}
-					dialog.dismiss();
-				}
-			});
-
-        // 取消按钮：仅关闭对话框
-        dialogBuilder.setNegativeButton("取消", new DialogInterface.OnClickListener() {
-				@Override
-				public void onClick(DialogInterface dialog, int which) {
-					dialog.dismiss();
-				}
-			});
-
-        // 配置对话框（禁止外部点击关闭）
-        dialogBuilder.setCancelable(false);
-        AlertDialog remarkDialog = dialogBuilder.create();
-        remarkDialog.show();
-    }
-
-
-    /**
-     * 显示删除确认对话框（删除列表项）
-     */
-    private void showDeleteConfirmDialog(final int position) {
-        AlertDialog.Builder deleteDialogBuilder = new AlertDialog.Builder(this);
-        deleteDialogBuilder.setTitle("删除位置记录")
-			.setMessage("确定要删除这条位置吗？（删除后不可恢复）")
-			.setPositiveButton("确定", new DialogInterface.OnClickListener() {
-				@Override
-				public void onClick(DialogInterface dialog, int which) {
-					// 从列表移除 + 保存本地
-					positionAdapter.removePosition(position);
-					try {
-						PositionModel.saveBeanList(LocationActivity.this, mPositionList, PositionModel.class);
-						Toast.makeText(LocationActivity.this, "删除成功", Toast.LENGTH_SHORT).show();
-					} catch (Exception e) {
-						e.printStackTrace();
-						Toast.makeText(LocationActivity.this, "删除失败，请重试", Toast.LENGTH_SHORT).show();
-					}
-				}
-			})
-			.setNegativeButton("取消", new DialogInterface.OnClickListener() {
-				@Override
-				public void onClick(DialogInterface dialog, int which) {
-					dialog.dismiss();
-				}
-			})
-			.setCancelable(false);
-        deleteDialogBuilder.show();
-    }
-
-
-    /**
-     * 检查定位权限（仅精确定位权限，满足实时距离计算需求）
-     */
-    private boolean checkLocationPermissions() {
-        return ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION)
-			== PackageManager.PERMISSION_GRANTED;
-    }
-
-
-    /**
-     * 申请定位权限
-     */
-    private void requestLocationPermissions() {
-        String[] permissions = new String[]{Manifest.permission.ACCESS_FINE_LOCATION};
-        ActivityCompat.requestPermissions(
-			this,
-			permissions,
-			REQUEST_LOCATION_PERMISSIONS
-        );
-    }
-
-
-    /**
-     * 启动实时定位（获取当前位置 + 监听位置变化）
-     */
-    private void startRealTimeLocation() {
-        if (!checkLocationPermissions()) {
-            Toast.makeText(this, "定位权限未授予", Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-        // 1. 先获取一次当前位置（初始化页面显示）
-        fusedLocationClient.getLastLocation()
-			.addOnSuccessListener(this, new OnSuccessListener<Location>() {
-				@Override
-				public void onSuccess(Location location) {
-					if (location != null) {
-						currentLocation = location;
-						tvLongitude.setText(String.format("当前经度：%.6f", location.getLongitude()));
-						tvLatitude.setText(String.format("当前纬度：%.6f", location.getLatitude()));
-					} else {
-						tvLongitude.setText("当前经度：等待更新...");
-						tvLatitude.setText("当前纬度：等待更新...");
-					}
-				}
-			});
-
-        // 2. 注册位置监听器（实时更新位置）
-        fusedLocationClient.requestLocationUpdates(
-			locationRequest,
-			locationCallback,
-			getMainLooper() // 主线程更新UI，避免线程异常
-        );
-    }
-
-
-    /**
-     * 处理权限申请结果
-     */
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        if (requestCode == REQUEST_LOCATION_PERMISSIONS) {
-            boolean isGranted = false;
-            for (int result : grantResults) {
-                if (result == PackageManager.PERMISSION_GRANTED) {
-                    isGranted = true;
-                    break;
-                }
-            }
-
-            if (isGranted) {
-                startRealTimeLocation(); // 权限通过，启动定位
-            } else {
-                // 权限拒绝，提示并显示无权限状态
-                Toast.makeText(this, "定位权限被拒绝，无法显示实时位置和距离", Toast.LENGTH_SHORT).show();
-                tvLongitude.setText("当前经度：无权限");
-                tvLatitude.setText("当前纬度：无权限");
-            }
-        }
-    }
-
-
-    /**
-     * 活动销毁：停止定位 + 停止距离刷新定时器（避免内存泄漏）
-     */
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-
-        // 1. 停止定位监听（释放定位资源）
-        if (fusedLocationClient != null && locationCallback != null) {
-            fusedLocationClient.removeLocationUpdates(locationCallback);
-        }
-
-        // 2. 停止Adapter的距离刷新定时器（关键：避免Timer持有Context导致内存泄漏）
-        if (positionAdapter != null) {
-            positionAdapter.stopTimer();
-        }
-
-        // 3. 最后同步一次数据（确保所有修改保存）
-        try {
-            if (mPositionList != null && !mPositionList.isEmpty()) {
-                PositionModel.saveBeanList(this, mPositionList, PositionModel.class);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-
-    /**
-     * 辅助工具：dp转px（适配不同屏幕分辨率）
-     */
-    private int dip2px(float dpValue) {
-        final float scale = getResources().getDisplayMetrics().density;
-        return (int) (dpValue * scale + 0.5f); // +0.5f用于四舍五入，确保精度
-    }
-}
-

positions/src/main/java/cc/winboll/studio/positions/adapters/PositionAdapter.java

@@ -1,675 +0,0 @@
-package cc.winboll.studio.positions.adapters;
-
-/**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/09/29 20:25
- * @Describe 位置数据适配器（修复定时器：仅刷新实时距离，不干扰编辑中的任务；优化任务触发通知）
- */
-import android.content.Context;
-import android.os.Handler;
-import android.os.Looper;
-import android.view.LayoutInflater;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.PopupMenu;
-import android.widget.RadioButton;
-import android.widget.RadioGroup;
-import android.widget.TextView;
-import android.widget.Toast;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import cc.winboll.studio.positions.R;
-import cc.winboll.studio.positions.models.PositionModel;
-import cc.winboll.studio.positions.models.PositionTaskModel;
-import cc.winboll.studio.positions.views.PositionTaskListView;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Timer;
-import java.util.TimerTask;
-import cc.winboll.studio.positions.utils.NotificationUtils;
-
-public class PositionAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-    // 常量定义（不变）
-    public static final String TAG = "PositionAdapter";
-    private static final int VIEW_TYPE_SIMPLE = 1;
-    private static final int VIEW_TYPE_EDIT = 2;
-    private static final long REFRESH_INTERVAL = 5000;
-    private static final String DEFAULT_TASK_DESC = "新位置任务";
-    private static final int DEFAULT_TASK_DISTANCE = 100;
-
-    // 核心成员变量（新增：1.位置ID→索引映射 2.主线程Handler 3.任务触发标记）
-    private final ArrayList<PositionModel> mPositionList;
-    private final ArrayList<PositionTaskModel> mAllPositionTasks;
-    private final Context mContext;
-    private PositionModel mCurrentGpsPosition;
-    private final Timer mDistanceTimer;
-    private final Handler mMainHandler;
-    private final Map<String, ArrayList<PositionTaskModel>> mPositionTaskMap;
-    private final Map<String, TextView> mVisibleDistanceViews = new HashMap<>();
-    // 新增1：存储“位置ID→列表索引”映射（快速定位位置项，避免遍历）
-    private final Map<String, Integer> mPositionIdToIndexMap = new HashMap<>();
-    // 新增2：主线程Handler（确保UI更新在主线程，避免异常）
-    private final Handler mUiHandler = new Handler(Looper.getMainLooper());
-
-    // 接口回调（不变）
-    public interface OnDeleteClickListener {
-        void onDeleteClick(int position);
-    }
-
-    public interface OnSavePositionClickListener {
-        void onSavePositionClick();
-    }
-
-    public interface OnSavePositionTaskClickListener {
-        void onSavePositionTaskClick();
-    }
-
-    private OnDeleteClickListener mOnDeleteClickListener;
-    private OnSavePositionClickListener mOnSavePositionClickListener;
-    private OnSavePositionTaskClickListener mOnSavePositionTaskClickListener;
-
-    // 构造函数（新增：初始化位置ID→索引映射）
-    public PositionAdapter(Context context, ArrayList<PositionModel> positionList, ArrayList<PositionTaskModel> allPositionTasks) {
-        this.mContext = context;
-        this.mPositionList = (positionList != null) ? positionList : new ArrayList<PositionModel>();
-        this.mAllPositionTasks = (allPositionTasks != null) ? allPositionTasks : new ArrayList<PositionTaskModel>();
-        this.mMainHandler = new Handler(Looper.getMainLooper());
-        this.mDistanceTimer = new Timer();
-        this.mPositionTaskMap = new HashMap<String, ArrayList<PositionTaskModel>>();
-
-        // 初始化任务映射表（不变）
-        for (PositionModel model : mPositionList) {
-            String validPosId = model.getPositionId();
-            ArrayList<PositionTaskModel> matchedTasks = new ArrayList<PositionTaskModel>();
-            for (PositionTaskModel task : this.mAllPositionTasks) {
-                if (task != null && validPosId.equals(task.getPositionId())) {
-                    matchedTasks.add(task);
-                }
-            }
-            mPositionTaskMap.put(validPosId, matchedTasks);
-            // 新增：初始化“位置ID→索引”映射（索引即列表中的位置）
-            mPositionIdToIndexMap.put(validPosId, mPositionList.indexOf(model));
-        }
-
-        // 启动距离刷新定时器（不变）
-        startDistanceRefreshTimer();
-    }
-
-    // 对外API：设置当前GPS位置（不变）
-    public void setCurrentGpsPosition(PositionModel currentGpsPosition) {
-        this.mCurrentGpsPosition = currentGpsPosition;
-    }
-
-    // 对外API：设置监听器（不变）
-    public void setOnDeleteClickListener(OnDeleteClickListener listener) {
-        this.mOnDeleteClickListener = listener;
-    }
-
-    public void setOnSavePositionClickListener(OnSavePositionClickListener listener) {
-        this.mOnSavePositionClickListener = listener;
-    }
-
-    public void setOnSavePositionTaskClickListener(OnSavePositionTaskClickListener listener) {
-        this.mOnSavePositionTaskClickListener = listener;
-    }
-
-    // 对外API：停止定时器（不变）
-    public void stopTimer() {
-        if (mDistanceTimer != null) {
-            mDistanceTimer.cancel();
-            mDistanceTimer.purge();
-        }
-        mVisibleDistanceViews.clear();
-    }
-
-    // ---------------------- 核心修复1：定时器逻辑（仅刷新可见的距离TextView）（不变） ----------------------
-    private void startDistanceRefreshTimer() {
-        mDistanceTimer.scheduleAtFixedRate(new TimerTask() {
-				@Override
-				public void run() {
-					mMainHandler.post(new Runnable() {
-							@Override
-							public void run() {
-								for (Map.Entry<String, TextView> entry : mVisibleDistanceViews.entrySet()) {
-									String positionId = entry.getKey();
-									TextView distanceView = entry.getValue();
-
-									PositionModel targetModel = null;
-									for (PositionModel model : mPositionList) {
-										if (positionId.equals(model.getPositionId())) {
-											targetModel = model;
-											break;
-										}
-									}
-
-									if (targetModel != null) {
-										bindRealDistance(distanceView, targetModel);
-									}
-								}
-								for (PositionTaskModel task : mAllPositionTasks) {
-									if (task.isBingo() && task.isEnable()) {
-										NotificationUtils.show(mContext, task.getTaskId(), task.getPositionId(), task.getTaskDescription());
-									}
-								}
-							}
-						});
-				}
-			}, 0, REFRESH_INTERVAL);
-    }
-
-    // ---------------------- 核心修复2：管理可见/不可见的距离TextView（不变） ----------------------
-    @Override
-    public void onViewAttachedToWindow(@NonNull RecyclerView.ViewHolder holder) {
-        super.onViewAttachedToWindow(holder);
-        int position = holder.getAdapterPosition();
-        if (position < 0 || position >= mPositionList.size()) {
-            return;
-        }
-
-        PositionModel model = mPositionList.get(position);
-        String positionId = model.getPositionId();
-        // 同步更新位置ID→索引映射（防止列表项位置变化导致索引失效）
-        mPositionIdToIndexMap.put(positionId, position);
-
-        TextView distanceView = null;
-        if (holder instanceof SimpleViewHolder) {
-            distanceView = ((SimpleViewHolder) holder).tvSimpleRealDistance;
-        } else if (holder instanceof EditViewHolder) {
-            distanceView = ((EditViewHolder) holder).tvEditRealDistance;
-        }
-
-        if (distanceView != null) {
-            mVisibleDistanceViews.put(positionId, distanceView);
-        }
-    }
-
-    @Override
-    public void onViewDetachedFromWindow(@NonNull RecyclerView.ViewHolder holder) {
-        super.onViewDetachedFromWindow(holder);
-        int position = holder.getAdapterPosition();
-        if (position < 0 || position >= mPositionList.size()) {
-            return;
-        }
-
-        PositionModel model = mPositionList.get(position);
-        String positionId = model.getPositionId();
-        if (mVisibleDistanceViews.containsKey(positionId)) {
-            mVisibleDistanceViews.remove(positionId);
-        }
-    }
-
-    // ---------------------- RecyclerView 核心方法（不变） ----------------------
-    @Override
-    public int getItemViewType(int position) {
-        PositionModel model = mPositionList.get(position);
-        return model.isSimpleView() ? VIEW_TYPE_SIMPLE : VIEW_TYPE_EDIT;
-    }
-
-    @NonNull
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        LayoutInflater inflater = LayoutInflater.from(mContext);
-        if (viewType == VIEW_TYPE_SIMPLE) {
-            View view = inflater.inflate(R.layout.item_position_simple, parent, false);
-            return new SimpleViewHolder(view);
-        } else {
-            View view = inflater.inflate(R.layout.item_position_edit, parent, false);
-            return new EditViewHolder(view);
-        }
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-        PositionModel model = mPositionList.get(position);
-        // 同步更新位置ID→索引映射（确保索引与当前列表项位置一致）
-        mPositionIdToIndexMap.put(model.getPositionId(), position);
-
-        if (holder instanceof SimpleViewHolder) {
-            bindSimpleView((SimpleViewHolder) holder, model, position);
-        } else if (holder instanceof EditViewHolder) {
-            bindEditView((EditViewHolder) holder, model, position);
-        }
-    }
-
-    @Override
-    public int getItemCount() {
-        return mPositionList.size();
-    }
-
-    // 回收ViewHolder时清理资源（不变）
-    @Override
-    public void onViewRecycled(@NonNull RecyclerView.ViewHolder holder) {
-        super.onViewRecycled(holder);
-        int position = holder.getAdapterPosition();
-        if (position >= 0 && position < mPositionList.size()) {
-            String positionId = mPositionList.get(position).getPositionId();
-            mVisibleDistanceViews.remove(positionId);
-            // 移除已回收位置的索引映射（避免内存泄漏）
-            mPositionIdToIndexMap.remove(positionId);
-        }
-
-        if (holder instanceof SimpleViewHolder) {
-            ((SimpleViewHolder) holder).ptlvSimpleTasks.clearData();
-            ((SimpleViewHolder) holder).ptlvSimpleTasks.setOnTaskUpdatedListener(null);
-        } else if (holder instanceof EditViewHolder) {
-            ((EditViewHolder) holder).ptlvEditTasks.clearData();
-            ((EditViewHolder) holder).ptlvEditTasks.setOnTaskUpdatedListener(null);
-        }
-    }
-
-    // 绑定简单视图（不变）
-    private void bindSimpleView(final SimpleViewHolder holder, final PositionModel model, final int position) {
-        holder.tvSimpleLongitude.setText(String.format("经度：%.6f", model.getLongitude()));
-        holder.tvSimpleLatitude.setText(String.format("纬度：%.6f", model.getLatitude()));
-        holder.tvSimpleMemo.setText(String.format("备注：%s", model.getMemo()));
-        bindRealDistance(holder.tvSimpleRealDistance, model);
-
-        holder.itemView.setOnLongClickListener(new View.OnLongClickListener() {
-				@Override
-				public boolean onLongClick(View v) {
-					PopupMenu popupMenu = new PopupMenu(mContext, v);
-					MenuInflater menuInflater = popupMenu.getMenuInflater();
-					menuInflater.inflate(R.menu.menu_item_edit, popupMenu.getMenu());
-
-					popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
-							@Override
-							public boolean onMenuItemClick(MenuItem item) {
-								if (item.getItemId() == R.id.menu_edit) {
-									model.setIsSimpleView(false);
-									notifyItemChanged(position);
-									return true;
-								}
-								return false;
-							}
-						});
-
-					popupMenu.show();
-					return true;
-				}
-			});
-
-        String currentPosId = model.getPositionId();
-        ArrayList<PositionTaskModel> matchedTasks = getSafeTasks(currentPosId);
-        holder.ptlvSimpleTasks.clearData();
-        holder.ptlvSimpleTasks.setViewStatus(PositionTaskListView.VIEW_MODE_SIMPLE);
-        if (holder.ptlvSimpleTasks.getAllTasks().isEmpty()) {
-            holder.ptlvSimpleTasks.init(matchedTasks, currentPosId);
-        }
-    }
-
-    // 绑定编辑视图（不变）
-    private void bindEditView(final EditViewHolder holder, final PositionModel model, final int position) {
-        holder.tvEditLongitude.setText(String.format("经度：%.6f", model.getLongitude()));
-        holder.tvEditLatitude.setText(String.format("纬度：%.6f", model.getLatitude()));
-        holder.etEditMemo.setText(model.getMemo());
-        holder.etEditMemo.setSelection(holder.etEditMemo.getText().length());
-        bindRealDistance(holder.tvEditRealDistance, model);
-
-        if (model.isEnableRealPositionDistance()) {
-            holder.rgRealDistanceSwitch.check(R.id.rb_enable);
-        } else {
-            holder.rgRealDistanceSwitch.check(R.id.rb_disable);
-        }
-
-        holder.btnEditDelete.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					if (mOnDeleteClickListener != null) {
-						mOnDeleteClickListener.onDeleteClick(position);
-						mPositionTaskMap.remove(model.getPositionId());
-						// 移除删除位置的索引映射
-						mPositionIdToIndexMap.remove(model.getPositionId());
-					}
-				}
-			});
-
-        holder.btnEditCancel.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					model.setIsSimpleView(true);
-					notifyItemChanged(position);
-					holder.etEditMemo.clearFocus();
-				}
-			});
-
-        holder.btnEditConfirm.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					String newMemo = holder.etEditMemo.getText().toString().trim();
-					model.setMemo(newMemo);
-					boolean isEnableDistance = holder.rgRealDistanceSwitch.getCheckedRadioButtonId() == R.id.rb_enable;
-					model.setIsEnableRealPositionDistance(isEnableDistance);
-
-					String currentPosId = model.getPositionId();
-					ArrayList<PositionTaskModel> allTasks = holder.ptlvEditTasks.getAllTasks();
-					ArrayList<PositionTaskModel> boundTasks = new ArrayList<PositionTaskModel>();
-					for (PositionTaskModel task : allTasks) {
-						if (task != null) {
-							task.setPositionId(currentPosId);
-							boundTasks.add(task);
-						}
-					}
-					mPositionTaskMap.put(currentPosId, boundTasks);
-
-					model.setIsSimpleView(true);
-					notifyItemChanged(position);
-					if (mOnSavePositionClickListener != null) {
-						mOnSavePositionClickListener.onSavePositionClick();
-					}
-					Toast.makeText(mContext, "位置信息已保存", Toast.LENGTH_SHORT).show();
-				}
-			});
-
-        final String currentPosId = model.getPositionId();
-        ArrayList<PositionTaskModel> matchedTasks = getSafeTasks(currentPosId);
-        holder.ptlvEditTasks.clearData();
-
-        holder.ptlvEditTasks.setOnTaskUpdatedListener(new PositionTaskListView.OnTaskUpdatedListener() {
-				@Override
-				public void onTaskUpdated(String posId, ArrayList<PositionTaskModel> updatedTasks) {
-					ArrayList<PositionTaskModel> boundTasks = new ArrayList<PositionTaskModel>();
-					for (PositionTaskModel task : updatedTasks) {
-						if (task != null) {
-							task.setPositionId(currentPosId);
-							boundTasks.add(task);
-						}
-					}
-
-					mPositionTaskMap.put(currentPosId, boundTasks);
-					Iterator<PositionTaskModel> taskIterator = mAllPositionTasks.iterator();
-					while (taskIterator.hasNext()) {
-						PositionTaskModel task = taskIterator.next();
-						if (task != null && currentPosId.equals(task.getPositionId())) {
-							taskIterator.remove();
-						}
-					}
-					mAllPositionTasks.addAll(boundTasks);
-
-					if (mOnSavePositionTaskClickListener != null) {
-						mOnSavePositionTaskClickListener.onSavePositionTaskClick();
-					}
-					Toast.makeText(mContext, "任务信息已保存", Toast.LENGTH_SHORT).show();
-				}
-			});
-
-        if (holder.ptlvEditTasks.getAllTasks().isEmpty()) {
-            holder.ptlvEditTasks.init(matchedTasks, currentPosId);
-        }
-        holder.ptlvEditTasks.setViewStatus(PositionTaskListView.VIEW_MODE_EDIT);
-
-        holder.btnAddTask.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					PositionTaskModel newTask = new PositionTaskModel(
-                        PositionTaskModel.genTaskId(),
-                        currentPosId,
-                        DEFAULT_TASK_DESC,
-                        true,
-                        DEFAULT_TASK_DISTANCE,
-                        true
-					);
-
-					ArrayList<PositionTaskModel> currentTasks = getSafeTasks(currentPosId);
-					currentTasks.add(newTask);
-					mPositionTaskMap.put(currentPosId, new ArrayList<PositionTaskModel>(currentTasks));
-					mAllPositionTasks.add(newTask);
-
-					holder.ptlvEditTasks.clearData();
-					holder.ptlvEditTasks.init(currentTasks, currentPosId);
-					holder.ptlvEditTasks.setViewStatus(PositionTaskListView.VIEW_MODE_EDIT);
-					Toast.makeText(mContext, "已新增1个任务（绑定当前位置）", Toast.LENGTH_SHORT).show();
-				}
-			});
-    }
-
-    // 工具方法：绑定实时距离（不变）
-    private void bindRealDistance(TextView distanceView, PositionModel model) {
-        if (!model.isEnableRealPositionDistance()) {
-            distanceView.setText("实时距离：未启用");
-            distanceView.setTextColor(mContext.getResources().getColor(R.color.colorGrayText));
-            return;
-        }
-
-        if (mCurrentGpsPosition == null) {
-			distanceView.setText("实时距离：等待GPS定位");
-			distanceView.setTextColor(mContext.getResources().getColor(R.color.colorGrayText));
-			return;
-		}
-
-		try {
-			double distanceM = PositionModel.calculatePositionDistance(mCurrentGpsPosition, model, false);
-// 设置任务列表触发状态（调用优化后的通知逻辑）
-			bingoTask(model, (int) distanceM);
-			String distanceText = (distanceM < 1000) ?
-				String.format("实时距离：%.1f 米", distanceM) :
-				String.format("实时距离：%.1f 千米", distanceM / 1000);
-			distanceView.setText(distanceText);
-			distanceView.setTextColor(mContext.getResources().getColor(R.color.colorEnableGreen));
-		} catch (IllegalArgumentException e) {
-			distanceView.setText("实时距离：数据无效");
-			distanceView.setTextColor(mContext.getResources().getColor(R.color.colorRed));
-		}
-	}
-
-// ---------------------- 核心优化：bingoTask 任务触发通知逻辑（替换 notifyDataSetChanged()） ----------------------
-	private void bingoTask(PositionModel model, int distanceM) {
-// 1. 标记是否有任务触发（避免无变化时无效更新）
-		boolean hasTaskTriggered = false;
-// 2. 记录当前位置ID（后续精准定位列表项）
-		final String targetPosId = model.getPositionId();
-
-// 遍历当前位置的任务，判断是否触发
-		for (PositionTaskModel task : mAllPositionTasks) {
-			if (targetPosId.equals(task.getPositionId())) {
-// 暂存旧状态（避免重复触发更新）
-				boolean oldBingoState = task.isBingo();
-				boolean newBingoState = false;
-
-// 根据任务条件判断新触发状态
-				if (task.isGreaterThan()) {
-					newBingoState = task.isEnable() && distanceM > task.getDiscussDistance();
-				} else if (task.isLessThan()) {
-					newBingoState = task.isEnable() && distanceM < task.getDiscussDistance();
-				} else {
-					newBingoState = task.isEnable() && true;
-				}
-
-// 仅当状态变化时，才更新任务状态并标记需要通知
-				if (newBingoState != oldBingoState) {
-					task.setIsBingo(newBingoState);
-					hasTaskTriggered = true;
-				}
-			}
-		}
-
-// 3. 仅当有任务触发且状态变化时，才执行精准更新（避免全局刷新）
-		if (hasTaskTriggered) {
-// 切换到主线程更新UI（解决子线程更新异常）
-			mUiHandler.post(new Runnable() {
-					@Override
-					public void run() {
-// 从映射表快速获取位置索引（避免遍历列表，提升效率）
-						Integer targetPosIndex = mPositionIdToIndexMap.get(targetPosId);
-						if (targetPosIndex != null && targetPosIndex >= 0 && targetPosIndex < mPositionList.size()) {
-// 精准更新单个位置项（仅刷新该位置的任务列表，不干扰其他项）
-							notifyItemChanged(targetPosIndex);
-						}
-					}
-				});
-		}
-	}
-
-// 工具方法：安全获取任务列表（不变）
-	private ArrayList getSafeTasks(String positionId) {
-		if (!mPositionTaskMap.containsKey(positionId)) {
-			mPositionTaskMap.put(positionId, new ArrayList());
-		}
-		return mPositionTaskMap.get(positionId);
-	}
-
-// 对外API：新增位置（补充索引映射更新）
-	public void addPosition(PositionModel model) {
-		if (model == null) return;
-		String validPosId = model.getPositionId();
-		mPositionList.add(model);
-// 新增：添加新位置的索引映射（索引为列表最后一位）
-		mPositionIdToIndexMap.put(validPosId, mPositionList.size() - 1);
-
-		if (!mPositionTaskMap.containsKey(validPosId)) {
-			mPositionTaskMap.put(validPosId, new ArrayList());
-		}
-		notifyItemInserted(mPositionList.size() - 1);
-	}
-
-// 对外API：删除位置（补充索引映射清理）
-	public void removePosition(int position) {
-		if (position < 0 || position >= mPositionList.size()) return;
-		PositionModel removedModel = mPositionList.get(position);
-		String removedPosId = removedModel.getPositionId();
-
-// 1. 清理距离缓存和索引映射（新增）
-		mVisibleDistanceViews.remove(removedPosId);
-		mPositionIdToIndexMap.remove(removedPosId);
-
-// 2. 重新同步剩余位置的索引映射（避免删除后索引错位）
-		for (int i = position; i < mPositionList.size(); i++) {
-			PositionModel remainingModel = mPositionList.get(i);
-			mPositionIdToIndexMap.put(remainingModel.getPositionId(), i);
-		}
-
-// 3. 清理全局任务列表和映射表（不变）
-		Iterator taskIterator = mAllPositionTasks.iterator();
-		while (taskIterator.hasNext()) {
-			PositionTaskModel task = (PositionTaskModel)taskIterator.next();
-			if (task != null && removedPosId.equals(task.getPositionId())) {
-				taskIterator.remove();
-			}
-		}
-		mPositionTaskMap.remove(removedPosId);
-		mPositionList.remove(position);
-
-		notifyItemRemoved(position);
-		notifyItemRangeChanged(position, mPositionList.size());
-	}
-
-// 对外API：更新所有位置（补充索引映射同步）
-	public void updateAllPositions(ArrayList<PositionModel> newPositionList) {
-		if (newPositionList == null) return;
-		mPositionList.clear();
-		mPositionList.addAll(newPositionList);
-
-// 1. 清理距离缓存中无效的位置ID（不变）
-		Iterator distanceViewIter = mVisibleDistanceViews.keySet().iterator();
-		while (distanceViewIter.hasNext()) {
-			String posId = (String)distanceViewIter.next();
-			boolean isPosExist = false;
-			for (PositionModel model : newPositionList) {
-				if (posId.equals(model.getPositionId())) {
-					isPosExist = true;
-					break;
-				}
-			}
-			if (!isPosExist) {
-				distanceViewIter.remove();
-			}
-		}
-
-// 2. 清理任务映射表（不变）
-		Iterator taskMapKeyIter = mPositionTaskMap.keySet().iterator();
-		while (taskMapKeyIter.hasNext()) {
-			String posId = (String)taskMapKeyIter.next();
-			boolean isPosExist = false;
-			for (PositionModel model : newPositionList) {
-				if (posId.equals(model.getPositionId())) {
-					isPosExist = true;
-					break;
-				}
-			}
-			if (!isPosExist) {
-				taskMapKeyIter.remove();
-			}
-		}
-
-// 3. 重新初始化索引映射和任务列表（新增索引同步）
-		mPositionIdToIndexMap.clear();
-		for (int i = 0; i < newPositionList.size(); i++) {
-			PositionModel model = (PositionModel)newPositionList.get(i);
-			String posId = model.getPositionId();
-			mPositionIdToIndexMap.put(posId, i); // 同步新列表的索引
-			if (!mPositionTaskMap.containsKey(posId)) {
-				mPositionTaskMap.put(posId, new ArrayList());
-			}
-		}
-
-		notifyDataSetChanged();
-	}
-
-// 对外API：批量切换简单视图（不变）
-	public void switchAllToSimpleView() {
-		for (PositionModel model : mPositionList) {
-			model.setIsSimpleView(true);
-		}
-		notifyDataSetChanged();
-	}
-
-// 对外API：获取位置列表（不变）
-	public ArrayList getPositionList() {
-		return new ArrayList(mPositionList);
-	}
-
-// ---------------------- ViewHolder 定义（不变） ----------------------
-	public static class SimpleViewHolder extends RecyclerView.ViewHolder {
-		TextView tvSimpleLongitude;
-		TextView tvSimpleLatitude;
-		TextView tvSimpleMemo;
-		TextView tvSimpleRealDistance;
-		PositionTaskListView ptlvSimpleTasks;
-
-		public SimpleViewHolder(@NonNull View itemView) {
-			super(itemView);
-			tvSimpleLongitude = (TextView) itemView.findViewById(R.id.tv_simple_longitude);
-			tvSimpleLatitude = (TextView) itemView.findViewById(R.id.tv_simple_latitude);
-			tvSimpleMemo = (TextView) itemView.findViewById(R.id.tv_simple_memo);
-			tvSimpleRealDistance = (TextView) itemView.findViewById(R.id.tv_simple_real_distance);
-			ptlvSimpleTasks = (PositionTaskListView) itemView.findViewById(R.id.ptlv_simple_tasks);
-		}
-	}
-
-	public static class EditViewHolder extends RecyclerView.ViewHolder {
-		TextView tvEditLongitude;
-		TextView tvEditLatitude;
-		EditText etEditMemo;
-		RadioGroup rgRealDistanceSwitch;
-		RadioButton rbDisable;
-		RadioButton rbEnable;
-		Button btnEditDelete;
-		Button btnEditCancel;
-		Button btnEditConfirm;
-		PositionTaskListView ptlvEditTasks;
-		Button btnAddTask;
-		TextView tvEditRealDistance;
-
-		public EditViewHolder(@NonNull View itemView) {
-			super(itemView);
-			tvEditLongitude = (TextView) itemView.findViewById(R.id.tv_edit_longitude);
-			tvEditLatitude = (TextView) itemView.findViewById(R.id.tv_edit_latitude);
-			etEditMemo = (EditText) itemView.findViewById(R.id.et_edit_memo);
-			rgRealDistanceSwitch = (RadioGroup) itemView.findViewById(R.id.rg_real_distance_switch);
-			rbDisable = (RadioButton) itemView.findViewById(R.id.rb_disable);
-			rbEnable = (RadioButton) itemView.findViewById(R.id.rb_enable);
-			btnEditDelete = (Button) itemView.findViewById(R.id.btn_edit_delete);
-			btnEditCancel = (Button) itemView.findViewById(R.id.btn_edit_cancel);
-			btnEditConfirm = (Button) itemView.findViewById(R.id.btn_edit_confirm);
-			ptlvEditTasks = (PositionTaskListView) itemView.findViewById(R.id.ptlv_edit_tasks);
-			btnAddTask = (Button) itemView.findViewById(R.id.btn_add_task);
-			tvEditRealDistance = (TextView) itemView.findViewById(R.id.tv_edit_real_distance);
-		}
-	}
-}
-

positions/src/main/java/cc/winboll/studio/positions/models/PositionModel.java

@@ -1,209 +0,0 @@
-package cc.winboll.studio.positions.models;
-
-/**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/09/29 18:57
- * @Describe 位置数据模型
- */
-import android.util.JsonReader;
-import android.util.JsonWriter;
-import cc.winboll.studio.libappbase.BaseBean;
-import java.io.IOException;
-import java.util.UUID;
-
-public class PositionModel extends BaseBean {
-
-    public static final String TAG = "PositionModel";
-	// 位置唯一标识符（与任务的positionId绑定）
-	String positionId;
-	// 经度（范围：-180~180）
-	double longitude;
-	// 纬度（范围：-90~90）
-	double latitude;
-	// 位置备注（空值时显示“无备注”）
-	String memo;
-	// 是否启用实时距离计算
-	boolean isEnableRealPositionDistance;
-	// 是否显示简单视图（true=简单视图，false=编辑视图）
-	boolean isSimpleView = true;
-
-	// 带参构造（强制初始化位置ID和经纬度）
-	public PositionModel(String positionId, double longitude, double latitude, String memo, boolean isEnableRealPositionDistance) {
-		this.positionId = (positionId == null || positionId.trim().isEmpty()) ? genPositionId() : positionId;
-		this.longitude = Math.max(-180, Math.min(180, longitude)); // 经度范围限制
-		this.latitude = Math.max(-90, Math.min(90, latitude)); // 纬度范围限制
-		this.memo = (memo == null || memo.trim().isEmpty()) ? "无备注" : memo;
-		this.isEnableRealPositionDistance = isEnableRealPositionDistance;
-	}
-
-	// 无参构造（默认值初始化，避免空指针）
-	public PositionModel() {
-		this.positionId = genPositionId();
-		this.longitude = 0.0;
-		this.latitude = 0.0;
-		this.memo = "无备注";
-		this.isEnableRealPositionDistance = false;
-	}
-
-	// ---------------------- Getter/Setter（确保字段有效性） ----------------------
-	public void setPositionId(String positionId) {
-		this.positionId = (positionId == null || positionId.trim().isEmpty()) ? genPositionId() : positionId;
-	}
-
-	public String getPositionId() {
-		return positionId;
-	}
-
-	public void setIsEnableRealPositionDistance(boolean isEnableRealPositionDistance) {
-		this.isEnableRealPositionDistance = isEnableRealPositionDistance;
-	}
-
-	public boolean isEnableRealPositionDistance() {
-		return isEnableRealPositionDistance;
-	}
-
-	public void setIsSimpleView(boolean isSimpleView) {
-		this.isSimpleView = isSimpleView;
-	}
-
-	public boolean isSimpleView() {
-		return isSimpleView;
-	}
-
-	public void setMemo(String memo) {
-		this.memo = (memo == null || memo.trim().isEmpty()) ? "无备注" : memo;
-	}
-
-	public String getMemo() {
-		return memo;
-	}
-
-	public void setLongitude(double longitude) {
-		this.longitude = Math.max(-180, Math.min(180, longitude)); // 限制经度范围
-	}
-
-	public double getLongitude() {
-		return longitude;
-	}
-
-	public void setLatitude(double latitude) {
-		this.latitude = Math.max(-90, Math.min(90, latitude)); // 限制纬度范围
-	}
-
-	public double getLatitude() {
-		return latitude;
-	}
-
-	// ---------------------- 父类方法重写 ----------------------
-	@Override
-	public String getName() {
-		return PositionModel.class.getName();
-	}
-
-	// 生成唯一位置ID（与任务ID格式一致，确保关联匹配）
-	public static String genPositionId() {
-        UUID uniqueUuid = UUID.randomUUID();
-        return uniqueUuid.toString(); // 36位标准UUID（含横杠，确保与任务ID格式统一）
-    }
-
-	// JSON序列化（保存位置数据）
-	@Override
-	public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
-		super.writeThisToJsonWriter(jsonWriter);
-		jsonWriter.name("positionId").value(getPositionId());
-		jsonWriter.name("longitude").value(getLongitude());
-		jsonWriter.name("latitude").value(getLatitude());
-		jsonWriter.name("memo").value(getMemo());
-		jsonWriter.name("isEnableRealPositionDistance").value(isEnableRealPositionDistance());
-	}
-
-	// JSON反序列化（加载位置数据，校验字段）
-	@Override
-	public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
-		if (super.initObjectsFromJsonReader(jsonReader, name)) { 
-			return true; 
-		} else {
-			if (name.equals("positionId")) {
-				setPositionId(jsonReader.nextString());
-			} else if (name.equals("longitude")) {
-				setLongitude(jsonReader.nextDouble());
-			} else if (name.equals("latitude")) {
-				setLatitude(jsonReader.nextDouble());
-			} else if (name.equals("memo")) {
-				setMemo(jsonReader.nextString());
-			} else if (name.equals("isEnableRealPositionDistance")) {
-				setIsEnableRealPositionDistance(jsonReader.nextBoolean());
-			} else {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	// 从JSON读取位置数据
-	@Override
-	public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
-		jsonReader.beginObject();
-		while (jsonReader.hasNext()) {
-			String name = jsonReader.nextName();
-			if (!initObjectsFromJsonReader(jsonReader, name)) {
-				jsonReader.skipValue(); // 跳过未知字段
-			}
-		}
-		jsonReader.endObject();
-		return this;
-	}
-
-	// ---------------------- 核心工具方法：计算两点距离（Haversine公式，确保精度） ----------------------
-	/**
-	 * 计算两个位置之间的直线距离（地球表面最短距离）
-	 * @param position1 第一个位置（非null）
-	 * @param position2 第二个位置（非null）
-	 * @param isKilometer 是否返回千米单位：true→千米，false→米
-	 * @return 距离（保留1位小数，符合显示需求）
-	 * @throws IllegalArgumentException 位置为null或经纬度无效时抛出
-	 */
-	public static double calculatePositionDistance(PositionModel position1, PositionModel position2, boolean isKilometer) {
-		// 1. 校验参数有效性（避免计算异常）
-		if (position1 == null || position2 == null) {
-			throw new IllegalArgumentException("位置对象不能为null");
-		}
-		double lon1 = position1.getLongitude();
-		double lat1 = position1.getLatitude();
-		double lon2 = position2.getLongitude();
-		double lat2 = position2.getLatitude();
-		// 经纬度范围二次校验（确保有效）
-		if (lat1 < -90 || lat1 > 90 || lat2 < -90 || lat2 > 90 
-			|| lon1 < -180 || lon1 > 180 || lon2 < -180 || lon2 > 180) {
-			throw new IllegalArgumentException("经纬度值无效（纬度：-90~90，经度：-180~180）");
-		}
-
-		// 2. Haversine公式计算（地球半径取6371km，行业标准）
-		final double EARTH_RADIUS_KM = 6371;
-		double radLat1 = Math.toRadians(lat1); // 角度转弧度
-		double radLat2 = Math.toRadians(lat2);
-		double radLon1 = Math.toRadians(lon1);
-		double radLon2 = Math.toRadians(lon2);
-
-		double deltaLat = radLat2 - radLat1; // 纬度差
-		double deltaLon = radLon2 - radLon1; // 经度差
-
-		// 核心公式
-		double a = Math.pow(Math.sin(deltaLat / 2), 2) 
-			+ Math.cos(radLat1) * Math.cos(radLat2) 
-			* Math.pow(Math.sin(deltaLon / 2), 2);
-		double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
-		double distanceKm = EARTH_RADIUS_KM * c; // 距离（千米）
-
-		// 3. 单位转换+精度处理（保留1位小数，符合显示需求）
-		double distance;
-		if (isKilometer) {
-			distance = Math.round(distanceKm * 10.0) / 10.0; // 千米→1位小数
-		} else {
-			distance = Math.round(distanceKm * 1000 * 10.0) / 10.0; // 米→1位小数
-		}
-
-		return distance;
-	}
-}
-

positions/src/main/java/cc/winboll/studio/positions/models/PositionTaskModel.java

@@ -1,192 +0,0 @@
-package cc.winboll.studio.positions.models;
-
-/**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/09/30 02:48
- * @Describe 位置任务数据模型
- */
-import android.util.JsonReader;
-import android.util.JsonWriter;
-import cc.winboll.studio.libappbase.BaseBean;
-import java.io.IOException;
-import java.util.UUID;
-
-public class PositionTaskModel extends BaseBean {
-    
-    public static final String TAG = "PositionTaskModel";
-    // 任务标识符（唯一）
-	String taskId;
-	// 绑定的位置标识符（与PositionModel的positionId一一对应）
-	String positionId;
-	// 任务描述
-	String taskDescription;
-	// 任务距离条件：是否大于设定距离
-	boolean isGreaterThan;
-	// 任务距离条件：是否小于设定距离（与isGreaterThan互斥）
-	boolean isLessThan;
-	// 任务条件距离（单位：米）
-	int discussDistance;
-	// 任务是否已触发
-	boolean isBingo = false;
-	// 是否启用任务
-	boolean isEnable;
-
-	// 带参构造（强制传入positionId，确保任务与位置绑定）
-	public PositionTaskModel(String taskId, String positionId, String taskDescription, boolean isGreaterThan, int discussDistance, boolean isEnable) {
-		this.taskId = (taskId == null || taskId.trim().isEmpty()) ? genTaskId() : taskId; // 空ID自动生成
-		this.positionId = positionId; // 强制绑定位置ID
-		this.taskDescription = (taskDescription == null || taskDescription.trim().isEmpty()) ? "新任务" : taskDescription;
-		this.isGreaterThan = isGreaterThan;
-		this.isLessThan = !isGreaterThan; // 确保互斥
-		this.discussDistance = Math.max(discussDistance, 1); // 距离最小1米，避免无效值
-		this.isEnable = isEnable;
-	}
-	
-	// 无参构造（初始化默认值，positionId需后续设置）
-	public PositionTaskModel() {
-		this.taskId = genTaskId();
-		this.positionId = "";
-		this.taskDescription = "新任务";
-		this.isGreaterThan = true;
-		this.isLessThan = false; // 初始互斥
-		this.discussDistance = 100; // 默认100米
-		this.isEnable = true;
-	}
-
-	public void setIsBingo(boolean isBingo) {
-		this.isBingo = isBingo;
-	}
-
-	public boolean isBingo() {
-		return isBingo;
-	}
-
-	// ---------------------- Getter/Setter（确保positionId不为空，距离有效） ----------------------
-	public void setTaskId(String taskId) {
-		this.taskId = (taskId == null || taskId.trim().isEmpty()) ? genTaskId() : taskId;
-	}
-
-	public String getTaskId() {
-		return taskId;
-	}
-
-	public void setPositionId(String positionId) {
-		this.positionId = (positionId == null || positionId.trim().isEmpty()) ? "" : positionId; // 空值防护
-	}
-
-	public String getPositionId() {
-		return positionId;
-	}
-
-	public void setTaskDescription(String taskDescription) {
-		this.taskDescription = (taskDescription == null || taskDescription.trim().isEmpty()) ? "新任务" : taskDescription;
-	}
-
-	public String getTaskDescription() {
-		return taskDescription;
-	}
-
-	// 修复：确保isGreaterThan和isLessThan互斥
-	public void setIsGreaterThan(boolean isGreaterThan) {
-		this.isGreaterThan = isGreaterThan;
-		this.isLessThan = !isGreaterThan; // 关键：小于 = 非大于
-	}
-
-	public boolean isGreaterThan() {
-		return isGreaterThan;
-	}
-
-	// 修复：确保isLessThan和isGreaterThan互斥
-	public void setIsLessThan(boolean isLessThan) {
-		this.isLessThan = isLessThan;
-		this.isGreaterThan = !isLessThan; // 关键：大于 = 非小于
-	}
-
-	public boolean isLessThan() {
-		return isLessThan;
-	}
-
-	public void setDiscussDistance(int discussDistance) {
-		this.discussDistance = Math.max(discussDistance, 1); // 距离最小1米，避免0或负数
-	}
-
-	public int getDiscussDistance() {
-		return discussDistance;
-	}
-
-	public void setIsEnable(boolean isEnable) {
-		this.isEnable = isEnable;
-	}
-
-	public boolean isEnable() {
-		return isEnable;
-	}
-
-	// ---------------------- 父类方法重写 ----------------------
-	@Override
-	public String getName() {
-		return PositionTaskModel.class.getName();
-	}
-	
-	// 生成唯一任务ID（与PositionModel保持一致格式）
-	public static String genTaskId() {
-        UUID uniqueUuid = UUID.randomUUID();
-        return uniqueUuid.toString(); // 36位标准UUID（含横杠，确保唯一）
-    }
-
-	// JSON序列化（保存任务数据，包含所有字段）
-	@Override
-	public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
-		super.writeThisToJsonWriter(jsonWriter);
-		jsonWriter.name("taskId").value(getTaskId());
-		jsonWriter.name("positionId").value(getPositionId());
-		jsonWriter.name("taskDescription").value(getTaskDescription());
-		jsonWriter.name("isGreaterThan").value(isGreaterThan());
-		jsonWriter.name("isLessThan").value(isLessThan());
-		jsonWriter.name("discussDistance").value(getDiscussDistance());
-		jsonWriter.name("isEnable").value(isEnable());
-	}
-
-	// JSON反序列化（加载任务数据，校验字段有效性）
-	@Override
-	public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
-		if (super.initObjectsFromJsonReader(jsonReader, name)) { 
-			return true; 
-		} else {
-			if (name.equals("taskId")) {
-				setTaskId(jsonReader.nextString());
-			} else if (name.equals("positionId")) {
-				setPositionId(jsonReader.nextString());
-			} else if (name.equals("taskDescription")) {
-				setTaskDescription(jsonReader.nextString());
-			} else if (name.equals("isGreaterThan")) {
-				setIsGreaterThan(jsonReader.nextBoolean());
-			} else if (name.equals("isLessThan")) {
-				setIsLessThan(jsonReader.nextBoolean());
-			} else if (name.equals("discussDistance")) {
-				setDiscussDistance(jsonReader.nextInt());
-			} else if (name.equals("isEnable")) {
-				setIsEnable(jsonReader.nextBoolean());
-			} else {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	// 从JSON读取任务数据（确保反序列化完整）
-	@Override
-	public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
-		jsonReader.beginObject();
-		while (jsonReader.hasNext()) {
-			String name = jsonReader.nextName();
-			if (!initObjectsFromJsonReader(jsonReader, name)) {
-				jsonReader.skipValue(); // 跳过未知字段，避免崩溃
-			}
-		}
-		jsonReader.endObject();
-		return this;
-	}
-    
-}
-

positions/src/main/java/cc/winboll/studio/positions/utils/NotificationUtils.java

@@ -1,130 +0,0 @@
-package cc.winboll.studio.positions.utils;
-
-/**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/09/30 16:09
- * @Describe NotificationUtils
- */
-import android.app.Notification;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Build;
-import androidx.core.app.NotificationCompat;
-import cc.winboll.studio.positions.R;
-import cc.winboll.studio.positions.activities.LocationActivity; // 替换为你实际的LocationActivity路径
-
-/**
- * 通知栏工具类：专注于任务相关通知的显示与点击跳转
- * 核心功能：显示任务描述通知，点击后携带positionId/taskId跳转到LocationActivity
- */
-public class NotificationUtils {
-	public static final String TAG = "NotificationUtils";
-	// 1. 通知渠道ID（适配Android O及以上，必须唯一）
-	private static final String TASK_NOTIFICATION_CHANNEL_ID = "task_notification_channel_01";
-	// 2. 通知渠道名称（用户在系统设置中看到的名称）
-	private static final String TASK_NOTIFICATION_CHANNEL_NAME = "任务通知";
-	// 3. 通知ID（确保每次显示通知的ID唯一，这里用taskId哈希值避免重复）
-	private static int getNotificationId(String taskId) {
-		// 用taskId生成唯一ID（避免不同任务通知相互覆盖）
-		return taskId.hashCode() & 0xFFFFFF; // 限制ID在0-16777215范围内（系统推荐）
-	}
-
-	/**
-	 * 显示任务通知
-	 * @param context 上下文（如Activity/Fragment，确保非空）
-	 * @param taskId 任务ID（用于跳转传递+生成唯一通知ID）
-	 * @param positionId 位置ID（用于跳转传递给LocationActivity）
-	 * @param taskDescription 通知显示内容（仅展示该文本给用户）
-	 */
-	public static void show(Context context, String taskId, String positionId, String taskDescription) {
-		// 安全校验：避免空指针（上下文/必要参数为空时不执行）
-		if (context == null || taskId == null || positionId == null) {
-			return;
-		}
-
-		// 步骤1：初始化通知管理器（系统服务，负责发送/取消通知）
-		NotificationManager notificationManager = 
-			(NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-		if (notificationManager == null) {
-			return;
-		}
-
-		// 步骤2：创建通知渠道（Android O及以上必须，否则通知不显示）
-		createNotificationChannel(notificationManager);
-
-		// 步骤3：构建“点击通知跳转”的Intent（携带positionId和taskId）
-		Intent jumpIntent = new Intent(context, LocationActivity.class);
-		// 传递参数：用Intent的Extra携带ID（键名建议定义为常量，避免拼写错误）
-		jumpIntent.putExtra("EXTRA_POSITION_ID", positionId);
-		jumpIntent.putExtra("EXTRA_TASK_ID", taskId);
-		// 配置Intent：清除栈内旧Activity，确保跳转后是最新页面（根据需求调整）
-		jumpIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
-
-		// 步骤4：创建PendingIntent（授权系统在用户点击通知时执行jumpIntent）
-		// 注意：PendingIntent.FLAG_UPDATE_CURRENT 确保参数更新时覆盖旧Intent
-		PendingIntent pendingIntent = PendingIntent.getActivity(
-			context,
-			getNotificationId(taskId), // 请求码：与通知ID一致，确保唯一
-			jumpIntent,
-			Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? 
-			PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT : 
-			PendingIntent.FLAG_UPDATE_CURRENT
-		);
-
-		// 步骤5：构建通知内容（仅显示taskDescription，样式简洁）
-		Notification notification = new NotificationCompat.Builder(context, TASK_NOTIFICATION_CHANNEL_ID)
-			.setSmallIcon(R.mipmap.ic_launcher) // 通知小图标（必须设置，建议用应用图标）
-			.setContentTitle("任务提醒") // 通知标题（固定，用户快速识别通知类型）
-			.setContentText(taskDescription) // 通知内容（仅显示传入的任务描述）
-			.setContentIntent(pendingIntent) // 绑定点击跳转事件
-			.setAutoCancel(true) // 点击通知后自动消失（符合用户习惯）
-			.setPriority(NotificationCompat.PRIORITY_DEFAULT) // 通知优先级（默认，不抢占焦点）
-			.setDefaults(NotificationCompat.DEFAULT_SOUND) // 默认提示音（可选，根据需求关闭）
-			.build();
-
-		// 步骤6：发送通知（用唯一ID确保不同任务通知不覆盖）
-		notificationManager.notify(getNotificationId(taskId), notification);
-	}
-
-	/**
-	 * 创建通知渠道（Android O/API 26及以上必须）
-	 * 作用：用户可在系统设置中管理该渠道的通知（如关闭声音/屏蔽）
-	 */
-	private static void createNotificationChannel(NotificationManager notificationManager) {
-		// 仅在Android O及以上执行（低版本不需要渠道）
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-			// 配置渠道：重要性为“默认”（不弹窗，仅通知栏显示+提示音）
-			NotificationChannel channel = new NotificationChannel(
-				TASK_NOTIFICATION_CHANNEL_ID,
-				TASK_NOTIFICATION_CHANNEL_NAME,
-				NotificationManager.IMPORTANCE_DEFAULT
-			);
-			// 可选：配置渠道其他属性（根据需求调整）
-			channel.setDescription("接收任务相关提醒，点击可查看任务详情"); // 渠道描述（系统设置中显示）
-			channel.enableVibration(true); // 是否震动（默认开启，可关闭）
-			channel.setVibrationPattern(new long[]{0, 300}); // 震动模式（0延迟，震动300ms）
-
-			// 注册渠道到系统（仅需注册一次，重复注册会覆盖旧配置）
-			notificationManager.createNotificationChannel(channel);
-		}
-	}
-
-	/**
-	 * （可选）取消指定任务的通知
-	 * 场景：任务完成后关闭已显示的通知（如bingo状态取消后）
-	 */
-	public static void cancel(Context context, String taskId) {
-		if (context == null || taskId == null) {
-			return;
-		}
-		NotificationManager notificationManager = 
-			(NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-		if (notificationManager != null) {
-			notificationManager.cancel(getNotificationId(taskId));
-		}
-	}
-}
-

positions/src/main/java/cc/winboll/studio/positions/views/PositionTaskListView.java

@@ -1,416 +0,0 @@
-package cc.winboll.studio.positions.views;
-
-/**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/09/30 08:09
- * @Describe 位置任务列表视图（支持简单/编辑模式，含 isBingo 红点标识）
- */
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.CompoundButton;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.RadioButton;
-import android.widget.RadioGroup;
-import android.widget.TextView;
-import android.widget.Toast;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import cc.winboll.studio.positions.R;
-import cc.winboll.studio.positions.models.PositionTaskModel;
-import java.util.ArrayList;
-import java.util.List;
-
-public class PositionTaskListView extends LinearLayout {
-    // 视图模式常量
-    public static final int VIEW_MODE_SIMPLE = 1;
-    public static final int VIEW_MODE_EDIT = 2;
-
-    // 核心成员变量
-    private String mBindPositionId;
-    private ArrayList<PositionTaskModel> mTaskList;
-    private int mCurrentViewMode;
-    private TaskListAdapter mTaskAdapter;
-    private RecyclerView mRvTasks;
-
-    // 任务修改回调接口
-    public interface OnTaskUpdatedListener {
-        void onTaskUpdated(String positionId, ArrayList<PositionTaskModel> updatedTasks);
-    }
-
-    private OnTaskUpdatedListener mOnTaskUpdatedListener;
-
-    // ---------------------- 构造函数 ----------------------
-    public PositionTaskListView(Context context) {
-        super(context);
-        initView(context);
-    }
-
-    public PositionTaskListView(Context context, @Nullable AttributeSet attrs) {
-        super(context, attrs);
-        initView(context);
-    }
-
-    public PositionTaskListView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        initView(context);
-    }
-
-    // 初始化视图（绑定控件+设置布局）
-    private void initView(Context context) {
-        setOrientation(VERTICAL);
-        LayoutInflater.from(context).inflate(R.layout.view_position_task_list, this, true);
-
-        mRvTasks = (RecyclerView) findViewById(R.id.rv_position_tasks);
-        mRvTasks.setLayoutManager(new LinearLayoutManager(context));
-
-        mTaskList = new ArrayList<PositionTaskModel>();
-        mTaskAdapter = new TaskListAdapter(mTaskList);
-        mRvTasks.setAdapter(mTaskAdapter);
-
-        mCurrentViewMode = VIEW_MODE_SIMPLE;
-    }
-
-    // ---------------------- 对外API ----------------------
-    public void init(ArrayList<PositionTaskModel> taskList, String positionId) {
-        this.mBindPositionId = positionId;
-        if (this.mTaskList.isEmpty()) {
-            ArrayList<PositionTaskModel> matchedTasks = new ArrayList<PositionTaskModel>();
-            if (taskList != null && !taskList.isEmpty()) {
-                for (PositionTaskModel task : taskList) {
-                    if (task != null && positionId.equals(task.getPositionId())) {
-                        matchedTasks.add(task);
-                    }
-                }
-            }
-            mTaskList.clear();
-            mTaskList.addAll(matchedTasks);
-        }
-        mTaskAdapter.notifyDataSetChanged();
-    }
-
-    public void setViewStatus(int viewMode) {
-        if (viewMode != VIEW_MODE_SIMPLE && viewMode != VIEW_MODE_EDIT) {
-            return;
-        }
-        mCurrentViewMode = viewMode;
-        mTaskAdapter.notifyDataSetChanged();
-    }
-
-    public void setOnTaskUpdatedListener(OnTaskUpdatedListener listener) {
-        this.mOnTaskUpdatedListener = listener;
-    }
-
-    public ArrayList<PositionTaskModel> getAllTasks() {
-        return new ArrayList<PositionTaskModel>(mTaskList);
-    }
-
-    public void clearData() {
-        mTaskList.clear();
-        if (mTaskAdapter != null && mTaskAdapter.mData != null) {
-            mTaskAdapter.mData.clear();
-        }
-        mTaskAdapter.notifyDataSetChanged();
-        mBindPositionId = null;
-    }
-
-    public void triggerTaskSync() {
-        if (mOnTaskUpdatedListener != null && mBindPositionId != null) {
-            mOnTaskUpdatedListener.onTaskUpdated(mBindPositionId, new ArrayList<PositionTaskModel>(mTaskList));
-        }
-    }
-
-    // ---------------------- 内部工具方法 ----------------------
-    private boolean isTaskMatchedWithPosition(PositionTaskModel task) {
-        if (task == null || mBindPositionId == null || mBindPositionId.trim().isEmpty()) {
-            return false;
-        }
-        return mBindPositionId.equals(task.getPositionId());
-    }
-
-    // ---------------------- 内部Adapter：适配 isBingo 红点（核心调整） ----------------------
-    private class TaskListAdapter extends RecyclerView.Adapter<TaskListAdapter.TaskViewHolder> {
-        private final List<PositionTaskModel> mData;
-
-        public TaskListAdapter(List<PositionTaskModel> data) {
-            this.mData = data;
-        }
-
-        @Override
-        public int getItemCount() {
-            return mData.isEmpty() ? 1 : mData.size();
-        }
-
-        // 调整：根据“是否空列表”+“视图模式”区分视图类型（确保简单/编辑模式加载对应布局）
-        @Override
-        public int getItemViewType(int position) {
-            if (mData.isEmpty()) {
-                return 0; // 0=空提示
-            } else {
-                return mCurrentViewMode; // 1=简单模式，2=编辑模式（复用视图模式常量）
-            }
-        }
-
-        // 调整：按视图类型加载布局（简单模式加载带红点的布局，编辑模式加载原有布局）
-        @NonNull
-        @Override
-        public TaskViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-            Context context = parent.getContext();
-            LayoutInflater inflater = LayoutInflater.from(context);
-
-            if (viewType == 0) {
-                // 空提示布局
-                View emptyView = inflater.inflate(R.layout.item_task_empty, parent, false);
-                return new EmptyViewHolder(emptyView);
-            } else if (viewType == VIEW_MODE_SIMPLE) {
-                // 简单模式布局（带 isBingo 红点）
-                View simpleTaskView = inflater.inflate(R.layout.item_position_task_simple, parent, false);
-                return new SimpleTaskViewHolder(simpleTaskView);
-            } else {
-                // 编辑模式布局（原有布局不变）
-                View editTaskView = inflater.inflate(R.layout.item_task_content, parent, false);
-                return new TaskContentViewHolder(editTaskView);
-            }
-        }
-
-        // 调整：按视图类型绑定数据（简单模式绑定红点+文本，编辑模式绑定原有逻辑）
-        @Override
-        public void onBindViewHolder(@NonNull TaskViewHolder holder, int position) {
-            // 空提示处理（不变）
-            if (holder instanceof EmptyViewHolder) {
-                EmptyViewHolder emptyHolder = (EmptyViewHolder) holder;
-                TextView tvEmptyTip = (TextView) emptyHolder.itemView.findViewById(R.id.tv_task_empty_tip);
-                tvEmptyTip.setText(mCurrentViewMode == VIEW_MODE_EDIT ? "暂无任务，点击\"添加新任务\"创建" : "暂无启用的任务");
-                return;
-            }
-
-            // 任务项有效性校验（不变）
-            if (position >= mData.size()) {
-                return;
-            }
-            final PositionTaskModel task = mData.get(position);
-            if (task == null) {
-                return;
-            }
-
-            // 简单模式：绑定红点（isBingo）和文本数据
-            if (holder instanceof SimpleTaskViewHolder) {
-                SimpleTaskViewHolder simpleHolder = (SimpleTaskViewHolder) holder;
-                // 绑定任务描述
-                simpleHolder.tvSimpleTaskDesc.setText(String.format("任务：%s", task.getTaskDescription()));
-                // 绑定距离条件
-                String distanceCond = task.isGreaterThan() ? "大于" : "小于";
-                simpleHolder.tvSimpleDistanceCond.setText(String.format("条件：距离 %s %d 米", distanceCond, task.getDiscussDistance()));
-                // 绑定启用状态
-                simpleHolder.tvSimpleIsEnable.setText(task.isEnable() ? "状态：已启用" : "状态：已禁用");
-                // 核心：根据 isBingo 控制红点显示（true=显示，false=隐藏）
-                simpleHolder.vBingoDot.setVisibility(task.isBingo() ? View.VISIBLE : View.GONE);
-            }
-            // 编辑模式：沿用原有绑定逻辑（核心修复在此处）
-            else if (holder instanceof TaskContentViewHolder) {
-                TaskContentViewHolder contentHolder = (TaskContentViewHolder) holder;
-                bindTaskData(contentHolder, task, position);
-            }
-        }
-
-        // ---------------------- 核心修复：编辑模式绑定逻辑（解决布局中通知异常） ----------------------
-        private void bindTaskData(final TaskContentViewHolder holder, final PositionTaskModel task, final int position) {
-            String taskDesc = (task.getTaskDescription() == null) ? "未设置描述" : task.getTaskDescription();
-            holder.tvTaskDesc.setText(String.format("任务：%s", taskDesc));
-
-            String distanceCondition = task.isGreaterThan() ? "大于" : "小于";
-            holder.tvTaskDistance.setText(String.format("条件：%s %d 米", distanceCondition, task.getDiscussDistance()));
-
-            // 修复点1：先移除开关监听，再设置状态（避免设值时触发回调导致异常）
-            holder.cbTaskEnable.setOnCheckedChangeListener(null);
-            holder.cbTaskEnable.setChecked(task.isEnable());
-            holder.cbTaskEnable.setEnabled(mCurrentViewMode == VIEW_MODE_EDIT);
-
-            if (mCurrentViewMode == VIEW_MODE_EDIT) {
-                holder.btnEditTask.setVisibility(View.VISIBLE);
-                holder.btnDeleteTask.setVisibility(View.VISIBLE);
-
-                // 删除按钮逻辑（不变，本身在点击时执行，不涉及布局中通知）
-                holder.btnDeleteTask.setOnClickListener(new View.OnClickListener() {
-						@Override
-						public void onClick(View v) {
-							mData.remove(position);
-							notifyItemRemoved(position);
-							notifyItemRangeChanged(position, mData.size());
-							if (mOnTaskUpdatedListener != null && mBindPositionId != null) {
-								mOnTaskUpdatedListener.onTaskUpdated(mBindPositionId, new ArrayList<PositionTaskModel>(mData));
-							}
-							Toast.makeText(getContext(), "任务已删除", Toast.LENGTH_SHORT).show();
-						}
-					});
-
-                // 编辑按钮逻辑（不变，弹窗保存时修复通知时机）
-                holder.btnEditTask.setOnClickListener(new View.OnClickListener() {
-						@Override
-						public void onClick(View v) {
-							showTaskEditDialog(task, position);
-						}
-					});
-
-                // 修复点2：开关监听-用 RecyclerView.post 延迟执行 notify（避免布局中调用）
-                holder.cbTaskEnable.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-						@Override
-						public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-							task.setIsEnable(isChecked); // 先更新数据源（必须执行）
-							// 关键：通过 mRvTasks.post 延迟通知，确保在布局计算/滚动结束后执行
-							mRvTasks.post(new Runnable() {
-									@Override
-									public void run() {
-										notifyItemChanged(position);
-										if (mOnTaskUpdatedListener != null && mBindPositionId != null) {
-											mOnTaskUpdatedListener.onTaskUpdated(mBindPositionId, new ArrayList<PositionTaskModel>(mData));
-										}
-									}
-								});
-						}
-					});
-            } else {
-                holder.btnEditTask.setVisibility(View.GONE);
-                holder.btnDeleteTask.setVisibility(View.GONE);
-                holder.cbTaskEnable.setOnCheckedChangeListener(null);
-            }
-        }
-
-        // ---------------------- 修复：编辑弹窗保存逻辑（延迟通知，避免极端场景异常） ----------------------
-        private void showTaskEditDialog(final PositionTaskModel task, final int position) {
-            final Context context = getContext();
-            View dialogView = LayoutInflater.from(context).inflate(R.layout.dialog_edit_task, null);
-
-            final EditText etEditDesc = (EditText) dialogView.findViewById(R.id.et_edit_task_desc);
-            final RadioGroup rgDistanceCondition = (RadioGroup) dialogView.findViewById(R.id.rg_distance_condition);
-            final EditText etEditDistance = (EditText) dialogView.findViewById(R.id.et_edit_distance);
-            Button btnCancel = (Button) dialogView.findViewById(R.id.btn_dialog_cancel);
-            Button btnSave = (Button) dialogView.findViewById(R.id.btn_dialog_save);
-
-            etEditDesc.setText(task.getTaskDescription());
-            etEditDesc.setSelection(etEditDesc.getText().length());
-
-            if (task.isGreaterThan()) {
-                rgDistanceCondition.check(R.id.rb_greater_than);
-            } else {
-                rgDistanceCondition.check(R.id.rb_less_than);
-            }
-
-            etEditDistance.setText(String.valueOf(task.getDiscussDistance()));
-
-            final android.app.AlertDialog dialog = new android.app.AlertDialog.Builder(context)
-				.setView(dialogView)
-				.create();
-            dialog.show();
-
-            btnCancel.setOnClickListener(new View.OnClickListener() {
-					@Override
-					public void onClick(View v) {
-						dialog.dismiss();
-					}
-				});
-
-            btnSave.setOnClickListener(new View.OnClickListener() {
-					@Override
-					public void onClick(View v) {
-						String newDesc = etEditDesc.getText().toString().trim();
-						String distanceStr = etEditDistance.getText().toString().trim();
-
-						if (distanceStr.isEmpty()) {
-							Toast.makeText(context, "请输入有效距离", Toast.LENGTH_SHORT).show();
-							return;
-						}
-
-						int newDistance;
-						try {
-							newDistance = Integer.parseInt(distanceStr);
-							if (newDistance < 1) {
-								Toast.makeText(context, "距离不能小于1米", Toast.LENGTH_SHORT).show();
-								return;
-							}
-						} catch (NumberFormatException e) {
-							Toast.makeText(context, "距离请输入数字", Toast.LENGTH_SHORT).show();
-							return;
-						}
-
-						task.setTaskDescription(newDesc);
-						task.setDiscussDistance(newDistance);
-						boolean isGreater = rgDistanceCondition.getCheckedRadioButtonId() == R.id.rb_greater_than;
-						task.setIsGreaterThan(isGreater);
-						task.setPositionId(mBindPositionId);
-
-						// 修复点3：弹窗保存后延迟通知（同开关逻辑，避免列表滚动时异常）
-						mRvTasks.post(new Runnable() {
-								@Override
-								public void run() {
-									notifyItemChanged(position);
-									if (mOnTaskUpdatedListener != null && mBindPositionId != null) {
-										mOnTaskUpdatedListener.onTaskUpdated(mBindPositionId, new ArrayList<PositionTaskModel>(mData));
-									}
-								}
-							});
-
-						dialog.dismiss();
-						Toast.makeText(context, "任务已更新", Toast.LENGTH_SHORT).show();
-					}
-				});
-        }
-
-        // ---------------------- ViewHolder 定义（完全不变） ----------------------
-        // 基础抽象 ViewHolder（不变）
-        public abstract class TaskViewHolder extends RecyclerView.ViewHolder {
-            public TaskViewHolder(@NonNull View itemView) {
-                super(itemView);
-            }
-        }
-
-        // 空提示 Holder（不变）
-        public class EmptyViewHolder extends TaskViewHolder {
-            public EmptyViewHolder(@NonNull View itemView) {
-                super(itemView);
-            }
-        }
-
-        // 新增：简单模式 Holder（绑定带红点的布局控件）
-        public class SimpleTaskViewHolder extends TaskViewHolder {
-            TextView tvSimpleTaskDesc;    // 任务描述
-            TextView tvSimpleDistanceCond;// 距离条件
-            TextView tvSimpleIsEnable;    // 启用状态
-            View vBingoDot;               // isBingo 红点控件
-
-            public SimpleTaskViewHolder(@NonNull View itemView) {
-                super(itemView);
-                // 绑定简单模式布局中的控件（与 item_task_simple.xml 完全对应）
-                tvSimpleTaskDesc = itemView.findViewById(R.id.tv_simple_task_desc);
-                tvSimpleDistanceCond = itemView.findViewById(R.id.tv_simple_distance_cond);
-                tvSimpleIsEnable = itemView.findViewById(R.id.tv_simple_is_enable);
-                vBingoDot = itemView.findViewById(R.id.v_bingo_dot);
-            }
-        }
-
-        // 编辑模式 Holder（原有逻辑，完全不变）
-        public class TaskContentViewHolder extends TaskViewHolder {
-            TextView tvTaskDesc;
-            TextView tvTaskDistance;
-            CompoundButton cbTaskEnable;
-            Button btnEditTask;
-            Button btnDeleteTask;
-
-            public TaskContentViewHolder(@NonNull View itemView) {
-                super(itemView);
-                tvTaskDesc = (TextView) itemView.findViewById(R.id.tv_task_desc);
-                tvTaskDistance = (TextView) itemView.findViewById(R.id.tv_task_distance);
-                cbTaskEnable = (CompoundButton) itemView.findViewById(R.id.cb_task_enable);
-                btnEditTask = (Button) itemView.findViewById(R.id.btn_edit_task);
-                btnDeleteTask = (Button) itemView.findViewById(R.id.btn_delete_task);
-            }
-        }
-    }
-}
-

positions/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -1,34 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-    <path
-        android:fillType="evenOdd"
-        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="78.5885"
-                android:endY="90.9159"
-                android:startX="48.7653"
-                android:startY="61.0927"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1" />
-</vector>

positions/src/main/res/drawable/bg_bingo_dot.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">  <!-- 形状：圆形 -->
-    <solid android:color="#FF4444"/>  <!-- 填充色：亮红色（可调整色值） -->
-    <stroke
-        android:width="1dp"
-        android:color="#FFFFFF"/>
-</shape>

positions/src/main/res/drawable/bg_task_item.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="4dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/gray" />
-
-    <padding
-        android:left="8dp"
-        android:top="8dp"
-        android:right="8dp"
-        android:bottom="8dp" />
-
-</shape>
-

positions/src/main/res/drawable/btn_cancel_bg.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- 按压状态（加深灰色） -->
-    <item android:state_pressed="true">
-        <shape android:shape="rectangle">
-            <solid android:color="#666666"/>
-            <corners android:radius="4dp"/>
-        </shape>
-    </item>
-    <!-- 默认状态（浅灰色） -->
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="#999999"/>
-            <corners android:radius="4dp"/>
-        </shape>
-    </item>
-</selector>
-

positions/src/main/res/drawable/btn_confirm_bg.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- 按压状态（加深蓝色） -->
-    <item android:state_pressed="true">
-        <shape android:shape="rectangle">
-            <solid android:color="#303F9F"/>
-            <corners android:radius="4dp"/>
-        </shape>
-    </item>
-    <!-- 默认状态（标准蓝色） -->
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="#3F51B5"/>
-            <corners android:radius="4dp"/>
-        </shape>
-    </item>
-</selector>
-

positions/src/main/res/drawable/btn_delete_bg.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <shape android:shape="rectangle">
-            <solid android:color="#D32F2F"/>
-            <corners android:radius="4dp"/>
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="#F44336"/>
-            <corners android:radius="4dp"/>
-        </shape>
-    </item>
-</selector>
-

positions/src/main/res/drawable/circle_button_bg.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 圆形按钮背景：默认青色，按压时深色 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- 按钮按压状态（深色，增强交互反馈） -->
-    <item android:state_pressed="true">
-        <shape android:shape="oval"> <!-- oval=圆形 -->
-            <solid android:color="#0F9D58"/> <!-- 按压时颜色：深青色（接近Google绿，美观且醒目） -->
-            <stroke android:width="1dp" android:color="#0F9D58"/> <!-- 边框颜色与背景一致，避免白边 -->
-        </shape>
-    </item>
-
-    <!-- 按钮默认状态（青色） -->
-    <item>
-        <shape android:shape="oval">
-            <solid android:color="#14C38E"/> <!-- 默认颜色：亮青色（视觉舒适，符合悬浮按钮风格） -->
-            <stroke android:width="1dp" android:color="#14C38E"/>
-        </shape>
-    </item>
-
-</selector>

positions/src/main/res/drawable/edittext_bg.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="true">
-        <shape android:shape="rectangle">
-            <solid android:color="#FFFFFF"/>
-            <stroke android:width="1.5dp" android:color="#4A90E2"/>
-            <corners android:radius="4dp"/>
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="#FFFFFF"/>
-            <stroke android:width="1dp" android:color="#DDDDDD"/>
-            <corners android:radius="4dp"/>
-        </shape>
-    </item>
-</selector>
-

positions/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_positions"/>
-</layer-list>

positions/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>

positions/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_positions"/>
-</layer-list>

positions/src/main/res/drawable/item_bg_edit.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- res/drawable/item_bg_edit.xml -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- 状态1：按压时（编辑项被点击，反馈明确） -->
-    <item android:state_pressed="true">
-        <shape android:shape="rectangle">
-            <solid android:color="#E0E6ED" /> <!-- 按压底色：比默认深一点的灰蓝色，反馈清晰 -->
-            <corners android:radius="8dp" />  <!-- 保持圆角统一 -->
-            <stroke
-                android:width="1.5dp"
-                android:color="#A0B4C8" />    <!-- 按压时边框加深，增强视觉焦点 -->
-        </shape>
-    </item>
-
-    <!-- 状态2：默认状态（未按压，区分简单视图） -->
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="#EEEEEE" /> <!-- 默认底色：比简单视图深，明确编辑模式 -->
-            <corners android:radius="8dp" />  <!-- 与简单视图一致的圆角，UI不割裂 -->
-            <stroke
-                android:width="1.5dp"
-                android:color="#D0D8E0" />    <!-- 淡蓝色边框，暗示“可编辑” -->
-        </shape>
-    </item>
-</selector>
-

positions/src/main/res/drawable/item_bg_simple.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- res/drawable/item_bg_simple.xml -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- 状态1：按压时的背景（深一点的灰色，明确反馈点击动作） -->
-    <item android:state_pressed="true">
-        <shape android:shape="rectangle">
-            <solid android:color="#E8E8E8" /> <!-- 按压底色（比默认深一点） -->
-            <corners android:radius="8dp" />  <!-- 保持和默认状态一致的圆角 -->
-            <stroke
-                android:width="1dp"
-                android:color="#E0E0E0" />
-        </shape>
-    </item>
-
-    <!-- 状态2：默认状态（未按压时的背景，和基础版一致） -->
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="#F5F5F5" /> <!-- 默认浅灰底色 -->
-            <corners android:radius="8dp" />  <!-- 8dp圆角 -->
-            <stroke
-                android:width="1dp"
-                android:color="#E0E0E0" />    <!-- 细灰边框 -->
-        </shape>
-    </item>
-</selector>
-

positions/src/main/res/drawable/item_position_bg.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <shape android:shape="rectangle">
-            <solid android:color="#F5F5F5"/>
-            <stroke android:width="1dp" android:color="#DDDDDD"/>
-            <corners android:radius="4dp"/>
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="#FFFFFF"/>
-            <stroke android:width="1dp" android:color="#DDDDDD"/>
-            <corners android:radius="4dp"/>
-        </shape>
-    </item>
-</selector>
-

positions/src/main/res/layout/activity_location.xml

@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="20dp">
-
-    <!-- 1. 经纬度显示区域（保持居中，上方） -->
-    <LinearLayout
-        android:id="@+id/layout_location_info"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="30dp"
-        android:orientation="vertical"
-        android:gravity="center_horizontal">
-
-        <!-- 标题 -->
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="实时位置信息"
-            android:textSize="22sp"
-            android:textStyle="bold"/>
-
-        <!-- 经度显示 -->
-        <TextView
-            android:id="@+id/tv_longitude"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="当前经度：等待更新..."
-            android:textSize="18sp"
-            android:layout_marginTop="15dp"/>
-
-        <!-- 纬度显示 -->
-        <TextView
-            android:id="@+id/tv_latitude"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="当前纬度：等待更新..."
-            android:textSize="18sp"
-            android:layout_marginTop="10dp"/>
-
-    </LinearLayout>
-
-    <!-- 2. 新增：位置列表（RecyclerView）- 位于经纬度下方，悬浮按钮上方 -->
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rv_position_list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/layout_location_info"
-        android:layout_above="@id/fab_p_button"
-        android:layout_marginTop="20dp"
-        android:paddingBottom="10dp"/>
-
-    <!-- 3. 右下角圆形悬浮按钮（不变） -->
-    <Button
-        android:id="@+id/fab_p_button"
-        android:layout_width="60dp"
-        android:layout_height="60dp"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:layout_margin="20dp"
-        android:background="@drawable/circle_button_bg"
-        android:text="P"
-        android:textColor="@android:color/white"
-        android:textSize="24sp"
-        android:elevation="6dp"
-        android:padding="0dp"/>
-
-</RelativeLayout>
-

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

@@ -1,51 +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">
-
-	<com.google.android.material.appbar.AppBarLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
-
-		<androidx.appcompat.widget.Toolbar
-			android:id="@+id/toolbar"
-			android:layout_width="match_parent"
-			android:layout_height="?attr/actionBarSize"
-			app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
-
-	</com.google.android.material.appbar.AppBarLayout>
-
-	<LinearLayout
-		android:orientation="vertical"
-		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:layout_weight="1.0"
-		android:gravity="center_vertical|center_horizontal">
-
-		<Button
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="Positions"
-			android:onClick="onPositions"/>
-
-	</LinearLayout>
-
-	<LinearLayout
-		android:orientation="vertical"
-		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:layout_weight="1.0">
-
-		<cc.winboll.studio.libappbase.LogView
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:id="@+id/logview"/>
-
-	</LinearLayout>
-
-</LinearLayout>
-

positions/src/main/res/layout/dialog_edit_position.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 编辑视图布局：垂直排列（经纬度显示+备注输入框），带内边距确保美观 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:padding="16dp">
-
-    <!-- 1. 经度显示（灰色小字体，不可编辑） -->
-    <TextView
-        android:id="@+id/tv_edit_longitude"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="14sp"
-        android:textColor="#666666"
-        android:layout_marginBottom="8dp"/>
-
-    <!-- 2. 纬度显示（灰色小字体，不可编辑） -->
-    <TextView
-        android:id="@+id/tv_edit_latitude"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="14sp"
-        android:textColor="#666666"
-        android:layout_marginBottom="16dp"/>
-
-    <!-- 3. 备注输入框（可编辑，带提示文字，适配多行输入） -->
-    <EditText
-        android:id="@+id/et_edit_memo"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="请输入位置备注（如：公司/家/学校）"
-        android:textSize="16sp"
-        android:inputType="textMultiLine"
-        android:minLines="3"
-        android:maxLines="5"
-        android:padding="10dp"
-        android:background="@drawable/edittext_bg"/> <!-- 输入框背景（带边框，区分普通文本） -->
-
-</LinearLayout>
-

positions/src/main/res/layout/dialog_edit_task.xml

@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:padding="16dp"
-    android:background="@color/white">
-
-    <EditText
-        android:id="@+id/et_edit_task_desc"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="输入任务描述"
-        android:maxLines="1"
-        android:textSize="14sp" />
-
-    <RadioGroup
-        android:id="@+id/rg_distance_condition"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginTop="12dp">
-
-        <RadioButton
-            android:id="@+id/rb_greater_than"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="大于"
-            android:textColor="@color/black"
-            android:textSize="14sp" />
-
-        <RadioButton
-            android:id="@+id/rb_less_than"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="小于"
-            android:textColor="@color/black"
-            android:textSize="14sp"
-            android:layout_marginLeft="24dp" />
-
-    </RadioGroup>
-
-    <EditText
-        android:id="@+id/et_edit_distance"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="输入距离（米）"
-        android:inputType="number"
-        android:maxLines="1"
-        android:textSize="14sp"
-        android:layout_marginTop="8dp" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="end"
-        android:layout_marginTop="16dp">
-
-        <Button
-            android:id="@+id/btn_dialog_cancel"
-            android:layout_width="wrap_content"
-            android:layout_height="40dp"
-            android:text="取消"
-            android:textColor="@color/black"
-            android:textSize="14sp"
-            android:layout_marginRight="8dp"
-            android:background="@color/gray" />
-
-        <Button
-            android:id="@+id/btn_dialog_save"
-            android:layout_width="wrap_content"
-            android:layout_height="40dp"
-            android:text="保存"
-            android:textSize="14sp"
-            android:background="@color/blue"
-            android:textColor="@color/white" />
-
-    </LinearLayout>
-
-</LinearLayout>
-

positions/src/main/res/layout/item_position_edit.xml

@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:orientation="vertical"
-	android:padding="12dp"
-	android:background="@drawable/item_bg_edit">
-
-	<TextView
-		android:id="@+id/tv_edit_longitude"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:textSize="14sp"
-		android:textColor="#999999"/>
-
-	<TextView
-		android:id="@+id/tv_edit_latitude"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:textSize="14sp"
-		android:textColor="#999999"
-		android:layout_marginTop="4dp"/>
-
-	<EditText
-		android:id="@+id/et_edit_memo"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:hint="请输入位置备注"
-		android:textSize="14sp"
-		android:padding="8dp"
-		android:layout_marginTop="8dp"
-		android:background="@drawable/edittext_bg"/>
-
-	<LinearLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:orientation="vertical"
-		android:layout_marginTop="10dp">
-
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:textSize="14sp"
-			android:textColor="#333333"
-			android:id="@+id/tv_edit_real_distance"/>
-
-		<RadioGroup
-			android:id="@+id/rg_real_distance_switch"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:orientation="horizontal"
-			android:layout_marginLeft="8dp">
-
-			<RadioButton
-				android:id="@+id/rb_disable"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="禁用"
-				android:textSize="14sp"
-				android:checked="true"/>
-
-			<RadioButton
-				android:id="@+id/rb_enable"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="启用"
-				android:textSize="14sp"
-				android:layout_marginLeft="15dp"/>
-
-		</RadioGroup>
-
-	</LinearLayout>
-
-	<LinearLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:orientation="horizontal"
-		android:layout_marginTop="12dp">
-
-		<Button
-			android:id="@+id/btn_edit_delete"
-			android:layout_width="wrap_content"
-			android:layout_height="32dp"
-			android:background="@drawable/btn_delete_bg"
-			android:text="删除位置"
-			android:textColor="@android:color/white"
-			android:textSize="13sp"
-			android:paddingStart="15dp"
-			android:paddingEnd="15dp"/>
-
-		<View
-			android:layout_width="10dp"
-			android:layout_height="match_parent"/>
-
-		<Button
-			android:id="@+id/btn_edit_cancel"
-			android:layout_width="wrap_content"
-			android:layout_height="32dp"
-			android:background="@drawable/btn_cancel_bg"
-			android:text="取消"
-			android:textColor="@android:color/white"
-			android:textSize="13sp"
-			android:paddingStart="15dp"
-			android:paddingEnd="15dp"/>
-
-		<View
-			android:layout_width="10dp"
-			android:layout_height="match_parent"/>
-
-		<Button
-			android:id="@+id/btn_edit_confirm"
-			android:layout_width="wrap_content"
-			android:layout_height="32dp"
-			android:background="@drawable/btn_confirm_bg"
-			android:text="确定"
-			android:textColor="@android:color/white"
-			android:textSize="13sp"
-			android:paddingStart="15dp"
-			android:paddingEnd="15dp"/>
-
-	</LinearLayout>
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:orientation="vertical"
-		android:layout_marginTop="16dp">
-
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="30dp"
-			android:orientation="horizontal">
-
-			<TextView
-				android:layout_width="wrap_content"
-				android:layout_height="match_parent"
-				android:gravity="center_vertical"
-				android:text="关联任务（可编辑）："
-				android:textSize="14sp"
-				android:textColor="#333333"/>
-
-			<View
-				android:layout_width="0dp"
-				android:layout_height="match_parent"
-				android:layout_weight="1"/>
-
-			<Button
-				android:id="@+id/btn_add_task"
-				android:layout_width="wrap_content"
-				android:layout_height="match_parent"
-				android:background="@drawable/btn_confirm_bg"
-				android:text="添加新任务"
-				android:textColor="@android:color/white"
-				android:textSize="12sp"
-				android:paddingStart="12dp"
-				android:paddingEnd="12dp"/>
-
-		</LinearLayout>
-
-		<cc.winboll.studio.positions.views.PositionTaskListView
-			android:id="@+id/ptlv_edit_tasks"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="6dp"/>
-
-	</LinearLayout>
-
-</LinearLayout>
-

positions/src/main/res/layout/item_position_simple.xml

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:padding="12dp"
-    android:background="@drawable/item_bg_simple">
-    <TextView
-        android:id="@+id/tv_simple_longitude"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="14sp"
-        android:textColor="#333333"/>
-
-    <TextView
-        android:id="@+id/tv_simple_latitude"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="14sp"
-        android:textColor="#333333"
-        android:layout_marginTop="4dp"/>
-
-    <TextView
-        android:id="@+id/tv_simple_memo"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="14sp"
-        android:textColor="#666666"
-        android:layout_marginTop="4dp"/>
-
-    <TextView
-        android:id="@+id/tv_simple_real_distance"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="14sp"
-        android:textColor="#2E8B57"
-        android:layout_marginTop="6dp"/>
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="关联任务（已启用）："
-        android:textSize="14sp"
-        android:textColor="#333333"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="4dp"/>
-
-    <cc.winboll.studio.positions.views.PositionTaskListView
-        android:id="@+id/ptlv_simple_tasks"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"/>
-
-</LinearLayout>
-

positions/src/main/res/layout/item_position_task_edit.xml

@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:padding="12dp"
-    android:background="@drawable/item_bg_edit"
-    android:layout_marginBottom="8dp">
-
-    <!-- 1. 不可编辑字段（仅显示，灰色文字） -->
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_marginBottom="10dp">
-
-        <TextView
-            android:id="@+id/tv_edit_task_id"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="12sp"
-            android:textColor="#999999"
-            android:text="任务ID："/>
-
-        <TextView
-            android:id="@+id/tv_edit_position_id"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="12sp"
-            android:textColor="#999999"
-            android:layout_marginTop="2dp"
-            android:text="位置ID："/>
-    </LinearLayout>
-
-    <!-- 2. 任务描述（可编辑） -->
-    <EditText
-        android:id="@+id/et_edit_task_desc"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="请输入任务描述（如：到达后提醒打卡）"
-        android:textSize="14sp"
-        android:padding="8dp"
-        android:background="@drawable/edittext_bg"
-        android:layout_marginBottom="10dp"/>
-
-    <!-- 3. 距离条件（单选组：大于/小于） -->
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginBottom="10dp">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="距离条件："
-            android:textSize="14sp"
-            android:textColor="#333333"
-            android:layout_marginRight="10dp"/>
-
-        <RadioGroup
-            android:id="@+id/rg_edit_distance_cond"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <RadioButton
-                android:id="@+id/rb_edit_greater"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="大于"
-                android:textSize="14sp"
-                android:layout_marginRight="15dp"/>
-
-            <RadioButton
-                android:id="@+id/rb_edit_less"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="小于"
-                android:textSize="14sp"/>
-        </RadioGroup>
-    </LinearLayout>
-
-    <!-- 4. 商议距离（可编辑，仅整数） -->
-    <EditText
-        android:id="@+id/et_edit_discuss_dist"
-        android:layout_width="120dp"
-        android:layout_height="wrap_content"
-        android:hint="请输入距离（米）"
-        android:textSize="14sp"
-        android:inputType="number"
-        android:padding="8dp"
-        android:background="@drawable/edittext_bg"
-        android:layout_marginBottom="10dp"/>
-
-    <!-- 5. 启用状态（单选组：是/否） -->
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginBottom="12dp">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="启用任务："
-            android:textSize="14sp"
-            android:textColor="#333333"
-            android:layout_marginRight="10dp"/>
-
-        <RadioGroup
-            android:id="@+id/rg_edit_is_enable"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <RadioButton
-                android:id="@+id/rb_edit_enable_yes"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="是"
-                android:textSize="14sp"
-                android:layout_marginRight="15dp"/>
-
-            <RadioButton
-                android:id="@+id/rb_edit_enable_no"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="否"
-                android:textSize="14sp"/>
-        </RadioGroup>
-    </LinearLayout>
-
-    <!-- 6. 功能按钮（删除-红 / 取消-灰 / 确定-蓝） -->
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center_vertical">
-
-        <Button
-            android:id="@+id/btn_edit_delete"
-            android:layout_width="wrap_content"
-            android:layout_height="32dp"
-            android:background="@drawable/btn_delete_bg"
-            android:text="删除"
-            android:textColor="@android:color/white"
-            android:textSize="13sp"
-            android:paddingStart="15dp"
-            android:paddingEnd="15dp"/>
-
-        <View
-            android:layout_width="10dp"
-            android:layout_height="match_parent"/>
-
-        <Button
-            android:id="@+id/btn_edit_cancel"
-            android:layout_width="wrap_content"
-            android:layout_height="32dp"
-            android:background="@drawable/btn_cancel_bg"
-            android:text="取消"
-            android:textColor="@android:color/white"
-            android:textSize="13sp"
-            android:paddingStart="15dp"
-            android:paddingEnd="15dp"/>
-
-        <View
-            android:layout_width="10dp"
-            android:layout_height="match_parent"/>
-
-        <Button
-            android:id="@+id/btn_edit_confirm"
-            android:layout_width="wrap_content"
-            android:layout_height="32dp"
-            android:background="@drawable/btn_confirm_bg"
-            android:text="确定"
-            android:textColor="@android:color/white"
-            android:textSize="13sp"
-            android:paddingStart="15dp"
-            android:paddingEnd="15dp"/>
-    </LinearLayout>
-
-</LinearLayout>
-

positions/src/main/res/layout/item_position_task_simple.xml

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 根布局改为 RelativeLayout，支持红点右上角定位（原 LinearLayout 无法便捷实现绝对位置） -->
-<RelativeLayout 
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:padding="12dp"
-    android:background="@drawable/item_bg_simple"
-    android:layout_marginBottom="8dp">
-
-    <!-- 1. 右上角小红点（仅 isBingo=true 时显示，绑定 isBingo 属性） -->
-    <View
-        android:id="@+id/v_bingo_dot"
-        android:layout_width="12dp"
-        android:layout_height="12dp"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginRight="2dp"
-        android:layout_marginTop="2dp"
-        android:background="@drawable/bg_bingo_dot"
-        android:visibility="gone"/>  <!-- 默认隐藏，仅任务触发（isBingo=true）时显示 -->
-
-    <!-- 2. 任务描述（原控件不变，位置受红点不影响） -->
-    <TextView
-        android:id="@+id/tv_simple_task_desc"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="16sp"
-        android:textColor="#333333"
-        android:text="任务：无描述"/>
-
-    <!-- 3. 距离条件（原控件不变） -->
-    <TextView
-        android:id="@+id/tv_simple_distance_cond"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="14sp"
-        android:textColor="#666666"
-        android:layout_marginTop="6dp"
-        android:layout_below="@id/tv_simple_task_desc"
-        android:text="条件：距离 > 0 米"/>
-
-    <!-- 4. 启用状态（原控件不变） -->
-    <TextView
-        android:id="@+id/tv_simple_is_enable"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="14sp"
-        android:textColor="#2E8B57"
-        android:layout_marginTop="4dp"
-        android:layout_below="@id/tv_simple_distance_cond"
-        android:text="状态：已启用"/>
-
-</RelativeLayout>
-

positions/src/main/res/layout/item_task_content.xml

@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:gravity="center_vertical"
-    android:padding="8dp"
-    android:background="@drawable/bg_task_item"
-    android:layout_marginVertical="4dp">
-
-    <CheckBox
-        android:id="@+id/cb_task_enable"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="12dp" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/tv_task_desc"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="任务描述"
-            android:textSize="16sp"
-            android:textColor="@color/black" />
-
-        <TextView
-            android:id="@+id/tv_task_distance"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="条件：大于 100 米"
-            android:textSize="12sp"
-            android:textColor="@color/gray_dark"
-            android:layout_marginTop="2dp" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginLeft="8dp">
-
-        <Button
-            android:id="@+id/btn_edit_task"
-            android:layout_width="wrap_content"
-            android:layout_height="30dp"
-            android:text="修改"
-            android:textSize="12sp"
-            android:layout_marginRight="4dp"
-            android:background="@color/blue"
-            android:textColor="@color/white" />
-
-        <Button
-            android:id="@+id/btn_delete_task"
-            android:layout_width="wrap_content"
-            android:layout_height="30dp"
-            android:text="删除"
-            android:textSize="12sp"
-            android:background="@color/red"
-            android:textColor="@color/white" />
-
-    </LinearLayout>
-
-</LinearLayout>
-

positions/src/main/res/layout/item_task_empty.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="80dp"
-    android:gravity="center"
-    android:orientation="vertical"
-    android:background="@color/background_light">
-
-    <TextView
-        android:id="@+id/tv_task_empty_tip"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="暂无任务"
-        android:textColor="@color/gray"
-        android:textSize="14sp" />
-
-</LinearLayout>
-

positions/src/main/res/layout/view_position_task_list.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:padding="8dp">
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rv_position_tasks"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/white"
-        android:paddingVertical="4dp" />
-
-</LinearLayout>
-

positions/src/main/res/menu/menu_item_edit.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- 编辑菜单：点击后切换到编辑视图 -->
-    <item
-        android:id="@+id/menu_edit"
-        android:title="编辑"
-        android:orderInCategory="100"
-        android:showAsAction="never"/> <!-- 仅在菜单中显示，不显示在按钮栏 -->
-</menu>

positions/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

positions/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

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

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#009688</color>
-    <color name="colorPrimaryDark">#00796B</color>
-    <color name="colorAccent">#FF9800</color>
-	<!-- 1. colorEnableGreen：简单视图“已启用”状态文字颜色（柔和绿色，不刺眼） -->
-    <color name="colorEnableGreen">#2E8B57</color> <!-- 海绿色：比纯绿柔和，适合文字提示 -->
-
-    <!-- 2. colorGrayText：编辑视图“不可编辑字段”文字颜色（浅灰色，暗示“不可修改”） -->
-    <color name="colorGrayText">#999999</color> <!-- 中浅灰：既不模糊，又能和可编辑文字区分开 -->
-
-    <!-- （可选补充）适配之前的背景资源颜色（避免后续新增资源报错，提前定义） -->
-    <color name="colorItemSimpleBg">#F5F5F5</color> <!-- item_bg_simple 底色 -->
-    <color name="colorItemEditBg">#EEEEEE</color>   <!-- item_bg_edit 底色 -->
-    <color name="colorItemBorder">#E0E0E0</color>   <!-- 列表项边框颜色 -->
-	<color name="colorRed">#F44336</color> <!-- 标准 Material 红色，可自定义RGB值 -->
-
-	<!-- 基础颜色：解决@color/gray未定义问题 -->
-	<color name="gray">#9E9E9E</color> <!-- 浅灰色（用于提示文本、次要信息） -->
-	<color name="gray_dark">#616161</color> <!-- 深灰色（备用，避免后续扩展缺失） -->
-
-	<!-- 其他已用颜色：确保布局中所有颜色引用都有定义 -->
-	<color name="white">#FFFFFF</color> <!-- 白色（任务列表背景、弹窗背景） -->
-	<color name="black">#000000</color> <!-- 黑色（任务描述文本） -->
-	<color name="blue">#2196F3</color> <!-- 蓝色（编辑/保存按钮背景） -->
-	<color name="red">#F44336</color> <!-- 红色（删除按钮背景） -->
-	<color name="background_light">#F5F5F5</color> <!-- 浅灰背景（备用，提升页面质感） -->
-
-	<!-- 扩展颜色（避免后续新增功能时再次缺失） -->
-	<color name="green">#4CAF50</color> <!-- 绿色（备用：如“启用”状态标识） -->
-	<color name="yellow">#FFC107</color> <!-- 黄色（备用：如“提醒”标识） -->
-
-</resources>

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

@@ -1,4 +0,0 @@
-<resources>
-    <string name="app_name">Positions</string>
-    
-</resources>

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

@@ -1,11 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="MyAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-
-</resources>

positions/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>
-

positions/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"
-
-// Positions 项目编译设置
-//include ':positions'
-//rootProject.name = "positions"
+//rootProject.name = "webpagesources"