6.20.1

app/src/main/AndroidManifest.xml

@@ -358,20 +358,13 @@
             android:screenOrientation="portrait" />
 
         <!-- 企业版主界面 -->
-        <activity android:name="com.silence.tech.ui.MainCompanyActivity"
-            android:screenOrientation="portrait"/>
-        <!-- 企业版监控火警界面 -->
-        <activity android:name="com.silence.tech.ui.moni.activity.MoniFireAlarmActivity"
-            android:screenOrientation="portrait"/>
-        <!-- 企业版监控故障界面 -->
-        <activity android:name="com.silence.tech.ui.moni.activity.MoniFaultActivity"
-            android:screenOrientation="portrait"/>
+        <activity
+            android:name="com.silence.tech.ui.MainCompanyActivity"
+            android:screenOrientation="portrait" />
         <!-- 企业版监控异常界面 -->
-        <activity android:name="com.silence.tech.ui.moni.activity.MoniAbnormalActivity"
-            android:screenOrientation="portrait"/>
-        <!-- 企业版监控隐患界面 -->
-        <activity android:name="com.silence.tech.ui.moni.activity.MoniHidTroubleActivity"
-            android:screenOrientation="portrait"/>
+        <activity android:name="com.silence.tech.ui.moni.activity.MoniTroubleActivity"
+            android:screenOrientation="portrait"
+            ></activity>
     </application>
 
 </manifest>

app/src/main/java/com/silence/tech/adapter/MoniTroubleAdapter.java

@@ -1,6 +1,9 @@
 package com.silence.tech.adapter;
 
+import android.graphics.Color;
 import android.support.annotation.Nullable;
+import android.text.TextUtils;
+import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -12,11 +15,12 @@ import com.silence.tech.bean.TroubleListBean;
 import java.util.List;
 
 public class MoniTroubleAdapter extends BaseQuickAdapter<TroubleListBean.DataBean.DataListBean, BaseViewHolder> {
-
+    mOnClickListener onclick;
     List<TroubleListBean.DataBean.DataListBean> listData;
 
-    public MoniTroubleAdapter(int layoutResId, @Nullable List<TroubleListBean.DataBean.DataListBean> listData) {
+    public MoniTroubleAdapter(int layoutResId, @Nullable List<TroubleListBean.DataBean.DataListBean> listData, mOnClickListener onclick) {
         super(layoutResId, listData);
+        this.onclick = onclick;
         this.listData = listData;
     }
 
@@ -24,6 +28,7 @@ public class MoniTroubleAdapter extends BaseQuickAdapter<TroubleListBean.DataBea
     protected void convert(BaseViewHolder helper, TroubleListBean.DataBean.DataListBean data) {
         TextView tvDeviceName = helper.itemView.findViewById(R.id.recycler_view_test_item_person_name_tv);  //设备名称
         TextView tvRegionName = helper.itemView.findViewById(R.id.recycler_view_place);     //区域名
+        ImageView ivTrouble = helper.itemView.findViewById(R.id.imageView_fire);            //状态图标
         TextView tvTroubleType = helper.itemView.findViewById(R.id.fire);                   //设备状态
         TextView tvDeviceId = helper.itemView.findViewById(R.id.number);            //设备编号
         TextView tvDeviceLocation = helper.itemView.findViewById(R.id.place);           //位置
@@ -37,12 +42,20 @@ public class MoniTroubleAdapter extends BaseQuickAdapter<TroubleListBean.DataBea
 
         if ("1".equals(data.getTroubleType())){
             tvTroubleType.setText(R.string.state_fire);
+            tvTroubleType.setTextColor(Color.rgb(250,85,58));
+            ivTrouble.setImageResource(R.mipmap.redlinght);
         }else if ("2".equals(data.getTroubleType())){
             tvTroubleType.setText(R.string.state_fault);
+            tvTroubleType.setTextColor(Color.rgb(255,153,51));
+            ivTrouble.setImageResource(R.mipmap.redlinght0);
         }else if ("3".equals(data.getTroubleType())){
             tvTroubleType.setText(R.string.state_abnormal);
+            tvTroubleType.setTextColor(Color.rgb(68,68,68));
+            ivTrouble.setImageResource(R.mipmap.light);
         }else if ("0".equals(data.getTroubleType())){
             tvTroubleType.setText(R.string.state_hidtrouble);
+            tvTroubleType.setTextColor(Color.rgb(68,68,68));
+            ivTrouble.setImageResource(R.mipmap.light);
         }
 
         String deviceId = "编号：" + data.getDeviceId();
@@ -54,7 +67,7 @@ public class MoniTroubleAdapter extends BaseQuickAdapter<TroubleListBean.DataBea
         String location = "地址：" + data.getLocation();
         tvLocation.setText(location);
 
-        if ("11".equals(data.getRecheckId())){
+        if (data.getRecheckId() == null){
             ivCheck.setImageResource(R.mipmap.unaudited1);
         }else {
             if ("0".equals(data.getIsValid())){
@@ -65,5 +78,15 @@ public class MoniTroubleAdapter extends BaseQuickAdapter<TroubleListBean.DataBea
             }
         }
 
+        helper.itemView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                onclick.itemOnClick(helper.getLayoutPosition(),listData);
+            }
+        });
+    }
+
+    public interface mOnClickListener{
+        void itemOnClick(int position, List<TroubleListBean.DataBean.DataListBean> listData);
     }
 }

app/src/main/java/com/silence/tech/bean/TroubleTypeBean.java

@@ -7,7 +7,7 @@ public class TroubleTypeBean {
     /**
      * code : 0
      * msg : success
-     * data : [{"typeId":"1","typeName":"火警","count":0},{"typeId":"2","typeName":"故障","count":0},{"typeId":"0","typeName":"异常","count":0},{"typeId":"3","typeName":"隐患","count":0}]
+     * data : [{"typeId":"1","typeName":"火警","count":1},{"typeId":"2","typeName":"故障","count":0},{"typeId":"0","typeName":"异常","count":0},{"typeId":"3","typeName":"隐患","count":0}]
      */
 
     private int code;
@@ -42,7 +42,7 @@ public class TroubleTypeBean {
         /**
          * typeId : 1
          * typeName : 火警
-         * count : 0
+         * count : 1
          */
 
         private String typeId;

app/src/main/java/com/silence/tech/constant/UrlConstantsTech.java

@@ -26,5 +26,7 @@ public interface UrlConstantsTech {
     String TROUBLE_TYPE = BASE_LOCAL + BASE_COMPANY + "getTroubleType";
     //查询未处理的设备异常记录
     String DEV_TROUBLE_LIST = BASE_LOCAL + BASE_COMPANY + "getDevTroubleList";
+
+    String DEV_TROUBLE_LIST_BY_TYPE = BASE_LOCAL + BASE_COMPANY + "getDevTroubleListByType";
 }
 

app/src/main/java/com/silence/tech/ui/moni/Interface/MoniListener.java

@@ -12,6 +12,7 @@ import java.util.List;
  */
 public interface MoniListener {
     interface View{
+        int getPage();
 
         void onTroubleListSuccess(TroubleListBean.DataBean dataBean);
         void onTroubleTypeSuccess(List<TroubleTypeBean.DataBean> data);

app/src/main/java/com/silence/tech/ui/moni/Interface/MoniTroubleListener.java

@@ -0,0 +1,19 @@
+package com.silence.tech.ui.moni.Interface;
+
+import com.silence.commonframe.base.basemvp.BaseModel;
+import com.silence.commonframe.base.basemvp.BasePresenter;
+import com.silence.tech.bean.TroubleListBean;
+
+public interface MoniTroubleListener {
+    interface View {
+        String getTroubleType();
+        int getPage();
+
+        void onDevTroubleListSuccess(TroubleListBean.DataBean dataBean);
+        void onFile(String msg);
+
+    }
+    abstract class Presenter extends BasePresenter<View,BaseModel> {
+        public abstract void getDevTroubleListByType();
+    }
+}

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

@@ -1,22 +0,0 @@
-package com.silence.tech.ui.moni.activity;
-
-import com.silence.commonframe.R;
-import com.silence.commonframe.base.basemvp.BaseActivity;
-
-public class MoniAbnormalActivity extends BaseActivity {
-
-    @Override
-    public int getLayoutId() {
-        return R.layout.activity_moni_abnormal;
-    }
-
-    @Override
-    public void initPresenter() {
-
-    }
-
-    @Override
-    public void initView() {
-
-    }
-}

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

@@ -1,22 +0,0 @@
-package com.silence.tech.ui.moni.activity;
-
-import com.silence.commonframe.R;
-import com.silence.commonframe.base.basemvp.BaseActivity;
-
-public class MoniFaultActivity extends BaseActivity {
-
-    @Override
-    public int getLayoutId() {
-        return R.layout.activity_moni_fault;
-    }
-
-    @Override
-    public void initPresenter() {
-
-    }
-
-    @Override
-    public void initView() {
-
-    }
-}

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

@@ -1,22 +0,0 @@
-package com.silence.tech.ui.moni.activity;
-
-import com.silence.commonframe.R;
-import com.silence.commonframe.base.basemvp.BaseActivity;
-
-public class MoniFireAlarmActivity extends BaseActivity {
-
-    @Override
-    public int getLayoutId() {
-        return R.layout.activity_moni_fire_alarm;
-    }
-
-    @Override
-    public void initPresenter() {
-
-    }
-
-    @Override
-    public void initView() {
-
-    }
-}

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

@@ -1,46 +1,34 @@
 package com.silence.tech.ui.moni.activity;
 
 import android.content.Intent;
-import android.os.Bundle;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.Switch;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import com.lzy.okgo.OkGo;
-import com.lzy.okgo.cache.CacheMode;
-import com.lzy.okgo.callback.StringCallback;
+import com.scwang.smartrefresh.layout.SmartRefreshLayout;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener;
+import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 import com.silence.commonframe.R;
-import com.silence.commonframe.activity.AirGuardWordTimeActivity;
 import com.silence.commonframe.base.basemvp.BaseFragment;
-import com.silence.commonframe.bean.BaseBean;
-import com.silence.commonframe.utils.Data;
-import com.silence.commonframe.utils.LoginIn;
+import com.silence.commonframe.common.constant.BaseConstants;
 import com.silence.tech.adapter.MoniTroubleAdapter;
 import com.silence.tech.bean.TroubleListBean;
 import com.silence.tech.bean.TroubleTypeBean;
-import com.silence.tech.constant.UrlConstantsTech;
 import com.silence.tech.ui.moni.Interface.MoniListener;
 import com.silence.tech.ui.moni.presenter.MoniPresenter;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.Unbinder;
-import okhttp3.Call;
-import okhttp3.Response;
+import butterknife.OnClick;
 
 
 public class MoniFragment extends BaseFragment implements MoniListener.View{
@@ -54,8 +42,15 @@ public class MoniFragment extends BaseFragment implements MoniListener.View{
     @BindView(R.id.back_pic)
     ImageView ivBackPic;
 
-    Unbinder butterKnife;
+    private String TROUBLE_FIRE_ALARM = "1";        //类型火警
+    private String TROUBLE_FAULT = "2";             //类型故障
+    private String TROUBLE_ABNORMAL = "0";          //类型异常
+    private String TROUBLE_HID_TROUBLE = "3";       //类型隐患
 
+    private int page = 1;
+
+    @BindView(R.id.ll_no_message)
+    LinearLayout llNoMessage;
     @BindView(R.id.tv_fire_alarm)
     TextView tvFireAlarm;
     @BindView(R.id.tv_fault)
@@ -66,6 +61,8 @@ public class MoniFragment extends BaseFragment implements MoniListener.View{
     TextView tvHidTrouble;
     @BindView(R.id.rv_moni_msg)
     RecyclerView rvTroubleList;
+    @BindView(R.id.srl_refresh)
+    SmartRefreshLayout srlRefresh;
 
     List<TroubleTypeBean.DataBean> listTroubleType = new ArrayList<>();
 
@@ -73,6 +70,8 @@ public class MoniFragment extends BaseFragment implements MoniListener.View{
 
     MoniTroubleAdapter mTroubleListAdapter;
 
+    private List<HashMap<String, String>> listmap = new ArrayList<>();
+
     @Override
     protected int getLayoutResource() {
         return R.layout.fragment_moni;
@@ -87,8 +86,23 @@ public class MoniFragment extends BaseFragment implements MoniListener.View{
     protected void initView() {
         navi_head_text.setText(R.string.text_tab_moni);
         ivBackPic.setVisibility(View.GONE);
-        presenter.getTroubleType();
-        presenter.getTroubleList();
+
+        srlRefresh.setOnRefreshListener(new OnRefreshListener() {
+            @Override
+            public void onRefresh(@NonNull RefreshLayout refreshLayout) {
+                presenter.getTroubleType();
+                presenter.getTroubleList();
+            }
+        });
+        srlRefresh.setOnLoadMoreListener(new OnLoadMoreListener() {
+            @Override
+            public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
+                page = page + 1;
+                presenter.getTroubleList();
+            }
+        });
+        srlRefresh.autoRefresh();
+        srlRefresh.setEnableLoadMore(false);
     }
 
     @Override
@@ -124,27 +138,89 @@ public class MoniFragment extends BaseFragment implements MoniListener.View{
         }
     }
 
+    //点击事件
+    @OnClick({R.id.ll_fire_alarm, R.id.ll_fault, R.id.ll_abnormal, R.id.ll_hidtrouble})
+    public void onClick(View view){
+        switch (view.getId()){
+            case R.id.ll_fire_alarm:{
+                Intent intent = new Intent(getActivity(),MoniTroubleActivity.class);
+                intent.putExtra("troubleType",TROUBLE_FIRE_ALARM);
+                startActivity(intent);
+            }
+            break;
+            case R.id.ll_fault:{
+                Intent intent = new Intent(getActivity(),MoniTroubleActivity.class);
+                intent.putExtra("troubleType",TROUBLE_FAULT);
+                startActivity(intent);
+            }
+            break;
+            case R.id.ll_abnormal:{
+                Intent intent = new Intent(getActivity(),MoniTroubleActivity.class);
+                intent.putExtra("troubleType",TROUBLE_ABNORMAL);
+                startActivity(intent);
+            }
+            break;
+            case R.id.ll_hidtrouble:{
+                Intent intent = new Intent(getActivity(),MoniTroubleActivity.class);
+                intent.putExtra("troubleType",TROUBLE_HID_TROUBLE);
+                startActivity(intent);
+            }
+            break;
+        }
+    }
 
     @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        butterKnife.unbind();
+    public int getPage() {
+        return page;
     }
 
+    MoniTroubleAdapter.mOnClickListener onclick = new MoniTroubleAdapter.mOnClickListener() {
+        @Override
+        public void itemOnClick(int position, List<TroubleListBean.DataBean.DataListBean> listData) {
+//            HashMap<String,String> hashMap = new HashMap<>();
+//            hashMap.put("processId", listData.get(position).getId());
+//            hashMap.put("deviceId", listData.get(position).getDeviceId());
+//            hashMap.put("deployment", listData.get(position).getDeployment());
+//            hashMap.put("location", listData.get(position).getLocation());
+//            hashMap.put("regionName", listData.get(position).getRegionName());
+//            hashMap.put("deviceLocation", listData.get(position).getDeviceLocation());
+//            hashMap.put("gmtCreate", listData.get(position).getGmtCreate());
+//            hashMap.put("troubleType", listData.get(position).getTroubleType());
+//            hashMap.put("deviceName", listData.get(position).getDeviceName());
+//            hashMap.put("recheckTime", listData.get(position).getRecheckTime());
+//            hashMap.put("recheckType", recheckType);
+//            hashMap.put("isValid", isValid);
+        }
+    };
+
+    //获取异常列表回调
     @Override
     public void onTroubleListSuccess(TroubleListBean.DataBean dataBean) {
-        mTroubleListAdapter = new MoniTroubleAdapter(R.layout.item_recylerview,dataBean.getDataList());
-        rvTroubleList.setLayoutManager(new LinearLayoutManager(getContext()));
-        rvTroubleList.setAdapter(mTroubleListAdapter);
-        mTroubleListAdapter.notifyDataSetChanged();
+        if (srlRefresh != null){
+            srlRefresh.finishRefresh();
+        }
+        if (dataBean.getRows() == 0){
+            llNoMessage.setVisibility(View.VISIBLE);
+        }else {
+            mTroubleListAdapter = new MoniTroubleAdapter(R.layout.item_recylerview,dataBean.getDataList(),onclick);
+            rvTroubleList.setLayoutManager(new LinearLayoutManager(getContext()));
+            rvTroubleList.setAdapter(mTroubleListAdapter);
+            mTroubleListAdapter.notifyDataSetChanged();
+        }
+        if (dataBean.getRows() >= Integer.valueOf(BaseConstants.PAGE_SIZE)){
+            srlRefresh.setEnableLoadMore(true);
+        }
     }
 
-    //获取异常类型成功后操作
+    //获取异常类型回调
     @Override
     public void onTroubleTypeSuccess(List<TroubleTypeBean.DataBean> data) {
         listTroubleType.clear();
         listTroubleType.addAll(data);
         setTroubleType();
+        if (srlRefresh != null){
+            srlRefresh.finishRefresh();
+        }
     }
 
     @Override

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

@@ -1,22 +0,0 @@
-package com.silence.tech.ui.moni.activity;
-
-import com.silence.commonframe.R;
-import com.silence.commonframe.base.basemvp.BaseActivity;
-
-public class MoniHidTroubleActivity extends BaseActivity {
-
-    @Override
-    public int getLayoutId() {
-        return R.layout.activity_moni_hid_trouble;
-    }
-
-    @Override
-    public void initPresenter() {
-
-    }
-
-    @Override
-    public void initView() {
-
-    }
-}

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

@@ -0,0 +1,175 @@
+package com.silence.tech.ui.moni.activity;
+
+import android.graphics.Color;
+import android.os.Build;
+import android.support.annotation.NonNull;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.scwang.smartrefresh.layout.SmartRefreshLayout;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener;
+import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
+import com.silence.commonframe.R;
+import com.silence.commonframe.base.basemvp.BaseActivity;
+import com.silence.commonframe.common.constant.BaseConstants;
+import com.silence.tech.adapter.MoniTroubleAdapter;
+import com.silence.tech.bean.TroubleListBean;
+import com.silence.tech.ui.moni.Interface.MoniTroubleListener;
+import com.silence.tech.ui.moni.presenter.MoniTroublePresenter;
+
+import java.util.List;
+
+import butterknife.BindView;
+
+public class MoniTroubleActivity extends BaseActivity implements MoniTroubleListener.View {
+
+    /**
+     * 导航栏信息
+     * back_pic、navi_head_back_text（透明）、navi_head_text、navi_head_text_right（右侧文字）、navi_head_img_right（右侧图片）
+     */
+    @BindView(R.id.navi_head_text)
+    TextView navi_head_text;    //标题
+    @BindView(R.id.rv_trouble_list)
+    RecyclerView rvTroubleList;
+    @BindView(R.id.ll_no_message)
+    LinearLayout llNoMessage;
+    @BindView(R.id.srl_refresh)
+    SmartRefreshLayout srlRefresh;
+
+    private int page = 1;
+
+    private String title;
+    private String troubleType;
+
+    MoniTroublePresenter presenter;
+
+    MoniTroubleAdapter mTroubleListAdapter;
+
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.activity_moni_trouble;
+    }
+
+    @Override
+    public void initPresenter() {
+        presenter = new MoniTroublePresenter(this,this);
+    }
+
+    @Override
+    public void initView() {
+        initWindows();
+        switch (getIntent().getStringExtra("troubleType")){
+            case "1": {
+                title = getResources().getString(R.string.state_fire) + getResources().getString(R.string.text_tab_moni);
+                troubleType = "1";
+            }
+            break;
+            case "2": {
+                title = getResources().getString(R.string.state_fault) + getResources().getString(R.string.text_tab_moni);
+                troubleType = "2";
+            }
+            break;
+            case "0": {
+                title = getResources().getString(R.string.state_abnormal) + getResources().getString(R.string.text_tab_moni);
+                troubleType = "0";
+            }
+            break;
+            case "3": {
+                title = getResources().getString(R.string.state_hidtrouble) + getResources().getString(R.string.text_tab_moni);
+                troubleType = "3";
+            }
+            break;
+        }
+        navi_head_text.setText(title);      //标题
+
+        //刷新
+        srlRefresh.setOnRefreshListener(new OnRefreshListener() {
+            @Override
+            public void onRefresh(@NonNull RefreshLayout refreshLayout) {
+                presenter.getDevTroubleListByType();
+            }
+        });
+        //加载更多
+        srlRefresh.setOnLoadMoreListener(new OnLoadMoreListener() {
+            @Override
+            public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
+                presenter.getDevTroubleListByType();
+            }
+        });
+        srlRefresh.autoRefresh();
+
+    }
+
+    /**
+     * 返回按钮
+     */
+    public void click_back(View view) {
+        finish();
+    }
+
+    @Override
+    public String getTroubleType() {
+        return troubleType;
+    }
+
+    @Override
+    public int getPage() {
+        return page;
+    }
+
+    MoniTroubleAdapter.mOnClickListener onclick = new MoniTroubleAdapter.mOnClickListener() {
+        @Override
+        public void itemOnClick(int position, List<TroubleListBean.DataBean.DataListBean> listData) {
+
+        }
+    };
+
+    @Override
+    public void onDevTroubleListSuccess(TroubleListBean.DataBean dataBean) {
+        if (srlRefresh != null){
+            srlRefresh.finishRefresh();
+        }
+        if (dataBean.getRows() == 0){
+            llNoMessage.setVisibility(View.VISIBLE);
+        }else {
+            llNoMessage.setVisibility(View.GONE);
+            mTroubleListAdapter = new MoniTroubleAdapter(R.layout.item_recylerview,dataBean.getDataList(),onclick);
+            rvTroubleList.setLayoutManager(new LinearLayoutManager(this));
+            rvTroubleList.setAdapter(mTroubleListAdapter);
+            mTroubleListAdapter.notifyDataSetChanged();
+        }
+        if (dataBean.getRows() >= Integer.valueOf(BaseConstants.PAGE_SIZE)){
+            srlRefresh.setEnableLoadMore(true);
+        }
+    }
+
+    @Override
+    public void onFile(String msg) {
+        Toast.makeText(this,""+msg,Toast.LENGTH_SHORT).show();
+    }
+
+    /**
+     * 页面全屏
+     */
+    private void initWindows() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            Window window = getWindow();
+            window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS
+                    | WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
+            window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+            window.setStatusBarColor(Color.TRANSPARENT);
+            window.setNavigationBarColor(Color.BLACK);
+        }
+    }
+}

app/src/main/java/com/silence/tech/ui/moni/presenter/MoniPresenter.java

@@ -6,6 +6,7 @@ import com.google.gson.Gson;
 import com.lzy.okgo.OkGo;
 import com.lzy.okgo.cache.CacheMode;
 import com.lzy.okgo.callback.StringCallback;
+import com.silence.commonframe.common.constant.BaseConstants;
 import com.silence.commonframe.utils.Data;
 import com.silence.commonframe.utils.LoginIn;
 import com.silence.tech.bean.TroubleListBean;
@@ -18,8 +19,6 @@ import okhttp3.Response;
 
 public class MoniPresenter extends MoniListener.Presenter {
 
-    private int PAGE_SIZE = 20;
-
     public MoniPresenter(Activity mContext, MoniListener.View mView){
         this.mContext = mContext;
         this.mView = mView;
@@ -27,7 +26,7 @@ public class MoniPresenter extends MoniListener.Presenter {
 
     @Override
     public void getTroubleType() {
-        OkGo.get(UrlConstantsTech.TROUBLE_TYPE)
+        OkGo.get(UrlConstantsTech.DEV_TROUBLE_COUNT)
                 .tag(this)
                 .cacheKey("cacheGetKey")
                 .cacheMode(CacheMode.DEFAULT)
@@ -56,8 +55,8 @@ public class MoniPresenter extends MoniListener.Presenter {
     public void getTroubleList() {
         OkGo.get(UrlConstantsTech.DEV_TROUBLE_LIST)
                 .tag(this)
-                .params("page",1)
-                .params("pageSize",PAGE_SIZE)
+                .params("page",mView.getPage())
+                .params("pageSize",Integer.valueOf(BaseConstants.PAGE_SIZE))
                 .cacheKey("cacheGetKey")
                 .cacheMode(CacheMode.DEFAULT)
                 .headers("token", Data.getToken())
@@ -80,4 +79,5 @@ public class MoniPresenter extends MoniListener.Presenter {
                     }
                 });
     }
+
 }

app/src/main/java/com/silence/tech/ui/moni/presenter/MoniTroublePresenter.java

@@ -0,0 +1,55 @@
+package com.silence.tech.ui.moni.presenter;
+
+import android.app.Activity;
+
+import com.google.gson.Gson;
+import com.lzy.okgo.OkGo;
+import com.lzy.okgo.cache.CacheMode;
+import com.lzy.okgo.callback.StringCallback;
+import com.silence.commonframe.common.constant.BaseConstants;
+import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.utils.LoginIn;
+import com.silence.tech.bean.TroubleListBean;
+import com.silence.tech.constant.UrlConstantsTech;
+import com.silence.tech.ui.moni.Interface.MoniTroubleListener;
+
+import okhttp3.Call;
+import okhttp3.Response;
+
+public class MoniTroublePresenter extends MoniTroubleListener.Presenter {
+
+    public MoniTroublePresenter(Activity mContext, MoniTroubleListener.View mView){
+        this.mContext=mContext;
+        this.mView=mView;
+    }
+
+
+    @Override
+    public void getDevTroubleListByType() {
+        OkGo.get(UrlConstantsTech.DEV_TROUBLE_LIST_BY_TYPE)
+                .params("page",mView.getPage())
+                .params("pageSize",Integer.valueOf(BaseConstants.PAGE_SIZE))
+                .params("troubleType",mView.getTroubleType())
+                .cacheKey("cachePostRegister11")
+                .cacheMode(CacheMode.DEFAULT)
+                .headers("token", Data.getToken())
+                .execute(new StringCallback() {
+                    @Override
+                    public void onSuccess(String s, Call call, Response response) {
+                        TroubleListBean data = new Gson().fromJson(s,TroubleListBean.class);
+                        if (data.getCode() == 0){
+                            mView.onDevTroubleListSuccess(data.getData());
+                        }else {
+                            LoginIn.tokenOut(data.getCode(),mContext);
+                            mView.onFile(data.getMsg());
+                        }
+                    }
+
+                    @Override
+                    public void onError(Call call, Response response, Exception e) {
+                        super.onError(call, response, e);
+                        mView.onFile("信息获取失败");
+                    }
+                });
+    }
+}

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

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.silence.tech.ui.moni.activity.MoniAbnormalActivity">
-
-</android.support.constraint.ConstraintLayout>

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

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.silence.tech.ui.moni.activity.MoniFaultActivity">
-
-</android.support.constraint.ConstraintLayout>

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

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context="com.silence.tech.ui.moni.activity.MoniFireAlarmActivity">
-
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/rv_fire_alarm"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-    </android.support.v7.widget.RecyclerView>
-
-</android.support.constraint.ConstraintLayout>

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

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.silence.tech.ui.moni.activity.MoniHidTroubleActivity">
-
-</android.support.constraint.ConstraintLayout>

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

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context="com.silence.tech.ui.moni.activity.MoniTroubleActivity">
+
+    <include layout="@layout/navi_head"/>
+
+    <com.scwang.smartrefresh.layout.SmartRefreshLayout
+        android:id="@+id/srl_refresh"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:id="@+id/ll_no_message"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:visibility="gone">
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/nothing"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/margin_side"
+                    android:text="@string/no_message"
+                    android:textSize="14sp"
+                    android:textColor="@color/myblack"/>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"/>
+            </LinearLayout>
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/rv_trouble_list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"/>
+
+        </LinearLayout>
+
+
+
+    </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
+
+
+</LinearLayout>

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

@@ -2,7 +2,10 @@
 <LinearLayout
     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:orientation="vertical">
+
+    <include layout="@layout/navi_head"/>
 
     <com.scwang.smartrefresh.layout.SmartRefreshLayout
         android:id="@+id/srl_refresh"
@@ -14,7 +17,28 @@
             android:layout_height="match_parent"
             android:orientation="vertical">
 
-            <include layout="@layout/navi_head"/>
+            <LinearLayout
+                android:id="@+id/ll_no_message"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:visibility="gone">
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/nothing"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/margin_side"
+                    android:text="@string/no_message"
+                    android:textSize="14sp"
+                    android:textColor="@color/myblack"/>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"/>
+            </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/ll_top"
@@ -42,7 +66,7 @@
                         android:layout_height="wrap_content"
                         android:textColor="@color/myblack"
                         android:textSize="16sp"
-                        android:text="1"/>
+                        android:text="0"/>
 
                 </LinearLayout>
 
@@ -65,7 +89,7 @@
                         android:layout_height="wrap_content"
                         android:textColor="@color/myblack"
                         android:textSize="16sp"
-                        android:text="2"/>
+                        android:text="0"/>
 
                 </LinearLayout>
 
@@ -88,7 +112,7 @@
                         android:layout_height="wrap_content"
                         android:textColor="@color/myblack"
                         android:textSize="16sp"
-                        android:text="3"/>
+                        android:text="0"/>
 
                 </LinearLayout>
 
@@ -111,7 +135,7 @@
                         android:layout_height="wrap_content"
                         android:textColor="@color/myblack"
                         android:textSize="16sp"
-                        android:text="4"/>
+                        android:text="0"/>
 
                 </LinearLayout>