diff --git a/positions/build.gradle b/positions/build.gradle
index e4f159b..5b4ea14 100644
--- a/positions/build.gradle
+++ b/positions/build.gradle
@@ -18,29 +18,34 @@ def genVersionName(def versionName){
}
android {
- // 1. compileSdkVersion：必须 ≥ targetSdkVersion，建议直接等于 targetSdkVersion（30）
- compileSdkVersion 30
+ compileSdkVersion 32
+ buildToolsVersion "32.0.0"
- // 2. buildToolsVersion：需匹配 compileSdkVersion，建议使用 30.x.x 最新稳定版（无需高于 compileSdkVersion）
- buildToolsVersion "30.0.3" // 这是 30 对应的最新稳定版，避免使用 beta 版
-
defaultConfig {
applicationId "cc.winboll.studio.positions"
- minSdkVersion 23
+ minSdkVersion 24
targetSdkVersion 30
versionCode 1
// versionName 更新后需要手动设置
// .winboll/winbollBuildProps.properties 文件的 stageCount=0
// Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
- versionName "15.12"
+ versionName "15.0"
if(true) {
versionName = genVersionName("${versionName}")
}
}
-
+
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
}
dependencies {
+ api fileTree(dir: 'libs', include: ['*.jar'])
+
// https://mvnrepository.com/artifact/com.jzxiang.pickerview/TimePickerDialog
api 'com.jzxiang.pickerview:TimePickerDialog:1.0.1'
@@ -56,6 +61,8 @@ dependencies {
api 'com.journeyapps:zxing-android-embedded:3.6.0'
// 应用介绍页类库
api 'io.github.medyo:android-about-page:2.0.0'
+ // 吐司类库
+ //api 'com.github.getActivity:ToastUtils:10.5'
// 网络连接类库
api 'com.squareup.okhttp3:okhttp:4.4.1'
// AndroidX 类库
@@ -66,14 +73,7 @@ dependencies {
//api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
//api 'androidx.fragment:fragment:1.1.0'
-
- // WinBoLL库 nexus.winboll.cc 地址
- //api 'cc.winboll.studio:libaes:15.12.0'
- //api 'cc.winboll.studio:libappbase:15.12.2'
-
- // WinBoLL备用库 jitpack.io 地址
- api 'com.github.ZhanGSKen:AES:aes-v15.12.3'
- api 'com.github.ZhanGSKen:APPBase:appbase-v15.12.2'
-
- api fileTree(dir: 'libs', include: ['*.jar'])
+ api 'cc.winboll.studio:libaes:15.10.2'
+ api 'cc.winboll.studio:libapputils:15.10.2'
+ api 'cc.winboll.studio:libappbase:15.10.9'
}
diff --git a/positions/build.properties b/positions/build.properties
index 33ec84f..0c9f1cc 100644
--- a/positions/build.properties
+++ b/positions/build.properties
@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
-#Sun Dec 07 11:41:29 GMT 2025
-stageCount=0
+#Tue Oct 28 14:17:09 HKT 2025
+stageCount=17
libraryProject=
-baseVersion=15.12
-publishVersion=15.12.0
-buildCount=3
-baseBetaVersion=15.12.1
+baseVersion=15.0
+publishVersion=15.0.16
+buildCount=0
+baseBetaVersion=15.0.17
diff --git a/positions/src/beta/res/values-zh/strings.xml b/positions/src/beta/res/values-zh/strings.xml
index 394a306..1e0577a 100644
--- a/positions/src/beta/res/values-zh/strings.xml
+++ b/positions/src/beta/res/values-zh/strings.xml
@@ -1,5 +1,4 @@
悟空笔记#
- 时空任务#
diff --git a/positions/src/beta/res/values/strings.xml b/positions/src/beta/res/values/strings.xml
index 5984bfd..5dc93b9 100644
--- a/positions/src/beta/res/values/strings.xml
+++ b/positions/src/beta/res/values/strings.xml
@@ -1,7 +1,6 @@
- Positions
- PositionsPlus+
+ Positions +
diff --git a/positions/src/beta/res/xml/shortcutsmain.xml b/positions/src/beta/res/xml/shortcutsmain.xml
deleted file mode 100644
index 08d8f99..0000000
--- a/positions/src/beta/res/xml/shortcutsmain.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/positions/src/beta/res/xml/shortcutsplus.xml b/positions/src/beta/res/xml/shortcutsplus.xml
deleted file mode 100644
index 78616e4..0000000
--- a/positions/src/beta/res/xml/shortcutsplus.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/positions/src/main/AndroidManifest.xml b/positions/src/main/AndroidManifest.xml
index d22e9d1..d302210 100644
--- a/positions/src/main/AndroidManifest.xml
+++ b/positions/src/main/AndroidManifest.xml
@@ -3,32 +3,20 @@
xmlns:android="http://schemas.android.com/apk/res/android"
package="cc.winboll.studio.positions">
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ android:label="@string/app_name">
-
+
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/positions/src/main/java/cc/winboll/studio/positions/App.java b/positions/src/main/java/cc/winboll/studio/positions/App.java
index 474212d..c99a5d8 100644
--- a/positions/src/main/java/cc/winboll/studio/positions/App.java
+++ b/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);
-
+ setIsDebuging(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 {
diff --git a/positions/src/main/java/cc/winboll/studio/positions/AppLevel.java b/positions/src/main/java/cc/winboll/studio/positions/AppLevel.java
deleted file mode 100644
index 40bc3e5..0000000
--- a/positions/src/main/java/cc/winboll/studio/positions/AppLevel.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package cc.winboll.studio.positions;
-
-/**
- * @Author ZhanGSKen&豆包大模型
- * @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; // 或抛出异常，根据业务需求调整
- }
-}
-
diff --git a/positions/src/main/java/cc/winboll/studio/positions/MainActivity.java b/positions/src/main/java/cc/winboll/studio/positions/MainActivity.java
index e659b96..d105d63 100644
--- a/positions/src/main/java/cc/winboll/studio/positions/MainActivity.java
+++ b/positions/src/main/java/cc/winboll/studio/positions/MainActivity.java
@@ -6,7 +6,6 @@ import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.Build;
import android.os.Bundle;
-import android.util.Log;
import android.view.View;
import android.widget.Button;
import android.widget.CompoundButton;
@@ -18,12 +17,10 @@ import androidx.core.content.ContextCompat;
import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.ToastUtils;
import cc.winboll.studio.positions.activities.LocationActivity;
import cc.winboll.studio.positions.activities.WinBoLLActivity;
-import cc.winboll.studio.positions.utils.APPPlusUtils;
+import cc.winboll.studio.positions.services.MainService;
import cc.winboll.studio.positions.utils.AppConfigsUtil;
-import cc.winboll.studio.positions.utils.JsonShareHandler;
import cc.winboll.studio.positions.utils.ServiceUtil;
/**
@@ -34,18 +31,17 @@ 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;
-
+
// UI 控件：服务控制开关、顶部工具栏
private Switch mServiceSwitch;
private Button mManagePositionsButton;
private Toolbar mToolbar;
// 服务相关：服务实例、绑定状态标记
//private DistanceRefreshService mDistanceService;
- //private boolean isServiceBound = false;
+ private boolean isServiceBound = false;
@Override
@@ -87,10 +83,6 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main); // 关联主页面布局
- // 处理启动时的分享 Intent
- handleShareIntent(getIntent());
-
-
// 1. 初始化顶部 Toolbar（保留原逻辑，设置页面标题）
initToolbar();
// 2. 初始化其他控件
@@ -103,31 +95,6 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {
//bindDistanceService();
}
-
- @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();
- }
- }
- });
- }
- }
-
@Override
protected void onDestroy() {
super.onDestroy();
@@ -147,9 +114,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));
+ }
}
/**
diff --git a/positions/src/main/java/cc/winboll/studio/positions/MainActivityLaojun.java b/positions/src/main/java/cc/winboll/studio/positions/MainActivityLaojun.java
deleted file mode 100644
index 15b5da5..0000000
--- a/positions/src/main/java/cc/winboll/studio/positions/MainActivityLaojun.java
+++ /dev/null
@@ -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&豆包大模型
- * @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);
- }
-
-}
diff --git a/positions/src/main/java/cc/winboll/studio/positions/PointLevel.java b/positions/src/main/java/cc/winboll/studio/positions/PointLevel.java
deleted file mode 100644
index 3c78f4d..0000000
--- a/positions/src/main/java/cc/winboll/studio/positions/PointLevel.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package cc.winboll.studio.positions;
-
-/**
- * @Author ZhanGSKen&豆包大模型
- * @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; // 或抛出异常，根据业务需求调整
- }
-}
diff --git a/positions/src/main/java/cc/winboll/studio/positions/activities/ShortcutActionActivity.java b/positions/src/main/java/cc/winboll/studio/positions/activities/ShortcutActionActivity.java
deleted file mode 100644
index f0618cc..0000000
--- a/positions/src/main/java/cc/winboll/studio/positions/activities/ShortcutActionActivity.java
+++ /dev/null
@@ -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&豆包大模型
- * @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);
- }
- }
-}
diff --git a/positions/src/main/java/cc/winboll/studio/positions/activities/WinBoLLActivity.java b/positions/src/main/java/cc/winboll/studio/positions/activities/WinBoLLActivity.java
index 8f40877..3cf13b7 100644
--- a/positions/src/main/java/cc/winboll/studio/positions/activities/WinBoLLActivity.java
+++ b/positions/src/main/java/cc/winboll/studio/positions/activities/WinBoLLActivity.java
@@ -12,19 +12,11 @@ import androidx.appcompat.app.AppCompatActivity;
import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
import cc.winboll.studio.libappbase.LogUtils;
-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;
-
@Override
public Activity getActivity() {
return this;
@@ -38,67 +30,18 @@ public class WinBoLLActivity extends AppCompatActivity implements IWinBoLLActivi
@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()));
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
/*if (item.getItemId() == R.id.item_log) {
- WinBoLLActivityManager.getInstance().startLogActivity(this);
- return true;
- } else if (item.getItemId() == R.id.item_home) {
- startActivity(new Intent(this, MainActivity.class));
- return true;
- }*/
+ WinBoLLActivityManager.getInstance().startLogActivity(this);
+ return true;
+ } else if (item.getItemId() == R.id.item_home) {
+ startActivity(new Intent(this, MainActivity.class));
+ return true;
+ }*/
// 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
return super.onOptionsItemSelected(item);
}
diff --git a/positions/src/main/java/cc/winboll/studio/positions/models/AppConfigsModel.java b/positions/src/main/java/cc/winboll/studio/positions/models/AppConfigsModel.java
index 032adb9..feb0aa0 100644
--- a/positions/src/main/java/cc/winboll/studio/positions/models/AppConfigsModel.java
+++ b/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;
}
diff --git a/positions/src/main/java/cc/winboll/studio/positions/receivers/MotionStatusReceiver.java b/positions/src/main/java/cc/winboll/studio/positions/receivers/MotionStatusReceiver.java
deleted file mode 100644
index 7ff5e8b..0000000
--- a/positions/src/main/java/cc/winboll/studio/positions/receivers/MotionStatusReceiver.java
+++ /dev/null
@@ -1,361 +0,0 @@
-package cc.winboll.studio.positions.receivers;
-
-/**
- * @Author ZhanGSKen&豆包大模型
- * @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); // 强制停止传感器
- }
-}
-
diff --git a/positions/src/main/java/cc/winboll/studio/positions/services/MainService.java b/positions/src/main/java/cc/winboll/studio/positions/services/MainService.java
index c68884f..59b4bc0 100644
--- a/positions/src/main/java/cc/winboll/studio/positions/services/MainService.java
+++ b/positions/src/main/java/cc/winboll/studio/positions/services/MainService.java
@@ -3,7 +3,7 @@ package cc.winboll.studio.positions.services;
/**
* @Author ZhanGSKen
* @Date 2024/07/19 14:30:57
- * @Describe 应用主要服务组件类（适配运动状态GPS控制+静止10秒切换）
+ * @Describe 应用主要服务组件类
*/
import android.app.Service;
import android.content.ComponentName;
@@ -35,216 +35,121 @@ import java.util.Iterator;
import java.util.Set;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import cc.winboll.studio.positions.utils.LocalMotionDetector;
+import java.util.concurrent.TimeUnit; // 新增：定时器时间单位依赖
-public class MainService extends Service implements LocalMotionDetector.MotionStatusCallback {
+public class MainService extends Service {
public static final String TAG = "MainService";
- public static final String EXTRA_IS_SETTING_TO_ENABLE = "EXTRA_IS_SETTING_TO_ENABLE";
- // ---------------------- 核心：LocalMotionDetector 实例（唯一运动状态检测工具） ----------------------
- private LocalMotionDetector mMotionDetector; // 本地运动状态检测器
- private static final long GPS_STATIC_INTERVAL = 30; // 静止时GPS间隔（30秒）
+ public static final String EXTRA_IS_SETTING_TO_ENABLE = "EXTRA_IS_SETTING_TO_ENABLE";
- // ---------------------- 定时器相关变量 ----------------------
- private ScheduledExecutorService gpsStaticTimer; // 静止时GPS定时任务
- private volatile boolean isGpsListening = false; // GPS是否持续监听
- private static final long GPS_STATIC_DURATION = 3; // 单次GPS获取超时（秒）
+ // ---------------------- 新增：定时器相关变量 ----------------------
+ private ScheduledExecutorService taskCheckTimer; // 任务校验定时器
+ private static final long TASK_CHECK_INTERVAL = 1; // 定时间隔（1分钟）
+ private static final long TASK_CHECK_INIT_DELAY = 1; // 初始延迟（1分钟：立即启动）
- // ---------------------- 静止延迟切换配置（核心功能） ----------------------
- private static final long STATIC_DELAY_MS = 10 * 1000; // 静止10秒后切换
- private Handler staticDelayHandler; // 延迟执行切换逻辑的Handler
- private volatile boolean isDelaySwitching = false; // 标记是否正在等待延迟切换
-
- // GPS监听接口
+ // GPS监听接口（Java 7 标准接口定义，无Lambda依赖）
public interface GpsUpdateListener {
void onGpsPositionUpdated(PositionModel currentGpsPos);
void onGpsStatusChanged(String status);
}
- // 任务更新监听接口
+ // 任务更新监听接口（Java 7 风格，供Adapter监听任务变化）
public interface TaskUpdateListener {
void onTaskUpdated();
}
- // 监听管理
+ // 监听管理（弱引用+线程安全集合，适配Java 7，避免内存泄漏+并发异常）
private final Set> mGpsListeners = new HashSet>();
private final Set> mTaskListeners = new HashSet>();
- private final Object mListenerLock = new Object();
+ private final Object mListenerLock = new Object(); // 监听操作锁，保证线程安全
- // 原有核心变量
- private LocalBinder mLocalBinder;
+ // 原有核心变量（Java 7 显式初始化，无Java 8+语法）
+ private LocalBinder mLocalBinder; //持有 LocalBinder 实例（用于暴露服务）
private LocationManager mLocationManager;
private LocationListener mGpsLocationListener;
- private static final long GPS_UPDATE_INTERVAL = 2000; // 实时GPS更新间隔：2秒
- private static final float GPS_UPDATE_DISTANCE = 1; // 实时GPS更新距离：1米
- private boolean isGpsEnabled = false;
- private boolean isGpsPermissionGranted = false;
+ private static final long GPS_UPDATE_INTERVAL = 2000; // GPS更新间隔：2秒
+ private static final float GPS_UPDATE_DISTANCE = 1; // GPS更新距离阈值：1米
+ private boolean isGpsEnabled = false; // GPS是否启用标记
+ private boolean isGpsPermissionGranted = false; // 定位权限是否授予标记
- // 数据存储集合
- private final ArrayList mPositionList = new ArrayList();
- private final ArrayList mAllTasks = new ArrayList();
- private static PositionModel _mCurrentGpsPosition;
+ // 数据存储集合（Java 7 基础集合，避免Stream/forEach等Java 8+特性）
+ private final ArrayList mPositionList = new ArrayList(); // 位置数据列表
+ private final ArrayList mAllTasks = new ArrayList();// 任务数据列表
+ private static PositionModel _mCurrentGpsPosition; // 当前GPS定位数据
- // 服务相关变量
+ // 服务相关变量（Java 7 显式声明，保持原逻辑）
MyServiceConnection mMyServiceConnection;
- volatile static boolean _mIsServiceRunning;
+ volatile static boolean _mIsServiceRunning; // 服务运行状态（volatile保证可见性）
AppConfigsUtil mAppConfigsUtil;
- private ScheduledExecutorService distanceExecutor = Executors.newSingleThreadScheduledExecutor();
- private final Set mVisiblePositionIds = new HashSet();
+ private ScheduledExecutorService distanceExecutor = Executors.newSingleThreadScheduledExecutor(); // 单线程池处理距离计算
+ private final Set mVisiblePositionIds = new HashSet(); // 可见位置ID集合
- // 单例+应用上下文
+ // 单例+应用上下文（Java 7 静态变量，保证服务实例唯一+上下文安全）
private static volatile MainService sInstance;
private static Context sAppContext;
// =========================================================================
- // 核心：运动状态回调（仅通过LocalMotionDetector触发，低运动归类为静止）
+ // 新增：定时器初始化方法（创建单线程定时器，每1分钟调用任务校验）
// =========================================================================
- @Override
- public void onMotionStatusChanged(boolean isWalking, String statusDesc) {
- LogUtils.d(TAG, "运动状态回调：" + statusDesc + "（isWalking=" + isWalking + "）");
- updateNotificationGpsStatus("当前状态：" + statusDesc);
-
- // 仅行走状态切实时GPS，非行走（静止+低运动）统一按静止处理
- if (isWalking) {
- // 行走状态：立即切回实时GPS（取消未执行的延迟任务）
- if (staticDelayHandler != null) {
- staticDelayHandler.removeCallbacksAndMessages(null); // 清空延迟任务
- isDelaySwitching = false; // 重置标记
- }
- stopGpsStaticTimer(); // 停止定时GPS
- startGpsLocation(); // 启动实时GPS
- LogUtils.d(TAG, "行走状态：已切换为实时GPS（2秒/1米）");
-
- } else {
- // 非行走状态：延迟10秒切换为定时GPS
- if (isGpsListening && !isDelaySwitching) { // 仅实时GPS运行且无延迟任务时触发
- isDelaySwitching = true;
- staticDelayHandler.postDelayed(new Runnable() {
- @Override
- public void run() {
- stopGpsLocation(); // 停止实时GPS
- startGpsStaticTimer(GPS_STATIC_INTERVAL); // 启动30秒定时GPS
- LogUtils.d(TAG, "静止/低运动10秒：已切换为30秒定时GPS");
- isDelaySwitching = false; // 重置标记
- }
- }, STATIC_DELAY_MS);
- LogUtils.d(TAG, "检测到静止/低运动：将在10秒后切换为定时GPS（若持续非行走）");
- }
- LogUtils.d(TAG, "静止/低运动状态：等待延迟切换GPS");
+ private void initTaskCheckTimer() {
+ // 先销毁旧定时器（避免重复创建导致多线程问题）
+ if (taskCheckTimer != null && !taskCheckTimer.isShutdown()) {
+ taskCheckTimer.shutdown();
}
- }
-
- // =========================================================================
- // 静止GPS定时任务方法（适配Java7）
- // =========================================================================
- // 启动静止时GPS定时获取（间隔：秒）
- public void startGpsStaticTimer(long intervalSeconds) {
- stopGpsStaticTimer();
-
- gpsStaticTimer = Executors.newSingleThreadScheduledExecutor();
- gpsStaticTimer.scheduleAtFixedRate(new Runnable() {
+ // 创建单线程定时器（确保任务串行执行，避免并发异常）
+ taskCheckTimer = Executors.newSingleThreadScheduledExecutor();
+ // 定时任务：初始延迟1分钟，每1分钟执行一次
+ taskCheckTimer.scheduleAtFixedRate(new Runnable() {
@Override
public void run() {
- LogUtils.d(TAG, "静止时GPS定时任务触发：开始单次GPS获取");
- startSingleGpsRetrieve();
+ LogUtils.d(TAG, "定时任务触发：开始校验任务（间隔1分钟）");
+ // 调用任务校验核心方法（与GPS位置变化时逻辑一致）
+ DistanceCalculatorUtil.getInstance(MainService.this).checkAllTaskTriggerCondition(MainService._mCurrentGpsPosition);
}
- }, 0, intervalSeconds, TimeUnit.SECONDS);
+ }, TASK_CHECK_INIT_DELAY, TASK_CHECK_INTERVAL, TimeUnit.MINUTES);
- LogUtils.d(TAG, "静止时GPS定时任务已启动（间隔：" + intervalSeconds + "秒）");
+ LogUtils.d(TAG, "任务校验定时器已启动（间隔：" + TASK_CHECK_INTERVAL + "分钟）");
}
- // 停止静止时GPS定时任务
- public void stopGpsStaticTimer() {
- if (gpsStaticTimer != null && !gpsStaticTimer.isShutdown()) {
- gpsStaticTimer.shutdown();
+ // =========================================================================
+ // 新增：定时器销毁方法（服务销毁时调用，避免内存泄漏）
+ // =========================================================================
+ private void destroyTaskCheckTimer() {
+ if (taskCheckTimer != null && !taskCheckTimer.isShutdown()) {
+ taskCheckTimer.shutdown(); // 优雅关闭：等待已提交任务执行完成
try {
- if (!gpsStaticTimer.awaitTermination(1, TimeUnit.SECONDS)) {
- gpsStaticTimer.shutdownNow();
+ // 等待1秒，若未终止则强制关闭
+ if (!taskCheckTimer.awaitTermination(1, TimeUnit.SECONDS)) {
+ taskCheckTimer.shutdownNow(); // 强制终止未完成任务
}
} catch (InterruptedException e) {
- gpsStaticTimer.shutdownNow();
- Thread.currentThread().interrupt();
+ taskCheckTimer.shutdownNow(); // 捕获中断异常，强制关闭
+ Thread.currentThread().interrupt(); // 恢复线程中断状态
} finally {
- gpsStaticTimer = null;
- LogUtils.d(TAG, "静止时GPS定时任务已销毁");
+ taskCheckTimer = null; // 置空，避免重复操作
+ LogUtils.d(TAG, "任务校验定时器已销毁");
}
}
}
- // 单次GPS获取（获取后关闭监听）
- private void startSingleGpsRetrieve() {
- if (!checkGpsReady()) {
- LogUtils.w(TAG, "单次GPS获取：GPS未就绪，跳过");
- return;
- }
-
- try {
- mLocationManager.requestSingleUpdate(
- LocationManager.GPS_PROVIDER,
- new LocationListener() {
- @Override
- public void onLocationChanged(Location location) {
- if (location != null) {
- PositionModel gpsPos = new PositionModel();
- gpsPos.setLatitude(location.getLatitude());
- gpsPos.setLongitude(location.getLongitude());
- gpsPos.setPositionId("CURRENT_GPS_POS");
- gpsPos.setMemo("静止时单次GPS位置");
- syncCurrentGpsPosition(gpsPos);
- LogUtils.d(TAG, "单次GPS获取成功：纬度=" + location.getLatitude());
- }
- mLocationManager.removeUpdates(this);
- }
-
- @Override
- public void onStatusChanged(String provider, int status, Bundle extras) {}
-
- @Override
- public void onProviderEnabled(String provider) {}
-
- @Override
- public void onProviderDisabled(String provider) {
- mLocationManager.removeUpdates(this);
- }
- },
- Looper.getMainLooper()
- );
-
- // 超时处理
- new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
- @Override
- public void run() {
- mLocationManager.removeUpdates(new LocationListener() {
- @Override public void onLocationChanged(Location location) {}
- @Override public void onStatusChanged(String provider, int status, Bundle extras) {}
- @Override public void onProviderEnabled(String provider) {}
- @Override public void onProviderDisabled(String provider) {}
- });
- LogUtils.d(TAG, "单次GPS获取超时（" + GPS_STATIC_DURATION + "秒）");
- }
- }, GPS_STATIC_DURATION * 1000);
-
- } catch (SecurityException e) {
- LogUtils.e(TAG, "单次GPS获取失败（权限异常）：" + e.getMessage());
- } catch (Exception e) {
- LogUtils.e(TAG, "单次GPS获取失败：" + e.getMessage());
- }
- }
-
-
// =========================================================================
- // 任务操作核心接口
+ // 任务操作核心接口（Java 7 实现，全迭代器遍历，无ConcurrentModificationException）
// =========================================================================
+ /**
+ * 新增任务（Adapter调用，通过MainService统一管理任务，保证数据一致性）
+ * @param newTask 待新增的任务模型
+ */
public void addTask(PositionTaskModel newTask) {
+ // 参数校验（Java 7 基础判断，无Optional等Java 8+特性）
if (newTask == null || TextUtils.isEmpty(newTask.getPositionId())) {
LogUtils.w(TAG, "addPositionTask：任务为空或未绑定位置ID，新增失败");
return;
}
+ // 任务去重（Java 7 迭代器遍历，避免增强for循环删除/新增导致的并发异常）
boolean isDuplicate = false;
Iterator taskIter = mAllTasks.iterator();
while (taskIter.hasNext()) {
@@ -259,18 +164,25 @@ public class MainService extends Service implements LocalMotionDetector.MotionSt
return;
}
+ // 新增任务+持久化+通知刷新（全Java 7 语法）
mAllTasks.add(newTask);
saveAllTasks();
- notifyTaskUpdated();
+ notifyTaskUpdated(); // 通知所有监听者（如Adapter）任务已更新
LogUtils.d(TAG, "addPositionTask：成功（位置ID=" + newTask.getPositionId() + "，任务ID=" + newTask.getTaskId() + "）");
}
+ /**
+ * 获取指定位置的所有任务（Adapter显示任务数量用，数据来源唯一）
+ * @param positionId 位置ID
+ * @return 该位置绑定的所有任务（返回新列表，避免外部修改原数据）
+ */
public ArrayList getTasksByPositionId(String positionId) {
ArrayList posTasks = new ArrayList();
if (TextUtils.isEmpty(positionId) || mAllTasks.isEmpty()) {
return posTasks;
}
+ // 筛选任务（Java 7 迭代器遍历，安全筛选）
Iterator taskIter = mAllTasks.iterator();
while (taskIter.hasNext()) {
PositionTaskModel task = taskIter.next();
@@ -281,44 +193,55 @@ public class MainService extends Service implements LocalMotionDetector.MotionSt
return posTasks;
}
+ /**
+ * 获取所有任务（Adapter全量刷新用，返回拷贝避免原数据被外部修改）
+ * @return 所有任务的拷贝列表
+ */
public ArrayList getAllTasks() {
- return mAllTasks;
+ return mAllTasks; // Java 7 集合拷贝方式
}
- public void updateTask(PositionTaskModel updatedTask) {
+ public void updateTask(PositionTaskModel updatedTask) {
if (updatedTask == null || updatedTask.getTaskId() == null) return;
for (int i = 0; i < mAllTasks.size(); i++) {
PositionTaskModel task = mAllTasks.get(i);
if (updatedTask.getTaskId().equals(task.getTaskId())) {
- mAllTasks.set(i, updatedTask);
+ mAllTasks.set(i, updatedTask); // 替换为更新后的任务
break;
}
- }
- saveAllTasks();
+ }
+ saveAllTasks(); // 持久化更新后的数据
}
+ // 4. 仅更新任务启用状态（优化性能，避免全量字段更新）
public void updateTaskStatus(PositionTaskModel task) {
if (task == null || task.getTaskId() == null) return;
for (PositionTaskModel item : mAllTasks) {
if (task.getTaskId().equals(item.getTaskId())) {
- item.setIsEnable(task.isEnable());
+ item.setIsEnable(task.isEnable()); // 只更新启用状态字段
break;
}
}
- saveAllTasks();
+ saveAllTasks(); // 持久化状态变更
}
+
+ /**
+ * 删除任务（Adapter调用，通过迭代器安全删除，避免并发异常）
+ * @param taskId 待删除任务的ID
+ */
public void deleteTask(String taskId) {
if (TextUtils.isEmpty(taskId) || mAllTasks.isEmpty()) {
LogUtils.w(TAG, "deletePositionTask：任务ID为空或列表为空，删除失败");
return;
}
+ // 迭代器删除（Java 7 唯一安全删除集合元素的方式）
Iterator taskIter = mAllTasks.iterator();
while (taskIter.hasNext()) {
PositionTaskModel task = taskIter.next();
if (taskId.equals(task.getTaskId())) {
- taskIter.remove();
+ taskIter.remove(); // 迭代器安全删除，无ConcurrentModificationException
saveAllTasks();
notifyTaskUpdated();
LogUtils.d(TAG, "deletePositionTask：成功（任务ID=" + taskId + "）");
@@ -327,16 +250,24 @@ public class MainService extends Service implements LocalMotionDetector.MotionSt
}
}
+ /**
+ * 注册任务更新监听（Java 7 弱引用管理，避免内存泄漏）
+ * @param listener 任务更新监听者（如Adapter）
+ */
public void registerTaskUpdateListener(TaskUpdateListener listener) {
if (listener == null) {
LogUtils.w(TAG, "registerTaskUpdateListener：监听者为空，跳过");
return;
}
- synchronized (mListenerLock) {
+ synchronized (mListenerLock) { // 加锁保证多线程注册安全
mTaskListeners.add(new WeakReference(listener));
}
}
+ /**
+ * 反注册任务更新监听（Java 7 迭代器清理，避免内存泄漏）
+ * @param listener 待反注册的监听者
+ */
public void unregisterTaskUpdateListener(TaskUpdateListener listener) {
if (listener == null) {
LogUtils.w(TAG, "unregisterTaskUpdateListener：监听者为空，跳过");
@@ -346,6 +277,7 @@ public class MainService extends Service implements LocalMotionDetector.MotionSt
Iterator> iter = mTaskListeners.iterator();
while (iter.hasNext()) {
WeakReference ref = iter.next();
+ // 清理目标监听者或已被回收的弱引用
if (ref.get() == listener || ref.get() == null) {
iter.remove();
}
@@ -353,12 +285,16 @@ public class MainService extends Service implements LocalMotionDetector.MotionSt
}
}
+ /**
+ * 通知所有任务监听者更新（Java 7 匿名内部类实现主线程回调，无Lambda）
+ */
private void notifyTaskUpdated() {
synchronized (mListenerLock) {
Iterator> iter = mTaskListeners.iterator();
while (iter.hasNext()) {
final WeakReference ref = iter.next();
if (ref.get() != null) {
+ // 判断是否在主线程，不在则切换（Java 7 匿名Runnable，无Lambda）
if (Looper.myLooper() == Looper.getMainLooper()) {
ref.get().onTaskUpdated();
} else {
@@ -370,7 +306,7 @@ public class MainService extends Service implements LocalMotionDetector.MotionSt
});
}
} else {
- iter.remove();
+ iter.remove(); // 清理已回收的弱引用，避免内存泄漏
}
}
}
@@ -378,14 +314,19 @@ public class MainService extends Service implements LocalMotionDetector.MotionSt
// =========================================================================
- // 服务基础方法（初始化LocalMotionDetector，删除Receiver相关逻辑）
+ // 原有基础方法（Java 7 语法调整：移除所有Lambda/方法引用，用匿名内部类替代）
// =========================================================================
+ /**
+ * 获取服务单例（Java 7 静态同步方法，保证线程安全）
+ * @param context 上下文
+ * @return MainService实例（未绑定成功时返回null）
+ */
public static synchronized MainService getInstance(Context context) {
if (sInstance == null) {
- if (AppConfigsUtil.getInstance(context).isEnableMainService(true)) {
- Intent intent = new Intent(context.getApplicationContext(), MainService.class);
- context.getApplicationContext().startService(intent);
- }
+ if (AppConfigsUtil.getInstance(context).isEnableMainService(true)) {
+ Intent intent = new Intent(context.getApplicationContext(), MainService.class);
+ context.getApplicationContext().startService(intent);
+ }
return null;
}
if (sAppContext == null) {
@@ -394,11 +335,18 @@ public class MainService extends Service implements LocalMotionDetector.MotionSt
return sInstance;
}
+ /**
+ * 服务绑定回调（Java 7 基础实现，无默认方法等Java 8+特性）
+ */
@Override
- public IBinder onBind(Intent intent) {
- return mLocalBinder;
- }
+ public IBinder onBind(Intent intent) {
+ // 返回 LocalBinder，使Activity能通过Binder获取MainService实例
+ return mLocalBinder;
+ }
+ /**
+ * 服务创建回调（初始化单例、上下文、配置、服务连接等）
+ */
@Override
public void onCreate() {
LogUtils.d(TAG, "onCreate");
@@ -406,118 +354,129 @@ public class MainService extends Service implements LocalMotionDetector.MotionSt
sInstance = this;
sAppContext = getApplicationContext();
- mLocalBinder = new LocalBinder(this);
+ // 初始化 LocalBinder（关键：将MainService实例传入Binder）
+ mLocalBinder = new LocalBinder(this);
+
_mIsServiceRunning = false;
mAppConfigsUtil = AppConfigsUtil.getInstance(this);
+ // 初始化服务连接（Java 7 显式判断，无Optional）
if (mMyServiceConnection == null) {
mMyServiceConnection = new MyServiceConnection();
}
- // 初始化：LocalMotionDetector+延迟切换Handler（Java7兼容）
- mMotionDetector = LocalMotionDetector.getInstance();
- staticDelayHandler = new Handler(Looper.getMainLooper());
-
- if (mAppConfigsUtil.isEnableMainService(true)) {
- run();
- }
+ if (mAppConfigsUtil.isEnableMainService(true)) {
+ run(); // 启动服务核心逻辑
+ }
}
- // 服务核心运行方法（删除Receiver注册逻辑）
+ /**
+ * 服务核心逻辑（启动前台服务、初始化GPS、加载数据等）
+ * 【关键修改】新增定时器初始化，每1分钟调用任务校验
+ */
public void run() {
if (mAppConfigsUtil.isEnableMainService(true)) {
if (!_mIsServiceRunning) {
_mIsServiceRunning = true;
- wakeupAndBindAssistant();
+ wakeupAndBindAssistant(); // 唤醒并绑定辅助服务
- // 启动前台服务
+ // 启动前台服务（Java 7 显式调用，无方法引用）
String initialStatus = "[ Positions ] is in Service.";
- NotificationUtil.createForegroundServiceNotification(this, initialStatus);
+ NotificationUtil.createForegroundServiceNotification(this, initialStatus);
startForeground(NotificationUtil.FOREGROUND_SERVICE_NOTIFICATION_ID,
NotificationUtil.createForegroundServiceNotification(this, initialStatus));
- // 初始化LocationManager
+ // 初始化GPS相关（Java 7 基础API调用）
mLocationManager = (LocationManager) sInstance.getApplicationContext().getSystemService(Context.LOCATION_SERVICE);
+ initGpsLocationListener();
+ startGpsLocation();
- // 加载本地数据
+ // 加载本地数据（Java 7 静态方法调用，无方法引用）
PositionModel.loadBeanList(MainService.this, mPositionList, PositionModel.class);
PositionTaskModel.loadBeanList(MainService.this, mAllTasks, PositionTaskModel.class);
- // 核心：启动LocalMotionDetector监测（唯一运动状态来源）
- mMotionDetector.startDetection(this, this);
-
- // 提示与日志
+ // 提示与日志（Java 7 基础调用）
ToastUtils.show(initialStatus);
LogUtils.i(TAG, initialStatus);
+
+ // ---------------------- 关键新增：启动任务校验定时器 ----------------------
+ //checkAllTaskTriggerCondition();
+ initTaskCheckTimer();
}
}
}
+ /**
+ * 获取服务运行状态
+ * @return true=运行中，false=未运行
+ */
public boolean isServiceRunning() {
return _mIsServiceRunning;
}
+ /**
+ * 服务销毁回调（清理资源、停止GPS、清空数据、反注册监听等）
+ * 【关键修改】新增定时器销毁，避免内存泄漏
+ */
@Override
public void onDestroy() {
super.onDestroy();
sInstance = null;
- // 核心：停止LocalMotionDetector（避免传感器内存泄漏）
- if (mMotionDetector != null) {
- mMotionDetector.stopDetection();
- LogUtils.d(TAG, "LocalMotionDetector 已停止检测");
- }
-
- // 清理延迟Handler任务（避免内存泄漏）
- if (staticDelayHandler != null) {
- staticDelayHandler.removeCallbacksAndMessages(null);
- staticDelayHandler = null;
- }
-
- // 原有清理逻辑（已删除Receiver注销代码）
+ // 清理资源（Java 7 顺序调用，无Stream等特性）
stopGpsLocation();
- stopGpsStaticTimer();
clearAllData();
stopForeground(true);
+ // 清理所有监听者（Java 7 加锁+清空，避免内存泄漏）
synchronized (mListenerLock) {
mGpsListeners.clear();
mTaskListeners.clear();
}
+ // ---------------------- 关键新增：销毁任务校验定时器 ----------------------
+ destroyTaskCheckTimer();
+ // 销毁距离计算线程池（原有逻辑，补充确保线程安全）
if (distanceExecutor != null && !distanceExecutor.isShutdown()) {
distanceExecutor.shutdown();
}
+ // 重置状态变量
_mIsServiceRunning = false;
isGpsEnabled = false;
- isGpsListening = false;
- isDelaySwitching = false;
mLocationManager = null;
- LogUtils.d(TAG, "MainService 销毁完成，所有资源已清理");
}
// =========================================================================
- // 位置操作方法
+ // 位置操作方法（Java 7 语法，全迭代器/基础循环，无Java 8+特性）
// =========================================================================
+ /**
+ * 获取所有位置数据（返回原列表，供外部读取）
+ * @return 位置列表
+ */
public ArrayList getPositionList() {
return mPositionList;
}
+ /**
+ * 获取当前GPS位置
+ * @return 当前GPS定位模型（未获取时返回null）
+ */
public PositionModel getCurrentGpsPosition() {
return _mCurrentGpsPosition;
}
- public boolean isGpsListening() {
- return isGpsListening;
- }
-
+ /**
+ * 删除指定位置（Java 7 迭代器安全删除）
+ * @param targetPosId 待删除位置的ID
+ */
public void removePosition(String targetPosId) {
if (TextUtils.isEmpty(targetPosId) || mPositionList.isEmpty()) {
LogUtils.w(TAG, "removePosition：参数无效");
return;
}
+ // 迭代器遍历删除（Java 7 安全方式）
Iterator iter = mPositionList.iterator();
while (iter.hasNext()) {
PositionModel pos = iter.next();
@@ -529,11 +488,16 @@ public class MainService extends Service implements LocalMotionDetector.MotionSt
}
}
+ /**
+ * 更新位置数据（Java 7 基础for循环，无Stream筛选）
+ * @param updatedPos 更新后的位置模型
+ */
public void updatePosition(PositionModel updatedPos) {
if (updatedPos == null || TextUtils.isEmpty(updatedPos.getPositionId()) || mPositionList.isEmpty()) {
LogUtils.w(TAG, "updatePosition：参数无效");
return;
}
+ // 基础for循环查找并更新（Java 7 标准写法）
for (int i = 0; i < mPositionList.size(); i++) {
PositionModel oldPos = mPositionList.get(i);
if (updatedPos.getPositionId().equals(oldPos.getPositionId())) {
@@ -544,22 +508,32 @@ public class MainService extends Service implements LocalMotionDetector.MotionSt
}
}
+ /**
+ * 同步所有位置任务（全量替换，用于批量更新）
+ * @param newTaskList 新的任务列表
+ */
public void syncAllPositionTasks(ArrayList newTaskList) {
if (newTaskList == null) {
LogUtils.w(TAG, "syncAllPositionTasks：新列表为空");
return;
}
+ // 全量替换+持久化+通知（Java 7 基础集合操作）
mAllTasks.clear();
mAllTasks.addAll(newTaskList);
saveAllTasks();
notifyTaskUpdated();
}
+ /**
+ * 新增位置（Java 7 增强for循环去重，无Stream）
+ * @param newPos 待新增的位置模型
+ */
public void addPosition(PositionModel newPos) {
if (newPos == null) {
LogUtils.w(TAG, "addPosition：位置为空");
return;
}
+ // 位置去重（Java 7 增强for循环，无Stream.filter）
boolean isDuplicate = false;
for (PositionModel pos : mPositionList) {
if (newPos.getPositionId().equals(pos.getPositionId())) {
@@ -573,16 +547,25 @@ public class MainService extends Service implements LocalMotionDetector.MotionSt
}
}
+ /**
+ * 持久化位置数据（Java 7 静态方法调用，保持原逻辑）
+ */
void savePositionList() {
LogUtils.d(TAG, String.format("savePositionList : size=%d", mPositionList.size()));
PositionModel.saveBeanList(MainService.this, mPositionList, PositionModel.class);
}
+ /**
+ * 持久化任务数据（Java 7 静态方法调用，保持原逻辑）
+ */
public void saveAllTasks() {
LogUtils.d(TAG, String.format("saveTaskList : size=%d", mAllTasks.size()));
PositionTaskModel.saveBeanList(MainService.this, mAllTasks, PositionTaskModel.class);
}
+ /**
+ * 清空所有数据（位置+任务+GPS缓存，Java 7 集合clear方法）
+ */
public void clearAllData() {
mPositionList.clear();
mAllTasks.clear();
@@ -590,6 +573,10 @@ public class MainService extends Service implements LocalMotionDetector.MotionSt
LogUtils.d(TAG, "clearAllData：已清空所有数据");
}
+ /**
+ * 同步当前GPS位置（更新缓存+通知监听者+同步通知栏，全Java 7 语法）
+ * @param position 最新GPS位置模型
+ */
public void syncCurrentGpsPosition(PositionModel position) {
if (position == null) {
LogUtils.w(TAG, "syncCurrentGpsPosition：位置为空");
@@ -599,21 +586,27 @@ public class MainService extends Service implements LocalMotionDetector.MotionSt
LogUtils.d(TAG, "syncCurrentGpsPosition：成功（纬度=" + position.getLatitude() + "，经度=" + position.getLongitude() + "）");
notifyAllGpsListeners(position);
+ // 服务运行中才同步通知栏状态
if (_mIsServiceRunning) {
syncGpsStatusToNotification();
}
}
+ /**
+ * 同步GPS状态到前台通知（Java 7 匿名Runnable切换主线程，无Lambda）
+ */
private void syncGpsStatusToNotification() {
if (!_mIsServiceRunning || _mCurrentGpsPosition == null) {
return;
}
+ // 格式化通知内容（Java 7 String.format，无String.join等Java 8+方法）
final String gpsStatus = String.format(
- "GPS位置：北纬%.4f° 东经%.4f° | 可见位置：%d个",
- _mCurrentGpsPosition.getLatitude(),
- _mCurrentGpsPosition.getLongitude(),
- mVisiblePositionIds.size()
+ "GPS位置：北纬%.4f° 东经%.4f° | 可见位置：%d个",
+ _mCurrentGpsPosition.getLatitude(),
+ _mCurrentGpsPosition.getLongitude(),
+ mVisiblePositionIds.size()
);
+ // 主线程判断+切换（Java 7 匿名内部类）
if (Looper.myLooper() == Looper.getMainLooper()) {
NotificationUtil.updateForegroundServiceStatus(this, gpsStatus);
} else {
@@ -627,35 +620,54 @@ public class MainService extends Service implements LocalMotionDetector.MotionSt
}
+
+
// =========================================================================
- // 服务生命周期+辅助服务相关
+ // 服务生命周期+辅助服务相关（Java 7 语法，无Lambda/方法引用）
// =========================================================================
+ /**
+ * 服务启动命令（每次startService调用时触发，重启服务核心逻辑）
+ */
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
- boolean isSettingToEnable = false;
- if (intent != null) {
- isSettingToEnable = intent.getBooleanExtra(EXTRA_IS_SETTING_TO_ENABLE, false);
- if (isSettingToEnable) {
- run();
- }
- }
+ boolean isSettingToEnable = false;
+ if (intent != null) {
+ isSettingToEnable = intent.getBooleanExtra(EXTRA_IS_SETTING_TO_ENABLE, false);
+ if (isSettingToEnable) {
+ run(); // 重启服务核心逻辑（保证服务启动后进入运行状态）
+ }
+ }
+
+ // 如果被设置为自启动就返回START_STICKY：服务被异常杀死后，系统会尝试重启（原逻辑保留）
+ // 否则就启动默认参数
return isSettingToEnable ? Service.START_STICKY : super.onStartCommand(intent, flags, startId);
}
+ /**
+ * 服务连接内部类（Java 7 静态内部类，避免持有外部类强引用导致内存泄漏）
+ */
private class MyServiceConnection implements ServiceConnection {
@Override
- public void onServiceConnected(ComponentName name, IBinder service) {}
+ public void onServiceConnected(ComponentName name, IBinder service) {
+ // 原逻辑保留（空实现，如需绑定辅助服务可补充具体逻辑）
+ }
@Override
public void onServiceDisconnected(ComponentName name) {
+ // 辅助服务断开时，重新唤醒绑定（原逻辑保留）
if (mAppConfigsUtil.isEnableMainService(true)) {
wakeupAndBindAssistant();
}
}
}
+ /**
+ * 唤醒并绑定辅助服务（检查服务状态，未存活则启动+绑定）
+ */
void wakeupAndBindAssistant() {
+ // 检查辅助服务是否存活（Java 7 静态方法调用，无方法引用）
if (!ServiceUtil.isServiceAlive(getApplicationContext(), AssistantService.class.getName())) {
+ // 启动+绑定辅助服务（Java 7 显式Intent，无Lambda）
startService(new Intent(MainService.this, AssistantService.class));
bindService(new Intent(MainService.this, AssistantService.class), mMyServiceConnection, Context.BIND_IMPORTANT);
}
@@ -663,35 +675,45 @@ public class MainService extends Service implements LocalMotionDetector.MotionSt
// =========================================================================
- // GPS相关核心方法
+ // GPS相关核心方法（Java 7 语法，匿名内部类实现LocationListener，无Lambda）
// =========================================================================
+ /**
+ * 构造函数（Java 7 显式初始化线程池+GPS监听器，无默认构造函数简化）
+ */
public MainService() {
distanceExecutor = Executors.newSingleThreadScheduledExecutor();
initGpsLocationListener();
}
+ /**
+ * 初始化GPS监听器（Java 7 匿名内部类实现LocationListener，无Lambda）
+ */
private void initGpsLocationListener() {
LogUtils.d(TAG, "initGpsLocationListener");
mGpsLocationListener = new LocationListener() {
@Override
public void onLocationChanged(Location location) {
if (location != null) {
+ // 封装GPS位置为PositionModel（Java 7 显式setter调用）
PositionModel gpsPos = new PositionModel();
gpsPos.setLatitude(location.getLatitude());
gpsPos.setLongitude(location.getLongitude());
gpsPos.setPositionId("CURRENT_GPS_POS");
gpsPos.setMemo("实时GPS位置");
+ // 同步GPS位置+刷新距离+日志（原逻辑保留）
syncCurrentGpsPosition(gpsPos);
- DistanceCalculatorUtil.getInstance(MainService.this).checkAllTaskTriggerCondition(gpsPos);
+ DistanceCalculatorUtil.getInstance(MainService.this).checkAllTaskTriggerCondition(gpsPos);
LogUtils.d(TAG, "GPS位置更新：纬度=" + location.getLatitude() + "，经度=" + location.getLongitude());
}
}
@Override
public void onStatusChanged(String provider, int status, Bundle extras) {
+ // 仅处理GPS_PROVIDER状态变化（Java 7 基础判断）
if (provider.equals(LocationManager.GPS_PROVIDER)) {
String statusDesc = "";
+ // 状态枚举判断（Java 7 switch，无增强switch）
switch (status) {
case LocationProvider.AVAILABLE:
statusDesc = "GPS状态：已就绪（可用）";
@@ -711,20 +733,22 @@ public class MainService extends Service implements LocalMotionDetector.MotionSt
@Override
public void onProviderEnabled(String provider) {
+ // GPS启用时更新状态+通知+重启定位（Java 7 基础逻辑）
if (provider.equals(LocationManager.GPS_PROVIDER)) {
isGpsEnabled = true;
String statusDesc = "GPS已开启（用户手动打开）";
LogUtils.d(TAG, statusDesc);
notifyAllGpsStatusListeners(statusDesc);
- updateNotificationGpsStatus("GPS已开启，等待运动状态触发...");
+ updateNotificationGpsStatus("GPS已开启，正在获取位置...");
+ startGpsLocation();
}
}
@Override
public void onProviderDisabled(String provider) {
+ // GPS禁用时清空状态+通知+提示（Java 7 基础逻辑）
if (provider.equals(LocationManager.GPS_PROVIDER)) {
isGpsEnabled = false;
- isGpsListening = false;
_mCurrentGpsPosition = null;
String statusDesc = "GPS已关闭（用户手动关闭）";
LogUtils.w(TAG, statusDesc);
@@ -736,15 +760,23 @@ public class MainService extends Service implements LocalMotionDetector.MotionSt
};
}
+ /**
+ * 检查GPS就绪状态（权限+启用状态，Java 7 基础权限判断，无Stream）
+ * @return true=GPS就绪，false=未就绪
+ */
private boolean checkGpsReady() {
+ // 检查定位权限（Java 7 基础权限API，无权限请求框架依赖）
isGpsPermissionGranted = checkSelfPermission(android.Manifest.permission.ACCESS_FINE_LOCATION)
- == PackageManager.PERMISSION_GRANTED;
+ == PackageManager.PERMISSION_GRANTED;
+ // 初始化LocationManager（Java 7 显式判断，无Optional）
if (mLocationManager == null) {
- mLocationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
+ mLocationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
}
+ // 检查GPS是否启用（系统LocationManager API，Java 7 兼容）
isGpsEnabled = mLocationManager.isProviderEnabled(LocationManager.GPS_PROVIDER);
+ // 权限未授予：提示+日志+通知
if (!isGpsPermissionGranted) {
String tip = "GPS准备失败：缺少精确定位权限";
LogUtils.e(TAG, tip);
@@ -753,6 +785,7 @@ public class MainService extends Service implements LocalMotionDetector.MotionSt
ToastUtils.show("请授予定位权限，否则无法获取GPS位置");
return false;
}
+ // GPS未启用：提示+日志+通知
if (!isGpsEnabled) {
String tip = "GPS准备失败：系统GPS未开启";
LogUtils.e(TAG, tip);
@@ -766,24 +799,25 @@ public class MainService extends Service implements LocalMotionDetector.MotionSt
return true;
}
- // 启动GPS持续监听（运动状态回调调用）
- public void startGpsLocation() {
- if (!checkGpsReady() || isGpsListening) {
+ /**
+ * 启动GPS定位（Java 7 异常处理，无try-with-resources，显式捕获SecurityException）
+ */
+ private void startGpsLocation() {
+ if (!checkGpsReady()) {
return;
}
try {
+ // 注册GPS位置更新（Java 7 标准LocationManager API，指定Looper为主线程）
mLocationManager.requestLocationUpdates(
- LocationManager.GPS_PROVIDER,
- GPS_UPDATE_INTERVAL,
- GPS_UPDATE_DISTANCE,
- mGpsLocationListener,
- Looper.getMainLooper()
+ LocationManager.GPS_PROVIDER,
+ GPS_UPDATE_INTERVAL,
+ GPS_UPDATE_DISTANCE,
+ mGpsLocationListener,
+ Looper.getMainLooper()
);
- isGpsListening = true;
-
- // 获取最后已知位置
+ // 获取最后已知GPS位置（缓存位置，避免首次定位等待）
Location lastKnownLocation = mLocationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
if (lastKnownLocation != null) {
PositionModel lastGpsPos = new PositionModel();
@@ -800,59 +834,68 @@ public class MainService extends Service implements LocalMotionDetector.MotionSt
}
} catch (SecurityException e) {
+ // 定位权限异常（Java 7 显式捕获，无Lambda异常处理）
String error = "启动GPS失败（权限异常）：" + e.getMessage();
LogUtils.e(TAG, error);
notifyAllGpsStatusListeners(error);
isGpsPermissionGranted = false;
- isGpsListening = false;
updateNotificationGpsStatus("定位权限异常，无法获取GPS");
} catch (Exception e) {
+ // 其他异常（如LocationManager为空、系统服务异常等）
String error = "启动GPS失败：" + e.getMessage();
LogUtils.e(TAG, error);
notifyAllGpsStatusListeners(error);
- isGpsListening = false;
updateNotificationGpsStatus("GPS启动失败，尝试重试...");
}
}
- // 停止GPS持续监听（运动状态回调调用）
- public void stopGpsLocation() {
+ /**
+ * 停止GPS定位（Java 7 异常处理，移除监听器避免内存泄漏）
+ */
+ private void stopGpsLocation() {
+ // 校验参数：避免空指针+权限未授予时调用
if (mLocationManager != null && mGpsLocationListener != null && isGpsPermissionGranted) {
try {
mLocationManager.removeUpdates(mGpsLocationListener);
String tip = "GPS定位已停止（移除监听器）";
LogUtils.d(TAG, tip);
notifyAllGpsStatusListeners(tip);
- isGpsListening = false;
} catch (Exception e) {
String error = "停止GPS失败：" + e.getMessage();
LogUtils.e(TAG, error);
notifyAllGpsStatusListeners(error);
- isGpsListening = false;
}
}
}
- // 发送任务触发通知
+ /**
+ * 发送任务触发通知（更新前台通知+显示Toast，Java 7 匿名Runnable切换主线程）
+ * @param task 触发的任务
+ * @param bindPos 任务绑定的位置
+ * @param currentDistance 当前距离
+ */
public void sendTaskTriggerNotification(final PositionTaskModel task, PositionModel bindPos, double currentDistance) {
- if (!_mIsServiceRunning) {
- return;
- }
+ /*if (!_mIsServiceRunning) {
+ return;
+ }*/
+ // 格式化通知内容（Java 7 String.format，无TextBlock等Java 15+特性）
final String triggerContent = String.format(
- "任务触发：%s\n位置：%s\n当前距离：%.1f米（条件：%s%d米）",
- task.getTaskDescription(),
- bindPos.getMemo(),
- currentDistance,
- task.isGreaterThan() ? ">" : "<",
- task.getDiscussDistance()
+ "任务触发：%s\n位置：%s\n当前距离：%.1f米（条件：%s%d米）",
+ task.getTaskDescription(),
+ bindPos.getMemo(),
+ currentDistance,
+ task.isGreaterThan() ? ">" : "<",
+ task.getDiscussDistance()
);
+ // 更新前台通知（主线程判断+切换）
updateNotificationGpsStatus(triggerContent);
+ // 显示Toast（主线程安全调用，Java 7 匿名内部类）
if (Looper.myLooper() == Looper.getMainLooper()) {
ToastUtils.show(triggerContent);
- NotificationUtil.show(MainService.this, task.getTaskId(), task.getPositionId(), task.getTaskDescription());
+ NotificationUtil.show(MainService.this, task.getTaskId(), task.getPositionId(), task.getTaskDescription());
} else {
new Handler(Looper.getMainLooper()).post(new Runnable() {
@Override
@@ -865,9 +908,14 @@ public class MainService extends Service implements LocalMotionDetector.MotionSt
LogUtils.i(TAG, "任务触发通知：" + triggerContent);
}
- // 更新前台通知的GPS状态
+
+ /**
+ * 更新前台通知的GPS状态（Java 7 主线程切换，匿名Runnable实现）
+ * @param statusText 通知显示的状态文本
+ */
void updateNotificationGpsStatus(final String statusText) {
if (_mIsServiceRunning) {
+ // 判断当前线程是否为主线程，避免UI操作在子线程
if (Looper.myLooper() == Looper.getMainLooper()) {
NotificationUtil.updateForegroundServiceStatus(this, statusText);
} else {
@@ -883,8 +931,12 @@ public class MainService extends Service implements LocalMotionDetector.MotionSt
// =========================================================================
- // GPS监听通知相关方法
+ // GPS监听通知相关方法（Java 7 迭代器遍历弱引用集合，避免内存泄漏）
// =========================================================================
+ /**
+ * 通知所有GPS监听者位置更新（Java 7 迭代器+弱引用管理，无Stream）
+ * @param currentGpsPos 当前最新GPS位置
+ */
public void notifyAllGpsListeners(PositionModel currentGpsPos) {
if (currentGpsPos == null || mGpsListeners.isEmpty()) {
return;
@@ -896,89 +948,107 @@ public class MainService extends Service implements LocalMotionDetector.MotionSt
GpsUpdateListener listener = ref.get();
if (listener != null) {
notifySingleListener(listener, currentGpsPos);
- } else {
- iter.remove();
- }
- }
- }
- }
+ } else {
+ iter.remove(); // 清理已被GC回收的监听者，避免内存泄漏
+ }
+ }
+ }
+ }
- private void notifySingleListener(final GpsUpdateListener listener, final PositionModel currentGpsPos) {
- if (Looper.myLooper() == Looper.getMainLooper()) {
- listener.onGpsPositionUpdated(currentGpsPos);
- } else {
- new Handler(Looper.getMainLooper()).post(new Runnable() {
+ /**
+ * 通知单个GPS监听者位置更新（主线程安全，Java 7 匿名Runnable）
+ * @param listener 单个监听者
+ * @param currentGpsPos 当前GPS位置
+ */
+ private void notifySingleListener(final GpsUpdateListener listener, final PositionModel currentGpsPos) {
+ if (Looper.myLooper() == Looper.getMainLooper()) {
+ listener.onGpsPositionUpdated(currentGpsPos);
+ } else {
+ new Handler(Looper.getMainLooper()).post(new Runnable() {
@Override
public void run() {
listener.onGpsPositionUpdated(currentGpsPos);
}
});
- }
- }
+ }
+ }
- private void notifyAllGpsStatusListeners(final String status) {
- if (status == null || mGpsListeners.isEmpty()) {
- return;
- }
- synchronized (mListenerLock) {
- Iterator> iter = mGpsListeners.iterator();
- while (iter.hasNext()) {
- WeakReference ref = iter.next();
- final GpsUpdateListener listener = ref.get();
- if (listener != null) {
- if (Looper.myLooper() == Looper.getMainLooper()) {
- listener.onGpsStatusChanged(status);
- } else {
- new Handler(Looper.getMainLooper()).post(new Runnable() {
+ /**
+ * 通知所有GPS监听者状态变化（如GPS开启/关闭、信号弱等，Java 7 迭代器）
+ * @param status GPS状态描述文本
+ */
+ private void notifyAllGpsStatusListeners(final String status) {
+ if (status == null || mGpsListeners.isEmpty()) {
+ return;
+ }
+ synchronized (mListenerLock) {
+ Iterator> iter = mGpsListeners.iterator();
+ while (iter.hasNext()) {
+ WeakReference ref = iter.next();
+ final GpsUpdateListener listener = ref.get();
+ if (listener != null) {
+ // 主线程切换，避免监听者在子线程处理UI
+ if (Looper.myLooper() == Looper.getMainLooper()) {
+ listener.onGpsStatusChanged(status);
+ } else {
+ new Handler(Looper.getMainLooper()).post(new Runnable() {
@Override
public void run() {
listener.onGpsStatusChanged(status);
}
});
- }
- } else {
- iter.remove();
- }
- }
- }
- }
+ }
+ } else {
+ iter.remove(); // 清理无效弱引用
+ }
+ }
+ }
+ }
- public void registerGpsUpdateListener(GpsUpdateListener listener) {
- if (listener == null) {
- LogUtils.w(TAG, "registerGpsUpdateListener：监听者为空");
- return;
- }
- synchronized (mListenerLock) {
- mGpsListeners.add(new WeakReference(listener));
- LogUtils.d(TAG, "GPS监听注册成功，当前数量：" + mGpsListeners.size());
- if (_mCurrentGpsPosition != null) {
- notifySingleListener(listener, _mCurrentGpsPosition);
- }
- }
- }
+ /**
+ * 注册GPS更新监听（Java 7 弱引用添加，避免监听者内存泄漏）
+ * @param listener GPS更新监听者（如Activity/Adapter）
+ */
+ public void registerGpsUpdateListener(GpsUpdateListener listener) {
+ if (listener == null) {
+ LogUtils.w(TAG, "registerGpsUpdateListener：监听者为空");
+ return;
+ }
+ synchronized (mListenerLock) {
+ mGpsListeners.add(new WeakReference(listener));
+ LogUtils.d(TAG, "GPS监听注册成功，当前数量：" + mGpsListeners.size());
+ // 注册后立即推送当前GPS位置（避免监听者错过初始数据）
+ if (_mCurrentGpsPosition != null) {
+ notifySingleListener(listener, _mCurrentGpsPosition);
+ }
+ }
+ }
- public void unregisterGpsUpdateListener(GpsUpdateListener listener) {
- if (listener == null) {
- LogUtils.w(TAG, "unregisterGpsUpdateListener：监听者为空");
- return;
- }
- synchronized (mListenerLock) {
- Iterator> iter = mGpsListeners.iterator();
- while (iter.hasNext()) {
- WeakReference ref = iter.next();
- if (ref.get() == listener || ref.get() == null) {
- iter.remove();
- LogUtils.d(TAG, "GPS监听反注册成功，当前数量：" + mGpsListeners.size());
- break;
- }
- }
- }
- }
+ /**
+ * 反注册GPS更新监听（Java 7 迭代器清理，避免内存泄漏）
+ * @param listener 待反注册的GPS监听者
+ */
+ public void unregisterGpsUpdateListener(GpsUpdateListener listener) {
+ if (listener == null) {
+ LogUtils.w(TAG, "unregisterGpsUpdateListener：监听者为空");
+ return;
+ }
+ synchronized (mListenerLock) {
+ Iterator> iter = mGpsListeners.iterator();
+ while (iter.hasNext()) {
+ WeakReference ref = iter.next();
+ // 匹配目标监听者或已回收的弱引用，直接移除
+ if (ref.get() == listener || ref.get() == null) {
+ iter.remove();
+ LogUtils.d(TAG, "GPS监听反注册成功，当前数量：" + mGpsListeners.size());
+ break;
+ }
+ }
+ }
+ }
-
-// =========================================================================
-// LocalBinder 定义（无修改）
-// =========================================================================
+ // 补全 LocalBinder 定义（与 LocationActivity 中的 LocalBinder 保持一致）
+ // 注意：若 LocationActivity 已定义 LocalBinder，此处可删除；建议统一在 MainService 中定义，避免重复
public class LocalBinder extends android.os.Binder {
private MainService mService;
@@ -990,7 +1060,7 @@ public class MainService extends Service implements LocalMotionDetector.MotionSt
return mService;
}
}
+
}
-
diff --git a/positions/src/main/java/cc/winboll/studio/positions/utils/APPPlusUtils.java b/positions/src/main/java/cc/winboll/studio/positions/utils/APPPlusUtils.java
deleted file mode 100644
index d747445..0000000
--- a/positions/src/main/java/cc/winboll/studio/positions/utils/APPPlusUtils.java
+++ /dev/null
@@ -1,194 +0,0 @@
-package cc.winboll.studio.positions.utils;
-
-/**
- * @Author ZhanGSKen&豆包大模型
- * @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
- );
- }
- }
-}
-
diff --git a/positions/src/main/java/cc/winboll/studio/positions/utils/ActivityAliasUtils.java b/positions/src/main/java/cc/winboll/studio/positions/utils/ActivityAliasUtils.java
deleted file mode 100644
index 619e5e6..0000000
--- a/positions/src/main/java/cc/winboll/studio/positions/utils/ActivityAliasUtils.java
+++ /dev/null
@@ -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&豆包大模型
- * @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;
- }
- }
-}
-
diff --git a/positions/src/main/java/cc/winboll/studio/positions/utils/AppConfigsUtil.java b/positions/src/main/java/cc/winboll/studio/positions/utils/AppConfigsUtil.java
index 97b728f..3110de7 100644
--- a/positions/src/main/java/cc/winboll/studio/positions/utils/AppConfigsUtil.java
+++ b/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&豆包大模型
@@ -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();
- }
}
diff --git a/positions/src/main/java/cc/winboll/studio/positions/utils/JsonShareHandler.java b/positions/src/main/java/cc/winboll/studio/positions/utils/JsonShareHandler.java
deleted file mode 100644
index 13095c6..0000000
--- a/positions/src/main/java/cc/winboll/studio/positions/utils/JsonShareHandler.java
+++ /dev/null
@@ -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&豆包大模型
- * @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);
- }
-}
-
diff --git a/positions/src/main/java/cc/winboll/studio/positions/utils/LocalMotionDetector.java b/positions/src/main/java/cc/winboll/studio/positions/utils/LocalMotionDetector.java
deleted file mode 100644
index 0e2a186..0000000
--- a/positions/src/main/java/cc/winboll/studio/positions/utils/LocalMotionDetector.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package cc.winboll.studio.positions.utils;
-
-/**
- * @Author ZhanGSKen&豆包大模型
- * @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);
- }
-}
-
diff --git a/positions/src/main/java/cc/winboll/studio/positions/utils/MyActivityLifecycleCallbacks.java b/positions/src/main/java/cc/winboll/studio/positions/utils/MyActivityLifecycleCallbacks.java
deleted file mode 100644
index cfeb878..0000000
--- a/positions/src/main/java/cc/winboll/studio/positions/utils/MyActivityLifecycleCallbacks.java
+++ /dev/null
@@ -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&豆包大模型
- * @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");
- }
-}
diff --git a/positions/src/main/java/cc/winboll/studio/positions/views/HourglassView.java b/positions/src/main/java/cc/winboll/studio/positions/views/HourglassView.java
deleted file mode 100644
index 9eb3f95..0000000
--- a/positions/src/main/java/cc/winboll/studio/positions/views/HourglassView.java
+++ /dev/null
@@ -1,282 +0,0 @@
-package cc.winboll.studio.positions.views;
-
-/**
- * @Author ZhanGSKen&豆包大模型
- * @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;
- }
- }
-}
-
diff --git a/positions/src/main/java/cc/winboll/studio/positions/views/PositionTaskListView.java b/positions/src/main/java/cc/winboll/studio/positions/views/PositionTaskListView.java
index f0d147c..b9661b3 100644
--- a/positions/src/main/java/cc/winboll/studio/positions/views/PositionTaskListView.java
+++ b/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); // 开启开关
- }
-
// 绑定外层对话框内的控件
diff --git a/positions/src/main/res/drawable/ic_positions_plus.png b/positions/src/main/res/drawable/ic_positions_plus.png
deleted file mode 100644
index 4155d06..0000000
Binary files a/positions/src/main/res/drawable/ic_positions_plus.png and /dev/null differ
diff --git a/positions/src/main/res/layout/dialog_edit_task.xml b/positions/src/main/res/layout/dialog_edit_task.xml
index ec00b89..4dd0362 100644
--- a/positions/src/main/res/layout/dialog_edit_task.xml
+++ b/positions/src/main/res/layout/dialog_edit_task.xml
@@ -65,16 +65,6 @@
-
-
-
-
-
+
+
悟空笔记
- 时空任务
- 开疆扩土
- 返璞归真
- 余力不足
- 辎重难返
diff --git a/positions/src/main/res/values/strings.xml b/positions/src/main/res/values/strings.xml
index 3913fe0..495482a 100644
--- a/positions/src/main/res/values/strings.xml
+++ b/positions/src/main/res/values/strings.xml
@@ -1,8 +1,3 @@
Positions
- PositionsPlus
- Open APP Plus
- Close APP Plus
- APP Plus Open Disable
- APP Plus Close Disable
diff --git a/positions/src/main/res/xml/file_provider.xml b/positions/src/main/res/xml/file_provider.xml
deleted file mode 100644
index 802e4cc..0000000
--- a/positions/src/main/res/xml/file_provider.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
diff --git a/positions/src/main/res/xml/shortcutsmain.xml b/positions/src/main/res/xml/shortcutsmain.xml
deleted file mode 100644
index 5c0c0b4..0000000
--- a/positions/src/main/res/xml/shortcutsmain.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/positions/src/main/res/xml/shortcutsplus.xml b/positions/src/main/res/xml/shortcutsplus.xml
deleted file mode 100644
index a38aa91..0000000
--- a/positions/src/main/res/xml/shortcutsplus.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-