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-02-29 16:45:41 +08:00
parent 4f7d18f483
commit f6566cae7b
9 changed files with 124 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/gradle.xml Executable file → Normal file
View File

@ -4,10 +4,10 @@
<component name="GradleSettings">
<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="1.8" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />

8
.idea/inspectionProfiles/Project_Default.xml Normal file
View File

@ -0,0 +1,8 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="AutoCloseableResource" enabled="true" level="WARNING" enabled_by_default="true">
<option name="METHOD_MATCHER_CONFIG" value="java.util.Formatter,format,java.io.Writer,append,com.google.common.base.Preconditions,checkNotNull,org.hibernate.Session,close,java.io.PrintWriter,printf,java.io.PrintStream,printf,android.app.Activity,managedQuery" />
</inspection_tool>
</profile>
</component>

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

@ -0,0 +1,65 @@
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 Normal file
View File

@ -0,0 +1,4 @@
<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>

7
README.md
View File

@ -66,3 +66,10 @@
2.以人找房 以房找人
```
## 2024-3-1
```
> 1.5.2
1.案件上报不限图片
```

4
app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueDetailActivity.java
View File

@ -954,9 +954,9 @@ public class IssueDetailActivity extends BaseActivity {
mPhotoIds += (baseUserBean.getData() + ",");
mCurrentBean.setId(baseUserBean.getData());
mCurrentBean.setPath(picPath);
if (mPhotos.size() < 4) {
// if (mPhotos.size() < 4) { //限制上传数量
mPhotos.add(new AddPhotoBean());
}
// }
mPhotoAdapter.notifyDataSetChanged();
mCurrentBean = null;
}

25
app/src/main/java/com/sucstepsoft/realtimelocation/activitys/issue/IssueReportActivity.java
View File

@ -2,6 +2,7 @@ package com.sucstepsoft.realtimelocation.activitys.issue;
import android.app.ProgressDialog;
import android.content.BroadcastReceiver;
import android.content.ClipData;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
@ -489,6 +490,9 @@ public class IssueReportActivity extends BaseActivity {
ids += mPhotoAdapter.getData().get(i).getId() + ",";
}
}
if (ids.endsWith(",")) {
ids = ids.substring(0, ids.length() - 1);
}
body.setCasePhotos(ids);
if (!TextUtils.isEmpty(mVideoId)) {
body.setCaseAudio(mVideoId);
@ -904,6 +908,7 @@ public class IssueReportActivity extends BaseActivity {
public void choseAlbum() {
mCurrentBean = bean;
Intent intent = new Intent(Intent.ACTION_PICK, null);
// intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);//多选照片
intent.setDataAndType(MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
"image/*");
startActivityForResult(intent, BaseUrlApi.PHOTO_REQUEST);
@ -957,7 +962,23 @@ public class IssueReportActivity extends BaseActivity {
int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
cursor.moveToFirst();
String srcPath = cursor.getString(column_index);
LogUtils.e("单张:" + srcPath);
//TODO 多张图片
// ClipData clipData = data.getClipData();
// if (clipData != null) {
// for (int i = 0; i < clipData.getItemCount(); i++) {
// Uri imageUri = clipData.getItemAt(i).getUri();
// Cursor query = getContentResolver().query(imageUri, proj, null, null, null);
// int columnIndexOrThrow = query.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
// query.moveToFirst();
// String string = query.getString(columnIndexOrThrow);
// LogUtils.e("选择的图片:" + string);
// }
// } else {
// LogUtils.e("返回图片为空");
// }
uploadImg(srcPath, 2);
} catch (Exception e) {
e.printStackTrace();
}
@ -1057,9 +1078,9 @@ public class IssueReportActivity extends BaseActivity {
mPhotoIds += (baseUserBean.getData() + ",");
mCurrentBean.setId(baseUserBean.getData());
mCurrentBean.setPath(picPath);
if (mPhotos.size() < 4) {
// if (mPhotos.size() < 4) {//限制图片上传数量
mPhotos.add(new AddPhotoBean());
}
// }
mPhotoAdapter.notifyDataSetChanged();
mCurrentBean = null;
}

24
app/src/main/java/com/sucstepsoft/realtimelocation/activitys/mine/WorkLogAddActivity.java
View File

@ -1,13 +1,11 @@
package com.sucstepsoft.realtimelocation.activitys.mine;
import android.app.ProgressDialog;
import android.content.ContentResolver;
import android.content.Intent;
import android.database.Cursor;
import android.graphics.drawable.AnimationDrawable;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.provider.MediaStore;
import android.support.v4.content.FileProvider;
@ -25,7 +23,6 @@ import com.baidu.location.BDAbstractLocationListener;
import com.baidu.location.BDLocation;
import com.baidu.location.LocationClient;
import com.baidu.location.LocationClientOption;
import com.baidu.mapapi.map.TextureMapView;
import com.cjt2325.cameralibrary.videorecord.AudioRecordButton;
import com.cjt2325.cameralibrary.videorecord.MediaManager;
import com.google.gson.Gson;
@ -42,13 +39,9 @@ import com.sucstepsoft.cm_utils.utils.ToastUtils;
import com.sucstepsoft.cm_utils.utils.UIUtil;
import com.sucstepsoft.cm_utils.utils.UserLgUtils;
import com.sucstepsoft.realtimelocation.R;
import com.sucstepsoft.realtimelocation.activitys.base.MainActivity;
import com.sucstepsoft.realtimelocation.activitys.common.PhotoActivity;
import com.sucstepsoft.realtimelocation.activitys.issue.IssueReportActivity;
import com.sucstepsoft.realtimelocation.activitys.issue.TakePointActivity;
import com.sucstepsoft.realtimelocation.beans.AppTokenUser;
import com.sucstepsoft.realtimelocation.beans.BaseUserBean;
import com.sucstepsoft.realtimelocation.beans.IssueReportBody;
import com.sucstepsoft.realtimelocation.beans.SavaWorkLogBean;
import com.sucstepsoft.realtimelocation.beans.SuccessBean;
import com.sucstepsoft.realtimelocation.beans.WorkLogDetailBean;
@ -119,6 +112,7 @@ public class WorkLogAddActivity extends BaseActivity {
mId = getIntent().getStringExtra("id");
String title = getIntent().getStringExtra("title");
mTvBaseTitle.setText(title);
initBaseView();
if (TextUtils.isEmpty(mId)) {
startSignLocation();
mTvCurrentLoc.setClickable(true);
@ -131,7 +125,7 @@ public class WorkLogAddActivity extends BaseActivity {
mTvCurrentLoc.setFocusable(false);
getDetailById();
}
initBaseView();
}
/**
@ -195,9 +189,9 @@ public class WorkLogAddActivity extends BaseActivity {
mPhotos.add(0, bean1);
}
}
if (mPhotos.size() >= 5) {
mPhotos.remove(mPhotos.size() - 1);
}
// if (mPhotos.size() >= 5) {
// mPhotos.remove(mPhotos.size() - 1);
// }
mPhotoAdapter.notifyDataSetChanged();
refreshView(STATE_LOAD_SUCCESS);
}
@ -339,6 +333,10 @@ public class WorkLogAddActivity extends BaseActivity {
ids += mPhotoAdapter.getData().get(i).getId() + ",";
}
}
if (ids.endsWith(",")) {
ids = ids.substring(0, ids.length() - 1);
}
LogUtils.e(ids);
body.setPhoto(ids);
if (!TextUtils.isEmpty(mVideoId)) {
body.setVideo(mVideoId);
@ -573,9 +571,9 @@ public class WorkLogAddActivity extends BaseActivity {
mPhotoIds += (baseUserBean.getData() + ",");
mCurrentBean.setId(baseUserBean.getData());
mCurrentBean.setPath(picPath);
if (mPhotos.size() < 4) {
// if (mPhotos.size() < 4) { //限制上传图片数量
mPhotos.add(new AddPhotoBean());
}
// }
mPhotoAdapter.notifyDataSetChanged();
mCurrentBean = null;
}

1
app/src/main/res/layout/activity_work_sign.xml
View File

@ -67,6 +67,7 @@
android:paddingTop="5dp"
android:paddingRight="15dp"
android:paddingBottom="5dp"
android:visibility="gone"
android:text="记录"
android:textColor="@color/col_white_black" />