hwf453
/
ZHDCOA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

设备总览-完成

Browse Source
master
wenfei 4 weeks ago
parent 2b6a435a31
commit dbb452fa7c
3 changed files with 106 additions and 156 deletions
Show Stats Download Patch File Download Diff File

11
app/src/main/java/com/rehome/zhdcoa/adapter/DeviceOverviewListAdapter.kt
Unescape Escape View File

@ -99,11 +99,16 @@ class DeviceOverviewListAdapter(
binding.ivDevicePhoto.setImageDrawable(drawable) binding.ivDevicePhoto.setImageDrawable(drawable)
} }
binding.tvMc.text = itemBean.name
if(!TextUtils.isEmpty(itemBean.areaFullName)){ if(!TextUtils.isEmpty(itemBean.areaFullName)){
binding.tvArea.text = itemBean.areaFullName binding.tvMc.text = itemBean.areaFullName+" > "+itemBean.name
}else{
binding.tvMc.text = itemBean.name
} }
binding.tvSbzt.text = itemBean.description binding.tvSbzt.text = itemBean.description
if(!TextUtils.isEmpty(itemBean.description)&&"正常"==itemBean.description){
binding.tvSbzt.setTextColor(Color.parseColor("#67C23A"))//0099ff
}
if(itemBean.online){ if(itemBean.online){
binding.tvZxzt.text = "在线" binding.tvZxzt.text = "在线"
binding.tvZxzt.setTextColor(Color.parseColor("#67C23A"))//0099ff binding.tvZxzt.setTextColor(Color.parseColor("#67C23A"))//0099ff
@ -111,8 +116,6 @@ class DeviceOverviewListAdapter(
binding.tvZxzt.text = "离线" binding.tvZxzt.text = "离线"
binding.tvZxzt.setTextColor(Color.parseColor("#ff0000")) binding.tvZxzt.setTextColor(Color.parseColor("#ff0000"))
} }
binding.tvZtsysc.text = itemBean.continuedTime
binding.tvAzsj.text = itemBean.installTime
binding.tvYczsc.text = itemBean.runningTime binding.tvYczsc.text = itemBean.runningTime
binding.tvSjgxsj.text = itemBean.warningTime binding.tvSjgxsj.text = itemBean.warningTime
binding.llCwcz.setOnClickListener { binding.llCwcz.setOnClickListener {

131
app/src/main/res/layout/adapter_device_overview_list.xml
Unescape Escape View File

@ -11,23 +11,41 @@
android:id="@+id/ll_cwcz" android:id="@+id/ll_cwcz"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="visible" android:orientation="horizontal"
android:orientation="horizontal"> android:visibility="visible">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="10dp" android:layout_marginStart="6dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginEnd="6dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical" android:orientation="vertical"
tools:ignore="UselessParent"> tools:ignore="UselessParent">
<LinearLayout <LinearLayout
style="@style/dagerListMarginTopStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:layout_marginBottom="5dp"
tools:ignore="UselessParent"> android:orientation="vertical">
<TextView
android:id="@+id/tv_mc"
style="@style/deviceManagerStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:text="#1锅炉区域 > 1号锅炉0米捞渣机,锅炉区域" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#cccccc" />
</LinearLayout>
<LinearLayout <LinearLayout
style="@style/dagerListMarginTopStyle" style="@style/dagerListMarginTopStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -41,67 +59,23 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="0dp" android:layout_marginTop="0dp"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView <ImageView
android:id="@+id/iv_device_photo" android:id="@+id/iv_device_photo"
android:layout_width="80dp" android:layout_width="110dp"
android:layout_height="80dp" android:layout_height="110dp"
android:contentDescription="@string/iv_device_photo" android:contentDescription="@string/iv_device_photo"
android:src="@drawable/icon_device_place" /> android:src="@drawable/icon_device_place" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
style="@style/dagerListMarginTopStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_marginTop="3dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="2" android:layout_weight="2"
android:layout_margin="6dp"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
style="@style/dagerListMarginTopStyle" style="@style/deviceOverlayStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginBottom="5dp"
android:orientation="horizontal">
<TextView
style="@style/deviceManagerStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="设备位置:" />
<TextView
android:id="@+id/tv_area"
style="@style/deviceManagerStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="#1锅炉区域 > 1号锅炉0米捞渣机,锅炉区域" />
</LinearLayout>
<LinearLayout
style="@style/dagerListMarginTopStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal">
<TextView
style="@style/deviceManagerStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="设备名称:" />
<TextView
android:id="@+id/tv_mc"
style="@style/deviceManagerStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="#1-2循环浆液泵电机尾部" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
style="@style/dagerListMarginTopStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
@ -126,6 +100,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" /> android:layout_weight="1" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
style="@style/dagerListMarginTopStyle" style="@style/dagerListMarginTopStyle"
android:layout_width="0dp" android:layout_width="0dp"
@ -148,7 +123,7 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
style="@style/dagerListMarginTopStyle" style="@style/deviceOverlayStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
@ -164,10 +139,10 @@
style="@style/deviceManagerStyle" style="@style/deviceManagerStyle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="状态持续时长:" /> android:text="运行总时长:" />
<TextView <TextView
android:id="@+id/tv_ztsysc" android:id="@+id/tv_yczsc"
style="@style/deviceManagerStyle" style="@style/deviceManagerStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -175,26 +150,10 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
style="@style/dagerListMarginTopStyle" style="@style/deviceOverlayStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
style="@style/deviceManagerStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="安装时间:" />
<TextView
android:id="@+id/tv_azsj"
style="@style/deviceManagerStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
style="@style/dagerListMarginTopStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="6dp"
android:orientation="horizontal"> android:orientation="horizontal">
<LinearLayout <LinearLayout
@ -208,32 +167,16 @@
style="@style/deviceManagerStyle" style="@style/deviceManagerStyle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="运行总时长:" /> android:text="数据更新时间:" />
<TextView <TextView
android:id="@+id/tv_yczsc" android:id="@+id/tv_sjgxsj"
style="@style/deviceManagerStyle" style="@style/deviceManagerStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" /> android:layout_weight="1" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout
style="@style/dagerListMarginTopStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
style="@style/deviceManagerStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="数据更新时间:" />
<TextView
android:id="@+id/tv_sjgxsj"
style="@style/deviceManagerStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

4
app/src/main/res/values/styles.xml
Unescape Escape View File

@ -140,6 +140,10 @@
<style name="dagerListMarginTopStyle"> <style name="dagerListMarginTopStyle">
<item name="android:layout_marginTop">5dp</item> <item name="android:layout_marginTop">5dp</item>
</style> </style>
<!-- 设备总览样式-->
<style name="deviceOverlayStyle">
<item name="android:layout_marginTop">8dp</item>
</style>
<!-- 危化品入厂申请列表左边样式--> <!-- 危化品入厂申请列表左边样式-->
<style name="dagerListLeftStyle"> <style name="dagerListLeftStyle">
<item name="android:gravity">center</item> <item name="android:gravity">center</item>

Write Preview
Loading…
Cancel
Save