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 @@ + + + + + + + + + \ 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 @@ 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 @@ + + + + + + \ 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 -<+>\n\n \n \n \n \n \n \n \n \n \n \n -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 @@ -- - - - -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 @@ -- -- -- -- -- -- -\ No newline at end of file -Index: .idea/gradle.xml -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP -<+>\n\n \n \n \n \n -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 @@ - - 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 @@ - - \ 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" /> + android:value="1.5.2" /> 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) { //已经签到,显示签退