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

去除案件检查相片必填

Browse Source
This commit is contained in:
itgaojian163 2023-03-12 12:53:01 +08:00
parent 7a783cecc9
commit 23849d2903
3 changed files with 231 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -40,3 +40,11 @@
1.境外人员 字段变更 1.境外人员 字段变更
``` ```
## 2023-3-12
```
> 1.4.6
1.去除案件检查时相片必填选项
```

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

@ -8,7 +8,6 @@ import android.graphics.drawable.AnimationDrawable;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Environment; import android.os.Environment;
import android.print.PrintManager;
import android.provider.MediaStore; import android.provider.MediaStore;
import android.support.v4.content.FileProvider; import android.support.v4.content.FileProvider;
import android.support.v7.widget.GridLayoutManager; import android.support.v7.widget.GridLayoutManager;
@ -427,11 +426,13 @@ public class IssueDetailActivity extends BaseActivity {
String desc = mEtIssueDisDesc.getText().toString().trim(); String desc = mEtIssueDisDesc.getText().toString().trim();
//处理 //处理
String ids = ""; String ids = "";
if (mPhotoAdapter.getData() != null && mPhotoAdapter.getData().size() >= 2) {
for (int i = 0; i < mPhotoAdapter.getData().size(); i++) { for (int i = 0; i < mPhotoAdapter.getData().size(); i++) {
if (!TextUtils.isEmpty(mPhotoAdapter.getData().get(i).getId())) { if (!TextUtils.isEmpty(mPhotoAdapter.getData().get(i).getId())) {
ids += mPhotoAdapter.getData().get(i).getId() + ","; ids += mPhotoAdapter.getData().get(i).getId() + ",";
} }
} }
}
bean.setInspectPhotos(ids); bean.setInspectPhotos(ids);
bean.setInspectOpinion(desc); bean.setInspectOpinion(desc);
if (isAccept) { if (isAccept) {
@ -449,10 +450,10 @@ public class IssueDetailActivity extends BaseActivity {
* @return * @return
*/ */
private boolean checkInspectParams() { private boolean checkInspectParams() {
if (mPhotoAdapter.getData() == null || mPhotoAdapter.getData().size() <= 1) { // if (mPhotoAdapter.getData() == null || mPhotoAdapter.getData().size() <= 1) {
ToastUtils.showShort("请上传现场照片."); // ToastUtils.showShort("请上传现场照片.");
return false; // return false;
} // }
String desc = mEtIssueDisDesc.getText().toString().trim(); String desc = mEtIssueDisDesc.getText().toString().trim();
if (TextUtils.isEmpty(desc)) { if (TextUtils.isEmpty(desc)) {
ToastUtils.showShort("请输入检查描述内容."); ToastUtils.showShort("请输入检查描述内容.");

8
cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java
View File

@ -9,8 +9,8 @@ import com.sucstepsoft.cm_utils.constant.PathConfig;
*/ */
public class BaseUrlApi { public class BaseUrlApi {
// public static final String IP = "http://219.147.99.164:8082/usercenter/"; /*正式统一用户*/ public static final String IP = "http://219.147.99.164:8082/usercenter/"; /*正式统一用户*/
public static final String IP = "http://192.168.31.14:7001/usercenter/"; /*测试统一用户*/ // public static final String IP = "http://192.168.31.14:7001/usercenter/"; /*测试统一用户*/
// public static final String IP = "http://175.24.42.217:7000/usercenter/"; /*测试统一用户*/ // public static final String IP = "http://175.24.42.217:7000/usercenter/"; /*测试统一用户*/
public static final String BASE_URL = IP; public static final String BASE_URL = IP;
public static final String APP_VERSION = BASE_URL + "appCmVersionManagement/getAppVersion"; public static final String APP_VERSION = BASE_URL + "appCmVersionManagement/getAppVersion";
@ -18,9 +18,9 @@ public class BaseUrlApi {
public static final String FIELD_SAFETY = BASE_URL + "appFieldSafety/goFloorPlan"; public static final String FIELD_SAFETY = BASE_URL + "appFieldSafety/goFloorPlan";
public static final int PHOTO_REQUEST = 233; public static final int PHOTO_REQUEST = 233;
public static final int CAMERA_REQUEST = 123; public static final int CAMERA_REQUEST = 123;
// public static final String BASE_IP_P = "http://219.147.99.164:8082/"; /*正式IP*/ public static final String BASE_IP_P = "http://219.147.99.164:8082/"; /*正式IP*/
// public static final String BASE_IP_P = "http://175.24.42.217"; /*演示IP*/ // public static final String BASE_IP_P = "http://175.24.42.217"; /*演示IP*/
public static final String BASE_IP_P = "http://192.168.31.14:8083/"; /*测试IP*/ // public static final String BASE_IP_P = "http://192.168.31.14:8083/"; /*测试IP*/
public static final String BASE_IP = BASE_IP_P + "servicecity/";/*网格系统*/ public static final String BASE_IP = BASE_IP_P + "servicecity/";/*网格系统*/
// public static final String BASE_IP = "http://192.168.0.109:8083/servicecity/";/*测试网格系统*/ // public static final String BASE_IP = "http://192.168.0.109:8083/servicecity/";/*测试网格系统*/
public static final String BASE_POPULATION_IP = BASE_IP_P + "population/";/*人口系统*/ public static final String BASE_POPULATION_IP = BASE_IP_P + "population/";/*人口系统*/