gaojian/realtimelocation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复在签到时为获取到当前定位时发生的空指针

Browse Source
This commit is contained in:
itgaojian 2024-09-19 10:16:19 +08:00
parent ba63dc318d
commit 9dca2eb1cc
7 changed files with 28 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.idea/deploymentTargetSelector.xml Normal file
View File

@ -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>

4
.idea/gradle.xml
View File

@ -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>

10
.idea/migrations.xml Normal file
View File

@ -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>

65
.idea/shelf/Uncommitted_changes_before_Checkout_at_2024_2_28,_10_46_[Default_Changelist]/shelved.patch
View File

@ -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>

4
.idea/shelf/Uncommitted_changes_before_Checkout_at_2024_2_28__10_46__Default_Changelist_.xml
View File

@ -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>

2
app/src/main/AndroidManifest.xml
View File

@ -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" /> <!-- 极光推送 -->

6
app/src/main/java/com/sucstepsoft/realtimelocation/activitys/common/WorkSignActivity.java
View File

@ -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) {
//已经签到,显示签退