diff --git a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
index a50f38c..d39875e 100644
--- a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
+++ b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
@@ -105,9 +105,17 @@
         batteryDataView.setTextColor(rowsBean.cell.toTextColor(context))
         signalImageView.setBackgroundResource(rowsBean.rsrp.toSignalImage())
         snrDataView.text = rowsBean.snr
-        val value = rowsBean.strength.toDouble().toInt()
-        lelValueView.text = "$value%"
-        volValueView.text = "${value * 500}ppm"
+        val value = rowsBean.strength
+        lelValueView.text = if (value.isNullOrBlank()) {
+            "0%"
+        } else {
+            "${value.toDouble().toInt()}%"
+        }
+        volValueView.text = if (value.isNullOrBlank()) {
+            "0ppm"
+        } else {
+            "${value.toDouble().toInt() * 500}ppm"
+        }
         installDateView.text = if (rowsBean.uptime.isNullOrBlank()) {
             String.format("更新时间：未知")
         } else {

diff --git a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
index a50f38c..d39875e 100644
--- a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
+++ b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
@@ -105,9 +105,17 @@
         batteryDataView.setTextColor(rowsBean.cell.toTextColor(context))
         signalImageView.setBackgroundResource(rowsBean.rsrp.toSignalImage())
         snrDataView.text = rowsBean.snr
-        val value = rowsBean.strength.toDouble().toInt()
-        lelValueView.text = "$value%"
-        volValueView.text = "${value * 500}ppm"
+        val value = rowsBean.strength
+        lelValueView.text = if (value.isNullOrBlank()) {
+            "0%"
+        } else {
+            "${value.toDouble().toInt()}%"
+        }
+        volValueView.text = if (value.isNullOrBlank()) {
+            "0ppm"
+        } else {
+            "${value.toDouble().toInt() * 500}ppm"
+        }
         installDateView.text = if (rowsBean.uptime.isNullOrBlank()) {
             String.format("更新时间：未知")
         } else {
diff --git a/app/src/main/res/layout/activity_add_device.xml b/app/src/main/res/layout/activity_add_device.xml
index 0dbe3dc..8514ef2 100644
--- a/app/src/main/res/layout/activity_add_device.xml
+++ b/app/src/main/res/layout/activity_add_device.xml
@@ -67,6 +67,7 @@
             <RelativeLayout style="@style/RelativeItemLayoutStyle">
 
                 <TextView
+                    android:id="@+id/tempView"
                     style="@style/RelativeTextViewStyle"
                     android:text="所属项目" />
 
@@ -74,7 +75,9 @@
                     android:id="@+id/ownerShipView"
                     style="@style/RelativeTextViewStyle"
                     android:layout_toStartOf="@id/ownerShipTempView"
+                    android:layout_toEndOf="@id/tempView"
                     android:hint="请选择"
+                    android:maxLines="2"
                     android:textColorHint="@color/hintTextColor" />
 
                 <ImageView

diff --git a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
index a50f38c..d39875e 100644
--- a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
+++ b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt
@@ -105,9 +105,17 @@
         batteryDataView.setTextColor(rowsBean.cell.toTextColor(context))
         signalImageView.setBackgroundResource(rowsBean.rsrp.toSignalImage())
         snrDataView.text = rowsBean.snr
-        val value = rowsBean.strength.toDouble().toInt()
-        lelValueView.text = "$value%"
-        volValueView.text = "${value * 500}ppm"
+        val value = rowsBean.strength
+        lelValueView.text = if (value.isNullOrBlank()) {
+            "0%"
+        } else {
+            "${value.toDouble().toInt()}%"
+        }
+        volValueView.text = if (value.isNullOrBlank()) {
+            "0ppm"
+        } else {
+            "${value.toDouble().toInt() * 500}ppm"
+        }
         installDateView.text = if (rowsBean.uptime.isNullOrBlank()) {
             String.format("更新时间：未知")
         } else {
diff --git a/app/src/main/res/layout/activity_add_device.xml b/app/src/main/res/layout/activity_add_device.xml
index 0dbe3dc..8514ef2 100644
--- a/app/src/main/res/layout/activity_add_device.xml
+++ b/app/src/main/res/layout/activity_add_device.xml
@@ -67,6 +67,7 @@
             <RelativeLayout style="@style/RelativeItemLayoutStyle">
 
                 <TextView
+                    android:id="@+id/tempView"
                     style="@style/RelativeTextViewStyle"
                     android:text="所属项目" />
 
@@ -74,7 +75,9 @@
                     android:id="@+id/ownerShipView"
                     style="@style/RelativeTextViewStyle"
                     android:layout_toStartOf="@id/ownerShipTempView"
+                    android:layout_toEndOf="@id/tempView"
                     android:hint="请选择"
+                    android:maxLines="2"
                     android:textColorHint="@color/hintTextColor" />
 
                 <ImageView
diff --git a/app/src/main/res/layout/item_group_over_view_rv.xml b/app/src/main/res/layout/item_group_over_view_rv.xml
index babe213..8c7436d 100644
--- a/app/src/main/res/layout/item_group_over_view_rv.xml
+++ b/app/src/main/res/layout/item_group_over_view_rv.xml
@@ -23,7 +23,8 @@
                 android:id="@+id/groupNameView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="项目编号: 20311" />
+                android:singleLine="true"
+                android:text="项目编号: 203" />
 
             <TextView
                 android:id="@+id/groupLocationView"