Merge branch 'winboll' into positions

.github/workflows/android.yml

@@ -1,87 +0,0 @@
-name: Android CI
-
-# 触发器
-on:
-  push:
-    tags:
-      - *-beta
-  pull_request:
-    tags:
-      - *-beta
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-    
-    # 设置 JDK 环境
-    steps:
-    - uses: actions/checkout@v3
-    - name: set up JDK 11
-      uses: actions/setup-java@v3
-      with:
-        java-version: '11'
-        distribution: 'temurin'
-        cache: gradle
-    
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-      
-    # 获取应用打包秘钥库
-    - name: Checkout Android Keystore
-      uses: actions/checkout@v3
-      with:
-        repository: zhangsken/keystore # 存储应用打包用的 keystore 的仓库（格式：用户名/仓库名）
-        token: ${{ secrets.APP_SECRET_TOKEN_1 }} # 连接仓库的 token , 需要单独配置
-        path: keystore # 仓库的根目录名
-        
-    # 打包 Stage Release 版本应用
-    - name: Build with Gradle
-      run: bash ./gradlew assembleBetaRelease
-    # 创建release
-    - name: Create Release
-      id: create_release
-      uses: actions/create-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.APP_SECRET_TOKEN_1 }}
-        # GitHub 会自动创建 GITHUB_TOKEN 密码以在工作流程中使用。 
-        # 您可以使用 GITHUB_TOKEN 在工作流程运行中进行身份验证。
-        # 当您启用 GitHub Actions 时，GitHub 在您的仓库中安装 GitHub 应用程序。 
-        # GITHUB_TOKEN 密码是一种 GitHub 应用程序 安装访问令牌。 
-        # 您可以使用安装访问令牌代表仓库中安装的 GitHub 应用程序 进行身份验证。 
-        # 令牌的权限仅限于包含您的工作流程的仓库。 更多信息请参阅“GITHUB_TOKEN 的权限”。
-        # 在每个作业开始之前， GitHub 将为作业提取安装访问令牌。 令牌在作业完成后过期。
-      with:
-        tag_name: ${{ github.ref }}
-        release_name: Release ${{ github.ref }}
-        draft: false
-        prerelease: false
-        
-    # 获取 APK 版本号
-    - name: Get Version Name
-      uses: actions/github-script@v3
-      id: get-version
-      with:
-        script: |
-          const str=process.env.GITHUB_REF;
-          return str.substring(str.indexOf("v"));
-        result-encoding: string
-    # 上传至 Release 的资源
-    - name: Upload Release Asset
-      id: upload-release-asset 
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.APP_SECRET_TOKEN_1 }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }} # 上传网址，无需改动
-        #asset_path: app/build/outputs/apk/release/app-release.apk # 上传路径(Release)
-        asset_path: app/build/outputs/apk/beta/release/app-beta-release.apk # 上传路径(WinBoll Stage Release)
-        asset_name: WinBoll-${{steps.get-version.outputs.result}}0.apk # 资源名
-        asset_content_type: application/vnd.android.package-archiv # 资源类型
-        
-    # 存档打包的文件
-    - name: Archive production artifacts
-      uses: actions/upload-artifact@v2
-      with:
-        name: build
-        path: app/build/outputs # 将打包之后的文件全部上传（里面会有混淆的 map 文件）

.winboll/bashPublishAPKAddTag.sh

@@ -1,166 +1,223 @@
 #!/usr/bin/bash
+# ==============================================================================
+# WinBoLL 应用发布脚本
+# 功能：检查Git源码状态 → 编译Stage Release包 → 添加WinBoLL标签 → 提交并推送源码
+# 依赖：build.properties、app_update_description.txt（项目根目录下）
+# 使用：./script_name.sh <APP_NAME>
+# 作者：豆包&ZhanGSKen<zhangsken@qq.com>
+# ==============================================================================
 
-# 检查是否指定了将要发布的应用名称
-# 使用 `-z` 命令检查变量是否为空
+# ==================== 常量定义 ====================
+# 脚本退出码
+EXIT_CODE_SUCCESS=0
+EXIT_CODE_ERR_NO_APP_NAME=2
+EXIT_CODE_ERR_WORK_DIR=1
+EXIT_CODE_ERR_GIT_CHECK=1
+EXIT_CODE_ERR_ADD_WINBOLL_TAG=1
+
+# Gradle 任务（正式发布）
+GRADLE_TASK_PUBLISH="assembleStageRelease"
+# Gradle 任务（调试用，注释备用）
+# GRADLE_TASK_DEBUG="assembleBetaDebug"
+
+# ==================== 函数定义 ====================
+# 检查Git源码是否已完全提交（无未提交变更）
+# 返回值：0=已完全提交，1=存在未提交变更
+function checkGitSources() {
+    # 配置Git安全目录（解决权限问题）
+    git config --global --add safe.directory "$(pwd)"
+    
+    # 检查是否有未提交的变更
+    if [[ -n $(git diff --stat) ]]; then
+        echo "[ERROR] Git源码存在未提交变更，请先提交所有修改！"
+        return 1
+    fi
+    
+    echo "[INFO] Git源码检查通过：所有变更已提交。"
+    return 0
+}
+
+# 询问是否添加GitHub Workflows标签（当前逻辑注释，保留扩展能力）
+# 返回值：1=用户选择是，0=用户选择否
+function askAddWorkflowsTag() {
+    read -p "是否添加GitHub Workflows标签？(Y/n) " answer
+    if [[ $answer =~ ^[Yy]$ ]]; then
+        return 1
+    else
+        return 0
+    fi
+}
+
+# 添加WinBoLL正式标签
+# 参数：$1=应用名称（项目根目录名）
+# 返回值：0=标签添加成功，1=标签已存在/添加失败
+function addWinBoLLTag() {
+    local app_name=$1
+    local build_prop_path="${app_name}/build.properties"
+    
+    # 从build.properties中提取publishVersion
+    local publish_version=$(grep -o "publishVersion=.*" "${build_prop_path}" | awk -F '=' '{print $2}')
+    if [[ -z ${publish_version} ]]; then
+        echo "[ERROR] 未从${build_prop_path}中提取到publishVersion配置！"
+        return 1
+    fi
+    echo "[INFO] 从${build_prop_path}读取到publishVersion：${publish_version}"
+    
+    # 构造WinBoLL标签（格式：<APP_NAME>-v<publishVersion>）
+    local tag="${app_name}-v${publish_version}"
+    echo "[INFO] 准备添加WinBoLL标签：${tag}"
+    
+    # 检查标签是否已存在
+    if [[ "$(git tag -l ${tag})" == "${tag}" ]]; then
+        echo "[ERROR] WinBoLL标签${tag}已存在！"
+        return 1
+    fi
+    
+    # 添加带注释的标签（注释来自app_update_description.txt）
+    git tag -a "${tag}" -F "${app_name}/app_update_description.txt"
+    echo "[INFO] WinBoLL标签${tag}添加成功！"
+    return 0
+}
+
+# 添加GitHub Workflows Beta标签（当前逻辑注释，保留扩展能力）
+# 参数：$1=应用名称（项目根目录名）
+# 返回值：0=标签添加成功，1=标签已存在/添加失败
+function addWorkflowsTag() {
+    local app_name=$1
+    local build_prop_path="${app_name}/build.properties"
+    
+    # 从build.properties中提取baseBetaVersion
+    local base_beta_version=$(grep -o "baseBetaVersion=.*" "${build_prop_path}" | awk -F '=' '{print $2}')
+    if [[ -z ${base_beta_version} ]]; then
+        echo "[ERROR] 未从${build_prop_path}中提取到baseBetaVersion配置！"
+        return 1
+    fi
+    echo "[INFO] 从${build_prop_path}读取到baseBetaVersion：${base_beta_version}"
+    
+    # 构造Workflows标签（格式：<APP_NAME>-v<baseBetaVersion>-beta）
+    local tag="${app_name}-v${base_beta_version}-beta"
+    echo "[INFO] 准备添加Workflows标签：${tag}"
+    
+    # 检查标签是否已存在
+    if [[ "$(git tag -l ${tag})" == "${tag}" ]]; then
+        echo "[ERROR] Workflows标签${tag}已存在！"
+        return 1
+    fi
+    
+    # 添加带注释的标签（注释来自app_update_description.txt）
+    git tag -a "${tag}" -F "${app_name}/app_update_description.txt"
+    echo "[INFO] Workflows标签${tag}添加成功！"
+    return 0
+}
+
+# ==================== 主流程开始 ====================
+echo "============================================="
+echo "          WinBoLL 应用发布脚本"
+echo "============================================="
+
+# 1. 检查应用名称参数是否指定
 if [ -z "$1" ]; then
-    echo "No APP name specified : $0"
-    exit 2
+    echo "[ERROR] 未指定应用名称！使用方式：${0} <APP_NAME>"
+    exit ${EXIT_CODE_ERR_NO_APP_NAME}
 fi
+APP_NAME=$1
+echo "[INFO] 待发布应用名称：${APP_NAME}"
 
-## 定义相关函数
-## 检查 Git 源码是否完全提交了，完全提交就返回0
-function checkGitSources {
-    #local input="$1"
-    #echo "The string is: $input"
-	git config --global --add safe.directory `pwd`
-	if [[ -n $(git diff --stat)  ]]
-    then
-		local result="Source is no commit completely."
-	    echo $result
-	    # 脚本调试时使用
-	    #return 0
-	    # 正式检查源码时使用
-	    return 1
-    fi
-    local result="Git Source Check OK."
-	echo $result
-    return 0
-}
-
-function askAddWorkflowsTag {
-	read answer
-	if [[ $answer =~ ^[Yy]$ ]]; then
-	    #echo "You chose yes."
-	    return 1
-	else
-	    #echo "You chose no."
-	    return 0
-	fi
-}
-
-function addWinBoLLTag {
-	# 就读取脚本 .winboll/winboll_app_build.gradle 生成的 publishVersion。
-    # 如果文件中有 publishVersion 这一项，
-	# 使用grep找到包含"publishVersion="的那一行，然后用awk提取其后的值
-	PUBLISH_VERSION=$(grep -o "publishVersion=.*" $1/build.properties | awk -F '=' '{print $2}')
-	echo "< $1/build.properties publishVersion : ${PUBLISH_VERSION} >"
-	## 设新的 WinBoLL 标签
-	# 脚本调试时使用
-	#tag="projectname-v7.6.4-test1"
-	# 正式设置标签时使用
-	tag=$1"-v"${PUBLISH_VERSION}
-	echo "< WinBoLL Tag To: $tag >";
-	# 检查是否已经添加了 WinBoLL Tag
-	if [ "$(git tag -l ${tag})" == "${tag}" ]; then
-        echo -e "< WinBoLL Tag ${tag} exist! >"
-        return 1 # WinBoLL标签重复
-    fi
-    # 添加WinBoLL标签
-	git tag -a ${tag} -F $1/app_update_description.txt
-    return 0
-}
-
-function addWorkflowsTag {
-	# 就读取脚本 .winboll/winboll_app_build.gradle 生成的 baseBetaVersion。
-    # 如果文件中有 baseBetaVersion 这一项，
-	# 使用grep找到包含"baseBetaVersion="的那一行，然后用awk提取其后的值
-	BASE_BETA_VERSION=$(grep -o "baseBetaVersion=.*" $1/build.properties | awk -F '=' '{print $2}')
-	echo "< $1/build.properties baseBetaVersion : ${BASE_BETA_VERSION} >"
-	## 设新的 workflows 标签
-	# 脚本调试时使用
-	#tag="projectname-v7.6.4-beta"
-	# 正式设置标签时使用
-	tag=$1"-v"${BASE_BETA_VERSION}-beta
-	echo "< Workflows Tag To: $tag >";
-	# 检查是否已经添加了工作流 Tag
-	if [ "$(git tag -l ${tag})" == "${tag}" ]; then
-        echo -e "< Github Workflows Tag ${tag} exist! >"
-        return 1 # 工作流标签重复
-    fi
-    # 添加工作流标签
-	git tag -a ${tag} -F $1/app_update_description.txt
-    return 0
-}
-
-## 开始执行脚本
-echo -e "Current dir : \n"`pwd`
-# 检查当前目录是否是项目根目录
-if [[ -e $1/build.properties ]]; then
-    echo "The $1/build.properties file exists."
-    echo -e "Work dir correctly."
-else
-    echo "The $1/build.properties file does not exist."
-    echo "尝试进入根目录"
-    # 进入项目根目录
+# 2. 检查并切换到项目根目录（确保build.properties存在）
+echo "[INFO] 当前工作目录：$(pwd)"
+if [[ ! -e "${APP_NAME}/build.properties" ]]; then
+    echo "[WARNING] 当前目录不存在${APP_NAME}/build.properties，尝试切换到上级目录..."
     cd ..
+    echo "[INFO] 切换后工作目录：$(pwd)"
 fi
-## 本脚本需要在项目根目录下执行
-echo -e "Current dir : \n"`pwd`
-# 检查当前目录是否是项目根目录
-if [[ -e $1/build.properties ]]; then
-    echo "The $1/build.properties file exists."
-    echo -e "Work dir correctly."
+
+# 验证最终工作目录是否正确
+if [[ ! -e "${APP_NAME}/build.properties" ]]; then
+    echo "[ERROR] 工作目录错误！${APP_NAME}/build.properties 文件不存在。"
+    exit ${EXIT_CODE_ERR_WORK_DIR}
+fi
+echo "[INFO] 工作目录验证通过：${APP_NAME}/build.properties 存在。"
+
+# 3. 检查Git源码状态
+echo "---------------------------------------------"
+echo "          步骤1：检查Git源码状态"
+echo "---------------------------------------------"
+checkGitSources
+if [[ $? -ne ${EXIT_CODE_SUCCESS} ]]; then
+    echo "[ERROR] Git源码检查失败，脚本终止！"
+    exit ${EXIT_CODE_ERR_GIT_CHECK}
+fi
+
+# 4. 编译Stage Release版本APK
+echo "---------------------------------------------"
+echo "          步骤2：编译Stage Release APK"
+echo "---------------------------------------------"
+echo "[INFO] 开始执行Gradle任务：${GRADLE_TASK_PUBLISH}"
+# 调试用（注释正式任务，启用调试任务）
+# bash gradlew :${APP_NAME}:${GRADLE_TASK_DEBUG}
+bash gradlew :${APP_NAME}:${GRADLE_TASK_PUBLISH}
+
+if [[ $? -ne ${EXIT_CODE_SUCCESS} ]]; then
+    echo "[ERROR] Gradle编译任务失败！"
+    exit 1
+fi
+echo "[INFO] Stage Release APK编译成功！"
+
+# 5. 添加WinBoLL正式标签
+echo "---------------------------------------------"
+echo "          步骤3：添加WinBoLL标签"
+echo "---------------------------------------------"
+addWinBoLLTag ${APP_NAME}
+if [[ $? -ne ${EXIT_CODE_SUCCESS} ]]; then
+    echo "[ERROR] WinBoLL标签添加失败，脚本终止！"
+    exit ${EXIT_CODE_ERR_ADD_WINBOLL_TAG}
+fi
+
+# 6. （可选）添加GitHub Workflows标签（当前逻辑注释，保留扩展能力）
+# echo "---------------------------------------------"
+# echo "          步骤4：添加Workflows标签（可选）"
+# echo "---------------------------------------------"
+# echo "是否添加GitHub Workflows Beta标签？(Y/n) "
+# askAddWorkflowsTag
+# nAskAddWorkflowsTag=$?
+# if [[ ${nAskAddWorkflowsTag} -eq 1 ]]; then
+#     addWorkflowsTag ${APP_NAME}
+#     if [[ $? -ne ${EXIT_CODE_SUCCESS} ]]; then
+#         echo "[ERROR] Workflows标签添加失败，脚本终止！"
+#         exit 1
+#     fi
+# fi
+
+# 7. 清理更新描述文件
+echo "---------------------------------------------"
+echo "          步骤5：清理更新描述文件"
+echo "---------------------------------------------"
+echo "" > "${APP_NAME}/app_update_description.txt"
+echo "[INFO] 已清空${APP_NAME}/app_update_description.txt"
+
+# 8. 提交并推送源码与标签
+echo "---------------------------------------------"
+echo "          步骤6：提交并推送源码"
+echo "---------------------------------------------"
+git add .
+git commit -m "<${APP_NAME}> 开始新的Stage版本开发。"
+echo "[INFO] 源码提交成功，开始推送..."
+
+# 推送源码到远程仓库
+git push origin
+# 推送标签到远程仓库
+git push origin --tags
+
+if [[ $? -eq ${EXIT_CODE_SUCCESS} ]]; then
+    echo "[INFO] 源码与标签推送成功！"
 else
-    echo "The $1/build.properties file does not exist."
-    echo -e "Work dir error."
+    echo "[ERROR] 源码与标签推送失败！"
     exit 1
 fi
 
-# 检查源码状态
-result=$(checkGitSources)
-if [[ $? -eq 0 ]]; then
-    echo $result
-    # 如果Git已经提交了所有代码就执行标签和应用发布操作
+# ==================== 主流程结束 ====================
+echo "============================================="
+echo "          WinBoLL 应用发布完成！"
+echo "============================================="
+exit ${EXIT_CODE_SUCCESS}
 
-    # 预先询问是否添加工作流标签
-    #echo "Add Github Workflows Tag? (yes/No)"
-	#result=$(askAddWorkflowsTag)
-	#nAskAddWorkflowsTag=$?
-	#echo $result
-
-    # 发布应用
-	echo "Publishing WinBoLL APK ..."
-	# 脚本调试时使用
-	#bash gradlew :$1:assembleBetaDebug
-	# 正式发布
-    bash gradlew :$1:assembleStageRelease
-    echo "Publishing WinBoLL APK OK."
-    
-    # 添加 WinBoLL 标签
-    result=$(addWinBoLLTag $1)
-    echo $result
-	if [[ $? -eq 0 ]]; then
-	    echo $result
-    	# WinBoLL 标签添加成功
-	else
-    	echo -e "${0}: addWinBoLLTag $1\n${result}\nAdd WinBoLL tag cancel."
-        exit 1 # addWinBoLLTag 异常
-	fi
-    
-    # 添加 GitHub 工作流标签
-	#if [[ $nAskAddWorkflowsTag -eq 1 ]]; then
-	    # 如果用户选择添加工作流标签
-    	#result=$(addWorkflowsTag $1)
-		#if [[ $? -eq 0 ]]; then
-		#    echo $result
-		    # 工作流标签添加成功
-		#else
-			#echo -e "${0}: addWorkflowsTag $1\n${result}\nAdd workflows tag cancel."
-			#exit 1 # addWorkflowsTag 异常
-		#fi
-	#fi
-	
-	## 清理更新描述文件内容
-	echo "" > $1/app_update_description.txt
-	
-	# 设置新版本开发参数配置
-	# 提交配置
-	git add .
-	git commit -m "<$1>Start New Stage Version."
-	echo "Push sources to git repositories ..."
-    # 推送源码到所有仓库
-    git push origin && git push origin --tags
-else
-	echo -e "${0}: checkGitSources\n${result}\nShell cancel."
-	exit 1 # checkGitSources 异常
-fi

.winboll/winboll_app_build.gradle

@@ -64,6 +64,11 @@ android {
             dimension "WinBoLLApp"
         }
     }
+	
+	compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
 
     // 应用包输出配置
     //

README.md

@@ -5,10 +5,11 @@
 ## ☁ ☁ ☁ WinBoLL APP ☁ ☁ ☁ ☁ ☁ ☁   ☁ ☁   ☁  ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁ ☁ ☁ 
 # ☁    ☁ WinBoLL Studio Android 应用开源项目。☁ ☁   ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁ ☁  ☁ ☁ 
 # ☁ ☁ ☁ WinBoLL 网站地址 https://www.winboll.cc/ ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁
-# ☁ ☁ ☁ WinBoLL 源码地址 <https://gitea.winboll.cc/Studio/APPBase> ☁ ☁ ☁ ☁  ☁ ☁ ☁
-# ☁ ☁ ☁ GitHub 源码地址 <https://github.com/ZhanGSKen/APPBase.git> ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁
-# ☁ ☁ ☁ 码云 源码地址 <https://gitee.com/zhangsken/appbase.git> ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁
-
+# ☁ ☁ ☁ WinBoLL 源码地址 <https://gitea.winboll.cc/Studio/WinBoLL.git> ☁ ☁ ☁ ☁  ☁ ☁ ☁
+# ☁ ☁ ☁ GitHub 源码地址 <https://github.com/ZhanGSKen/WinBoLL.git> ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁
+# ☁ ☁ ☁ 码云 源码地址 <https://gitee.com/zhangsken/winboll.git> ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁
+# ☁ ☁ ☁ 在 jitpack.io 托管的 APPBase 类库源码<https://github.com/ZhanGSKen/APPBase.git> ☁ ☁ ☁ ☁  
+# ☁ ☁ ☁ 在 jitpack.io 托管的 AES 类库源码<https://github.com/ZhanGSKen/AES.git> ☁ ☁ ☁ ☁  
 ## WinBoLL 提问
 同样是 /sdcard 目录，在开发 Android 应用时，
 能否实现手机编译与电脑编译的源码同步。
@@ -154,3 +155,11 @@ $ bash gradlew assembleBetaDebug
 $ bash gradlew assembleStageDebug
 
 ### 若是 winboll.properties 文件的 [ExtraAPKOutputPath] 属性设置了路径。编译器也会复制一份 APK 到这个路径。
+
+# 应用版本号命名方式
+## statge 渠道
+V<应用开发环境编号><应用功能变更号><应用调试阶段号>
+如：APPBase_15.7.0
+## beta 渠道
+V<应用开发环境编号><应用功能变更号><应用调试阶段号>-beta<调试编译计数>_<调试编译时间(分钟+秒钟)>
+如：APPBase_15.9.6-beta8_5413

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

build.gradle

@@ -26,6 +26,7 @@ buildscript {
         //mavenLocal()
     }
     dependencies {
+	    // 适配MIUI12
         classpath 'com.android.tools.build:gradle:7.2.1' // 对应 compileSdkVersion 32
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -100,12 +101,15 @@ allprojects {
     }
     
     subprojects {
+        // 1. 对纯 Java 模块的 JavaCompile 任务配置（升级为 Java 11）
         tasks.withType(JavaCompile) {
             options.compilerArgs << "-parameters"
-            sourceCompatibility = JavaVersion.VERSION_1_8
-            targetCompatibility = JavaVersion.VERSION_1_8
+            sourceCompatibility = JavaVersion.VERSION_11
+            targetCompatibility = JavaVersion.VERSION_11
+            // 可选：确保编码一致
+            options.encoding = "UTF-8"
         }
-    }
+	}
 }
 
 task clean(type: Delete) {

jcndk/META-INF/MANIFEST.MF

@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Built-By: Generated-by-ADT
-Created-By: Android Gradle 3.5.0
-
-Name: AndroidManifest.xml
-SHA1-Digest: U36A0NWthb49+Rxs33tkIuNYFCI=
-
-Name: jni/Android.mk
-SHA1-Digest: ZpGSlRJPL0g9OejiWbQorqj40/Y=
-
-Name: jni/Application.mk
-SHA1-Digest: TKh2CbRLeKfvgL4cPfmoxcVz+vc=
-
-Name: jni/hello-jni.cpp
-SHA1-Digest: 1btXO19SqB6rDvPo5ynG0brDqTk=
-
-Name: project.properties
-SHA1-Digest: 0ekOiGTFMVJOWqAFzNFj/1vxPL8=
-
-Name: res/values/strings.xml
-SHA1-Digest: FgRO/zbNaC1wuZKVT7h6NSYBmpY=
-
-Name: src/$package_name$/HelloJni.java
-SHA1-Digest: p0e9DNKocjRnsOhetb9bnp9s9J4=
-

positions/build.gradle

@@ -18,11 +18,12 @@ def genVersionName(def versionName){
 }
 
 android {
-    // 1. compileSdkVersion：必须 ≥ targetSdkVersion，建议直接等于 targetSdkVersion（30）
-    compileSdkVersion 30
+	
+	// 关键：改为你已安装的 SDK 32（≥ targetSdkVersion 30，兼容已安装环境）
+    compileSdkVersion 32
 
-    // 2. buildToolsVersion：需匹配 compileSdkVersion，建议使用 30.x.x 最新稳定版（无需高于 compileSdkVersion）
-    buildToolsVersion "30.0.3" // 这是 30 对应的最新稳定版，避免使用 beta 版
+    // 直接使用已安装的构建工具 33.0.3（无需修改）
+    buildToolsVersion "33.0.3"
 	
     defaultConfig {
         applicationId "cc.winboll.studio.positions"
@@ -32,21 +33,28 @@ android {
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.11"
+        versionName "15.12"
         if(true) {
             versionName = genVersionName("${versionName}")
         }
     }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
+	
+	// 米盟 SDK
+    packagingOptions {
+         doNotStrip "*/*/libmimo_1011.so"
     }
 }
 
 dependencies {
+	// 米盟
+	api 'com.miui.zeus:mimo-ad-sdk:5.3.+'//请使用最新版sdk
+     //注意：以下5个库必须要引入
+    //api 'androidx.appcompat:appcompat:1.4.1'
+    api 'androidx.recyclerview:recyclerview:1.0.0'
+    api 'com.google.code.gson:gson:2.8.5'
+    api 'com.github.bumptech.glide:glide:4.9.0'
+    //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
+	
 	// https://mvnrepository.com/artifact/com.jzxiang.pickerview/TimePickerDialog
 	api 'com.jzxiang.pickerview:TimePickerDialog:1.0.1'
 	
@@ -72,7 +80,13 @@ dependencies {
     //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
     //api 'androidx.fragment:fragment:1.1.0'
     
-    api 'cc.winboll.studio:libaes:15.11.0'
-	api 'cc.winboll.studio:libappbase:15.11.0'
+	// WinBoLL库 nexus.winboll.cc 地址
+	api 'cc.winboll.studio:libaes:15.12.13'
+    api 'cc.winboll.studio:libappbase:15.14.2'
+	
+	// WinBoLL备用库 jitpack.io 地址
+	//api 'com.github.ZhanGSKen:AES:aes-v15.12.9'
+	//api 'com.github.ZhanGSKen:APPBase:appbase-v15.14.1'
+	
 	api fileTree(dir: 'libs', include: ['*.jar'])
 }

positions/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat Nov 15 08:45:48 GMT 2025
-stageCount=2
+#Wed Jan 07 19:14:34 HKT 2026
+stageCount=9
 libraryProject=
-baseVersion=15.11
-publishVersion=15.11.1
-buildCount=21
-baseBetaVersion=15.11.2
+baseVersion=15.12
+publishVersion=15.12.8
+buildCount=0
+baseBetaVersion=15.12.9

positions/proguard-rules.pro

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

positions/src/main/AndroidManifest.xml

@@ -3,9 +3,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="cc.winboll.studio.positions">
 
-    <!-- 只能在前台获取精确的位置信息 -->
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-
     <!-- 只有在前台运行时才能获取大致位置信息 -->
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
 
@@ -30,6 +27,9 @@
     <!-- 修改或删除您共享存储空间中的内容 -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
+    <!-- 只能在前台获取精确的位置信息 -->
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+
     <uses-feature
         android:name="android.hardware.location.gps"
         android:required="false"/>
@@ -65,8 +65,6 @@
 
         </activity>
 
-        <activity android:name=".activities.CrashActivity"/>
-
         <activity-alias
             android:name=".MainActivityWukong"
             android:targetActivity=".MainActivity"
@@ -111,15 +109,9 @@
 
         </activity-alias>
 
-        <meta-data
-            android:name="android.max_aspect"
-            android:value="4.0"/>
-
         <activity android:name="cc.winboll.studio.positions.activities.LocationActivity"/>
 
-        <meta-data
-            android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version"/>
+        <activity android:name="cc.winboll.studio.positions.activities.ShortcutActionActivity"/>
 
         <service
             android:name=".services.MainService"
@@ -143,6 +135,14 @@
 
         </receiver>
 
+        <meta-data
+            android:name="android.max_aspect"
+            android:value="4.0"/>
+
+        <meta-data
+            android:name="com.google.android.gms.version"
+            android:value="@integer/google_play_services_version"/>
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.fileprovider"
@@ -151,11 +151,11 @@
 
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths"/>
+                android:resource="@xml/file_provider"/>
 
         </provider>
 
-        <activity android:name="cc.winboll.studio.positions.activities.ShortcutActionActivity"/>
+        <activity android:name="cc.winboll.studio.positions.activities.SettingsActivity"/>
 
     </application>
 

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

@@ -14,6 +14,7 @@ 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;
@@ -24,7 +25,6 @@ import android.widget.Toast;
 import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.ToastUtils;
-import cc.winboll.studio.positions.utils.MyActivityLifecycleCallbacks;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
@@ -44,36 +44,24 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 public class App extends GlobalApplication {
 
-	public static volatile AppLevel _mAppLevel = AppLevel.WUKONG;
-
-	public static final String COMPONENT_WUKONG = "cc.winboll.studio.positions.MainActivityWukong";
-	public static final String COMPONENT_LAOJUN = "cc.winboll.studio.positions.MainActivityLaojun";
-	public static final String ACTION_OPEN_APPPLUS = "cc.winboll.studio.positions.App.ACTION_OPEN_APPPLUS";
-	public static final String ACTION_CLOSE_APPPLUS = "cc.winboll.studio.positions.App.ACTION_CLOSE_APPPLUS";
-
     private static Handler MAIN_HANDLER = new Handler(Looper.getMainLooper());
 	
-	MyActivityLifecycleCallbacks mMyActivityLifecycleCallbacks;
-	
     @Override
     public void onCreate() {
         super.onCreate();
-
 		setIsDebugging(BuildConfig.DEBUG);
-
+		
 		WinBoLLActivityManager.init(this);
-
+		
         // 初始化 Toast 框架
         ToastUtils.init(this);
         // 设置 Toast 布局样式
         //ToastUtils.setView(R.layout.view_toast);
         //ToastUtils.setStyle(new WhiteToastStyle());
         //ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
-
+        
         //CrashHandler.getInstance().registerGlobal(this);
         //CrashHandler.getInstance().registerPart(this);
-		mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks();
-        registerActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);
     }
 
     public static void write(InputStream input, OutputStream output) throws IOException {

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

@@ -1,43 +0,0 @@
-package cc.winboll.studio.positions;
-
-/**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/11/10 07:23
- * @Describe 应用级别类型枚举
- */
-public enum AppLevel {
-    WUKONG("wukong", "悟空级别"),
-    LAOJUN("laojun", "老君级别");
-	
-	public static final String TAG = "AppLevel";
-    
-    // 枚举属性
-    private final String code;    // 编码（如 "wukong"）
-    private final String desc;    // 描述
-
-    // 构造方法（Java 7 需显式定义）
-    AppLevel(String code, String desc) {
-        this.code = code;
-        this.desc = desc;
-    }
-
-    // Getter 方法（获取枚举属性）
-    public String getCode() {
-        return code;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    // 可选：根据 code 获取枚举项（便于业务使用）
-    public static AppLevel getByCode(String code) {
-        for (AppLevel level : values()) {
-            if (level.code.equals(code)) {
-                return level;
-            }
-        }
-        return null; // 或抛出异常，根据业务需求调整
-    }
-}
-

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

@@ -4,9 +4,12 @@ import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.content.res.TypedArray;
+import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
-import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
 import android.widget.CompoundButton;
@@ -16,15 +19,17 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
-import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
+import cc.winboll.studio.libaes.utils.AESThemeUtil;
+import cc.winboll.studio.libaes.utils.DevelopUtils;
+import cc.winboll.studio.libaes.views.ADsBannerView;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.ToastUtils;
+import cc.winboll.studio.positions.R;
 import cc.winboll.studio.positions.activities.LocationActivity;
+import cc.winboll.studio.positions.activities.SettingsActivity;
 import cc.winboll.studio.positions.activities.WinBoLLActivity;
-import cc.winboll.studio.positions.utils.APPPlusUtils;
 import cc.winboll.studio.positions.utils.AppConfigsUtil;
-import cc.winboll.studio.positions.utils.JsonShareHandler;
 import cc.winboll.studio.positions.utils.ServiceUtil;
+import android.widget.LinearLayout;
 
 /**
  * 主页面：仅负责
@@ -34,8 +39,7 @@ import cc.winboll.studio.positions.utils.ServiceUtil;
  */
 public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {
     public static final String TAG = "MainActivity";
-	
-	// 权限请求码（建议定义为类常量，避免魔法值）
+    // 权限请求码（建议定义为类常量，避免魔法值）
 	private static final int REQUEST_LOCATION_PERMISSIONS = 1001;
 	private static final int REQUEST_BACKGROUND_LOCATION_PERMISSION = 1002;
 
@@ -45,7 +49,8 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {
     private Toolbar mToolbar;
     // 服务相关：服务实例、绑定状态标记
     //private DistanceRefreshService mDistanceService;
-    //private boolean isServiceBound = false;
+    private boolean isServiceBound = false;
+	ADsBannerView mADsBannerView;
 
 
     @Override
@@ -87,10 +92,6 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main); // 关联主页面布局
 
-		// 处理启动时的分享 Intent
-		handleShareIntent(getIntent());
-
-
         // 1. 初始化顶部 Toolbar（保留原逻辑，设置页面标题）
         initToolbar();
         // 2. 初始化其他控件
@@ -101,36 +102,32 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {
         }
         // 4. 绑定服务（仅用于获取服务实时状态，不影响服务独立运行）
         //bindDistanceService();
+
+		mADsBannerView = findViewById(R.id.adsbanner);
+
+		setLLMainBackgroundColor();
     }
 
+	// 在 Activity 的 onCreate() 或需要获取颜色的方法中调用
+	private void setLLMainBackgroundColor() {
+		// 1. 定义要解析的主题属性（这里是 colorAccent）
+		TypedArray a = getTheme().obtainStyledAttributes(new int[]{android.R.attr.colorAccent});
+		// 2. 获取对应的颜色值（默认值可设为你需要的 fallback 颜色，如 Color.GRAY）
+		int colorAccent = a.getColor(0, Color.GRAY);
+		// 3. 必须回收，避免内存泄漏
+		a.recycle();
 
-	@Override
-	protected void onNewIntent(Intent intent) {
-		super.onNewIntent(intent);
-		// 处理后续接收的分享 Intent（如应用已在后台）
-		handleShareIntent(intent);
-	}
-
-	private void handleShareIntent(Intent intent) {
-		if (intent != null && Intent.ACTION_SEND.equals(intent.getAction())) {
-			// 调用工具类，弹出确认对话框
-			JsonShareHandler.handleSharedJsonWithConfirm(this, intent, new JsonShareHandler.ConfirmCallback() {
-					@Override
-					public void onConfirm(boolean isConfirm) {
-						// 回调处理：isConfirm 为 true 表示接收并保存，false 表示取消
-						if (!isConfirm) {
-							Log.d("MainActivity", "用户取消接收文件");
-							// 可添加取消后的逻辑（如关闭页面）
-							// finish();
-						}
-					}
-				});
-		}
+		LinearLayout llmain = findViewById(R.id.llmain);
+		llmain.setBackgroundColor(colorAccent);
 	}
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
+		if (mADsBannerView != null) {
+			mADsBannerView.releaseAdResources();
+		}
+
         // 页面销毁时解绑服务，避免Activity与服务相互引用导致内存泄漏
 //        if (isServiceBound) {
 //            unbindService(mServiceConn);
@@ -139,6 +136,16 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {
 //        }
     }
 
+	@Override
+	protected void onResume() {
+		super.onResume();
+		if (mADsBannerView != null) {
+			mADsBannerView.resumeADs(MainActivity.this);
+		}
+	}
+
+
+
     // ---------------------- 核心功能1：初始化UI组件（Toolbar + 服务开关） ----------------------
     /**
      * 初始化顶部 Toolbar，设置页面标题
@@ -147,9 +154,9 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {
         mToolbar = (Toolbar) findViewById(R.id.toolbar); // Java 7 显式 findViewById + 强转
         setSupportActionBar(mToolbar);
         // 给ActionBar设置标题（先判断非空，避免空指针异常）
-		AppLevel appLevel = AppConfigsUtil.getInstance(getApplicationContext()).getAppLevel(true);
-        getSupportActionBar().setTitle(getString(R.string.app_name));
-
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setTitle(getString(R.string.app_name));
+        }
     }
 
     /**
@@ -161,7 +168,7 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {
 
 		mManagePositionsButton = (Button) findViewById(R.id.btn_manage_positions);
 		mManagePositionsButton.setEnabled(mServiceSwitch.isChecked());
-
+		
         // Java 7 用匿名内部类实现 CompoundButton.OnCheckedChangeListener
         mServiceSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
 				@Override
@@ -188,6 +195,39 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {
     }
 
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // 主题菜单
+		AESThemeUtil.inflateMenu(this, menu);
+		// 调试工具菜单
+		if (App.isDebugging()) {
+			DevelopUtils.inflateMenu(this, menu);
+		}
+		// 应用其他菜单
+        getMenuInflater().inflate(R.menu.toolbar_main, menu);
+
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int menuItemId = item.getItemId();
+		if (AESThemeUtil.onAppThemeItemSelected(this, item)) {
+            recreate();
+        } if (DevelopUtils.onDevelopItemSelected(this, item)) {
+			LogUtils.d(TAG, String.format("onOptionsItemSelected item.getItemId() %d ", item.getItemId()));
+		} else if (menuItemId == R.id.item_settings) {
+			Intent intent = new Intent();
+            intent.setClass(this, SettingsActivity.class);
+            startActivity(intent);
+        } else {
+			// 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
+			return super.onOptionsItemSelected(item);
+		}
+		return true;
+    }
+
+
     /**
      * 绑定服务（仅用于获取服务状态，不启动服务）
      */
@@ -208,14 +248,6 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {
         startActivity(new Intent(MainActivity.this, LocationActivity.class));
     }
 
-    /**
-     * 跳转至“日志页（LogActivity）”（按钮点击触发，需在布局中设置 android:onClick="onLog"）
-     * 无服务状态限制，直接跳转
-     */
-    public void onLog(View view) {
-        WinBoLLActivityManager.getInstance().startLogActivity(this); // 调用LogActivity静态方法跳转（保留原逻辑）
-    }
-
     // ---------------------- 新增：位置权限处理（适配Java7 + 后台GPS权限） ----------------------
     /**
      * 检查是否拥有「前台+后台」位置权限（适配Android版本差异）

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

@@ -1,22 +0,0 @@
-package cc.winboll.studio.positions;
-import android.os.Bundle;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.ToastUtils;
-
-/**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/11/13 15:21
- * @Describe MainActivityLaojun
- */
-public class MainActivityLaojun extends MainActivity {
-    
-    public static final String TAG = "MainActivityLaojun";
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		ToastUtils.show("道法自然");
-		LogUtils.d(TAG, "玩法归臻");
-		super.onCreate(savedInstanceState);
-	}
-    
-}

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

@@ -1,43 +0,0 @@
-package cc.winboll.studio.positions;
-
-/**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/11/15 15:14
- * @Describe 应用入口级别类型枚举
- */
-public enum PointLevel {
-	DORAEMON("doraemon", "叮铛级别"),
-    WUKONG("wukong", "悟空级别"),
-    LAOJUN("laojun", "老君级别");
-
-	public static final String TAG = "PointLevel";
-
-    // 枚举属性
-    private final String code;    // 编码（如 "wukong"）
-    private final String desc;    // 描述
-
-    // 构造方法（Java 7 需显式定义）
-    PointLevel(String code, String desc) {
-        this.code = code;
-        this.desc = desc;
-    }
-
-    // Getter 方法（获取枚举属性）
-    public String getCode() {
-        return code;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    // 可选：根据 code 获取枚举项（便于业务使用）
-    public static PointLevel getByCode(String code) {
-        for (PointLevel level : values()) {
-            if (level.code.equals(code)) {
-                return level;
-            }
-        }
-        return null; // 或抛出异常，根据业务需求调整
-    }
-}

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

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

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

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

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

@@ -1,61 +0,0 @@
-package cc.winboll.studio.positions.activities;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.PersistableBundle;
-import cc.winboll.studio.libappbase.ToastUtils;
-import cc.winboll.studio.positions.R;
-import cc.winboll.studio.positions.utils.APPPlusUtils;
-import cc.winboll.studio.positions.utils.AppConfigsUtil;
-import cc.winboll.studio.positions.AppLevel;
-
-/**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/11/15 13:45
- * @Describe 应用快捷方式活动类
- */
-public class ShortcutActionActivity extends Activity {
-    
-    public static final String TAG = "ShortcutActionActivity";
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		// 处理应用级别的切换请求
-        handleSwitchRequest();
-		finish();
-	}
-	
-	
-
-//	@Override
-//	public void onPostCreate(Bundle savedInstanceState, PersistableBundle persistentState) {
-//		super.onPostCreate(savedInstanceState, persistentState);
-//		finish();
-//	}
-
-//	@Override
-//	protected void onStart() {
-//		super.onStart();
-//	}
-    
-	/**
-     * 处理应用图标快捷菜单的请求
-     */
-    private void handleSwitchRequest() {
-        Intent intent = getIntent();
-        if (intent != null && "open_appplus".equals(intent.getDataString())) {
-            ToastUtils.show("已添加" + getString(R.string.app_name) + "附加组件");
-			AppConfigsUtil.getInstance(getApplicationContext()).setAppLevel(AppLevel.LAOJUN);
-			APPPlusUtils.openAPPPlus(this);
-			//moveTaskToBack(true);
-        }
-		if (intent != null && "close_appplus".equals(intent.getDataString())) {
-            ToastUtils.show("已移除" + getString(R.string.app_name) + "附加组件");
-			AppConfigsUtil.getInstance(getApplicationContext()).setAppLevel(AppLevel.WUKONG);
-			APPPlusUtils.closeAPPPlus(this);
-			//moveTaskToBack(true);
-        }
-    }
-}

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

@@ -10,20 +10,16 @@ import android.os.Bundle;
 import android.view.MenuItem;
 import androidx.appcompat.app.AppCompatActivity;
 import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
+import cc.winboll.studio.libaes.models.AESThemeBean;
+import cc.winboll.studio.libaes.utils.AESThemeUtil;
 import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.ToastUtils;
-import cc.winboll.studio.positions.App;
-import cc.winboll.studio.positions.PointLevel;
-import cc.winboll.studio.positions.R;
-import cc.winboll.studio.positions.utils.ActivityAliasUtils;
-import cc.winboll.studio.positions.utils.AppConfigsUtil;
 
 public class WinBoLLActivity extends AppCompatActivity implements IWinBoLLActivity {
 
     public static final String TAG = "WinBoLLActivity";
 
-	public static volatile PointLevel _mPointLevel = PointLevel.WUKONG;
+	protected volatile AESThemeBean.ThemeType mThemeType;
 
     @Override
     public Activity getActivity() {
@@ -35,58 +31,25 @@ public class WinBoLLActivity extends AppCompatActivity implements IWinBoLLActivi
         return TAG;
     }
 
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        mThemeType = getThemeType();
+        setThemeStyle();
+        super.onCreate(savedInstanceState);
+    }
+
+	AESThemeBean.ThemeType getThemeType() {
+        return AESThemeBean.getThemeStyleType(AESThemeUtil.getThemeTypeID(getApplicationContext()));
+    }
+
+    void setThemeStyle() {
+        setTheme(AESThemeUtil.getThemeTypeID(getApplicationContext()));
+    }
+
+
     @Override
     protected void onResume() {
         super.onResume();
-		//ToastUtils.show("onResume");
-
-		// ActivityAliasUtils 工具使用示例
-		//
-//		// 获取真实的目标组件名（即使通过 alias 启动，也能拿到 OriginalActivity）
-//        String realTargetName = ActivityAliasUtils.getRealTargetNameFromIntent(this);
-//        LogUtils.d("AliasActivity", "真实组件名：" + realTargetName);
-		// 获取真实的目标组件名（即使通过 alias 启动，也能拿到 OriginalActivity）
-//        String realTargetName = ActivityAliasUtils.getRealTargetNameFromIntent(this);
-//        LogUtils.d(TAG, "真实组件名：" + realTargetName);
-//		ToastUtils.show(realTargetName);
-//		// 判断某个组件是否为 alias
-//		String componentName = "com.winboll.app.AliasActivity";
-//		boolean isAlias = ActivityAliasUtils.isActivityAlias(getApplicationContext(), componentName);
-//		LogUtils.d("判断结果", componentName + " 是否为 alias：" + isAlias);  // true
-//		// 获取启动当前 Activity 的组件名（兼容 alias 场景）
-//        String launchComponent = ActivityAliasUtils.getLaunchComponentName(this);
-//        LogUtils.d("MainActivity", "启动组件名：" + launchComponent);
-
-		/*
-		 * 应用入口逻辑模块
-		 */
-		//
-		// 检查当前活动的启动组件名，设置应用入口级别。
-		String launchComponent = ActivityAliasUtils.getLaunchComponentName(this);
-        LogUtils.d("MainActivity", "启动组件名：" + launchComponent);
-		ToastUtils.show(launchComponent);
-		// 当前应用处于活动暂停的状态时，就检查应用的入口组件名称，设置应用入口级别。
-		if (WinBoLLActivity._mPointLevel == PointLevel.DORAEMON) {
-			if (launchComponent.equals(App.COMPONENT_WUKONG)) {
-				getSupportActionBar().setTitle(getString(R.string.appplus_name));
-				ToastUtils.show("WUKONG");
-				_mPointLevel = PointLevel.WUKONG;
-			} else if (launchComponent.equals(App.COMPONENT_LAOJUN)) {
-				getSupportActionBar().setTitle(getString(R.string.app_name));
-				ToastUtils.show("LAOJUN");
-				_mPointLevel = PointLevel.LAOJUN;
-			} else {
-				// 如果是其他应用组件入口，就关闭活动
-				finish();
-			}
-		}
-
-		/*
-		 * 应用级别设置模块
-		 */
-		// 读取并配置应用级别
-		App._mAppLevel = AppConfigsUtil.getInstance(getApplicationContext()).getAppLevel(true);
-
         LogUtils.d(TAG, String.format("onResume %s", getTag()));
     }
 

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

@@ -9,14 +9,12 @@ package cc.winboll.studio.positions.models;
 import android.util.JsonWriter;
 import android.util.JsonReader;
 import java.io.IOException;
-import cc.winboll.studio.positions.AppLevel;
 
 public class AppConfigsModel extends BaseBean {
     
     public static final String TAG = "AppConfigsModel";
 	
 	boolean isEnableMainService;
-	AppLevel appLevel;
 
 	public AppConfigsModel(boolean isEnableMainService) {
 		this.isEnableMainService = isEnableMainService;
@@ -26,14 +24,6 @@ public class AppConfigsModel extends BaseBean {
 		this.isEnableMainService = false;
 	}
 
-	public void setAppLevel(AppLevel appLevel) {
-		this.appLevel = appLevel;
-	}
-
-	public AppLevel getAppLevel() {
-		return appLevel;
-	}
-
 	public void setIsEnableMainService(boolean isEnableMainService) {
 		this.isEnableMainService = isEnableMainService;
 	}
@@ -52,7 +42,6 @@ public class AppConfigsModel extends BaseBean {
 	public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
 		super.writeThisToJsonWriter(jsonWriter);
 		jsonWriter.name("isEnableDistanceRefreshService").value(isEnableMainService());
-		jsonWriter.name("appLevel").value(getAppLevel().ordinal());
 	}
 
 	// JSON反序列化（加载位置数据，校验字段）
@@ -63,8 +52,6 @@ public class AppConfigsModel extends BaseBean {
 		} else {
 			if (name.equals("isEnableDistanceRefreshService")) {
 				setIsEnableMainService(jsonReader.nextBoolean());
-			} else if (name.equals("appLevel")) {
-				setAppLevel((AppLevel.values()[jsonReader.nextInt()]));
 			} else {
 				return false;
 			}

positions/src/main/java/cc/winboll/studio/positions/receivers/MotionStatusReceiver.java

@@ -1,361 +0,0 @@
-package cc.winboll.studio.positions.receivers;
-
-/**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/10/28 19:07
- * @Describe MotionStatusReceiver
- */
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.hardware.Sensor;
-import android.hardware.SensorEvent;
-import android.hardware.SensorEventListener;
-import android.hardware.SensorManager;
-import android.os.Build;
-import android.os.Handler;
-import android.os.Looper;
-import android.text.TextUtils;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.ToastUtils;
-import cc.winboll.studio.positions.services.MainService;
-import cc.winboll.studio.positions.utils.ServiceUtil;
-
-/**
- * 运动状态监听Receiver
- * 功能：1.持续监听传感器（不关闭） 2.每5秒计算运动状态 3.按状态切换GPS模式（实时/30秒定时）
- */
-public class MotionStatusReceiver extends BroadcastReceiver implements SensorEventListener {
-    public static final String TAG = "MotionStatusReceiver";
-
-    // 广播Action
-    public static final String ACTION_MOTION_STATUS_RECEIVER = "cc.winboll.studio.positions.receivers.MotionStatusReceiver";
-    public static final String EXTRA_SENSORS_ENABLE = "EXTRA_SENSORS_ENABLE";
-	// 传感器启动状态标志位
-	boolean mIsSensorsEnable = false;
-    // 运动状态常量
-    private static final int MOTION_STATUS_STATIC = 0; // 静止/低运动
-    private static final int MOTION_STATUS_WALKING = 1; // 行走/高速运动
-    // 配置参数（按需求调整）
-    private static final float ACCELEROMETER_THRESHOLD = 0.8f; // 加速度阈值
-    private static final float GYROSCOPE_THRESHOLD = 0.5f; // 陀螺仪阈值
-    private static final long STATUS_CALC_INTERVAL = 5000; // 运动状态计算间隔（5秒）
-    private static final long GPS_STATIC_INTERVAL = 30; // 静止时GPS间隔（30秒）
-    // 核心对象
-    private volatile SensorManager mSensorManager;
-    private Sensor mAccelerometer;
-    private Sensor mGyroscope;
-    private volatile boolean mIsSensorListening = false; // 传感器是否持续监听
-    private int mCurrentMotionStatus = MOTION_STATUS_STATIC; // 当前运动状态
-    private Handler mMainHandler; // 主线程Handler（用于定时计算）
-    private Context mBroadcastContext; // 广播上下文
-    // 传感器数据缓存（用于5秒内数据汇总，避免单次波动误判）
-    private float mAccelMax = 0f; // 5秒内加速度最大值
-    private float mGyroMax = 0f; // 5秒内陀螺仪最大值
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-
-        LogUtils.d(TAG, "===== 接收器启动：onReceive() 开始执行 =====");
-        this.mBroadcastContext = context;
-        mMainHandler = new Handler(Looper.getMainLooper());
-
-		if (TextUtils.equals(intent.getAction(), ACTION_MOTION_STATUS_RECEIVER)) {
-			boolean isSettingEnable = intent.getBooleanExtra(EXTRA_SENSORS_ENABLE, false);
-			if (mIsSensorsEnable == false && isSettingEnable == true) {
-				mIsSensorsEnable = true;
-				// 1. 初始化传感器（必执行）
-				initSensors();
-				
-
-				if (mAccelerometer == null || mGyroscope == null) {
-					LogUtils.e(TAG, "设备缺少加速度/陀螺仪，无法持续监听");
-					cleanResources(false); // 传感器不可用才清理
-					return;
-				}
-
-				// 2. 校验参数
-				if (context == null || intent == null) {
-					LogUtils.d(TAG, "onReceive()：无效参数，终止处理");
-					cleanResources(false);
-					return;
-				}
-				LogUtils.d(TAG, "onReceive()：接收到广播Action=" + intent.getAction());
-
-				// 3. 启动持续传感器监听（核心：不关闭，重复调用无影响）
-				startSensorListening();
-
-				// 4. 启动5秒定时计算运动状态（核心：持续触发状态判断）
-				startStatusCalcTimer();
-			}
-		}
-		
-
-        // 5. 处理外部广播触发（可选，保留外部控制能力）
-//        if (TextUtils.equals(intent.getAction(), ACTION_MOTION_STATUS_RECEIVER)) {
-//		 int motionStatus = intent.getIntExtra(EXTRA_MOTION_STATUS, MOTION_STATUS_STATIC);
-//		 String statusDesc = motionStatus == MOTION_STATUS_WALKING ? "高速运动" : "静止/低运动";
-//		 LogUtils.d(TAG, "外部广播触发，强制设置运动状态：" + statusDesc);
-//		 mCurrentMotionStatus = motionStatus;
-//		 handleMotionStatus(mCurrentMotionStatus); // 立即执行GPS切换
-//		 }
-    }
-
-    /**
-     * 初始化传感器（持续监听，复用实例）
-     */
-    private void initSensors() {
-        LogUtils.d(TAG, "initSensors()：初始化传感器");
-        if (mSensorManager != null || mBroadcastContext == null) return;
-
-        mSensorManager = (SensorManager) mBroadcastContext.getSystemService(Context.SENSOR_SERVICE);
-        if (mSensorManager == null) {
-            LogUtils.e(TAG, "设备不支持传感器服务");
-            return;
-        }
-        // 获取传感器实例（持续复用，不销毁）
-        mAccelerometer = mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
-        mGyroscope = mSensorManager.getDefaultSensor(Sensor.TYPE_GYROSCOPE);
-
-        LogUtils.d(TAG, "传感器初始化结果：加速度=" + (mAccelerometer != null) + "，陀螺仪=" + (mGyroscope != null));
-    }
-
-    /**
-     * 启动传感器持续监听（核心：不关闭，注册一次一直生效）
-     */
-    private void startSensorListening() {
-        if (mSensorManager == null || mAccelerometer == null || mGyroscope == null) return;
-
-        if (!mIsSensorListening) {
-            // 注册传感器监听（持续生效，直到服务销毁才注销）
-            mSensorManager.registerListener(
-                this,
-                mAccelerometer,
-                SensorManager.SENSOR_DELAY_NORMAL, // 正常延迟，平衡性能与精度
-                mMainHandler
-            );
-            mSensorManager.registerListener(
-                this,
-                mGyroscope,
-                SensorManager.SENSOR_DELAY_NORMAL,
-                mMainHandler
-            );
-            mIsSensorListening = true;
-            LogUtils.d(TAG, "startSensorListening()：传感器持续监听已启动（不关闭）");
-        }
-    }
-
-    /**
-     * 启动5秒定时计算运动状态（核心：周期性汇总传感器数据）
-     */
-    private void startStatusCalcTimer() {
-        if (mMainHandler == null) return;
-
-        // 移除旧任务（避免重复注册）
-        mMainHandler.removeCallbacks(mStatusCalcRunnable);
-        // 启动定时任务（每5秒执行一次）
-        mMainHandler.postDelayed(mStatusCalcRunnable, STATUS_CALC_INTERVAL);
-        LogUtils.d(TAG, "startStatusCalcTimer()：5秒运动状态计算定时器已启动");
-    }
-
-    /**
-     * 运动状态计算任务（5秒执行一次）
-     */
-    private final Runnable mStatusCalcRunnable = new Runnable() {
-        @Override
-        public void run() {
-            // 1. 基于5秒内缓存的最大传感器数据判断状态
-            boolean isHighMotion = (mAccelMax > ACCELEROMETER_THRESHOLD) && (mGyroMax > GYROSCOPE_THRESHOLD);
-            int newMotionStatus = isHighMotion ? MOTION_STATUS_WALKING : MOTION_STATUS_STATIC;
-
-            // 2. 状态变化时才处理（避免频繁切换GPS）
-            if (newMotionStatus != mCurrentMotionStatus) {
-                mCurrentMotionStatus = newMotionStatus;
-                String statusDesc = isHighMotion ? "高速运动" : "静止/低运动";
-                LogUtils.d(TAG, "运动状态更新（5秒计算）：" + statusDesc 
-						   + "（加速度最大值=" + mAccelMax + "，陀螺仪最大值=" + mGyroMax + "）");
-                handleMotionStatus(newMotionStatus); // 切换GPS模式
-            } else {
-                LogUtils.d(TAG, "运动状态无变化（5秒计算）：" + (isHighMotion ? "高速运动" : "静止/低运动"));
-            }
-
-            // 3. 重置传感器数据缓存，准备下一个5秒周期
-            mAccelMax = 0f;
-            mGyroMax = 0f;
-
-            // 4. 循环执行定时任务（核心：持续计算）
-            mMainHandler.postDelayed(this, STATUS_CALC_INTERVAL);
-        }
-    };
-
-    /**
-     * 传感器数据变化回调（核心：实时缓存最大数据）
-     */
-    @Override
-    public void onSensorChanged(SensorEvent event) {
-        if (event == null) return;
-
-        // 实时缓存5秒内的最大传感器数据（避免单次波动误判）
-        switch (event.sensor.getType()) {
-            case Sensor.TYPE_ACCELEROMETER:
-                float accelTotal = Math.abs(event.values[0]) + Math.abs(event.values[1]) + Math.abs(event.values[2]);
-                if (accelTotal > mAccelMax) mAccelMax = accelTotal; // 缓存最大值
-                LogUtils.d(TAG, "加速度传感器实时数据：合值=" + accelTotal + "（当前5秒最大值=" + mAccelMax + "）");
-                break;
-            case Sensor.TYPE_GYROSCOPE:
-                float gyroTotal = Math.abs(event.values[0]) + Math.abs(event.values[1]) + Math.abs(event.values[2]);
-                if (gyroTotal > mGyroMax) mGyroMax = gyroTotal; // 缓存最大值
-                LogUtils.d(TAG, "陀螺仪实时数据：合值=" + gyroTotal + "（当前5秒最大值=" + mGyroMax + "）");
-                break;
-        }
-    }
-
-    /**
-     * 处理运动状态（核心：按状态切换GPS模式）
-     */
-    private void handleMotionStatus(int motionStatus) {
-        LogUtils.d(TAG, "handleMotionStatus()：开始处理运动状态，切换GPS模式");
-        if (mBroadcastContext == null) {
-            LogUtils.w(TAG, "上下文为空，无法处理GPS");
-            return;
-        }
-
-        MainService mainService = getMainService();
-        if (mainService == null) {
-            LogUtils.e(TAG, "MainService未启动，GPS控制失败");
-            return;
-        }
-
-        if (motionStatus == MOTION_STATUS_WALKING) {
-            // 高速运动：启动GPS实时更新（2秒/1米）
-            handleHighMotionGPS(mainService);
-        } else {
-            // 静止/低运动：启动GPS30秒定时更新
-            handleStaticGPS(mainService);
-        }
-    }
-
-    /**
-     * 高速运动GPS处理：实时更新
-     */
-    private void handleHighMotionGPS(MainService mainService) {
-        // 动态权限判断（Android 6.0+）
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
-            mBroadcastContext.checkSelfPermission(android.Manifest.permission.ACCESS_FINE_LOCATION)
-            != PackageManager.PERMISSION_GRANTED) {
-            sendPermissionRequestBroadcast();
-            return;
-        }
-
-        // 启动实时GPS（已启动则不重复操作）
-        if (!mainService.isGpsListening()) {
-            mainService.startGpsLocation(); // 实时更新（2秒/1米）
-            mainService.stopGpsStaticTimer(); // 停止定时GPS
-            LogUtils.d(TAG, "高速运动：已启动GPS实时更新");
-        }
-    }
-
-    /**
-     * 静止/低运动GPS处理：30秒定时更新
-     */
-    private void handleStaticGPS(MainService mainService) {
-        // 停止实时GPS（已停止则不重复操作）
-        if (mainService.isGpsListening()) {
-            mainService.stopGpsLocation(); // 停止实时更新
-            LogUtils.d(TAG, "静止/低运动：已停止GPS实时更新");
-        }
-
-        // 启动30秒定时GPS（已启动则不重复操作）
-        mainService.startGpsStaticTimer(GPS_STATIC_INTERVAL); // 30秒一次
-        LogUtils.d(TAG, "静止/低运动：已启动GPS30秒定时更新");
-    }
-
-    /**
-     * 获取MainService实例（复用逻辑）
-     */
-    private MainService getMainService() {
-        if (mBroadcastContext == null) return null;
-
-        // 优先获取单例
-        MainService singleton = MainService.getInstance(mBroadcastContext);
-        if (singleton != null && singleton.isServiceRunning()) {
-            return singleton;
-        }
-
-        // 启动服务并重试
-        if (!ServiceUtil.isServiceAlive(mBroadcastContext, MainService.class.getName())) {
-            mBroadcastContext.startService(new Intent(mBroadcastContext, MainService.class));
-            try {
-                Thread.sleep(500); // 等待服务启动
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-            }
-        }
-        return MainService.getInstance(mBroadcastContext);
-    }
-
-    /**
-     * 发送GPS权限申请广播（Receiver无法直接申请）
-     */
-    private void sendPermissionRequestBroadcast() {
-        Intent permissionIntent = new Intent("cc.winboll.studio.positions.ACTION_REQUEST_GPS_PERMISSION");
-        permissionIntent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-        mBroadcastContext.sendBroadcast(permissionIntent);
-        LogUtils.d(TAG, "GPS权限缺失，已发送申请广播");
-    }
-
-    /**
-     * 资源清理（核心：传感器不关闭，仅清理Handler和上下文）
-     * @param isForceStopSensor 是否强制停止传感器（仅服务销毁时传true）
-     */
-    private void cleanResources(boolean isForceStopSensor) {
-        // 1. 停止定时计算任务
-        if (mMainHandler != null) {
-            mMainHandler.removeCallbacksAndMessages(null);
-            mMainHandler = null;
-            LogUtils.d(TAG, "cleanResources()：已停止运动状态计算定时器");
-        }
-
-        // 2. 强制停止传感器（仅当外部触发销毁时执行，正常情况不关闭）
-        if (isForceStopSensor && mSensorManager != null && mIsSensorListening) {
-            mSensorManager.unregisterListener(this);
-            mIsSensorListening = false;
-            LogUtils.d(TAG, "cleanResources()：已强制停止传感器监听");
-        }
-
-        // 3. 置空上下文（避免内存泄漏）
-        mBroadcastContext = null;
-    }
-
-    /**
-     * 传感器精度变化回调（日志监控）
-     */
-    @Override
-    public void onAccuracyChanged(Sensor sensor, int accuracy) {
-        String sensorType = sensor.getType() == Sensor.TYPE_ACCELEROMETER ? "加速度" : "陀螺仪";
-        String accuracyDesc = getAccuracyDesc(accuracy);
-        LogUtils.d(TAG, sensorType + "传感器精度变化：" + accuracyDesc);
-    }
-
-    /**
-     * 传感器精度描述转换
-     */
-    private String getAccuracyDesc(int accuracy) {
-        switch (accuracy) {
-            case SensorManager.SENSOR_STATUS_ACCURACY_HIGH: return "高";
-            case SensorManager.SENSOR_STATUS_ACCURACY_MEDIUM: return "中";
-            case SensorManager.SENSOR_STATUS_ACCURACY_LOW: return "低";
-            case SensorManager.SENSOR_STATUS_UNRELIABLE: return "不可靠";
-            default: return "未知";
-        }
-    }
-
-    /**
-     * 补充：Receiver销毁时强制清理（需在MainService注销时调用）
-     */
-    public void forceCleanResources() {
-        cleanResources(true); // 强制停止传感器
-    }
-}
-

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

@@ -1,194 +0,0 @@
-package cc.winboll.studio.positions.utils;
-
-/**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/11/10 09:51
- * @Describe 应用图标切换工具类（启用组件时创建对应快捷方式）
- */
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.os.Build;
-import android.widget.Toast;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.positions.App;
-import cc.winboll.studio.positions.MainActivity;
-
-public class APPPlusUtils {
-    public static final String TAG = "APPPlusUtils";
-
-    // 快捷方式配置（名称+图标，需与实际资源匹配）
-//    private static final String PLUS_SHORTCUT_NAME = "位置服务-Laojun";
-//    private static final int PLUS_SHORTCUT_ICON = R.mipmap.ic_launcher; // Laojun 图标资源
-
-    /**
-     * 添加Plus组件与图标
-     */
-    public static boolean openAPPPlus(Context context) {
-        if (context == null) {
-            LogUtils.d(TAG, "切换失败：上下文为空");
-            Toast.makeText(context, "图标切换失败", Toast.LENGTH_SHORT).show();
-            return false;
-        }
-
-        PackageManager pm = context.getPackageManager();
-        ComponentName plusComponentLaojun = new ComponentName(context, App.COMPONENT_LAOJUN);
-        //ComponentName plusComponentWuKong = new ComponentName(context, MainActivity.COMPONENT_WUKONG);
-
-        try {
-			//disableComponent(pm, plusComponentWuKong);
-            enableComponent(pm, plusComponentLaojun);
-
-            // 2. 创建 Laojun 组件对应的快捷方式（自动去重）
-//            boolean shortcutCreated = createComponentShortcut(context, plusComponent, PLUS_SHORTCUT_NAME, PLUS_SHORTCUT_ICON);
-//
-//            // 3. 通知桌面刷新图标
-//            context.sendBroadcast(new Intent(Intent.ACTION_PACKAGE_CHANGED)
-//								  .setData(android.net.Uri.parse("package:" + context.getPackageName())));
-//
-//            // 4. 反馈结果
-//            String logMsg = shortcutCreated ? "启用 Laojun + 快捷方式创建成功" : "启用 Laojun 成功，快捷方式创建失败";
-//            String toastMsg = shortcutCreated ? "图标切换为 Laojun，已创建快捷方式" : "图标切换为 Laojun，快捷方式创建失败";
-//            LogUtils.d(TAG, logMsg);
-//            Toast.makeText(context, toastMsg, Toast.LENGTH_SHORT).show();
-//
-            return true;
-
-        } catch (Exception e) {
-            LogUtils.e(TAG, "Laojun 图标切换失败：" + e.getMessage());
-            // 失败兜底：启用 Wukong 组件
-            //enableComponent(pm, wukongComponent);
-            Toast.makeText(context, "图标切换失败" + e.getMessage(), Toast.LENGTH_SHORT).show();
-            return false;
-        }
-    }
-
-
-    /**
-     * 移除Plus组件
-     */
-    public static boolean closeAPPPlus(Context context) {
-        if (context == null) {
-            LogUtils.d(TAG, "切换失败：上下文为空");
-            Toast.makeText(context, "图标切换失败", Toast.LENGTH_SHORT).show();
-            return false;
-        }
-
-        PackageManager pm = context.getPackageManager();
-        ComponentName plusComponentLaojun = new ComponentName(context, App.COMPONENT_LAOJUN);
-        //ComponentName plusComponentWuKong = new ComponentName(context, MainActivity.COMPONENT_WUKONG);
-		
-		disableComponent(pm, plusComponentLaojun);
-		//enableComponent(pm, plusComponentWuKong);
-
-        return true;
-    }
-
-    /**
-     * 创建指定组件的桌面快捷方式（自动去重，兼容 Android 8.0+）
-     * @param component 目标组件（如 LAOJUN_ACTIVITY）
-     * @param name 快捷方式名称
-     * @param iconRes 快捷方式图标资源ID
-     * @return 是否创建成功
-     */
-    private static boolean createComponentShortcut(Context context, ComponentName component, String name, int iconRes) {
-        if (context == null || component == null || name == null || iconRes == 0) {
-            LogUtils.d(TAG, "快捷方式创建失败：参数为空");
-            return false;
-        }
-
-        // Android 8.0+（API 26+）：使用 ShortcutManager（系统推荐）
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            try {
-                PackageManager pm = context.getPackageManager();
-                android.content.pm.ShortcutManager shortcutManager = context.getSystemService(android.content.pm.ShortcutManager.class);
-                if (shortcutManager == null || !shortcutManager.isRequestPinShortcutSupported()) {
-                    LogUtils.d(TAG, "系统不支持创建快捷方式");
-                    return false;
-                }
-
-                // 检查是否已存在该组件的快捷方式（去重）
-                for (android.content.pm.ShortcutInfo info : shortcutManager.getPinnedShortcuts()) {
-                    if (component.getClassName().equals(info.getIntent().getComponent().getClassName())) {
-                        LogUtils.d(TAG, "快捷方式已存在：" + component.getClassName());
-                        return true;
-                    }
-                }
-
-                // 构建启动目标组件的意图
-                Intent launchIntent = new Intent(Intent.ACTION_MAIN)
-					.setComponent(component)
-					.addCategory(Intent.CATEGORY_LAUNCHER)
-					.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-
-                // 构建快捷方式信息
-                android.content.pm.ShortcutInfo shortcutInfo = new android.content.pm.ShortcutInfo.Builder(context, component.getClassName())
-					.setShortLabel(name)
-					.setLongLabel(name)
-					.setIcon(android.graphics.drawable.Icon.createWithResource(context, iconRes))
-					.setIntent(launchIntent)
-					.build();
-
-                // 请求创建快捷方式（需用户确认）
-                shortcutManager.requestPinShortcut(shortcutInfo, null);
-                return true;
-
-            } catch (Exception e) {
-                LogUtils.d(TAG, "Android O+ 快捷方式创建失败：" + e.getMessage());
-                return false;
-            }
-        } else {
-            // Android 8.0 以下：使用广播（兼容旧机型）
-            try {
-                // 构建启动目标组件的意图
-                Intent launchIntent = new Intent(Intent.ACTION_MAIN)
-					.setComponent(component)
-					.addCategory(Intent.CATEGORY_LAUNCHER)
-					.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-
-                // 构建创建快捷方式的广播意图
-                Intent installIntent = new Intent("com.android.launcher.action.INSTALL_SHORTCUT");
-                installIntent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, launchIntent);
-                installIntent.putExtra(Intent.EXTRA_SHORTCUT_NAME, name);
-                installIntent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
-									   Intent.ShortcutIconResource.fromContext(context, iconRes));
-                installIntent.putExtra("duplicate", false); // 禁止重复创建
-
-                context.sendBroadcast(installIntent);
-                return true;
-
-            } catch (Exception e) {
-                LogUtils.d(TAG, "Android O- 快捷方式创建失败：" + e.getMessage());
-                return false;
-            }
-        }
-    }
-
-    /**
-     * 启用组件（带状态检查，避免重复操作）
-     */
-    private static void enableComponent(PackageManager pm, ComponentName component) {
-        if (pm.getComponentEnabledSetting(component) != PackageManager.COMPONENT_ENABLED_STATE_ENABLED) {
-            pm.setComponentEnabledSetting(
-				component,
-				PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
-				PackageManager.DONT_KILL_APP | PackageManager.SYNCHRONOUS
-            );
-        }
-    }
-
-    /**
-     * 禁用组件（带状态检查，避免重复操作）
-     */
-    private static void disableComponent(PackageManager pm, ComponentName component) {
-        if (pm.getComponentEnabledSetting(component) != PackageManager.COMPONENT_ENABLED_STATE_DISABLED) {
-            pm.setComponentEnabledSetting(
-				component,
-				PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
-				PackageManager.DONT_KILL_APP | PackageManager.SYNCHRONOUS
-            );
-        }
-    }
-}
-

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

@@ -1,148 +0,0 @@
-package cc.winboll.studio.positions.utils;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageManager;
-import android.text.TextUtils;
-import cc.winboll.studio.libappbase.LogUtils;
-
-/**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/11/15 15:23
- * @Describe Activity Alias 工具类（兼容 Android 所有版本，Java 7 语法）
- * 用于获取 activity-alias 对应的原始 Activity 组件名、判断 alias 类型、获取启动组件名等
- */
-public class ActivityAliasUtils {
-    private static final String TAG = "ActivityAliasUtils";
-
-    /**
-     * 获取 activity-alias 指向的原始 Activity 组件名
-     *
-     * @param context     上下文（建议用 ApplicationContext）
-     * @param aliasName   activity-alias 的组件名（完整路径，如 ".AliasActivity" 或 "com.winboll.app.AliasActivity"）
-     * @return            原始 Activity 的完整组件名（如 "com.winboll.app.OriginalActivity"），失败返回 null
-     */
-    public static String getTargetActivityName(Context context, String aliasName) {
-        // 校验参数
-        if (context == null || TextUtils.isEmpty(aliasName)) {
-            LogUtils.e(TAG, "getTargetActivityName: context is null or aliasName is empty");
-            return null;
-        }
-
-        // 补全组件名（若传入的是短名，自动拼接包名）
-        String fullAliasName = aliasName.startsWith(".")
-			? context.getPackageName() + aliasName
-			: aliasName;
-
-        try {
-            // 1. 获取 PackageManager
-            PackageManager packageManager = context.getPackageManager();
-
-            // 2. 解析 activity-alias 的 ActivityInfo（flag 必须设为 PackageManager.GET_META_DATA，否则可能获取不到 targetActivity）
-            ActivityInfo aliasActivityInfo = packageManager.getActivityInfo(
-				new android.content.ComponentName(context.getPackageName(), fullAliasName),
-				PackageManager.GET_META_DATA
-            );
-
-            // 3. 获取 targetActivity（原始 Activity 组件名）
-            String targetActivity = aliasActivityInfo.targetActivity;
-            if (TextUtils.isEmpty(targetActivity)) {
-                LogUtils.e(TAG, "getTargetActivityName: targetActivity is empty for alias " + fullAliasName);
-                return null;
-            }
-
-            // 4. 补全原始 Activity 的完整包名（若 targetActivity 是短名）
-            String fullTargetName = targetActivity.startsWith(".")
-				? context.getPackageName() + targetActivity
-				: targetActivity;
-
-            LogUtils.d(TAG, "getTargetActivityName: alias=" + fullAliasName + ", target=" + fullTargetName);
-            return fullTargetName;
-
-        } catch (PackageManager.NameNotFoundException e) {
-            LogUtils.e(TAG, "getTargetActivityName: alias not found - " + fullAliasName, e);
-        } catch (Exception e) {
-            LogUtils.e(TAG, "getTargetActivityName: unknown error", e);
-        }
-        return null;
-    }
-
-    /**
-     * 判断某个组件名是否为 activity-alias（而非原始 Activity）
-     *
-     * @param context       上下文
-     * @param componentName 待判断的组件名（完整路径）
-     * @return              true：是 activity-alias；false：不是或判断失败
-     */
-    public static boolean isActivityAlias(Context context, String componentName) {
-        // 调用 getTargetActivityName，若返回非空，则说明是 alias
-        return !TextUtils.isEmpty(getTargetActivityName(context, componentName));
-    }
-
-    /**
-     * 从启动的 Intent 中获取实际的目标组件名（处理 alias 场景）
-     * 适用于 Activity 中获取自身真实组件名（原始 Activity 名）
-     *
-     * @param context  当前 Activity 上下文
-     * @return         真实的目标组件名（原始 Activity 名，若为 alias 启动则返回原始 Activity，否则返回自身）
-     */
-    public static String getRealTargetNameFromIntent(Context context) {
-        if (context == null) {
-            LogUtils.e(TAG, "getRealTargetNameFromIntent: context is null");
-            return null;
-        }
-
-        // 获取当前 Activity 的组件名（可能是 alias）
-        String currentComponentName = context.getClass().getName();
-        // 检查是否为 alias，若是则返回 target，否则返回自身
-        String targetName = getTargetActivityName(context, currentComponentName);
-        return TextUtils.isEmpty(targetName) ? currentComponentName : targetName;
-    }
-
-    /**
-     * 获取当前活动上下文（Activity）的启动组件名（即启动时使用的组件名，可能是 alias 或原始 Activity）
-     * 场景：若通过 alias 启动 Activity，返回 alias 名；若直接启动原始 Activity，返回原始 Activity 名
-     *
-     * @param context 当前 Activity 上下文（必须是 Activity 实例，不能是 ApplicationContext）
-     * @return        启动组件的完整名，失败返回 null
-     */
-    public static String getLaunchComponentName(Context context) {
-        // 1. 校验上下文类型（必须是 Activity，否则无法获取启动 Intent）
-        if (context == null) {
-            LogUtils.e(TAG, "getLaunchComponentName: context is null");
-            return null;
-        }
-        if (!(context instanceof android.app.Activity)) {
-            LogUtils.e(TAG, "getLaunchComponentName: context must be Activity instance, current is " + context.getClass().getName());
-            return null;
-        }
-
-        try {
-            // 2. 获取启动当前 Activity 的 Intent
-            android.app.Activity activity = (android.app.Activity) context;
-            Intent launchIntent = activity.getIntent();
-            if (launchIntent == null) {
-                LogUtils.e(TAG, "getLaunchComponentName: launch Intent is null");
-                return null;
-            }
-
-            // 3. 从 Intent 中获取启动组件名（ComponentName）
-            android.content.ComponentName componentName = launchIntent.getComponent();
-            if (componentName == null) {
-                LogUtils.e(TAG, "getLaunchComponentName: ComponentName is null in launch Intent");
-                return null;
-            }
-
-            // 4. 获取组件的完整类名（即启动时使用的组件名）
-            String launchComponentName = componentName.getClassName();
-            LogUtils.d(TAG, "getLaunchComponentName: current launch component is " + launchComponentName);
-            return launchComponentName;
-
-        } catch (Exception e) {
-            LogUtils.e(TAG, "getLaunchComponentName: failed to get launch component name", e);
-            return null;
-        }
-    }
-}
-

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

@@ -1,8 +1,6 @@
 package cc.winboll.studio.positions.utils;
 import android.content.Context;
-import cc.winboll.studio.positions.AppLevel;
 import cc.winboll.studio.positions.models.AppConfigsModel;
-import cc.winboll.studio.positions.App;
 
 /**
  * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
@@ -60,27 +58,11 @@ public class AppConfigsUtil {
 	}
 
 	public void setIsEnableMainService(boolean isEnableMainService) {
-		if (mAppConfigsModel == null) {
+		if(mAppConfigsModel == null) {
 			mAppConfigsModel = new AppConfigsModel();
 		}
 		mAppConfigsModel.setIsEnableMainService(isEnableMainService);
 		saveConfigs();
 	}
-
-	public AppLevel getAppLevel(boolean isReloadConfigs) {
-		if (isReloadConfigs) {
-			loadConfigs();
-		}
-		return (mAppConfigsModel == null) ?AppLevel.WUKONG: mAppConfigsModel.getAppLevel();
-	}
-	
-	public void setAppLevel(AppLevel appLevel) {
-		if (mAppConfigsModel == null) {
-			mAppConfigsModel = new AppConfigsModel();
-		}
-		App._mAppLevel = appLevel;
-		mAppConfigsModel.setAppLevel(appLevel);
-		saveConfigs();
-	}
 }
 

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

@@ -1,241 +0,0 @@
-package cc.winboll.studio.positions.utils;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Environment;
-import android.provider.MediaStore;
-import android.util.Log;
-import android.widget.Toast;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/11/13 15:42
- * @Describe JsonShareHandler
- * 外部 JSON 文件分享处理工具类
- * 功能：接收外部分享的 .json 文件，弹出确认对话框，保存到外部存储 files/BaseBean 目录
- */
-public class JsonShareHandler {
-    private static final String TAG = "JsonShareHandler";
-    private static final String TARGET_DIR = "BaseBean";
-    private static final String MIME_TYPE_JSON = "application/json";
-    private static final String FILE_SUFFIX_JSON = ".json";
-    // 对话框回调接口（Java7 无 Lambda，用接口实现）
-    public interface ConfirmCallback {
-        void onConfirm(boolean isConfirm);
-    }
-
-    /**
-     * 处理外部分享的 Intent，先弹出确认对话框，再决定是否接收文件
-     * @param context 上下文（需为 Activity，否则无法弹出对话框）
-     * @param intent 分享 Intent
-     * @param callback 确认结果回调（用于 Activity 处理后续逻辑）
-     */
-    public static void handleSharedJsonWithConfirm(final Context context, final Intent intent, final ConfirmCallback callback) {
-        if (context == null || intent == null || callback == null) {
-            Log.e(TAG, "参数为空，处理失败");
-            if (callback != null) callback.onConfirm(false);
-            return;
-        }
-
-        // 1. 先验证 Intent 合法性（提前过滤无效分享）
-        String action = intent.getAction();
-        String type = intent.getType();
-        if (!Intent.ACTION_SEND.equals(action) || type == null) {
-            Log.e(TAG, "非文件分享 Intent");
-            Toast.makeText(context, "不支持的分享类型", Toast.LENGTH_SHORT).show();
-            callback.onConfirm(false);
-            return;
-        }
-
-        // 2. 弹出确认对话框
-        new AlertDialog.Builder(context)
-			.setTitle("接收 JSON 文件")
-			.setMessage("是否接收并保存该 JSON 文件？")
-			.setPositiveButton("Yes", new DialogInterface.OnClickListener() {
-				@Override
-				public void onClick(DialogInterface dialog, int which) {
-					dialog.dismiss();
-					// 3. 点击 Yes，处理文件保存
-					String savedPath = handleSharedJsonFile(context, intent);
-					if (savedPath != null) {
-						Toast.makeText(context, "文件保存成功：" + savedPath, Toast.LENGTH_LONG).show();
-						callback.onConfirm(true);
-					} else {
-						Toast.makeText(context, "文件保存失败", Toast.LENGTH_SHORT).show();
-						callback.onConfirm(false);
-					}
-				}
-			})
-			.setNegativeButton("No", new DialogInterface.OnClickListener() {
-				@Override
-				public void onClick(DialogInterface dialog, int which) {
-					dialog.dismiss();
-					// 4. 点击 No，直接退出处理
-					callback.onConfirm(false);
-				}
-			})
-			.setCancelable(false) // 不可点击外部取消
-			.show();
-    }
-
-    /**
-     * 核心文件处理逻辑（原有功能，无修改）
-     */
-    private static String handleSharedJsonFile(Context context, Intent intent) {
-        String action = intent.getAction();
-        String type = intent.getType();
-
-        // 验证 JSON 格式
-        if (!MIME_TYPE_JSON.equals(type) && !type.contains("json")) {
-            Uri uri = intent.getParcelableExtra(Intent.EXTRA_STREAM);
-            if (uri == null || !getFileNameFromUri(context, uri).endsWith(FILE_SUFFIX_JSON)) {
-                Log.e(TAG, "接收的文件不是 JSON 格式");
-                return null;
-            }
-        }
-
-        Uri sharedUri = intent.getParcelableExtra(Intent.EXTRA_STREAM);
-        if (sharedUri == null) {
-            Log.e(TAG, "未获取到分享的文件 Uri");
-            return null;
-        }
-
-        try {
-            // 创建保存目录
-            File saveDir = getTargetSaveDir(context);
-            if (!saveDir.exists() && !saveDir.mkdirs()) {
-                Log.e(TAG, "创建保存目录失败：" + saveDir.getAbsolutePath());
-                return null;
-            }
-
-            // 解析文件名（兼容低版本）
-            String fileName = getFileNameFromUri(context, sharedUri);
-            if (fileName == null || !fileName.endsWith(FILE_SUFFIX_JSON)) {
-                fileName = "default_" + System.currentTimeMillis() + FILE_SUFFIX_JSON;
-                Log.w(TAG, "文件名解析失败，使用默认名称：" + fileName);
-            }
-
-            // 复制文件
-            File targetFile = new File(saveDir, fileName);
-            boolean copySuccess = copyFileFromUri(context, sharedUri, targetFile);
-            return copySuccess ? targetFile.getAbsolutePath() : null;
-
-        } catch (Exception e) {
-            Log.e(TAG, "处理分享文件异常：" + e.getMessage());
-            return null;
-        }
-    }
-
-    /**
-     * 获取目标保存目录（兼容 Android 10+ 分区存储）
-     */
-    private static File getTargetSaveDir(Context context) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            return new File(context.getExternalFilesDir(null), TARGET_DIR);
-        } else {
-            return new File(
-                Environment.getExternalStorageDirectory() + File.separator +
-                "Android" + File.separator +
-                "data" + File.separator +
-                context.getPackageName() + File.separator +
-                "files" + File.separator +
-                TARGET_DIR
-            );
-        }
-    }
-
-    /**
-     * 从 Uri 解析文件名（兼容所有 Android 版本）
-     */
-    private static String getFileNameFromUri(Context context, Uri uri) {
-        if (uri == null) return null;
-
-        // 1. 文件 Uri（file:// 开头）
-        if ("file".equals(uri.getScheme())) {
-            return new File(uri.getPath()).getName();
-        }
-
-        // 2. 内容 Uri（content:// 开头）
-        if ("content".equals(uri.getScheme())) {
-            Cursor cursor = null;
-            try {
-                cursor = context.getContentResolver().query(
-                    uri,
-                    new String[]{MediaStore.MediaColumns.DISPLAY_NAME},
-                    null,
-                    null,
-                    null
-                );
-                if (cursor != null && cursor.moveToFirst()) {
-                    int nameIndex = cursor.getColumnIndex(MediaStore.MediaColumns.DISPLAY_NAME);
-                    if (nameIndex != -1) {
-                        return cursor.getString(nameIndex);
-                    }
-                }
-            } catch (Exception e) {
-                Log.e(TAG, "解析内容 Uri 文件名失败：" + e.getMessage());
-            } finally {
-                if (cursor != null) cursor.close();
-            }
-        }
-
-        // 3. 解析失败，返回默认名称
-        String lastPathSegment = uri.getLastPathSegment();
-        return lastPathSegment != null ? lastPathSegment : "unknown.json";
-    }
-
-    /**
-     * 复制 Uri 指向的文件到目标路径
-     */
-    private static boolean copyFileFromUri(Context context, Uri sourceUri, File targetFile) {
-        InputStream inputStream = null;
-        OutputStream outputStream = null;
-        try {
-            inputStream = context.getContentResolver().openInputStream(sourceUri);
-            if (inputStream == null) {
-                Log.e(TAG, "无法打开源文件输入流");
-                return false;
-            }
-
-            outputStream = new FileOutputStream(targetFile);
-            byte[] buffer = new byte[1024 * 4];
-            int length;
-            while ((length = inputStream.read(buffer)) != -1) {
-                outputStream.write(buffer, 0, length);
-            }
-            outputStream.flush();
-            Log.d(TAG, "文件保存成功：" + targetFile.getAbsolutePath());
-            return true;
-
-        } catch (IOException e) {
-            Log.e(TAG, "文件复制异常：" + e.getMessage());
-            return false;
-        } finally {
-            try {
-                if (inputStream != null) inputStream.close();
-                if (outputStream != null) outputStream.close();
-            } catch (IOException e) {
-                Log.e(TAG, "关闭流异常：" + e.getMessage());
-            }
-        }
-    }
-
-    /**
-     * 检查外部存储是否可用
-     */
-    public static boolean isExternalStorageAvailable() {
-        String state = Environment.getExternalStorageState();
-        return Environment.MEDIA_MOUNTED.equals(state);
-    }
-}
-

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

@@ -1,168 +0,0 @@
-package cc.winboll.studio.positions.utils;
-
-/**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/11/05 15:49
- * @Describe LocalMotionDetector
- */
-import android.content.Context;
-import android.hardware.Sensor;
-import android.hardware.SensorEvent;
-import android.hardware.SensorEventListener;
-import android.hardware.SensorManager;
-import android.os.Handler;
-import android.os.Looper;
-import android.util.Log;
-import cc.winboll.studio.libappbase.LogUtils;
-
-/**
- * 本机运动状态监测工具（无联网，纯传感器）
- */
-public class LocalMotionDetector implements SensorEventListener {
-    public static final String TAG = "LocalMotionDetector";
-
-    // 配置参数（重点修改：调高运动阈值，适配坐立持机场景）
-    private static final float MOTION_THRESHOLD = 1.8f; // 从0.5f调高到1.8f（过滤坐立轻微晃动）
-    private static final long STATUS_CHECK_INTERVAL = 3000; // 3秒判断一次状态
-    private static final int STEP_CHANGE_THRESHOLD = 2; // 3秒≥2步判定行走
-
-    private SensorManager mSensorManager;
-    private Sensor mAccelerometer;
-    private Sensor mStepCounter;
-    private Handler mMainHandler;
-    private MotionStatusCallback mCallback;
-
-    private boolean mIsDetecting = false;
-    private float mLastAccelMagnitude = 0f;
-    private int mLastStepCount = 0;
-    private int mCurrentStepCount = 0;
-    private boolean mIsWalking = false;
-
-    // 单例模式
-    private static LocalMotionDetector sInstance;
-    public static LocalMotionDetector getInstance() {
-        if (sInstance == null) {
-            synchronized (LocalMotionDetector.class) {
-                if (sInstance == null) {
-                    sInstance = new LocalMotionDetector();
-                }
-            }
-        }
-        return sInstance;
-    }
-
-    private LocalMotionDetector() {
-        mMainHandler = new Handler(Looper.getMainLooper());
-    }
-
-    /**
-     * 开始监测运动状态
-     */
-    public void startDetection(Context context, MotionStatusCallback callback) {
-        if (mIsDetecting) return;
-        mCallback = callback;
-        mSensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
-
-        // 初始化传感器
-        mAccelerometer = mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
-        mStepCounter = mSensorManager.getDefaultSensor(Sensor.TYPE_STEP_COUNTER);
-
-        // 注册传感器监听
-        if (mAccelerometer != null) {
-            mSensorManager.registerListener(this, mAccelerometer, SensorManager.SENSOR_DELAY_NORMAL, mMainHandler);
-        }
-        if (mStepCounter != null) {
-            mSensorManager.registerListener(this, mStepCounter, SensorManager.SENSOR_DELAY_NORMAL, mMainHandler);
-            LogUtils.d(TAG, "计步传感器已启动");
-        } else {
-            LogUtils.d(TAG, "设备不支持计步传感器，仅用加速度判断");
-        }
-
-        // 启动定时状态检测
-        mMainHandler.postDelayed(mStatusCheckRunnable, STATUS_CHECK_INTERVAL);
-        mIsDetecting = true;
-        LogUtils.d(TAG, "运动状态监测已启动");
-    }
-
-    /**
-     * 停止监测
-     */
-    public void stopDetection() {
-        if (!mIsDetecting) return;
-        if (mSensorManager != null) {
-            mSensorManager.unregisterListener(this);
-        }
-        mMainHandler.removeCallbacksAndMessages(null);
-        mIsDetecting = false;
-        mIsWalking = false;
-        mCallback = null;
-        LogUtils.d(TAG, "运动状态监测已停止");
-    }
-
-    @Override
-    public void onSensorChanged(SensorEvent event) {
-        if (!mIsDetecting) return;
-        switch (event.sensor.getType()) {
-            case Sensor.TYPE_ACCELEROMETER:
-                // 计算加速度幅度（保留原逻辑，阈值已调高）
-                float accelX = Math.abs(event.values[0]);
-                float accelY = Math.abs(event.values[1]);
-                float accelZ = Math.abs(event.values[2]);
-                mLastAccelMagnitude = accelX + accelY + accelZ;
-                break;
-            case Sensor.TYPE_STEP_COUNTER:
-                // 累计步数
-                mCurrentStepCount = (int) event.values[0];
-                break;
-        }
-    }
-
-    /**
-     * 定时判断运动状态（优化逻辑：计步为0时，即使有轻微加速度也判定为静止）
-     */
-    private final Runnable mStatusCheckRunnable = new Runnable() {
-        @Override
-        public void run() {
-            if (!mIsDetecting || mCallback == null) return;
-
-			//LogUtils.d(TAG, "mStatusCheckRunnable run");
-			
-            boolean newIsWalking = false;
-            // 结合计步器+加速度判断（优化：优先计步，无步数时严格按高阈值判断）
-            if (mStepCounter != null) {
-                int stepChange = mCurrentStepCount - mLastStepCount;
-                // 只有“步数达标” 或 “无步数但加速度远超坐立幅度”，才判定为行走
-                newIsWalking = (stepChange >= STEP_CHANGE_THRESHOLD) 
-					&& (mLastAccelMagnitude >= MOTION_THRESHOLD); // 增加步数+加速度双重校验
-                mLastStepCount = mCurrentStepCount;
-            } else {
-                // 无计步器时，仅用高阈值判断
-                newIsWalking = mLastAccelMagnitude >= MOTION_THRESHOLD;
-            }
-
-            // 状态变化时回调
-            if (newIsWalking != mIsWalking) {
-                mIsWalking = newIsWalking;
-                String statusDesc = mIsWalking ? "行走状态" : "静止/低运动状态";
-                LogUtils.d(TAG, "运动状态变化：" + statusDesc + " | 加速度幅度：" + mLastAccelMagnitude); // 增加日志便于调试
-                mCallback.onMotionStatusChanged(mIsWalking, statusDesc);
-            }
-			
-			LogUtils.d(TAG, String.format("运动状态 newIsWalking %s", newIsWalking));
-
-            // 循环检测
-            mMainHandler.postDelayed(this, STATUS_CHECK_INTERVAL);
-        }
-    };
-
-    @Override
-    public void onAccuracyChanged(Sensor sensor, int accuracy) {}
-
-    /**
-     * 运动状态回调接口
-     */
-    public interface MotionStatusCallback {
-        void onMotionStatusChanged(boolean isWalking, String statusDesc);
-    }
-}
-

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

@@ -1,105 +0,0 @@
-package cc.winboll.studio.positions.utils;
-
-import android.app.Activity;
-import android.app.Application;
-import android.content.Intent;
-import android.os.Bundle;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.ToastUtils;
-import cc.winboll.studio.positions.PointLevel;
-import cc.winboll.studio.positions.activities.WinBoLLActivity;
-
-/**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/11/15 15:59
- * @Describe 应用活动窗口状态响应类
- * 主要用于设置应用级别与组件状态
- */
-public class MyActivityLifecycleCallbacks implements Application.ActivityLifecycleCallbacks { 
-
-	public static final String TAG = "MyActivityLifecycleCallbacks";
-
-	public String mInfo = "";
-
-	public MyActivityLifecycleCallbacks() {
-
-	}
-
-	void createActivityeInfo(Activity activity) {
-		StringBuilder sb = new StringBuilder();
-		Intent receivedIntent = activity.getIntent();
-		sb.append("\nCallingActivity : \n");
-		if (activity.getCallingActivity() != null) {
-			sb.append(activity.getCallingActivity().getPackageName());
-		}
-		sb.append("\nReceived Intent Package : \n");
-		sb.append(receivedIntent.getPackage());
-
-		Bundle extras = receivedIntent.getExtras();
-		if (extras != null) {
-			for (String key : extras.keySet()) {
-				sb.append("\nIntentInfo");
-				sb.append("\n键: ");
-				sb.append(key);
-				sb.append(", 值: ");
-				sb.append(extras.get(key));
-				//Log.d("IntentInfo", "键: " + key + ", 值: " + extras.get(key));
-			}
-		}
-		mInfo = sb.toString();
-		//Log.d("IntentInfo", "发送Intent的应用包名: " + senderPackage);
-	}
-
-	public void showActivityeInfo() {
-		//ToastUtils.show("ActivityeInfo : " + mInfo);
-		LogUtils.d(TAG, "ActivityeInfo : " + mInfo);
-	}
-
-	@Override 
-	public void onActivityCreated(Activity activity, Bundle savedInstanceState) { 
-		// 在这里可以做一些初始化相关的操作，例如记录Activity的创建时间等 
-		//System.out.println(activity.getLocalClassName() + " was created"); 
-		LogUtils.d(TAG, activity.getLocalClassName() + " was created");
-		createActivityeInfo(activity);
-	} 
-
-	@Override 
-	public void onActivityStarted(Activity activity) { 
-		//System.out.println(activity.getLocalClassName() + " was started");
-		LogUtils.d(TAG, activity.getLocalClassName() + " was started");
-		//createActivityeInfo(activity);
-	} 
-
-	@Override 
-	public void onActivityResumed(Activity activity) { 
-		//System.out.println(activity.getLocalClassName() + " was resumed");
-		LogUtils.d(TAG, activity.getLocalClassName() + " was resumed");
-		//createActivityeInfo(activity);
-	} 
-
-	@Override 
-	public void onActivityPaused(Activity activity) {
-		ToastUtils.show("Activity Paused");
-		// 应用从正在活动状态抽离出来时，设置应用入口级别状态，设置为时空虚幻而不确定的哆啦A梦级别。
-		WinBoLLActivity._mPointLevel = PointLevel.DORAEMON;
-		//System.out.println(activity.getLocalClassName() + " was paused");
-		LogUtils.d(TAG, activity.getLocalClassName() + " was paused");
-	} 
-
-	@Override 
-	public void onActivityStopped(Activity activity) { 
-		//System.out.println(activity.getLocalClassName() + " was stopped");
-		LogUtils.d(TAG, activity.getLocalClassName() + " was stopped");
-	} 
-
-	@Override 
-	public void onActivitySaveInstanceState(Activity activity, Bundle outState) { 
-		// 可以在这里添加保存状态的自定义逻辑 
-	} 
-
-	@Override 
-	public void onActivityDestroyed(Activity activity) { 
-		//System.out.println(activity.getLocalClassName() + " was destroyed");
-		LogUtils.d(TAG, activity.getLocalClassName() + " was destroyed");
-	} 
-}

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

@@ -1,282 +0,0 @@
-package cc.winboll.studio.positions.views;
-
-/**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/11/10 08:29
- * @Describe 沙漏计时器控件
- */
-import android.content.Context;
-import android.graphics.Color;
-import android.graphics.drawable.ClipDrawable;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.LayerDrawable;
-import android.text.InputFilter;
-import android.text.InputType;
-import android.util.AttributeSet;
-import android.view.Gravity;
-import android.view.ViewGroup;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.ProgressBar;
-import android.widget.Switch;
-import android.widget.TextView;
-
-/**
- * 沙漏视图类（Java 7语法，修复ProgressDrawable和setHeight问题）
- */
-public class HourglassView extends LinearLayout {
-	public static final String TAG = "HourglassView";
-	// 数据模型
-    private String hourglassId;
-    private int hour; // 小时
-    private int minute; // 分钟
-    private boolean isEnabled; // 开关状态
-
-    // 控件引用
-    private EditText etHour;
-    private EditText etMinute;
-    private ProgressBar progressBar;
-    private Switch switchControl;
-
-    // 样式参数
-    private int textSize = 16;
-    private int padding = 8;
-    private int progressColor = 0xFF2196F3; // 进度条颜色
-    private int progressBgColor = 0xFFE0E0E0; // 进度条背景色
-    private int textColor = 0xFF333333;
-    private int editTextWidth = 40; // 输入框宽度（dp）
-    private int progressHeight = 8; // 进度条高度（dp，新增参数）
-
-    public HourglassView(Context context) {
-        super(context);
-        initView();
-    }
-
-    public HourglassView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        initView();
-    }
-
-    /**
-     * 初始化视图布局
-     */
-    private void initView() {
-        setOrientation(HORIZONTAL);
-        setGravity(Gravity.CENTER_VERTICAL);
-        setPadding(dp2px(padding), dp2px(padding), dp2px(padding), dp2px(padding));
-
-        // 1. 左侧时间输入区域（水平布局）
-        LinearLayout inputLayout = new LinearLayout(getContext());
-        inputLayout.setOrientation(HORIZONTAL);
-        inputLayout.setGravity(Gravity.CENTER_VERTICAL);
-        LayoutParams inputParams = new LayoutParams(
-			ViewGroup.LayoutParams.WRAP_CONTENT,
-			ViewGroup.LayoutParams.WRAP_CONTENT
-        );
-        inputParams.setMargins(0, 0, dp2px(padding * 2), 0);
-        addView(inputLayout, inputParams);
-
-        // 小时输入框
-        etHour = createNumberEditText();
-        etHour.setHint("时");
-        etHour.setFilters(new InputFilter[]{new InputFilter.LengthFilter(2)});
-        inputLayout.addView(etHour, getEditTextParams());
-
-        // 分隔符
-        TextView divider = new TextView(getContext());
-        divider.setText(":");
-        divider.setTextSize(textSize);
-        divider.setTextColor(textColor);
-        LayoutParams dividerParams = new LayoutParams(
-			ViewGroup.LayoutParams.WRAP_CONTENT,
-			ViewGroup.LayoutParams.WRAP_CONTENT
-        );
-        dividerParams.setMargins(dp2px(padding / 2), 0, dp2px(padding / 2), 0);
-        inputLayout.addView(divider, dividerParams);
-
-        // 分钟输入框
-        etMinute = createNumberEditText();
-        etMinute.setHint("分");
-        etMinute.setFilters(new InputFilter[]{new InputFilter.LengthFilter(2)});
-        inputLayout.addView(etMinute, getEditTextParams());
-
-        // 2. 中间进度条（修复：通过LayoutParams设置高度，替代setHeight）
-        progressBar = new ProgressBar(getContext(), null, android.R.attr.progressBarStyleHorizontal);
-        progressBar.setProgressDrawable(createProgressDrawable()); // 传入Drawable类型
-
-        // 修复核心：用LayoutParams设置进度条高度（兼容低版本）
-        LayoutParams progressParams = new LayoutParams(
-			0,
-			dp2px(progressHeight), // 直接在布局参数中设置高度（dp转px）
-			1.0f
-        );
-        progressParams.setMargins(0, 0, dp2px(padding * 2), 0);
-        addView(progressBar, progressParams);
-
-        // 3. 右侧开关
-        switchControl = new Switch(getContext());
-        switchControl.setOnCheckedChangeListener(new Switch.OnCheckedChangeListener() {
-				@Override
-				public void onCheckedChanged(android.widget.CompoundButton buttonView, boolean isChecked) {
-					isEnabled = isChecked;
-					// 开关状态控制输入框是否可编辑
-					etHour.setEnabled(!isChecked);
-					etMinute.setEnabled(!isChecked);
-					// 更新进度条（仅在开关开启时生效）
-					if (isChecked) {
-						updateProgressBar();
-					}
-				}
-			});
-        addView(switchControl);
-
-        // 初始状态
-        isEnabled = false;
-        etHour.setEnabled(true);
-        etMinute.setEnabled(true);
-    }
-
-    /**
-     * 创建数字输入框
-     */
-    private EditText createNumberEditText() {
-        EditText editText = new EditText(getContext());
-        editText.setInputType(InputType.TYPE_CLASS_NUMBER);
-        editText.setTextSize(textSize);
-        editText.setTextColor(textColor);
-        editText.setGravity(Gravity.CENTER);
-        editText.setSingleLine(true);
-        editText.setBackgroundResource(android.R.drawable.edit_text); // 默认输入框背景
-        return editText;
-    }
-
-    /**
-     * 获取输入框布局参数
-     */
-    private LayoutParams getEditTextParams() {
-        LayoutParams params = new LayoutParams(
-			dp2px(editTextWidth),
-			ViewGroup.LayoutParams.WRAP_CONTENT
-        );
-        params.setMargins(0, 0, dp2px(padding), 0);
-        return params;
-    }
-
-    /**
-     * 修复核心：创建ProgressDrawable（返回Drawable类型，而非Paint）
-     * 用LayerDrawable实现「背景+进度」的双层进度条
-     */
-    private Drawable createProgressDrawable() {
-        // 1. 进度条背景（灰色）
-        ColorDrawable bgDrawable = new ColorDrawable(progressBgColor);
-        // 2. 进度条前景（主题色）
-        ColorDrawable progressDrawable = new ColorDrawable(progressColor);
-        // 3. 用ClipDrawable包裹前景，实现进度裁剪
-        ClipDrawable clipDrawable = new ClipDrawable(progressDrawable, Gravity.LEFT, ClipDrawable.HORIZONTAL);
-
-        // 4. 组合成LayerDrawable（顺序：背景在下，进度在上）
-        Drawable[] layers = new Drawable[]{bgDrawable, clipDrawable};
-        LayerDrawable layerDrawable = new LayerDrawable(layers);
-
-        // 5. 设置进度条的层级ID（必须与系统ProgressBar的ID匹配）
-        layerDrawable.setId(0, android.R.id.background);
-        layerDrawable.setId(1, android.R.id.progress);
-
-        return layerDrawable;
-    }
-
-    /**
-     * 更新进度条（总时间 = 小时*60 + 分钟，单位：分钟）
-     */
-    private void updateProgressBar() {
-        try {
-            // 获取输入的时间（为空时默认0）
-            int inputHour = TextUtils.isEmpty(etHour.getText().toString().trim()) 
-				? 0 : Integer.parseInt(etHour.getText().toString().trim());
-            int inputMinute = TextUtils.isEmpty(etMinute.getText().toString().trim()) 
-				? 0 : Integer.parseInt(etMinute.getText().toString().trim());
-
-            // 校验时间合法性（小时0-99，分钟0-59）
-            inputHour = Math.max(0, Math.min(99, inputHour));
-            inputMinute = Math.max(0, Math.min(59, inputMinute));
-
-            // 计算总分钟数（进度条最大值）
-            int totalMinutes = inputHour * 60 + inputMinute;
-            totalMinutes = Math.max(1, totalMinutes); // 最小1分钟，避免进度条无长度
-
-            // 更新进度条
-            progressBar.setMax(totalMinutes);
-            progressBar.setProgress(totalMinutes); // 初始显示满进度，可根据实际需求修改
-
-            // 更新数据模型
-            this.hour = inputHour;
-            this.minute = inputMinute;
-
-        } catch (NumberFormatException e) {
-            // 输入非法时重置进度条
-            progressBar.setMax(0);
-            progressBar.setProgress(0);
-        }
-    }
-
-    /**
-     * dp转px（适配不同设备）
-     */
-    private int dp2px(int dp) {
-        return (int) (dp * getContext().getResources().getDisplayMetrics().density + 0.5f);
-    }
-
-    // ------------------- 数据模型 getter/setter -------------------
-    public String getHourglassId() {
-        return hourglassId;
-    }
-
-    public void setHourglassId(String hourglassId) {
-        this.hourglassId = hourglassId;
-    }
-
-    public int getHour() {
-        return hour;
-    }
-
-    public void setHour(int hour) {
-        this.hour = Math.max(0, Math.min(99, hour)); // 限制范围
-        etHour.setText(String.valueOf(this.hour));
-    }
-
-    public int getMinute() {
-        return minute;
-    }
-
-    public void setMinute(int minute) {
-        this.minute = Math.max(0, Math.min(59, minute)); // 限制范围
-        etMinute.setText(String.valueOf(this.minute));
-    }
-
-    public boolean isEnabled() {
-        return isEnabled;
-    }
-
-    public void setEnabled(boolean enabled) {
-        isEnabled = enabled;
-        switchControl.setChecked(enabled);
-    }
-
-    /**
-     * 手动更新进度条（外部调用）
-     */
-    public void refreshProgress() {
-        if (isEnabled) {
-            updateProgressBar();
-        }
-    }
-
-    // 工具类：判断字符串是否为空（Java7无TextUtils.isEmpty，手动实现）
-    private static class TextUtils {
-        public static boolean isEmpty(CharSequence str) {
-            return str == null || str.length() == 0;
-        }
-    }
-}
-

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

@@ -33,10 +33,6 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
-import cc.winboll.studio.positions.App;
-import cc.winboll.studio.positions.AppLevel;
-import cc.winboll.studio.positions.activities.WinBoLLActivity;
-import cc.winboll.studio.positions.PointLevel;
 
 public class PositionTaskListView extends LinearLayout {
     // 视图模式常量
@@ -384,7 +380,7 @@ public class PositionTaskListView extends LinearLayout {
 							// 步骤3：刷新Adapter（局部刷新+范围通知，避免列表错乱）
 							notifyItemRemoved(position);
 							notifyItemRangeChanged(position, mAdapterData.size());
-
+							
 							LogUtils.d(TAG, "Adapter已移除任务，刷新列表（位置索引=" + position + "）");
 
 							// 步骤4：通知外部（如Activity）任务已更新
@@ -461,7 +457,7 @@ public class PositionTaskListView extends LinearLayout {
 					}
 				});
         }
-
+		
 		private String genSelectedTimeText(long timeMillis) {
 			// 2. 格式化时间字符串（Java 7 用 SimpleDateFormat，需处理 ParseException）
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.getDefault());
@@ -487,16 +483,6 @@ public class PositionTaskListView extends LinearLayout {
             final EditText etEditDistance = dialogView.findViewById(R.id.et_edit_distance);
 			Button btnCancel = dialogView.findViewById(R.id.btn_dialog_cancel);
             Button btnSave = dialogView.findViewById(R.id.btn_dialog_save);
-			HourglassView hourglassView = dialogView.findViewById(R.id.hourglassView);
-			if (WinBoLLActivity._mPointLevel == PointLevel.WUKONG) {
-				hourglassView.setVisibility(View.GONE);
-			} else if (WinBoLLActivity._mPointLevel == PointLevel.LAOJUN) {
-				hourglassView.setHourglassId("hourglass_001");
-				hourglassView.setHour(1);
-				hourglassView.setMinute(30);
-				hourglassView.setEnabled(false); // 开启开关
-			}
-
 
 
 			// 绑定外层对话框内的控件

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 禁用状态：仅此处自定义（灰化样式） -->
+    <item android:state_enabled="false">
+        <shape android:shape="rectangle">
+            <solid android:color="#E0E0E0" /> <!-- 禁用背景灰（浅灰，贴近系统禁用色） -->
+            <stroke android:width="1px" android:color="#CCCCCC" /> <!-- 禁用边框灰 -->
+            <corners android:radius="2dp" /> <!-- 匹配系统按钮圆角弧度 -->
+        </shape>
+    </item>
+    <!-- 启用状态：直接复用系统默认按钮样式（与普通按钮完全一致） -->
+    <item android:state_enabled="true" android:drawable="@android:drawable/btn_default" />
+</selector>
+

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 禁用状态：文字灰（系统默认禁用文字色） -->
+    <item android:state_enabled="false" android:color="#9E9E9E" />
+    <!-- 启用状态：复用系统默认按钮文字色（与普通按钮一致） -->
+    <item android:state_enabled="true" android:color="@android:color/black" />
+</selector>
+

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

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

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

@@ -1,67 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:padding="20dp">
+	android:layout_height="match_parent">
 
-	<LinearLayout
-		android:id="@+id/layout_location_info"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_centerHorizontal="true"
-		android:layout_marginTop="30dp"
-		android:orientation="vertical"
-		android:gravity="center_horizontal">
-
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="实时位置信息"
-			android:textSize="22sp"
-			android:textStyle="bold"/>
-
-		<TextView
-			android:id="@+id/tv_longitude"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="当前经度：等待更新..."
-			android:textSize="18sp"
-			android:layout_marginTop="15dp"/>
-
-		<TextView
-			android:id="@+id/tv_latitude"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="当前纬度：等待更新..."
-			android:textSize="18sp"
-			android:layout_marginTop="10dp"/>
-
-	</LinearLayout>
-
-	<androidx.recyclerview.widget.RecyclerView
-		android:id="@+id/rv_position_list"
+	<cc.winboll.studio.libaes.views.ASupportToolbar
 		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:layout_below="@id/layout_location_info"
-		android:layout_above="@id/fab_p_button"
-		android:layout_marginTop="20dp"
-		android:paddingBottom="10dp"/>
+		android:layout_height="@dimen/toolbar_height"
+		android:id="@+id/toolbar"
+		android:gravity="center_vertical"/>
 
-	<Button
-		android:id="@+id/fab_p_button"
-		android:layout_width="60dp"
-		android:layout_height="60dp"
-		android:layout_alignParentBottom="true"
-		android:layout_alignParentRight="true"
-		android:layout_margin="20dp"
-		android:background="@drawable/circle_button_bg"
-		android:text="P"
-		android:textColor="@android:color/white"
-		android:textSize="24sp"
-		android:elevation="6dp"
-		android:padding="0dp"
-		android:onClick="addNewPosition"/>
+	<RelativeLayout
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:padding="20dp"
+		android:layout_weight="1.0">
 
-</RelativeLayout>
+		<LinearLayout
+			android:id="@+id/layout_location_info"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_centerHorizontal="true"
+			android:layout_marginTop="30dp"
+			android:orientation="vertical"
+			android:gravity="center_horizontal">
+
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="实时位置信息"
+				android:textSize="22sp"
+				android:textStyle="bold"/>
+
+			<TextView
+				android:id="@+id/tv_longitude"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="当前经度：等待更新..."
+				android:textSize="18sp"
+				android:layout_marginTop="15dp"/>
+
+			<TextView
+				android:id="@+id/tv_latitude"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="当前纬度：等待更新..."
+				android:textSize="18sp"
+				android:layout_marginTop="10dp"/>
+
+		</LinearLayout>
+
+		<androidx.recyclerview.widget.RecyclerView
+			android:id="@+id/rv_position_list"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:layout_below="@id/layout_location_info"
+			android:layout_above="@id/fab_p_button"
+			android:layout_marginTop="20dp"
+			android:paddingBottom="10dp"/>
+
+		<Button
+			android:id="@+id/fab_p_button"
+			android:layout_width="60dp"
+			android:layout_height="60dp"
+			android:layout_alignParentBottom="true"
+			android:layout_alignParentRight="true"
+			android:layout_margin="20dp"
+			android:background="@drawable/circle_button_bg"
+			android:text="P"
+			android:textColor="@android:color/white"
+			android:textSize="24sp"
+			android:elevation="6dp"
+			android:padding="0dp"
+			android:onClick="addNewPosition"/>
+
+	</RelativeLayout>
+
+</LinearLayout>
 

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

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

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

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<cc.winboll.studio.libaes.views.ASupportToolbar
+		android:layout_width="match_parent"
+		android:layout_height="@dimen/toolbar_height"
+		android:id="@+id/toolbar"
+		android:gravity="center_vertical"/>
+
+	<cc.winboll.studio.libaes.views.ADsControlView
+		android:id="@+id/ads_control_view"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"/>
+
+</LinearLayout>
+

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

@@ -65,16 +65,6 @@
 
 	</LinearLayout>
 
-	<LinearLayout
-		android:orientation="horizontal"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
-		<cc.winboll.studio.positions.views.HourglassView
-			android:id="@+id/hourglassView"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"/>
-	</LinearLayout>
-
 	<LinearLayout
 		android:orientation="horizontal"
 		android:layout_width="match_parent"
@@ -87,7 +77,7 @@
 			android:layout_height="wrap_content"
 			android:text="开始时间"
 			android:id="@+id/btn_select_time"/>
-
+		
 		<TextView
 			android:id="@+id/tv_selected_time"
 			android:layout_width="0dp"
@@ -95,6 +85,7 @@
 			android:text="Text"
 			android:layout_weight="1.0"/>
 
+
 	</LinearLayout>
 
 	<LinearLayout

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

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

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

@@ -1,9 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">悟空笔记</string>
-    <string name="appplus_name">时空任务</string>
-	<string name="open_appplus">开疆扩土</string>
-	<string name="close_appplus">返璞归真</string>
-	<string name="appplus_open_disabled">余力不足</string>
-	<string name="appplus_close_disabled">辎重难返</string>
 </resources>

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

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

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

@@ -1,8 +1,9 @@
 <resources>
     <string name="app_name">Positions</string>
-    <string name="appplus_name">PositionsPlus</string>
+	<string name="appplus_name">PositionsPlus</string>
 	<string name="open_appplus">Open APP Plus</string>
 	<string name="close_appplus">Close APP Plus</string>
 	<string name="appplus_open_disabled">APP Plus Open Disable</string>
 	<string name="appplus_close_disabled">APP Plus Close Disable</string>
 </resources>
+

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

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

positions/src/main/res/xml/file_provider.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <external-files-path
+        name="BaseBean"
+        path="BaseBean/" />
+</paths>

winboll/build.gradle

@@ -18,16 +18,14 @@ def genVersionName(def versionName){
 }
 
 android {
+	// 适配MIUI12
+	compileSdkVersion 30
+    buildToolsVersion "30.0.3"
 	
-    // 1. compileSdkVersion：必须 ≥ targetSdkVersion，建议直接等于 targetSdkVersion（30）
-    compileSdkVersion 30
-
-    // 2. buildToolsVersion：需匹配 compileSdkVersion，建议使用 30.x.x 最新稳定版（无需高于 compileSdkVersion）
-    buildToolsVersion "30.0.3" // 这是 30 对应的最新稳定版，避免使用 beta 版
-
     defaultConfig {
         applicationId "cc.winboll.studio.winboll"
-        minSdkVersion 23
+	    minSdkVersion 23
+		// 适配MIUI12
         targetSdkVersion 30
         versionCode 1
         // versionName 更新后需要手动设置 
@@ -43,6 +41,12 @@ android {
     packagingOptions {
          doNotStrip "*/*/libmimo_1011.so"
     }
+	
+    sourceSets {
+        main {
+            jniLibs.srcDirs = ['libs'] // 若SO库放在libs目录下
+        }
+    }
 }
 
 dependencies {
@@ -63,6 +67,10 @@ dependencies {
     api 'io.github.medyo:android-about-page:2.0.0'
 	// 网络连接类库
     api 'com.squareup.okhttp3:okhttp:4.4.1'
+	// OkHttp网络请求
+     implementation 'com.squareup.okhttp3:okhttp:3.14.9'
+     // FastJSON解析
+     implementation 'com.alibaba:fastjson:1.2.76'
     
 	// AndroidX 类库
     api 'androidx.appcompat:appcompat:1.1.0'
@@ -82,12 +90,12 @@ dependencies {
     //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
 	
 	// WinBoLL库 nexus.winboll.cc 地址
-	//api 'cc.winboll.studio:libaes:15.12.0'
-    //api 'cc.winboll.studio:libappbase:15.12.2'
+	api 'cc.winboll.studio:libaes:15.12.13'
+    api 'cc.winboll.studio:libappbase:15.14.2'
 	
 	// WinBoLL备用库 jitpack.io 地址
-	api 'com.github.ZhanGSKen:AES:aes-v15.12.1'
-	api 'com.github.ZhanGSKen:APPBase:appbase-v15.12.2'
+	//api 'com.github.ZhanGSKen:AES:aes-v15.12.9'
+	//api 'com.github.ZhanGSKen:APPBase:appbase-v15.14.1'
 	
 	api fileTree(dir: 'libs', include: ['*.jar'])
 }

winboll/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Dec 07 03:22:51 HKT 2025
-stageCount=7
+#Sat Jan 10 02:54:10 GMT 2026
+stageCount=9
 libraryProject=
 baseVersion=15.11
-publishVersion=15.11.6
-buildCount=0
-baseBetaVersion=15.11.7
+publishVersion=15.11.8
+buildCount=13
+baseBetaVersion=15.11.9

winboll/src/main/AndroidManifest.xml

@@ -14,8 +14,8 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@drawable/ic_launcher_stage"
-        android:roundIcon="@drawable/ic_launcher_stage"
+        android:icon="@drawable/ic_launcher"
+        android:roundIcon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/MyAppTheme"
         android:resizeableActivity="true"
@@ -37,7 +37,7 @@
             android:targetActivity=".MainActivity"
             android:exported="true"
             android:label="@string/app_name"
-            android:icon="@drawable/ic_launcher_stage"
+            android:icon="@drawable/ic_launcher"
             android:enabled="true">
 
             <intent-filter>
@@ -278,6 +278,10 @@
 
         <activity android:name="cc.winboll.studio.winboll.activities.SettingsActivity"/>
 
+        <activity android:name="cc.winboll.studio.winboll.unittest.TestWeWorkSpecSDK"/>
+
+        <activity android:name="cc.winboll.studio.winboll.activities.WXPayActivity"/>
+
     </application>
 
 </manifest>

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

@@ -1,6 +1,6 @@
 package cc.winboll.studio.winboll;
 
-import android.app.Activity;
+import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -8,20 +8,17 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
+import cc.winboll.studio.libaes.activitys.AboutActivity;
 import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
-import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
 import cc.winboll.studio.libaes.models.APPInfo;
 import cc.winboll.studio.libaes.models.DrawerMenuBean;
-import cc.winboll.studio.libaes.unittests.TestAButtonFragment;
-import cc.winboll.studio.libaes.unittests.TestViewPageFragment;
 import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.winboll.R;
 import cc.winboll.studio.winboll.activities.SettingsActivity;
+import cc.winboll.studio.winboll.activities.WXPayActivity;
 import cc.winboll.studio.winboll.fragments.BrowserFragment;
 import java.util.ArrayList;
-import android.content.Intent;
-import cc.winboll.studio.libaes.activitys.AboutActivity;
 
 public class MainActivity extends DrawerFragmentActivity {
 
@@ -152,6 +149,8 @@ public class MainActivity extends DrawerFragmentActivity {
 			}
 		} else if (nItemId == R.id.item_settings) {
 			WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), SettingsActivity.class);
+        } else if (nItemId == R.id.item_wxpayactivity) {
+			WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), WXPayActivity.class);
         } else if (nItemId == cc.winboll.studio.libaes.R.id.item_about) {
 			Intent intent = new Intent(getApplicationContext(), AboutActivity.class);
 			APPInfo appInfo = genDefaultAPPInfo();

winboll/src/main/java/cc/winboll/studio/winboll/WxPayConfig.java

@@ -0,0 +1,28 @@
+package cc.winboll.studio.winboll;
+
+/**
+ * 微信支付配置类
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2026/01/07
+ */
+public class WxPayConfig {
+    // ========== 核心修改点：替换为你的服务端地址 ==========
+    // 服务端IP/域名 + 端口（Docker部署的服务端，需确保安卓端可访问）
+    public static final String BASE_URL = "https://wxpay.winboll.cc";
+
+    // 统一下单接口路径（对应服务端的测试接口）
+    public static final String CREATE_ORDER_URL = BASE_URL + "/pay/createOrder";
+
+    // 订单查询接口路径
+    public static final String QUERY_ORDER_URL = BASE_URL + "/pay/queryOrder";
+
+    // ========== 固定支付配置 ==========
+    public static final String ORDER_BODY = "定额测试支付"; // 商品描述
+    public static final int TOTAL_FEE = 1; // 固定金额：1分（沙箱环境推荐）
+    public static final String TRADE_TYPE = "NATIVE"; // 支付类型：二维码
+
+    // ========== 轮询配置 ==========
+    public static final long POLL_INTERVAL = 10000; // 轮询间隔：10秒
+    public static final long POLL_TIMEOUT = 45000; // 轮询超时：45秒
+}
+

winboll/src/main/java/cc/winboll/studio/winboll/activities/WXPayActivity.java

@@ -0,0 +1,211 @@
+package cc.winboll.studio.winboll.activities;
+
+import android.app.Activity;
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
+import cc.winboll.studio.winboll.R;
+import cc.winboll.studio.winboll.WxPayConfig;
+import cc.winboll.studio.winboll.utils.SpecUtil;
+import cc.winboll.studio.winboll.utils.WxPayApi;
+import cc.winboll.studio.winboll.utils.ZXingUtils;
+import java.util.Timer;
+import java.util.TimerTask;
+
+
+
+/**
+ * 主界面：生成二维码 + 轮询查询支付结果
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2026/01/07
+ */
+public class WXPayActivity extends WinBoLLActivity implements IWinBoLLActivity {
+
+	private static final String TAG = "WXPayActivity";
+
+	// Handler消息标识
+	private static final int MSG_POLL_TIMEOUT = 1001;
+	private static final int MSG_POLL_SUCCESS = 1002;
+	private static final int MSG_POLL_FAILED = 1003;
+
+	private ImageView mIvQrCode;
+	private TextView mTvOrderNo;
+	private TextView mTvPayStatus;
+	private Button mBtnCreateOrder;
+
+	private String mOutTradeNo; // 商户订单号
+	private Timer mPollTimer; // 轮询定时器
+	private long mPollStartTime; // 轮询开始时间
+
+	
+
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+	
+	private Handler mPollHandler = new Handler() {
+		@Override
+		public void handleMessage(Message msg) {
+			super.handleMessage(msg);
+			switch (msg.what) {
+				case MSG_POLL_TIMEOUT:
+					stopPoll();
+					mTvPayStatus.setText("支付状态：轮询超时");
+					mTvPayStatus.setTextColor(getResources().getColor(android.R.color.darker_gray));
+					Toast.makeText(WXPayActivity.this, "轮询超时，请手动查询", Toast.LENGTH_SHORT).show();
+					break;
+				case MSG_POLL_SUCCESS:
+					boolean isPaySuccess = (boolean) msg.obj;
+					String tradeState = (String) msg.getData().getString("tradeState");
+					stopPoll();
+					if (isPaySuccess) {
+						mTvPayStatus.setText("支付状态：支付成功 ✅");
+						mTvPayStatus.setTextColor(getResources().getColor(android.R.color.holo_green_dark));
+						Toast.makeText(WXPayActivity.this, "支付成功！", Toast.LENGTH_SHORT).show();
+					} else {
+						mTvPayStatus.setText("支付状态：" + tradeState);
+						mTvPayStatus.setTextColor(getResources().getColor(android.R.color.holo_red_dark));
+					}
+					break;
+				case MSG_POLL_FAILED:
+					String errorMsg = (String) msg.obj;
+					mTvPayStatus.setText("查询失败：" + errorMsg);
+					break;
+			}
+		}
+	};
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.activity_wxpay);
+
+		initView();
+		initListener();
+	}
+
+	private void initView() {
+		mIvQrCode = findViewById(R.id.iv_qrcode);
+		mTvOrderNo = findViewById(R.id.tv_order_no);
+		mTvPayStatus = findViewById(R.id.tv_pay_status);
+		mBtnCreateOrder = findViewById(R.id.btn_create_order);
+	}
+
+	private void initListener() {
+		mBtnCreateOrder.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					createOrder();
+				}
+			});
+	}
+
+	/**
+	 * 统一下单，生成二维码
+	 */
+	private void createOrder() {
+		mBtnCreateOrder.setEnabled(false);
+		mTvPayStatus.setText("支付状态：生成订单中...");
+		mIvQrCode.setImageBitmap(null);
+
+		WxPayApi.createOrder(new WxPayApi.OnCreateOrderCallback() {
+				@Override
+				public void onSuccess(String outTradeNo, String codeUrl) {
+					mOutTradeNo = outTradeNo;
+					mTvOrderNo.setText("商户订单号：" + outTradeNo);
+					mTvPayStatus.setText("支付状态：未支付，请扫码");
+
+					// 生成二维码
+					Bitmap qrCodeBitmap = ZXingUtils.createQRCodeBitmap(codeUrl, 250, 250);
+					if (qrCodeBitmap != null) {
+						mIvQrCode.setImageBitmap(qrCodeBitmap);
+						// 开始轮询查询支付结果
+						startPoll();
+					} else {
+						mTvPayStatus.setText("支付状态：生成二维码失败");
+						mBtnCreateOrder.setEnabled(true);
+					}
+				}
+
+				@Override
+				public void onFailure(String errorMsg) {
+					SpecUtil.WWSpecLogError(TAG, "统一下单失败：" + errorMsg);
+					mTvPayStatus.setText("生成订单失败：" + errorMsg);
+					mBtnCreateOrder.setEnabled(true);
+					Toast.makeText(WXPayActivity.this, errorMsg, Toast.LENGTH_SHORT).show();
+				}
+			});
+	}
+
+	/**
+	 * 开始轮询查询支付结果
+	 */
+	private void startPoll() {
+		stopPoll(); // 先停止之前的轮询
+		mPollStartTime = System.currentTimeMillis();
+		mPollTimer = new Timer();
+		mPollTimer.scheduleAtFixedRate(new TimerTask() {
+				@Override
+				public void run() {
+					// 检查是否超时
+					long elapsedTime = System.currentTimeMillis() - mPollStartTime;
+					if (elapsedTime >= WxPayConfig.POLL_TIMEOUT) {
+						mPollHandler.sendEmptyMessage(MSG_POLL_TIMEOUT);
+						return;
+					}
+
+					// 查询订单状态
+					WxPayApi.queryOrder(mOutTradeNo, new WxPayApi.OnQueryOrderCallback() {
+							@Override
+							public void onSuccess(boolean isPaySuccess, String tradeState) {
+								Message msg = Message.obtain();
+								msg.what = MSG_POLL_SUCCESS;
+								msg.obj = isPaySuccess;
+								Bundle bundle = new Bundle();
+								bundle.putString("tradeState", tradeState);
+								msg.setData(bundle);
+								mPollHandler.sendMessage(msg);
+							}
+
+							@Override
+							public void onFailure(String errorMsg) {
+								Message msg = Message.obtain();
+								msg.what = MSG_POLL_FAILED;
+								msg.obj = errorMsg;
+								mPollHandler.sendMessage(msg);
+							}
+						});
+				}
+			}, 0, WxPayConfig.POLL_INTERVAL);
+	}
+
+	/**
+	 * 停止轮询
+	 */
+	private void stopPoll() {
+		if (mPollTimer != null) {
+			mPollTimer.cancel();
+			mPollTimer = null;
+		}
+	}
+
+	@Override
+	protected void onDestroy() {
+		super.onDestroy();
+		stopPoll();
+	}
+}
+

winboll/src/main/java/cc/winboll/studio/winboll/unittest/TestWeWorkSpecSDK.java

@@ -0,0 +1,311 @@
+package cc.winboll.studio.winboll.unittest;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.view.View;
+import android.widget.Button;
+import android.widget.Toast;
+import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.winboll.R;
+import cc.winboll.studio.winboll.activities.WinBoLLActivity;
+
+/**
+ * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
+ * @Date 2026/01/03 10:52
+ * @Describe 企业微信SDK接口测试（基础调试版）
+ * 包含：SDK初始化、基础接口调用、日志输出、主线程回调处理
+ */
+public class TestWeWorkSpecSDK extends WinBoLLActivity implements IWinBoLLActivity, View.OnClickListener {
+
+    public static final String TAG = "TestWeWorkSpecSDK";
+
+    // ------------------- 企业微信SDK配置常量（需替换为实际项目参数） -------------------
+    // 企业微信 CorpID（从企业微信管理后台获取）
+    private static final String CORP_ID = "wwb37c73f34c722852";
+    // 应用 AgentID（从企业微信应用管理后台获取）
+    private static final String AGENT_ID = "your_agent_id_here";
+    // 应用 Secret（从企业微信应用管理后台获取，注意保密）
+    private static final String APP_SECRET = "your_app_secret_here";
+
+    // ------------------- Handler消息标识（主线程处理SDK回调） -------------------
+    private static final int MSG_SDK_INIT_SUCCESS = 1001;
+    private static final int MSG_SDK_INIT_FAILED = 1002;
+    private static final int MSG_GET_CORP_INFO_SUCCESS = 1003;
+    private static final int MSG_GET_CORP_INFO_FAILED = 1004;
+
+    // ------------------- 控件声明 -------------------
+    private Button mBtnInitSDK;
+    private Button mBtnGetCorpInfo;
+    private Button mBtnCheckAuth;
+
+    // ------------------- 主线程Handler（处理SDK异步回调） -------------------
+    private Handler mWeWorkHandler;
+
+
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+	
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_test_weworkspecsdk);
+
+        // 初始化控件
+        initViews();
+        // 绑定点击事件
+        initEvents();
+        // 初始化Handler（主线程处理回调，更新UI）
+        initHandler();
+        // 初始化SDK（可选：启动时自动初始化，或点击按钮初始化）
+        // initWeWorkSDK();
+    }
+
+    /**
+     * 初始化控件（Java 7 显式绑定）
+     */
+    private void initViews() {
+        mBtnInitSDK = (Button) findViewById(R.id.btn_init_sdk);
+        mBtnGetCorpInfo = (Button) findViewById(R.id.btn_get_corp_info);
+        mBtnCheckAuth = (Button) findViewById(R.id.btn_check_auth);
+    }
+
+    /**
+     * 绑定点击事件（Java 7 匿名内部类）
+     */
+    private void initEvents() {
+        mBtnInitSDK.setOnClickListener(this);
+        mBtnGetCorpInfo.setOnClickListener(this);
+        mBtnCheckAuth.setOnClickListener(this);
+    }
+
+    /**
+     * 初始化主线程Handler（处理SDK异步回调，安全更新UI）
+     */
+    private void initHandler() {
+        mWeWorkHandler = new Handler() {
+            @Override
+            public void handleMessage(Message msg) {
+                super.handleMessage(msg);
+                switch (msg.what) {
+                    case MSG_SDK_INIT_SUCCESS:
+                        showToast("企业微信SDK初始化成功");
+                        LogUtils.d(TAG, "SDK初始化成功");
+                        break;
+                    case MSG_SDK_INIT_FAILED:
+                        String initError = (String) msg.obj;
+                        showToast("SDK初始化失败：" + initError);
+                        LogUtils.e(TAG, "SDK初始化失败：" + initError);
+                        break;
+                    case MSG_GET_CORP_INFO_SUCCESS:
+                        String corpInfo = (String) msg.obj;
+                        showToast("获取企业信息成功");
+                        LogUtils.d(TAG, "企业信息：" + corpInfo);
+                        break;
+                    case MSG_GET_CORP_INFO_FAILED:
+                        String corpError = (String) msg.obj;
+                        showToast("获取企业信息失败：" + corpError);
+                        LogUtils.e(TAG, "获取企业信息失败：" + corpError);
+                        break;
+                    default:
+                        break;
+                }
+            }
+        };
+    }
+
+    // ------------------- 企业微信SDK核心接口调用 -------------------
+
+    /**
+     * 初始化企业微信SDK（异步操作，通过Handler回调结果）
+     */
+    private void initWeWorkSDK() {
+        showToast("开始初始化企业微信SDK...");
+        // 模拟SDK异步初始化（实际项目中替换为企业微信SDK的真实初始化接口）
+        new Thread(new Runnable() {
+				@Override
+				public void run() {
+					try {
+						// 真实SDK初始化逻辑示例：
+						// WeWorkSDK.init(TestWeWorkSpecSDK.this, CORP_ID, AGENT_ID, new WeWorkSDKCallback() {
+						//     @Override
+						//     public void onSuccess() {
+						//         mWeWorkHandler.sendEmptyMessage(MSG_SDK_INIT_SUCCESS);
+						//     }
+						//
+						//     @Override
+						//     public void onFailure(String errorMsg) {
+						//         Message msg = Message.obtain();
+						//         msg.what = MSG_SDK_INIT_FAILED;
+						//         msg.obj = errorMsg;
+						//         mWeWorkHandler.sendMessage(msg);
+						//     }
+						// });
+
+						// 调试模拟：休眠1秒，模拟异步初始化
+						Thread.sleep(1000);
+						// 模拟初始化成功（如需测试失败，替换为发送MSG_SDK_INIT_FAILED）
+						mWeWorkHandler.sendEmptyMessage(MSG_SDK_INIT_SUCCESS);
+						// 模拟初始化失败
+						// Message msg = Message.obtain();
+						// msg.what = MSG_SDK_INIT_FAILED;
+						// msg.obj = "CorpID或AgentID错误";
+						// mWeWorkHandler.sendMessage(msg);
+					} catch (InterruptedException e) {
+						e.printStackTrace();
+						Message msg = Message.obtain();
+						msg.what = MSG_SDK_INIT_FAILED;
+						msg.obj = "线程中断：" + e.getMessage();
+						mWeWorkHandler.sendMessage(msg);
+					}
+				}
+			}).start();
+    }
+
+    /**
+     * 获取企业基本信息（异步操作，需先初始化SDK）
+     */
+    private void getCorpInfo() {
+        if (!isSDKInitialized()) {
+            showToast("请先初始化SDK");
+            return;
+        }
+        showToast("开始获取企业信息...");
+        // 模拟SDK异步获取企业信息（实际项目中替换为真实接口）
+        new Thread(new Runnable() {
+				@Override
+				public void run() {
+					try {
+						// 真实SDK接口示例：
+						// WeWorkSDK.getCorpInfo(APP_SECRET, new CorpInfoCallback() {
+						//     @Override
+						//     public void onSuccess(CorpInfo info) {
+						//         Message msg = Message.obtain();
+						//         msg.what = MSG_GET_CORP_INFO_SUCCESS;
+						//         msg.obj = "企业名称：" + info.getCorpName() + "，企业ID：" + info.getCorpId();
+						//         mWeWorkHandler.sendMessage(msg);
+						//     }
+						//
+						//     @Override
+						//     public void onFailure(String errorMsg) {
+						//         Message msg = Message.obtain();
+						//         msg.what = MSG_GET_CORP_INFO_FAILED;
+						//         msg.obj = errorMsg;
+						//         mWeWorkHandler.sendMessage(msg);
+						//     }
+						// });
+
+						// 调试模拟：休眠1秒，模拟异步获取
+						Thread.sleep(1000);
+						// 模拟获取成功
+						Message successMsg = Message.obtain();
+						successMsg.what = MSG_GET_CORP_INFO_SUCCESS;
+						successMsg.obj = "企业名称：WinBoLL Studio，企业ID：" + CORP_ID;
+						mWeWorkHandler.sendMessage(successMsg);
+						// 模拟获取失败
+						// Message failMsg = Message.obtain();
+						// failMsg.what = MSG_GET_CORP_INFO_FAILED;
+						// failMsg.obj = "AppSecret错误或权限不足";
+						// mWeWorkHandler.sendMessage(failMsg);
+					} catch (InterruptedException e) {
+						e.printStackTrace();
+						Message msg = Message.obtain();
+						msg.what = MSG_GET_CORP_INFO_FAILED;
+						msg.obj = "线程中断：" + e.getMessage();
+						mWeWorkHandler.sendMessage(msg);
+					}
+				}
+			}).start();
+    }
+
+    /**
+     * 检查当前用户是否已授权（同步操作，示例）
+     */
+    private void checkAuthStatus() {
+        if (!isSDKInitialized()) {
+            showToast("请先初始化SDK");
+            return;
+        }
+        // 真实SDK接口示例：
+        // boolean isAuthorized = WeWorkSDK.isAuthorized();
+        // 调试模拟：默认返回true
+        boolean isAuthorized = true;
+
+        if (isAuthorized) {
+            showToast("用户已授权");
+            LogUtils.d(TAG, "当前用户已授权企业微信应用");
+        } else {
+            showToast("用户未授权，请先授权");
+            LogUtils.d(TAG, "当前用户未授权企业微信应用");
+            // 真实项目中可调用授权接口：
+            // WeWorkSDK.requestAuth(TestWeWorkSpecSDK.this, new AuthCallback() {
+            //     @Override
+            //     public void onSuccess(String code) {
+            //         showToast("授权成功，code：" + code);
+            //     }
+            //
+            //     @Override
+            //     public void onFailure(String errorMsg) {
+            //         showToast("授权失败：" + errorMsg);
+            //     }
+            // });
+        }
+    }
+
+    // ------------------- 工具方法 -------------------
+
+    /**
+     * 检查SDK是否已初始化（模拟方法，实际项目中替换为SDK的真实状态检查）
+     */
+    private boolean isSDKInitialized() {
+        // 真实SDK可通过静态方法检查状态：
+        // return WeWorkSDK.isInitialized();
+        // 调试模拟：假设Handler不为空即表示已初始化
+        return mWeWorkHandler != null;
+    }
+
+    /**
+     * 显示Toast提示（Java 7 简化封装）
+     */
+    private void showToast(String msg) {
+        Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
+    }
+
+    // ------------------- 点击事件处理 -------------------
+
+    @Override
+    public void onClick(View v) {
+        int id = v.getId();
+        if (id == R.id.btn_init_sdk) {
+            initWeWorkSDK();
+        } else if (id == R.id.btn_get_corp_info) {
+            getCorpInfo();
+        } else if (id == R.id.btn_check_auth) {
+            checkAuthStatus();
+        }
+    }
+
+    // ------------------- 生命周期管理 -------------------
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        // 释放Handler资源，避免内存泄漏
+        if (mWeWorkHandler != null) {
+            mWeWorkHandler.removeCallbacksAndMessages(null);
+            mWeWorkHandler = null;
+        }
+        // 真实SDK需调用销毁方法：
+        // WeWorkSDK.destroy();
+    }
+}
+

winboll/src/main/java/cc/winboll/studio/winboll/utils/OkHttpUtil.java

@@ -0,0 +1,83 @@
+package cc.winboll.studio.winboll.utils;
+
+import android.os.Handler;
+import android.os.Looper;
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * OkHttp网络请求工具类
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2026/01/07
+ */
+public class OkHttpUtil {
+
+    private static OkHttpClient sOkHttpClient;
+    private static Handler sMainHandler = new Handler(Looper.getMainLooper());
+
+    static {
+        sOkHttpClient = new OkHttpClient.Builder()
+			.connectTimeout(10, TimeUnit.SECONDS)
+			.readTimeout(10, TimeUnit.SECONDS)
+			.writeTimeout(10, TimeUnit.SECONDS)
+			.build();
+    }
+
+    /**
+     * GET请求
+     * @param url 请求地址
+     * @param callback 回调
+     */
+    public static void get(String url, final OnResultCallback callback) {
+        Request request = new Request.Builder()
+			.url(url)
+			.get()
+			.build();
+
+        sOkHttpClient.newCall(request).enqueue(new Callback() {
+				@Override
+				public void onFailure(Call call, final IOException e) {
+					sMainHandler.post(new Runnable() {
+							@Override
+							public void run() {
+								if (callback != null) {
+									callback.onFailure(e.getMessage());
+								}
+							}
+						});
+				}
+
+				@Override
+				public void onResponse(Call call, final Response response) throws IOException {
+					final String result = response.body().string();
+					sMainHandler.post(new Runnable() {
+							@Override
+							public void run() {
+								if (callback != null) {
+									if (response.isSuccessful()) {
+										callback.onSuccess(result);
+									} else {
+										callback.onFailure("请求失败：" + response.code());
+									}
+								}
+							}
+						});
+				}
+			});
+    }
+
+    /**
+     * 回调接口
+     */
+    public interface OnResultCallback {
+        void onSuccess(String result);
+        void onFailure(String errorMsg);
+    }
+}
+

winboll/src/main/java/cc/winboll/studio/winboll/utils/SpecUtil.java

@@ -0,0 +1,26 @@
+package cc.winboll.studio.winboll.utils;
+
+import cc.winboll.studio.libappbase.LogUtils;
+
+/**
+ * 日志工具类（适配项目规范）
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2026/01/07
+ */
+public class SpecUtil {
+
+    private static final boolean isDebug = true;
+
+    public static void WWSpecLogInfo(String tag, String msg) {
+        if (isDebug) {
+            LogUtils.i(tag, msg);
+        }
+    }
+
+    public static void WWSpecLogError(String tag, String msg) {
+        if (isDebug) {
+            LogUtils.e(tag, msg);
+        }
+    }
+}
+

winboll/src/main/java/cc/winboll/studio/winboll/utils/WxPayApi.java

@@ -0,0 +1,100 @@
+package cc.winboll.studio.winboll.utils;
+
+import cc.winboll.studio.winboll.WxPayConfig;
+import com.alibaba.fastjson.JSONObject;
+
+/**
+ * 微信支付服务端接口封装
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2026/01/07
+ */
+public class WxPayApi {
+
+    /**
+     * 统一下单（生成二维码）
+     * @param callback 回调
+     */
+    public static void createOrder(final OnCreateOrderCallback callback) {
+        // 拼接请求参数（服务端测试接口需支持GET传参，若为POST需修改为表单/JSON）
+        String url = WxPayConfig.CREATE_ORDER_URL +
+			"?body=" + WxPayConfig.ORDER_BODY +
+			"&totalFee=" + WxPayConfig.TOTAL_FEE +
+			"&tradeType=" + WxPayConfig.TRADE_TYPE;
+
+        OkHttpUtil.get(url, new OkHttpUtil.OnResultCallback() {
+				@Override
+				public void onSuccess(String result) {
+					try {
+						JSONObject jsonObject = JSONObject.parseObject(result);
+						String outTradeNo = jsonObject.getString("out_trade_no");
+						String codeUrl = jsonObject.getString("code_url");
+						if (callback != null) {
+							callback.onSuccess(outTradeNo, codeUrl);
+						}
+					} catch (Exception e) {
+						if (callback != null) {
+							callback.onFailure("解析统一下单结果失败：" + e.getMessage());
+						}
+					}
+				}
+
+				@Override
+				public void onFailure(String errorMsg) {
+					if (callback != null) {
+						callback.onFailure("统一下单请求失败：" + errorMsg);
+					}
+				}
+			});
+    }
+
+    /**
+     * 订单查询
+     * @param outTradeNo 商户订单号
+     * @param callback 回调
+     */
+    public static void queryOrder(String outTradeNo, final OnQueryOrderCallback callback) {
+        String url = WxPayConfig.QUERY_ORDER_URL + "?outTradeNo=" + outTradeNo;
+
+        OkHttpUtil.get(url, new OkHttpUtil.OnResultCallback() {
+				@Override
+				public void onSuccess(String result) {
+					try {
+						JSONObject jsonObject = JSONObject.parseObject(result);
+						String tradeState = jsonObject.getString("trade_state");
+						boolean isSuccess = "SUCCESS".equals(tradeState);
+						if (callback != null) {
+							callback.onSuccess(isSuccess, tradeState);
+						}
+					} catch (Exception e) {
+						if (callback != null) {
+							callback.onFailure("解析订单查询结果失败：" + e.getMessage());
+						}
+					}
+				}
+
+				@Override
+				public void onFailure(String errorMsg) {
+					if (callback != null) {
+						callback.onFailure("订单查询请求失败：" + errorMsg);
+					}
+				}
+			});
+    }
+
+    /**
+     * 统一下单回调接口
+     */
+    public interface OnCreateOrderCallback {
+        void onSuccess(String outTradeNo, String codeUrl);
+        void onFailure(String errorMsg);
+    }
+
+    /**
+     * 订单查询回调接口
+     */
+    public interface OnQueryOrderCallback {
+        void onSuccess(boolean isPaySuccess, String tradeState);
+        void onFailure(String errorMsg);
+    }
+}
+

winboll/src/main/java/cc/winboll/studio/winboll/utils/ZXingUtils.java

@@ -0,0 +1,75 @@
+package cc.winboll.studio.winboll.utils;
+
+import android.graphics.Bitmap;
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
+import com.google.zxing.WriterException;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.qrcode.QRCodeWriter;
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import com.journeyapps.barcodescanner.BarcodeEncoder;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * ZXing二维码生成工具类
+ * 依赖：com.google.zxing:core:3.4.1 + com.journeyapps:zxing-android-embedded:3.6.0
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2026/01/07
+ */
+public class ZXingUtils {
+
+    /**
+     * 生成二维码Bitmap（核心方法，使用journeyapps工具类）
+     * @param content 内容（如微信支付的code_url）
+     * @param width 二维码宽度（px）
+     * @param height 二维码高度（px）
+     * @return 二维码Bitmap，失败返回null
+     */
+    public static Bitmap createQRCodeBitmap(String content, int width, int height) {
+        // 1. 入参合法性校验
+        if (content == null || content.trim().isEmpty()) {
+            return null;
+        }
+        if (width <= 0 || height <= 0) {
+            return null;
+        }
+
+        // 2. 配置二维码参数
+        Map<EncodeHintType, Object> hints = new HashMap<>();
+        hints.put(EncodeHintType.CHARACTER_SET, "UTF-8"); // 字符编码
+        hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H); // 高容错级别（H级可容忍30%遮挡）
+        hints.put(EncodeHintType.MARGIN, 1); // 边距（值越小，二维码越紧凑，建议1-4）
+
+        try {
+            // 3. 生成BitMatrix（二维码矩阵）
+            QRCodeWriter qrCodeWriter = new QRCodeWriter();
+            BitMatrix bitMatrix = qrCodeWriter.encode(
+				content,
+				BarcodeFormat.QR_CODE,
+				width,
+				height,
+				hints
+            );
+
+            // 4. 转换BitMatrix为Bitmap（关键：使用journeyapps的BarcodeEncoder）
+            BarcodeEncoder barcodeEncoder = new BarcodeEncoder();
+            return barcodeEncoder.createBitmap(bitMatrix);
+
+        } catch (WriterException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * 重载方法：生成正方形二维码（宽度=高度）
+     * @param content 内容
+     * @param size 二维码边长（px）
+     * @return 二维码Bitmap
+     */
+    public static Bitmap createQRCodeBitmap(String content, int size) {
+        return createQRCodeBitmap(content, size, size);
+    }
+}
+

winboll/src/main/java/com/tencent/wework/SpecCallbackSDK.java

@@ -0,0 +1,210 @@
+package com.tencent.wework;
+
+import java.util.Map;
+import java.util.HashMap;;
+
+/**
+ * @warning: 1. 不要修改成员变量名，native方法内有反射调用
+ *           2. 调用本地方法需保持包结构，本工具需放在包com.tencent.wework内
+ *           3. 不允许继承，类名和函数名均不可修改，会影响本地方法的引用，详见：javah生成本地方法头文件
+ */
+public final class SpecCallbackSDK {
+
+    /**
+     * @description 调用本地方法后实例化的对象指针
+     */
+    private long specCallbackSDKptr = 0;
+
+    public long GetPtr() { return specCallbackSDKptr; }
+
+    /**
+     * @description: 回包的headers
+     */
+    private Map<String, String> responseHeaders;
+
+    public Map<String, String> GetResponseHeaders() { return responseHeaders; }
+
+    /**
+     * @description:  回包的加密后的body
+     */
+    private String responseBody;
+
+    public String GetResponseBody() { return responseBody; }
+
+    /**
+     * @description:   每个请求构造一个SpecCallbackSDK示例,
+     *                 SpecCallbackSDK仅持有headers和body的引用,
+     *                 因此需保证headers和body的生存期比SpecCallbackSDK长
+     * @param method:  请求方法GET/POST
+     * @param headers: 请求header
+     * @param body:    请求body
+     * @example: 
+     * SpecCallbackSDK sdk = new SpecCallbackSDK(method, headers, body);
+     * if (sdk.IsOk()) {
+     *   String corpid = sdk.GetCorpId();
+     *   String agentid = sdk.GetAgentId();
+     *   String call_type = sdk.GetCallType();
+     *   String data = sdk.GetData();
+     *   //do something...
+     * } 
+     * String response = ...;
+     * sdk.BuildResponseHeaderBody(response);
+     * Map<String, String> responseHeaders = sdk.GetResponseHeaders();
+     * String body = sdk.GetResponseBody();
+     * //do response
+     * 
+     * @return errorcode 示例如下:
+     *         -920001: 未设置请求方法
+     *         -920002: 未设置请求header
+     *         -920003: 未设置请求body
+     * */
+    public SpecCallbackSDK(String method, Map<String, String> headers, String body) {
+        try {
+            specCallbackSDKptr = NewCallbackSDK(method, headers, body);
+        } catch (Exception e) {
+            SpecUtil.WWSpecLogError("SpecCallbackSDK exception caught", e.getMessage());
+        }
+    }
+
+    private native long NewCallbackSDK(String method, Map<String, String> headers, String body);
+
+    /**
+     * @usage 在Java对象的内存回收前析构C++对象
+     */
+    @Override
+    protected void finalize() throws Throwable {
+        DeleteCPPInstance(specCallbackSDKptr);
+        super.finalize();
+    }
+
+    private native void DeleteCPPInstance(long specCallbackSDKptr);
+
+    /**
+     * @description: 判断构造函数中传入的请求是否解析成功
+     * @return:      成功与否
+     * */
+    public boolean IsOk() {
+        return IsOk(specCallbackSDKptr);
+    }
+
+    private native boolean IsOk(long specCallbackSDKptr);
+
+    /**
+     * @description: 获取请求的企业
+     * @require:     仅当IsOk() == true可调用
+     * @return:      corpid
+     * */
+    public String GetCorpId() {
+        return GetCorpId(specCallbackSDKptr);
+    }
+
+    private native String GetCorpId(long specCallbackSDKptr);
+
+    /**
+     * @description: 获取请求的应用
+     * @require:     仅当IsOk() == true可调用
+     * @return:      agentid
+     * */
+    public long GetAgentId() {
+        return GetAgentId(specCallbackSDKptr);
+    }
+
+    private native long GetAgentId(long specCallbackSDKptr);
+
+    /**
+     * @description: 获取请求的类型
+     * @require:     仅当IsOk() == true可调用
+     * @return:      1 - 来自[应用调用专区]的请求
+     *               2 - 来自企业微信的回调事件
+     * */
+    public long GetCallType() {
+        return GetCallType(specCallbackSDKptr);
+    }
+
+    private native long GetCallType(long specCallbackSDKptr);
+
+    /**
+     * @description: 获取请求数据
+     * @require:     仅当IsOk() == true可调用
+     * @return:      请求数据,根据call_type可能是:
+     *               - 企业微信回调事件
+     *               - [应用调用专区]接口中的request_data
+     * */
+    public String GetData() {
+        return GetData(specCallbackSDKptr);
+    }
+
+    private native String GetData(long specCallbackSDKptr);
+
+    /**
+     * @description: 是否异步请求
+     * @require:     仅当IsOk() == true可调用
+     * @return:      是否异步请求
+     * */
+    public boolean GetIsAsync() {
+        return GetIsAsync(specCallbackSDKptr);
+    }
+
+    private native boolean GetIsAsync(long specCallbackSDKptr);
+
+    /**
+     * @description: 获取请求的job_info,
+     * @require:     仅当IsOk() == true可调用
+     * @return:      job_info,无需理解内容,
+     *               在同一个请求上下文中使用SpecSDK的时候传入
+     * */
+    public String GetJobInfo() {
+        return GetJobInfo(specCallbackSDKptr);
+    }
+
+    private native String GetJobInfo(long specCallbackSDKptr);
+
+    /**
+     * @description: 获取请求的ability_id,[应用调用专区]接口时指定
+     * @require:     仅当IsOk() == true可调用
+     * @return:      ability_id
+     * */
+    public String GetAbilityId() {
+        return GetAbilityId(specCallbackSDKptr);
+    }
+
+    private native String GetAbilityId(long specCallbackSDKptr);
+
+    /**
+     * @description: 获取请求的notify_id,用于[应用同步调用专区程序]接口
+     * @require:     仅当IsOk() == true可调用
+     * @return:      notify_id
+     * */
+    public String GetNotifyId() {
+        return GetNotifyId(specCallbackSDKptr);
+    }
+
+    private native String GetNotifyId(long specCallbackSDKptr);
+
+    /**
+     * @description:    对返回包计算签名&加密
+     * @param response: 待加密的回包明文.如果IsOk()==false,传入空串即可
+     * @note 本接口的执行问题可查看日志
+     * */
+    public void BuildResponseHeaderBody(String response) {
+        try {
+            responseHeaders = new HashMap<String, String>();
+            responseBody = "";
+            BuildResponseHeaderBody(specCallbackSDKptr, response);
+        } catch (Exception e) {
+            SpecUtil.WWSpecLogError("SpecCallbackSDK exception caught", e.getMessage());
+        }
+    }
+
+    private native void BuildResponseHeaderBody(long specCallbackSDKptr, String response);
+
+    // 静态代码块内还无法调用native日志函数，这里的日志在管理系统无法查询
+    static {
+        try {
+            Class.forName("com.tencent.wework.SpecUtil");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+}

winboll/src/main/java/com/tencent/wework/SpecSDK.java

@@ -0,0 +1,163 @@
+package com.tencent.wework;
+
+/**
+ * @warning: 1. 不要修改成员变量名，native方法内有反射调用
+ *           2. 调用本地方法需保持包结构，本工具需放在包com.tencent.wework内
+ *           3. 不允许继承，类名和函数名均不可修改，会影响本地方法的引用，详见：javah生成本地方法头文件
+ */
+public final class SpecSDK {
+
+    /**
+     * @description 调用本地方法后实例化的对象指针
+     */
+    private long specSDKptr = 0;
+
+    /**
+     * @usage invoke的请求
+     * @example "{\"limit\":1}
+     */
+    private String request;
+
+    public void SetRequest(String request) {
+        this.request = request;
+    }
+
+    /**
+     * @usage 访问上一次invoke的结果
+     */
+    private String response;
+    
+    public String GetResponse() { 
+        return response;
+    }
+
+    /**
+     * @param corpid:     企业corpid，必选参数
+     * @param agentid:    应用id，必选参数
+     * @param ability_id: 能力ID，可选参数
+     * @param job_info:   job_info，可选参数
+     * */
+    public SpecSDK(String corpId, long agentId) {
+        specSDKptr = NewSDK1(corpId, agentId);
+    }
+
+    private native long NewSDK1(String corpId, long agentId);
+
+    public SpecSDK(String corpId, long agentId, String abilityId) {
+        specSDKptr = NewSDK2(corpId, agentId, abilityId);
+    }
+
+    private native long NewSDK2(String corpId, long agentId, String abilityId);
+
+    public SpecSDK(String corpId, long agentId, String abilityId, String jobInfo) {
+        specSDKptr = NewSDK3(corpId, agentId, abilityId, jobInfo);
+    }
+
+    private native long NewSDK3(String corpId, long agentId, String abilityId, String jobInfo);
+
+    /**
+     * @description         使用callback的请求来初始化
+     * @param callback_sdk: 要求IsOk()==true
+     * @return C++内部指针，创建失败时指针仍为0，并输出错误日志
+     * */
+    public SpecSDK(SpecCallbackSDK callbackSDK) {
+        specSDKptr = NewSDK4(callbackSDK.GetPtr());
+    }
+
+    private native long NewSDK4(long callbackSDK);
+
+    /**
+     * @usage 在Java对象的内存回收前析构C++对象
+     */
+    @Override
+    protected void finalize() throws Throwable {
+        DeleteCPPInstance(specSDKptr);
+        super.finalize();
+    }
+
+    private native void DeleteCPPInstance(long specSDKptr);
+
+    /**
+     * @description     用于在专区内调用企业微信接口
+     * @param api_name 接口名
+     * @param request  json格式的请求数据
+     * @param response json格式的返回数据
+     * @return errorcode 参考如下:
+     *            0: 成功
+     *            -910001: SDK没有初始化
+     *            -910002: 没有设置请求体
+     *            -910003: 没有设置请求的API
+     *            -910004: 在SDK成员内找不到成员"response",注意lib内有反射机制,不要修改成员变量名
+     *            -910005: 使用未初始化的callback初始化SDK
+     *            -910006: invoke调用失败,应检查日志查看具体原因
+     *            -910007: 响应体为空
+     * @note 当返回0时,表示没有网络或请求协议层面或调用方法的失败,
+     *       调用方需继续检查response中的errcode字段确保业务层面的成功
+     * 
+     * @usage 当前版本sdk支持的接口列表,每个接口的具体协议请查看企业微信文档:
+     *        https://developer.work.weixin.qq.com/document/path/91201
+     * 
+     * +--------------------------------+--------------------------------+
+     * |接口名                          |描述                            |
+     * |--------------------------------|--------------------------------|
+     * |program_async_job_call_back     |上报异步任务结果                |
+     * |sync_msg                        |获取会话记录                    |
+     * |get_group_chat                  |获取内部群信息                  |
+     * |get_agree_status_single         |获取单聊会话同意情况            |
+     * |get_agree_status_room           |获取群聊会话同意情况            |
+     * |set_hide_sensitiveinfo_config   |设置成员会话组件敏感信息隐藏配置|
+     * |get_hide_sensitiveinfo_config   |获取成员会话组件敏感信息隐藏配置|
+     * |search_chat                     |会话名称搜索                    |
+     * |search_msg                      |会话消息搜索                    |
+     * |create_rule                     |新增关键词规则                  |
+     * |get_rule_list                   |获取关键词列表                  |
+     * |get_rule_detail                 |获取关键词规则详情              |
+     * |update_rule                     |修改关键词规则                  |
+     * |delete_rule                     |删除关键词规则                  |
+     * |get_hit_msg_list                |获取命中关键词规则的会话记录    |
+     * |create_sentiment_task           |创建情感分析任务                |
+     * |get_sentiment_result            |获取情感分析结果                |
+     * |create_summary_task             |创建摘要提取任务                |
+     * |get_summary_result              |获取摘要提取结果                |
+     * |create_customer_tag_task        |创建标签匹配任务                |
+     * |get_customer_tag_result         |获取标签任务结果                |
+     * |create_recommend_dialog_task    |创建话术推荐任务                |
+     * |get_recommend_dialog_result     |获取话术推荐结果                |
+     * |create_private_task             |创建自定义模型任务              |
+     * |get_private_task_result         |获取自定义模型结果              |
+     * |(废弃)document_list             |获取知识集列表                  |
+     * |create_spam_task                |会话反垃圾创建分析任务          |
+     * |get_spam_result                 |会话反垃圾获取任务结果          |
+     * |create_chatdata_export_job      |创建会话内容导出任务            |
+     * |get_chatdata_export_job_status  |获取会话内容导出任务结果        |
+     * |spec_notify_app                 |专区通知应用                    |
+     * |create_program_task             |创建自定义程序任务              |
+     * |get_program_task_result         |获取自定义程序结果              |
+     * |knowledge_base_list             |获取企业授权给应用的知识集列表  |
+     * |knowledge_base_create           |创建知识集                      |
+     * |knowledge_base_detail           |获取知识集详情                  |
+     * |knowledge_base_add_doc          |添加知识集內容                  |
+     * |knowledge_base_remove_doc       |删除知识集內容                  |
+     * |knowledge_base_modify_name      |修改知识集名称                  |
+     * |knowledge_base_delete           |删除知识集                      |
+     * |search_contact_or_customer      |员工或者客户名称搜索            |
+     * |create_ww_model_task            |创建企微通用模型任务            |
+     * |get_ww_model_result             |获取企微通用模型结果            |
+     * |get_msg_list_by_page_id         |page_id获取消息列表             |
+     * +-----------------------------------------------------------------+
+     * */
+    public int Invoke(String apiName) {
+        return Invoke(specSDKptr, apiName, request);
+    }
+
+    private native int Invoke(long sdk, String apiName, String request);
+
+    // 静态代码块内还无法调用native日志函数，这里的日志在管理系统无法查询
+    static {
+        try {
+            Class.forName("com.tencent.wework.SpecUtil");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+    }
+}

winboll/src/main/java/com/tencent/wework/SpecUtil.java

@@ -0,0 +1,171 @@
+package com.tencent.wework;
+
+//import java.lang.management.ManagementFactory;
+//import java.lang.management.RuntimeMXBean;
+
+/**
+ * @warning: 1. 不要修改成员变量名，native方法内有反射调用
+ *           2. 调用本地方法需保持包结构，本工具需放在包com.tencent.wework内
+ *           3. 不允许继承，类名和函数名均不可修改，会影响本地方法的引用，详见：javah生成本地方法头文件
+ *           4. 使用其他工具打印的日志将无法被查询，如需使用SLF4j风格的日志或性能更好的日志框架，
+ *              请自行封装SpecUtil.SpecLog或SpecUtil.SpecLogNative方法
+ * 
+ * @usage:   1. 获取SDK的版本号
+ *           2. 打印三个级别的日志
+ *           3. 开启调试模式
+ */
+public final class SpecUtil {
+
+    /**
+     * @description SDK版本号
+     * @usage 可用于校对不同SDK版本，或后续针对不同的SDK版本添加业务逻辑
+     */
+    private static final String SDK_VERSION = "1.4.0";
+
+    public static String GetSDKVersion() {
+        return SDK_VERSION;
+    }
+
+    /**
+     * @description 正确的包名，SDK必须存放在"com.tencent.wework"下，否则会影响本地方法的调用
+     */
+    private static final String EXPECTED_PACKAGE_NAME = "com.tencent.wework";
+
+    public static String GetExpectedPackageName() {
+        return EXPECTED_PACKAGE_NAME;
+    }
+
+    private static final String LINE_SEPERATOR = System.getProperty("line.separator");
+
+    public static void WWSpecLogInfo(String... args) {
+        SpecLog('I', args);
+    }
+
+    public static void WWSpecLogError(String... args) {
+        SpecLog('E', args);
+    }
+
+    public static void WWSpecLogDebug(String... args) {
+        SpecLog('D', args);
+    }
+
+    public static void WWSpecLogInfoWithReqId(String reqId, String... args) {
+        SpecLogWithReqId(reqId, 'I', args);
+    }
+
+    public static void WWSpecLogErrorWithReqId(String reqId, String... args) {
+        SpecLogWithReqId(reqId, 'E', args);
+    }
+
+    public static void WWSpecLogDebugWithReqId(String reqId, String... args) {
+        SpecLogWithReqId(reqId, 'D', args);
+    }
+
+    /**
+     * @usage 打印标准日志
+     * @note  只有使用SpecLog和SpecLogNative函数打印的日志能被调试平台查询，其他框架的日志仅能本地查看
+     * @param logLevel 日志级别，使用char传递，目前支持I——INFO、E——ERROR、D——DEBUG
+     * @param args 自定义参数
+     */
+    public static void SpecLog(char logLevel, String... args) {
+        StackTraceElement element = Thread.currentThread().getStackTrace()[3];
+        SpecLogNative(
+            logLevel, 
+            element.getFileName(), 
+            element.getLineNumber(), 
+            String.join(",", args).replace(LINE_SEPERATOR, " ")
+        );
+    }
+
+    /**
+     * @usage 打印标准日志
+     * @note  只有使用SpecLog和SpecLogNative函数打印的日志能被调试平台查询，其他框架的日志仅能本地查看
+     * @param reqid  请求id 
+     * @param logLevel 日志级别，使用char传递，目前支持I——INFO、E——ERROR、D——DEBUG
+     * @param args 自定义参数
+     */
+    public static void SpecLogWithReqId(String reqId, char logLevel, String... args) {
+        StackTraceElement element = Thread.currentThread().getStackTrace()[3];
+        SpecLogNativeWithReqId(
+            reqId,
+            logLevel, 
+            element.getFileName(), 
+            element.getLineNumber(), 
+            String.join(",", args).replace(LINE_SEPERATOR, " ")
+        );
+    }
+
+    /**
+     * @usage 打印标准日志
+     * @note  只有使用SpecLog和SpecLogNative函数打印的日志能被调试平台查询，其他框架的日志仅能本地查看
+     *        如需SLF4J风格的接口或对日志性能有进一步需求，开发者可以自行封装该函数
+     * @param logLevel   日志级别，使用char传递，目前支持I——INFO、E——ERROR、D——DEBUG
+     * @param fileName   文件名（类名）
+     * @param lineNumber 行号
+     * @param argsString 自定义参数
+     */
+    public static native void SpecLogNative(char logLevel, String fileName, int lineNumber, String argsString);
+
+    /**
+     * @usage 打印标准日志
+     * @note  只有使用SpecLog和SpecLogNative函数打印的日志能被调试平台查询，其他框架的日志仅能本地查看
+     *        如需SLF4J风格的接口或对日志性能有进一步需求，开发者可以自行封装该函数
+     * @param reqid  请求id 
+     * @param logLevel   日志级别，使用char传递，目前支持I——INFO、E——ERROR、D——DEBUG
+     * @param fileName   文件名（类名）
+     * @param lineNumber 行号
+     * @param argsString 自定义参数
+     */
+    public static native void SpecLogNativeWithReqId(String reqId, char logLevel, String fileName, int lineNumber, String argsString);
+
+
+
+    /**
+     * @usage 开启调试模式，进程级别开关
+     * @param debugToken 调试凭证，在管理端获取
+     * @param accessToken 应用access token
+     * @return 是否开启成功
+     */
+    public static boolean SpecOpenDebugMode(String debugToken, String accessToken) {
+        return SpecOpenDebugModeNative(debugToken, accessToken);
+    }
+
+    private static native boolean SpecOpenDebugModeNative(String debugToken, String accessToken);
+
+    /**
+     * @usage  生成notify id。用户可调用本接口生成notify id，也可完全自定义生成
+     * @return 新的notify id，支持纳秒级隔离，内部异常时会输出日志并返回空串
+     * @note   1. 用户可先生成notify id，将其与回调数据关联存储后，再使用该notify id通知应用，
+     *            从而保证回调数据被请求时已存储完毕
+     */
+    public static String GenerateNotifyId() {
+        return GenerateNotifyIdNative();
+    }
+
+    private static native String GenerateNotifyIdNative();
+
+    static {
+        // 检查包名
+        String packageName = SpecUtil.class.getPackage().getName();
+        if (!EXPECTED_PACKAGE_NAME.equals(packageName)) {
+            // 静态代码块内还无法调用native日志函数，这里的日志在管理系统无法查询
+            System.out.println("SpecUtil class must be in package com.tencent.wework");
+            System.exit(1);
+        }
+
+        // 加载so库
+        try {
+            System.loadLibrary("WeWorkSpecSDK");
+        } catch (UnsatisfiedLinkError e) {
+            System.out.println("libWeWorkSpecSDK.so not found in java.library.path");
+            e.printStackTrace();
+            System.exit(1);
+        } catch (Exception e) {
+            System.out.println("unexpected exception: " + e.getMessage());
+            e.printStackTrace();
+            System.exit(1);
+        }
+
+        SpecUtil.WWSpecLogInfo("SDK init done", "packageName=" + packageName, "SDK_VERSION=" + SDK_VERSION);
+    }
+}

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

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

winboll/src/main/res/drawable/ic_dev_connected.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#ff000000"
-        android:pathData="M4,1C2.89,1 2,1.89 2,3V7C2,8.11 2.89,9 4,9H1V11H13V9H10C11.11,9 12,8.11 12,7V3C12,1.89 11.11,1 10,1H4M4,3H10V7H4V3M3,12V14H5V12H3M14,13C12.89,13 12,13.89 12,15V19C12,20.11 12.89,21 14,21H11V23H23V21H20C21.11,21 22,20.11 22,19V15C22,13.89 21.11,13 20,13H14M3,15V17H5V15H3M14,15H20V19H14V15M3,18V20H5V18H3M6,18V20H8V18H6M9,18V20H11V18H9Z"/>
-
-</vector>

winboll/src/main/res/drawable/ic_dev_disconnected.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#ff000000"
-        android:pathData="M4,1C2.89,1 2,1.89 2,3V7C2,8.11 2.89,9 4,9H1V11H13V9H10C11.11,9 12,8.11 12,7V3C12,1.89 11.11,1 10,1H4M4,3H10V7H4V3M14,13C12.89,13 12,13.89 12,15V19C12,20.11 12.89,21 14,21H11V23H23V21H20C21.11,21 22,20.11 22,19V15C22,13.89 21.11,13 20,13H14M3.88,13.46L2.46,14.88L4.59,17L2.46,19.12L3.88,20.54L6,18.41L8.12,20.54L9.54,19.12L7.41,17L9.54,14.88L8.12,13.46L6,15.59L3.88,13.46M14,15H20V19H14V15Z"/>
-
-</vector>

winboll/src/main/res/drawable/ic_email.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#ff000000"
-        android:pathData="M22,6C22,4.9 21.1,4 20,4H4C2.9,4 2,4.9 2,6V18C2,19.1 2.9,20 4,20H20C21.1,20 22,19.1 22,18V6M20,6L12,11L4,6H20M20,18H4V8L12,13L20,8V18Z"/>
-
-</vector>

winboll/src/main/res/drawable/ic_email_alert.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#ff000000"
-        android:pathData="M24,7H22V13H24V7M24,15H22V17H24V15M20,6C20,4.9 19.1,4 18,4H2C0.9,4 0,4.9 0,6V18C0,19.1 0.9,20 2,20H18C19.1,20 20,19.1 20,18V6M18,6L10,11L2,6H18M18,18H2V8L10,13L18,8V18Z"/>
-
-</vector>

winboll/src/main/res/drawable/ic_iw.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="1565dp"
-    android:height="1565dp"
-    android:viewportWidth="1565"
-    android:viewportHeight="1565">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:strokeColor="#FFFFFFFF"
-        android:strokeWidth="4.0"
-        android:strokeLineCap="round"
-        android:strokeMiterLimit="10"
-        android:pathData="M793.8 222.7C782.5 239.2 736.3 298.6 685.6 361.9 647 410.2 633.3 428.9 633.6 432.7 633.7 433.4 633.8 434.6 633.9 435.3 634.1 437.8 647.9 440.7 663.8 441.5 706.7 443.8 717 445.3 724.9 450.6 733.7 456.4 735.9 467.4 736 504.2 736 504.2 736 521.9 736 521.9 736 521.9 730.8 522.4 730.8 522.4 727.9 522.8 691.8 525.3 650.5 528 609.3 530.8 571.9 533.3 567.5 533.6 531.8 536 503.4 540.5 487.4 546 475 550.3 442.2 566.5 428.2 575.2 392.1 597.6 360.1 629.2 338 664.3 317 697.7 304.6 729.6 292.5 781 287.8 801 283.9 805.6 267.2 811 255.1 814.9 248.7 818.3 243.4 823.5 239.7 827.2 239.2 828.4 237.7 836.5 236.7 841.5 235.5 850 235 855.5 234.3 863.9 232.6 911.1 232.6 924.5 232.6 934.6 234.2 959.8 235 963 237.4 972 242.3 975.8 258.7 981.7 271.7 986.3 277.4 989.5 280.4 993.9 283.1 997.9 286.5 1008.7 287.4 1016.5 289.3 1031.7 293.3 1050.2 297.7 1064 306.4 1091.9 317.6 1107.7 330 1109.5 332.4 1109.9 334.7 1110.3 335 1110.5 335.3 1110.6 339.1 1111.1 343.5 1111.4 347.9 1111.8 353.8 1112.3 356.5 1112.5 370 1113.7 407.8 1115.8 430 1116.5 439.6 1116.8 453.4 1117.3 460.5 1117.5 467.7 1117.8 482.3 1118.2 493 1118.5 503.7 1118.8 520.8 1119.2 531 1119.5 587.8 1121.1 683 1122 794.5 1122 918.8 1122 996.1 1121 1075 1118.5 1083.5 1118.2 1098.6 1117.8 1108.5 1117.4 1118.4 1117.1 1129.4 1116.7 1133 1116.5 1136.6 1116.3 1144.7 1115.8 1151 1115.5 1183.3 1114 1207.5 1110.9 1221.5 1106.3 1235.3 1101.9 1244.8 1094.1 1249.9 1083.2 1253.5 1075.4 1253.7 1074.4 1259 1044 1266.4 1001.7 1269.1 993.5 1276.9 989.2 1278.9 988.1 1284.7 986.1 1289.9 984.6 1305.8 980.1 1313.3 975.5 1314.4 969.7 1316.2 959.5 1317.1 881.4 1315.7 859.5 1314 834.8 1313.1 831.4 1307 824.7 1301.2 818.3 1295 814.8 1283 811 1278 809.5 1272.4 807 1270.5 805.6 1264 800.6 1259.5 790.1 1252.5 763 1243.5 728.4 1235.9 706.8 1224.6 683.5 1202.3 637.7 1167.5 602.5 1111.8 569.1 1087.6 554.7 1054.4 542.7 1028.1 539 1024.1 538.4 1020.5 537.8 1020.1 537.6 1019.8 537.4 1016.4 536.9 1012.7 536.5 1009 536.2 1005.1 535.7 1004.2 535.5 999.7 534.7 988.4 533.6 973.5 532.5 969.7 532.2 964.5 531.8 962 531.5 959.5 531.2 940.4 530.1 919.5 529 851.7 525.4 836.1 523.7 829.5 519.4 821.2 514 825.2 495.6 837.6 481.8 843.8 474.9 844.2 474.3 856.8 448 862.6 436 868.9 425.2 879.9 408.7 888.2 396.2 895 385.5 895 385.1 895 384.6 889.7 383.3 883.3 382 851.1 375.9 812.7 367.8 806.9 365.9 792.4 361.2 790.7 358.7 790.2 342.5 789.7 326.8 792.4 303.4 800 258.5 802.1 246.1 803.3 220.9 801.9 219.6 801.7 219.4 800.5 218.9 799.3 218.6 797.4 218 796.5 218.7 793.8 222.7Z"/>
-    <path
-        android:fillColor="#FF62686C"
-        android:strokeColor="#FF62686C"
-        android:strokeWidth="4.0"
-        android:strokeLineCap="round"
-        android:strokeMiterLimit="10"
-        android:pathData="M570.4 704.1C553.5 706.1 539.7 713 532.9 722.7 523.5 736.3 519.9 764.2 519.6 826 519.5 859.4 519.7 860.6 530.1 872.9 543.4 888.6 560.4 900 574.1 902.1 586.7 904 601.5 898.9 615.7 887.5 632.5 874.1 633.5 868.9 632.7 793.6 632.2 742.5 631.6 736 627 725.2 620.5 710 596.2 700.9 570.4 704.1Z"/>
-    <path
-        android:fillColor="#FF62686C"
-        android:strokeColor="#FF62686C"
-        android:strokeWidth="4.0"
-        android:strokeLineCap="round"
-        android:strokeMiterLimit="10"
-        android:pathData="M949.2 705.5C935.1 708.7 927 716.8 922.6 732.4 918.4 746.7 917.8 757.3 917.3 816.5 917.1 847.8 917.3 874 917.7 874.6 919.2 876.7 945.3 892.3 955.5 897.1 973.4 905.5 983.5 905.4 978.9 896.8 977.1 893.4 979.1 892.6 985.9 893.9 993.6 895.4 997.8 894.3 1005.2 889.1 1010.9 885 1020.2 873.6 1023.8 866.5 1029.6 854.9 1031.1 841.6 1031.1 800.5 1031.1 750.1 1028.6 737.6 1014.9 720.4 1009.4 713.5 1004.6 709.8 996.9 706.8 992.2 704.9 989.1 704.6 973.5 704.4 960.6 704.1 953.7 704.5 949.2 705.5Z"/>
-    <path
-        android:fillColor="#FF62686C"
-        android:strokeColor="#FF62686C"
-        android:strokeWidth="4.0"
-        android:strokeLineCap="round"
-        android:strokeMiterLimit="10"
-        android:pathData="M717 988.7C671.1 990.4 640.9 994.2 635.6 998.8 631.5 1002.5 636.3 1017.5 643.6 1024 650.9 1030.3 661.7 1032.5 694 1034 721.9 1035.3 829.3 1035.3 857 1034 891.4 1032.4 901.4 1029.9 908.9 1021.3 914.5 1015 917.9 1003.4 915.2 999.4 910.4 992.1 856 987.9 772 988.2 745.9 988.3 721.1 988.5 717 988.7Z"/>
-</vector>

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

@@ -9,5 +9,5 @@
         android:top="0dp" 
         android:right="0dp" 
         android:bottom="0dp"
-        android:drawable="@drawable/ic_iw"/>
+        android:drawable="@drawable/ic_launcher"/>
 </layer-list>

winboll/src/main/res/drawable/ic_launcher_disable.xml

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

winboll/src/main/res/drawable/ic_launcher_foreground.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M16.61,15.15C16.15,15.15 15.77,14.78 15.77,14.32S16.15,13.5 16.61,13.5H16.61C17.07,13.5 17.45,13.86 17.45,14.32C17.45,14.78 17.07,15.15 16.61,15.15M7.41,15.15C6.95,15.15 6.57,14.78 6.57,14.32C6.57,13.86 6.95,13.5 7.41,13.5H7.41C7.87,13.5 8.24,13.86 8.24,14.32C8.24,14.78 7.87,15.15 7.41,15.15M16.91,10.14L18.58,7.26C18.67,7.09 18.61,6.88 18.45,6.79C18.28,6.69 18.07,6.75 18,6.92L16.29,9.83C14.95,9.22 13.5,8.9 12,8.91C10.47,8.91 9,9.24 7.73,9.82L6.04,6.91C5.95,6.74 5.74,6.68 5.57,6.78C5.4,6.87 5.35,7.08 5.44,7.25L7.1,10.13C4.25,11.69 2.29,14.58 2,18H22C21.72,14.59 19.77,11.7 16.91,10.14H16.91Z"/>
-</vector>

winboll/src/main/res/drawable/ic_launcher_foreground_disable.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#FF808080"
-        android:pathData="M16.61,15.15C16.15,15.15 15.77,14.78 15.77,14.32S16.15,13.5 16.61,13.5H16.61C17.07,13.5 17.45,13.86 17.45,14.32C17.45,14.78 17.07,15.15 16.61,15.15M7.41,15.15C6.95,15.15 6.57,14.78 6.57,14.32C6.57,13.86 6.95,13.5 7.41,13.5H7.41C7.87,13.5 8.24,13.86 8.24,14.32C8.24,14.78 7.87,15.15 7.41,15.15M16.91,10.14L18.58,7.26C18.67,7.09 18.61,6.88 18.45,6.79C18.28,6.69 18.07,6.75 18,6.92L16.29,9.83C14.95,9.22 13.5,8.9 12,8.91C10.47,8.91 9,9.24 7.73,9.82L6.04,6.91C5.95,6.74 5.74,6.68 5.57,6.78C5.4,6.87 5.35,7.08 5.44,7.25L7.1,10.13C4.25,11.69 2.29,14.58 2,18H22C21.72,14.59 19.77,11.7 16.91,10.14H16.91Z"/>
-</vector>

winboll/src/main/res/layout/activity_test_weworkspecsdk.xml

@@ -0,0 +1,30 @@
+<?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="match_parent"
+    android:orientation="vertical"
+    android:padding="20dp"
+    android:gravity="center_horizontal">
+
+    <Button
+        android:id="@+id/btn_init_sdk"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="初始化企业微信SDK"
+        android:layout_marginBottom="10dp"/>
+
+    <Button
+        android:id="@+id/btn_get_corp_info"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="获取企业基本信息"
+        android:layout_marginBottom="10dp"/>
+
+    <Button
+        android:id="@+id/btn_check_auth"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="检查用户授权状态"/>
+
+</LinearLayout>
+

winboll/src/main/res/layout/activity_wxpay.xml

@@ -0,0 +1,43 @@
+<?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="match_parent"
+    android:orientation="vertical"
+    android:gravity="center_horizontal"
+    android:padding="20dp">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="定额支付测试（0.01元）"
+        android:textSize="20sp"/>
+
+    <ImageView
+        android:id="@+id/iv_qrcode"
+        android:layout_width="250dp"
+        android:layout_height="250dp"
+        android:scaleType="fitXY"/>
+
+    <TextView
+        android:id="@+id/tv_order_no"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="商户订单号："
+        android:textSize="16sp"/>
+
+    <TextView
+        android:id="@+id/tv_pay_status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="支付状态：未支付"
+        android:textSize="16sp"
+        android:textColor="@android:color/black"/>
+
+    <Button
+        android:id="@+id/btn_create_order"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="生成支付二维码"/>
+
+</LinearLayout>
+

winboll/src/main/res/layout/view_toolbar.xml

@@ -9,7 +9,7 @@
         android:id="@+id/toolbar_icon"
         android:layout_width="48dp"
         android:layout_height="48dp"
-        android:src="@drawable/ic_iw"
+        android:src="@drawable/ic_launcher"
         android:layout_alignParentStart="true"
         android:layout_centerVertical="true"
         android:layout_marginStart="6dp"

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

@@ -7,4 +7,7 @@
 	<item
         android:id="@+id/item_settings"
         android:title="Settings"/>
+	<item
+        android:id="@+id/item_wxpayactivity"
+        android:title="WXPayActivity"/>
 </menu>

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

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

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

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