<positions>APK 15.12.4 release Publish.

positions/build.gradle

@@ -38,9 +38,22 @@ android {
         }
     }
 	
+	// 米盟 SDK
+    packagingOptions {
+         doNotStrip "*/*/libmimo_1011.so"
+    }
 }
 
 dependencies {
+	// 米盟
+	api 'com.miui.zeus:mimo-ad-sdk:5.3.+'//请使用最新版sdk
+     //注意：以下5个库必须要引入
+    //api 'androidx.appcompat:appcompat:1.4.1'
+    api 'androidx.recyclerview:recyclerview:1.0.0'
+    api 'com.google.code.gson:gson:2.8.5'
+    api 'com.github.bumptech.glide:glide:4.9.0'
+    //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
+	
 	// https://mvnrepository.com/artifact/com.jzxiang.pickerview/TimePickerDialog
 	api 'com.jzxiang.pickerview:TimePickerDialog:1.0.1'
 	

positions/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Dec 07 21:00:59 HKT 2025
-stageCount=1
+#Mon Dec 08 16:14:14 HKT 2025
+stageCount=5
 libraryProject=
 baseVersion=15.12
-publishVersion=15.12.0
+publishVersion=15.12.4
 buildCount=0
-baseBetaVersion=15.12.1
+baseBetaVersion=15.12.5

positions/proguard-rules.pro

@@ -1,21 +1,143 @@
-# 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
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:\tools\adt-bundle-windows-x86_64-20131030\sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# ============================== 基础通用规则 ==============================
+# 保留系统组件
+-keep public class * extends android.app.Activity
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.app.backup.BackupAgentHelper
+-keep public class * extends android.preference.Preference
+
+# 保留 WinBoLL 核心包及子类（合并简化规则）
+-keep class cc.winboll.studio.** { *; }
+-keepclassmembers class cc.winboll.studio.** { *; }
+
+# 保留所有类中的 public static final String TAG 字段（便于日志定位）
+-keepclassmembers class * {
+    public static final java.lang.String TAG;
+}
+
+# 保留序列化类（避免Parcelable/Gson解析异常）
+-keep class * implements android.os.Parcelable {
+    public static final android.os.Parcelable$Creator *;
+}
+-keepclassmembers class * implements java.io.Serializable {
+    static final long serialVersionUID;
+    private static final java.io.ObjectStreamField[] serialPersistentFields;
+    private void writeObject(java.io.ObjectOutputStream);
+    private void readObject(java.io.ObjectInputStream);
+    java.lang.Object writeReplace();
+    java.lang.Object readResolve();
+}
+
+# 保留 R 文件（避免资源ID混淆）
+-keepclassmembers class **.R$* {
+    public static <fields>;
+}
+
+# 保留 native 方法（避免JNI调用失败）
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
+
+# 保留注解和泛型（避免反射/序列化异常）
+-keepattributes *Annotation*
+-keepattributes Signature
+
+# 屏蔽 Java 8+ 警告（适配 Java 7 语法）
+-dontwarn java.lang.invoke.*
+-dontwarn android.support.v8.renderscript.*
+-dontwarn java.util.function.**
+
+# ============================== 第三方框架专项规则 ==============================
+# OkHttp 4.4.1（米盟广告请求依赖，完善Lambda兼容）
+-keep class okhttp3.** { *; }
+-keep interface okhttp3.** { *; }
+-keep class okhttp3.internal.** { *; }
+-keep class okio.** { *; }
+-dontwarn okhttp3.internal.platform.**
+-dontwarn okio.**
+# ============================== 必要补充规则 ==============================
+# OkHttp 4.4.1 补充规则（Java 7 兼容）
+-keep class okhttp3.internal.concurrent.** { *; }
+-keep class okhttp3.internal.connection.** { *; }
+-dontwarn okhttp3.internal.concurrent.TaskRunner
+-dontwarn okhttp3.internal.connection.RealCall
+
+# Glide 4.9.0（米盟广告图片加载依赖）
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep public class * extends com.bumptech.glide.module.AppGlideModule
+-keep public enum com.bumptech.glide.load.ImageHeaderParser$ImageType {
+    **[] $VALUES;
+    public *;
+}
+-keepclassmembers class * implements com.bumptech.glide.module.AppGlideModule {
+    <init>();
+}
+-dontwarn com.bumptech.glide.**
+
+# Gson 2.8.5（米盟广告数据序列化依赖）
+-keep class com.google.gson.** { *; }
+-keep interface com.google.gson.** { *; }
+-keepclassmembers class * {
+    @com.google.gson.annotations.SerializedName <fields>;
+}
+
+# 米盟 SDK（核心广告组件，完整保留避免加载失败）
+-keep class com.miui.zeus.** { *; }
+-keep interface com.miui.zeus.** { *; }
+# 保留米盟日志字段（便于广告加载失败排查）
+-keepclassmembers class com.miui.zeus.mimo.sdk.** {
+    public static final java.lang.String TAG;
+}
+
+# RecyclerView 1.0.0（米盟广告布局渲染依赖）
+-keep class androidx.recyclerview.** { *; }
+-keep interface androidx.recyclerview.** { *; }
+-keepclassmembers class androidx.recyclerview.widget.RecyclerView$Adapter {
+    public *;
+}
+
+# 其他第三方框架（按引入依赖保留，无则可删除）
+# XXPermissions 18.63
+-keep class com.hjq.permissions.** { *; }
+-keep interface com.hjq.permissions.** { *; }
+
+# ZXing 二维码（核心解析组件）
+-keep class com.google.zxing.** { *; }
+-keep class com.journeyapps.zxing.** { *; }
+
+# Jsoup HTML解析
+-keep class org.jsoup.** { *; }
+
+# Pinyin4j 拼音搜索
+-keep class net.sourceforge.pinyin4j.** { *; }
+
+# JSch SSH组件
+-keep class com.jcraft.jsch.** { *; }
+
+# AndroidX 基础组件
+-keep class androidx.appcompat.** { *; }
+-keep interface androidx.appcompat.** { *; }
+
+# ============================== 优化与调试配置 ==============================
+# 优化级别（平衡混淆效果与性能）
+-optimizationpasses 5
+-optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/*
+
+# 调试辅助（保留行号便于崩溃定位）
+-verbose
+-dontpreverify
+-dontusemixedcaseclassnames
+-keepattributes SourceFile,LineNumberTable
+

positions/src/main/AndroidManifest.xml

@@ -112,7 +112,7 @@
         <activity android:name="cc.winboll.studio.positions.activities.LocationActivity"/>
 
         <activity android:name="cc.winboll.studio.positions.activities.ShortcutActionActivity"/>
-		
+
         <service
             android:name=".services.MainService"
             android:exported="false"/>
@@ -134,16 +134,15 @@
             </intent-filter>
 
         </receiver>
-		
+
         <meta-data
             android:name="android.max_aspect"
             android:value="4.0"/>
-		
+
         <meta-data
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version"/>
 
-
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.fileprovider"
@@ -156,6 +155,8 @@
 
         </provider>
 
+        <activity android:name="cc.winboll.studio.positions.activities.SettingsActivity"/>
+
     </application>
 
-</manifest>
+</manifest>

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

@@ -4,8 +4,12 @@ import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.content.res.TypedArray;
+import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
 import android.widget.CompoundButton;
@@ -15,13 +19,17 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
-import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
+import cc.winboll.studio.libaes.utils.AESThemeUtil;
+import cc.winboll.studio.libaes.utils.DevelopUtils;
+import cc.winboll.studio.libaes.views.ADsBannerView;
 import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.positions.R;
 import cc.winboll.studio.positions.activities.LocationActivity;
+import cc.winboll.studio.positions.activities.SettingsActivity;
 import cc.winboll.studio.positions.activities.WinBoLLActivity;
-import cc.winboll.studio.positions.services.MainService;
 import cc.winboll.studio.positions.utils.AppConfigsUtil;
 import cc.winboll.studio.positions.utils.ServiceUtil;
+import android.widget.LinearLayout;
 
 /**
  * 主页面：仅负责
@@ -34,7 +42,7 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {
     // 权限请求码（建议定义为类常量，避免魔法值）
 	private static final int REQUEST_LOCATION_PERMISSIONS = 1001;
 	private static final int REQUEST_BACKGROUND_LOCATION_PERMISSION = 1002;
-	
+
     // UI 控件：服务控制开关、顶部工具栏
     private Switch mServiceSwitch;
 	private Button mManagePositionsButton;
@@ -42,6 +50,7 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {
     // 服务相关：服务实例、绑定状态标记
     //private DistanceRefreshService mDistanceService;
     private boolean isServiceBound = false;
+	ADsBannerView mADsBannerView;
 
 
     @Override
@@ -93,11 +102,32 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {
         }
         // 4. 绑定服务（仅用于获取服务实时状态，不影响服务独立运行）
         //bindDistanceService();
+
+		mADsBannerView = findViewById(R.id.adsbanner);
+
+		setLLMainBackgroundColor();
     }
 
+	// 在 Activity 的 onCreate() 或需要获取颜色的方法中调用
+	private void setLLMainBackgroundColor() {
+		// 1. 定义要解析的主题属性（这里是 colorAccent）
+		TypedArray a = getTheme().obtainStyledAttributes(new int[]{android.R.attr.colorAccent});
+		// 2. 获取对应的颜色值（默认值可设为你需要的 fallback 颜色，如 Color.GRAY）
+		int colorAccent = a.getColor(0, Color.GRAY);
+		// 3. 必须回收，避免内存泄漏
+		a.recycle();
+
+		LinearLayout llmain = findViewById(R.id.llmain);
+		llmain.setBackgroundColor(colorAccent);
+	}
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
+		if (mADsBannerView != null) {
+			mADsBannerView.releaseAdResources();
+		}
+
         // 页面销毁时解绑服务，避免Activity与服务相互引用导致内存泄漏
 //        if (isServiceBound) {
 //            unbindService(mServiceConn);
@@ -106,6 +136,16 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {
 //        }
     }
 
+	@Override
+	protected void onResume() {
+		super.onResume();
+		if (mADsBannerView != null) {
+			mADsBannerView.resumeADs(MainActivity.this);
+		}
+	}
+
+
+
     // ---------------------- 核心功能1：初始化UI组件（Toolbar + 服务开关） ----------------------
     /**
      * 初始化顶部 Toolbar，设置页面标题
@@ -155,6 +195,39 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {
     }
 
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // 主题菜单
+		AESThemeUtil.inflateMenu(this, menu);
+		// 调试工具菜单
+		if (App.isDebugging()) {
+			DevelopUtils.inflateMenu(this, menu);
+		}
+		// 应用其他菜单
+        getMenuInflater().inflate(R.menu.toolbar_main, menu);
+
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int menuItemId = item.getItemId();
+		if (AESThemeUtil.onAppThemeItemSelected(this, item)) {
+            recreate();
+        } if (DevelopUtils.onDevelopItemSelected(this, item)) {
+			LogUtils.d(TAG, String.format("onOptionsItemSelected item.getItemId() %d ", item.getItemId()));
+		} else if (menuItemId == R.id.item_settings) {
+			Intent intent = new Intent();
+            intent.setClass(this, SettingsActivity.class);
+            startActivity(intent);
+        } else {
+			// 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
+			return super.onOptionsItemSelected(item);
+		}
+		return true;
+    }
+
+
     /**
      * 绑定服务（仅用于获取服务状态，不启动服务）
      */
@@ -175,14 +248,6 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {
         startActivity(new Intent(MainActivity.this, LocationActivity.class));
     }
 
-    /**
-     * 跳转至“日志页（LogActivity）”（按钮点击触发，需在布局中设置 android:onClick="onLog"）
-     * 无服务状态限制，直接跳转
-     */
-    public void onLog(View view) {
-        WinBoLLActivityManager.getInstance().startLogActivity(this); // 调用LogActivity静态方法跳转（保留原逻辑）
-    }
-
     // ---------------------- 新增：位置权限处理（适配Java7 + 后台GPS权限） ----------------------
     /**
      * 检查是否拥有「前台+后台」位置权限（适配Android版本差异）

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

@@ -16,8 +16,10 @@ import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.TextView;
 import android.widget.Toast;
+import androidx.appcompat.widget.Toolbar;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.ToastUtils;
 import cc.winboll.studio.positions.R;
@@ -33,12 +35,14 @@ import java.util.concurrent.atomic.AtomicBoolean;
  * 2. Adapter 初始化传入 MainService 实例，确保数据来源唯一
  * 3. 所有位置/任务操作通过 MainService 接口执行
  */
-public class LocationActivity extends Activity {
+public class LocationActivity extends WinBoLLActivity implements IWinBoLLActivity {
     public static final String TAG = "LocationActivity";
 
+	private Toolbar mToolbar;
+
     private RecyclerView mRvPosition;
     private PositionAdapter mPositionAdapter;
-    
+
     // MainService 引用+绑定状态（AtomicBoolean 确保多线程状态可见性）
     private MainService mMainService;
     private final AtomicBoolean isServiceBound = new AtomicBoolean(false);
@@ -96,11 +100,34 @@ public class LocationActivity extends Activity {
         }
     };
 
+    @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_location);
 
+		mToolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(mToolbar);
+		mToolbar.setSubtitle(getTag());
+        mToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
+		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					LogUtils.d(TAG, "【导航栏】点击返回");
+					finish();
+				}
+			});
+
         // 1. 初始化视图（优先执行，避免Adapter初始化时视图为空）
         initView();
         // 2. 初始化GPS监听（提前创建，避免绑定服务后空指针）
@@ -167,7 +194,7 @@ public class LocationActivity extends Activity {
                 }
             }
             LogUtils.d(TAG, "数据同步完成：服务位置数=" + (servicePosList == null ? 0 : servicePosList.size()) 
-                      + "，本地缓存数=" + mLocalPosCache.size());
+					   + "，本地缓存数=" + mLocalPosCache.size());
 
         } catch (Exception e) {
             LogUtils.d(TAG, "同步服务数据失败：" + e.getMessage());
@@ -183,9 +210,9 @@ public class LocationActivity extends Activity {
         // 1. 多重安全校验（避免销毁后初始化/重复初始化/依赖未就绪）
         if (isAdapterInited.get() || !isServiceBound.get() || mMainService == null || mRvPosition == null) {
             LogUtils.w(TAG, "Adapter初始化跳过：" 
-                      + "已初始化=" + isAdapterInited.get() 
-                      + "，服务绑定=" + isServiceBound.get() 
-                      + "，视图就绪=" + (mRvPosition != null));
+					   + "已初始化=" + isAdapterInited.get() 
+					   + "，服务绑定=" + isServiceBound.get() 
+					   + "，视图就绪=" + (mRvPosition != null));
             return;
         }
 
@@ -195,54 +222,54 @@ public class LocationActivity extends Activity {
 
             // 3. 设置删除回调（删除时同步服务+本地缓存+Adapter）
             mPositionAdapter.setOnDeleteClickListener(new PositionAdapter.OnDeleteClickListener() {
-                @Override
-                public void onDeleteClick(int position) {
-                    // 安全校验（索引有效+服务绑定+缓存非空）
-                    if (position < 0 || position >= mLocalPosCache.size() || !isServiceBound.get() || mMainService == null) {
-                        LogUtils.w(TAG, "删除位置失败：索引无效/服务未就绪（索引=" + position + "，缓存量=" + mLocalPosCache.size() + "）");
-                        return;
-                    }
+					@Override
+					public void onDeleteClick(int position) {
+						// 安全校验（索引有效+服务绑定+缓存非空）
+						if (position < 0 || position >= mLocalPosCache.size() || !isServiceBound.get() || mMainService == null) {
+							LogUtils.w(TAG, "删除位置失败：索引无效/服务未就绪（索引=" + position + "，缓存量=" + mLocalPosCache.size() + "）");
+							return;
+						}
 
-                    PositionModel deletePos = mLocalPosCache.get(position);
-                    if (deletePos != null && !deletePos.getPositionId().isEmpty()) {
-                        // 步骤1：调用服务删除（确保服务数据一致性）
-                        mMainService.removePosition(deletePos.getPositionId());
-                        // 步骤2：删除本地缓存（确保缓存与服务同步）
-                        synchronized (mLocalPosCache) {
-                            mLocalPosCache.remove(position);
-                        }
-                        // 步骤3：通知Adapter刷新（基于缓存操作，避免空数据）
-                        mPositionAdapter.notifyItemRemoved(position);
-                        showToast("删除位置成功：" + deletePos.getMemo());
-                        LogUtils.d(TAG, "删除位置完成：ID=" + deletePos.getPositionId() + "（服务+缓存已同步）");
-                    }
-                }
-            });
+						PositionModel deletePos = mLocalPosCache.get(position);
+						if (deletePos != null && !deletePos.getPositionId().isEmpty()) {
+							// 步骤1：调用服务删除（确保服务数据一致性）
+							mMainService.removePosition(deletePos.getPositionId());
+							// 步骤2：删除本地缓存（确保缓存与服务同步）
+							synchronized (mLocalPosCache) {
+								mLocalPosCache.remove(position);
+							}
+							// 步骤3：通知Adapter刷新（基于缓存操作，避免空数据）
+							mPositionAdapter.notifyItemRemoved(position);
+							showToast("删除位置成功：" + deletePos.getMemo());
+							LogUtils.d(TAG, "删除位置完成：ID=" + deletePos.getPositionId() + "（服务+缓存已同步）");
+						}
+					}
+				});
 
             // 4. 设置保存回调（保存时同步服务+本地缓存+Adapter）
             mPositionAdapter.setOnSavePositionClickListener(new PositionAdapter.OnSavePositionClickListener() {
-                @Override
-                public void onSavePositionClick(int position, PositionModel updatedPos) {
-                    // 安全校验（索引有效+服务绑定+数据非空）
-                    if (!isServiceBound.get() || mMainService == null 
-                        || position < 0 || position >= mLocalPosCache.size() || updatedPos == null) {
-                        LogUtils.w(TAG, "保存位置失败：服务未就绪/索引无效/数据空");
-                        showToast("服务未就绪，保存失败");
-                        return;
-                    }
+					@Override
+					public void onSavePositionClick(int position, PositionModel updatedPos) {
+						// 安全校验（索引有效+服务绑定+数据非空）
+						if (!isServiceBound.get() || mMainService == null 
+							|| position < 0 || position >= mLocalPosCache.size() || updatedPos == null) {
+							LogUtils.w(TAG, "保存位置失败：服务未就绪/索引无效/数据空");
+							showToast("服务未就绪，保存失败");
+							return;
+						}
 
-                    // 步骤1：调用服务更新（确保服务数据一致性）
-                    mMainService.updatePosition(updatedPos);
-                    // 步骤2：更新本地缓存（确保缓存与服务同步）
-                    synchronized (mLocalPosCache) {
-                        mLocalPosCache.set(position, updatedPos);
-                    }
-                    // 步骤3：通知Adapter刷新（基于缓存操作，避免空数据）
-                    mPositionAdapter.notifyItemChanged(position);
-                    showToast("保存位置成功：" + updatedPos.getMemo());
-                    LogUtils.d(TAG, "保存位置完成：ID=" + updatedPos.getPositionId() + "（服务+缓存已同步）");
-                }
-            });
+						// 步骤1：调用服务更新（确保服务数据一致性）
+						mMainService.updatePosition(updatedPos);
+						// 步骤2：更新本地缓存（确保缓存与服务同步）
+						synchronized (mLocalPosCache) {
+							mLocalPosCache.set(position, updatedPos);
+						}
+						// 步骤3：通知Adapter刷新（基于缓存操作，避免空数据）
+						mPositionAdapter.notifyItemChanged(position);
+						showToast("保存位置成功：" + updatedPos.getMemo());
+						LogUtils.d(TAG, "保存位置完成：ID=" + updatedPos.getPositionId() + "（服务+缓存已同步）");
+					}
+				});
 
             // 5. 设置Adapter到RecyclerView（最后一步，确保Adapter已配置完成）
             mRvPosition.setAdapter(mPositionAdapter);
@@ -268,7 +295,7 @@ public class LocationActivity extends Activity {
         }
         Toast.makeText(this, content, Toast.LENGTH_SHORT).show();
     }
-	
+
 	// ---------------------- 页面交互（新增位置逻辑保留，适配GPS数据） ----------------------
     /**
      * 新增位置（调用服务addPosition()，可选：用当前GPS位置初始化新位置）
@@ -395,9 +422,7 @@ public class LocationActivity extends Activity {
             LogUtils.d(TAG, "onResume：服务已绑定但Adapter未初始化，重新同步数据");
             syncDataFromMainService();
             initPositionAdapter();
-        }
-        // 2. 服务已绑定且Adapter已初始化：刷新数据（确保与服务同步）
-        else if (isServiceBound.get() && mMainService != null && isAdapterInited.get() && mPositionAdapter != null) {
+        } else if (isServiceBound.get() && mMainService != null && isAdapterInited.get() && mPositionAdapter != null) {
             syncDataFromMainService();
             mPositionAdapter.notifyDataSetChanged();
             LogUtils.d(TAG, "onResume：刷新位置数据（与服务同步）");

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

@@ -0,0 +1,51 @@
+package cc.winboll.studio.positions.activities;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.ToastUtils;
+import cc.winboll.studio.positions.R;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/12/07 23:29
+ * @Describe 应用设置活动窗口
+ */
+public class SettingsActivity extends WinBoLLActivity implements IWinBoLLActivity {
+
+    public static final String TAG = "SettingsActivity";
+
+	private Toolbar mToolbar;
+
+	@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_settings);
+
+		mToolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(mToolbar);
+		mToolbar.setSubtitle(getTag());
+        mToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
+		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					LogUtils.d(TAG, "【导航栏】点击返回");
+					finish();
+				}
+			});
+    }
+}

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

@@ -10,6 +10,8 @@ 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.models.AESThemeBean;
+import cc.winboll.studio.libaes.utils.AESThemeUtil;
 import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 import cc.winboll.studio.libappbase.LogUtils;
 
@@ -17,6 +19,8 @@ public class WinBoLLActivity extends AppCompatActivity implements IWinBoLLActivi
 
     public static final String TAG = "WinBoLLActivity";
 
+	protected volatile AESThemeBean.ThemeType mThemeType;
+
     @Override
     public Activity getActivity() {
         return this;
@@ -27,6 +31,22 @@ public class WinBoLLActivity extends AppCompatActivity implements IWinBoLLActivi
         return TAG;
     }
 
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        mThemeType = getThemeType();
+        setThemeStyle();
+        super.onCreate(savedInstanceState);
+    }
+
+	AESThemeBean.ThemeType getThemeType() {
+        return AESThemeBean.getThemeStyleType(AESThemeUtil.getThemeTypeID(getApplicationContext()));
+    }
+
+    void setThemeStyle() {
+        setTheme(AESThemeUtil.getThemeTypeID(getApplicationContext()));
+    }
+
+
     @Override
     protected void onResume() {
         super.onResume();
@@ -36,12 +56,12 @@ public class WinBoLLActivity extends AppCompatActivity implements IWinBoLLActivi
     @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;
-        }*/
+		 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);
     }

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

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"> <!-- 矩形形状（匹配 LinearLayout ） -->
+
+    <!-- 1px 边框（关键：stroke 标签控制边框） -->
+    <stroke
+        android:width="2px"
+        android:color="?attr/colorAccent" /> <!-- 边框颜色（替换为你的颜色，如 #CCCCCC） -->
+
+    <!-- 可选：设置 LinearLayout 背景色（若需要） -->
+    <solid android:color="#00000000" /> <!-- 内部填充色，默认透明可删除 -->
+
+    <!-- 可选：设置圆角（不需要圆角可删除） -->
+    <corners android:radius="0dp" />
+</shape>

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

@@ -1,67 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:padding="20dp">
+	android:layout_height="match_parent">
 
-	<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>
-
-	<androidx.recyclerview.widget.RecyclerView
-		android:id="@+id/rv_position_list"
+	<cc.winboll.studio.libaes.views.ASupportToolbar
 		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"/>
+		android:layout_height="@dimen/toolbar_height"
+		android:id="@+id/toolbar"
+		android:gravity="center_vertical"/>
 
-	<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"
-		android:onClick="addNewPosition"/>
+	<RelativeLayout
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:padding="20dp"
+		android:layout_weight="1.0">
 
-</RelativeLayout>
+		<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>
+
+		<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"/>
+
+		<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"
+			android:onClick="addNewPosition"/>
+
+	</RelativeLayout>
+
+</LinearLayout>
 

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

@@ -1,39 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:orientation="vertical">
+	android:id="@+id/llmain">
 
-	<androidx.appcompat.widget.Toolbar
+	<cc.winboll.studio.libaes.views.ASupportToolbar
+		android:layout_width="match_parent"
+		android:layout_height="@dimen/toolbar_height"
 		android:id="@+id/toolbar"
-		android:layout_width="match_parent"
-		android:layout_height="?attr/actionBarSize"
-		android:background="?attr/colorPrimary"
-		android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/>
+		android:gravity="center_vertical"/>
 
-	<Switch
-		android:id="@+id/switch_service_control"
-		android:layout_margin="16dp"
-		android:text="GPS服务开关"
+	<LinearLayout
+		xmlns:app="http://schemas.android.com/apk/res-auto"
+		android:orientation="vertical"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"/>
+		android:layout_height="0dp"
+		android:background="#00000000"
+		android:layout_weight="1.0">
 
-	<Button
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_margin="16dp"
-		android:onClick="onPositions"
-		android:text="位置与任务管理"
-		android:id="@+id/btn_manage_positions"/>
+		<LinearLayout
+			android:orientation="vertical"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:background="@drawable/activity_background"
+			android:layout_margin="0dp">
 
-	<Button
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_margin="16dp"
-		android:onClick="onLog"
-		android:text="查看应用日志"/>
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="0dp"
+				android:orientation="vertical"
+				android:layout_weight="1.0">
+
+				<Switch
+					android:id="@+id/switch_service_control"
+					android:text="GPS服务开关"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginTop="120dp"
+					android:layout_marginLeft="50dp"
+					android:layout_marginRight="50dp"
+					android:background="@drawable/shape_2px_border"
+					android:paddingLeft="10dp"/>
+
+				<Button
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginTop="20dp"
+					android:layout_marginLeft="50dp"
+					android:layout_marginRight="50dp"
+					android:onClick="onPositions"
+					android:text="位置与任务管理"
+					android:id="@+id/btn_manage_positions"/>
+
+			</LinearLayout>
+
+			<cc.winboll.studio.libaes.views.ADsBannerView
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:id="@+id/adsbanner"
+				android:layout_alignParentBottom="true"/>
+
+		</LinearLayout>
+
+	</LinearLayout>
 
 </LinearLayout>
 

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

@@ -0,0 +1,21 @@
+<?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">
+
+	<cc.winboll.studio.libaes.views.ASupportToolbar
+		android:layout_width="match_parent"
+		android:layout_height="@dimen/toolbar_height"
+		android:id="@+id/toolbar"
+		android:gravity="center_vertical"/>
+
+	<cc.winboll.studio.libaes.views.ADsControlView
+		android:id="@+id/ads_control_view"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"/>
+
+</LinearLayout>
+

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto">
+    
+    <item
+        android:id="@+id/item_settings"
+        android:title="Settings"/>
+    
+</menu>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="toolbar_height">60dp</dimen>
+    <dimen name="text_content_size">18dp</dimen>
+    <dimen name="text_title_size">24dp</dimen>
+    <dimen name="text_subtitle_size">16dp</dimen>
+</resources>

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

@@ -14,4 +14,12 @@
 	</style>
 
 
+    <!-- 设置Toolbar标题字体的大小 -->
+    <style name="Toolbar.TitleText" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">
+        <item name="android:textSize">@dimen/text_title_size</item>
+    </style>
+    <style name="Toolbar.SubTitleText" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">
+        <item name="android:textSize">@dimen/text_subtitle_size</item>
+    </style>
+	
 </resources>