2.0完整版

app/build.gradle

@@ -22,7 +22,7 @@ android {
         applicationId "com.silence.commonframe"
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 19070301
+        versionCode 19070601
         versionName "2.0"
         javaCompileOptions { annotationProcessorOptions { includeCompileClasspath = true } }
         multiDexEnabled true

app/src/main/java/com/silence/commonframe/ApiService.java

@@ -4,7 +4,7 @@ public interface ApiService {
     String httpUrl   = "https://www.hsh-iot.com/YunGanKeJi/";
 
    // String httpUrl1   =   "https://www.hsh-iot.com/hsh_app";
-       String httpUrl1   =   "https://www.hsh-iot.com/test/hsh_app";
+       String httpUrl1   =   "https://www.hsh-iot.com/hsh_app";
     //  String httpUrl1   =   " http://192.168.1.112:8080/";
     /**视频http地址*/
     //String httpVideoUrl="http://47.100.29.244:8082/";

app/src/main/java/com/silence/commonframe/activity/mine/activity/setup/FireMessageActivity.java

@@ -63,7 +63,7 @@ public class FireMessageActivity extends BaseActivity implements FireMessageList
         myRecyclerView.setLayoutManager(new LinearLayoutManager(FireMessageActivity.this));
         myRecyclerView.setAdapter(myAdapter);
         //设置分割线
-        myRecyclerView.addItemDecoration(new LinearItemDecoration(FireMessageActivity.this,LinearLayoutManager.HORIZONTAL,8,getResources().getColor(R.color.thingray)));
+        myRecyclerView.addItemDecoration(new LinearItemDecoration(FireMessageActivity.this,LinearLayoutManager.HORIZONTAL,4,getResources().getColor(R.color.gray_line)));
 
         srlRefresh.setOnRefreshListener(refreshLayout -> {
             page = 1;

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

@@ -62,7 +62,7 @@ public class HistoryAdapter extends BaseQuickAdapter<FireAlarmModel.DataBean, Ba
             btKnow.setImageResource(R.drawable.iknow_gray);
         }
 
-        btKnow.setOnClickListener(v -> {
+        helper.itemView.setOnClickListener(v -> {
             if (mListener != null){
                 mListener.onItemClick(helper.getAdapterPosition());
             }

app/src/main/java/com/silence/tech/ui/files/activity/MPAndroidCart/MPChartMarkerView.java

@@ -41,13 +41,24 @@ public class MPChartMarkerView extends MarkerView {
 
     @Override
     public void refreshContent(Entry e, Highlight highlight) {
+        String day="";
         if (e instanceof CandleEntry) {
             CandleEntry ce = (CandleEntry) e;
             tvContent.setText(type+StringUtils.double2String(ce.getHigh(), 2)+"次");
-            tvTime.setText(time+"");
+            if (StringUtils.double2String(ce.getLow(), 2).length()==1){
+                day="0"+StringUtils.double2String(ce.getLow(), 2).length();
+            }else {
+                day=""+StringUtils.double2String(ce.getLow(), 2).length();
+            }
+            tvTime.setText(time+"."+day);
         } else {
             tvContent.setText(type+StringUtils.double2String(e.getY(), 2)+"次");
-            tvTime.setText(time+"");
+            if (e.getX()<10){
+                day="0"+(int)e.getX();
+            }else {
+                day=""+(int)e.getX();
+            }
+            tvTime.setText(time+"."+day);
         }
 
         super.refreshContent(e, highlight);//必须加上该句话；This sentence must be added.

app/src/main/java/com/silence/tech/ui/moni/activity/MoniFragment.java

@@ -101,22 +101,22 @@ public class MoniFragment extends BaseFragment implements MoniListener.View{
         for (int i = 0; i < listTroubleType.size(); i++){
             switch (listTroubleType.get(i).getTypeId()){
                 case "1":{
-                    String fireAlarm = listTroubleType.get(i).getCount() + listTroubleType.get(i).getTypeName();
+                    String fireAlarm = listTroubleType.get(i).getTypeName()+"数:"+listTroubleType.get(i).getCount() ;
                     tvFireAlarm.setText(fireAlarm);
                 }
                 break;
                 case "2":{
-                    String fault = listTroubleType.get(i).getCount() + listTroubleType.get(i).getTypeName();
+                    String fault = listTroubleType.get(i).getTypeName()+"数:"+listTroubleType.get(i).getCount() ;
                     tvFault.setText(fault);
                 }
                 break;
                 case "0":{
-                    String abNormal = listTroubleType.get(i).getCount() + listTroubleType.get(i).getTypeName();
+                    String abNormal = listTroubleType.get(i).getTypeName()+"数:"+listTroubleType.get(i).getCount() ;
                     tvAbnormal.setText(abNormal);
                 }
                 break;
                 case "3":{
-                    String hidTrouble = listTroubleType.get(i).getCount() + listTroubleType.get(i).getTypeName();
+                    String hidTrouble = listTroubleType.get(i).getTypeName()+"数:"+listTroubleType.get(i).getCount() ;
                     tvHidTrouble.setText(hidTrouble);
                 }
                 break;

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

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#FFF" />
+    <stroke
+        android:width="3dp"
+        android:color="#00000000" />
+    <size
+        android:width="20dp"
+        android:height="20dp" />
+</shape>

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

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

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#3CB371" />
+    <corners android:radius="20dp" />
+</shape>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/switch_ios_track_on" android:state_checked="true" />
+    <item android:drawable="@drawable/switch_ios_track_off" android:state_checked="false" />
+</selector>

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

@@ -40,6 +40,7 @@
                 android:layout_marginLeft="7dp"
                 android:background="@null"
                 android:inputType="number"
+                android:maxLength="11"
                 android:hint="请输入注册手机号码"
                 android:textSize="15dp" />
 
@@ -76,7 +77,7 @@
                 android:background="@null"
                 android:hint="请输入手机验证码"
                 android:inputType="number"
-                android:maxLength="11"
+                android:maxLength="6"
                 android:textSize="15dp" />
 
             <TextView

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

@@ -70,6 +70,8 @@
                 android:layout_height="match_parent"
                 android:layout_marginLeft="7dp"
                 android:background="@null"
+                android:inputType="number"
+                android:maxLength="11"
                 android:hint="请输入手机号码"
                 android:textSize="15dp"
                 android:theme="@style/MyEditText" />
@@ -108,7 +110,7 @@
             android:background="@null"
             android:hint="请输入手机验证码"
             android:inputType="number"
-            android:maxLength="11"
+            android:maxLength="6"
             android:textSize="15dp" />
 
         <TextView

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

@@ -9,47 +9,40 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"/>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="130dp"
-        android:layout_marginTop="20dp"
-        android:gravity="center">
-
         <ImageView
-            android:layout_width="65dp"
-            android:layout_height="65dp"
-            android:background="@mipmap/logo"/>
+            android:layout_width="80dp"
+            android:layout_height="80dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="20dp"
+            android:src="@mipmap/logo"/>
 
-    </LinearLayout>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="150dp"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="15dp"
-        android:gravity="center">
 
         <TextView
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginLeft="15dp"
+            android:layout_marginRight="15dp"
+            android:layout_marginTop="30dp"
             android:lineSpacingMultiplier="1.5"
             android:textColor="#444"
+            android:textSize="15dp"
             android:text="      海盛海智联APP是一款针对九小场所消防设施进行监控的应用软件，能够协助业主进行警情复核，并能够对感烟探测器、用电安全灭火器等设备进行实时监控和智能化管理。通知业主还能够设置警情发生第一时间收到电话、短信等通知，避免更大的损失发生。"/>
 
-    </LinearLayout>
 
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:gravity="bottom">
+        android:gravity="bottom"
+        android:layout_marginBottom="20dp">
 
         <TextView
             android:id="@+id/tv_version_code"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center|bottom"
-            android:textSize="13sp"
+            android:textSize="14dp"
             android:textColor="#444"
             android:layout_marginBottom="5dp"
             android:text="当前版本：1.0"/>
@@ -58,7 +51,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center|bottom"
-            android:textSize="13sp"
+            android:textSize="14dp"
             android:textColor="#444"
             android:layout_marginBottom="5dp"
             android:text="系统最高版本：1.0"/>

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

@@ -48,7 +48,7 @@
     <TextView
         android:id="@+id/tv_submit"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="50dp"
         android:gravity="center"
         android:background="@color/myblue"
         android:paddingTop="10dp"

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

@@ -40,7 +40,7 @@
             android:orientation="vertical">
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 

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

@@ -32,9 +32,9 @@
                 android:layout_centerVertical="true">
 
                 <ImageView
-                    android:layout_width="16dp"
-                    android:layout_height="16dp"
-                    android:background="@mipmap/pushmanage" />
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:src="@mipmap/pushmanage" />
 
                 <TextView
                     android:id="@+id/tv_place"
@@ -77,9 +77,9 @@
                 android:layout_centerVertical="true">
 
                 <ImageView
-                    android:layout_width="16dp"
-                    android:layout_height="16dp"
-                    android:background="@mipmap/wechat" />
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:src="@mipmap/wechat" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -94,14 +94,11 @@
 
             <Switch
                 android:id="@+id/switch_wx_bind"
+                android:layout_alignParentRight="true"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:switchMinWidth="45dp"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:track="@drawable/bg_switch_track"
-                android:thumb="@drawable/bg_switch_thumb"
-                />
+                android:thumb="@drawable/switch_ios_thumb"
+                android:track="@drawable/switch_ios_track_selector" />
 
         </RelativeLayout>
 
@@ -124,9 +121,9 @@
                 android:layout_centerVertical="true">
 
                 <ImageView
-                    android:layout_width="16dp"
-                    android:layout_height="16dp"
-                    android:background="@mipmap/wechat_public" />
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:src="@mipmap/wechat_public" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -174,9 +171,9 @@
             android:layout_centerVertical="true">
 
             <ImageView
-                android:layout_width="16dp"
-                android:layout_height="16dp"
-                android:background="@mipmap/aboutour" />
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:src="@mipmap/aboutour" />
 
             <TextView
                 android:id="@+id/tv_place1"
@@ -216,9 +213,9 @@
             android:layout_centerVertical="true">
 
             <ImageView
-                android:layout_width="16dp"
-                android:layout_height="16dp"
-                android:background="@mipmap/useragreement" />
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:src="@mipmap/useragreement" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -257,9 +254,9 @@
             android:layout_centerVertical="true">
 
             <ImageView
-                android:layout_width="16dp"
-                android:layout_height="16dp"
-                android:background="@mipmap/useragreement" />
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:src="@mipmap/useragreement" />
 
             <TextView
                 android:layout_width="wrap_content"

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

@@ -25,15 +25,16 @@
                 android:layout_height="wrap_content"
                 android:text="场所名称："
                 android:textColor="@color/myblack"
-                android:textSize="17sp"/>
+                android:textSize="15dp"/>
 
             <TextView
                 android:id="@+id/tv_palce"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
                 android:text="杭州市海智中心3栋4...."
                 android:textColor="@color/myblack"
-                android:textSize="17sp" />
+                android:textSize="15dp" />
         </LinearLayout>
 
         <View
@@ -55,31 +56,18 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="区"
+                android:text="区         域:"
                 android:textColor="@color/myblack"
-                android:textSize="17sp" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="空格"
-                android:textColor="#00000000"
-                android:textSize="17sp"/>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="域："
-                android:textColor="@color/myblack"
-                android:textSize="17sp" />
+                android:textSize="15dp" />
 
             <TextView
                 android:id="@+id/tv_area"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="杭州市海智中心3栋4...."
+                android:layout_marginLeft="10dp"
                 android:textColor="@color/myblack"
-                android:textSize="17sp" />
+                android:textSize="15dp" />
 
         </LinearLayout>
 
@@ -93,13 +81,16 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="杭州市海智中心3栋4栋5层"
-                android:layout_margin="15dp"
+                android:layout_marginLeft="15dp"
+                android:layout_marginRight="15dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
                 android:textColor="@color/myblack"
-                android:textSize="17sp" />
+                android:textSize="15dp" />
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="3dp"
+            android:layout_height="2dp"
             android:background="@color/gray_line"/>
 
         <LinearLayout
@@ -117,7 +108,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="center_vertical"
-                    android:layout_marginLeft="10dp"
+                    android:layout_marginLeft="15dp"
                     android:layout_marginTop="8dp"
                     android:layout_marginBottom="8dp"
                     android:orientation="horizontal">
@@ -127,7 +118,7 @@
                         android:layout_height="wrap_content"
                         android:text="负责人："
                         android:textColor="@color/myblack"
-                        android:textSize="17sp" />
+                        android:textSize="15dp" />
 
                     <TextView
                         android:id="@+id/tv_name"
@@ -136,7 +127,7 @@
                         android:text="小李"
                         android:layout_marginLeft="5dp"
                         android:textColor="@color/myblack"
-                        android:textSize="17sp" />
+                        android:textSize="15dp" />
 
 
 
@@ -146,8 +137,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="center_vertical"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginTop="8dp"
+                    android:layout_marginLeft="15dp"
                     android:layout_marginBottom="8dp"
                     android:orientation="horizontal">
 
@@ -156,7 +146,7 @@
                         android:layout_height="wrap_content"
                         android:text="手机号："
                         android:textColor="@color/myblack"
-                        android:textSize="17sp" />
+                        android:textSize="15dp" />
 
                     <TextView
                         android:id="@+id/tv_tel"
@@ -165,19 +155,13 @@
                         android:layout_marginLeft="5dp"
                         android:text="13859594646"
                         android:textColor="@color/myblack"
-                        android:textSize="17sp" />
+                        android:textSize="15dp" />
 
                 </LinearLayout>
 
 
             </LinearLayout>
 
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_weight="0.2"
-                android:gravity="right"
-                android:layout_height="match_parent">
-
                 <ImageView
                     android:id="@+id/question"
                     android:layout_width="45dp"
@@ -186,12 +170,10 @@
                     android:layout_marginRight="10dp"
                     android:layout_gravity="center_vertical"
                     android:background="@mipmap/sitetel1" />
-
-            </LinearLayout>
         </LinearLayout>
         <View
             android:layout_width="match_parent"
-            android:layout_height="3dp"
+            android:layout_height="2dp"
             android:background="@color/gray_line"/>
 
 </LinearLayout>

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

@@ -63,7 +63,7 @@
             </android.support.design.widget.TabLayout>
     <TextView
         android:layout_width="match_parent"
-        android:layout_height="5dp"
+        android:layout_height="4dp"
         android:background="@color/bg_gray"/>
             <android.support.v4.view.ViewPager
                 android:id="@+id/vp_content"

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

@@ -95,9 +95,9 @@
                 android:layout_centerVertical="true">
 
                 <ImageView
-                    android:layout_width="16dp"
-                    android:layout_height="16dp"
-                    android:background="@mipmap/placemansge" />
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:src="@mipmap/placemansge" />
 
                 <TextView
                     android:id="@+id/tv_place"
@@ -138,9 +138,9 @@
                 android:layout_centerVertical="true">
 
                 <ImageView
-                    android:layout_width="16dp"
-                    android:layout_height="16dp"
-                    android:background="@mipmap/fire" />
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:src="@mipmap/fire" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -180,9 +180,9 @@
                 android:layout_centerVertical="true">
 
                 <ImageView
-                    android:layout_width="16dp"
-                    android:layout_height="16dp"
-                    android:background="@mipmap/question1" />
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:src="@mipmap/question1" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -222,9 +222,9 @@
                 android:layout_centerVertical="true">
 
                 <ImageView
-                    android:layout_width="16dp"
-                    android:layout_height="16dp"
-                    android:background="@mipmap/callphoto" />
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:src="@mipmap/callphoto" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -243,8 +243,6 @@
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
-                android:layout_marginEnd="10dp"
-                android:layout_marginRight="10dp"
                 android:background="@mipmap/right" />
 
         </RelativeLayout>

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

@@ -3,7 +3,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white"
     android:orientation="vertical">
 
     <com.silence.commonframe.base.basemvp.TitleBar
@@ -24,7 +23,8 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/margin_side"
+                android:padding="@dimen/margin_side"
+                android:background="@color/white"
                 android:orientation="horizontal">
 
                 <LinearLayout
@@ -125,11 +125,6 @@
 
             </LinearLayout>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="5dp"
-                android:background="@color/gray_line"/>
-
             <LinearLayout
                 android:id="@+id/ll_no_message"
                 android:layout_width="match_parent"

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

@@ -27,8 +27,8 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_alignParentRight="true"
-            android:track="@drawable/bg_switch_track"
-            android:thumb="@drawable/bg_switch_thumb"/>
+            android:thumb="@drawable/switch_ios_thumb"
+            android:track="@drawable/switch_ios_track_selector" />
 
     </RelativeLayout>
 

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

@@ -8,8 +8,8 @@
     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_marginLeft="@dimen/dp_10"
+    android:layout_marginRight="@dimen/dp_10"
     card_view:cardElevation="4dp">
 
     <RelativeLayout

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

@@ -1,28 +1,25 @@
 <?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"
+    android:layout_height="60dp"
     android:background="@color/white"
     android:descendantFocusability="blocksDescendants">
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="68dp">
+        android:layout_height="60dp">
 
         <LinearLayout
             android:id="@+id/layout_content"
             android:layout_width="match_parent"
-            android:layout_height="68dp"
+            android:layout_height="60dp"
             android:gravity="center"
             android:orientation="horizontal">
 
             <LinearLayout
-                android:layout_width="0dp"
+                android:layout_width="match_parent"
                 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">
@@ -33,7 +30,7 @@
                     android:layout_height="wrap_content"
                     android:gravity="center"
                     android:layout_marginLeft="@dimen/normal_side"
-                    android:textSize="17dp"
+                    android:textSize="15dp"
                     android:text="场所名称"
                     android:textStyle="bold"
                     android:textColor="@color/myblack" />
@@ -44,7 +41,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/normal_side"
                     android:layout_marginTop="4dp"
-                    android:textSize="15dp"
+                    android:textSize="14dp"
                     android:singleLine="true"
                     android:text="场所地址"
                     android:textColor="@color/myblack" />

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

@@ -20,7 +20,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:textSize="18sp"
+            android:textSize="15dp"
             android:text="测试四海带花掉"
             android:textColor="@color/myblack" />
 
@@ -29,7 +29,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="10dp"
+        android:layout_marginTop="7dp"
         android:orientation="horizontal">
 
         <LinearLayout
@@ -49,8 +49,8 @@
                 android:layout_height="wrap_content"
                 android:text="接收火警电话"
                 android:textColor="@color/myblack"
-                android:textSize="16sp"
-                android:layout_marginLeft="10dp"/>
+                android:textSize="@dimen/sp_14"
+                android:layout_marginLeft="5dp"/>
 
         </LinearLayout>
 
@@ -72,8 +72,8 @@
                 android:layout_height="wrap_content"
                 android:text="接收短信通知"
                 android:textColor="@color/myblack"
-                android:textSize="16sp"
-                android:layout_marginLeft="10dp"/>
+                android:textSize="@dimen/sp_14"
+                android:layout_marginLeft="5dp"/>
 
         </LinearLayout>
 

app/src/main/res/values/strings.xml

@@ -80,7 +80,7 @@
     <string-array name="device_type">
         <item>烟感</item>
         <item>摄像头</item>
-        <item>空气卫士</item>
+  <!--      <item>空气卫士</item>-->
     </string-array>
     <!-- 档案页面标题栏 -->
     <string-array name="archives_type">

app/src/main/res/values/styles.xml

@@ -203,8 +203,8 @@
     <style name="list_margin_style">
         <item name="android:paddingLeft">@dimen/normal_side</item>
         <item name="android:paddingRight">@dimen/normal_side</item>
-        <item name="android:paddingTop">@dimen/normal_side</item>
-        <item name="android:paddingBottom">@dimen/normal_side</item>
+        <item name="android:paddingTop">@dimen/dp_10</item>
+        <item name="android:paddingBottom">@dimen/dp_10</item>
     </style>
 
     <!-- 自定义TitleBar -->