From f3577c7e78ad7041d74c139eeceba9ccffa6214b Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Fri, 21 Mar 2025 21:21:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=8D=E5=8A=A1=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 positions/build.properties                    |  4 +-
 .../fragments/PositionsFragment.java          | 56 +++++++++++--------
 .../main/res/layout/fragment_positions.xml    |  8 +--
 3 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/positions/build.properties b/positions/build.properties
index 3c2d94e..c0cbb17 100644
--- a/positions/build.properties
+++ b/positions/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Fri Mar 21 13:06:16 GMT 2025
+#Fri Mar 21 13:19:51 GMT 2025
 stageCount=0
 libraryProject=
 baseVersion=1.0
 publishVersion=1.0.0
-buildCount=365
+buildCount=367
 baseBetaVersion=1.0.1
diff --git a/positions/src/main/java/cc/winboll/studio/positions/fragments/PositionsFragment.java b/positions/src/main/java/cc/winboll/studio/positions/fragments/PositionsFragment.java
index 21f5c9e..fcbd578 100644
--- a/positions/src/main/java/cc/winboll/studio/positions/fragments/PositionsFragment.java
+++ b/positions/src/main/java/cc/winboll/studio/positions/fragments/PositionsFragment.java
@@ -33,6 +33,7 @@ import cc.winboll.studio.positions.models.PostionFixModel;
 import cc.winboll.studio.positions.utils.LocationFusion;
 import cc.winboll.studio.positions.utils.TimeUtils;
 import android.widget.EditText;
+import android.widget.Switch;
 
 public class PositionsFragment extends Fragment {
 
@@ -52,6 +53,8 @@ public class PositionsFragment extends Fragment {
 
     EditText metLockLatitude;
     EditText metLockLongitude;
+    
+    Switch mswTaskService;
 
     double latitudeWifiLock;
     double longitudeWifiLock;
@@ -106,34 +109,21 @@ public class PositionsFragment extends Fragment {
 
         metLockLatitude = viewMain.findViewById(R.id.locklatitude_et);
         metLockLongitude = viewMain.findViewById(R.id.locklongitude_et);
+        metLockLatitude.setEnabled(false);
+        metLockLongitude.setEnabled(false);
 
 //        tvWifiLocation = viewMain.findViewById(R.id.wifi_position_tv);
 //        tvGPSLocation = viewMain.findViewById(R.id.gps_position_tv);
 //        tvFuseLocation = viewMain.findViewById(R.id.fuse_position_tv);
         locationManager = (LocationManager) getActivity().getSystemService(getActivity().LOCATION_SERVICE);
 
-        Button btnLockingPosition = viewMain.findViewById(R.id.locking_position_btn);
-        btnLockingPosition.setOnClickListener(new View.OnClickListener(){
-                @Override
-                public void onClick(View p1) {
-                    if (!metLockLatitude.getText().toString().trim().equals("")
-                        && !metLockLongitude.getText().toString().trim().equals("")) {
-                        _LocationPhoneGPSLock = new Location("User_Defined_GPS");
-                        _LocationPhoneGPSLock.setLatitude(Double.parseDouble(metLockLatitude.getText().toString()));
-                        _LocationPhoneGPSLock.setLongitude(Double.parseDouble(metLockLongitude.getText().toString()));
-                        ToastUtils.show("定位手动设定位置");
-                    } else {
-                        Location locationFix = fixGPSLocationFromPostionFixModel(_LocationPhoneGPS);
-                        //_LocationPhoneGPSLock = _LocationTX;
-                        _LocationPhoneGPSLock = locationFix;
-                        ToastUtils.show("定位GPS设定位置");
-                    }
-                    showLockPostionInfo();
-                    //ToastUtils.show(String.format("%s", locationFix.toString()));
-
-                    TXMSFragment.moveToLocation(_LocationPhoneGPSLock.getLatitude(), _LocationPhoneGPSLock.getLongitude());
-                }
-            });
+        mswTaskService = viewMain.findViewById(R.id.taskservice_sw);
+//        mswTaskService.setOnClickListener(new View.OnClickListener(){
+//                @Override
+//                public void onClick(View p1) {
+//                    
+//                }
+//            });
 
         // 请求GPS定位
         locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, phoneGPSLocationListener);
@@ -151,6 +141,25 @@ public class PositionsFragment extends Fragment {
 
         return viewMain;
     }
+    
+    void moveToCurrentLocation() {
+        if (!metLockLatitude.getText().toString().trim().equals("")
+            && !metLockLongitude.getText().toString().trim().equals("")) {
+            _LocationPhoneGPSLock = new Location("User_Defined_GPS");
+            _LocationPhoneGPSLock.setLatitude(Double.parseDouble(metLockLatitude.getText().toString()));
+            _LocationPhoneGPSLock.setLongitude(Double.parseDouble(metLockLongitude.getText().toString()));
+            ToastUtils.show("定位手动设定位置");
+        } else {
+            Location locationFix = fixGPSLocationFromPostionFixModel(_LocationPhoneGPS);
+            //_LocationPhoneGPSLock = _LocationTX;
+            _LocationPhoneGPSLock = locationFix;
+            ToastUtils.show("定位GPS设定位置");
+        }
+        showLockPostionInfo();
+        //ToastUtils.show(String.format("%s", locationFix.toString()));
+
+        TXMSFragment.moveToLocation(_LocationPhoneGPSLock.getLatitude(), _LocationPhoneGPSLock.getLongitude());
+    }
 
     void showLocationPhoneGPS() {
         if (_LocationPhoneGPS != null) {
@@ -356,6 +365,9 @@ public class PositionsFragment extends Fragment {
 //            LogUtils.d(TAG, szTemp);
             showLocationPhoneGPS();
             updatePostionFixModel();
+            if(mswTaskService.isChecked()) {
+                moveToCurrentLocation();
+            }
         }
     }
 
diff --git a/positions/src/main/res/layout/fragment_positions.xml b/positions/src/main/res/layout/fragment_positions.xml
index 8ea140e..2fdcbed 100644
--- a/positions/src/main/res/layout/fragment_positions.xml
+++ b/positions/src/main/res/layout/fragment_positions.xml
@@ -152,11 +152,11 @@
 
 			</LinearLayout>
 
-			<Button
-				android:layout_width="wrap_content"
+			<Switch
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:text="定位"
-				android:id="@+id/locking_position_btn"/>
+				android:text="启用提醒服务"
+				android:id="@+id/taskservice_sw"/>
 
 		</LinearLayout>