From 56a9edeb94d07f3b54514244c2c50f39e5a5f587 Mon Sep 17 00:00:00 2001 From: wenfei Date: Tue, 17 Mar 2026 12:13:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E8=AF=A6=E6=83=85=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B6=8B=E5=8A=BF=E5=9B=BE=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 2 +- .../adapter/DeviceManagerListAdapter.kt | 3 + .../zhdcoa/ui/activity/Activity_DzdtInfo.java | 4 +- .../ui/activity/ClcrzsqcxinfoActivity.java | 2 + .../DeviceAlarmInfoLineChartActivity.java | 61 +++++++++++++++++++ .../DeviceOnlineStatusListActivity.kt | 2 +- .../zhdcoa/ui/activity/LoginActivity.kt | 9 ++- .../DeviceMonitoringDetailFragment.java | 50 +++++++++++++++ .../res/layout/item_device_detail_row.xml | 2 +- .../item_device_detail_row_type_add_speed.xml | 20 +++++- .../layout/item_device_detail_row_type_pl.xml | 20 +++++- .../layout/item_device_detail_row_type_wy.xml | 20 +++++- .../item_device_detail_row_type_zlfl.xml | 21 ++++++- app/src/main/res/values/arrays.xml | 3 +- 14 files changed, 203 insertions(+), 16 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 80a4cab..2f0ce19 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1156,7 +1156,7 @@ + android:screenOrientation="portrait" /> diff --git a/app/src/main/java/com/rehome/zhdcoa/adapter/DeviceManagerListAdapter.kt b/app/src/main/java/com/rehome/zhdcoa/adapter/DeviceManagerListAdapter.kt index 83ad6c6..15de6c4 100644 --- a/app/src/main/java/com/rehome/zhdcoa/adapter/DeviceManagerListAdapter.kt +++ b/app/src/main/java/com/rehome/zhdcoa/adapter/DeviceManagerListAdapter.kt @@ -5,6 +5,7 @@ import android.annotation.SuppressLint import android.content.Context import android.graphics.Bitmap import android.graphics.BitmapFactory +import android.graphics.Color import android.graphics.drawable.BitmapDrawable import android.graphics.drawable.Drawable import android.text.TextUtils @@ -106,8 +107,10 @@ class DeviceManagerListAdapter( binding.tvSbzt.text = itemBean.description if(itemBean.online){ binding.tvZxzt.text = "在线" + binding.tvZxzt.setTextColor(Color.parseColor("#67C23A"))//0099ff }else{ binding.tvZxzt.text = "离线" + binding.tvZxzt.setTextColor(Color.parseColor("#ff0000")) } binding.tvZtsysc.text = itemBean.continuedTime binding.tvAzsj.text = itemBean.installTime diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/Activity_DzdtInfo.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/Activity_DzdtInfo.java index 4dbf404..1935c92 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/Activity_DzdtInfo.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/Activity_DzdtInfo.java @@ -80,7 +80,9 @@ public class Activity_DzdtInfo extends BaseActivity { private final HttpListener callback = new HttpListener() { @Override public void onSucceed(int what, Response response) { - SbfxBean sbfxBean = GsonUtils.GsonToBean(response.get(), SbfxBean.class); + String result = response.get(); + showLog(result); + SbfxBean sbfxBean = GsonUtils.GsonToBean(result, SbfxBean.class); if(sbfxBean!=null){ GDdatas.clear(); YHdatas.clear(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ClcrzsqcxinfoActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ClcrzsqcxinfoActivity.java index b831101..cffa540 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ClcrzsqcxinfoActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ClcrzsqcxinfoActivity.java @@ -349,6 +349,8 @@ public class ClcrzsqcxinfoActivity extends BaseActivity implements View.OnClickL clcrzcxBean.setRows(dataRowsBeanList); clcrzcxBean.setTotal("1"); json = GsonUtils.GsonString(clcrzcxBean); + showLog("---------"); + showLog(json); return json; } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceAlarmInfoLineChartActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceAlarmInfoLineChartActivity.java index e549ef6..7d50cd2 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceAlarmInfoLineChartActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceAlarmInfoLineChartActivity.java @@ -71,6 +71,7 @@ import javax.net.ssl.SSLSocketFactory; public class DeviceAlarmInfoLineChartActivity extends BaseActivityOaToolbarViewBinding { private String deviceCode; private String deviceName; + private String showType;//显示图表类型 //格式化日期的对象(转化成习惯的时间格式) SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdfDay = new SimpleDateFormat("yyyy-MM-dd"); @@ -129,6 +130,66 @@ public class DeviceAlarmInfoLineChartActivity extends BaseActivityOaToolbarViewB if(deviceNameTemp != null&&deviceNameTemp.contains("\"")){ deviceName=deviceNameTemp.replace("\"","").trim(); } + String showTypeTemp = getIntent().getStringExtra("showType"); + if(showTypeTemp != null){ + showType=showTypeTemp; + if("速度".equals(showType)){ + binding.rb1.setChecked(false); + binding.rb2.setChecked(false); + binding.rb3.setChecked(true); + binding.rb4.setChecked(false); + binding.rb5.setChecked(false); + binding.rb6.setChecked(false); + binding.rb7.setChecked(false); + } + if("加速度".equals(showType)){ + binding.rb1.setChecked(false); + binding.rb2.setChecked(true); + binding.rb3.setChecked(false); + binding.rb4.setChecked(false); + binding.rb5.setChecked(false); + binding.rb6.setChecked(false); + binding.rb7.setChecked(false); + } + if("位移".equals(showType)){ + binding.rb1.setChecked(false); + binding.rb2.setChecked(false); + binding.rb3.setChecked(false); + binding.rb4.setChecked(true); + binding.rb5.setChecked(false); + binding.rb6.setChecked(false); + binding.rb7.setChecked(false); + } + if("频率".equals(showType)){ + binding.rb1.setChecked(false); + binding.rb2.setChecked(false); + binding.rb3.setChecked(false); + binding.rb4.setChecked(false); + binding.rb5.setChecked(false); + binding.rb6.setChecked(true); + binding.rb7.setChecked(false); + } + if("直流分量".equals(showType)){ + binding.rb1.setChecked(false); + binding.rb2.setChecked(false); + binding.rb3.setChecked(false); + binding.rb4.setChecked(false); + binding.rb5.setChecked(true); + binding.rb6.setChecked(false); + binding.rb7.setChecked(false); + } + if("温度".equals(showType)){ + binding.rb1.setChecked(true); + binding.rb2.setChecked(false); + binding.rb3.setChecked(false); + binding.rb4.setChecked(false); + binding.rb5.setChecked(false); + binding.rb6.setChecked(false); + binding.rb7.setChecked(false); + } + } + + String title=getIntent().getStringExtra("title"); initToolbar(title, "刷新", new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceOnlineStatusListActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceOnlineStatusListActivity.kt index 53269ed..7be36ce 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceOnlineStatusListActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceOnlineStatusListActivity.kt @@ -27,7 +27,7 @@ import com.yolanda.nohttp.rest.Response class DeviceOnlineStatusListActivity : BaseActivityOaToolbarViewBinding() { - val typeList = mutableListOf("VIBRATION", "OIL", "FUEL", "THERMAL_IMAGER", "VIBRATION_ZB") + val typeList = mutableListOf("VIBRATION", "OIL", "THERMAL_IMAGER", "VIBRATION_ZB") private lateinit var spinnerAdapter: ArrayAdapter //options:[{ value:'online',label:'在线”}{value:'offline',label:'离线”}1， private var dataList: MutableList = mutableListOf()//数据列表 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 8aad8e6..3aab8bf 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 @@ -267,6 +267,12 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { // binding.etUsername.setText("310440") // binding.etPassword.setText("Qch@123456") +// binding.etUsername.setText("310695") +// binding.etPassword.setText("Abcd*1234") +// +// binding.etUsername.setText("310728") +// binding.etPassword.setText("Zl@852290530") + //select * from u_account where account_fullusername='郑佩璋' @@ -315,9 +321,6 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { //谭添欢 // binding.etUsername.setText("310273") // binding.etPassword.setText("#Tth8680004") - //吴云强 -// binding.etUsername.setText("310430") -// binding.etPassword.setText("Laq@201610") //欧建荣 // binding.etUsername.setText("310285") // binding.etPassword.setText("@Ojr310285") diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/DeviceMonitoringDetailFragment.java b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/DeviceMonitoringDetailFragment.java index a6995ac..728911d 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/DeviceMonitoringDetailFragment.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/DeviceMonitoringDetailFragment.java @@ -104,9 +104,59 @@ public class DeviceMonitoringDetailFragment extends BaseViewBindingFragment + android:text="" /> + + + + + + + + + + + + + 测振测温设备 油质监测设备 - 燃料测温设备 热成像测温设备 zigBee 传感器 @@ -65,3 +64,5 @@ + + \ No newline at end of file