From cf518aeda9c26e2ce0f1897bf0ee22af282521ca Mon Sep 17 00:00:00 2001 From: chenglifeng Date: Sun, 29 Sep 2024 20:00:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85=E9=85=8D=E7=BD=AE=EF=BC=8C?= =?UTF-8?q?=E6=B7=B7=E6=B7=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 11 ++++- app/gradle.properties | 8 ++++ app/proguard-rules.pro | 26 ++++++++--- .../project/survey/logic/bean/ListResult.kt | 3 ++ .../com/project/survey/logic/event/Message.kt | 2 + .../project/survey/model/ApprovalResponse.kt | 4 ++ .../project/survey/model/ControlNetBean.kt | 45 ++++++++++--------- .../project/survey/model/ControlNetCGBean.kt | 3 ++ .../survey/model/ControlNetListBean.kt | 3 ++ .../survey/model/ControlNetVersionBean.kt | 3 ++ .../project/survey/model/LoftingListBean.kt | 3 ++ .../com/project/survey/model/LoginBean.kt | 2 + .../survey/model/PointMeasureListBean.kt | 3 ++ .../com/project/survey/model/ProjectBean.kt | 2 + .../project/survey/model/TextStyleBean.java | 2 + .../com/project/survey/network/HttpResult.kt | 3 ++ .../survey/network/ResponseThrowable.kt | 2 + .../project/survey/network/RetrofitClient.kt | 2 +- .../survey/ui/approval/ApprovalActivity.kt | 2 +- .../survey/ui/login/LoginInputCodeActivity.kt | 7 +-- .../survey/ui/project/ProjectListFragment.kt | 2 +- .../com/project/survey/util/param/Param.java | 3 ++ 22 files changed, 107 insertions(+), 34 deletions(-) create mode 100644 app/gradle.properties diff --git a/app/build.gradle b/app/build.gradle index 1373839..a138c10 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -44,7 +44,7 @@ android { } productFlavors { - shanghai { + shsx { def versionUtils = new SurveyorVersionUtils(project) versionCode versionUtils.versionCode + 0 versionName versionUtils.versionName @@ -55,6 +55,12 @@ android { debug { storeFile file('./debug.keystore') } + release { + storeFile file(StoreFile) + storePassword StorePassword + keyAlias KeyAlias + keyPassword KeyPassword + } } buildTypes { @@ -67,6 +73,7 @@ android { minifyEnabled true shrinkResources true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.release } } @@ -76,7 +83,7 @@ android { abi { enable true reset() - include 'arm64-v8a', 'armeabi-v7a'//,'armeabi-v7a', 'x86'//, 'x86_64', 'mips','armeabi', + include 'arm64-v8a' //'armeabi-v7a', 'x86'//, 'x86_64', 'mips','armeabi', } } diff --git a/app/gradle.properties b/app/gradle.properties new file mode 100644 index 0000000..3c98b6a --- /dev/null +++ b/app/gradle.properties @@ -0,0 +1,8 @@ +StoreFile = release.jks +StorePassword = com.shsx.survey.2024 +KeyAlias = shsx +KeyPassword = com.shsx.survey.2024 +#StoreFile = heike.keystore +#StorePassword = heike6868 +#KeyAlias = heike +#KeyPassword = heike6868 \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index c8f43e2..821f81c 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -160,12 +160,21 @@ public static final int *; -keepclassmembers class blankj.utilcode.** { *; } -dontwarn blankj.utilcode.** --keep class com.chad.library.adapter.** { +#-keep class com.chad.library.adapter.** { +#*; +#} +#-keep public class * extends com.chad.library.adapter.base.BaseQuickAdapter +#-keep public class * extends com.chad.library.adapter.base.BaseViewHolder +#-keepclassmembers class **$** extends com.chad.library.adapter.base.BaseViewHolder { +# (...); +#} + +-keep class com.chad.library.adapter4.** { *; } --keep public class * extends com.chad.library.adapter.base.BaseQuickAdapter --keep public class * extends com.chad.library.adapter.base.BaseViewHolder --keepclassmembers class **$** extends com.chad.library.adapter.base.BaseViewHolder { +-keep public class * extends com.chad.library.adapter4.BaseQuickAdapter +-keep public class * extends com.chad.library.adapter4.viewholder.QuickViewHolder +-keepclassmembers class **$** extends com.chad.library.adapter4.viewholder.QuickViewHolder { (...); } @@ -273,4 +282,11 @@ public static final int *; -keep class com.bingce.event.WxLoginSuccessEvent{ *; } # 友盟 - -keep class com.umeng.** {*;} \ No newline at end of file + -keep class com.umeng.** {*;} + +# Param +-keep class com.project.survey.util.param.Param { *; } +-keepattributes *Param* +-keepclassmembers class com.project.survey.model.** { *; } +-keepclassmembers class com.project.survey.logic.bean.** { *; } +-keepclassmembers class com.project.survey.logic.event.** { *; } diff --git a/app/src/main/java/com/project/survey/logic/bean/ListResult.kt b/app/src/main/java/com/project/survey/logic/bean/ListResult.kt index 965d0c6..d75a696 100644 --- a/app/src/main/java/com/project/survey/logic/bean/ListResult.kt +++ b/app/src/main/java/com/project/survey/logic/bean/ListResult.kt @@ -1,3 +1,6 @@ package com.project.survey.logic.bean +import androidx.annotation.Keep + +@Keep data class ListResult(val rows: List, val totalCount: Int) diff --git a/app/src/main/java/com/project/survey/logic/event/Message.kt b/app/src/main/java/com/project/survey/logic/event/Message.kt index 1526945..3fcfa79 100644 --- a/app/src/main/java/com/project/survey/logic/event/Message.kt +++ b/app/src/main/java/com/project/survey/logic/event/Message.kt @@ -1,8 +1,10 @@ package com.project.survey.logic.event +import androidx.annotation.Keep import java.text.SimpleDateFormat import java.util.* +@Keep data class Message @JvmOverloads constructor( var msg: String = "", var arg1: Int = 0, diff --git a/app/src/main/java/com/project/survey/model/ApprovalResponse.kt b/app/src/main/java/com/project/survey/model/ApprovalResponse.kt index 6641129..ee8a4a8 100644 --- a/app/src/main/java/com/project/survey/model/ApprovalResponse.kt +++ b/app/src/main/java/com/project/survey/model/ApprovalResponse.kt @@ -1,12 +1,15 @@ package com.project.survey.model +import androidx.annotation.Keep import com.project.survey.logic.bean.ListResult +@Keep data class ApprovalResponse( val badges: Badge, val data: ListResult ) +@Keep data class Badge( val PI_PREAPPROV: Int, val PI_APPROVED: Int, @@ -37,6 +40,7 @@ data class Badge( * "urging": null * } */ +@Keep data class ApprovalBean( val id: String, val title: String, diff --git a/app/src/main/java/com/project/survey/model/ControlNetBean.kt b/app/src/main/java/com/project/survey/model/ControlNetBean.kt index c46fe72..5d4c7ee 100644 --- a/app/src/main/java/com/project/survey/model/ControlNetBean.kt +++ b/app/src/main/java/com/project/survey/model/ControlNetBean.kt @@ -1,29 +1,32 @@ package com.project.survey.model +import androidx.annotation.Keep + /** * { - * "KZW_TYPE_CODE": "02", - * "SY_CREATEUSERID": "c1c843dd971f416da307f5fefa9d782e", - * "KZW_TYPE_NAME": "专用", - * "KZW_APPROVALSTATUS": "", - * "KZW_VERSION": "2024-09-2704", - * "SY_GROUP_COMPANY_ID": "", - * "KZW_MEASUREMENTLEVEL": "2", - * "SY_COMPANY_ID": "V1R0gp2zJ3SvGFNvJdM", - * "KZW_FILE": "", - * "SY_CREATEUSERNAME": "zlh", - * "KZW_MEASUREMENTUNIT": "", - * "KZW_REMARK": "", - * "BD_KZW_ID": "14faecf400d74001ad37ca7b349e9de7", - * "SY_CREATETIME": "2024-09-27 15:36:26", - * "SY_ORG_ID": "systemdepartment", - * "": "2024-09-27", - * "KZW_LCMC": "专用控制网测试2", - * "KZW_MEASUREMENTUNIT_ID": "", - * "KZW_NAME": "专用", - * "BD_XMXX_ID": "" - * } + * "KZW_TYPE_CODE": "02", + * "SY_CREATEUSERID": "c1c843dd971f416da307f5fefa9d782e", + * "KZW_TYPE_NAME": "专用", + * "KZW_APPROVALSTATUS": "", + * "KZW_VERSION": "2024-09-2704", + * "SY_GROUP_COMPANY_ID": "", + * "KZW_MEASUREMENTLEVEL": "2", + * "SY_COMPANY_ID": "V1R0gp2zJ3SvGFNvJdM", + * "KZW_FILE": "", + * "SY_CREATEUSERNAME": "zlh", + * "KZW_MEASUREMENTUNIT": "", + * "KZW_REMARK": "", + * "BD_KZW_ID": "14faecf400d74001ad37ca7b349e9de7", + * "SY_CREATETIME": "2024-09-27 15:36:26", + * "SY_ORG_ID": "systemdepartment", + * "": "2024-09-27", + * "KZW_LCMC": "专用控制网测试2", + * "KZW_MEASUREMENTUNIT_ID": "", + * "KZW_NAME": "专用", + * "BD_XMXX_ID": "" + * } */ +@Keep data class ControlNetBean( val KZW_NAME:String, val KZW_MEASUREMENTLEVEL:String, diff --git a/app/src/main/java/com/project/survey/model/ControlNetCGBean.kt b/app/src/main/java/com/project/survey/model/ControlNetCGBean.kt index e5aa8df..d1a7b24 100644 --- a/app/src/main/java/com/project/survey/model/ControlNetCGBean.kt +++ b/app/src/main/java/com/project/survey/model/ControlNetCGBean.kt @@ -1,5 +1,7 @@ package com.project.survey.model +import androidx.annotation.Keep + /** * { * "KZW_TYPE_CODE": "01", @@ -22,6 +24,7 @@ package com.project.survey.model * "KZWZBCG_POINTNAME": "测点1" * } */ +@Keep data class ControlNetCGBean( val KZWZBCG_BZ:String, val KZWZBCG_POINTNAME:String, diff --git a/app/src/main/java/com/project/survey/model/ControlNetListBean.kt b/app/src/main/java/com/project/survey/model/ControlNetListBean.kt index e34b282..5c87952 100644 --- a/app/src/main/java/com/project/survey/model/ControlNetListBean.kt +++ b/app/src/main/java/com/project/survey/model/ControlNetListBean.kt @@ -1,4 +1,7 @@ package com.project.survey.model +import androidx.annotation.Keep + +@Keep class ControlNetListBean { } \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/model/ControlNetVersionBean.kt b/app/src/main/java/com/project/survey/model/ControlNetVersionBean.kt index 686213e..caf94d6 100644 --- a/app/src/main/java/com/project/survey/model/ControlNetVersionBean.kt +++ b/app/src/main/java/com/project/survey/model/ControlNetVersionBean.kt @@ -1,8 +1,11 @@ package com.project.survey.model +import androidx.annotation.Keep + /** * 控制网版本号 */ +@Keep class ControlNetVersionBean(val version: String) { diff --git a/app/src/main/java/com/project/survey/model/LoftingListBean.kt b/app/src/main/java/com/project/survey/model/LoftingListBean.kt index f2df5d6..167039c 100644 --- a/app/src/main/java/com/project/survey/model/LoftingListBean.kt +++ b/app/src/main/java/com/project/survey/model/LoftingListBean.kt @@ -1,4 +1,7 @@ package com.project.survey.model +import androidx.annotation.Keep + +@Keep class LoftingListBean { } \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/model/LoginBean.kt b/app/src/main/java/com/project/survey/model/LoginBean.kt index 06a5060..f8e5f9d 100644 --- a/app/src/main/java/com/project/survey/model/LoginBean.kt +++ b/app/src/main/java/com/project/survey/model/LoginBean.kt @@ -1,11 +1,13 @@ package com.project.survey.model import android.os.Parcelable +import androidx.annotation.Keep import kotlinx.android.parcel.Parcelize /** * {"token":"a52e6940-34c9-4f93-8a60-5b13bf25693f","mobilePhone":"15903684576","personId":"fqwerfqergqwer"} */ +@Keep @Parcelize data class LoginBean( val token: String, diff --git a/app/src/main/java/com/project/survey/model/PointMeasureListBean.kt b/app/src/main/java/com/project/survey/model/PointMeasureListBean.kt index a045a00..09db6f8 100644 --- a/app/src/main/java/com/project/survey/model/PointMeasureListBean.kt +++ b/app/src/main/java/com/project/survey/model/PointMeasureListBean.kt @@ -1,4 +1,7 @@ package com.project.survey.model +import androidx.annotation.Keep + +@Keep class PointMeasureListBean { } \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/model/ProjectBean.kt b/app/src/main/java/com/project/survey/model/ProjectBean.kt index 81c4b90..1e5f3bb 100644 --- a/app/src/main/java/com/project/survey/model/ProjectBean.kt +++ b/app/src/main/java/com/project/survey/model/ProjectBean.kt @@ -1,6 +1,7 @@ package com.project.survey.model import android.os.Parcelable +import androidx.annotation.Keep import kotlinx.android.parcel.Parcelize //{ @@ -30,6 +31,7 @@ import kotlinx.android.parcel.Parcelize // "SY_ORG_ID": null, // "XMXX_NAME": "测试项目" //} +@Keep @Parcelize data class ProjectBean( val XMXX_NAME: String, //项目名称 diff --git a/app/src/main/java/com/project/survey/model/TextStyleBean.java b/app/src/main/java/com/project/survey/model/TextStyleBean.java index c72f503..e1c36ff 100644 --- a/app/src/main/java/com/project/survey/model/TextStyleBean.java +++ b/app/src/main/java/com/project/survey/model/TextStyleBean.java @@ -1,7 +1,9 @@ package com.project.survey.model; import androidx.annotation.ColorInt; +import androidx.annotation.Keep; +@Keep public class TextStyleBean { private String text; private float textSize; diff --git a/app/src/main/java/com/project/survey/network/HttpResult.kt b/app/src/main/java/com/project/survey/network/HttpResult.kt index 8f411e3..a280c98 100644 --- a/app/src/main/java/com/project/survey/network/HttpResult.kt +++ b/app/src/main/java/com/project/survey/network/HttpResult.kt @@ -1,3 +1,6 @@ package com.project.survey.network +import androidx.annotation.Keep + +@Keep data class HttpResult(val code: String, val message: String, val data: T, val success: Boolean) diff --git a/app/src/main/java/com/project/survey/network/ResponseThrowable.kt b/app/src/main/java/com/project/survey/network/ResponseThrowable.kt index c3b6490..52f8c24 100644 --- a/app/src/main/java/com/project/survey/network/ResponseThrowable.kt +++ b/app/src/main/java/com/project/survey/network/ResponseThrowable.kt @@ -1,11 +1,13 @@ package com.project.survey.network +import androidx.annotation.Keep import java.lang.Exception /** * Name: ResponseThrowable * Author: chenglifeng */ +@Keep data class ResponseThrowable( var code: Int, var msg: String, diff --git a/app/src/main/java/com/project/survey/network/RetrofitClient.kt b/app/src/main/java/com/project/survey/network/RetrofitClient.kt index 8d081b7..6e451a4 100644 --- a/app/src/main/java/com/project/survey/network/RetrofitClient.kt +++ b/app/src/main/java/com/project/survey/network/RetrofitClient.kt @@ -83,7 +83,7 @@ object RetrofitClient { level = if (BuildConfig.DEBUG) HttpLoggingInterceptor.Level.BODY else - HttpLoggingInterceptor.Level.NONE + HttpLoggingInterceptor.Level.BODY }) .sslSocketFactory( HttpsTrustUtil.createSSLSocketFactory(), diff --git a/app/src/main/java/com/project/survey/ui/approval/ApprovalActivity.kt b/app/src/main/java/com/project/survey/ui/approval/ApprovalActivity.kt index 60de8de..d50a4c0 100644 --- a/app/src/main/java/com/project/survey/ui/approval/ApprovalActivity.kt +++ b/app/src/main/java/com/project/survey/ui/approval/ApprovalActivity.kt @@ -42,7 +42,7 @@ class ApprovalActivity : BaseBindingActivity(), OnRefre private val viewModel: ProjectViewModel by viewModels() @Param - private lateinit var type: String + private var type: String = "" private val adapter by lazy { ApprovalAdapter() } private var currentPage = 1 diff --git a/app/src/main/java/com/project/survey/ui/login/LoginInputCodeActivity.kt b/app/src/main/java/com/project/survey/ui/login/LoginInputCodeActivity.kt index 2913d82..cbcceb4 100644 --- a/app/src/main/java/com/project/survey/ui/login/LoginInputCodeActivity.kt +++ b/app/src/main/java/com/project/survey/ui/login/LoginInputCodeActivity.kt @@ -29,16 +29,17 @@ class LoginInputCodeActivity : BaseBindingActivity() { private val adapter by lazy { ProjectListAdapter() } @Param - private lateinit var type: String + private var type: String = "" override fun initView() { mBinding.recyclerView.addItemDecoration(HorDividerDecoration(mContext)) diff --git a/app/src/main/java/com/project/survey/util/param/Param.java b/app/src/main/java/com/project/survey/util/param/Param.java index a75dad3..2023824 100644 --- a/app/src/main/java/com/project/survey/util/param/Param.java +++ b/app/src/main/java/com/project/survey/util/param/Param.java @@ -1,5 +1,7 @@ package com.project.survey.util.param; +import androidx.annotation.Keep; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -8,6 +10,7 @@ import java.lang.annotation.Target; /** * des 参数解析注解 */ +@Keep @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) public @interface Param {