Merge remote-tracking branch 'origin/positions' into appbase

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Fri Sep 26 05:36:14 HKT 2025
-stageCount=9
+#Sat Sep 27 21:03:20 HKT 2025
+stageCount=10
 libraryProject=libappbase
 baseVersion=15.10
-publishVersion=15.10.8
+publishVersion=15.10.9
 buildCount=0
-baseBetaVersion=15.10.9
+baseBetaVersion=15.10.10

libappbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Fri Sep 26 05:36:14 HKT 2025
-stageCount=9
+#Sat Sep 27 21:03:08 HKT 2025
+stageCount=10
 libraryProject=libappbase
 baseVersion=15.10
-publishVersion=15.10.8
+publishVersion=15.10.9
 buildCount=0
-baseBetaVersion=15.10.9
+baseBetaVersion=15.10.10

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

@@ -22,12 +22,12 @@ public class GlobalApplication extends Application {
         GlobalApplication.isDebuging = isDebuging;
     }
     
-    public static void saveDebugStatus(GlobalApplication application) {
-        APPModel.saveBeanToFile(application.getAPPModelFilePath(application), new APPModel(GlobalApplication.isDebuging));
+    public static void saveDebugStatus(Context context) {
+        APPModel.saveBeanToFile(getAPPModelFilePath(context), new APPModel(GlobalApplication.isDebuging));
     }
 	
-    static String getAPPModelFilePath(GlobalApplication application) {
-        return application.getDataDir().getPath() + "/APPModel.json";
+    static String getAPPModelFilePath(Context context) {
+        return context.getDataDir().getPath() + "/APPModel.json";
     }
 
     public static boolean isDebuging() {

positions/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Oct 01 21:03:35 HKT 2025
-stageCount=6
+#Thu Oct 02 02:36:00 GMT 2025
+stageCount=8
 libraryProject=
 baseVersion=15.0
-publishVersion=15.0.5
-buildCount=0
-baseBetaVersion=15.0.6
+publishVersion=15.0.7
+buildCount=9
+baseBetaVersion=15.0.8

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/java/cc/winboll/studio/positions/MainActivity.java

@@ -1,5 +1,6 @@
 package cc.winboll.studio.positions;
 
+import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -9,7 +10,10 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.CompoundButton;
 import android.widget.Switch;
+import android.widget.Toast;
+import androidx.annotation.NonNull;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
 import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
 import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 import cc.winboll.studio.libappbase.LogUtils;
@@ -17,7 +21,6 @@ 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 com.hjq.toast.ToastUtils;
 
 /**
  * 主页面：仅负责
@@ -27,9 +30,10 @@ import com.hjq.toast.ToastUtils;
  */
 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_LOCATION_PERMISSIONS = 1001;
+	private static final int REQUEST_BACKGROUND_LOCATION_PERMISSION = 1002;
+	
     // UI 控件：服务控制开关、顶部工具栏
     private Switch mServiceSwitch;
 	private Button mManagePositionsButton;
@@ -37,7 +41,7 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {
     // 服务相关：服务实例、绑定状态标记
     //private DistanceRefreshService mDistanceService;
     private boolean isServiceBound = false;
-	
+
 
     @Override
     public Activity getActivity() {
@@ -110,7 +114,7 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {
         setSupportActionBar(mToolbar);
         // 给ActionBar设置标题（先判断非空，避免空指针异常）
         if (getSupportActionBar() != null) {
-            getSupportActionBar().setTitle("位置管理");
+            getSupportActionBar().setTitle(getString(R.string.app_name));
         }
     }
 
@@ -120,7 +124,7 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {
     private void initViews() {
         mServiceSwitch = (Switch) findViewById(R.id.switch_service_control); // 显式强转
 		mServiceSwitch.setChecked(AppConfigsUtil.getInstance(this).isEnableMainService(true));
-		
+
 		mManagePositionsButton = (Button) findViewById(R.id.btn_manage_positions);
 		mManagePositionsButton.setEnabled(mServiceSwitch.isChecked());
 
@@ -206,49 +210,57 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {
         return hasForegroundPerm && hasBackgroundPerm;
     }
 
-    /**
-     * 申请「前台+后台」位置权限（弹出系统权限弹窗，适配版本差异）
-     */
-    private void requestLocationPermissions() {
-        String[] permissions;
-        // Java7 显式版本判断：Android 10+ 需同时申请前台+后台权限
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            permissions = new String[]{
-				android.Manifest.permission.ACCESS_FINE_LOCATION,
-				android.Manifest.permission.ACCESS_BACKGROUND_LOCATION
-            };
-        } else {
-            // 低版本仅需申请前台权限
-            permissions = new String[]{android.Manifest.permission.ACCESS_FINE_LOCATION};
-        }
-        // 触发系统权限申请（Java7 显式调用requestPermissions，无方法引用）
-        requestPermissions(permissions, REQUEST_LOCATION_PERMISSIONS);
-    }
+	private void requestLocationPermissions() {
+		// 1. 先判断前台定位权限（ACCESS_FINE_LOCATION）是否已授予
+		if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION)
+            != PackageManager.PERMISSION_GRANTED) {
+			// 1.1 未授予前台权限：先申请前台权限（API 30+ 后台权限依赖前台权限）
+			String[] foregroundPermissions = new String[]{Manifest.permission.ACCESS_FINE_LOCATION};
+			// 对API 23+（Android 6.0）动态申请，低版本会直接授予（清单已声明前提下）
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+				requestPermissions(foregroundPermissions, REQUEST_LOCATION_PERMISSIONS);
+			}
+		} else {
+			// 2. 已授予前台权限：判断是否需要申请后台权限（仅API 29+需要）
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+				// 2.1 检查后台权限是否未授予
+				if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_BACKGROUND_LOCATION)
+                    != PackageManager.PERMISSION_GRANTED) {
+					// 2.2 API 30+ 必须单独申请后台权限（不能和前台权限一起弹框）
+					requestPermissions(
+                        new String[]{Manifest.permission.ACCESS_BACKGROUND_LOCATION},
+                        REQUEST_BACKGROUND_LOCATION_PERMISSION
+					);
+				}
+			}
+			// 3. 前台权限已授予（+ 后台权限按需授予）：此处可执行定位相关逻辑
+			// doLocationRelatedLogic(); 
+		}
+	}
 
-    /**
-     * 处理权限申请结果（系统弹窗用户选择后回调，Java7 显式重写方法）
-     */
-    @Override
-    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        // 仅处理位置权限的申请结果
-        if (requestCode == REQUEST_LOCATION_PERMISSIONS) {
-            boolean allGranted = true;
-            // Java7 显式for循环遍历结果（无增强for简化写法）
-            for (int i = 0; i < grantResults.length; i++) {
-                if (grantResults[i] != PackageManager.PERMISSION_GRANTED) {
-                    allGranted = false;
-                    break; // 有一个权限未通过，直接终止判断
-                }
-            }
+// 【必须补充】权限申请结果回调（处理用户同意/拒绝逻辑）
+	@Override
+	public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+		super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+		// 处理前台权限申请结果
+		if (requestCode == REQUEST_LOCATION_PERMISSIONS) {
+			if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+				// 前台权限同意：自动尝试申请后台权限（如果是API 29+）
+				requestLocationPermissions();
+			} else {
+				// 前台权限拒绝：提示用户（可选：引导跳转到应用设置页）
+				Toast.makeText(this, "需要前台定位权限才能使用该功能", Toast.LENGTH_SHORT).show();
+			}
+		} else if (requestCode == REQUEST_BACKGROUND_LOCATION_PERMISSION) {
+			if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+				// 后台权限同意：可执行后台定位逻辑
+				Toast.makeText(this, "已获得后台定位权限", Toast.LENGTH_SHORT).show();
+			} else {
+				// 后台权限拒绝：提示用户（可选：说明后台定位的用途，引导手动开启）
+				Toast.makeText(this, "拒绝后台权限将无法在后台持续定位", Toast.LENGTH_SHORT).show();
+			}
+		}
+	}
 
-            // 提示用户权限结果，并处理开关状态
-            if (allGranted) {
-                ToastUtils.show("已获取位置权限（含后台），可正常使用定位功能");
-            } else {
-                ToastUtils.show("位置权限未完全授予，无法后台获取GPS数据，请在设置中开启");
-            }
-        }
-    }
 }
 

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

@@ -22,6 +22,8 @@ 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 cc.winboll.studio.libappbase.ToastUtils;
+import cc.winboll.studio.positions.utils.AppConfigsUtil;
 
 /**
  * 核心调整说明：
@@ -61,11 +63,13 @@ public class LocationActivity extends WinBoLLActivity implements IWinBoLLActivit
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_location);
+		
+		LogUtils.d(TAG, "onCreate");
 
         // 1. 初始化服务实例（通过单例/全局方式，避免直接new导致数据重置）
         initServiceInstance();
         // 2. 检查服务状态（未运行/未初始化则提示关闭）
-        //checkServiceStatus();
+        checkServiceStatus();
         // 3. 初始化RecyclerView（布局+性能优化）
         initRecyclerViewConfig();
         // 4. 缓存服务数据（从服务PUBLIC方法获取，不访问私有字段）
@@ -112,27 +116,27 @@ public class LocationActivity extends WinBoLLActivity implements IWinBoLLActivit
             finish();
         }
     }
+	
 
     /**
      * 检查服务状态（替代原绑定检查，通过服务PUBLIC方法判断）
      */
     private void checkServiceStatus() {
+		LogUtils.d(TAG, "checkServiceStatus");
         // 1. 服务实例未初始化
         if (mMainService == null) {
             return; // 已在initServiceInstance中处理，此处避免重复finish
         }
 
         // 2. 检查服务运行状态（通过服务PUBLIC方法isServiceRunning()获取，不访问私有字段）
-//        if (!mMainService.isServiceRunning()) {
-//            // 服务未运行：手动触发启动（调用服务PUBLIC方法run()）
-//            mMainService.run();
-//            LogUtils.d(TAG, "服务未运行，已通过PUBLIC方法触发启动");
-//        }
+        if (!mMainService.isServiceRunning()) {
+            // 服务未运行：手动触发启动（调用服务PUBLIC方法run()）
+            mMainService.run();
+            LogUtils.d(TAG, "服务未运行，已通过PUBLIC方法触发启动");
+        }
 
         // 3. 检查SP中服务配置（双重校验，确保一致性）
-        SharedPreferences sp = getSharedPreferences(SP_SERVICE_CONFIG, Context.MODE_PRIVATE);
-        boolean isServiceConfigRunning = sp.getBoolean(KEY_SERVICE_RUNNING, false);
-        if (!isServiceConfigRunning) {
+        if (!AppConfigsUtil.getInstance(LocationActivity.this).isEnableMainService(true)) {
             Toast.makeText(this, "位置服务配置未启用，数据可能无法更新", Toast.LENGTH_SHORT).show();
         }
     }
@@ -142,6 +146,7 @@ public class LocationActivity extends WinBoLLActivity implements IWinBoLLActivit
      */
     private void cacheServiceData() {
         if (mMainService == null) {
+			ToastUtils.show("缓存数据失败：服务实例为空");
             LogUtils.e(TAG, "缓存数据失败：服务实例为空");
             mCachedPositionList = new ArrayList<PositionModel>();
             mCachedTaskList = new ArrayList<PositionTaskModel>();
@@ -156,6 +161,7 @@ public class LocationActivity extends WinBoLLActivity implements IWinBoLLActivit
         if (mCachedPositionList == null) mCachedPositionList = new ArrayList<PositionModel>();
         if (mCachedTaskList == null) mCachedTaskList = new ArrayList<PositionTaskModel>();
         
+		ToastUtils.show("缓存服务数据成功：位置数=" + mCachedPositionList.size() + "，任务数=" + mCachedTaskList.size());
         LogUtils.d(TAG, "缓存服务数据成功：位置数=" + mCachedPositionList.size() + "，任务数=" + mCachedTaskList.size());
     }
 
@@ -175,6 +181,7 @@ public class LocationActivity extends WinBoLLActivity implements IWinBoLLActivit
      * 初始化Adapter（通过缓存数据初始化，数据更新时同步调用服务方法）
      */
     private void initAdapter() {
+		LogUtils.d(TAG, "initAdapter");
         if (mCachedPositionList == null || mCachedTaskList == null) {
             LogUtils.e(TAG, "初始化Adapter失败：缓存数据为空");
             return;

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

@@ -107,7 +107,7 @@ public class MainService extends Service {
 
     }
 
-    private void run() {
+    public void run() {
         if (mAppConfigsUtil.isEnableMainService(true)) {
             if (_mIsServiceRunning == false) {
                 // 设置运行状态
@@ -135,6 +135,10 @@ public class MainService extends Service {
             }
         }
     }
+	
+	public boolean isServiceRunning() {
+		return _mIsServiceRunning;
+	}
 
     public interface SMSListener {
         void speakMessage();

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

@@ -53,11 +53,14 @@ public class AppConfigsUtil {
 		if (isReloadConfigs) {
 			loadConfigs();
 		}
-		
-		return mAppConfigsModel.isEnableMainService();
+
+		return (mAppConfigsModel == null) ?false: mAppConfigsModel.isEnableMainService();
 	}
 
 	public void setIsEnableMainService(boolean isEnableMainService) {
+		if(mAppConfigsModel == null) {
+			mAppConfigsModel = new AppConfigsModel();
+		}
 		mAppConfigsModel.setIsEnableMainService(isEnableMainService);
 		saveConfigs();
 	}

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

@@ -16,7 +16,7 @@
 	<Switch
 		android:id="@+id/switch_service_control"
 		android:layout_margin="16dp"
-		android:text="主要服务开关"
+		android:text="GPS服务开关"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"/>
 
@@ -25,7 +25,7 @@
 		android:layout_height="wrap_content"
 		android:layout_margin="16dp"
 		android:onClick="onPositions"
-		android:text="进入位置管理"
+		android:text="位置与任务管理"
 		android:id="@+id/btn_manage_positions"/>
 
 	<Button
@@ -33,7 +33,7 @@
 		android:layout_height="wrap_content"
 		android:layout_margin="16dp"
 		android:onClick="onLog"
-		android:text="查看操作日志"/>
+		android:text="查看应用日志"/>
 
 </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>