7.8

app/build.gradle

@@ -27,7 +27,7 @@ android {
         javaCompileOptions { annotationProcessorOptions { includeCompileClasspath = true } }
         multiDexEnabled true
         ndk {
-            abiFilters "armeabi"
+            abiFilters "armeabi","x86"
 //            abiFilter("arm64-v8a")
         }
         manifestPlaceholders = [

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

@@ -91,7 +91,7 @@ public class MessageFragment extends BaseFragment implements NewFindListener.Vie
             page++;
             presenter.getData();
         });
-        srlRefresh.setEnableLoadMore(false);
+        srlRefresh.setEnableLoadMoreWhenContentNotFull(false);
     }
 
     @Override
@@ -168,9 +168,16 @@ public class MessageFragment extends BaseFragment implements NewFindListener.Vie
         if (page == 1){
             listData.clear();
         }
-        if (srlRefresh != null){
-            srlRefresh.finishRefresh();
-            srlRefresh.finishLoadMore();
+        if (dataBean.size() == 0){
+            if (srlRefresh != null){
+                srlRefresh.finishRefresh();
+                srlRefresh.finishLoadMoreWithNoMoreData();
+            }
+        }else {
+            if (srlRefresh != null){
+                srlRefresh.finishRefresh();
+                srlRefresh.finishLoadMore();
+            }
         }
         listData.addAll(dataBean);
         if (listData.size() == 0){
@@ -179,9 +186,6 @@ public class MessageFragment extends BaseFragment implements NewFindListener.Vie
             no_message.setVisibility(View.GONE);
         }
         mAdapter.notifyDataSetChanged();
-        if (dataBean.size() >= Integer.valueOf(BaseConstants.PAGE_SIZE)){
-            srlRefresh.setEnableLoadMore(true);
-        }
         stopLoading();
     }
 

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

@@ -3,6 +3,6 @@
 
     <stroke android:color="@color/mygray" android:width="0.3dp"/>
 
-    <solid android:color="@color/thinwhite"></solid>
+    <solid android:color="@color/gray_line"></solid>
 
 </shape>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="18dp"/>
-    <solid android:color="@color/thinwhite"/>
+    <solid android:color="@color/white"/>
 </shape>

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/white"/>
+    <corners
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="0dp"
+        android:topLeftRadius="18dp"
+        android:topRightRadius="18dp"/>
+</shape>

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

@@ -17,7 +17,8 @@
         android:layout_marginBottom="5dp"
         android:gravity="center"
         android:text="尊敬的用户，你的设备发生警情"
-        android:textColor="#000"
+        android:textColor="@color/myblack"
+        android:textStyle="bold"
         android:textSize="19sp" />
 
     <TextView
@@ -26,7 +27,8 @@
         android:layout_marginBottom="5dp"
         android:gravity="center"
         android:text="敬请及时处理"
-        android:textColor="#000"
+        android:textColor="@color/myblack"
+        android:textStyle="bold"
         android:textSize="19sp" />
 
 

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

@@ -19,7 +19,7 @@
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dp"
+            android:layout_height="0.5dp"
             android:background="@color/mygray"/>
 
         <LinearLayout
@@ -40,7 +40,7 @@
                 android:textSize="17sp"/>
 
             <View
-                android:layout_width="1dp"
+                android:layout_width="0.5dp"
                 android:layout_height="match_parent"
                 android:background="@color/mygray"/>
 

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

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent"
+    android:background="@drawable/bg_dialog_edittext">
 
     <LinearLayout
         android:layout_width="match_parent"