2.3.1发布

app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "com.rehome.zhdcoa"
         minSdk 24
         targetSdk 34
-        versionCode 14
+        versionCode 15
-        versionName "2.3.0"
+        versionName "2.3.1"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         //每个应用拥有不同的authorities，防止相同的在同一个手机上无法同时安装

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) {

app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyAboutMeActivity.kt

@@ -631,6 +631,12 @@ class ApplyAboutMeActivity : BaseActivityOaToolbarViewBinding<ActivityApplyAbout
                             intent.putExtra("DepartmentNameId", datas[position].departmentnameid)
                             startActivity(intent)
                         }
+                        "ZNAFZYQYSQ" -> {
+                            //常维人员授权 审核页面
+                            val intent = Intent(this, ZdqyryinfoActivity::class.java)
+                            intent.putExtra("id", datas[position].listid)
+                            startActivity(intent)
+                        }
                     }
                 }
         } else if (aboutMeType == ApplyAboutMeActivity.TYPE_MENTIONS) {

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;

app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt

@@ -170,8 +170,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
 
         if (BuildConfig.LOG_ERROR) {
             //        管理员
-            binding.etUsername.setText("ZHPS_Admin")
+//            binding.etUsername.setText("ZHPS_Admin")
-            binding.etPassword.setText("Rehome.zhps@996")
+//            binding.etPassword.setText("Rehome.zhps@996")
 
             //马
 //            binding.etUsername.setText("310482")
@@ -184,8 +184,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
             //陈坚标
 //            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")

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

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<FragmentHomeBinding>() {
                 }
 
                 "CBS_WHP_SQ" -> {
-                    val intent =
+                    val intent = Intent(activity, DagerEnterApplyDetailActivity::class.java)
-                        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<FragmentHomeBinding>() {
                     )
                     startActivity(intent)
                 }
+
+                "ZNAFZYQYSQ" -> {
+                    //常维人员授权 审核页面
+                    val intent = Intent(activity, ZdqyryinfoActivity::class.java)
+                    intent.putExtra("id", AboutMeListdatas[position].listid)
+                    startActivity(intent)
+                }
             }
         }
     }

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