<mymessagemanager>APK 15.12.11 release Publish.

将 import 从 cc.winboll.studio.libaes 修正为
cc.winboll.studio.libappbase，与布局文件保持一致，
修复打开应用介绍窗口时的 ClassCastException。

aes/src/main/res/drawable-night/bg_frame.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?> 
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" > 
+    <item 
+        android:left="2dp" 
+        android:top="2dp" 
+        android:right="2dp" 
+        android:bottom="2dp"> 
+        <shape android:shape="rectangle" > 
+            <gradient 
+                android:angle="270" 
+                android:endColor="#0F000000" 
+                android:startColor="#0F000000" /> 
+            <corners android:radius="?attr/borderCornerRadius" />
+        </shape> 
+    </item> 
+    <item 
+        android:left="3dp" 
+        android:top="3dp" 
+        android:right="3dp" 
+        android:bottom="5dp"> 
+        <shape android:shape="rectangle" > 
+            <gradient 
+                android:angle="270" 
+                android:endColor="#00000000" 
+                android:startColor="#1AFFFFFF" /> 
+            <stroke 
+                android:width="1dp" 
+                android:color="#FF666666" /> 
+            <corners android:radius="?attr/borderCornerRadius" />
+        </shape> 
+    </item> 
+</layer-list>

aes/src/main/res/drawable/bg_frame.xml

@@ -12,11 +12,7 @@
                 android:angle="270" 
                 android:endColor="#0F000000" 
                 android:startColor="#0F000000" /> 
-            <corners 
-                android:bottomLeftRadius="6dip" 
-                android:bottomRightRadius="6dip" 
-                android:topLeftRadius="6dip" 
-                android:topRightRadius="6dip" /> 
+            <corners android:radius="?attr/borderCornerRadius" />
         </shape> 
     </item> 
     <!-- 背景部分 --> 
@@ -31,11 +27,7 @@
                 android:angle="270" 
                 android:endColor="#0FFFFFFF" 
                 android:startColor="#FFFFFFFF" /> 
-            <corners 
-                android:bottomLeftRadius="6dip" 
-                android:bottomRightRadius="6dip" 
-                android:topLeftRadius="6dip" 
-                android:topRightRadius="6dip" /> 
+            <corners android:radius="?attr/borderCornerRadius" />
         </shape> 
     </item> 
 </layer-list>

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

@@ -4,7 +4,7 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent" android:background="@drawable/bg_container_border">
 
 	<cc.winboll.studio.libaes.views.ASupportToolbar
 		android:layout_width="match_parent"

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

@@ -4,7 +4,7 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent" android:background="@drawable/bg_container_border">
 
 	<cc.winboll.studio.libaes.views.ADsControlView
 		android:id="@+id/ads_control_view"

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

@@ -4,7 +4,7 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent" android:background="@drawable/bg_container_border">
 
 	<TextView
 		android:layout_width="wrap_content"

appbase/src/main/res/drawable/bg_container_border.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="@android:color/transparent" />
+    <stroke android:width="1dp" android:color="#FFB0B0B0" />
+    <corners android:radius="?attr/borderCornerRadius" />
+</shape>

appbase/src/main/res/layout/activity_about.xml

@@ -4,7 +4,7 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent" android:background="@drawable/bg_container_border">
 
 	<android.widget.Toolbar
 		android:layout_width="match_parent"

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

@@ -4,7 +4,7 @@
 	android:orientation="vertical"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:padding="16dp">
+	android:padding="16dp" android:background="@drawable/bg_container_border">
 
 	<android.widget.Toolbar
 		android:layout_width="match_parent"
@@ -14,21 +14,21 @@
 	<ScrollView
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
-		android:layout_weight="1.0">
+		android:layout_weight="1.0" android:background="@drawable/bg_container_border">
 
 		<LinearLayout
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:orientation="vertical"
 			android:gravity="center_vertical"
-			android:spacing="12dp">
+			android:spacing="12dp" android:background="@drawable/bg_container_border">
 
 			<Button
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:text="关于应用"
 				android:textSize="16sp"
-				android:textColor="@android:color/white"
+				
 				android:background="#81C7F5"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"
@@ -40,7 +40,7 @@
 				android:layout_height="wrap_content"
 				android:text="应用崩溃测试"
 				android:textSize="16sp"
-				android:textColor="@android:color/white"
+				
 				android:background="#81C7F5"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"
@@ -52,7 +52,7 @@
 				android:layout_height="wrap_content"
 				android:text="应用日志测试"
 				android:textSize="16sp"
-				android:textColor="@android:color/white"
+				
 				android:background="#81C7F5"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"
@@ -64,7 +64,7 @@
 				android:layout_height="wrap_content"
 				android:text="应用日志测试（新窗口）"
 				android:textSize="16sp"
-				android:textColor="@android:color/white"
+				
 				android:background="#81C7F5"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"
@@ -76,7 +76,7 @@
 				android:layout_height="wrap_content"
 				android:text="应用吐司测试"
 				android:textSize="16sp"
-				android:textColor="@android:color/white"
+				
 				android:background="#81C7F5"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"
@@ -88,7 +88,7 @@
 				android:layout_height="wrap_content"
 				android:text="分屏测试"
 				android:textSize="16sp"
-				android:textColor="@android:color/white"
+				
 				android:background="#81C7F5"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"
@@ -100,7 +100,7 @@
 				android:layout_height="wrap_content"
 				android:text="多开窗口"
 				android:textSize="16sp"
-				android:textColor="@android:color/white"
+				
 				android:background="#81C7F5"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"

appbase/src/main/res/layout/activity_main2.xml

@@ -12,6 +12,6 @@
 		android:layout_height="wrap_content"
 		android:text="Main2Activity"
 		android:textSize="24sp"
-		android:textColor="@color/gray_900"/>
+		/>
 
 </LinearLayout>

appbase/src/main/res/layout/activity_nfcrsaoperate.xml

@@ -4,6 +4,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent" android:background="@drawable/bg_container_border">
     
 </LinearLayout>

appbase/src/main/res/values/attrs.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <attr name="borderCornerRadius" format="dimension" />
 	<declare-styleable name="AboutView">
         <attr name="app_name" format="string" />
         <attr name="app_apkfoldername" format="string" />

gpsrelaysentinel/README.md

@@ -1,117 +0,0 @@
-# GPSRelaySentinel
-
-## 介绍
-
-GPSRelaySentinel 是一款基于安卓平台的综合工具应用，集成 Termux 终端模拟器、二维码扫描、网络请求等功能。
-
-## 技术栈
-
-- **编程语言**: Java 7（源码）
-- **编译环境**: Java 11（Gradle 编译）
-- **Gradle 插件**: 7.2.1
-- **安卓 API**:
-  - 最低支持: API 26 (Android 8.0)
-  - 目标版本: API 30 (Android 11)
-  - 编译版本: API 30
-
-## 软件架构
-
-适配以下安卓开发环境的 Gradle 编译结构：
-- AIDE Pro
-- AndroidIDE
-
-## 模块说明
-
-本项目采用多模块结构：
-- `gpsrelaysentinel` - 主应用模块
-- `libappbase` - 基础库模块（提供 OkHttp、Gson、JSch 等基础能力）
-- `libaes` - AES 加密库模块（提供权限请求、二维码、拼音搜索等扩展功能）
-
-## 核心依赖库
-
-### 网络相关
-- OkHttp 4.4.1 / 3.14.9 - HTTP 客户端
-- Gson 2.10.1 - JSON 解析
-
-### 终端模拟
-- Termux: terminal-emulator 0.118.0
-- Termux: terminal-view 0.118.0
-- Termux: termux-shared 0.118.0
-
-### 功能组件
-- ZXing 3.4.1 - 二维码生成与扫描
-- JSch 0.1.55 - SSH/SFTP 客户端
-- Jsoup 1.13.1 - HTML 解析
-- FastJSON 1.2.76 - JSON 处理
-
-### UI 组件
-- Material Design 1.4.0
-- AndroidX 组件库
-- PullRefreshLayout 1.2.0 - 下拉刷新
-
-## Gradle 编译说明
-
-### 调试版编译
-```bash
-gradle assembleDebug
-```
-
-### 阶段版编译（发布）
-```bash
-bash .winboll/bashPublishAPKAddTag.sh gpsrelaysentinel
-```
-
-### 版本管理
-版本信息由 `gpsrelaysentinel/build.properties` 管理：
-- `baseVersion` - 基础版本号
-- `stageCount` - 阶段构建次数
-- `publishVersion` - 发布版本号
-- `buildCount` - 构建次数
-
-## 使用说明
-
-### Termux 应用配置
-
-1. 安装 Termux 应用（包名: `com.termux`）
-2. 配置允许外部应用访问：
-   ```bash
-   echo "allow-external-apps = true" > ~/.termux/termux.properties
-   ```
-
-### 权限说明
-
-应用需要以下权限：
-- 网络访问权限
-- 存储读写权限
-- 相机权限（二维码扫描）
-- 位置权限（GPS 相关功能）
-
-## 项目结构
-
-```
-gpsrelaysentinel/
-├── src/main/
-│   ├── java/          # Java 源码（Java 7 语法）
-│   ├── res/           # 资源文件
-│   ├── libs/          # 本地库文件（含 JNI 库）
-│   └── AndroidManifest.xml
-├── build.gradle       # 模块构建配置
-└── build.properties   # 版本配置文件
-```
-
-## 参与贡献
-
-1. Fork 本仓库
-2. 新建功能分支 (`git checkout -b feat_xxx`)
-3. 提交代码（作者: ZhanGSKen <zhangsken@188.com>）
-4. 新建 Pull Request
-
-## 许可证
-
-[待添加许可证信息]
-
-## 参考文档
-
-- [Android Developer Documentation](https://developer.android.com/)
-- [Termux Wiki](https://wiki.termux.com/)
-- [Gradle User Manual](https://docs.gradle.org/)

gpsrelaysentinel/build.properties

@@ -1,8 +0,0 @@
-#Created by .winboll/winboll_app_build.gradle
-#Thu May 07 10:59:47 CST 2026
-stageCount=27
-libraryProject=
-baseVersion=15.11
-publishVersion=15.11.26
-buildCount=31
-baseBetaVersion=15.11.27

gpsrelaysentinel/src/beta/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>
-

gpsrelaysentinel/src/main/AndroidManifest.xml

@@ -1,46 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cc.winboll.studio.gpsrelaysentinel">
-
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        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"/>
-
-        <service android:name=".MainService"
-            android:enabled="true"
-            android:exported="false" />
-
-    </application>
-
-</manifest>

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

@@ -1,340 +0,0 @@
-package cc.winboll.studio.gpsrelaysentinel;
-
-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 cc.winboll.studio.libappbase.ToastUtils;
-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);
-		
-        //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();
-        }
-    }
-}

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

@@ -1,127 +0,0 @@
-package cc.winboll.studio.gpsrelaysentinel;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.CompoundButton;
-import android.widget.Switch;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.LogView;
-import cc.winboll.studio.libappbase.ToastUtils;
-
-public class MainActivity extends AppCompatActivity {
-
-    LogView mLogView;
-    Switch mSwitchService;
-    private static final int REQUEST_LOCATION_PERMISSION = 1;
-
-    @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);
-        mSwitchService = findViewById(R.id.switch_service);
-
-        // 根据当前权限状态初始化switch
-        mSwitchService.setChecked(hasLocationPermission());
-
-        mSwitchService.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                if (isChecked) {
-                    // 打开时检查权限
-                    if (hasLocationPermission()) {
-                        startService();
-                    } else {
-                        // 没有权限，申请权限
-                        requestLocationPermission();
-                        // 暂时不打开switch，等权限申请结果
-                        mSwitchService.setChecked(false);
-                    }
-                } else {
-                    stopService();
-                }
-            }
-        });
-
-        ToastUtils.show("onCreate");
-    }
-
-    private boolean hasLocationPermission() {
-        boolean hasBasic = checkSelfPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED
-            || checkSelfPermission(android.Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED;
-        if (hasBasic && android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
-            return checkSelfPermission(android.Manifest.permission.ACCESS_BACKGROUND_LOCATION) == PackageManager.PERMISSION_GRANTED;
-        }
-        return hasBasic;
-    }
-
-    private void requestLocationPermission() {
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
-            String[] permissions = new String[] {
-                android.Manifest.permission.ACCESS_FINE_LOCATION,
-                android.Manifest.permission.ACCESS_COARSE_LOCATION,
-                android.Manifest.permission.ACCESS_BACKGROUND_LOCATION
-            };
-            requestPermissions(permissions, REQUEST_LOCATION_PERMISSION);
-        } else {
-            String[] permissions = new String[] {
-                android.Manifest.permission.ACCESS_FINE_LOCATION,
-                android.Manifest.permission.ACCESS_COARSE_LOCATION
-            };
-            requestPermissions(permissions, REQUEST_LOCATION_PERMISSION);
-        }
-    }
-
-    private void startService() {
-        Intent intent = new Intent(MainActivity.this, MainService.class);
-        startForegroundService(intent);
-        ToastUtils.show("GPS Service started");
-        LogUtils.d(MainService.TAG, "GPS Service started from MainActivity");
-    }
-
-    private void stopService() {
-        // 先设置SP标记为不启用
-        MainActivity.this.getSharedPreferences(MainService.PREF_NAME, Context.MODE_PRIVATE)
-            .edit()
-            .putBoolean(MainService.KEY_SERVICE_ENABLED, false)
-            .apply();
-        Intent intent = new Intent(MainActivity.this, MainService.class);
-        stopService(intent);
-        ToastUtils.show("GPS Service stopped");
-        LogUtils.d(MainService.TAG, "GPS Service stopped from MainActivity");
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        if (requestCode == REQUEST_LOCATION_PERMISSION) {
-            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                // 权限申请成功，启动服务
-                mSwitchService.setChecked(true);
-                startService();
-            } else {
-                ToastUtils.show("需要位置权限才能使用GPS服务");
-                mSwitchService.setChecked(false);
-            }
-        }
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mLogView.start();
-    }
-
-//    public void onLibraryActivity(View view) {
-//		startActivity(new Intent(this, LibraryActivity.class));
-//    }
-}

gpsrelaysentinel/src/main/java/cc/winboll/studio/gpsrelaysentinel/MainService.java

@@ -1,185 +0,0 @@
-package cc.winboll.studio.gpsrelaysentinel;
-
-import android.app.Notification;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.app.Service;
-import android.content.Context;
-import android.content.Intent;
-import android.location.Location;
-import android.location.LocationListener;
-import android.location.LocationManager;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.IBinder;
-import androidx.core.app.NotificationCompat;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libgpsrelaysentinel.manager.GpsSubscribeManager;
-import cc.winboll.studio.libgpsrelaysentinel.manager.SubscribeLocationManager;
-import cc.winboll.studio.libgpsrelaysentinel.model.GpsSubscribeMsg;
-import java.util.Map;
-
-public class MainService extends Service {
-
-    public static final String TAG = "MainService";
-    private LocationManager mLocationManager;
-    private LocationListener mLocationListener;
-    private boolean mIsRunning = false;
-    private NotificationManager mNotificationManager;
-    private NotificationCompat.Builder mNotificationBuilder;
-    private static final String CHANNEL_ID = "gps_relay_channel";
-    private static final int NOTIFICATION_ID = 1;
-    static final String PREF_NAME = "gps_relay_service_prefs";
-    static final String KEY_SERVICE_ENABLED = "service_enabled";
-    private int mGpsCount = 0;
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        LogUtils.d(TAG, "Service onCreate");
-        mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-        createNotificationChannel();
-        if (isServiceEnabled()) {
-            LogUtils.d(TAG, "Service was enabled, starting GPS updates");
-            run();
-        }
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        LogUtils.d(TAG, "Service onStartCommand");
-        setServiceEnabled(true);
-        run();
-        return START_STICKY;
-    }
-
-    private boolean isServiceEnabled() {
-        return getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE).getBoolean(KEY_SERVICE_ENABLED, false);
-    }
-
-    private void setServiceEnabled(boolean enabled) {
-        getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE).edit().putBoolean(KEY_SERVICE_ENABLED, enabled).apply();
-        LogUtils.d(TAG, "Service enabled set to: " + enabled);
-    }
-
-    private void run() {
-        if (mIsRunning) {
-            LogUtils.d(TAG, "GPS updates already running");
-            return;
-        }
-        mLocationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
-        mLocationListener = new LocationListener() {
-            @Override
-            public void onLocationChanged(Location location) {
-                mGpsCount++;
-                String gpsInfo = "Lat: " + location.getLatitude() + ", Lng: " + location.getLongitude();
-                LogUtils.d(TAG, "Location changed: " + gpsInfo);
-                updateNotification(gpsInfo);
-				
-				//管理器初始化
-				GpsSubscribeManager subscribeManager = GpsSubscribeManager.getInstance();
-				SubscribeLocationManager locationManager = SubscribeLocationManager.getInstance();
-
-				//遍历所有订阅者做距离判断+定点更新
-				Map<String, GpsSubscribeMsg> subscribeMap = subscribeManager.getSubscribeMap();
-				for (Map.Entry<String, GpsSubscribeMsg> entry : subscribeMap.entrySet()) {
-					String sid = entry.getKey();
-					GpsSubscribeMsg subscribeMsg = entry.getValue();
-
-					double nowLat = location.getLatitude();
-					double nowLng = location.getLongitude();
-
-					//判断是否满足推送
-					boolean canPush = locationManager.isNeedPush(sid, nowLat, nowLng);
-					if (canPush) {
-						//执行发送GPS广播
-						//sendGpsBroadcast(...);
-
-						//推送成功立刻刷新订阅者基准坐标
-						locationManager.updateSubscriberPoint(sid, nowLat, nowLng);
-					}
-				}
-				
-            }
-
-            @Override
-            public void onStatusChanged(String provider, int status, Bundle extras) {
-                LogUtils.d(TAG, "Status changed: " + provider + ", status: " + status);
-            }
-
-            @Override
-            public void onProviderEnabled(String provider) {
-                LogUtils.d(TAG, "Provider enabled: " + provider);
-            }
-
-            @Override
-            public void onProviderDisabled(String provider) {
-                LogUtils.d(TAG, "Provider disabled: " + provider);
-            }
-        };
-
-        try {
-            if (mLocationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
-                mLocationManager.requestLocationUpdates(
-                    LocationManager.GPS_PROVIDER,
-                    1000,
-                    1,
-                    mLocationListener
-                );
-                LogUtils.d(TAG, "GPS location updates requested");
-                mIsRunning = true;
-                startForegroundNotification();
-            }
-        } catch (SecurityException e) {
-            LogUtils.e(TAG, "Permission denied: " + e.getMessage());
-        }
-    }
-
-    private void createNotificationChannel() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            NotificationChannel channel = new NotificationChannel(
-                CHANNEL_ID,
-                "GPS Relay Service",
-                NotificationManager.IMPORTANCE_LOW
-            );
-            channel.setDescription("GPS Relay Sentinel service channel");
-            mNotificationManager.createNotificationChannel(channel);
-        }
-    }
-
-    private void startForegroundNotification() {
-        mNotificationBuilder = new NotificationCompat.Builder(this, CHANNEL_ID)
-            .setContentTitle("GPS Relay Service")
-            .setContentText("Waiting for GPS data...")
-            .setSmallIcon(android.R.drawable.ic_menu_mylocation)
-            .setOngoing(true);
-        Notification notification = mNotificationBuilder.build();
-        startForeground(NOTIFICATION_ID, notification);
-    }
-
-    private void updateNotification(String gpsInfo) {
-        if (mNotificationBuilder != null) {
-            mNotificationBuilder.setContentText(gpsInfo + " | Count: " + mGpsCount);
-            mNotificationManager.notify(NOTIFICATION_ID, mNotificationBuilder.build());
-        }
-    }
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return null;
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        if (mLocationManager != null && mLocationListener != null) {
-            try {
-                mLocationManager.removeUpdates(mLocationListener);
-            } catch (SecurityException e) {
-                LogUtils.e(TAG, "Permission denied when removing updates: " + e.getMessage());
-            }
-        }
-        mIsRunning = false;
-        LogUtils.d(TAG, "Service onDestroy");
-    }
-}

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

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

@@ -1,65 +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>
-
-	<ScrollView
-		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:layout_weight="1.0">
-
-		<LinearLayout
-			android:orientation="vertical"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:gravity="center_vertical|center_horizontal"
-			android:id="@+id/ll_main">
-
-			<TextView
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="GPSRelaySentinel"
-				android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-			<Switch
-				android:id="@+id/switch_service"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="GPS Service"
-				android:checked="false"/>
-
-		</LinearLayout>
-
-	</ScrollView>
-
-	<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>
-

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

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

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

@@ -1,6 +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>
-</resources>

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

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

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

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

libaes/src/main/java/cc/winboll/studio/libaes/views/ASupportToolbar.java

@@ -49,6 +49,10 @@ public class ASupportToolbar extends Toolbar {
         // 工具栏描边
         int nStroke = 5;
 
+        TypedArray taBorder = getContext().obtainStyledAttributes(new int[]{R.attr.borderCornerRadius});
+        float cornerRadius = taBorder.getDimension(0, 6 * getResources().getDisplayMetrics().density);
+        taBorder.recycle();
+
         //分别为开始颜色，中间夜色，结束颜色
         int colors0[] = { mEndColor , mCenterColor,  mStartColor};
         GradientDrawable gradientDrawable0;
@@ -57,7 +61,7 @@ public class ASupportToolbar extends Toolbar {
         gradientDrawable0.setShape(GradientDrawable.RECTANGLE);
         gradientDrawable0.setColors(colors0); //添加颜色组
         gradientDrawable0.setGradientType(GradientDrawable.LINEAR_GRADIENT);//设置线性渐变
-        gradientDrawable0.setCornerRadius(20);
+        gradientDrawable0.setCornerRadius(cornerRadius);
 
         int colors1[] = { mCenterColor , mCenterColor, mCenterColor };
         GradientDrawable gradientDrawable1;
@@ -66,7 +70,7 @@ public class ASupportToolbar extends Toolbar {
         gradientDrawable1.setShape(GradientDrawable.RECTANGLE);
         gradientDrawable1.setColors(colors1); //添加颜色组
         gradientDrawable1.setGradientType(GradientDrawable.LINEAR_GRADIENT);//设置线性渐变
-        gradientDrawable1.setCornerRadius(20);
+        gradientDrawable1.setCornerRadius(cornerRadius);
 
         int colors2[] = {  mEndColor, mCenterColor, mStartColor };
         GradientDrawable gradientDrawable2;
@@ -75,7 +79,7 @@ public class ASupportToolbar extends Toolbar {
         gradientDrawable2.setShape(GradientDrawable.RECTANGLE);
         gradientDrawable2.setColors(colors2); //添加颜色组
         gradientDrawable2.setGradientType(GradientDrawable.LINEAR_GRADIENT);//设置线性渐变
-        gradientDrawable2.setCornerRadius(20);
+        gradientDrawable2.setCornerRadius(cornerRadius);
 
         ld = new LayerDrawable(array); //参数为上面的Drawable数组
         ld.setLayerInset(2, nStroke * 2, nStroke * 2, getWidth() + nStroke * 2, getHeight() + nStroke * 2); 

libaes/src/main/java/cc/winboll/studio/libaes/views/AToolbar.java

@@ -51,6 +51,10 @@ public class AToolbar extends Toolbar {
         // 工具栏描边
         int nStroke = 5;
 
+        TypedArray taBorder = getContext().obtainStyledAttributes(new int[]{R.attr.borderCornerRadius});
+        float cornerRadius = taBorder.getDimension(0, 6 * getResources().getDisplayMetrics().density);
+        taBorder.recycle();
+
         //分别为开始颜色，中间夜色，结束颜色
         int colors0[] = { mEndColor , mCenterColor,  mStartColor};
         GradientDrawable gradientDrawable0;
@@ -59,7 +63,7 @@ public class AToolbar extends Toolbar {
         gradientDrawable0.setShape(GradientDrawable.RECTANGLE);
         gradientDrawable0.setColors(colors0); //添加颜色组
         gradientDrawable0.setGradientType(GradientDrawable.LINEAR_GRADIENT);//设置线性渐变
-        gradientDrawable0.setCornerRadius(20);
+        gradientDrawable0.setCornerRadius(cornerRadius);
 
         int colors1[] = { mCenterColor , mCenterColor, mCenterColor };
         GradientDrawable gradientDrawable1;
@@ -68,7 +72,7 @@ public class AToolbar extends Toolbar {
         gradientDrawable1.setShape(GradientDrawable.RECTANGLE);
         gradientDrawable1.setColors(colors1); //添加颜色组
         gradientDrawable1.setGradientType(GradientDrawable.LINEAR_GRADIENT);//设置线性渐变
-        gradientDrawable1.setCornerRadius(20);
+        gradientDrawable1.setCornerRadius(cornerRadius);
 
         int colors2[] = {  mEndColor, mCenterColor, mStartColor };
         GradientDrawable gradientDrawable2;
@@ -77,7 +81,7 @@ public class AToolbar extends Toolbar {
         gradientDrawable2.setShape(GradientDrawable.RECTANGLE);
         gradientDrawable2.setColors(colors2); //添加颜色组
         gradientDrawable2.setGradientType(GradientDrawable.LINEAR_GRADIENT);//设置线性渐变
-        gradientDrawable2.setCornerRadius(20);
+        gradientDrawable2.setCornerRadius(cornerRadius);
 
 
         ld = new LayerDrawable(array); //参数为上面的Drawable数组

libaes/src/main/res/drawable/acard_frame_main.xml

@@ -13,11 +13,7 @@
                 android:startColor="@color/colorACardShadow"
                 android:centerColor="@color/colorACardShadow"
                 android:endColor="@color/colorACardShadow"/> 
-            <corners 
-                android:bottomLeftRadius="6dip" 
-                android:bottomRightRadius="6dip" 
-                android:topLeftRadius="6dip" 
-                android:topRightRadius="6dip" /> 
+            <corners android:radius="?attr/borderCornerRadius" />
         </shape> 
     </item>
     <!-- 边框部分 -->
@@ -32,11 +28,7 @@
                 android:startColor="@color/colorACardFrame"
                 android:centerColor="@color/colorACardFrame"
                 android:endColor="@color/colorACardFrame"/> 
-            <corners 
-                android:bottomLeftRadius="6dip" 
-                android:bottomRightRadius="6dip" 
-                android:topLeftRadius="6dip" 
-                android:topRightRadius="6dip" /> 
+            <corners android:radius="?attr/borderCornerRadius" />
         </shape> 
     </item>
     <!-- 背景主体部分 -->
@@ -52,11 +44,7 @@
                 android:startColor="@color/colorACardBackgroung"
                 android:centerColor="@color/colorACardBackgroung"
                 android:endColor="@color/colorACardBackgroung"/> 
-            <corners 
-                android:bottomLeftRadius="6dip" 
-                android:bottomRightRadius="6dip" 
-                android:topLeftRadius="6dip" 
-                android:topRightRadius="6dip" /> 
+            <corners android:radius="?attr/borderCornerRadius" />
         </shape> 
     </item> 
 </layer-list>

libaes/src/main/res/drawable/atoolbar_frame.xml

@@ -13,11 +13,7 @@
                 android:startColor="?attr/attrAToolbarEndColor"
                 android:centerColor="?attr/attrAToolbarCenterColor"
                 android:endColor="?attr/attrAToolbarStartColor"/> 
-            <corners 
-                android:bottomLeftRadius="6dip" 
-                android:bottomRightRadius="6dip" 
-                android:topLeftRadius="6dip" 
-                android:topRightRadius="6dip" /> 
+            <corners android:radius="?attr/borderCornerRadius" />
         </shape>
     </item>
     <!-- 边框部分 -->
@@ -32,11 +28,7 @@
                 android:startColor="?attr/attrAToolbarCenterColor"
                 android:centerColor="?attr/attrAToolbarCenterColor"
                 android:endColor="?attr/attrAToolbarCenterColor"/> 
-            <corners 
-                android:bottomLeftRadius="6dip" 
-                android:bottomRightRadius="6dip" 
-                android:topLeftRadius="6dip" 
-                android:topRightRadius="6dip" /> 
+            <corners android:radius="?attr/borderCornerRadius" />
         </shape> 
     </item>
     <!-- 背景主体部分 -->
@@ -52,11 +44,7 @@
                 android:startColor="?attr/attrAToolbarStartColor"
                 android:centerColor="?attr/attrAToolbarCenterColor"
                 android:endColor="?attr/attrAToolbarEndColor"/> 
-            <corners 
-                android:bottomLeftRadius="6dip" 
-                android:bottomRightRadius="6dip" 
-                android:topLeftRadius="6dip" 
-                android:topRightRadius="6dip" /> 
+            <corners android:radius="?attr/borderCornerRadius" />
         </shape> 
     </item> 
 </layer-list>

libaes/src/main/res/drawable/bg_container_border.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="@android:color/transparent" />
+    <stroke android:width="1dp" android:color="#FFB0B0B0" />
+    <corners android:radius="?attr/borderCornerRadius" />
+</shape>

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

@@ -12,11 +12,7 @@
                 android:angle="270" 
                 android:endColor="#0F000000" 
                 android:startColor="#0F000000" /> 
-            <corners 
-                android:bottomLeftRadius="6dip" 
-                android:bottomRightRadius="6dip" 
-                android:topLeftRadius="6dip" 
-                android:topRightRadius="6dip" /> 
+            <corners android:radius="?attr/borderCornerRadius" />
         </shape> 
     </item> 
     <!-- 背景部分 --> 
@@ -31,11 +27,7 @@
                 android:angle="270" 
                 android:endColor="@color/colorAccent" 
                 android:startColor="@color/colorAccent" /> 
-            <corners 
-                android:bottomLeftRadius="6dip" 
-                android:bottomRightRadius="6dip" 
-                android:topLeftRadius="6dip" 
-                android:topRightRadius="6dip" /> 
+            <corners android:radius="?attr/borderCornerRadius" />
         </shape> 
     </item> 
 </layer-list>

libaes/src/main/res/drawable/ohpcts_frame.xml

@@ -9,7 +9,7 @@
                 android:startColor="@color/colorOHPCTSBackground"
                 android:centerColor="@color/colorOHPCTSBackground"
                 android:endColor="@color/colorOHPCTSBackground"/> 
-            <corners android:radius="6dip"/> 
+            <corners android:radius="?attr/borderCornerRadius"/> 
         </shape>
     </item>
     <!-- 第二进度条 -->
@@ -22,7 +22,7 @@
                     android:startColor="@color/colorOHPCTSSecondaryProgress"
                     android:centerColor="@color/colorOHPCTSSecondaryProgress"
                     android:endColor="@color/colorOHPCTSSecondaryProgress"/> 
-                <corners android:radius="6dip"/> 
+                <corners android:radius="?attr/borderCornerRadius"/> 
             </shape> 
         </clip>
     </item>
@@ -36,7 +36,7 @@
                     android:startColor="@color/colorOHPCTSProgress"
                     android:centerColor="@color/colorOHPCTSProgress"
                     android:endColor="@color/colorOHPCTSProgress"/> 
-                <corners android:radius="6dip"/> 
+                <corners android:radius="?attr/borderCornerRadius"/> 
             </shape> 
         </clip>
     </item> 

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

@@ -4,7 +4,7 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent" android:background="@drawable/bg_container_border">
 
 	<cc.winboll.studio.libaes.views.ASupportToolbar
 		android:layout_width="match_parent"
@@ -16,6 +16,6 @@
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
 		android:layout_weight="1.0"
-		android:id="@+id/aboutviewroot_ll"/>
+		android:id="@+id/aboutviewroot_ll" android:background="@drawable/bg_container_border" />
 
 </LinearLayout>

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

@@ -3,7 +3,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="wrap_content">
+	android:layout_height="wrap_content" android:background="@drawable/bg_container_border">
 
 	<cc.winboll.studio.libaes.views.ASupportToolbar
 		android:layout_width="match_parent"
@@ -19,13 +19,13 @@
 		<LinearLayout
 			android:orientation="vertical"
 			android:layout_width="match_parent"
-			android:layout_height="match_parent">
+			android:layout_height="match_parent" android:background="@drawable/bg_container_border">
 
 			<LinearLayout
 				android:layout_width="match_parent"
 				android:layout_height="0dp"
 				android:layout_weight="1.0"
-				android:id="@+id/activitydrawerLinearLayout1"/>
+				android:id="@+id/activitydrawerLinearLayout1" android:background="@drawable/bg_container_border" />
 		</LinearLayout>
 
         <com.baoyz.widget.PullRefreshLayout

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

@@ -4,7 +4,7 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent" android:background="@drawable/bg_container_border">
 
 	<cc.winboll.studio.libaes.views.ASupportToolbar
 		android:layout_width="match_parent"
@@ -15,7 +15,7 @@
 		android:orientation="vertical"
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
-		android:layout_weight="1.0">
+		android:layout_weight="1.0" android:background="@drawable/bg_container_border">
 
 		<androidx.drawerlayout.widget.DrawerLayout
 			android:layout_width="match_parent"
@@ -26,7 +26,7 @@
 			<FrameLayout
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"
-				android:id="@+id/activitydrawerfragmentFrameLayout1"/>
+				android:id="@+id/activitydrawerfragmentFrameLayout1" android:background="@drawable/bg_container_border" />
 
 			<com.baoyz.widget.PullRefreshLayout
 				android:orientation="vertical"

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

@@ -4,7 +4,7 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent" android:background="@drawable/bg_container_border">
 
 	<TextView
 		android:layout_width="wrap_content"

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

@@ -4,12 +4,12 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent" android:background="@drawable/bg_container_border">
 
 	<FrameLayout
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		android:id="@+id/activitytestaboutfragmentFrameLayout1"/>
+		android:id="@+id/activitytestaboutfragmentFrameLayout1" android:background="@drawable/bg_container_border" />
 
 </LinearLayout>
 

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

@@ -4,7 +4,7 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent" android:background="@drawable/bg_container_border">
 
 	<cc.winboll.studio.libaes.views.ASupportToolbar
 		android:layout_width="match_parent"

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

@@ -4,7 +4,7 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent" android:background="@drawable/bg_container_border">
 
 	<cc.winboll.studio.libaes.views.AToolbar
 		android:layout_width="match_parent"

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

@@ -13,7 +13,6 @@
         android:layout_height="wrap_content"
         android:text="用户须知"
         android:textSize="18sp"
-        android:textColor="@android:color/black"
         android:textStyle="bold"
         android:layout_marginBottom="16dp" />
 
@@ -22,14 +21,13 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:layout_marginBottom="20dp">
+        android:layout_marginBottom="20dp" android:background="@drawable/bg_container_border">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="小米广告SDK隐私政策: "
-            android:textSize="14sp"
-            android:textColor="@android:color/darker_gray" />
+            android:textSize="14sp" />
 
         <!-- 可点击链接（用TextView承载，通过代码设置蓝色+下划线） -->
         <TextView
@@ -44,8 +42,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="，点击链接查看完整政策"
-            android:textSize="14sp"
-            android:textColor="@android:color/darker_gray" />
+            android:textSize="14sp" />
     </LinearLayout>
 
     <!-- 按钮容器（水平排列） -->
@@ -53,7 +50,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:gravity="end">
+        android:gravity="end" android:background="@drawable/bg_container_border">
 
         <Button
             android:id="@+id/btn_disagree"

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

@@ -3,7 +3,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent" android:background="@drawable/bg_container_border">
 
 	<TextView
 		android:layout_width="wrap_content"
@@ -22,7 +22,7 @@
 		android:orientation="horizontal"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:gravity="end">
+		android:gravity="end" android:background="@drawable/bg_container_border">
 
 		<Button
 			android:layout_width="wrap_content"

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

@@ -3,7 +3,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent" android:background="@drawable/bg_container_border">
 
 	<TextView
 		android:layout_width="wrap_content"

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

@@ -5,7 +5,7 @@
 	android:orientation="vertical"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:gravity="center_vertical">
+	android:gravity="center_vertical" android:background="@drawable/bg_container_border">
 
 	<TextView
 		android:layout_width="wrap_content"
@@ -23,7 +23,7 @@
 		android:layout_height="60dp"
 		android:orientation="horizontal"
 		android:gravity="center"
-		android:id="@+id/fragmentviewpageLinearLayout1">
+		android:id="@+id/fragmentviewpageLinearLayout1" android:background="@drawable/bg_container_border">
 
 		<ImageView
 			android:layout_width="wrap_content"

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

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="48dp"
     android:gravity="center_vertical"
-    android:orientation="horizontal">
+    android:orientation="horizontal" android:background="@drawable/bg_container_border">
 
     <ImageView
         android:layout_centerVertical="true"

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

@@ -4,12 +4,12 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:id="@+id/ads_container"
 	android:layout_width="match_parent"
-	android:layout_height="wrap_content">
+	android:layout_height="wrap_content" android:background="@drawable/bg_container_border">
 
 	<LinearLayout
 		android:id="@+id/ads_container"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:orientation="vertical"/>
+		android:orientation="vertical" android:background="@drawable/bg_container_border" />
 
 </LinearLayout>

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

@@ -4,14 +4,13 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:padding="16dp">
+    android:padding="16dp" android:background="@drawable/bg_container_border">
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="应用支持模式设置："
         android:textSize="16sp"
-        android:textColor="@android:color/black"
         android:layout_marginBottom="12dp"/>
 
     <RadioGroup
@@ -26,7 +25,6 @@
             android:layout_height="wrap_content"
             android:text="无扰单机模式"
             android:textSize="14sp"
-            android:textColor="@android:color/darker_gray"
             android:layout_marginBottom="8dp"/>
 
         <RadioButton
@@ -35,7 +33,6 @@
             android:layout_height="wrap_content"
             android:text="米盟广告模式"
             android:textSize="14sp"
-            android:textColor="@android:color/darker_gray"
             android:layout_marginBottom="8dp"/>
 
         <RadioButton
@@ -43,8 +40,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="云宝物语模式"
-            android:textSize="14sp"
-            android:textColor="@android:color/darker_gray"/>
+            android:textSize="14sp"/>
 
     </RadioGroup>
 
@@ -54,7 +50,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
-        android:layout_marginTop="0dp"> <!-- 移除顶部多余间距 -->
+        android:layout_marginTop="0dp"> <!-- 移除顶部多余间距 -- android:background="@drawable/bg_container_border">
 
         <ImageView
             android:id="@+id/iv_winboll_store"

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

@@ -3,7 +3,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent" android:background="@drawable/bg_container_border">
 
 	<TextView
 		android:layout_width="wrap_content"

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

@@ -3,7 +3,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent" android:background="@drawable/bg_container_border">
 
 	<TextView
 		android:layout_width="wrap_content"

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

@@ -4,7 +4,7 @@
 	android:orientation="vertical"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:gravity="center">
+	android:gravity="center" android:background="@drawable/bg_container_border">
 
 	<TextView
         android:layout_width="wrap_content"
@@ -15,7 +15,7 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center">
+        android:gravity="center" android:background="@drawable/bg_container_border">
 
         <cc.winboll.studio.libaes.views.AOHPCTCSeekBar
             android:layout_width="300dp"

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

@@ -3,7 +3,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent" android:background="@drawable/bg_container_border">
 
 	<TextView
 		android:layout_width="wrap_content"

libaes/src/main/res/values/attrs.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     
+    <attr name="borderCornerRadius" format="dimension" />
     <attr name="colorTextColor" format="color" />
     <attr name="colorPrimary" format="color" />
     <attr name="colorPrimaryDark" format="color" />

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

@@ -456,7 +456,6 @@ public final class CrashHandler {
 					int padding = dp2px(16); // 内边距 16dp（适配不同屏幕）
 					message.setPadding(padding, padding, padding, padding);
 					message.setText(mLog); // 设置崩溃日志
-					message.setTextColor(Color.BLACK); // 文字黑色
 					message.setTextIsSelectable(true); // 支持文本选择（便于手动复制）
 				}
 

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

@@ -178,7 +178,6 @@ public class GlobalCrashReportView extends LinearLayout {
 		// 设置默认配色
 		mTitleColor = Color.WHITE;
 		mTitleBackgroundColor = Color.BLACK;
-		mTextColor = Color.BLACK;
 		mTextBackgroundColor = Color.WHITE;
 		// 加载布局
 		inflateView();
@@ -210,7 +209,7 @@ public class GlobalCrashReportView extends LinearLayout {
 		);
 		mTextColor = typedArray.getColor(
 			R.styleable.GlobalCrashActivity_colorText,
-			Color.BLACK
+			0
 		);
 		mTextBackgroundColor = typedArray.getColor(
 			R.styleable.GlobalCrashActivity_colorTextBackgound, // 注：原拼写错误，保持与 attrs.xml 一致
@@ -253,7 +252,7 @@ public class GlobalCrashReportView extends LinearLayout {
 
 		// 配置日志文本控件样式
 		if (mTvReport != null) {
-			mTvReport.setTextColor(mTextColor);
+			if (mTextColor != 0) mTvReport.setTextColor(mTextColor);
 			mTvReport.setBackgroundColor(mTextBackgroundColor);
 			// 可选：设置日志文本换行方式（默认已换行，此处增强可读性）
 			mTvReport.setSingleLine(false);

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

@@ -116,7 +116,6 @@ public class LogView extends RelativeLayout {
         // 获取Log Level spinner实例
         mLogLevelSpinner = findViewById(cc.winboll.studio.libappbase.R.id.viewlogSpinner1);
 
-		metTagSearch.setTextColor(mContext.getResources().getColor(R.color.white));
         metTagSearch.addTextChangedListener(new TextWatcher() {
 
                 @Override
@@ -248,7 +247,6 @@ public class LogView extends RelativeLayout {
 		}
 		mSelectAllTAGCheckBox.setLayoutParams(layoutParams2);
 		//mSelectAllTAGCheckBox.setPadding(0,0,0,0);
-		mSelectAllTAGCheckBox.setTextColor(mContext.getResources().getColor(R.color.white));
         mSelectAllTAGCheckBox.setOnClickListener(new View.OnClickListener(){
                 @Override
                 public void onClick(View v) {
@@ -502,7 +500,6 @@ public class LogView extends RelativeLayout {
 			}
 			holder.tvText.setLayoutParams(layoutParams);
 			holder.tvText.setPadding(0,0,0,0);
-			holder.tvText.setTextColor(mContext.getResources().getColor(R.color.white));
             holder.cbChecked.setChecked(item.isChecked());
 			holder.cbChecked.setLayoutParams(layoutParams);
 			holder.cbChecked.setPadding(0,0,0,0);

libappbase/src/main/java/cc/winboll/studio/libappbase/views/AboutView.java

@@ -3,6 +3,7 @@ package cc.winboll.studio.libappbase.views;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.content.res.TypedArray;
 import android.net.Uri;
 import android.util.AttributeSet;
 import android.view.Gravity;
@@ -421,8 +422,11 @@ public class AboutView extends LinearLayout {
          */
         private android.graphics.drawable.Drawable create_item_background() {
             android.graphics.drawable.GradientDrawable drawable = new android.graphics.drawable.GradientDrawable();
+            TypedArray taBorder = mItemContext.obtainStyledAttributes(new int[]{R.attr.borderCornerRadius});
+            float cornerRadius = taBorder.getDimension(0, 6 * mItemContext.getResources().getDisplayMetrics().density);
+            taBorder.recycle();
             drawable.setStroke(1, mItemContext.getResources().getColor(R.color.gray_200));
-            drawable.setCornerRadius(4);
+            drawable.setCornerRadius(cornerRadius);
             drawable.setColor(mItemContext.getResources().getColor(android.R.color.white));
             return drawable;
         }
@@ -449,7 +453,6 @@ public class AboutView extends LinearLayout {
             TextView tvTitle = new TextView(mItemContext);
             tvTitle.setText(mTitle);
             tvTitle.setTextSize(16);
-            tvTitle.setTextColor(mItemContext.getResources().getColor(R.color.gray_900));
             llText.addView(tvTitle);
             // 内容
             TextView tvContent = new TextView(mItemContext);

libappbase/src/main/java/cc/winboll/studio/libappbase/widget/LogTagSpinner.java

@@ -154,7 +154,6 @@ public class LogTagSpinner extends Spinner {
 		// 4. 文字对齐（垂直居中+靠左，符合常规 UI 设计）
 		//itemTv.setGravity(View.GRAVITY_CENTER_VERTICAL | View.GRAVITY_START);
 		// 5. 文字颜色（统一深色，可改为项目颜色资源）
-		itemTv.setTextColor(this.mContext.getColor(R.color.white));
 		itemTv.setBackgroundColor(this.mContext.getColor(R.color.btn_gray_normal));
 		// 6. 文字溢出处理（最多 2 行，超出省略，避免长标签换行过多）
 		itemTv.setSingleLine(false);

libappbase/src/main/res/drawable/bg_border_round.xml

@@ -5,9 +5,5 @@
         android:width="1dp"
         android:color="#000000" /> <!-- 这里可调整边框宽度和颜色 -->
     <solid android:color="@android:color/transparent" />
-    <corners 
-        android:bottomLeftRadius="6dip" 
-        android:bottomRightRadius="6dip" 
-        android:topLeftRadius="6dip" 
-        android:topRightRadius="6dip" /> 
+            <corners android:radius="?attr/borderCornerRadius" />
 </shape>

libappbase/src/main/res/drawable/bg_container_border.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="@android:color/transparent" />
+    <stroke android:width="1dp" android:color="#FFB0B0B0" />
+    <corners android:radius="?attr/borderCornerRadius" />
+</shape>

libappbase/src/main/res/drawable/bg_toolbar_log.xml

@@ -12,11 +12,7 @@
                 android:angle="270" 
                 android:endColor="@color/colorPrimary" 
                 android:startColor="@color/colorPrimary" /> 
-            <corners 
-                android:bottomLeftRadius="6dip" 
-                android:bottomRightRadius="6dip" 
-                android:topLeftRadius="6dip" 
-                android:topRightRadius="6dip" /> 
+            <corners android:radius="?attr/borderCornerRadius" />
         </shape> 
     </item> 
     <!-- 背景部分 --> 
@@ -31,11 +27,7 @@
                 android:angle="270" 
                 android:endColor="@color/colorPrimary" 
                 android:startColor="@color/colorPrimary" /> 
-            <corners 
-                android:bottomLeftRadius="6dip" 
-                android:bottomRightRadius="6dip" 
-                android:topLeftRadius="6dip" 
-                android:topRightRadius="6dip" /> 
+            <corners android:radius="?attr/borderCornerRadius" />
         </shape> 
     </item> 
 </layer-list>

libappbase/src/main/res/layout/activity_about.xml

@@ -4,7 +4,7 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent" android:background="@drawable/bg_container_border">
 
 	<android.widget.Toolbar
 		android:layout_width="match_parent"
@@ -16,5 +16,5 @@
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
 		android:layout_weight="1.0"
-		android:id="@+id/aboutviewroot_ll"/>
+		android:id="@+id/aboutviewroot_ll" android:background="@drawable/bg_container_border" />
 </LinearLayout>

libappbase/src/main/res/layout/activity_globalcrash.xml

@@ -4,7 +4,7 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent" android:background="@drawable/bg_container_border">
 
 	<cc.winboll.studio.libappbase.GlobalCrashReportView
 		android:layout_width="match_parent"

libappbase/src/main/res/layout/activity_log.xml

@@ -3,7 +3,7 @@
 	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:layout_height="match_parent" android:background="@drawable/bg_container_border">
 
 	<cc.winboll.studio.libappbase.LogView
 		android:layout_width="match_parent"

libappbase/src/main/res/layout/activity_nfc_rsa_operate.xml

@@ -14,7 +14,6 @@
         android:layout_height="wrap_content"
         android:text="正在监听NFC卡片，请贴近设备检测密钥..."
         android:textSize="17sp"
-        android:textColor="@android:color/black"
         android:gravity="center"
         android:padding="12dp"
         android:layout_marginBottom="30dp"/>
@@ -26,7 +25,6 @@
         android:layout_height="wrap_content"
         android:text="私钥内容：无"
         android:textSize="14sp"
-        android:textColor="@android:color/darker_gray"
         android:layout_marginBottom="12dp"
         android:maxLines="5"
         android:ellipsize="end"/>
@@ -38,7 +36,6 @@
         android:layout_height="wrap_content"
         android:text="公钥内容：无"
         android:textSize="14sp"
-        android:textColor="@android:color/darker_gray"
         android:layout_marginBottom="40dp"
         android:maxLines="5"
         android:ellipsize="end"/>
@@ -50,7 +47,6 @@
         android:layout_height="wrap_content"
         android:text="功能按钮待激活"
         android:textSize="16sp"
-        android:textColor="@android:color/white"
         android:backgroundTint="@android:color/holo_blue_light"
         android:padding="14dp"
         android:enabled="false"/>

libappbase/src/main/res/layout/dialog_sign_get.xml

@@ -13,13 +13,12 @@
 		android:layout_height="wrap_content"
 		android:text="应用指纹校验"
 		android:textSize="16sp"
-		android:textColor="@color/gray_900"
 		android:textStyle="bold"
 		android:layout_marginBottom="12dp"/>
 
 	<ScrollView
 		android:layout_width="wrap_content"
-		android:layout_height="wrap_content">
+		android:layout_height="wrap_content" android:background="@drawable/bg_container_border">
 
 		<EditText
 			android:id="@+id/et_sign_fingerprint"
@@ -45,8 +44,7 @@
 		android:layout_height="wrap_content"
 		android:layout_marginTop="12dp"
 		android:textSize="11sp"
-		android:gravity="center"
-		android:textColor="@color/gray_900"/>
+		android:gravity="center"/>
 
 </LinearLayout>
 

libappbase/src/main/res/layout/dialog_winboll_host.xml

@@ -12,7 +12,6 @@
         android:layout_height="wrap_content"
         android:text="设置服务器地址"
         android:textSize="16sp"
-        android:textColor="#212121"
         android:textStyle="bold"
         android:layout_marginBottom="16dp"/>
 
@@ -33,7 +32,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:gravity="end">
+        android:gravity="end" android:background="@drawable/bg_container_border">
 
         <!-- 取消按钮 -->
         <Button
@@ -51,8 +50,7 @@
             android:layout_height="wrap_content"
             android:text="确认"
             android:textSize="14sp"
-            android:backgroundTint="#2196F3"
-            android:textColor="#FFFFFF"/>
+            android:backgroundTint="#2196F3"/>
 
     </LinearLayout>
 

libappbase/src/main/res/layout/layout_about_view.xml

@@ -2,7 +2,7 @@
 <ScrollView
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent" android:background="@drawable/bg_container_border">
 
 	<LinearLayout
 		android:layout_width="match_parent"
@@ -12,7 +12,7 @@
 		android:paddingLeft="16dp"
 		android:paddingTop="16dp"
 		android:paddingRight="16dp"
-		android:paddingBottom="16dp">
+		android:paddingBottom="16dp" android:background="@drawable/bg_container_border">
 
 		<cc.winboll.studio.libappbase.views.DebugSwitchImageView
 			android:id="@+id/iv_app_icon"
@@ -25,8 +25,7 @@
 			android:id="@+id/tv_app_name_version"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:textSize="18sp"
-			android:textColor="@color/gray_900"/>
+			android:textSize="18sp"/>
 
 		<TextView
 			android:id="@+id/tv_app_desc"
@@ -34,8 +33,7 @@
 			android:layout_height="wrap_content"
 			android:layout_marginTop="4dp"
 			android:layout_marginBottom="8dp"
-			android:textSize="14sp"
-			android:textColor="@color/gray_500"/>
+			android:textSize="14sp"/>
 
 		<View
 			android:layout_width="match_parent"
@@ -48,7 +46,7 @@
 			android:id="@+id/ll_function_container"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:orientation="vertical"/>
+			android:orientation="vertical" android:background="@drawable/bg_container_border" />
 
 		<LinearLayout
 			android:orientation="horizontal"
@@ -56,7 +54,7 @@
 			android:layout_height="wrap_content"
 			android:gravity="center"
 			android:layout_marginTop="8dp"
-			android:spacing="20dp">
+			android:spacing="20dp" android:background="@drawable/bg_container_border">
 
 			<ImageButton
 				android:layout_width="48dp"

libappbase/src/main/res/layout/view_globalcrashreport.xml

@@ -5,7 +5,7 @@
 	android:orientation="vertical"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:id="@+id/viewglobalcrashreportLinearLayout1">
+	android:id="@+id/viewglobalcrashreportLinearLayout1" android:background="@drawable/bg_container_border">
 
     <android.widget.Toolbar
         android:layout_width="match_parent"
@@ -15,11 +15,11 @@
 	<ScrollView
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
-		android:layout_weight="1.0">
+		android:layout_weight="1.0" android:background="@drawable/bg_container_border">
 
 		<HorizontalScrollView
 			android:layout_width="match_parent"
-			android:layout_height="match_parent">
+			android:layout_height="match_parent" android:background="@drawable/bg_container_border">
 
 			<TextView
 				android:layout_width="match_parent"

libappbase/src/main/res/layout/view_log.xml

@@ -19,7 +19,6 @@
 			android:layout_height="@dimen/log_button_height"
 			android:textSize="@dimen/log_text_size"
 			android:text="Clean"
-			android:textColor="@color/white"
 			android:backgroundTint="@drawable/btn_gray_bg"
 			android:layout_centerVertical="true"
 			android:id="@+id/viewlogButtonClean"
@@ -34,8 +33,7 @@
 			android:layout_toRightOf="@+id/viewlogButtonClean"
 			android:layout_centerVertical="true"
 			android:id="@+id/viewlogTextView1"
-			android:background="@color/btn_gray_normal"
-			android:textColor="@color/black"/>
+			android:background="@color/btn_gray_normal"/>
 
 		<cc.winboll.studio.libappbase.widget.LogTagSpinner
 			android:layout_width="wrap_content"
@@ -54,14 +52,13 @@
 			android:text="Selectable"
 			android:background="@color/btn_gray_normal"
 			android:id="@+id/viewlogCheckBoxSelectable"
-			android:padding="@dimen/log_text_padding"
-			android:textColor="@color/white"/>
+			android:textColor="?android:attr/textColorPrimary"
+			android:padding="@dimen/log_text_padding"/>
 
 		<Button
 			android:layout_width="@dimen/log_button_width"
 			android:layout_height="@dimen/log_button_height"
 			android:textSize="@dimen/log_text_size"
-			android:textColor="@color/white"
 			android:backgroundTint="@drawable/btn_gray_bg"
 			android:text="Copy"
 			android:layout_alignParentRight="true"
@@ -89,6 +86,7 @@
 			android:id="@+id/viewlogCheckBox1"
 			android:background="@drawable/bg_border_round"
 			android:layout_marginLeft="5dp"
+			android:textColor="?android:attr/textColorPrimary"
 			android:layout_marginRight="5dp"/>
 
 		<EditText
@@ -123,7 +121,7 @@
 		android:layout_height="wrap_content"
 		android:layout_weight="1.0"
 		android:layout_alignParentBottom="true"
-		android:layout_below="@+id/viewlogLinearLayout1">
+		android:layout_below="@+id/viewlogLinearLayout1" android:background="@drawable/bg_container_border">
 
 		<ScrollView
 			android:layout_width="match_parent"
@@ -136,7 +134,6 @@
 				android:layout_height="match_parent"
 				android:textSize="@dimen/log_text_size"
 				android:text="Text"
-				android:textColor="#FF00FF00"
 				android:textIsSelectable="true"
 				android:id="@+id/viewlogTextViewLog"/>
 

libappbase/src/main/res/values/attrs.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <attr name="borderCornerRadius" format="dimension" />
     <attr name="themeGlobalCrashActivity" format="reference"/>
 
     <declare-styleable name="GlobalCrashActivity">

libgpsrelaysentinel/build.gradle

@@ -1,25 +0,0 @@
-apply plugin: 'com.android.library'
-apply plugin: 'maven-publish'
-apply from: '../.winboll/winboll_lib_build.gradle'
-apply from: '../.winboll/winboll_lint_build.gradle'
-
-android {
-	// 适配MIUI12
-	compileSdkVersion 30
-    buildToolsVersion "30.0.3"
-
-    defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 30
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-}
-
-dependencies {
-    api fileTree(dir: 'libs', include: ['*.jar'])
-}

libgpsrelaysentinel/build.properties

@@ -1,8 +0,0 @@
-#Created by .winboll/winboll_app_build.gradle
-#Fri May 01 17:09:11 HKT 2026
-stageCount=57
-libraryProject=libdebugtemp
-baseVersion=15.0
-publishVersion=15.0.56
-buildCount=0
-baseBetaVersion=15.0.57

libgpsrelaysentinel/proguard-rules.pro

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

libgpsrelaysentinel/src/main/AndroidManifest.xml

@@ -1,27 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cc.winboll.studio.libgpsrelaysentinel">
-
-    <application>
-		<service
-			android:name=".service.GpsSubscribeReceiverService"
-			android:exported="true"
-			android:enabled="true">
-			<intent-filter>
-				<action android:name="cc.winboll.studio.libgpsrelaysentinel.action.RECEIVE" />
-			</intent-filter>
-		</service>
-		
-        <receiver android:name=".receiver.GpsSubscribeObserverReceiver">
-
-            <intent-filter>
-
-                <action android:name=".receiver.GpsSubscribeObserverReceiver"/>
-
-            </intent-filter>
-
-        </receiver>
-    </application>
-
-</manifest>

libgpsrelaysentinel/src/main/java/cc/winboll/studio/libgpsrelaysentinel/manager/GpsSubscribeManager.java

@@ -1,75 +0,0 @@
-package cc.winboll.studio.libgpsrelaysentinel.manager;
-
-/**
- * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @Date 2026/05/07 10:25
- */
-
-import android.content.Context;
-import android.content.Intent;
-import java.util.HashMap;
-import java.util.Map;
-
-import cc.winboll.studio.libgpsrelaysentinel.model.GpsSubscribeConst;
-import cc.winboll.studio.libgpsrelaysentinel.model.GpsSubscribeMsg;
-import cc.winboll.studio.libgpsrelaysentinel.model.GpsSubscribeResult;
-
-public final class GpsSubscribeManager {
-
-    private static GpsSubscribeManager instance;
-    private final Map<String,GpsSubscribeMsg> subscribeMap;
-    private Context appContext;
-
-    private GpsSubscribeManager(){
-        subscribeMap = new HashMap<String, GpsSubscribeMsg>();
-    }
-
-    public static GpsSubscribeManager getInstance(){
-        if(instance == null){
-            instance = new GpsSubscribeManager();
-        }
-        return instance;
-    }
-
-    public void initContext(final Context context){
-        this.appContext = context.getApplicationContext();
-    }
-
-    public void addSubscribe(final GpsSubscribeMsg subscribeMsg){
-        if(subscribeMsg == null){
-            return;
-        }
-        subscribeMap.put(subscribeMsg.getSubscribeUniqueId(),subscribeMsg);
-    }
-
-    public void removeSubscribe(final String sid){
-        if(sid == null){
-            return;
-        }
-        subscribeMap.remove(sid);
-        SubscribeLocationManager.getInstance().removeSubscribe(sid);
-    }
-
-    public boolean isSubscribeExist(final String sid){
-        return subscribeMap.containsKey(sid);
-    }
-
-    public void sendSubscribeResult(final GpsSubscribeResult result){
-        if(appContext == null || result == null){
-            return;
-        }
-        Intent intent = new Intent(GpsSubscribeConst.ACTION_SUBSCRIBE_CALLBACK);
-        intent.putExtra("data",result);
-        appContext.sendBroadcast(intent);
-    }
-
-    public void clearAllSubscribe(){
-        subscribeMap.clear();
-        SubscribeLocationManager.getInstance().clearAll();
-    }
-
-    public Map<String, GpsSubscribeMsg> getSubscribeMap() {
-        return subscribeMap;
-    }
-}
-

libgpsrelaysentinel/src/main/java/cc/winboll/studio/libgpsrelaysentinel/manager/SubscribeLocationManager.java

@@ -1,103 +0,0 @@
-package cc.winboll.studio.libgpsrelaysentinel.manager;
-
-/**
- * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @Date 2026/05/07 10:26
- */
-
-import cc.winboll.studio.libgpsrelaysentinel.model.GpsSubscribeConst;
-import cc.winboll.studio.libgpsrelaysentinel.model.GpsSubscribeMsg;
-import cc.winboll.studio.libgpsrelaysentinel.model.LocationPoint;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public final class SubscribeLocationManager {
-
-    private static SubscribeLocationManager instance;
-    private final Map<String,GpsSubscribeMsg> subscribeConfigMap;
-    private final Map<String,LocationPoint> subscriberPointMap;
-
-    private SubscribeLocationManager(){
-        subscribeConfigMap = new HashMap<String, GpsSubscribeMsg>();
-        subscriberPointMap = new HashMap<String, LocationPoint>();
-    }
-
-    public static SubscribeLocationManager getInstance(){
-        if(instance == null){
-            instance = new SubscribeLocationManager();
-        }
-        return instance;
-    }
-
-    public void putSubscribeConfig(final String sid,final GpsSubscribeMsg msg){
-        subscribeConfigMap.put(sid,msg);
-    }
-
-    public void initSubscriberPoint(final String sid,double lat,double lng){
-        subscriberPointMap.put(sid,new LocationPoint(lat,lng,System.currentTimeMillis()));
-    }
-
-    public void updateSubscriberPoint(final String sid,double lat,double lng){
-        subscriberPointMap.put(sid,new LocationPoint(lat,lng,System.currentTimeMillis()));
-    }
-
-    public LocationPoint getLastPoint(final String sid){
-        return subscriberPointMap.get(sid);
-    }
-
-    public GpsSubscribeMsg getSubscribeConfig(final String sid){
-        return subscribeConfigMap.get(sid);
-    }
-
-    public boolean isNeedPush(final String sid,double nowLat,double nowLng){
-        GpsSubscribeMsg config = getSubscribeConfig(sid);
-        if(config == null){
-            return false;
-        }
-
-        if(config.getSubscribeMode() == GpsSubscribeConst.SUB_TYPE_ALL){
-            return true;
-        }
-
-        LocationPoint lastPoint = getLastPoint(sid);
-        if(lastPoint == null){
-            return true;
-        }
-
-        double distance = calculateDistance(
-			lastPoint.getLatitude(),lastPoint.getLongitude(),
-			nowLat,nowLng
-        );
-        return distance >= config.getStepDistanceM();
-    }
-
-    private double calculateDistance(double lat1,double lng1,double lat2,double lng2){
-        double radLat1 = Math.toRadians(lat1);
-        double radLat2 = Math.toRadians(lat2);
-        double radLng1 = Math.toRadians(lng1);
-        double radLng2 = Math.toRadians(lng2);
-
-        double latDiff = radLat1 - radLat2;
-        double lngDiff = radLng1 - radLng2;
-
-        double result = 2 * Math.asin(Math.sqrt(
-										  Math.pow(Math.sin(latDiff / 2),2)
-										  + Math.cos(radLat1) * Math.cos(radLat2)
-										  * Math.pow(Math.sin(lngDiff / 2),2)
-									  ));
-        result = result * GpsSubscribeConst.EARTH_RADIUS;
-        return result;
-    }
-
-    public void removeSubscribe(final String sid){
-        subscribeConfigMap.remove(sid);
-        subscriberPointMap.remove(sid);
-    }
-
-    public void clearAll(){
-        subscribeConfigMap.clear();
-        subscriberPointMap.clear();
-    }
-}
-

libgpsrelaysentinel/src/main/java/cc/winboll/studio/libgpsrelaysentinel/model/GpsSubscribeConst.java

@@ -1,46 +0,0 @@
-package cc.winboll.studio.libgpsrelaysentinel.model;
-
-/**
- * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @Date 2026/05/07 10:22
- * WinBoLL Studio
- * Java7 | API26-30
- */
-public final class GpsSubscribeConst {
-	
-	// 新增：GPS定位推送广播
-	public static final String ACTION_GPS_LOCATION = "cc.winboll.studio.ACTION_GPS_LOCATION";
-
-    //订阅运行模式
-    public static final int SUB_TYPE_ALL = 1;
-    public static final int SUB_TYPE_STEP_DISTANCE = 2;
-
-    //原始数据订阅类型
-    public static final int SUBSCRIBE_TYPE_LOCATION = 1;
-    public static final int SUBSCRIBE_TYPE_SATELLITE = 2;
-    public static final int SUBSCRIBE_TYPE_NMEA = 3;
-
-    //订阅返回码
-    public static final int RESULT_SUCCESS = 0;
-    public static final int RESULT_PERMISSION_DENY = 1;
-    public static final int RESULT_PARAM_ERROR = 2;
-    public static final int RESULT_GPS_NOT_AVAILABLE = 3;
-    public static final int RESULT_SYSTEM_LIMIT = 4;
-
-    //GPS设备状态
-    public static final int GPS_STATE_CLOSE = 0;
-    public static final int GPS_STATE_SCANNING = 1;
-    public static final int GPS_STATE_LOCATED = 2;
-    public static final int GPS_STATE_SIGNAL_WEAK = 3;
-
-    //广播Action
-    public static final String ACTION_SUBSCRIBE_REQUEST = "cc.winboll.studio.GPS_SUBSCRIBE_REQUEST";
-    public static final String ACTION_SUBSCRIBE_CALLBACK = "cc.winboll.studio.GPS_SUBSCRIBE_CALLBACK";
-
-    //超时毫秒
-    public static final long SUBSCRIBE_TIME_OUT = 5000;
-
-    //地球半径 距离计算常量
-    public static final double EARTH_RADIUS = 6378137.0;
-}
-

libgpsrelaysentinel/src/main/java/cc/winboll/studio/libgpsrelaysentinel/model/GpsSubscribeMsg.java

@@ -1,137 +0,0 @@
-package cc.winboll.studio.libgpsrelaysentinel.model;
-
-/**
- * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @Date 2026/05/07 10:24
- */
-import android.os.Bundle;
-import android.os.Parcel;
-import android.os.Parcelable;
-
-public final class GpsSubscribeMsg implements Parcelable {
-
-    private final String subscribePackage;
-    private final int subscribeMode;
-    private final float stepDistanceM;
-
-    private final int subscribeType;
-    private final long updateInterval;
-    private final float minDistance;
-    private final boolean backgroundPush;
-    private final String subscribeUniqueId;
-
-    public GpsSubscribeMsg(String subscribePackage,
-                           int subscribeMode,
-                           float stepDistanceM,
-                           int subscribeType,
-                           long updateInterval,
-                           float minDistance,
-                           boolean backgroundPush,
-                           String subscribeUniqueId) {
-        this.subscribePackage = subscribePackage;
-        this.subscribeMode = subscribeMode;
-        this.stepDistanceM = stepDistanceM;
-        this.subscribeType = subscribeType;
-        this.updateInterval = updateInterval;
-        this.minDistance = minDistance;
-        this.backgroundPush = backgroundPush;
-        this.subscribeUniqueId = subscribeUniqueId;
-    }
-
-    public String getSubscribePackage() {
-        return subscribePackage;
-    }
-
-    public int getSubscribeMode() {
-        return subscribeMode;
-    }
-
-    public float getStepDistanceM() {
-        return stepDistanceM;
-    }
-
-    public int getSubscribeType() {
-        return subscribeType;
-    }
-
-    public long getUpdateInterval() {
-        return updateInterval;
-    }
-
-    public float getMinDistance() {
-        return minDistance;
-    }
-
-    public boolean isBackgroundPush() {
-        return backgroundPush;
-    }
-
-    public String getSubscribeUniqueId() {
-        return subscribeUniqueId;
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(subscribePackage);
-        dest.writeInt(subscribeMode);
-        dest.writeFloat(stepDistanceM);
-        dest.writeInt(subscribeType);
-        dest.writeLong(updateInterval);
-        dest.writeFloat(minDistance);
-        dest.writeByte((byte) (backgroundPush ? 1 : 0));
-        dest.writeString(subscribeUniqueId);
-    }
-
-    public static final Creator<GpsSubscribeMsg> CREATOR = new Creator<GpsSubscribeMsg>() {
-        @Override
-        public GpsSubscribeMsg createFromParcel(Parcel in) {
-            return new GpsSubscribeMsg(
-				in.readString(),
-				in.readInt(),
-				in.readFloat(),
-				in.readInt(),
-				in.readLong(),
-				in.readFloat(),
-				in.readByte() == 1,
-				in.readString()
-            );
-        }
-
-        @Override
-        public GpsSubscribeMsg[] newArray(int size) {
-            return new GpsSubscribeMsg[size];
-        }
-    };
-
-    public Bundle convertToBundle() {
-        Bundle bundle = new Bundle();
-        bundle.putString("pkg", subscribePackage);
-        bundle.putInt("subMode",subscribeMode);
-        bundle.putFloat("stepM",stepDistanceM);
-        bundle.putInt("type", subscribeType);
-        bundle.putLong("interval", updateInterval);
-        bundle.putFloat("distance", minDistance);
-        bundle.putBoolean("bgPush", backgroundPush);
-        bundle.putString("sid", subscribeUniqueId);
-        return bundle;
-    }
-
-    public static GpsSubscribeMsg createByBundle(Bundle bundle) {
-        return new GpsSubscribeMsg(
-			bundle.getString("pkg"),
-			bundle.getInt("subMode"),
-			bundle.getFloat("stepM"),
-			bundle.getInt("type"),
-			bundle.getLong("interval"),
-			bundle.getFloat("distance"),
-			bundle.getBoolean("bgPush"),
-			bundle.getString("sid")
-        );
-    }
-}
-

libgpsrelaysentinel/src/main/java/cc/winboll/studio/libgpsrelaysentinel/model/GpsSubscribeResult.java

@@ -1,115 +0,0 @@
-package cc.winboll.studio.libgpsrelaysentinel.model;
-
-/**
- * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @Date 2026/05/07 10:25
- */
-
-import android.os.Bundle;
-import android.os.Parcel;
-import android.os.Parcelable;
-
-public final class GpsSubscribeResult implements Parcelable {
-
-    private final String subscribeUniqueId;
-    private final int resultCode;
-    private final String resultDesc;
-    private final int gpsRunningState;
-    private final long realEffectiveInterval;
-    private final long currentTimeStamp;
-
-    public GpsSubscribeResult(String subscribeUniqueId,
-                              int resultCode,
-                              String resultDesc,
-                              int gpsRunningState,
-                              long realEffectiveInterval,
-                              long currentTimeStamp) {
-        this.subscribeUniqueId = subscribeUniqueId;
-        this.resultCode = resultCode;
-        this.resultDesc = resultDesc;
-        this.gpsRunningState = gpsRunningState;
-        this.realEffectiveInterval = realEffectiveInterval;
-        this.currentTimeStamp = currentTimeStamp;
-    }
-
-    public String getSubscribeUniqueId() {
-        return subscribeUniqueId;
-    }
-
-    public int getResultCode() {
-        return resultCode;
-    }
-
-    public String getResultDesc() {
-        return resultDesc;
-    }
-
-    public int getGpsRunningState() {
-        return gpsRunningState;
-    }
-
-    public long getRealEffectiveInterval() {
-        return realEffectiveInterval;
-    }
-
-    public long getCurrentTimeStamp() {
-        return currentTimeStamp;
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(subscribeUniqueId);
-        dest.writeInt(resultCode);
-        dest.writeString(resultDesc);
-        dest.writeInt(gpsRunningState);
-        dest.writeLong(realEffectiveInterval);
-        dest.writeLong(currentTimeStamp);
-    }
-
-    public static final Creator<GpsSubscribeResult> CREATOR = new Creator<GpsSubscribeResult>() {
-        @Override
-        public GpsSubscribeResult createFromParcel(Parcel in) {
-            return new GpsSubscribeResult(
-				in.readString(),
-				in.readInt(),
-				in.readString(),
-				in.readInt(),
-				in.readLong(),
-				in.readLong()
-            );
-        }
-
-        @Override
-        public GpsSubscribeResult[] newArray(int size) {
-            return new GpsSubscribeResult[size];
-        }
-    };
-
-    public Bundle convertToBundle() {
-        Bundle bundle = new Bundle();
-        bundle.putString("sid", subscribeUniqueId);
-        bundle.putInt("code", resultCode);
-        bundle.putString("desc", resultDesc);
-        bundle.putInt("gpsState", gpsRunningState);
-        bundle.putLong("realInterval", realEffectiveInterval);
-        bundle.putLong("time", currentTimeStamp);
-        return bundle;
-    }
-
-    public static GpsSubscribeResult createByBundle(Bundle bundle) {
-        return new GpsSubscribeResult(
-			bundle.getString("sid"),
-			bundle.getInt("code"),
-			bundle.getString("desc"),
-			bundle.getInt("gpsState"),
-			bundle.getLong("realInterval"),
-			bundle.getLong("time")
-        );
-    }
-}
-

libgpsrelaysentinel/src/main/java/cc/winboll/studio/libgpsrelaysentinel/model/LocationPoint.java

@@ -1,37 +0,0 @@
-package cc.winboll.studio.libgpsrelaysentinel.model;
-
-import java.io.Serializable;
-
-/**
- * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @Date 2026/05/07 10:23
- * 订阅者基准定点坐标
- * 每次推送成功自动更新
- */
-public final class LocationPoint implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private final double latitude;
-    private final double longitude;
-    private final long recordTime;
-
-    public LocationPoint(double latitude, double longitude, long recordTime) {
-        this.latitude = latitude;
-        this.longitude = longitude;
-        this.recordTime = recordTime;
-    }
-
-    public double getLatitude() {
-        return latitude;
-    }
-
-    public double getLongitude() {
-        return longitude;
-    }
-
-    public long getRecordTime() {
-        return recordTime;
-    }
-}
-

libgpsrelaysentinel/src/main/java/cc/winboll/studio/libgpsrelaysentinel/receiver/GpsSubscribeObserverReceiver.java

@@ -1,42 +0,0 @@
-package cc.winboll.studio.libgpsrelaysentinel.receiver;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-/**
- * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @Date 2026/05/07 10:27
- */
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-import cc.winboll.studio.libgpsrelaysentinel.model.GpsSubscribeConst;
-import cc.winboll.studio.libgpsrelaysentinel.model.GpsSubscribeResult;
-
-public final class GpsSubscribeObserverReceiver extends BroadcastReceiver {
-
-    private OnSubscribeResultListener listener;
-
-    public void setOnSubscribeResultListener(OnSubscribeResultListener listener){
-        this.listener = listener;
-    }
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        String action = intent.getAction();
-        if(GpsSubscribeConst.ACTION_SUBSCRIBE_CALLBACK.equals(action)){
-            GpsSubscribeResult result = intent.getParcelableExtra("data");
-            if(listener != null && result != null){
-                listener.onResultBack(result);
-            }
-        }
-    }
-
-    public interface OnSubscribeResultListener{
-        void onResultBack(GpsSubscribeResult result);
-    }
-}
-

libgpsrelaysentinel/src/main/java/cc/winboll/studio/libgpsrelaysentinel/service/GpsSubscribeReceiverService.java

@@ -1,139 +0,0 @@
-package cc.winboll.studio.libgpsrelaysentinel.service;
-
-import android.app.Service;
-import android.content.Intent;
-import android.os.IBinder;
-
-/**
- * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @Date 2026/05/07 10:46
- */
-
-	import android.app.Service;
-	import android.content.Context;
-	import android.content.Intent;
-	import android.os.Binder;
-		import android.os.IBinder;
-		import android.os.RemoteException;
-
-	import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import cc.winboll.studio.libgpsrelaysentinel.model.GpsSubscribeConst;
-import cc.winboll.studio.libgpsrelaysentinel.model.GpsSubscribeMsg;
-import cc.winboll.studio.libgpsrelaysentinel.model.GpsSubscribeResult;
-import cc.winboll.studio.libgpsrelaysentinel.model.LocationPoint;
-
-/**
- * 对外消息接收服务：外部App可bind或start
- * 收到GPS消息后，通过本地广播回调给外部App
- */
-public final class GpsSubscribeReceiverService extends Service {
-
-    // 外部回调监听
-    public interface GpsMessageListener {
-        void onGpsLocation(LocationPoint point, GpsSubscribeMsg config);
-        void onSubscribeResult(GpsSubscribeResult result);
-    }
-
-    private final List<GpsMessageListener> listeners = new CopyOnWriteArrayList<GpsMessageListener>();
-    private final IBinder localBinder = new LocalBinder();
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-    }
-
-    // 外部App绑定服务
-    @Override
-    public IBinder onBind(Intent intent) {
-        return localBinder;
-    }
-
-    // 外部App startService 入口：接收订阅请求
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        if (intent != null && intent.getParcelableExtra("req") != null) {
-            GpsSubscribeMsg msg = intent.getParcelableExtra("req");
-            handleSubscribeRequest(msg);
-        }
-        return START_STICKY;
-    }
-
-    // 处理订阅请求：发送给管理器，并回执
-    private void handleSubscribeRequest(final GpsSubscribeMsg msg) {
-        // 加入订阅管理
-        cc.winboll.studio.libgpsrelaysentinel.manager.GpsSubscribeManager
-                .getInstance().addSubscribe(msg);
-        cc.winboll.studio.libgpsrelaysentinel.manager.SubscribeLocationManager
-                .getInstance().putSubscribeConfig(msg.getSubscribeUniqueId(), msg);
-
-        // 回执成功
-        GpsSubscribeResult result = new GpsSubscribeResult(
-                msg.getSubscribeUniqueId(),
-                GpsSubscribeConst.RESULT_SUCCESS,
-                "subscribe ok",
-                GpsSubscribeConst.GPS_STATE_LOCATED,
-                1000,
-                System.currentTimeMillis()
-        );
-        sendSubscribeResultBroadcast(result);
-        notifySubscribeResult(result);
-    }
-
-    // 供内部（GPS服务）调用：推送定位消息
-    public void pushLocation(final LocationPoint point, final GpsSubscribeMsg config) {
-        sendLocationBroadcast(point, config);
-        notifyGpsLocation(point, config);
-    }
-
-    // ---------- 广播回调（跨进程/外部App接收） ----------
-    private void sendLocationBroadcast(final LocationPoint point, final GpsSubscribeMsg config) {
-        Intent intent = new Intent(GpsSubscribeConst.ACTION_GPS_LOCATION);
-        intent.putExtra("point", point);
-        intent.putExtra("config", config);
-        sendBroadcast(intent);
-    }
-
-    private void sendSubscribeResultBroadcast(final GpsSubscribeResult result) {
-        Intent intent = new Intent(GpsSubscribeConst.ACTION_SUBSCRIBE_CALLBACK);
-        intent.putExtra("data", result);
-        sendBroadcast(intent);
-    }
-
-    // ---------- 本地Binder（同进程直接回调） ----------
-    public class LocalBinder extends Binder {
-        public GpsSubscribeReceiverService getService() {
-            return GpsSubscribeReceiverService.this;
-        }
-    }
-
-    public void addListener(final GpsMessageListener l) {
-        if (l != null && !listeners.contains(l)) {
-            listeners.add(l);
-        }
-    }
-
-    public void removeListener(final GpsMessageListener l) {
-        listeners.remove(l);
-    }
-
-    private void notifyGpsLocation(final LocationPoint point, final GpsSubscribeMsg config) {
-        for (GpsMessageListener l : listeners) {
-            l.onGpsLocation(point, config);
-        }
-    }
-
-    private void notifySubscribeResult(final GpsSubscribeResult result) {
-        for (GpsMessageListener l : listeners) {
-            l.onSubscribeResult(result);
-        }
-    }
-
-    @Override
-    public void onDestroy() {
-        listeners.clear();
-        super.onDestroy();
-    }
-}
-

libgpsrelaysentinel/src/main/java/cc/winboll/studio/libgpsrelaysentinel/util/TimeCountUtil.java

@@ -1,51 +0,0 @@
-package cc.winboll.studio.libgpsrelaysentinel.util;
-
-/**
- * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @Date 2026/05/07 10:26
- */
-
-import android.os.Handler;
-import android.os.Message;
-
-public final class TimeCountUtil {
-
-    private final Handler mHandler;
-    private long totalTime;
-    private boolean isRunning;
-    public static final int COUNT_FINISH = 1001;
-
-    public TimeCountUtil(final OnCountListener listener) {
-        mHandler = new Handler() {
-            @Override
-            public void handleMessage(Message msg) {
-                super.handleMessage(msg);
-                if(msg.what == COUNT_FINISH){
-                    isRunning = false;
-                    if(listener != null){
-                        listener.onTimeOut();
-                    }
-                }
-            }
-        };
-    }
-
-    public void start(long time){
-        if(isRunning){
-            return;
-        }
-        totalTime = time;
-        isRunning = true;
-        mHandler.sendEmptyMessageDelayed(COUNT_FINISH,totalTime);
-    }
-
-    public void cancel(){
-        mHandler.removeMessages(COUNT_FINISH);
-        isRunning = false;
-    }
-
-    public interface OnCountListener{
-        void onTimeOut();
-    }
-}
-

libgpsrelaysentinel/src/main/java/cc/winboll/studio/libgpsrelaysentinel/view/GpsSubscribeControlView.java

@@ -1,174 +0,0 @@
-package cc.winboll.studio.libgpsrelaysentinel.view;
-
-/**
- * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @Date 2026/05/07 10:27
- */
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.CompoundButton;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.RadioButton;
-import android.widget.RadioGroup;
-import android.widget.Switch;
-import android.widget.TextView;
-import cc.winboll.studio.libgpsrelaysentinel.R;
-
-import java.util.UUID;
-
-import cc.winboll.studio.libgpsrelaysentinel.model.GpsSubscribeConst;
-import cc.winboll.studio.libgpsrelaysentinel.model.GpsSubscribeMsg;
-import cc.winboll.studio.libgpsrelaysentinel.model.GpsSubscribeResult;
-import cc.winboll.studio.libgpsrelaysentinel.receiver.GpsSubscribeObserverReceiver;
-import cc.winboll.studio.libgpsrelaysentinel.util.TimeCountUtil;
-
-public final class GpsSubscribeControlView extends LinearLayout {
-
-    private RadioGroup rgSubMode;
-    private RadioButton rbAll;
-    private RadioButton rbStep;
-    private LinearLayout layoutStepSetting;
-    private EditText etStepMeter;
-
-    private Switch mSwitchSubscribe;
-    private TextView mTvCountTip;
-
-    private TimeCountUtil mTimeCountUtil;
-    private GpsSubscribeObserverReceiver mResultReceiver;
-    private String currentSubscribeSid;
-    private boolean isSubscribeSuccess;
-
-    public GpsSubscribeControlView(Context context) {
-        super(context);
-        initView();
-    }
-
-    public GpsSubscribeControlView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        initView();
-    }
-
-    private void initView(){
-        setOrientation(VERTICAL);
-        inflate(getContext(),R.layout.view_gps_subscribe_control,this);
-
-        rgSubMode = findViewById(R.id.rg_sub_mode);
-        rbAll = findViewById(R.id.rb_all);
-        rbStep = findViewById(R.id.rb_step);
-        layoutStepSetting = findViewById(R.id.layout_step_setting);
-        etStepMeter = findViewById(R.id.et_step_meter);
-
-        mSwitchSubscribe = findViewById(R.id.switch_subscribe);
-        mTvCountTip = findViewById(R.id.tv_count_tip);
-
-        initModeSwitch();
-        initCountUtil();
-        initReceiver();
-        initSwitchEvent();
-    }
-
-    private void initModeSwitch(){
-        rgSubMode.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
-				@Override
-				public void onCheckedChanged(RadioGroup group, int checkedId) {
-					layoutStepSetting.setVisibility(checkedId == R.id.rb_step ? View.VISIBLE : View.GONE);
-				}
-			});
-    }
-
-    private void initCountUtil(){
-        mTimeCountUtil = new TimeCountUtil(new TimeCountUtil.OnCountListener() {
-				@Override
-				public void onTimeOut() {
-					if(!isSubscribeSuccess){
-						mSwitchSubscribe.setChecked(false);
-						mTvCountTip.setText("订阅超时，已自动关闭");
-					}
-				}
-			});
-    }
-
-    private void initReceiver(){
-        mResultReceiver = new GpsSubscribeObserverReceiver();
-        mResultReceiver.setOnSubscribeResultListener(new GpsSubscribeObserverReceiver.OnSubscribeResultListener() {
-				@Override
-				public void onResultBack(GpsSubscribeResult result) {
-					if(currentSubscribeSid.equals(result.getSubscribeUniqueId())){
-						isSubscribeSuccess = true;
-						mTimeCountUtil.cancel();
-						mTvCountTip.setText("订阅已生效，通讯正常");
-					}
-				}
-			});
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(GpsSubscribeConst.ACTION_SUBSCRIBE_CALLBACK);
-        getContext().registerReceiver(mResultReceiver,filter);
-    }
-
-    private void initSwitchEvent(){
-        mSwitchSubscribe.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-				@Override
-				public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-					if(isChecked){
-						startSubscribe();
-					}else{
-						stopSubscribe();
-					}
-				}
-			});
-    }
-
-    private void startSubscribe(){
-        isSubscribeSuccess = false;
-        currentSubscribeSid = UUID.randomUUID().toString();
-        mTvCountTip.setText("等待订阅返回中...");
-
-        int subMode = GpsSubscribeConst.SUB_TYPE_ALL;
-        float stepMeter = 10.0f;
-
-        if(rbStep.isChecked()){
-            subMode = GpsSubscribeConst.SUB_TYPE_STEP_DISTANCE;
-            try{
-                stepMeter = Float.parseFloat(etStepMeter.getText().toString().trim());
-            }catch (Exception e){
-                stepMeter = 10.0f;
-            }
-        }
-
-        GpsSubscribeMsg msg = new GpsSubscribeMsg(
-			getContext().getPackageName(),
-			subMode,
-			stepMeter,
-			GpsSubscribeConst.SUBSCRIBE_TYPE_LOCATION,
-			1000,
-			1.0f,
-			true,
-			currentSubscribeSid
-        );
-
-        Intent intent = new Intent(GpsSubscribeConst.ACTION_SUBSCRIBE_REQUEST);
-        intent.putExtra("req",msg);
-        getContext().sendBroadcast(intent);
-
-        mTimeCountUtil.start(GpsSubscribeConst.SUBSCRIBE_TIME_OUT);
-    }
-
-    private void stopSubscribe(){
-        mTimeCountUtil.cancel();
-        isSubscribeSuccess = false;
-        mTvCountTip.setText("订阅已关闭");
-    }
-
-    public void release(){
-        mTimeCountUtil.cancel();
-        if(mResultReceiver != null){
-            getContext().unregisterReceiver(mResultReceiver);
-        }
-    }
-}
-

libgpsrelaysentinel/src/main/res/layout/view_gps_subscribe_control.xml

@@ -1,99 +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">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center_vertical">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="订阅模式："
-            android:textSize="14sp"/>
-
-        <RadioGroup
-            android:id="@+id/rg_sub_mode"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <RadioButton
-                android:id="@+id/rb_all"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="全消息订阅"
-                android:checked="true"/>
-
-            <RadioButton
-                android:id="@+id/rb_step"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="步长订阅"/>
-        </RadioGroup>
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/layout_step_setting"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginTop="10dp"
-        android:gravity="center_vertical"
-        android:visibility="gone">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="移动步长阈值(米)："
-            android:textSize="14sp"/>
-
-        <EditText
-            android:id="@+id/et_step_meter"
-            android:layout_width="80dp"
-            android:layout_height="wrap_content"
-            android:inputType="numberDecimal"
-            android:text="10"
-            android:gravity="center"/>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center_vertical"
-        android:layout_marginTop="12dp">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="GPS订阅总开关"
-            android:textSize="14sp"/>
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_weight="1"/>
-
-        <Switch
-            android:id="@+id/switch_subscribe"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/tv_count_tip"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:text="未订阅"
-        android:textSize="12sp"
-        android:textColor="#666666"/>
-
-</LinearLayout>
-

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="AppTheme" parent="@android:style/Theme.Material.Light">
-	</style>
-</resources>