<positions>APK 15.0.17 release Publish.

positions/README.md

@@ -2,6 +2,7 @@
 
 #### 介绍
 安卓位置应用，有关于地理位置的相关应用。
+PS:使用感言~~~『記低用唔到』。
 
 #### 软件架构
 适配安卓应用 [AIDE Pro] 的 Gradle 编译结构。

positions/build.gradle

@@ -46,6 +46,9 @@ android {
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
 	
+	// https://mvnrepository.com/artifact/com.jzxiang.pickerview/TimePickerDialog
+	api 'com.jzxiang.pickerview:TimePickerDialog:1.0.1'
+	
 	// 谷歌定位服务核心依赖（FusedLocationProviderClient所在库）
     api 'com.google.android.gms:play-services-location:21.0.1'
     
@@ -59,7 +62,7 @@ dependencies {
     // 应用介绍页类库
     api 'io.github.medyo:android-about-page:2.0.0'
     // 吐司类库
-    api 'com.github.getActivity:ToastUtils:10.5'
+    //api 'com.github.getActivity:ToastUtils:10.5'
     // 网络连接类库
     api 'com.squareup.okhttp3:okhttp:4.4.1'
     // AndroidX 类库

positions/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Fri Oct 03 23:10:42 HKT 2025
+#Tue Oct 28 20:03:59 HKT 2025
-stageCount=10
+stageCount=18
 libraryProject=
 baseVersion=15.0
-publishVersion=15.0.9
+publishVersion=15.0.17
 buildCount=0
-baseBetaVersion=15.0.10
+baseBetaVersion=15.0.18

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

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">寻龙记#</string>
+    <string name="app_name">悟空笔记#</string>
 </resources>

positions/src/main/AndroidManifest.xml

@@ -3,6 +3,9 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="cc.winboll.studio.positions">
 
+	<!-- 1. 声明GPS权限 -->
+	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+
     <!-- 前台服务权限（可选，提升后台定位稳定性，避免服务被回收） -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
@@ -61,6 +64,17 @@
         <service android:name=".services.AssistantService"/>
 
         <service android:name=".services.DistanceRefreshService"/>
+
+
+		<!-- 2. 注册运动状态Receiver -->
+		<receiver
+			android:name="cc.winboll.studio.positions.receivers.MotionStatusReceiver"
+			android:enabled="true"
+			android:exported="true">
+			<intent-filter>
+				<action android:name="cc.winboll.studio.positions.ACTION_MOTION_STATUS" />
+			</intent-filter>
+		</receiver>
     </application>
 
 </manifest>

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

@@ -22,9 +22,9 @@ import android.widget.HorizontalScrollView;
 import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
+import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 import cc.winboll.studio.libappbase.GlobalApplication;
-import com.hjq.toast.ToastUtils;
+import cc.winboll.studio.libappbase.ToastUtils;
-import com.hjq.toast.style.WhiteToastStyle;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
@@ -41,7 +41,6 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
-import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 
 public class App extends GlobalApplication {
 
@@ -58,8 +57,8 @@ public class App extends GlobalApplication {
         ToastUtils.init(this);
         // 设置 Toast 布局样式
         //ToastUtils.setView(R.layout.view_toast);
-        ToastUtils.setStyle(new WhiteToastStyle());
+        //ToastUtils.setStyle(new WhiteToastStyle());
-        ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
+        //ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
         
         //CrashHandler.getInstance().registerGlobal(this);
         //CrashHandler.getInstance().registerPart(this);

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

@@ -21,6 +21,7 @@ import cc.winboll.studio.positions.activities.LocationActivity;
 import cc.winboll.studio.positions.activities.WinBoLLActivity;
 import cc.winboll.studio.positions.services.MainService;
 import cc.winboll.studio.positions.utils.AppConfigsUtil;
+import cc.winboll.studio.positions.utils.ServiceUtil;
 
 /**
  * 主页面：仅负责
@@ -141,18 +142,11 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {
 					// 权限就绪：执行服务启停逻辑
 					if (isChecked) {
 						LogUtils.d(TAG, "设置启动服务");
-						AppConfigsUtil.getInstance(MainActivity.this).setIsEnableMainService(true);
+						ServiceUtil.startAutoService(MainActivity.this);
-						// 启动服务（startService确保服务独立运行，不受Activity绑定影响）
-						startService(new Intent(MainActivity.this, MainService.class));
 					} else {
 						LogUtils.d(TAG, "设置关闭服务");
-						AppConfigsUtil.getInstance(MainActivity.this).setIsEnableMainService(false);
+
-						// 停止服务前先解绑，避免服务被Activity持有
+						ServiceUtil.stopAutoService(MainActivity.this);
-//						if (isServiceBound) {
-//							unbindService(mServiceConn);
-//							isServiceBound = false;
-//						}
-						stopService(new Intent(MainActivity.this, MainService.class));
 					}
 
 					mManagePositionsButton.setEnabled(isChecked);

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

@@ -26,19 +26,22 @@ public class PositionTaskModel extends BaseBean {
 	boolean isLessThan;
 	// 任务条件距离（单位：米）
 	int discussDistance;
+	// 任务开始启用时间
+	long startTime;
 	// 任务是否已触发
 	boolean isBingo = false;
 	// 是否启用任务
 	boolean isEnable;
 
 	// 带参构造（强制传入positionId，确保任务与位置绑定）
-	public PositionTaskModel(String taskId, String positionId, String taskDescription, boolean isGreaterThan, int discussDistance, boolean isEnable) {
+	public PositionTaskModel(String taskId, String positionId, String taskDescription, boolean isGreaterThan, int discussDistance, long startTime, boolean isEnable) {
 		this.taskId = (taskId == null || taskId.trim().isEmpty()) ? genTaskId() : taskId; // 空ID自动生成
 		this.positionId = positionId; // 强制绑定位置ID
 		this.taskDescription = (taskDescription == null || taskDescription.trim().isEmpty()) ? "新任务" : taskDescription;
 		this.isGreaterThan = isGreaterThan;
 		this.isLessThan = !isGreaterThan; // 确保互斥
 		this.discussDistance = Math.max(discussDistance, 1); // 距离最小1米，避免无效值
+		this.startTime = startTime;
 		this.isEnable = isEnable;
 	}
 	
@@ -50,9 +53,18 @@ public class PositionTaskModel extends BaseBean {
 		this.isGreaterThan = true;
 		this.isLessThan = false; // 初始互斥
 		this.discussDistance = 100; // 默认100米
+		this.startTime = System.currentTimeMillis();
 		this.isEnable = true;
 	}
 
+	public void setStartTime(long startTime) {
+		this.startTime = startTime;
+	}
+
+	public long getStartTime() {
+		return startTime;
+	}
+
 	public void setIsBingo(boolean isBingo) {
 		this.isBingo = isBingo;
 	}
@@ -144,6 +156,7 @@ public class PositionTaskModel extends BaseBean {
 		jsonWriter.name("isGreaterThan").value(isGreaterThan());
 		jsonWriter.name("isLessThan").value(isLessThan());
 		jsonWriter.name("discussDistance").value(getDiscussDistance());
+		jsonWriter.name("startTime").value(getStartTime());
 		jsonWriter.name("isEnable").value(isEnable());
 	}
 
@@ -165,6 +178,8 @@ public class PositionTaskModel extends BaseBean {
 				setIsLessThan(jsonReader.nextBoolean());
 			} else if (name.equals("discussDistance")) {
 				setDiscussDistance(jsonReader.nextInt());
+			} else if (name.equals("startTime")) {
+				setStartTime(jsonReader.nextLong());
 			} else if (name.equals("isEnable")) {
 				setIsEnable(jsonReader.nextBoolean());
 			} else {

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

@@ -0,0 +1,124 @@
+package cc.winboll.studio.positions.receivers;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/10/28 19:07
+ * @Describe MotionStatusReceiver
+ */
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Build;
+import android.text.TextUtils;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.positions.services.MainService;
+import cc.winboll.studio.positions.utils.ServiceUtil;
+
+/**
+ * 运动状态监听Receiver
+ * 功能：接收运动状态广播，控制GPS权限申请与GPS监听开关
+ */
+public class MotionStatusReceiver extends BroadcastReceiver {
+	public static final String TAG = "MotionStatusReceiver";
+
+	// 运动状态广播Action（需与运动状态发送方保持一致，如传感器服务）
+	public static final String ACTION_MOTION_STATUS = "cc.winboll.studio.positions.ACTION_MOTION_STATUS";
+	// 运动状态Extra键：0=静止/低运动，1=行走/高运动
+	public static final String EXTRA_MOTION_STATUS = "EXTRA_MOTION_STATUS";
+	// 静止时GPS定时获取间隔（单位：分钟，可配置）
+	public static final long GPS_STATIC_INTERVAL = 1;
+
+	@Override
+	public void onReceive(Context context, Intent intent) {
+		if (context == null || intent == null || !TextUtils.equals(intent.getAction(), ACTION_MOTION_STATUS)) {
+			LogUtils.w(TAG, "无效广播：Action不匹配或上下文为空");
+			return;
+		}
+
+		// 1. 获取运动状态（0=静止/低运动，1=行走/高运动）
+		int motionStatus = intent.getIntExtra(EXTRA_MOTION_STATUS, 0);
+		LogUtils.d(TAG, "接收运动状态：" + (motionStatus == 1 ? "行走中" : "静止/低运动"));
+
+		// 2. 绑定并获取MainService实例（确保服务已启动）
+		MainService mainService = getMainService(context);
+		if (mainService == null) {
+			LogUtils.e(TAG, "MainService未启动，无法控制GPS状态");
+			return;
+		}
+
+		// 3. 根据运动状态处理GPS逻辑
+		if (motionStatus == 1) {
+			// 3.1 行走中：申请GPS权限（若未授予）+ 开启持续GPS监听
+			handleWalkingStatus(mainService, context);
+		} else {
+			// 3.2 静止/低运动：关闭持续GPS监听 + 启动定时GPS获取
+			handleStaticStatus(mainService);
+		}
+	}
+
+	/**
+	 * 处理行走状态：申请GPS权限+开启持续GPS监听
+	 */
+	private void handleWalkingStatus(MainService mainService, Context context) {
+		// 检查GPS权限（Android 6.0+动态权限）
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && 
+			context.checkSelfPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) 
+			!= PackageManager.PERMISSION_GRANTED) {
+			// 发送权限申请广播（由Activity接收并发起申请，Receiver无法直接申请权限）
+			Intent permissionIntent = new Intent("cc.winboll.studio.positions.ACTION_REQUEST_GPS_PERMISSION");
+			permissionIntent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
+			context.sendBroadcast(permissionIntent);
+			LogUtils.d(TAG, "行走中：GPS权限未授予，已发送权限申请广播");
+			return;
+		}
+
+		// 权限已授予：开启持续GPS监听（调用MainService原有方法）
+		if (!mainService.isGpsListening()) { // 需在MainService中新增isGpsListening()方法
+			mainService.startGpsLocation();
+			LogUtils.d(TAG, "行走中：已开启持续GPS监听");
+		}
+
+		// 停止静止时的GPS定时任务（避免重复获取）
+		mainService.stopGpsStaticTimer();
+	}
+
+	/**
+	 * 处理静止状态：关闭持续GPS监听+启动定时GPS获取
+	 */
+	private void handleStaticStatus(MainService mainService) {
+		// 关闭持续GPS监听（避免耗电）
+		if (mainService.isGpsListening()) {
+			mainService.stopGpsLocation();
+			LogUtils.d(TAG, "静止中：已关闭持续GPS监听");
+		}
+
+		// 启动定时GPS获取（获取一次后关闭，间隔GPS_STATIC_INTERVAL分钟）
+		mainService.startGpsStaticTimer(GPS_STATIC_INTERVAL);
+	}
+
+	/**
+	 * 获取MainService实例（通过绑定服务或单例，确保线程安全）
+	 */
+	private MainService getMainService(Context context) {
+		// 方式1：若MainService单例有效，直接获取（推荐）
+		MainService singleton = MainService.getInstance(context);
+		if (singleton != null && singleton.isServiceRunning()) {
+			return singleton;
+		}
+
+		// 方式2：若单例无效，尝试绑定服务（备用，需处理绑定回调）
+		if (!ServiceUtil.isServiceAlive(context, MainService.class.getName())) {
+			// 启动服务（若未运行）
+			context.startService(new Intent(context, MainService.class));
+			// 等待服务启动（短延时，实际项目建议用ServiceConnection异步绑定）
+			try {
+				Thread.sleep(500);
+			} catch (InterruptedException e) {
+				Thread.currentThread().interrupt();
+			}
+		}
+		return MainService.getInstance(context);
+	}
+}
+

positions/src/main/java/cc/winboll/studio/positions/services/AssistantService.java

@@ -18,7 +18,8 @@ import cc.winboll.studio.positions.utils.ServiceUtil;
 public class AssistantService extends Service {
 
     public final static String TAG = "AssistantService";
-
+	public static final String EXTRA_IS_SETTING_TO_ENABLE = "EXTRA_IS_SETTING_TO_ENABLE";
+	
     MyServiceConnection mMyServiceConnection;
     volatile boolean mIsServiceRunning;
     AppConfigsUtil mAppConfigsUtil;
@@ -37,13 +38,18 @@ public class AssistantService extends Service {
         }
         // 设置运行参数
         mIsServiceRunning = false;
-        run();
+        if (mAppConfigsUtil.isEnableMainService(true)) {
+			run();
+		}
     }
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        run();
+		if (mAppConfigsUtil.isEnableMainService(true)) {
-        return START_STICKY;
+			run();
+		}
+
+        return  mAppConfigsUtil.isEnableMainService(true) ? Service.START_STICKY : super.onStartCommand(intent, flags, startId);
     }
 
     @Override

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

@@ -41,11 +41,11 @@ public class AppConfigsUtil {
         return sInstance;
     }
 
-	void loadConfigs() {
+	public void loadConfigs() {
 		mAppConfigsModel = AppConfigsModel.loadBean(mContext, AppConfigsModel.class);
 	}
 
-	void saveConfigs() {
+	public void saveConfigs() {
 		AppConfigsModel.saveBean(mContext, mAppConfigsModel);
 	}
 

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

@@ -0,0 +1,45 @@
+package cc.winboll.studio.positions.utils;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/10/22 01:16
+ * @Describe DensityUtils
+ */
+
+import android.content.Context;
+import android.util.DisplayMetrics;
+import android.view.WindowManager;
+
+/**
+ * 屏幕密度工具类（dp/sp 转 px、获取屏幕尺寸）
+ */
+public class DensityUtils {
+	public static final String TAG = "DensityUtils";
+
+	/**
+	 * dp 转 px（根据屏幕密度）
+	 */
+	public static int dp2px(Context context, float dpValue) {
+		final float scale = context.getResources().getDisplayMetrics().density;
+		return (int) (dpValue * scale + 0.5f);
+	}
+
+	/**
+	 * sp 转 px（根据文字缩放比例）
+	 */
+	public static int sp2px(Context context, float spValue) {
+		final float scale = context.getResources().getDisplayMetrics().scaledDensity;
+		return (int) (spValue * scale + 0.5f);
+	}
+
+	/**
+	 * 获取屏幕宽度（像素）
+	 */
+	public static int getScreenWidth(Context context) {
+		WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+		DisplayMetrics dm = new DisplayMetrics();
+		wm.getDefaultDisplay().getMetrics(dm);
+		return dm.widthPixels;
+	}
+}
+

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

@@ -0,0 +1,246 @@
+package cc.winboll.studio.positions.utils;
+import android.content.Context;
+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.models.PositionModel;
+import cc.winboll.studio.positions.models.PositionTaskModel;
+import cc.winboll.studio.positions.services.MainService;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/10/27 18:40
+ * @Describe 距离计算工具集（单例模式）
+ */
+public class DistanceCalculatorUtil {
+
+    public static final String TAG = "DistanceCalculatorUtil";
+
+    // 1. 私有静态 volatile 实例：保证多线程下实例可见性，避免指令重排序导致的空指针
+    private static volatile DistanceCalculatorUtil sInstance;
+	Context mContext;
+	ArrayList<PositionModel> mPositionList;   // 位置数据列表
+    ArrayList<PositionTaskModel> mAllTasks;// 任务数据列表
+	PositionModel mGpsPositionCalculated;
+	long mLastCalculatedTime = 0;
+	long mMinCalculatedTimeBettween = 30000; // GPS数据更新时，两次计算之间的最小时间间隔
+	double mMinjumpDistance = 10.0f; // GPS数据更新时，能跳跃距离最小有效值，达到有效值时，两次计算之间的最小时间间隔阀值将被忽略。
+
+    // 2. 私有构造器：禁止外部通过 new 关键字创建实例，确保单例唯一性
+    private DistanceCalculatorUtil(Context context) {
+        // 可选：初始化工具类依赖的资源（如配置参数、缓存等）
+		mContext = context;
+
+        LogUtils.d(TAG, "DistanceCalculatorUtil 单例实例初始化");
+    }
+
+    // 3. 公开静态方法：双重校验锁获取单例，兼顾线程安全与性能
+    public static DistanceCalculatorUtil getInstance(Context context) {
+        // 第一重校验：避免已创建实例时的频繁加锁，提升性能
+        if (sInstance == null) {
+            // 加锁：确保多线程下仅一个线程进入实例创建逻辑
+            synchronized (DistanceCalculatorUtil.class) {
+                // 第二重校验：防止多线程并发时重复创建实例
+                if (sInstance == null) {
+                    sInstance = new DistanceCalculatorUtil(context);
+                }
+            }
+        }
+        return sInstance;
+    }
+
+    // ---------------------- 以下可补充距离计算相关工具方法 ----------------------
+    /**
+     * 示例：Haversine 公式计算两点间距离（单位：米）
+     * @param lat1 第一点纬度
+     * @param lon1 第一点经度
+     * @param lat2 第二点纬度
+     * @param lon2 第二点经度
+     * @return 两点间直线距离（米），计算失败返回 -1
+     */
+    public static double calculateHaversineDistance(double lat1, double lon1, double lat2, double lon2) {
+        try {
+            final double EARTH_RADIUS = 6371000; // 地球半径（米）
+            // 角度转弧度
+            double latDiff = Math.toRadians(lat2 - lat1);
+            double lonDiff = Math.toRadians(lon2 - lon1);
+
+            // Haversine 核心公式
+            double a = Math.sin(latDiff / 2) * Math.sin(latDiff / 2)
+				+ Math.cos(Math.toRadians(lat1)) * Math.cos(Math.toRadians(lat2))
+				* Math.sin(lonDiff / 2) * Math.sin(lonDiff / 2);
+            double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+
+            return EARTH_RADIUS * c; // 返回距离（米）
+        } catch (Exception e) {
+            LogUtils.d(TAG, "Haversine 距离计算失败：" + e.getMessage());
+            return -1; // 标记计算失败
+        }
+    }
+
+
+    /**
+     * 计算两点间距离（Haversine公式，纯Java 7 基础API，无数学工具类依赖）
+     * @param gpsLat GPS纬度
+     * @param gpsLon GPS经度
+     * @param posLat 目标位置纬度
+     * @param posLon 目标位置经度
+     * @return 两点间距离（单位：米）
+     */
+    /*private double calculateHaversineDistance(double gpsLat, double gpsLon, double posLat, double posLon) {
+	 final double EARTH_RADIUS = 6371000; // 地球半径（米）
+	 double latDiff = Math.toRadians(posLat - gpsLat);
+	 double lonDiff = Math.toRadians(posLon - gpsLon);
+	 // Haversine公式核心计算（Java 7 基础数学方法）
+	 double a = Math.sin(latDiff / 2) * Math.sin(latDiff / 2)
+	 + Math.cos(Math.toRadians(gpsLat)) * Math.cos(Math.toRadians(posLat))
+	 * Math.sin(lonDiff / 2) * Math.sin(lonDiff / 2);
+	 double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+	 return EARTH_RADIUS * c;
+	 }*/
+
+	/**
+     * 校验所有任务触发条件（距离达标则触发任务通知）
+     */
+    public void checkAllTaskTriggerCondition(PositionModel currentGpsPosition) {
+		if (currentGpsPosition == null) {
+			LogUtils.d(TAG, "传入坐标参数为空，退出函数。");
+			return;
+		}
+
+		// 计算频率控制模块
+		//
+		// 计算与最近一次GPS计算的时间间隔
+		long nCalculatedTimeBettween = System.currentTimeMillis() - mLastCalculatedTime;
+		// 计算跳跃距离
+		double gpsPositionCalculatedLatitude = mGpsPositionCalculated == null ?0.0f: mGpsPositionCalculated.getLatitude();
+		double gpsPositionCalculatedLongitude = mGpsPositionCalculated == null ?0.0f: mGpsPositionCalculated.getLongitude();
+		double jumpDistance = calculateHaversineDistance(gpsPositionCalculatedLatitude, gpsPositionCalculatedLongitude, currentGpsPosition.getLatitude(), currentGpsPosition.getLongitude());
+		if (jumpDistance < mMinjumpDistance) {
+			LogUtils.d(TAG, String.format("checkAllTaskTriggerCondition：跳跃距离%f，小于50米。", jumpDistance));
+			// 跳跃距离小于最小有效跳跃值
+			if (nCalculatedTimeBettween < mMinCalculatedTimeBettween) {
+				//间隔小于最小时间间隔设定
+				LogUtils.d(TAG, String.format("checkAllTaskTriggerCondition：与最近一次计算间隔时间%d，坐标变化忽略。", nCalculatedTimeBettween));
+				return;
+			}
+		}
+
+		if (mGpsPositionCalculated == null) {
+			mGpsPositionCalculated = currentGpsPosition;
+			LogUtils.d(TAG, "最后计算位置记录为空，现在使用新坐标为初始化。");
+		}
+
+		LogUtils.d(TAG, String.format("checkAllTaskTriggerCondition：跳跃距离%f，与上次计算间隔%d，现在启动任务数据计算。", jumpDistance, nCalculatedTimeBettween));
+
+		// 获取位置任务基础数据
+		MainService mainService = MainService.getInstance(mContext);
+		mPositionList = mainService.getPositionList();
+		mAllTasks = mainService.getAllTasks();
+
+		// 位置数据为空，跳过校验。
+        if (mPositionList.isEmpty()) {
+            LogUtils.d(TAG, "checkAllTaskTriggerCondition：位置数据为空，跳过距离计算。");
+            return;
+        }
+
+		// 更新所有位置点的位置距离数据
+		refreshRealPositionDistance(currentGpsPosition);
+
+		// 任务数据为空，跳过校验。
+        if (mAllTasks.isEmpty()) {
+            LogUtils.d(TAG, "checkAllTaskTriggerCondition：任务数据为空，跳过任务提醒检查计算。");
+            return;
+        }
+
+        // 迭代器遍历任务（Java 7 安全遍历，避免并发修改异常）
+        Iterator<PositionTaskModel> taskIter = mAllTasks.iterator();
+        while (taskIter.hasNext()) {
+            PositionTaskModel task = taskIter.next();
+            // 仅校验“已启用”且“绑定有效位置”的任务
+            if (!task.isEnable() || TextUtils.isEmpty(task.getPositionId())) {
+                continue;
+            }
+
+            // 查找任务绑定的位置（Java 7 迭代器遍历位置列表）
+            PositionModel bindPos = null;
+            Iterator<PositionModel> posIter = mPositionList.iterator();
+            while (posIter.hasNext()) {
+                PositionModel pos = posIter.next();
+                if (task.getPositionId().equals(pos.getPositionId())) {
+                    bindPos = pos;
+                    break;
+                }
+            }
+            if (bindPos == null) {
+                LogUtils.w(TAG, "任务ID=" + task.getTaskId() + "：绑定位置不存在，跳过");
+                task.setIsBingo(false);
+                continue;
+            }
+
+			// 校验任务开始时间
+			if (task.getStartTime() > System.currentTimeMillis()) {
+				continue;
+			}
+
+            // 校验距离条件（判断是否满足任务触发阈值）
+            double currentDistance = bindPos.getRealPositionDistance();
+            if (currentDistance < 0) {
+                LogUtils.w(TAG, "任务ID=" + task.getTaskId() + "：距离计算失败，跳过");
+                task.setIsBingo(false);
+                continue;
+            }
+
+            boolean isTriggered = false;
+            int taskDistance = task.getDiscussDistance();
+            // 任务触发条件：大于/小于指定距离（Java 7 基础判断，无三元运算符嵌套）
+            if (task.isGreaterThan()) {
+                isTriggered = currentDistance > taskDistance;
+            } else if (task.isLessThan()) {
+                isTriggered = currentDistance < taskDistance;
+            }
+
+            // 更新任务触发状态+发送通知（状态变化时才处理）
+            if (task.isBingo() != isTriggered) {
+                task.setIsBingo(isTriggered);
+                if (isTriggered) {
+                    MainService.getInstance(mContext).sendTaskTriggerNotification(task, bindPos, currentDistance);
+                }
+            }
+        }
+
+        MainService.getInstance(mContext).saveAllTasks(); // 持久化更新后的任务状态
+		// 记录最后坐标更新点
+		mGpsPositionCalculated = currentGpsPosition;
+		// 记录数据计算时间
+		mLastCalculatedTime = System.currentTimeMillis();
+    }
+
+
+    /**
+     * 强制刷新所有位置距离（GPS更新后调用，计算距离+校验任务触发条件）
+     */
+    public void refreshRealPositionDistance(PositionModel currentGpsPosition) {
+        // 遍历所有位置计算距离（Java 7 增强for循环，无Stream）
+        for (PositionModel pos : mPositionList) {
+            if (pos.isEnableRealPositionDistance()) {
+				double distance = DistanceCalculatorUtil.calculateHaversineDistance(
+					currentGpsPosition.getLatitude(),
+					currentGpsPosition.getLongitude(),
+					pos.getLatitude(),
+					pos.getLongitude()
+				);
+				pos.setRealPositionDistance(distance);
+            } else {
+                pos.setRealPositionDistance(-1); // 未启用距离计算，标记为无效
+            }
+        }
+
+        // 距离刷新后通知GPS监听者
+        MainService.getInstance(mContext).notifyAllGpsListeners(currentGpsPosition);
+    }
+}

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

@@ -7,6 +7,10 @@ package cc.winboll.studio.positions.utils;
  */
 import android.app.ActivityManager;
 import android.content.Context;
+import android.content.Intent;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.positions.services.AssistantService;
+import cc.winboll.studio.positions.services.MainService;
 import java.util.List;
 
 public class ServiceUtil {
@@ -31,4 +35,35 @@ public class ServiceUtil {
 
         return false;
     }
+
+	public static void stopAutoService(Context context) {
+		AppConfigsUtil appConfigsUtil = AppConfigsUtil.getInstance(context);
+		appConfigsUtil.setIsEnableMainService(false);
+		appConfigsUtil.saveConfigs();
+		// 关闭并设置主服务
+		Intent intent1 = new Intent(context, MainService.class);
+		intent1.putExtra(MainService.EXTRA_IS_SETTING_TO_ENABLE, false);
+		context.stopService(intent1); // 先停止旧服务
+		context.startService(intent1); // 传入新的启动标志位，返回给系统
+		// 关闭并设置主服务守护进程
+		Intent intent2 = new Intent(context, AssistantService.class);
+		intent2.putExtra(AssistantService.EXTRA_IS_SETTING_TO_ENABLE, false);
+		context.stopService(intent2); // 先停止旧服务
+		context.startService(intent2); // 传入新的启动标志位，返回给系统
+		// 再次关闭所有服务
+		context.stopService(intent1);
+		context.stopService(intent2);
+
+		LogUtils.d(TAG, "stopAutoService");
+	}
+
+	public static void startAutoService(Context context) {
+		AppConfigsUtil appConfigsUtil = AppConfigsUtil.getInstance(context);
+		appConfigsUtil.setIsEnableMainService(true);
+		appConfigsUtil.saveConfigs();
+		Intent intent = new Intent(context, MainService.class);
+		intent.putExtra(MainService.EXTRA_IS_SETTING_TO_ENABLE, true);
+		context.startService(intent);
+		LogUtils.d(TAG, "startAutoService");
+	}
 }

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

@@ -0,0 +1,254 @@
+package cc.winboll.studio.positions.views;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/10/22 02:15
+ * @Describe DateTimePickerPopup
+ */
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.NumberPicker;
+import android.widget.PopupWindow;
+import java.util.Calendar;
+import cc.winboll.studio.positions.R;
+import cc.winboll.studio.positions.utils.DensityUtils;
+
+/**
+ * 日期时间选择弹窗（竖直滚动行：年、月、日、时、分）
+ */
+public class DateTimePickerPopup extends PopupWindow {
+	public static final String TAG = "DateTimePickerPopup";
+
+    private Context mContext;
+    private NumberPicker mPickerYear;
+    private NumberPicker mPickerMonth;
+    private NumberPicker mPickerDay;
+    private NumberPicker mPickerHour;
+    private NumberPicker mPickerMinute;
+    private Button mBtnCancel;
+    private Button mBtnConfirm;
+    private OnDateTimeSelectedListener mListener;
+
+    // 时间范围默认值
+    private int mMinYear = 2000;
+    private int mMaxYear = Calendar.getInstance().get(Calendar.YEAR) + 10;
+    private int mMinMonth = 1;
+    private int mMaxMonth = 12;
+    private int mMinDay = 1;
+    private int mMaxDay = 31;
+    private int mMinHour = 0;
+    private int mMaxHour = 23;
+    private int mMinMinute = 0;
+    private int mMaxMinute = 59;
+
+    // 默认选中时间
+    private int mDefaultYear;
+    private int mDefaultMonth;
+    private int mDefaultDay;
+    private int mDefaultHour;
+    private int mDefaultMinute;
+
+    /**
+     * 日期时间选择回调
+     */
+    public interface OnDateTimeSelectedListener {
+        void onDateTimeSelected(int year, int month, int day, int hour, int minute);
+        void onCancel();
+    }
+
+    /**
+     * Builder 模式
+     */
+    public static class Builder {
+        private Context mContext;
+        private DateTimePickerPopup mPopup;
+
+        public Builder(Context context) {
+            this.mContext = context;
+            mPopup = new DateTimePickerPopup(context);
+            Calendar calendar = Calendar.getInstance();
+            mPopup.mDefaultYear = calendar.get(Calendar.YEAR);
+            mPopup.mDefaultMonth = calendar.get(Calendar.MONTH) + 1;
+            mPopup.mDefaultDay = calendar.get(Calendar.DAY_OF_MONTH);
+            mPopup.mDefaultHour = calendar.get(Calendar.HOUR_OF_DAY);
+            mPopup.mDefaultMinute = calendar.get(Calendar.MINUTE);
+        }
+
+        public Builder setDateTimeRange(int minYear, int maxYear, int minMonth, int maxMonth,
+                                       int minDay, int maxDay, int minHour, int maxHour,
+                                       int minMinute, int maxMinute) {
+            mPopup.mMinYear = minYear;
+            mPopup.mMaxYear = maxYear;
+            mPopup.mMinMonth = minMonth;
+            mPopup.mMaxMonth = maxMonth;
+            mPopup.mMinDay = minDay;
+            mPopup.mMaxDay = maxDay;
+            mPopup.mMinHour = minHour;
+            mPopup.mMaxHour = maxHour;
+            mPopup.mMinMinute = minMinute;
+            mPopup.mMaxMinute = maxMinute;
+            return this;
+        }
+
+        public Builder setDefaultDateTime(int year, int month, int day, int hour, int minute) {
+            mPopup.mDefaultYear = year;
+            mPopup.mDefaultMonth = month;
+            mPopup.mDefaultDay = day;
+            mPopup.mDefaultHour = hour;
+            mPopup.mDefaultMinute = minute;
+            return this;
+        }
+
+        public Builder setOnDateTimeSelectedListener(OnDateTimeSelectedListener listener) {
+            mPopup.mListener = listener;
+            return this;
+        }
+
+        public DateTimePickerPopup build() {
+            mPopup.initView();
+            mPopup.initPickers();
+            mPopup.bindButtonClick();
+            mPopup.setPopupStyle();
+            return mPopup;
+        }
+    }
+
+    private DateTimePickerPopup(Context context) {
+        super(context);
+        this.mContext = context;
+    }
+
+    private void initView() {
+        LayoutInflater inflater = LayoutInflater.from(mContext);
+        View rootView = inflater.inflate(R.layout.dialog_date_time_picker, null, false);
+        setContentView(rootView);
+
+        mPickerYear = (NumberPicker) rootView.findViewById(R.id.picker_year);
+        mPickerMonth = (NumberPicker) rootView.findViewById(R.id.picker_month);
+        mPickerDay = (NumberPicker) rootView.findViewById(R.id.picker_day);
+        mPickerHour = (NumberPicker) rootView.findViewById(R.id.picker_hour);
+        mPickerMinute = (NumberPicker) rootView.findViewById(R.id.picker_minute);
+        mBtnCancel = (Button) rootView.findViewById(R.id.btn_cancel);
+        mBtnConfirm = (Button) rootView.findViewById(R.id.btn_confirm);
+    }
+
+    private void initPickers() {
+        // 初始化年选择器
+        mPickerYear.setMinValue(mMinYear);
+        mPickerYear.setMaxValue(mMaxYear);
+        mPickerYear.setValue(mDefaultYear);
+        mPickerYear.setWrapSelectorWheel(false);
+
+        // 初始化月选择器
+        mPickerMonth.setMinValue(mMinMonth);
+        mPickerMonth.setMaxValue(mMaxMonth);
+        mPickerMonth.setValue(mDefaultMonth);
+        mPickerMonth.setWrapSelectorWheel(false);
+
+        // 初始化日选择器（根据年月动态调整范围）
+        updateDayRange(mDefaultYear, mDefaultMonth);
+        mPickerDay.setValue(mDefaultDay);
+        mPickerDay.setWrapSelectorWheel(false);
+
+        // 初始化时选择器
+        mPickerHour.setMinValue(mMinHour);
+        mPickerHour.setMaxValue(mMaxHour);
+        mPickerHour.setValue(mDefaultHour);
+        mPickerHour.setWrapSelectorWheel(false);
+
+        // 初始化分选择器
+        mPickerMinute.setMinValue(mMinMinute);
+        mPickerMinute.setMaxValue(mMaxMinute);
+        mPickerMinute.setValue(mDefaultMinute);
+        mPickerMinute.setWrapSelectorWheel(false);
+
+        // 年月变化时更新日范围（Java 7 匿名内部类）
+        mPickerYear.setOnValueChangedListener(new NumberPicker.OnValueChangeListener() {
+            @Override
+            public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
+                updateDayRange(newVal, mPickerMonth.getValue());
+            }
+        });
+
+        mPickerMonth.setOnValueChangedListener(new NumberPicker.OnValueChangeListener() {
+            @Override
+            public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
+                updateDayRange(mPickerYear.getValue(), newVal);
+            }
+        });
+    }
+
+    private void updateDayRange(int year, int month) {
+        int maxDay;
+        switch (month) {
+            case 2:
+                if ((year % 4 == 0 && year % 100 != 0) || year % 400 == 0) {
+                    maxDay = 29;
+                } else {
+                    maxDay = 28;
+                }
+                break;
+            case 4:
+            case 6:
+            case 9:
+            case 11:
+                maxDay = 30;
+                break;
+            default:
+                maxDay = 31;
+        }
+        mPickerDay.setMaxValue(maxDay);
+        if (mPickerDay.getValue() > maxDay) {
+            mPickerDay.setValue(maxDay);
+        }
+    }
+
+    private void bindButtonClick() {
+        // 取消按钮（Java 7 匿名内部类）
+        mBtnCancel.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dismiss();
+                if (mListener != null) {
+                    mListener.onCancel();
+                }
+            }
+        });
+
+        // 确认按钮（Java 7 匿名内部类）
+        mBtnConfirm.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                int year = mPickerYear.getValue();
+                int month = mPickerMonth.getValue();
+                int day = mPickerDay.getValue();
+                int hour = mPickerHour.getValue();
+                int minute = mPickerMinute.getValue();
+
+                if (mListener != null) {
+                    mListener.onDateTimeSelected(year, month, day, hour, minute);
+                }
+                dismiss();
+            }
+        });
+    }
+
+    private void setPopupStyle() {
+        int width = (int) (DensityUtils.getScreenWidth(mContext) * 0.85f);
+        int height = ViewGroup.LayoutParams.WRAP_CONTENT;
+
+        setWidth(width);
+        setHeight(height);
+        setFocusable(true);
+        setOutsideTouchable(true);
+        setBackgroundDrawable(mContext.getResources().getDrawable(R.drawable.bg_dialog_round));
+        setAnimationStyle(R.style.PopupDateTimePickerAnim);
+    }
+
+    public void showAsDropDown(View anchorView) {
+        super.showAsDropDown(anchorView, 0, DensityUtils.dp2px(mContext, 10));
+    }
+}

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

@@ -14,7 +14,6 @@ import android.widget.Button;
 import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.LinearLayout;
-import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -26,8 +25,14 @@ import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.positions.R;
 import cc.winboll.studio.positions.models.PositionTaskModel;
 import cc.winboll.studio.positions.services.MainService;
+import com.jzxiang.pickerview.TimePickerDialog;
+import com.jzxiang.pickerview.listener.OnDateSetListener;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 
 public class PositionTaskListView extends LinearLayout {
     // 视图模式常量
@@ -321,6 +326,7 @@ public class PositionTaskListView extends LinearLayout {
                 // 任务描述
                 String taskDesc = task.getTaskDescription() == null ? "未设置描述" : task.getTaskDescription();
                 simpleHolder.tvSimpleTaskDesc.setText(String.format("任务：%s", taskDesc));
+				simpleHolder.tvStartTime.setText(genSelectedTimeText(task.getStartTime()));
                 // 距离条件（大于/小于+距离值）
                 String distanceCond = task.isGreaterThan() ? "大于" : "小于";
                 simpleHolder.tvSimpleDistanceCond.setText(String.format("条件：距离 %s %d 米", distanceCond, task.getDiscussDistance()));
@@ -328,10 +334,7 @@ public class PositionTaskListView extends LinearLayout {
                 simpleHolder.tvSimpleIsEnable.setText(task.isEnable() ? "状态：已启用" : "状态：已禁用");
                 // isBingo红点（任务触发时显示，未触发时隐藏）
                 simpleHolder.vBingoDot.setVisibility(task.isBingo() ? View.VISIBLE : View.GONE);
-            }
+            } else if (holder instanceof TaskContentViewHolder) {
-
-            // 4. 编辑模式绑定（核心调整：所有修改操作后同步MainService）
-            else if (holder instanceof TaskContentViewHolder) {
                 TaskContentViewHolder contentHolder = (TaskContentViewHolder) holder;
                 bindEditModeTask(contentHolder, task, position);
             }
@@ -346,6 +349,7 @@ public class PositionTaskListView extends LinearLayout {
             holder.tvTaskDesc.setText(String.format("任务：%s", taskDesc));
             String distanceCond = task.isGreaterThan() ? "大于" : "小于";
             holder.tvTaskDistance.setText(String.format("条件：%s %d 米", distanceCond, task.getDiscussDistance()));
+			holder.tvStartTime.setText(genSelectedTimeText(task.getStartTime()));
 
             // 4.2 绑定“启用开关”（修复：先解绑监听→设值→再绑定监听，避免设值触发回调）
             holder.cbTaskEnable.setOnCheckedChangeListener(null);
@@ -372,10 +376,11 @@ public class PositionTaskListView extends LinearLayout {
 							LogUtils.d(TAG, "调用MainService删除任务：ID=" + task.getTaskId() + "（位置ID=" + mBindPositionId + "）");
 
 							// 步骤2：从Adapter数据源移除任务（避免等待同步，立即反馈UI）
-							mAdapterData.remove(position);
+							//mAdapterData.remove(position);
 							// 步骤3：刷新Adapter（局部刷新+范围通知，避免列表错乱）
 							notifyItemRemoved(position);
 							notifyItemRangeChanged(position, mAdapterData.size());
+							
 							LogUtils.d(TAG, "Adapter已移除任务，刷新列表（位置索引=" + position + "）");
 
 							// 步骤4：通知外部（如Activity）任务已更新
@@ -452,12 +457,20 @@ 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());
+			String formattedDateTime = sdf.format(new Date(timeMillis)); // Date 需导入 java.util.Date
+
+			return formattedDateTime;
+		}
 
         /**
          * 编辑任务弹窗（核心：保存修改→同步MainService→刷新Adapter）
          */
         private void showEditTaskDialog(final PositionTaskModel task, final int position) {
-            Context context = getContext();
+            final Context context = getContext();
             if (context == null) {
                 LogUtils.w(TAG, "编辑弹窗无法显示：上下文为空");
                 return;
@@ -468,9 +481,72 @@ public class PositionTaskListView extends LinearLayout {
             final EditText etEditDesc = dialogView.findViewById(R.id.et_edit_task_desc);
             final RadioGroup rgDistanceCondition = dialogView.findViewById(R.id.rg_distance_condition);
             final EditText etEditDistance = dialogView.findViewById(R.id.et_edit_distance);
-            Button btnCancel = dialogView.findViewById(R.id.btn_dialog_cancel);
+			Button btnCancel = dialogView.findViewById(R.id.btn_dialog_cancel);
             Button btnSave = dialogView.findViewById(R.id.btn_dialog_save);
 
+
+			// 绑定外层对话框内的控件
+			final Button btnSelectTime = (Button) dialogView.findViewById(R.id.btn_select_time);
+			final TextView tv_SelectedTime = (TextView) dialogView.findViewById(R.id.tv_selected_time);
+
+			tv_SelectedTime.setText(genSelectedTimeText(task.getStartTime()));
+
+			// 核心：从 long 时间戳解析年月日时分，用于初始化弹窗
+			// --------------------------
+			Calendar initCalendar = Calendar.getInstance();
+			initCalendar.setTimeInMillis(task.getStartTime()); // 将 long 时间戳传入 Calendar
+
+			// 从 Calendar 中解析出年月日时分（对应弹窗需要的参数格式）
+			int initYear = initCalendar.get(Calendar.YEAR);
+			int initMonth = initCalendar.get(Calendar.MONTH) + 1; // 关键：Calendar 月份0-11，转成1-12
+			int initDay = initCalendar.get(Calendar.DAY_OF_MONTH);
+			int initHour = initCalendar.get(Calendar.HOUR_OF_DAY); // 24小时制
+			int initMinute = initCalendar.get(Calendar.MINUTE);
+
+			// 初始化弹窗，用解析出的年月日时分设置默认选中时间
+			final DateTimePickerPopup dateTimePopup = new DateTimePickerPopup.Builder(context)
+				.setDateTimeRange(2020, 2030, 1, 12, 1, 31, 0, 23, 0, 59)
+				// 用 long 时间戳解析出的参数设置初始时间
+				.setDefaultDateTime(initYear, initMonth, initDay, initHour, initMinute)
+				.setOnDateTimeSelectedListener(new DateTimePickerPopup.OnDateTimeSelectedListener() {
+					@Override
+					public void onDateTimeSelected(int year, int month, int day, int hour, int minute) {
+						// 处理选择的日期时间
+						// 1. 创建 Calendar 实例（用于组装日期时间）
+						Calendar calendar = Calendar.getInstance();
+						// 2. 设置 Calendar 的年、月、日、时、分（注意：Calendar 月份从 0 开始，需减 1）
+						calendar.set(Calendar.YEAR, year);
+						calendar.set(Calendar.MONTH, month - 1); // 关键：传入的 month 是 1-12，需转为 0-11
+						calendar.set(Calendar.DAY_OF_MONTH, day);
+						calendar.set(Calendar.HOUR_OF_DAY, hour); // 24小时制，对应参数中的 hour（0-23）
+						calendar.set(Calendar.MINUTE, minute);
+						calendar.set(Calendar.SECOND, 0); // 秒默认设为 0，避免随机值
+						calendar.set(Calendar.MILLISECOND, 0); // 毫秒默认设为 0，确保时间戳精确
+
+						// 3. 转为 long 类型时间戳（单位：毫秒，从 1970-01-01 00:00:00 开始计算）
+						long timeMillis = calendar.getTimeInMillis();
+
+						// 4. 后续使用（示例：打印时间戳或传递给其他逻辑）
+						tv_SelectedTime.setText(genSelectedTimeText(timeMillis));
+						task.setStartTime(timeMillis);
+					}
+
+					@Override
+					public void onCancel() {
+						// 处理取消操作
+					}
+				})
+				.build();
+
+			// 3. “选择时间”按钮点击事件（弹出 TimePickerPopup）
+			btnSelectTime.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(final View v) {
+						dateTimePopup.showAsDropDown(btnSelectTime);
+					}
+				});
+
+
             // 初始化弹窗数据（填充当前任务信息）
             etEditDesc.setText(task.getTaskDescription() == null ? "" : task.getTaskDescription());
             etEditDesc.setSelection(etEditDesc.getText().length()); // 光标定位到末尾
@@ -489,6 +565,14 @@ public class PositionTaskListView extends LinearLayout {
 				.create();
             dialog.show();
 
+
+
+			final OnDateSetListener onSateSetListener = new OnDateSetListener(){
+				@Override
+				public void onDateSet(TimePickerDialog timePickerDialog, long p) {
+				}
+			};
+
             // 取消按钮：关闭弹窗（不做操作）
             btnCancel.setOnClickListener(new View.OnClickListener() {
 					@Override
@@ -583,6 +667,7 @@ public class PositionTaskListView extends LinearLayout {
         public class SimpleTaskViewHolder extends TaskViewHolder {
             TextView tvSimpleTaskDesc;    // 任务描述
             TextView tvSimpleDistanceCond;// 距离条件（大于/小于+距离）
+			TextView tvStartTime;
             TextView tvSimpleIsEnable;    // 启用状态（已启用/已禁用）
             View vBingoDot;               // isBingo红点（任务触发时显示）
 
@@ -591,6 +676,7 @@ public class PositionTaskListView extends LinearLayout {
                 // 绑定简单模式布局控件（与XML控件ID严格对应）
                 tvSimpleTaskDesc = itemView.findViewById(R.id.tv_simple_task_desc);
                 tvSimpleDistanceCond = itemView.findViewById(R.id.tv_simple_distance_cond);
+				tvStartTime = itemView.findViewById(R.id.tv_starttime);
                 tvSimpleIsEnable = itemView.findViewById(R.id.tv_simple_is_enable);
                 vBingoDot = itemView.findViewById(R.id.v_bingo_dot);
             }
@@ -600,6 +686,7 @@ public class PositionTaskListView extends LinearLayout {
         public class TaskContentViewHolder extends TaskViewHolder {
             TextView tvTaskDesc;         // 任务描述
             TextView tvTaskDistance;     // 距离条件
+			TextView tvStartTime;
             CompoundButton cbTaskEnable; // 启用开关
             Button btnEditTask;          // 编辑按钮
             Button btnDeleteTask;        // 删除按钮
@@ -609,6 +696,7 @@ public class PositionTaskListView extends LinearLayout {
                 // 绑定编辑模式布局控件（与XML控件ID严格对应）
                 tvTaskDesc = itemView.findViewById(R.id.tv_task_desc);
                 tvTaskDistance = itemView.findViewById(R.id.tv_task_distance);
+				tvStartTime = itemView.findViewById(R.id.tv_starttime);
                 cbTaskEnable = itemView.findViewById(R.id.cb_task_enable);
                 btnEditTask = itemView.findViewById(R.id.btn_edit_task);
                 btnDeleteTask = itemView.findViewById(R.id.btn_delete_task);

positions/src/main/res/anim/popup_date_time_picker_in.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="300">
+    <translate
+        android:fromYDelta="50%"
+        android:toYDelta="0%"
+        android:interpolator="@android:anim/decelerate_interpolator" />
+    <alpha
+        android:fromAlpha="0.6"
+        android:toAlpha="1.0"
+        android:interpolator="@android:anim/decelerate_interpolator" />
+</set>

positions/src/main/res/anim/popup_date_time_picker_out.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="250">
+    <translate
+        android:fromYDelta="0%"
+        android:toYDelta="50%"
+        android:interpolator="@android:anim/accelerate_interpolator" />
+    <alpha
+        android:fromAlpha="1.0"
+        android:toAlpha="0.6"
+        android:interpolator="@android:anim/accelerate_interpolator" />
+</set>

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

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <!-- 白色背景 -->
+    <solid android:color="#FFFFFF" />
+    <!-- 圆角（12dp，可根据需求调整） -->
+    <corners android:radius="12dp" />
+    <!-- 轻微阴影（增强层次感） -->
+    <stroke
+        android:width="1dp"
+        android:color="#00000008" /> <!-- 透明黑色阴影，避免生硬 -->
+</shape>
+

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

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <!-- 透明背景 -->
+    <solid android:color="#00000000" />
+    <!-- 灰色边框（与取消按钮文字同色） -->
+    <stroke
+        android:width="1dp"
+        android:color="#FF333333" />
+    <!-- 圆角（与弹窗一致，12dp） -->
+    <corners android:radius="12dp" />
+</shape>
+

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <!-- 填充色（示例深灰色，可改为 #FF007AFF 等主题色） -->
+    <solid android:color="#FF333333" />
+    <!-- 圆角（与弹窗一致） -->
+    <corners android:radius="12dp" />
+</shape>
+

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

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="16dp"
+    android:background="@drawable/bg_dialog_round">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center">
+
+        <NumberPicker
+            android:id="@+id/picker_year"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <NumberPicker
+            android:id="@+id/picker_month"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <NumberPicker
+            android:id="@+id/picker_day"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <NumberPicker
+            android:id="@+id/picker_hour"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <NumberPicker
+            android:id="@+id/picker_minute"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="end"
+        android:layout_marginTop="16dp"
+        android:spacing="12dp">
+
+        <Button
+            android:id="@+id/btn_cancel"
+            android:layout_width="wrap_content"
+            android:layout_height="42dp"
+            android:minWidth="80dp"
+            android:background="@drawable/btn_dialog_cancel"
+            android:text="取消"
+            android:textSize="16sp" />
+
+        <Button
+            android:id="@+id/btn_confirm"
+            android:layout_width="wrap_content"
+            android:layout_height="42dp"
+            android:minWidth="80dp"
+            android:background="@drawable/btn_dialog_confirm"
+            android:text="确认"
+            android:textSize="16sp"
+            android:textColor="@android:color/white" />
+    </LinearLayout>
+</LinearLayout>
+

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

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

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

@@ -92,7 +92,7 @@
         android:padding="8dp"
         android:background="@drawable/edittext_bg"
         android:layout_marginBottom="10dp"/>
-
+	
     <!-- 5. 启用状态（单选组：是/否） -->
     <LinearLayout
         android:layout_width="wrap_content"

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

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

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

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

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

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">寻龙记</string>
+    <string name="app_name">悟空笔记</string>
 </resources>

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

@@ -29,5 +29,11 @@
 	<!-- 扩展颜色（避免后续新增功能时再次缺失） -->
 	<color name="green">#4CAF50</color> <!-- 绿色（备用：如“启用”状态标识） -->
 	<color name="yellow">#FFC107</color> <!-- 黄色（备用：如“提醒”标识） -->
-
+    <color name="color_text_primary">#333333</color>
+    <color name="color_gray">#999999</color>
+    <color name="color_gray_light">#F5F5F5</color>
+    <color name="color_shadow">#1A000000</color>
+    <color name="color_primary">#2196F3</color> <!-- 主题蓝 -->
+    <color name="color_primary_dark">#1976D2</color> <!-- 主题蓝加深 -->
+	
 </resources>

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

@@ -8,4 +8,10 @@
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
+	<style name="PopupDateTimePickerAnim" parent="android:Animation">
+		<item name="android:windowEnterAnimation">@anim/popup_date_time_picker_in</item>
+		<item name="android:windowExitAnimation">@anim/popup_date_time_picker_out</item>
+	</style>
+
+
 </resources>