diff --git a/app/build.gradle b/app/build.gradle index d629791..86492f0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,20 +15,26 @@ android { //每个应用拥有不同的authorities，防止相同的在同一个手机上无法同时安装 resValue "string", "authorities", applicationId resourceConfigurations += ['zh', 'en', 'hdpi'] - ndk { - abiFilters 'armeabi', 'armeabi-v7a','arm64-v8a' - } } buildFeatures { viewBinding = true + buildConfig = true + } + signingConfigs { + release { + keyAlias 'key0' + storeFile file('../key/key_zhdcoa') + storePassword 'abc123123' + keyPassword 'abc123123' + v1SigningEnabled true //是否开启V1签名 + v2SigningEnabled true //是否开启V2签名 + } } /* keypassword:abc123123 alias key0*/ - buildTypes { debug { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - buildConfigField("boolean","LOG_ERROR","true"); + buildConfigField "boolean", "LOG_ERROR", "true" } release { lintOptions { @@ -46,6 +52,7 @@ android { outputFileName = "zdxoaapp.apk" } } + signingConfig signingConfigs.release // 打包签名信息 } } sourceSets { @@ -55,8 +62,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } namespace 'com.rehome.zhdcoa' } diff --git a/app/src/main/java/com/rehome/zhdcoa/Contans.java b/app/src/main/java/com/rehome/zhdcoa/Contans.java index e9a1678..74cfa0b 100644 --- a/app/src/main/java/com/rehome/zhdcoa/Contans.java +++ b/app/src/main/java/com/rehome/zhdcoa/Contans.java @@ -25,16 +25,17 @@ public class Contans { public static String CK_BASE_IP = "http://10.19.0.13:80/"; public static String IP_INTRANET = "http://10.19.0.72:8081/"; + + public static String BASE_URL_EXTRANET = "http://219.131.195.3:8082/";//app外网服务器，对应内网ip: 172.16.25.75 public static String IP_EXTRANET = "http://219.131.195.3:8081/"; - //public static String IP_EXTRANET = "http://192.168.2.215:9005/"; + +// public static String BASE_URL_EXTRANET = "http://192.168.2.215:8082/";//app公司内网开发服务器 +// public static String IP_EXTRANET = "http://192.168.2.215:9005/"; + + //app内网 10.19.0.73 public static String BASE_URL_INTRANET = "http://10.19.0.73:8082/"; - //app公司内网开发服务器 - //app外网对应内网ip: 172.16.25.75 - public static String BASE_URL_EXTRANET = "http://219.131.195.3:8082/"; - //public static String BASE_URL_EXTRANET = "http://192.168.2.215:8082/"; - //智慧安防平台登录 电厂内网 public static String BASE_URL_COMPANY_SERVER_INTRANET= "http://10.19.0.73:8011/"; //智慧安防平台登录 电厂外网 diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AddDagerEnterApplyActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AddDagerEnterApplyActivity.kt index c69000e..6e90be8 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AddDagerEnterApplyActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AddDagerEnterApplyActivity.kt @@ -34,6 +34,7 @@ class AddDagerEnterApplyActivity : override fun getViewBinding() = ActivityAddDagerEnterApplyBinding.inflate(layoutInflater) private lateinit var launcherResult: ActivityResultLauncher + private lateinit var launcherResultAddList: ActivityResultLauncher override fun getToolbar() = binding.toolbarView.toolbar @@ -41,6 +42,7 @@ class AddDagerEnterApplyActivity : isEdit = intent.getBooleanExtra("isEdit", false) id = intent.getStringExtra("id") launcherResult = createActivityResultLauncher() + launcherResultAddList = createActivityResultLauncherAddList() initToolbar("危化品入厂申请", "下一步") { } @@ -72,8 +74,8 @@ class AddDagerEnterApplyActivity : this, AddDagerEnterApplyListActivity::class.java ) -// intent.putExtra(Contans.KEY.MODUETYPE, Contans.MODUETYPE.KQ_LEVEKIND) -// startActivityForResult(intent, ApplyLeaveDetailActivity.REQUEST_TYPE) + //intent.putExtra("item", Contans.MODUETYPE.KQ_LEVEKIND) + launcherResultAddList.launch(intent) }) } @@ -100,6 +102,23 @@ class AddDagerEnterApplyActivity : } } + //创建一个ActivityResultLauncher + private fun createActivityResultLauncherAddList(): ActivityResultLauncher { + //kotlin写法 + return registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { + val data = it.data + val resultCode = it.resultCode + if (resultCode == RESULT_OK) { + if (data != null) { + departmentId = data.getStringExtra("departmentId") + departmentName = data.getStringExtra("departmentName") + binding.ilDinnerUnit.content = departmentName + } + } + } + } + + //http://192.168.2.215:8082/CBS/WHP/Api/GetHWPSQByID.ashx?ID=6966abb3-8150-4170-9e8a-9e81a6dbe07d //获取一条危化品数据 private fun getHWPSQByID() { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AddDagerEnterApplyListActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AddDagerEnterApplyListActivity.kt index 1a37e5f..af53f6f 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AddDagerEnterApplyListActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AddDagerEnterApplyListActivity.kt @@ -10,6 +10,9 @@ class AddDagerEnterApplyListActivity : BaseActivityOaToolbarViewBinding() { // 管理员 - binding.etUsername.setText("ZHPS_Admin") - binding.etPassword.setText("Rehome.zhps@2020") +// binding.etUsername.setText("ZHPS_Admin") +// binding.etPassword.setText("Rehome.zhps@2020") // // binding.etUsername.setText("310665") // binding.etPassword.setText("ABcd.123") diff --git a/app/src/main/java/com/rehome/zhdcoa/utils/MqttSSLPublishServer.java b/app/src/main/java/com/rehome/zhdcoa/utils/MqttSSLPublishServer.java index d0ffe79..ecb5288 100644 --- a/app/src/main/java/com/rehome/zhdcoa/utils/MqttSSLPublishServer.java +++ b/app/src/main/java/com/rehome/zhdcoa/utils/MqttSSLPublishServer.java @@ -73,7 +73,7 @@ public class MqttSSLPublishServer { try { clientid = (String) SPUtils.get(context, "clientid", String.valueOf("")); - if (clientid.equals("")) { + if (TextUtils.isEmpty(clientid)) { clientid = UUID.randomUUID().toString(); SPUtils.put(context, "clientid", clientid); } diff --git a/app/src/main/res/layout/activity_add_dager_enter_apply_list.xml b/app/src/main/res/layout/activity_add_dager_enter_apply_list.xml index beb1cde..257a451 100644 --- a/app/src/main/res/layout/activity_add_dager_enter_apply_list.xml +++ b/app/src/main/res/layout/activity_add_dager_enter_apply_list.xml @@ -23,79 +23,55 @@ android:orientation="vertical"> + app:tv_title="危险化学品名称"/> + app:tv_title="危险类别" /> + app:tv_title="使用部门" /> + app:tv_title="责任人" /> + + app:must="true" + app:tv_title="储存地点" /> - - + - -