7.6.2

app/app.iml

@@ -172,6 +172,7 @@
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.4.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.amap.api:3dmap:6.9.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.lzy.net:okgo:2.1.4@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.zyp.cardview:cardview:1.0.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:cardview-v7:28.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.facebook.fresco:drawee:1.3.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.14.0@jar" level="project" />

app/src/main/java/com/silence/commonframe/activity/home/activity/AdddevicedetailActivity.java

@@ -84,7 +84,7 @@ public class AdddevicedetailActivity extends BaseActivity implements AddDeviceDe
 
         presenter.getSite();
 
-        devicePlace.requestFocus();
+        deviceName.requestFocus();
         tv_spinner.setOnClickListener(clickListener);
         mSpinerPopWindow = new SpinerPopWindow<>(this, listSite,itemClickListener);
         mSpinerPopWindow.setOnDismissListener(dismissListener);
@@ -107,7 +107,7 @@ public class AdddevicedetailActivity extends BaseActivity implements AddDeviceDe
 
     public void click(View view) {
         avoidDoubleClick(view);
-       str1 = devicePlace.getText().toString();
+        str1 = devicePlace.getText().toString();
         if (TextUtils.isEmpty(str1)){
             onFile(getResources().getString(R.string.please_edit_location));
             return;

app/src/main/java/com/silence/commonframe/activity/message/activity/MessageFragment.java

@@ -57,7 +57,7 @@ public class MessageFragment extends BaseFragment implements NewFindListener.Vie
 
     @Override
     protected int getLayoutResource() {
-        return R.layout.fragment_find;
+        return R.layout.fragment_message;
     }
 
     @Override

app/src/main/java/com/silence/commonframe/activity/mine/activity/NewSiteDetailActivity.java

@@ -54,7 +54,7 @@ public class NewSiteDetailActivity extends BaseActivity implements SiteDetailLis
     public void initView() {
         setTitle(this, getResources().getString(R.string.site_list), "", true);
         rvList.setLayoutManager(new StaggeredGridLayoutManager(1, StaggeredGridLayoutManager.VERTICAL));
-        rvList.addItemDecoration(new LinearItemDecoration(this, LinearLayoutManager.HORIZONTAL,5,getResources().getColor(R.color.thingray)));     //设置分割线
+        rvList.addItemDecoration(new LinearItemDecoration(this, LinearLayoutManager.HORIZONTAL,8,getResources().getColor(R.color.thingray)));     //设置分割线
         siteDetailsAdapter=new SiteDetailsAdapter(R.layout.recyclerview_item_minedevice,dataBeans,this,this);
         rvList.setAdapter(siteDetailsAdapter);
 

app/src/main/java/com/silence/commonframe/adapter/mine/NewLinkManAdapter.java

@@ -20,8 +20,8 @@ public class NewLinkManAdapter extends BaseQuickAdapter<LinkManBean.DataBean,Bas
 
     @Override
     protected void convert(BaseViewHolder helper, LinkManBean.DataBean item) {
-        helper.setText(R.id.tv_name,item.getName() + "：");
-        helper.setText(R.id.tv_phone,item.getPhone());
+        helper.setText(R.id.tv_name,item.getName() + "");
+        helper.setText( R.id.tv_phone, "：" +item.getPhone());
         helper.getView(R.id.iv_delete).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {

app/src/main/res/drawable-hdpi/bg_switch_thumb_gray.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape android:shape="rectangle"
-    xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size android:height="20dp" android:width="20dp"/>
-
-    <corners android:radius="10dp"/>
-
-    <solid android:color="@color/mygray"/>
-</shape>

app/src/main/res/drawable/bg_switch_thumb_blue.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape android:shape="rectangle"
-    xmlns:android="http://schemas.android.com/apk/res/android" >
+<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
 
     <size android:height="20dp" android:width="20dp"/>
 

app/src/main/res/layout/activity_add_context_device.xml

@@ -34,7 +34,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/device_category"
                     android:textColor="@color/myblack"
-                    android:textSize="14dp" />
+                    android:textSize="15dp" />
 
                 <TextView
                     android:id="@+id/tv_device_type"
@@ -45,6 +45,7 @@
                     android:layout_marginLeft="@dimen/dp_10"
                     android:gravity="center_vertical"
                     android:drawableRight="@drawable/icon_botton"
+                    android:textSize="15sp"
                     android:textColor="@color/text_black" />
             </LinearLayout>
 
@@ -66,7 +67,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/device_id"
                     android:textColor="@color/myblack"
-                    android:textSize="14sp" />
+                    android:textSize="15sp" />
 
                 <EditText
                     android:id="@+id/et_code"
@@ -79,7 +80,7 @@
                     android:hint="@string/device_id_hint"
                     android:singleLine="true"
                     android:textColor="@color/myblack"
-                    android:textSize="14sp" />
+                    android:textSize="15sp" />
 
                 <ImageView
                     android:id="@+id/iv_qr_code"

app/src/main/res/layout/activity_adddevicedetail.xml

@@ -20,35 +20,36 @@
         android:orientation="vertical">
 
         <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="35dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
-            android:layout_marginTop="10dp"
-            android:layout_marginLeft="15dp"
+            android:padding="@dimen/normal_side"
             android:orientation="horizontal">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@color/myblack"
-                android:textSize="14sp"
+                android:textSize="16sp"
                 android:text="设备编号：" />
 
             <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:id="@+id/device_id"
-                android:textColor="#444"
-                android:textSize="14sp"
-                android:layout_marginLeft="5dp"
+                android:textColor="@color/myblack"
+                android:textSize="16sp"
+                android:paddingLeft="5dp"
                 android:text="" />
 
         </LinearLayout>
 
+        <include layout="@layout/bottom_line"/>
+
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="35dp"
-            android:layout_marginLeft="15dp"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/normal_side"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
@@ -56,124 +57,88 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@color/myblack"
-                android:textSize="14sp"
+                android:textSize="16sp"
                 android:text="设备名称：" />
 
-            <LinearLayout
+            <EditText
                 android:layout_width="match_parent"
-                android:layout_height="35dp"
-                android:layout_marginLeft="5dp"
-                android:gravity="center_vertical"
-                android:orientation="vertical">
-
-                <EditText
-                    android:layout_width="match_parent"
-                    android:layout_height="30dp"
-                    android:id="@+id/device_name"
-                    android:layout_marginRight="10dp"
-                    android:textColor="@color/myblack"
-                    android:textSize="14sp"
-                    android:theme="@style/MyEditText"
-                    android:background="#fff"
-                    android:singleLine="true"
-                    android:text="" />
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginRight="10dp"
-                    android:background="#ccc"/>
-
-            </LinearLayout>
+                android:layout_height="match_parent"
+                android:id="@+id/device_name"
+                android:paddingLeft="5dp"
+                android:textColor="@color/myblack"
+                android:textSize="16sp"
+                android:theme="@style/MyEditText"
+                android:background="#fff"
+                android:singleLine="true"
+                android:text="" />
 
         </LinearLayout>
 
+        <include layout="@layout/bottom_line"/>
+
         <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="35dp"
-            android:layout_marginLeft="15dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/normal_side"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="#444"
-                android:textSize="14sp"
+                android:textColor="@color/myblack"
+                android:textSize="16sp"
                 android:text="安装位置：" />
 
-            <LinearLayout
+            <EditText
+                android:id="@+id/device_place"
                 android:layout_width="match_parent"
-                android:layout_height="35dp"
-                android:layout_marginLeft="5dp"
-                android:gravity="center_vertical"
-                android:orientation="vertical">
-
-                <EditText
-                    android:id="@+id/device_place"
-                    android:layout_width="match_parent"
-                    android:layout_height="30dp"
-                    android:layout_marginRight="10dp"
-                    android:textColor="#444"
-                    android:textSize="14sp"
-                    android:theme="@style/MyEditText"
-                    android:background="#fff"
-                    android:singleLine="true" />
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginRight="10dp"
-                    android:background="#ccc"/>
-
-            </LinearLayout>
+                android:layout_height="match_parent"
+                android:textColor="@color/myblack"
+                android:textSize="16sp"
+                android:paddingLeft="5dp"
+                android:hint="请输入安装位置"
+                android:theme="@style/MyEditText"
+                android:background="#fff"
+                android:singleLine="true" />
 
         </LinearLayout>
 
+        <include layout="@layout/bottom_line"/>
+
         <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="35dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
-            android:layout_marginLeft="15dp"
+            android:paddingLeft="@dimen/normal_side"
+            android:paddingRight="@dimen/normal_side"
             android:orientation="horizontal">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="#444"
-                android:textSize="14sp"
+                android:textColor="@color/myblack"
+                android:textSize="16sp"
                 android:text="所属场地：" />
 
-            <LinearLayout
+            <TextView
+                android:id="@+id/tv_value"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="5dp"
+                android:layout_height="wrap_content"
+                android:paddingTop="@dimen/normal_side"
+                android:paddingBottom="@dimen/normal_side"
                 android:gravity="center_vertical"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/tv_value"
-                    android:layout_width="match_parent"
-                    android:layout_height="30dp"
-                    android:gravity="center_vertical"
-                    android:layout_marginRight="10dp"
-                    android:background="@drawable/shape_help_category_tv_bg"
-                    android:drawableRight="@drawable/icon_down"
-                    android:paddingLeft="10dp"
-                    android:textColor="@color/content_color"
-                    android:text="请选择场所"
-                    android:textSize="14sp"/>
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginRight="10dp"
-                    android:background="#ccc"/>
-
-            </LinearLayout>
+                android:background="@drawable/shape_help_category_tv_bg"
+                android:drawableRight="@drawable/icon_down"
+                android:paddingLeft="10dp"
+                android:textColor="@color/content_color"
+                android:text="请选择场所"
+                android:textSize="16sp"/>
 
         </LinearLayout>
 
+        <include layout="@layout/bottom_line"/>
+
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"

app/src/main/res/layout/activity_coustomer.xml

@@ -13,76 +13,78 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"/>
 
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:padding="@dimen/normal_side"
+            android:gravity="center_vertical"
             android:orientation="horizontal">
 
             <LinearLayout
-                android:layout_width="100dp"
-                android:layout_height="80dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:orientation="vertical">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="15dp"
-                    android:layout_marginTop="16dp"
-                    android:textSize="14sp"
-                    android:textColor="#444"
-                    android:text="客服电话"
-                    />
+                    android:textSize="16sp"
+                    android:textColor="@color/myblack"
+                    android:text="客服电话" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:layout_marginLeft="15dp"
-                    android:textSize="14sp"
-                    android:textColor="#444"
-                    android:text="工作时间"
-                    />
+                    android:textSize="16sp"
+                    android:textColor="@color/myblack"
+                    android:layout_marginTop="10dp"
+                    android:text="工作时间" />
 
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="wrap_content"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="15dp"
                 android:orientation="vertical">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
                     android:text="4006005531"
-                    android:textSize="14sp"
-                    android:textColor="#444"
-                    />
+                    android:textSize="16sp"
+                    android:textColor="@color/myblack" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
+                    android:layout_marginTop="10dp"
                     android:text="09:00&#45;&#45;18:00（周一至周六）"
-                    android:textSize="14sp"
-                    android:textColor="#444"
-                    />
+                    android:textSize="16sp"
+                    android:textColor="@color/myblack" />
             </LinearLayout>
-                <ImageView
-                    android:layout_width="35dp"
-                    android:layout_height="35dp"
-                    android:layout_marginLeft="30dp"
-                    android:layout_gravity="center"
-                    android:layout_marginRight="10dp"
-                    android:onClick="diallPhone"
-                    app:srcCompat="@mipmap/sitetel1" />
 
         </LinearLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/gray_line"/>
+        <ImageView
+            android:layout_width="50dp"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_gravity="center"
+            android:layout_marginRight="15dp"
+            android:onClick="diallPhone"
+            app:srcCompat="@mipmap/sitetel1" />
+
+    </RelativeLayout>
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:background="@color/gray_line"/>
 
 </LinearLayout>

app/src/main/res/layout/activity_device_detail_new.xml

@@ -19,15 +19,18 @@
         <ScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent">
+
             <LinearLayout
                 android:orientation="vertical"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="wrap_content">
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="15dp"
-                    android:layout_marginTop="4dp"
+                    android:layout_marginLeft="@dimen/normal_side"
+                    android:layout_marginRight="@dimen/normal_side"
+                    android:layout_marginTop="@dimen/margin_side"
                     android:orientation="vertical">
 
                     <TextView
@@ -42,22 +45,22 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="3dp"
-                        android:layout_marginRight="10dp"
+                        android:layout_marginTop="10dp"
                         android:orientation="horizontal">
 
                         <ImageView
-                            android:layout_width="70dp"
-                            android:layout_height="70dp"
+                            android:layout_width="60dp"
+                            android:layout_height="60dp"
                             android:layout_gravity="center"
                             android:background="@mipmap/devicepicture" />
 
                         <RelativeLayout
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="10dp">
 
                             <LinearLayout
-                                android:layout_width="wrap_content"
+                                android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:layout_centerInParent="true"
                                 android:orientation="vertical">
@@ -65,6 +68,7 @@
                                 <LinearLayout
                                     android:layout_width="match_parent"
                                     android:layout_height="match_parent"
+                                    android:layout_marginBottom="5dp"
                                     android:orientation="horizontal">
 
                                     <TextView
@@ -82,17 +86,12 @@
                                         android:textColor="@color/myblack"
                                         android:textSize="14sp" />
 
-                                    <View
-                                        android:layout_width="0dp"
-                                        android:layout_height="match_parent"
-                                        android:layout_weight="1"
-                                        android:textColor="@color/myblack"></View>
-
                                 </LinearLayout>
 
                                 <LinearLayout
                                     android:layout_width="match_parent"
                                     android:layout_height="match_parent"
+                                    android:layout_marginBottom="5dp"
                                     android:orientation="horizontal">
 
                                     <TextView
@@ -124,16 +123,12 @@
                                         android:textColor="@color/myblack"
                                         android:textSize="14sp" />
 
-                                    <View
-                                        android:layout_width="0dp"
-                                        android:layout_height="match_parent"
-                                        android:layout_weight="1"></View>
-
                                 </LinearLayout>
 
                                 <LinearLayout
                                     android:layout_width="match_parent"
                                     android:layout_height="match_parent"
+                                    android:layout_marginBottom="5dp"
                                     android:orientation="horizontal">
 
                                     <TextView
@@ -167,51 +162,25 @@
 
                                 </LinearLayout>
 
-                                <LinearLayout
-                                    android:layout_width="match_parent"
-                                    android:layout_height="match_parent"
-                                    android:orientation="horizontal">
-
-                                    <TextView
-                                        android:id="@+id/tv_place1"
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text="详细地址：杭州市余杭区海智海3栋"
-                                        android:lineSpacingMultiplier="1.2"
-                                        android:textColor="@color/myblack"
-                                        android:textSize="14sp" />
-
-                                </LinearLayout>
+                                <TextView
+                                    android:id="@+id/tv_place1"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="详细地址：杭州市余杭区海智海3栋"
+                                    android:lineSpacingMultiplier="1.2"
+                                    android:textColor="@color/myblack"
+                                    android:textSize="14sp" />
 
                             </LinearLayout>
 
-                            <LinearLayout
+                            <TextView
+                                android:id="@+id/tv_status"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentRight="true"
-                                android:orientation="vertical">
-
-                                <LinearLayout
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginRight="5dp">
-
-                                </LinearLayout>
-
-                                <LinearLayout
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginRight="5dp">
-
-                                    <TextView
-                                        android:id="@+id/tv_status"
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text="离线 "
-                                        android:textColor="@color/myblack"
-                                        android:textSize="14sp" />
-                                </LinearLayout>
-                            </LinearLayout>
+                                android:text="离线 "
+                                android:textColor="@color/myblack"
+                                android:textSize="14sp" />
 
                         </RelativeLayout>
 
@@ -219,12 +188,6 @@
 
                 </LinearLayout>
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginTop="10dp"
-                    android:background="@color/gray_line"></View>
-
                 <TextView
                     android:id="@+id/tv_running_record"
                     android:layout_width="match_parent"
@@ -238,6 +201,12 @@
                     android:textColor="@color/myblue"
                     android:textSize="16sp" />
 
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginBottom="10dp"
+                    android:background="@color/gray_line"></View>
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"

app/src/main/res/layout/item_item_firealarm.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v7.widget.CardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -7,9 +8,7 @@
     android:foreground="?android:attr/selectableItemBackground"
     card_view:cardBackgroundColor="@android:color/white"
     card_view:cardCornerRadius="10dp"
-    android:layout_marginTop="@dimen/margin_side"
-    android:layout_marginLeft="@dimen/margin_side"
-    android:layout_marginRight="@dimen/margin_side"
+    android:layout_margin="5dp"
     card_view:cardElevation="4dp">
 
     <RelativeLayout
@@ -36,7 +35,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
-                android:paddingLeft="5dp"
                 android:text="区域名：海智中心3栋6"
                 android:textColor="@color/myblack"
                 android:textSize="16dp" />
@@ -46,7 +44,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
-                android:paddingLeft="5dp"
                 android:text="正常"
                 android:textColor="@color/myblack"
                 android:textSize="16dp" />
@@ -56,7 +53,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
-                android:paddingLeft="5dp"
                 android:text="编号：123456789"
                 android:textColor="@color/myblack"
                 android:textSize="16dp" />
@@ -66,7 +62,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
-                android:paddingLeft="5dp"
                 android:text="位置：杭州市区余杭海之中西"
                 android:textColor="@color/myblack"
                 android:textSize="16dp" />
@@ -76,7 +71,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
-                android:paddingLeft="5dp"
                 android:text="时间：2018年11月9日"
                 android:textColor="@color/myblack"
                 android:textSize="16dp" />
@@ -86,7 +80,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
-                android:paddingLeft="5dp"
                 android:lineSpacingMultiplier="1.2"
                 android:text="详细地址：杭州市余杭区海智园3栋404"
                 android:textColor="@color/myblack"

app/src/main/res/layout/item_recylerview.xml

@@ -24,6 +24,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="2dp"
+            android:textStyle="bold"
             android:text="独立烟感探测报警器"
             android:textColor="@color/myblack"
             android:textSize="18sp" />
@@ -53,6 +54,7 @@
                     android:id="@+id/recycler_view_place"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:paddingLeft="5dp"
                     android:text="区域名：海智中心3栋6"
                     android:textColor="@color/myblack"
                     android:textSize="15sp" />

app/src/main/res/layout/linkmanrececlyview_item.xml

@@ -14,6 +14,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"
+        android:textStyle="bold"
         android:textColor="@color/myblack"
         android:textSize="17sp" />
 

app/src/main/res/layout/recyclerview_item_minedevice.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.silence.commonframe.utils.LeftSlideView
-    android:layout_marginBottom="1dp"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="68dp"
@@ -21,8 +20,6 @@
             <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_side"
-                android:layout_marginBottom="@dimen/margin_side"
                 android:layout_weight="1"
                 android:gravity="center_vertical"
                 android:orientation="vertical">