From 9dca2eb1cc428a3bb194d94720b8b097b36d4fd3 Mon Sep 17 00:00:00 2001
From: itgaojian <itgaojian@163.com>
Date: Thu, 19 Sep 2024 10:16:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=A8=E7=AD=BE=E5=88=B0?=
 =?UTF-8?q?=E6=97=B6=E4=B8=BA=E8=8E=B7=E5=8F=96=E5=88=B0=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E6=97=B6=E5=8F=91=E7=94=9F=E7=9A=84=E7=A9=BA?=
 =?UTF-8?q?=E6=8C=87=E9=92=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetSelector.xml            | 10 +++
 .idea/gradle.xml                              |  4 +-
 .idea/migrations.xml                          | 10 +++
 .../shelved.patch                             | 65 -------------------
 ..._2024_2_28__10_46__Default_Changelist_.xml |  4 --
 app/src/main/AndroidManifest.xml              |  2 +-
 .../activitys/common/WorkSignActivity.java    |  6 +-
 7 files changed, 28 insertions(+), 73 deletions(-)
 create mode 100644 .idea/deploymentTargetSelector.xml
 create mode 100644 .idea/migrations.xml
 delete mode 100644 .idea/shelf/Uncommitted_changes_before_Checkout_at_2024_2_28,_10_46_[Default_Changelist]/shelved.patch
 delete mode 100644 .idea/shelf/Uncommitted_changes_before_Checkout_at_2024_2_28__10_46__Default_Changelist_.xml

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
new file mode 100644
index 0000000..b268ef3
--- /dev/null
+++ b/.idea/deploymentTargetSelector.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetSelector">
+    <selectionStates>
+      <SelectionState runConfigName="app">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+    </selectionStates>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 8243232..757fe3a 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,9 +5,8 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="delegatedBuild" value="false" />
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -16,6 +15,7 @@
             <option value="$PROJECT_DIR$/cm_utils" />
           </set>
         </option>
+        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
new file mode 100644
index 0000000..f8051a6
--- /dev/null
+++ b/.idea/migrations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2024_2_28,_10_46_[Default_Changelist]/shelved.patch b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2024_2_28,_10_46_[Default_Changelist]/shelved.patch
deleted file mode 100644
index d6fbc0d..0000000
--- a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2024_2_28,_10_46_[Default_Changelist]/shelved.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Index: .idea/misc.xml
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
-<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<project version=\"4\">\n  <component name=\"CMakeSettings\">\n    <configurations>\n      <configuration PROFILE_NAME=\"Debug\" CONFIG_NAME=\"Debug\" />\n    </configurations>\n  </component>\n  <component name=\"ProjectRootManager\" version=\"2\" languageLevel=\"JDK_1_8\" default=\"true\" project-jdk-name=\"JDK\" project-jdk-type=\"JavaSDK\">\n    <output url=\"file://$PROJECT_DIR$/build/classes\" />\n  </component>\n  <component name=\"ProjectType\">\n    <option name=\"id\" value=\"Android\" />\n  </component>\n</project>
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/.idea/misc.xml b/.idea/misc.xml
---- a/.idea/misc.xml	(revision a6247a1022302cdf8042c0552cc40004d22c4abf)
-+++ b/.idea/misc.xml	(date 1709086581076)
-@@ -1,4 +1,3 @@
--<?xml version="1.0" encoding="UTF-8"?>
- <project version="4">
-   <component name="CMakeSettings">
-     <configurations>
-Index: .idea/runConfigurations.xml
-===================================================================
-diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
-deleted file mode 100644
---- a/.idea/runConfigurations.xml	(revision a6247a1022302cdf8042c0552cc40004d22c4abf)
-+++ /dev/null	(revision a6247a1022302cdf8042c0552cc40004d22c4abf)
-@@ -1,12 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<project version="4">
--  <component name="RunConfigurationProducerService">
--    <option name="ignoredProducers">
--      <set>
--        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
--        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
--        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
--      </set>
--    </option>
--  </component>
--</project>
-\ No newline at end of file
-Index: .idea/gradle.xml
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
-<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<project version=\"4\">\n  <component name=\"GradleMigrationSettings\" migrationVersion=\"1\" />\n  <component name=\"GradleSettings\">\n    <option name=\"linkedExternalProjectsSettings\">\n      <GradleProjectSettings>\n        <option name=\"delegatedBuild\" value=\"false\" />\n        <option name=\"testRunner\" value=\"PLATFORM\" />\n        <option name=\"distributionType\" value=\"DEFAULT_WRAPPED\" />\n        <option name=\"externalProjectPath\" value=\"$PROJECT_DIR$\" />\n        <option name=\"modules\">\n          <set>\n            <option value=\"$PROJECT_DIR$\" />\n            <option value=\"$PROJECT_DIR$/app\" />\n            <option value=\"$PROJECT_DIR$/camera\" />\n            <option value=\"$PROJECT_DIR$/cm_utils\" />\n          </set>\n        </option>\n        <option name=\"resolveModulePerSourceSet\" value=\"false\" />\n      </GradleProjectSettings>\n    </option>\n  </component>\n</project>
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/.idea/gradle.xml b/.idea/gradle.xml
---- a/.idea/gradle.xml	(revision a6247a1022302cdf8042c0552cc40004d22c4abf)
-+++ b/.idea/gradle.xml	(date 1709086670731)
-@@ -5,9 +5,10 @@
-     <option name="linkedExternalProjectsSettings">
-       <GradleProjectSettings>
-         <option name="delegatedBuild" value="false" />
--        <option name="testRunner" value="PLATFORM" />
-+        <option name="testRunner" value="GRADLE" />
-         <option name="distributionType" value="DEFAULT_WRAPPED" />
-         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-+        <option name="gradleJvm" value="Embedded JDK" />
-         <option name="modules">
-           <set>
-             <option value="$PROJECT_DIR$" />
-@@ -16,7 +17,6 @@
-             <option value="$PROJECT_DIR$/cm_utils" />
-           </set>
-         </option>
--        <option name="resolveModulePerSourceSet" value="false" />
-       </GradleProjectSettings>
-     </option>
-   </component>
diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2024_2_28__10_46__Default_Changelist_.xml b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2024_2_28__10_46__Default_Changelist_.xml
deleted file mode 100644
index a1860cf..0000000
--- a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2024_2_28__10_46__Default_Changelist_.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<changelist name="Uncommitted_changes_before_Checkout_at_2024_2_28,_10_46_[Default_Changelist]" date="1709088412218" recycled="true" deleted="true">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Checkout_at_2024_2_28,_10_46_[Default_Changelist]/shelved.patch" />
-  <option name="DESCRIPTION" value="Uncommitted changes before Checkout at 2024/2/28, 10:46 [Default Changelist]" />
-</changelist>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 044776d..f703311 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -763,7 +763,7 @@
             android:value="ff95776367" />
         <meta-data
             android:name="BUGLY_APP_VERSION"
-            android:value="1.3.1" />
+            android:value="1.5.2" />
         <meta-data
             android:name="BUGLY_APP_CHANNEL"
             android:value="realtimelocation" /> <!-- 极光推送 -->
diff --git a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/common/WorkSignActivity.java b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/common/WorkSignActivity.java
index 23e5787..7932ed8 100644
--- a/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/common/WorkSignActivity.java
+++ b/app/src/main/java/com/sucstepsoft/realtimelocation/activitys/common/WorkSignActivity.java
@@ -189,7 +189,7 @@ public class WorkSignActivity extends BaseActivity {
         getCurrentTime();
         checkSign();
         mLlSign.setOnClickListener(v -> doSign());
-        mBtnSignRecord.setOnClickListener(v->startActivity(new Intent(mActivity,SignRecordActivity.class)));
+        mBtnSignRecord.setOnClickListener(v -> startActivity(new Intent(mActivity, SignRecordActivity.class)));
         refreshView(STATE_LOAD_SUCCESS);
 
     }
@@ -198,6 +198,10 @@ public class WorkSignActivity extends BaseActivity {
      * 签到或签退
      */
     private void doSign() {
+        if (mCurrent == null) {
+            ToastUtils.showShort("请稍等,当前定位获取中...");
+            return;
+        }
         if (mCanSign) {
             if (isSign) {
                 //已经签到,显示签退