7.4

BUG调整

app/app.iml

@@ -91,12 +91,14 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-libraries" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkDebugClasspath" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkReleaseClasspath" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/legacy_multidex_aapt_derived_proguard_rules" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/legacy_multidex_main_dex_list" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />

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

@@ -3,7 +3,7 @@ package com.silence.commonframe;
 public interface ApiService {
     String httpUrl   = "https://www.hsh-iot.com/YunGanKeJi/";
 
-//   String httpUrl1   = "https://www.hsh-iot.com/test/hsh_app";
+//   String httpUrl1   = "https://www.hsh-iot.com/hsh_app";
 
     String httpUrl1   =   "https://www.hsh-iot.com/test/hsh_app";
   //    String httpUrl1   =   " http://192.168.1.112:8080/";

app/src/main/java/com/silence/commonframe/activity/device/activity/NewDeviceDetailActivity.java

@@ -13,8 +13,9 @@ import android.widget.Toast;
 import com.orhanobut.hawk.Hawk;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.silence.commonframe.R;
-import com.silence.commonframe.activity.device.Interface.NewDeviceDetailListener;
 import com.silence.commonframe.activity.MainActivity;
+import com.silence.commonframe.activity.device.Interface.NewDeviceDetailListener;
+import com.silence.commonframe.activity.device.activity.camera.ActivityGuideDeviceCamera;
 import com.silence.commonframe.activity.device.activity.context_device.NewAddContextDeviceActivity;
 import com.silence.commonframe.activity.device.activity.context_device.NewContextManagementActivity;
 import com.silence.commonframe.activity.device.activity.context_device.RunningRecordActivity;
@@ -24,12 +25,10 @@ import com.silence.commonframe.adapter.device.ConnectFireDetailAdapter;
 import com.silence.commonframe.base.basemvp.BaseActivity;
 import com.silence.commonframe.bean.CameraDetailBean;
 import com.silence.commonframe.bean.ConnectDeviceBean;
+import com.silence.commonframe.bean.Data;
 import com.silence.commonframe.bean.DeviceDetailBean;
-import com.silence.commonframe.bean.IsDeviceChange;
 import com.silence.commonframe.common.constant.BaseConstants;
-import com.silence.commonframe.activity.device.activity.camera.ActivityGuideDeviceCamera;
 import com.silence.commonframe.lib.funsdk.support.models.FunDevice;
-import com.silence.commonframe.bean.Data;
 import com.silence.tech.ui.MainCompanyActivity;
 
 import java.util.ArrayList;
@@ -234,7 +233,7 @@ public class NewDeviceDetailActivity extends BaseActivity implements NewDeviceDe
                 }
             }
             if (position!=-1){
-                IsDeviceChange.setIsContextCamera(true);
+                Hawk.put(BaseConstants.IS_CONTEXT_CAMERA,true);
                 Data.setDevIdsCamera(bean.getUuid());
                 Intent intent1 = new Intent();
                 Bundle bundle = new Bundle();

app/src/main/java/com/silence/commonframe/activity/device/activity/NewDeviceFragment.java

@@ -134,7 +134,7 @@ public class NewDeviceFragment extends BaseFragment implements NewDeviceListener
     public void onResume() {
         super.onResume();
         Boolean sizeChange = Hawk.get(BaseConstants.NEED_SITE_CHANGE);
-        if (Hawk.get(BaseConstants.NEED_SITE_CHANGE) != null && sizeChange){
+        if (sizeChange != null && sizeChange){
             page = 1;
             presenter.getPlace();
             Hawk.put(BaseConstants.NEED_SITE_CHANGE,false);
@@ -349,6 +349,7 @@ public class NewDeviceFragment extends BaseFragment implements NewDeviceListener
                 }
             }
             if (position!=-1){
+                Hawk.put(BaseConstants.IS_CONTEXT_CAMERA,false);
                 Data.setDevIdsCamera(bean.getUuid());
                 Intent intent1 = new Intent();
                 Bundle bundle = new Bundle();

app/src/main/java/com/silence/commonframe/activity/device/activity/airguard/AirGuardDetailActivity.java

@@ -8,7 +8,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.silence.commonframe.Dialog.CDialog;
+import com.silence.commonframe.Dialog.BaseDialog;
 import com.silence.commonframe.R;
 import com.silence.commonframe.activity.device.activity.airguard.Interface.AirGuardDetailListener;
 import com.silence.commonframe.activity.device.activity.airguard.presenter.AirGuardDetailPresenter;
@@ -89,17 +89,19 @@ public class AirGuardDetailActivity extends BaseActivity implements AirGuardDeta
      * 修改名字提示框
      */
     private void dialogUpdateName() {
-        CDialog.Builder builder = new CDialog.Builder(AirGuardDetailActivity.this);
-        builder.setCancelable(false);
-        builder.setTitle(getResources().getString(R.string.tips));
-        builder.setMessage(getResources().getString(R.string.dialog_update_name));
-        builder.setPositiveButton(getResources().getString(R.string.sure), (dialog, which) -> {
-            //确定修改后的操作
-            startLoading();
-            presenter.updateDeviceName();
-        });
-        builder.setNegativeButton(getResources().getString(R.string.cancle), (dialog, which) -> dialog.dismiss());
-        builder.show();
+        BaseDialog.DialogCallBack dialogCallBack=new BaseDialog.DialogCallBack() {
+            @Override
+            public void leftBtn() {
+            }
+
+            @Override
+            public void rightBtn() {
+                //确定修改后的操作
+                startLoading();
+                presenter.updateDeviceName();
+            }
+        };
+        new BaseDialog().BaseDialog(this,getResources().getString(R.string.tips),getResources().getString(R.string.dialog_update_name),getResources().getString(R.string.cancle),getResources().getString(R.string.sure),dialogCallBack);
     }
 
     @Override

app/src/main/java/com/silence/commonframe/activity/device/activity/airguard/AirGuardNewTimeActivity.java

@@ -1,7 +1,12 @@
 package com.silence.commonframe.activity.device.activity.airguard;
 
+import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.graphics.Color;
+import android.os.Handler;
+import android.os.Message;
+import android.view.MotionEvent;
+import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -26,6 +31,9 @@ public class AirGuardNewTimeActivity extends BaseActivity implements AirGuardNew
 
     public static int WHEEL_SIZE = 5;      //显示的滚动的数量
 
+    public final int ADD_NUMBER = 1;
+    public final int REDUEC_NUMBER = 2;
+
     @BindView(R.id.start_time_hour)
     WheelView<String> start_time_hour;      //开始时间-小时
     @BindView(R.id.start_time_minute)
@@ -59,6 +67,8 @@ public class AirGuardNewTimeActivity extends BaseActivity implements AirGuardNew
 
     AirGuardNewTimePresenter presenter;
 
+    Boolean longClick;
+
     @Override
     public int getLayoutId() {
         return R.layout.activity_air_guard_new_time;
@@ -69,6 +79,7 @@ public class AirGuardNewTimeActivity extends BaseActivity implements AirGuardNew
         presenter = new AirGuardNewTimePresenter(this,this);
     }
 
+    @SuppressLint("ClickableViewAccessibility")
     @Override
     public void initView() {
         clickTitle(this,getResources().getString(R.string.airguard_newtime),getResources().getString(R.string.sure),true)
@@ -107,23 +118,96 @@ public class AirGuardNewTimeActivity extends BaseActivity implements AirGuardNew
 
         }
 
-        wind_speed_increase.setOnClickListener(v -> {
-            avoidDoubleClick(v);
-            if (wind_speed < BaseConstants.WIND_SPEED_HIGN){
-                wind_speed++;
+        //长按增加
+        wind_speed_increase.setOnTouchListener(new View.OnTouchListener() {
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                if (event.getAction() == MotionEvent.ACTION_DOWN){
+                    longClick = true;
+                    Thread t = new Thread(){
+                        @Override
+                        public void run() {
+                            while (longClick){
+                                try {
+                                    Thread.sleep(150);
+                                    myHandler.sendEmptyMessage(ADD_NUMBER);
+                                } catch (InterruptedException e) {
+                                    e.printStackTrace();
+                                }
+                            }
+                            super.run();
+                        }
+                    };
+                    t.start();
+                }
+                if (event.getAction() == MotionEvent.ACTION_UP){
+                    longClick = false;
+                }
+                return true;
             }
-            wind_speed_level.setText(String.valueOf(wind_speed));
         });
 
-        wind_speed_reduce.setOnClickListener(v -> {
-            avoidDoubleClick(v);
-            if (wind_speed > 0){
-                wind_speed--;
+        //长按减少
+        wind_speed_reduce.setOnTouchListener(new View.OnTouchListener() {
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                if (event.getAction() == MotionEvent.ACTION_DOWN){
+                    longClick = true;
+                    Thread t = new Thread(){
+                        @Override
+                        public void run() {
+                            while (longClick){
+                                try {
+                                    Thread.sleep(150);
+                                    myHandler.sendEmptyMessage(REDUEC_NUMBER);
+                                } catch (InterruptedException e) {
+                                    e.printStackTrace();
+                                }
+                            }
+                            super.run();
+                        }
+                    };
+                    t.start();
+                }
+                if (event.getAction() == MotionEvent.ACTION_UP){
+                    longClick = false;
+                }
+                return true;
             }
-            wind_speed_level.setText(String.valueOf(wind_speed));
         });
+
     }
 
+    @SuppressLint("HandlerLeak")
+    Handler myHandler = new Handler(){
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+            switch (msg.what){
+                case ADD_NUMBER:{
+                    //增加操作
+                    if (wind_speed < BaseConstants.WIND_SPEED_HIGN){
+                        wind_speed++;
+                    }
+                    if (wind_speed_level != null)
+                        wind_speed_level.setText(String.valueOf(wind_speed));
+                }
+                    break;
+                case REDUEC_NUMBER:{
+                    //减少操作
+                    if (wind_speed > 0){
+                        wind_speed--;
+                    }
+                    if (wind_speed_level != null)
+                        wind_speed_level.setText(String.valueOf(wind_speed));
+                }
+                    break;
+                default:
+                    break;
+            }
+        }
+    };
+
     /**
      * 确定添加时间事件
      */

app/src/main/java/com/silence/commonframe/activity/device/activity/airguard/AirGuardTimeClockActivity.java

@@ -53,10 +53,10 @@ public class AirGuardTimeClockActivity extends BaseActivity implements AirGuardT
         public void run() {
             do {
                 try {
-                    Thread.sleep(1000);
+                    Thread.sleep(500);
                     Message msg = new Message();
                     msg.what = 1;
-                    mHandler.sendMessage(msg);      //每隔1秒发送一个msg给mHandler
+                    mHandler.sendMessage(msg);      //每隔0.5秒发送一个msg给mHandler
                 } catch (InterruptedException e) {
                     e.printStackTrace();
                 }

app/src/main/java/com/silence/commonframe/activity/device/activity/camera/CameraSetupActivity.java

@@ -8,7 +8,7 @@ import com.orhanobut.hawk.Hawk;
 import com.silence.commonframe.R;
 import com.silence.commonframe.activity.device.activity.context_device.NewContextManagementActivity;
 import com.silence.commonframe.base.basemvp.BaseActivity;
-import com.silence.commonframe.bean.IsDeviceChange;
+import com.silence.commonframe.common.constant.BaseConstants;
 
 import butterknife.BindView;
 import butterknife.OnClick;
@@ -47,10 +47,12 @@ public class CameraSetupActivity extends BaseActivity {
 
         devId = getIntent().getIntExtra("FUN_DEVICE_ID",-1);
 
-        if (IsDeviceChange.isIsContextCamera()){
-            camerasetup_contextdevicemanagement.setVisibility(View.GONE);
-        }else {
-            camerasetup_contextdevicemanagement.setVisibility(View.VISIBLE);
+        if (Hawk.get(BaseConstants.IS_CONTEXT_CAMERA) != null){
+            if (Hawk.get(BaseConstants.IS_CONTEXT_CAMERA)){
+                camerasetup_contextdevicemanagement.setVisibility(View.GONE);
+            }else {
+                camerasetup_contextdevicemanagement.setVisibility(View.VISIBLE);
+            }
         }
 
         //获取Intent中的值

app/src/main/java/com/silence/commonframe/activity/device/activity/context_device/NewContextManagementActivity.java

@@ -14,9 +14,10 @@ import android.widget.Toast;
 import com.orhanobut.hawk.Hawk;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.silence.commonframe.R;
-import com.silence.commonframe.activity.device.activity.context_device.Interface.NewContextManagementListener;
 import com.silence.commonframe.activity.MainActivity;
 import com.silence.commonframe.activity.device.activity.NewDeviceDetailActivity;
+import com.silence.commonframe.activity.device.activity.camera.ActivityGuideDeviceCamera;
+import com.silence.commonframe.activity.device.activity.context_device.Interface.NewContextManagementListener;
 import com.silence.commonframe.activity.device.activity.context_device.presenter.NewContextManagementPresenter;
 import com.silence.commonframe.adapter.device.ContextManagementCameraDetailAdapter;
 import com.silence.commonframe.adapter.device.ContextManagementFireDetailAdapter;
@@ -24,14 +25,12 @@ import com.silence.commonframe.base.base.AppManager;
 import com.silence.commonframe.base.basemvp.BaseActivity;
 import com.silence.commonframe.bean.CameraDetailBean;
 import com.silence.commonframe.bean.ConnectDeviceBean;
-import com.silence.commonframe.bean.IsDeviceChange;
+import com.silence.commonframe.bean.Data;
 import com.silence.commonframe.common.constant.BaseConstants;
-import com.silence.commonframe.activity.device.activity.camera.ActivityGuideDeviceCamera;
 import com.silence.commonframe.lib.funsdk.support.models.FunDevice;
-import com.silence.commonframe.bean.Data;
+import com.silence.commonframe.utils.AddDeviceUtils;
 import com.silence.commonframe.utils.ManagePopupMenu;
 import com.silence.commonframe.utils.TitlePopupMenu;
-import com.silence.commonframe.utils.AddDeviceUtils;
 import com.silence.tech.ui.MainCompanyActivity;
 
 import java.util.ArrayList;
@@ -272,7 +271,7 @@ public class NewContextManagementActivity extends BaseActivity implements NewCon
                 }
             }
             if (position!=-1){
-                IsDeviceChange.setIsContextCamera(true);
+                Hawk.put(BaseConstants.IS_CONTEXT_CAMERA,true);
                 Data.setDevIdsCamera(bean.getUuid());
                 Intent intent1 = new Intent();
                 Bundle bundle = new Bundle();

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

@@ -14,12 +14,13 @@ import android.widget.PopupWindow;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.orhanobut.hawk.Hawk;
 import com.silence.commonframe.R;
 import com.silence.commonframe.activity.home.Interface.AddDeviceDetailListener;
 import com.silence.commonframe.activity.home.presenter.AddDeviceDetailPresenter;
 import com.silence.commonframe.base.basemvp.BaseActivity;
-import com.silence.commonframe.bean.IsDeviceChange;
 import com.silence.commonframe.bean.SiteModel;
+import com.silence.commonframe.common.constant.BaseConstants;
 import com.silence.commonframe.utils.SpinerPopWindow;
 
 import java.util.ArrayList;
@@ -167,6 +168,7 @@ public class AdddevicedetailActivity extends BaseActivity implements AddDeviceDe
         if (requestCode == 41 && resultCode == 41){
             page = 1;
             presenter.getSite();
+            tv_spinner.setText("请选择场所");
         }
     }
 
@@ -238,7 +240,7 @@ public class AdddevicedetailActivity extends BaseActivity implements AddDeviceDe
 
     @Override
     public void onSuccess() {
-        IsDeviceChange.setChangeSize(true);
+        Hawk.put(BaseConstants.NEED_SITE_CHANGE,true);
         stopLoading();
         finish();
     }

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

@@ -90,6 +90,7 @@ public class NewAddSiteActivity extends BaseActivity implements AddSiteListener.
     public void initView() {
         clickTitle(this, "添加场所", "", true);
 
+        setResult(41);
         if (Hawk.get(BaseConstants.USER_NAME) != null)
             tvName.setText(Hawk.get(BaseConstants.USER_NAME) + "");
         if (Hawk.get(BaseConstants.PHONE) != null)

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

@@ -166,13 +166,14 @@ public class FindFragment1 extends BaseFragment implements NewFindListener.View
         }
         if (srlRefresh != null){
             srlRefresh.finishRefresh();
+            srlRefresh.finishLoadMore();
         }
-        if (dataBean.size() == 0){
+        listData.addAll(dataBean);
+        if (listData.size() == 0){
             no_message.setVisibility(View.VISIBLE);
         } else {
             no_message.setVisibility(View.GONE);
         }
-        listData.addAll(dataBean);
         mAdapter.notifyDataSetChanged();
         if (dataBean.size() >= Integer.valueOf(BaseConstants.PAGE_SIZE)){
             srlRefresh.setEnableLoadMore(true);
@@ -189,6 +190,11 @@ public class FindFragment1 extends BaseFragment implements NewFindListener.View
     @Override
     public void onFile(String msg) {
         Toast.makeText(mActivity,""+msg,Toast.LENGTH_SHORT).show();
+        if (srlRefresh != null){
+            srlRefresh.finishRefresh();
+            srlRefresh.finishLoadMore();
+        }
+        stopLoading();
     }
 
     @Override

app/src/main/java/com/silence/commonframe/adapter/device/DeviceListAdapter.java

@@ -66,6 +66,9 @@ public class DeviceListAdapter extends BaseQuickAdapter<DeviceListBean.DataListB
             @Override
             public void onClick(View view) {
                 itemClickListener.itemClickListener(helper.getPosition());
+                if (menuIsOpen()) {
+                    mMenu.closeMenu();//关闭菜单
+                }
             }
         });
         //左滑删除点击事件
@@ -75,9 +78,9 @@ public class DeviceListAdapter extends BaseQuickAdapter<DeviceListBean.DataListB
                 if (menuIsOpen()) {
                     mMenu.closeMenu();//关闭菜单
                 }
-                if ("1".equals(item.getDeviceName())){
+                if ("1".equals(item.getDeviceType())){
                     mIDeleteBtnClickListener.onDeleteBtnCilck(helper.getPosition(),BaseConstants.TYPE_SMOKE);
-                } else if ("2".equals(item.getDeviceName())){
+                } else if ("2".equals(item.getDeviceType())){
                     mIDeleteBtnClickListener.onDeleteBtnCilck(helper.getPosition(),BaseConstants.TYPE_CAMERA);
                 }
             }

app/src/main/java/com/silence/commonframe/bean/IsDeviceChange.java

@@ -1,23 +0,0 @@
-package com.silence.commonframe.bean;
-
-public class IsDeviceChange {
-    private static boolean changeSize = false;
-
-    public static boolean getChangeSize() {
-        return changeSize;
-    }
-
-    public static void setChangeSize(boolean changeSize) {
-        IsDeviceChange.changeSize = changeSize;
-    }
-
-    private static boolean isContextCamera;
-
-    public static boolean isIsContextCamera() {
-        return isContextCamera;
-    }
-
-    public static void setIsContextCamera(boolean isContextCamera) {
-        IsDeviceChange.isContextCamera = isContextCamera;
-    }
-}

app/src/main/java/com/silence/commonframe/common/constant/BaseConstants.java

@@ -16,6 +16,8 @@ public interface BaseConstants {
    String PICTIURE="picture";
    String AUDIO="audio";
    String VIDEO="video";
+   String NEED_SITE_CHANGE = "need_change";
+   String IS_CONTEXT_CAMERA = "is_context_camera";
 
    //获取验证码  0-登录 找回密码 1-注册 2-直接发验证码
    String CODE_TYPE_LOGIN="0";
@@ -43,8 +45,6 @@ public interface BaseConstants {
    String PAGE_SIZE="15";
    int WIND_SPEED_HIGN = 100; //空气卫士最高风速
 
-   String NEED_SITE_CHANGE = "need_change";
-
    int TYPE_CAMERA=12;
    int TYPE_SMOKE=13;
    int TYPE_AIR_GUARD=14;
@@ -59,7 +59,5 @@ public interface BaseConstants {
    String TROUBLE_ABNORMAL = "0";          //类型异常
    String TROUBLE_HID_TROUBLE = "3";       //类型隐患
 
-   String INTENT_ZXING_CONFIG = "zxingConfig";
-
 }
 

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

@@ -55,7 +55,6 @@ public class ArchivesFragment extends BaseFragment implements ArchivesListener.V
     @BindView(R.id.ll_no_data)
     LinearLayout llNoData;
 
-
     String troubleType = "";//0-异常（防拆，低压） 1-火警 2-故障(离线) 3-隐患
     String date = "";
     ArchvesBean archvesBean = new ArchvesBean();
@@ -80,6 +79,7 @@ public class ArchivesFragment extends BaseFragment implements ArchivesListener.V
         presenter = new ArchivesPresenter(getActivity(), this);
     }
 
+    @SuppressLint("ClickableViewAccessibility")
     @Override
     protected void initView() {
         startLoading();
@@ -106,6 +106,7 @@ public class ArchivesFragment extends BaseFragment implements ArchivesListener.V
         rvList.setLayoutManager(new StaggeredGridLayoutManager(1, StaggeredGridLayoutManager.VERTICAL));
         archivesAdapter=new ArchivesAdapter(R.layout.item_recylerview,archvesBeans,onclick);
         rvList.setAdapter(archivesAdapter);
+        rvList.setNestedScrollingEnabled(false);
         presenter.getTrouble();
         presenter.getData();
     }

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

@@ -97,7 +97,6 @@ public class MoniFragment extends BaseFragment implements MoniListener.View{
                 presenter.getTroubleList();
             }
         });
-        srlRefresh.setEnableLoadMore(false);
     }
 
     @Override
@@ -181,9 +180,6 @@ public class MoniFragment extends BaseFragment implements MoniListener.View{
     //获取异常列表回调
     @Override
     public void onTroubleListSuccess(TroubleListBean.DataBean dataBean) {
-        if (page == 1){
-            listData.clear();
-        }
         if (srlRefresh != null){
             srlRefresh.finishRefresh();
             srlRefresh.finishLoadMore();
@@ -191,15 +187,13 @@ public class MoniFragment extends BaseFragment implements MoniListener.View{
         if (dataBean.getRows() == 0){
             llNoMessage.setVisibility(View.VISIBLE);
         }else {
-            if (listData.size() != 0){
+            llNoMessage.setVisibility(View.GONE);
+            if (listData.size() != 0 && page == 1){
                 listData.clear();
             }
             listData.addAll(dataBean.getDataList());
             mTroubleListAdapter.notifyDataSetChanged();
         }
-        if (dataBean.getRows() >= Integer.valueOf(BaseConstants.PAGE_SIZE)){
-            srlRefresh.setEnableLoadMore(true);
-        }
         stopLoading();
     }
 

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

@@ -117,9 +117,9 @@
             android:id="@+id/rv_list"
             android:visibility="gone"
             android:layout_marginLeft="80dp"
-            android:background="@color/white"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:background="@drawable/shape_popupwindow_list_bg"
             android:layout_marginTop="@dimen/dp_40" />
     </RelativeLayout>
 

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

@@ -67,6 +67,7 @@
                     android:textCursorDrawable="@drawable/cursor_color"
                     android:textSize="16sp"
                     android:paddingLeft="20dp"
+                    android:paddingRight="40dp"
                     android:singleLine="true"
                     android:imeOptions="actionDone"
                     android:background="@null"

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

@@ -86,7 +86,7 @@
             android:layout_height="30dp"
             android:src="@mipmap/ic_home_blue_localhost"/>
     </RelativeLayout>
-        <com.silence.commonframe.utils1.MaxHeightRecyclerView
+        <com.silence.commonframe.utils.MaxHeightRecyclerView
             android:id="@+id/rv_list"
             android:layout_alignParentBottom="true"
             android:layout_width="match_parent"

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

@@ -1,62 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
-    android:orientation="vertical"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-    <HorizontalScrollView
+
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fillViewport="true"
-        android:scrollbars="none"
-        >
+        android:layout_height="match_parent"
+        android:scrollbars="none">
+
         <LinearLayout
-            android:orientation="horizontal"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-            <com.github.mikephil.charting.charts.LineChart
-                android:id="@+id/lineChart"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <HorizontalScrollView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fillViewport="true"
+                android:scrollbars="none"
+                >
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <com.github.mikephil.charting.charts.LineChart
+                        android:id="@+id/lineChart"
+                        android:layout_width="match_parent"
+                        android:layout_height="200dp"
+                        android:padding="20dp" />
+                </LinearLayout>
+            </HorizontalScrollView>
+            <TextView
+                android:background="@color/bg_gray"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="14dp"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp"
+                android:text="运行明细"
+                android:textColor="@color/gray_333"
+                android:textSize="15dp"
+                android:textStyle="bold" />
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/rv_list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"/>
+            <LinearLayout
+                android:id="@+id/ll_no_data"
+                android:visibility="gone"
+                android:orientation="vertical"
                 android:layout_width="match_parent"
-                android:layout_height="200dp"
-                android:padding="20dp" />
+                android:layout_height="match_parent">
+                <ImageView
+                    android:id="@+id/tv_security"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:src="@drawable/home_security" />
+
+                <TextView
+                    android:id="@+id/tv_safe"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center_horizontal"
+                    android:text="暂无消息"
+                    android:textColor="#444"
+                    android:textSize="15sp" />
+            </LinearLayout>
+
         </LinearLayout>
-    </HorizontalScrollView>
-    <TextView
-        android:background="@color/bg_gray"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="14dp"
-        android:paddingTop="10dp"
-        android:paddingBottom="10dp"
-        android:text="运行明细"
-        android:textColor="@color/gray_333"
-        android:textSize="15dp"
-        android:textStyle="bold" />
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/rv_list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-    <LinearLayout
-        android:id="@+id/ll_no_data"
-        android:visibility="gone"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-        <ImageView
-            android:id="@+id/tv_security"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:src="@drawable/home_security" />
 
-        <TextView
-            android:id="@+id/tv_safe"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center_horizontal"
-            android:text="暂无消息"
-            android:textColor="#444"
-            android:textSize="15sp" />
-    </LinearLayout>
+    </ScrollView>
 
 </LinearLayout>

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

@@ -12,6 +12,7 @@
         android:id="@+id/srl_refresh"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
+
         <LinearLayout
             android:orientation="vertical"
             android:layout_width="match_parent"

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

@@ -39,6 +39,7 @@
                 android:background="@drawable/bg_corner_addsidetext"
                 android:textSize="16sp"
                 android:textColor="@color/myblack"
+                android:singleLine="true"
                 android:hint="请手动输入编号"
                 />
 

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

@@ -1,23 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="200dp"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    >
+    android:orientation="vertical">
+
     <TextView
-    android:id="@+id/tv_content"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:textColor="@color/myblack"
-    android:textSize="14dp"
-    android:singleLine="true"
-    android:ellipsize="marquee"
-    android:textAlignment="gravity"
-    android:text="烟感"
-    android:paddingTop="@dimen/dp_10"
-    android:paddingBottom="@dimen/dp_10"
-    />
+        android:id="@+id/tv_content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="@color/myblack"
+        android:textSize="14dp"
+        android:singleLine="true"
+        android:ellipsize="marquee"
+        android:textAlignment="gravity"
+        android:text="烟感"
+        android:paddingLeft="10dp"
+        android:paddingTop="@dimen/dp_10"
+        android:paddingBottom="@dimen/dp_10" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:background="@color/mygray"/>
+
 </LinearLayout>