diff --git a/README.md b/README.md index 9f2c361..0a6f293 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,5 @@ ### 2022-2-10 > 1 学校重点人员添加网格信息 添加经纬度信息 -> 2 学校涉及案件添加网格、经纬度信息 \ No newline at end of file +> 2 学校涉及案件添加网格、经纬度信息 +> 3 网格员事件核查添加评分 \ No newline at end of file diff --git a/app/release/app-release.apk b/app/release/app-release.apk index c71cf48..b060f6c 100644 Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index c7d2471..018f3eb 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -10,8 +10,8 @@ { "type": "SINGLE", "filters": [], - "versionCode": 5, - "versionName": "1.0.4", + "versionCode": 6, + "versionName": "1.0.5", "outputFile": "app-release.apk" } ] diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java b/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java index a600b8c..ed3408f 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java @@ -520,4 +520,5 @@ public class PathConfig { public static final String PATH_MODULE_SUPERVISION_INCIDENT_CHECK_LIST = "/modulesupervision/activity/incidentDeptList";//事件核查 public static final String PATH_MODULE_SUPERVISION_INCIDENT_CHECK_DETAIL = "/modulesupervision/activity/incidentDeptListDetail";//事件核查详情 + public static final String PATH_MODULE_SUPERVISION_ACTIVITY_PETITION_DISPOSE_LIST = "/modulesupervision/activity/petitionDisposeList";//公众信访 } diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java index 458a568..7be2758 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java @@ -7,7 +7,7 @@ package com.tenlionsoft.baselib.core.retrofit_net; */ public class BaseUrlApi { - // public static final String IP = "http://192.168.0.155:7011/";/* 测试IP */ +// public static final String IP = "http://192.168.0.155:7011/";/* 测试IP */ // public static final String IP = "http://49.233.36.36:58091/";/* 测试IP */ public static final String IP = "http://1.24.238.149:37210/";/* 正式IP */ public static final String SYS_USERCENTER = "usercenter/"; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/utils/AesUtil.java b/baselib/src/main/java/com/tenlionsoft/baselib/utils/AesUtil.java index 86d0f47..6c2c760 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/utils/AesUtil.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/utils/AesUtil.java @@ -106,7 +106,7 @@ public class AesUtil { * @throws Exception */ public static String aesCommonDecoder(String key, String content) throws Exception { - byte[] encryptedBytes = Base64.decode(content,0); + byte[] encryptedBytes = Base64.decode(content, 0); byte[] enCodeFormat = key.getBytes(); SecretKeySpec secretKey = new SecretKeySpec(enCodeFormat, "AES"); byte[] initParam = IV_STRING.getBytes(); @@ -116,4 +116,26 @@ public class AesUtil { byte[] result = cipher.doFinal(encryptedBytes); return new String(result, "UTF-8"); } + + + // public static final byte[] a = new byte[]{ +// 120, 119, 57, 80, 52, 110, 102, 56, 114, 66, +// 75, 75, 65, 110, 119, 53}; + public static final byte[] a = new byte[]{ + 120, 119, 57, 80, 52, 110, 102, 56, 114, 66, + 75, 75, 65, 110, 119, 53}; + + public static String test(String paramString) { + byte[] arrayOfByte = "1234567890123456".getBytes(); + SecretKeySpec secretKeySpec = new SecretKeySpec(a, "AES"); + try { + Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding"); + cipher.init(1, secretKeySpec, new IvParameterSpec(arrayOfByte)); + byte[] bytes = cipher.doFinal(paramString.getBytes()); + return new String(Base64.encode(bytes, Base64.NO_PADDING), "UTF-8"); + } catch (Exception exception) { + exception.printStackTrace(); + return null; + } + } } diff --git a/build.gradle b/build.gradle index d34ef27..839e0f5 100644 --- a/build.gradle +++ b/build.gradle @@ -55,8 +55,8 @@ ext { gCompileSdkVersion = 30 gMinSdkVersion = 21 gTargetSdkVersion = 30 - gVersionCode = 5 - gVersionName = '1.0.4' + gVersionCode = 6 + gVersionName = '1.0.5' gBuildToolsVersion = "29.0.2" // gVersionCode=26 // gVersionName='1.3.0' diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentCheckDetailActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentCheckDetailActivity.java index bfe4b24..1e56dc2 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentCheckDetailActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentCheckDetailActivity.java @@ -65,6 +65,7 @@ import java.io.File; import java.util.ArrayList; import java.util.List; +import androidx.appcompat.widget.AppCompatRatingBar; import androidx.appcompat.widget.SwitchCompat; import androidx.cardview.widget.CardView; import androidx.core.widget.NestedScrollView; @@ -140,6 +141,8 @@ public class IncidentCheckDetailActivity extends BaseActivity { RadioGroup mRgWay; @BindView(R2.id.tmv_map) TextureMapView mTmvMap; + @BindView(R2.id.rb_star) + AppCompatRatingBar mRbStar; private Unbinder mBind; private String mId; @@ -154,6 +157,7 @@ public class IncidentCheckDetailActivity extends BaseActivity { private String mTaskId; private IncidentDetailBean mDetailBean; private String mSelPassType = "approved";//通过 不通过failed + private int mLevel; @Override protected int setLayoutId() { @@ -201,7 +205,7 @@ public class IncidentCheckDetailActivity extends BaseActivity { mRlvHandles.setAdapter(mHandleRecordAdapter); mSrlContent.setOnLoadMoreListener(refreshLayout -> doLoadMore()); mSrlContent.setOnRefreshListener(refreshLayout -> doRefresh()); - + mRbStar.setOnRatingBarChangeListener((ratingBar, rating, fromUser) -> mLevel = (int) rating); mPhotos.add(new AddPhotoBean()); mAddPhotoAdapter = new AddPhotoAdapter(mActivity, mPhotos); mRlvCheckPhotos.setLayoutManager(new GridLayoutManager(mActivity, 4)); @@ -394,6 +398,7 @@ public class IncidentCheckDetailActivity extends BaseActivity { String trim = mEtContent.getText().toString().trim(); bean.setCheckContent(trim); bean.setCheckPhotos(mPhotoIds); + bean.setCheckScore(mLevel + ""); Gson gson = new Gson(); String obj = gson.toJson(bean); RequestBody requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), obj); @@ -415,6 +420,10 @@ public class IncidentCheckDetailActivity extends BaseActivity { ToastUtils.show("请上传现场照片"); return false; } + if (mLevel == 0) { + ToastUtils.show("请选择评分"); + return false; + } return true; } diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentDetailActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentDetailActivity.java index 4af9e7a..202441c 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentDetailActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentDetailActivity.java @@ -176,6 +176,8 @@ public class IncidentDetailActivity extends BaseActivity { CardView mCvDispose; @BindView(R2.id.tmv_map) TextureMapView mTmvMap; + @BindView(R2.id.rb_star) + AppCompatRatingBar mRbStar; private Unbinder mBind; private String mId; private int mCurrentPage = 1; @@ -938,6 +940,7 @@ public class IncidentDetailActivity extends BaseActivity { paths.add(BaseUrlApi.BASE_IMG_URL + doorId); } } + mRbStar.setRating(bean.getCheckScope()); mAdapter.setData(paths); } diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/DisposeDetailBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/DisposeDetailBean.java index 926b835..c887b4d 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/DisposeDetailBean.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/DisposeDetailBean.java @@ -16,6 +16,15 @@ public class DisposeDetailBean { private String creatorName; private String gmtCreate; private String reportId; + private int checkScore; + + public int getCheckScope() { + return checkScore; + } + + public void setCheckScope(int checkScore) { + this.checkScore = checkScore; + } public String getCheckContent() { return checkContent; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveCheckBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveCheckBean.java index e0f9288..f4185b0 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveCheckBean.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveCheckBean.java @@ -13,6 +13,15 @@ public class SaveCheckBean { private String checkStatus; private String reportId; private String taskId; + private String checkScore; + + public String getCheckScore() { + return checkScore; + } + + public void setCheckScore(String checkScore) { + this.checkScore = checkScore; + } public String getCheckContent() { return checkContent; diff --git a/commonmodule/src/main/res/layout/activity_incident_check_detail.xml b/commonmodule/src/main/res/layout/activity_incident_check_detail.xml index 6d7bbb9..e66accd 100644 --- a/commonmodule/src/main/res/layout/activity_incident_check_detail.xml +++ b/commonmodule/src/main/res/layout/activity_incident_check_detail.xml @@ -189,7 +189,7 @@ + android:layout_height="200dp" /> @@ -364,6 +364,49 @@ android:text="核查内容" android:textStyle="bold" /> + + + + + + + + + + + + +