From a70af4ad6ead2bbac4e77e9e1a93316f38f6e77a Mon Sep 17 00:00:00 2001 From: wenfei Date: Thu, 25 Sep 2025 14:59:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B0=94=E8=B1=A1=E6=95=B0=E6=8D=AE=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=A2=9E=E5=8A=A0RSA=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/rehome/zhdcoa/Contans.java | 5 ++ .../zhdcoa/ui/activity/LoginActivity.kt | 4 +- .../zhdcoa/ui/activity/WeatherActivity.kt | 54 ++++++++++++++- .../ui/activity/WeatherHistoryActivity.kt | 67 ++++++++++++------- 4 files changed, 99 insertions(+), 31 deletions(-) diff --git a/app/src/main/java/com/rehome/zhdcoa/Contans.java b/app/src/main/java/com/rehome/zhdcoa/Contans.java index ae717ae..9015f1a 100644 --- a/app/src/main/java/com/rehome/zhdcoa/Contans.java +++ b/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 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 8f4cbce..0fd11dc 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 @@ -228,8 +228,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { if (isApkInDebug(context)) { // 管理员 - binding.etUsername.setText("ZHPS_Admin") - binding.etPassword.setText("Rehome.zhps@996") +// binding.etUsername.setText("ZHPS_Admin") +// binding.etPassword.setText("Rehome.zhps@996") //公司内网215管理员 diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WeatherActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WeatherActivity.kt index 7c31974..d911bf1 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WeatherActivity.kt +++ b/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 } private fun refreshData() { - requestData() + requestDataRsa() } private fun showHistoryPage(type: String) { @@ -105,10 +107,11 @@ class WeatherActivity : BaseActivityOaToolbarViewBinding } 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 } }) } + + 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 { + + override fun onSucceed(what: Int, response: Response?) { + 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?) { + + } + }) + } } \ No newline at end of file diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WeatherHistoryActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WeatherHistoryActivity.kt index 2599f90..86e3bc0 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WeatherHistoryActivity.kt +++ b/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 0) { - binding.tvNodata.visibility = View.GONE - binding.lv.visibility = View.VISIBLE - datas.clear() - datas.addAll(bean.data) - mAdapter.notifyDataSetChanged() - page++ + val jsonDecode = RSAUtils.decryptBASE64StrClient(result) + if (TextUtils.isEmpty(jsonDecode)) { + showToast(UiUtlis.getString(context, R.string.data_error)) } else { - binding.tvNodata.visibility = View.VISIBLE - binding.lv.visibility = View.GONE + val bean = GsonUtils.GsonToBean( + jsonDecode, + WeatherHistoryBean::class.java + ) + if (bean != null && bean.code == 1 && bean.data != null && bean.data.size > 0) { + binding.tvNodata.visibility = View.GONE + binding.lv.visibility = View.VISIBLE + datas.clear() + datas.addAll(bean.data) + mAdapter.notifyDataSetChanged() + page++ + } else { + binding.tvNodata.visibility = View.VISIBLE + binding.lv.visibility = View.GONE + } } } @@ -233,7 +242,7 @@ class WeatherHistoryActivity : BaseActivityOaToolbarViewBinding 0) { - datas.addAll(bean.data) - mAdapter.notifyDataSetChanged() - page++ - }else{ - showToast("没有更多数据啦") + + val jsonDecode = RSAUtils.decryptBASE64StrClient(result) + if (TextUtils.isEmpty(jsonDecode)) { + showToast(UiUtlis.getString(context, R.string.data_error)) + } else { + val bean = GsonUtils.GsonToBean( + jsonDecode, + WeatherHistoryBean::class.java + ) + binding.lv.loadComplete() + if (bean != null && bean.code == 1 && bean.data != null && bean.data.size > 0) { + datas.addAll(bean.data) + mAdapter.notifyDataSetChanged() + page++ + }else{ + showToast("没有更多数据啦") + } } }