From 97ee49780d5b5313778c8d349b01cde9c3b88800 Mon Sep 17 00:00:00 2001 From: hwf453 Date: Wed, 14 Aug 2024 17:14:44 +0800 Subject: [PATCH] =?UTF-8?q?2.3.1=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 ++-- .../java/com/rehome/zhdcoa/service/PushService.java | 3 +++ .../rehome/zhdcoa/ui/activity/ApplyAboutMeActivity.kt | 6 ++++++ .../zhdcoa/ui/activity/DeparmentTreeActivity.java | 2 +- .../com/rehome/zhdcoa/ui/activity/LoginActivity.kt | 8 ++++---- .../zhdcoa/ui/activity/OtherCountMeActivity.java | 3 --- .../com/rehome/zhdcoa/ui/fragment/HomeFragment.kt | 11 +++++++++-- .../com/rehome/zhdcoa/utils/MqttSSLPublishServer.java | 4 ++-- 8 files changed, 27 insertions(+), 14 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 21c60df..c8d7a9e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ android { applicationId "com.rehome.zhdcoa" minSdk 24 targetSdk 34 - versionCode 14 - versionName "2.3.0" + versionCode 15 + versionName "2.3.1" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" //每个应用拥有不同的authorities，防止相同的在同一个手机上无法同时安装 diff --git a/app/src/main/java/com/rehome/zhdcoa/service/PushService.java b/app/src/main/java/com/rehome/zhdcoa/service/PushService.java index 5e548bd..af24819 100755 --- a/app/src/main/java/com/rehome/zhdcoa/service/PushService.java +++ b/app/src/main/java/com/rehome/zhdcoa/service/PushService.java @@ -211,6 +211,9 @@ public class PushService extends IntentService { } break; case 2: + showLog("2"); + showLog("安建环"); + showLog(response.get()); //安建环计划 AjhjhList info = GsonToBean(response.get(), AjhjhList.class); if (info != null) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyAboutMeActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyAboutMeActivity.kt index 38815f5..cd1d57a 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyAboutMeActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyAboutMeActivity.kt @@ -631,6 +631,12 @@ class ApplyAboutMeActivity : BaseActivityOaToolbarViewBinding { + //常维人员授权 审核页面 + val intent = Intent(this, ZdqyryinfoActivity::class.java) + intent.putExtra("id", datas[position].listid) + startActivity(intent) + } } } } else if (aboutMeType == ApplyAboutMeActivity.TYPE_MENTIONS) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeparmentTreeActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeparmentTreeActivity.java index 701134d..7b985ab 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeparmentTreeActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeparmentTreeActivity.java @@ -23,7 +23,7 @@ import java.util.List; import retrofit2.Call; import retrofit2.Response; -public class DeparmentTreeActivity extends BaseActivity implements SelectItemDepartmentAdapter.SelectItemListener { +public class DeparmentTreeActivity extends BaseActivity implements SelectItemDepartmentAdapter.SelectItemListener { ClearEditText etSearch; ListView lv; diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt index ca0973f..2621239 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt @@ -170,8 +170,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { if (BuildConfig.LOG_ERROR) { // 管理员 - binding.etUsername.setText("ZHPS_Admin") - binding.etPassword.setText("Rehome.zhps@996") +// binding.etUsername.setText("ZHPS_Admin") +// binding.etPassword.setText("Rehome.zhps@996") //马 // binding.etUsername.setText("310482") @@ -184,8 +184,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { //陈坚标 // binding.etUsername.setText("310063") // binding.etPassword.setText("ZHPs@040909") -// binding.etUsername.setText("310707") -// binding.etPassword.setText("Wxfnz666#") + + //谭添欢 // binding.etUsername.setText("310273") // binding.etPassword.setText("#Tth8680004") diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/OtherCountMeActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/OtherCountMeActivity.java index 398deaf..6ad78bb 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/OtherCountMeActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/OtherCountMeActivity.java @@ -66,10 +66,7 @@ public class OtherCountMeActivity extends BaseActivity { datas.addAll(bean.getRows()); setAdapter(); } - - } - } @Override diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt index 2922fae..7ce4aae 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt @@ -71,6 +71,7 @@ import com.rehome.zhdcoa.ui.activity.TaskCountActivity import com.rehome.zhdcoa.ui.activity.TaskDateActivity import com.rehome.zhdcoa.ui.activity.TrainInfoMoreActivity import com.rehome.zhdcoa.ui.activity.WzccinfoActivity +import com.rehome.zhdcoa.ui.activity.ZdqyryinfoActivity import com.rehome.zhdcoa.utils.GsonUtils import com.rehome.zhdcoa.utils.HttpListener import com.rehome.zhdcoa.utils.HttpUtils @@ -571,8 +572,7 @@ class HomeFragment : BaseViewBindingFragment() { } "CBS_WHP_SQ" -> { - val intent = - Intent(activity, DagerEnterApplyDetailActivity::class.java) + val intent = Intent(activity, DagerEnterApplyDetailActivity::class.java) intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) intent.putExtra("id", AboutMeListdatas[position].listid) intent.putExtra( @@ -581,6 +581,13 @@ class HomeFragment : BaseViewBindingFragment() { ) startActivity(intent) } + + "ZNAFZYQYSQ" -> { + //常维人员授权 审核页面 + val intent = Intent(activity, ZdqyryinfoActivity::class.java) + intent.putExtra("id", AboutMeListdatas[position].listid) + startActivity(intent) + } } } } 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 ecb5288..9bd27ca 100644 --- a/app/src/main/java/com/rehome/zhdcoa/utils/MqttSSLPublishServer.java +++ b/app/src/main/java/com/rehome/zhdcoa/utils/MqttSSLPublishServer.java @@ -33,7 +33,7 @@ public class MqttSSLPublishServer { /** * 代理服务器ip地址 */ - private final String HOST = "tcp://39.101.173.20:1883"; + private final String HOST = "tcp://47.242.184.139:1883"; /** * 发送主题 */ @@ -55,7 +55,7 @@ public class MqttSSLPublishServer { /** * MQTT服务端连接密码 */ - private final String passWord = "public"; + private final String passWord = "publish452131wW452131wW$"; /** * 消息发布质量 * 0：最多一次，即：<=1