新增 新增设备照片管理页面

master
wenfei 1 month ago
parent 33e6f35a8a
commit 022161c109

@ -82,7 +82,6 @@
tools:replace="android:allowBackup"
tools:targetApi="s">
<meta-data
android:name="design_width"
android:value="768" />
@ -458,6 +457,9 @@
<activity
android:name=".ui.activity.DeviceOnlineStatusActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.DeviceOnlinePhotoManageActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.YdckglActivity"
android:screenOrientation="portrait" />

@ -540,6 +540,10 @@ public class Contans {
//http://10.19.0.17:1700/dserver/device/vibration/monitoring/list?deviceCode=002c005e&startTime=2026-01-21+14:37:00&endTime=2026-01-22+23:59:59&v=1769063841074
public final static String DeviceAlermInfoDataListUrl = "dserver/device/vibration/monitoring/list";
public final static String DeviceOnlineStatusUrl = "dserver/device/online/data";
public final static String getDevicePhotoListUrl = "dserver/device/img";
//设备在线列表
public final static String DeviceOnlineStatusListUrl = "dserver/device/list";
//人员组织结构模块 用户验证接口token

@ -0,0 +1,129 @@
package com.rehome.zhdcoa.bean;
import java.util.Date;
import java.util.List;
/**
*
*
* @author HuangWenfei
*/
public class DeviceOnlineStatusImgBean extends DeviceAlarmBaseBean{
private List<DeviceOnlineStatusImg> data;
public List<DeviceOnlineStatusImg> getData() {
return data;
}
public void setData(List<DeviceOnlineStatusImg> data) {
this.data = data;
}
public static class DeviceOnlineStatusImg {
/**
*
*/
private String deviceName;
/**
* id
*/
private Integer id;
/**
* id
*/
private String deviceId;
/**
*
*/
private String imgUrl;
/**
*
*/
private String fileName;
/**
*
*/
private Date createTime;
/**
*
*/
private Date deleteTime;
/**
*
*/
private Integer isDeleted;
public String getDeviceName() {
return deviceName;
}
public void setDeviceName(String deviceName) {
this.deviceName = deviceName;
}
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getDeviceId() {
return deviceId;
}
public void setDeviceId(String deviceId) {
this.deviceId = deviceId;
}
public String getImgUrl() {
return imgUrl;
}
public void setImgUrl(String imgUrl) {
this.imgUrl = imgUrl;
}
public String getFileName() {
return fileName;
}
public void setFileName(String fileName) {
this.fileName = fileName;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getDeleteTime() {
return deleteTime;
}
public void setDeleteTime(Date deleteTime) {
this.deleteTime = deleteTime;
}
public Integer getIsDeleted() {
return isDeleted;
}
public void setIsDeleted(Integer isDeleted) {
this.isDeleted = isDeleted;
}
}
}

@ -1,20 +1,15 @@
package com.rehome.zhdcoa.ui.activity
import android.os.Bundle
import android.content.Intent
import android.text.TextUtils
import android.view.View
import android.widget.ArrayAdapter
import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
import com.google.gson.GsonBuilder
import com.google.gson.reflect.TypeToken
import com.rehome.zhdcoa.Contans
import com.rehome.zhdcoa.Listener.OnItemClickListener
import com.rehome.zhdcoa.R
import com.rehome.zhdcoa.adapter.DeviceAlarmInfoAdapter
import com.rehome.zhdcoa.adapter.DeviceOnlineStatusListAdapter
import com.rehome.zhdcoa.base.BaseActivityOaToolbarViewBinding
import com.rehome.zhdcoa.bean.DeviceAlarmListResultBean
import com.rehome.zhdcoa.bean.DeviceOnlineStatusListResultBean
import com.rehome.zhdcoa.databinding.ActivityDeviceOnlineStatusListBinding
import com.rehome.zhdcoa.utils.AuthenticationLoginAIUtils
@ -23,11 +18,11 @@ import com.rehome.zhdcoa.utils.HttpListener
import com.rehome.zhdcoa.utils.NohttpUtils
import com.rehome.zhdcoa.utils.RSAAndroid
import com.rehome.zhdcoa.weiget.LoadListView
import com.rehome.zhdcoa.weiget.OAToolbar
import com.yolanda.nohttp.NoHttp
import com.yolanda.nohttp.RequestMethod
import com.yolanda.nohttp.rest.Response
class DeviceOnlineStatusListActivity : BaseActivityOaToolbarViewBinding<ActivityDeviceOnlineStatusListBinding>() {
val typeList = mutableListOf<String>("VIBRATION", "OIL", "FUEL", "THERMAL_IMAGER", "VIBRATION_ZB")
@ -67,11 +62,37 @@ class DeviceOnlineStatusListActivity : BaseActivityOaToolbarViewBinding<Activity
showLog("typeTemp:")
showLog(typeTemp)
binding.lv.emptyView = binding.tvNodata
val gson = GsonBuilder()
.setPrettyPrinting()
.serializeNulls()
.create()
deviceOnlineStatusListAdapter = DeviceOnlineStatusListAdapter(context, dataList,typeTemp
) { position, _ ->
run {
val item = dataList[position]
showLog(GsonUtils.GsonString(item))
val type = object : TypeToken<Map<String, Any>>() {}.type
val mapItem: Map<String, Any>? = gson.fromJson(GsonUtils.GsonString(item), type)
if(mapItem!=null){
//val typeTemp:String = binding.spZy.selectedItem.toString()
val typeIndex:Int = binding.spZy.selectedItemPosition
//request.add("type",typeList[typeIndex])
val intent = Intent(context,DeviceOnlinePhotoManageActivity::class.java)
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
intent.putExtra("deviceName", mapItem["name"].toString())
if(typeIndex==0){
intent.putExtra("deviceId", mapItem["id"].toString())
}
if(typeIndex==4){
intent.putExtra("deviceId", mapItem["deviceCode"].toString())
}
startActivity(intent)
}
//DeviceOnlinePhotoManageActivity
//R.layout.activity_device_online_photo_manage
}
}
binding.lv.adapter = deviceOnlineStatusListAdapter

@ -0,0 +1,114 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/activity_sqxgdlr3"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".ui.activity.DeviceOnlinePhotoManageActivity">
<include layout="@layout/layout_base"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical|start">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:textSize="20sp"
android:textStyle="bold"
android:text="设备:" />
<TextView
android:id="@+id/tv_sbmc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:textSize="20sp"
android:textStyle="bold"
android:text="" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:background="@drawable/radius"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycleDevicePhotoOnline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:overScrollMode="never" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:background="@drawable/radius"
android:minHeight="90dp"
android:orientation="vertical">
<CheckBox
android:id="@+id/cb_crop"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="是否裁剪图片"
android:textColor="#53575e"
android:textSize="14sp"
android:visibility="gone" />
<CheckBox
android:id="@+id/cb_compress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true"
android:gravity="center_vertical"
android:text="是否压缩图片"
android:textColor="#53575e"
android:textSize="14sp"
android:visibility="gone" />
<CheckBox
android:id="@+id/cb_editor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true"
android:gravity="center_vertical"
android:text="是否开启图片编辑"
android:textColor="#53575e"
android:textSize="14sp"
android:visibility="gone" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:overScrollMode="never" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
Loading…
Cancel
Save