气象数据接口增加RSA加密

app/src/main/java/com/rehome/zhdcoa/Contans.java

@@ -592,6 +592,11 @@ public class Contans {
 
     //气象获取历史数据
     public final static String GET_WEATHER_HISTORY_DATA = "PubFile/Data/QXZ/GetHistoryData.ashx";
+    //气象获取实时数据
+    public final static String GET_WEATHER_NOW_DATA_RSA = "PubFile/Data/QXZ/GetCurrentDataRsa.ashx";
+
+    //气象获取历史数据
+    public final static String GET_WEATHER_HISTORY_DATA_RSA = "PubFile/Data/QXZ/GetHistoryDataRsa.ashx";
 
     //http://localhost:28105/PubFile/Data/QXZ/GetHistoryData.ashx?times=2025-09-07 00:00:00&timee=2025-09-19 23:00:00&page=2&pageSize=20&dataType=E1
     //http://localhost:28105/PubFile/Data/QXZ/GetCurrentData.ashx

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

@@ -228,8 +228,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
 
         if (isApkInDebug(context)) {
             //        管理员
-            binding.etUsername.setText("ZHPS_Admin")
+//            binding.etUsername.setText("ZHPS_Admin")
-            binding.etPassword.setText("Rehome.zhps@996")
+//            binding.etPassword.setText("Rehome.zhps@996")
 
 
             //公司内网215管理员

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

@@ -23,6 +23,8 @@ import com.rehome.zhdcoa.utils.GsonUtils
 import com.rehome.zhdcoa.utils.HttpListener
 import com.rehome.zhdcoa.utils.NohttpUtils
 import com.rehome.zhdcoa.utils.RSAAndroid
+import com.rehome.zhdcoa.utils.RSAUtils
+import com.rehome.zhdcoa.utils.UiUtlis
 import com.yolanda.nohttp.NoHttp
 import com.yolanda.nohttp.RequestMethod
 import com.yolanda.nohttp.rest.Response
@@ -94,7 +96,7 @@ class WeatherActivity : BaseActivityOaToolbarViewBinding<ActivityWeatherBinding>
     }
 
     private fun refreshData() {
-        requestData()
+        requestDataRsa()
     }
 
     private fun showHistoryPage(type: String) {
@@ -105,10 +107,11 @@ class WeatherActivity : BaseActivityOaToolbarViewBinding<ActivityWeatherBinding>
     }
 
     override fun initData() {
-        requestData()
+        //requestData()
+        requestDataRsa()
     }
 
-    private fun requestData() {
+    private fun requestDataBase() {
         val request = NoHttp.createStringRequest(
             Contans.BASE_URL + Contans.GET_WEATHER_NOW_DATA,
             RequestMethod.GET
@@ -148,4 +151,49 @@ class WeatherActivity : BaseActivityOaToolbarViewBinding<ActivityWeatherBinding>
             }
         })
     }
+
+    private fun requestDataRsa() {
+        val request = NoHttp.createStringRequest(
+            Contans.BASE_URL + Contans.GET_WEATHER_NOW_DATA_RSA,
+            RequestMethod.GET
+        )
+
+        NohttpUtils.getInstance().add(this, 0, request, object : HttpListener<String?> {
+
+            override fun onSucceed(what: Int, response: Response<String?>?) {
+                val result = response?.get()
+                showLog("----------------")
+                showLog(result)
+
+                val jsonDecode = RSAUtils.decryptBASE64StrClient(result)
+                if (TextUtils.isEmpty(jsonDecode)) {
+                    showToast(UiUtlis.getString(context, R.string.data_error))
+                } else {
+                    val bean = GsonUtils.GsonToBean(
+                        jsonDecode,
+                        WeatherRealDataBean::class.java
+                    )
+                    if (bean != null && bean.code==1 && bean.data != null) {
+                        val data = bean.data
+                        binding.timeQiya.text=data.tbsj
+                        binding.timeShidu.text=data.tbsj
+                        binding.timeWendu.text=data.tbsj
+                        binding.timeFengsu.text=data.tbsj
+                        binding.timeYuliang.text=data.tbsj
+                        binding.timeFengxiang.text=data.tbsj
+                        binding.tvWendu.text=data.e16
+                        binding.tvShidu.text=data.e14
+                        binding.tvQiya.text=data.e15
+                        binding.tvFengsu.text=data.e1
+                        binding.tvFengxiang.text=data.e12
+                        binding.tvYuliang.text=data.e4
+                    }
+                }
+            }
+
+            override fun onFailed(what: Int, response: Response<String?>?) {
+
+            }
+        })
+    }
 }

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

@@ -3,8 +3,10 @@ package com.rehome.zhdcoa.ui.activity
 
 import android.annotation.SuppressLint
 import android.content.Intent
+import android.text.TextUtils
 import android.view.View
 import com.rehome.zhdcoa.Contans
+import com.rehome.zhdcoa.R
 import com.rehome.zhdcoa.adapter.WeatherHistoryAdapter
 import com.rehome.zhdcoa.base.BaseActivityOaToolbarViewBinding
 import com.rehome.zhdcoa.bean.WeatherHistoryBean
@@ -13,6 +15,8 @@ import com.rehome.zhdcoa.databinding.ActivityWeatherHistoryBinding
 import com.rehome.zhdcoa.utils.GsonUtils
 import com.rehome.zhdcoa.utils.HttpListener
 import com.rehome.zhdcoa.utils.NohttpUtils
+import com.rehome.zhdcoa.utils.RSAUtils
+import com.rehome.zhdcoa.utils.UiUtlis
 import com.rehome.zhdcoa.weiget.DateTimeMinutePickDialog
 import com.rehome.zhdcoa.weiget.LoadListView
 import com.yolanda.nohttp.NoHttp
@@ -164,7 +168,7 @@ class WeatherHistoryActivity : BaseActivityOaToolbarViewBinding<ActivityWeatherH
 
     private fun requestData(st: String, et: String) {
         val request = NoHttp.createStringRequest(
-            Contans.BASE_URL + Contans.GET_WEATHER_HISTORY_DATA,
+            Contans.BASE_URL + Contans.GET_WEATHER_HISTORY_DATA_RSA,
             RequestMethod.GET
         )
 
@@ -208,8 +212,12 @@ class WeatherHistoryActivity : BaseActivityOaToolbarViewBinding<ActivityWeatherH
                 val result = response?.get()
                 showLog("----------------")
                 showLog(result)
+                val jsonDecode = RSAUtils.decryptBASE64StrClient(result)
+                if (TextUtils.isEmpty(jsonDecode)) {
+                    showToast(UiUtlis.getString(context, R.string.data_error))
+                } else {
                     val bean = GsonUtils.GsonToBean(
-                    result,
+                        jsonDecode,
                         WeatherHistoryBean::class.java
                     )
                     if (bean != null && bean.code == 1 && bean.data != null && bean.data.size > 0) {
@@ -224,6 +232,7 @@ class WeatherHistoryActivity : BaseActivityOaToolbarViewBinding<ActivityWeatherH
                         binding.lv.visibility = View.GONE
                     }
                 }
+            }
 
             override fun onFailed(what: Int, response: Response<String?>?) {
 
@@ -233,7 +242,7 @@ class WeatherHistoryActivity : BaseActivityOaToolbarViewBinding<ActivityWeatherH
 
     private fun requestLoadMoreData(st: String, et: String) {
         val request = NoHttp.createStringRequest(
-            Contans.BASE_URL + Contans.GET_WEATHER_HISTORY_DATA,
+            Contans.BASE_URL + Contans.GET_WEATHER_HISTORY_DATA_RSA,
             RequestMethod.GET
         )
 
@@ -277,8 +286,13 @@ class WeatherHistoryActivity : BaseActivityOaToolbarViewBinding<ActivityWeatherH
                 val result = response?.get()
                 showLog("----------------")
                 showLog(result)
+
+                val jsonDecode = RSAUtils.decryptBASE64StrClient(result)
+                if (TextUtils.isEmpty(jsonDecode)) {
+                    showToast(UiUtlis.getString(context, R.string.data_error))
+                } else {
                     val bean = GsonUtils.GsonToBean(
-                    result,
+                        jsonDecode,
                         WeatherHistoryBean::class.java
                     )
                     binding.lv.loadComplete()
@@ -290,6 +304,7 @@ class WeatherHistoryActivity : BaseActivityOaToolbarViewBinding<ActivityWeatherH
                         showToast("没有更多数据啦")
                     }
                 }
+            }
 
             override fun onFailed(what: Int, response: Response<String?>?) {
                 binding.lv.loadComplete()