diff --git a/.gitignore b/.gitignore index 603b140..bf9b0ea 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,6 @@ /captures .externalNativeBuild .cxx + +/zq +*.zip diff --git a/.gitignore b/.gitignore index 603b140..bf9b0ea 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,6 @@ /captures .externalNativeBuild .cxx + +/zq +*.zip diff --git a/app/build.gradle b/app/build.gradle index 6883130..f353a13 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,8 +19,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 116 - versionName "1.1.6" + versionCode 117 + versionName "1.1.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -43,8 +43,6 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } } } diff --git a/.gitignore b/.gitignore index 603b140..bf9b0ea 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,6 @@ /captures .externalNativeBuild .cxx + +/zq +*.zip diff --git a/app/build.gradle b/app/build.gradle index 6883130..f353a13 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,8 +19,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 116 - versionName "1.1.6" + versionCode 117 + versionName "1.1.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -43,8 +43,6 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 65025a6..1107b54 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,6 +11,7 @@ + + $clientid") + SaveKeyValues.putValue("CID", clientid.toString()) //通知MainActivity注册个推服务 val msg: Message = MainActivity.weakReferenceHandler.obtainMessage() msg.what = LocaleConstant.PUSH_REGISTER @@ -86,11 +87,11 @@ userId = userDataModel.id.toString() } //解析设备编号和jobId - val temp = msg.content.split(",") + val temp = msg.content.split(",") + //["设备编号[412022030904]发生井盖报警,工单编号为[904178807]"] val regex = "\\[|\\]".toRegex() val deviceCode = temp[0].split(regex)[1] val jobId = temp[1].split(regex)[1] - //TODO 暂时去掉设备报警,只要工单,工单时间需要和后台确定 if (msg.title.contains("工单")) { DataBaseManager.get.insertNotice( msg.messageId, msg.appid, msg.clientId, msg.taskId, diff --git a/.gitignore b/.gitignore index 603b140..bf9b0ea 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,6 @@ /captures .externalNativeBuild .cxx + +/zq +*.zip diff --git a/app/build.gradle b/app/build.gradle index 6883130..f353a13 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,8 +19,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 116 - versionName "1.1.6" + versionCode 117 + versionName "1.1.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -43,8 +43,6 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 65025a6..1107b54 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,6 +11,7 @@ + $clientid") + SaveKeyValues.putValue("CID", clientid.toString()) //通知MainActivity注册个推服务 val msg: Message = MainActivity.weakReferenceHandler.obtainMessage() msg.what = LocaleConstant.PUSH_REGISTER @@ -86,11 +87,11 @@ userId = userDataModel.id.toString() } //解析设备编号和jobId - val temp = msg.content.split(",") + val temp = msg.content.split(",") + //["设备编号[412022030904]发生井盖报警,工单编号为[904178807]"] val regex = "\\[|\\]".toRegex() val deviceCode = temp[0].split(regex)[1] val jobId = temp[1].split(regex)[1] - //TODO 暂时去掉设备报警,只要工单,工单时间需要和后台确定 if (msg.title.contains("工单")) { DataBaseManager.get.insertNotice( msg.messageId, msg.appid, msg.clientId, msg.taskId, diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 8da3e03..a15444f 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -16,6 +16,7 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.READ_MEDIA_IMAGES, + Manifest.permission.POST_NOTIFICATIONS, ) } else { arrayOf( diff --git a/.gitignore b/.gitignore index 603b140..bf9b0ea 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,6 @@ /captures .externalNativeBuild .cxx + +/zq +*.zip diff --git a/app/build.gradle b/app/build.gradle index 6883130..f353a13 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,8 +19,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 116 - versionName "1.1.6" + versionCode 117 + versionName "1.1.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -43,8 +43,6 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 65025a6..1107b54 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,6 +11,7 @@ + $clientid") + SaveKeyValues.putValue("CID", clientid.toString()) //通知MainActivity注册个推服务 val msg: Message = MainActivity.weakReferenceHandler.obtainMessage() msg.what = LocaleConstant.PUSH_REGISTER @@ -86,11 +87,11 @@ userId = userDataModel.id.toString() } //解析设备编号和jobId - val temp = msg.content.split(",") + val temp = msg.content.split(",") + //["设备编号[412022030904]发生井盖报警,工单编号为[904178807]"] val regex = "\\[|\\]".toRegex() val deviceCode = temp[0].split(regex)[1] val jobId = temp[1].split(regex)[1] - //TODO 暂时去掉设备报警,只要工单,工单时间需要和后台确定 if (msg.title.contains("工单")) { DataBaseManager.get.insertNotice( msg.messageId, msg.appid, msg.clientId, msg.taskId, diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 8da3e03..a15444f 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -16,6 +16,7 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.READ_MEDIA_IMAGES, + Manifest.permission.POST_NOTIFICATIONS, ) } else { arrayOf( diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt index 9bed6e8..2f14832 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt @@ -1,5 +1,8 @@ package com.casic.app.smartwell.view +import android.content.ClipData +import android.content.ClipboardManager +import android.content.Context import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider @@ -14,6 +17,7 @@ import com.google.gson.reflect.TypeToken import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -23,6 +27,7 @@ private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var loginViewModel: LoginViewModel + private lateinit var clipboard: ClipboardManager override fun initViewBinding(): ActivityUserDetailBinding { return ActivityUserDetailBinding.inflate(layoutInflater) @@ -37,6 +42,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager + val userDetailJson = SaveKeyValues.getValue(LocaleConstant.USER_DETAIL_MODEL, "") as String if (userDetailJson.isNotBlank()) { userDataModel = gson.fromJson( @@ -48,6 +55,9 @@ binding.userDeptView.text = userDataModel.deptName binding.userPhoneView.text = userDataModel.phone } + + binding.pushIdView.text = SaveKeyValues.getValue("CID", "") as String + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] loginViewModel.outResultModel.observe(this) { if (it.code == 200) { @@ -63,6 +73,13 @@ } override fun initEvent() { + binding.pushIdView.setOnLongClickListener { + val cipData = ClipData.newPlainText("CID", binding.pushIdView.text) + clipboard.setPrimaryClip(cipData) + "CID复制成功".show(this) + true + } + binding.changePwdLayout.setOnClickListener { this.navigatePageTo() } diff --git a/.gitignore b/.gitignore index 603b140..bf9b0ea 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,6 @@ /captures .externalNativeBuild .cxx + +/zq +*.zip diff --git a/app/build.gradle b/app/build.gradle index 6883130..f353a13 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,8 +19,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 116 - versionName "1.1.6" + versionCode 117 + versionName "1.1.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -43,8 +43,6 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 65025a6..1107b54 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,6 +11,7 @@ + $clientid") + SaveKeyValues.putValue("CID", clientid.toString()) //通知MainActivity注册个推服务 val msg: Message = MainActivity.weakReferenceHandler.obtainMessage() msg.what = LocaleConstant.PUSH_REGISTER @@ -86,11 +87,11 @@ userId = userDataModel.id.toString() } //解析设备编号和jobId - val temp = msg.content.split(",") + val temp = msg.content.split(",") + //["设备编号[412022030904]发生井盖报警,工单编号为[904178807]"] val regex = "\\[|\\]".toRegex() val deviceCode = temp[0].split(regex)[1] val jobId = temp[1].split(regex)[1] - //TODO 暂时去掉设备报警,只要工单,工单时间需要和后台确定 if (msg.title.contains("工单")) { DataBaseManager.get.insertNotice( msg.messageId, msg.appid, msg.clientId, msg.taskId, diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 8da3e03..a15444f 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -16,6 +16,7 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.READ_MEDIA_IMAGES, + Manifest.permission.POST_NOTIFICATIONS, ) } else { arrayOf( diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt index 9bed6e8..2f14832 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt @@ -1,5 +1,8 @@ package com.casic.app.smartwell.view +import android.content.ClipData +import android.content.ClipboardManager +import android.content.Context import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider @@ -14,6 +17,7 @@ import com.google.gson.reflect.TypeToken import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -23,6 +27,7 @@ private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var loginViewModel: LoginViewModel + private lateinit var clipboard: ClipboardManager override fun initViewBinding(): ActivityUserDetailBinding { return ActivityUserDetailBinding.inflate(layoutInflater) @@ -37,6 +42,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager + val userDetailJson = SaveKeyValues.getValue(LocaleConstant.USER_DETAIL_MODEL, "") as String if (userDetailJson.isNotBlank()) { userDataModel = gson.fromJson( @@ -48,6 +55,9 @@ binding.userDeptView.text = userDataModel.deptName binding.userPhoneView.text = userDataModel.phone } + + binding.pushIdView.text = SaveKeyValues.getValue("CID", "") as String + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] loginViewModel.outResultModel.observe(this) { if (it.code == 200) { @@ -63,6 +73,13 @@ } override fun initEvent() { + binding.pushIdView.setOnLongClickListener { + val cipData = ClipData.newPlainText("CID", binding.pushIdView.text) + clipboard.setPrimaryClip(cipData) + "CID复制成功".show(this) + true + } + binding.changePwdLayout.setOnClickListener { this.navigatePageTo() } diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml index 4a2e853..da0827d 100644 --- a/app/src/main/res/layout/activity_user_detail.xml +++ b/app/src/main/res/layout/activity_user_detail.xml @@ -22,9 +22,7 @@ android:background="@drawable/bg_solid_layout_white_radius_10" android:orientation="vertical"> - + - + - + - + + + + + + + + + +