6.22.1 空气卫士调整

火警通知页面调整
复核详情页面调整
场所管理界面调整
接口修改
企业版监控页面调整
档案页面异常信息增加点击进入复核详情

app/src/main/java/com/silence/commonframe/activity/AirGuardWordTimeActivity.java

@@ -1,4 +1,5 @@
 package com.silence.commonframe.activity;
+
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Build;

app/src/main/java/com/silence/commonframe/activity/HistoryActivity.java

@@ -115,7 +115,7 @@ public class HistoryActivity extends BaseActivity implements HistoryListener.Vie
 
     @Override
     public void initView() {
-        getData1();
+        presenter.getData();
         initWindows();
 
         mAdapter = new FireAlarmAdapter(HistoryActivity.this, listmap, myItemClickListener);

app/src/main/java/com/silence/commonframe/activity/NewsdetailActivity.java

@@ -3,11 +3,8 @@ package com.silence.commonframe.activity;
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Build;
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
@@ -16,34 +13,18 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 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.ApiService;
 import com.silence.commonframe.R;
 import com.silence.commonframe.activity.Interface.NewsDetailListener;
 import com.silence.commonframe.activity.presenter.NewsDetailPresenter;
 import com.silence.commonframe.adapter.RecheckMsgAdapter;
 import com.silence.commonframe.base.basemvp.BaseActivity;
-import com.silence.commonframe.model.FireAlarmModel;
 import com.silence.commonframe.model.RecheckMsgModel;
 import com.silence.commonframe.model.TroubleDeviceModel;
-import com.silence.commonframe.utils.AtyContainer;
-import com.silence.commonframe.utils.Data;
-import com.silence.commonframe.utils.LoginIn;
-
-import org.json.JSONException;
-import org.json.JSONObject;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 
-
 import butterknife.BindView;
-import butterknife.ButterKnife;
-import okhttp3.Call;
-import okhttp3.Response;
 
 public class NewsdetailActivity extends BaseActivity implements NewsDetailListener.View {
    @BindView(R.id.imageView4)
@@ -82,6 +63,7 @@ public class NewsdetailActivity extends BaseActivity implements NewsDetailListen
     TextView tv_cputem;
 
     TroubleDeviceModel.DataBean dataBean;
+    List<RecheckMsgModel.DataBean> listDataBean = new ArrayList<>();
 
     private String recheckId;
     private String processId;
@@ -104,6 +86,11 @@ public class NewsdetailActivity extends BaseActivity implements NewsDetailListen
     public void initView() {
         initWindows();
 
+        RecyclerView_RecheckMsg.setLayoutManager(new LinearLayoutManager(NewsdetailActivity.this));
+        recheckMsgAdapter = new RecheckMsgAdapter(R.layout.item_recheckmsg,listDataBean,itemClickListener);
+        RecyclerView_RecheckMsg.setAdapter(recheckMsgAdapter);
+        RecyclerView_RecheckMsg.setNestedScrollingEnabled(false);
+
         Intent intent = getIntent();
         //  list1 = (List<HashMap<String, String>>) bundle.getSerializable("listmap");
         String jsonData = getIntent().getStringExtra("listmap");
@@ -183,10 +170,10 @@ public class NewsdetailActivity extends BaseActivity implements NewsDetailListen
 
     @Override
     public void onRecheckMsgSuccess(List<RecheckMsgModel.DataBean> dataBean) {
-        recheckMsgAdapter = new RecheckMsgAdapter(R.layout.item_recheckmsg,dataBean,itemClickListener);
-        RecyclerView_RecheckMsg.setLayoutManager(new LinearLayoutManager(NewsdetailActivity.this));
-        RecyclerView_RecheckMsg.setAdapter(recheckMsgAdapter);
-        RecyclerView_RecheckMsg.setNestedScrollingEnabled(false);
+        if (listDataBean.size() != 0){
+            listDataBean.clear();
+        }
+        listDataBean.addAll(dataBean);
         recheckMsgAdapter.notifyDataSetChanged();
     }
 

app/src/main/java/com/silence/commonframe/activity/SitedetailActivity.java

@@ -118,6 +118,8 @@ public class SitedetailActivity extends BaseActivity implements SiteDetailListen
             }
         });
 
+        presenter.getSite();
+
         btdel.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -154,7 +156,6 @@ public class SitedetailActivity extends BaseActivity implements SiteDetailListen
             }
         });
         srlRefresh.setEnableLoadMore(false);
-        srlRefresh.autoRefresh();
     }
 
     /**
@@ -279,6 +280,7 @@ public class SitedetailActivity extends BaseActivity implements SiteDetailListen
             }
         });
 
+
         srlRefresh.finishRefresh();
     }
 

app/src/main/java/com/silence/commonframe/activity/presenter/AirGuardWordTimePresenter.java

@@ -1,7 +1,6 @@
 package com.silence.commonframe.activity.presenter;
 
 import android.app.Activity;
-import android.widget.Toast;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
@@ -9,12 +8,10 @@ import com.lzy.okgo.OkGo;
 import com.lzy.okgo.cache.CacheMode;
 import com.lzy.okgo.callback.StringCallback;
 import com.silence.commonframe.ApiService;
-import com.silence.commonframe.activity.Interface.AirGuardListener;
 import com.silence.commonframe.activity.Interface.AirGuardWordTimeListener;
-import com.silence.commonframe.bean.AirGuardDetailBean;
-import com.silence.commonframe.bean.AirGuardWordTimeBean;
 import com.silence.commonframe.bean.BaseBean;
 import com.silence.commonframe.common.constant.UrlConstants;
+import com.silence.commonframe.model.AirGuardRunTimeListModel;
 import com.silence.commonframe.utils.Data;
 import com.silence.commonframe.utils.LoginIn;
 
@@ -28,9 +25,11 @@ public class AirGuardWordTimePresenter extends AirGuardWordTimeListener.Presente
         this.mContext=mContext;
         this.mView=mView;
     }
+
+    //获取运行时间间隔
     @Override
     public void getData() {
-        OkGo.get(ApiService.httpUrl1 + Data.getConfigUrl()+UrlConstants.AIR_RUN_TIME)
+        OkGo.get(ApiService.httpUrl1 + Data.getConfigUrl() + UrlConstants.AIR_RUN_TIME)
                 .params("deviceId",mView.getDevId())
                 .tag(this)
                 .cacheKey("cachePostRegister11")
@@ -39,14 +38,132 @@ public class AirGuardWordTimePresenter extends AirGuardWordTimeListener.Presente
                 .execute(new StringCallback() {
                     @Override
                     public void onSuccess(String s, Call call, Response response) {
-                        BaseBean<AirGuardWordTimeBean> data=new Gson().fromJson(s,new TypeToken<BaseBean<AirGuardWordTimeBean>>(){}.getType());
-                        if (data.code==0){
-                            mView.onSuccess(data.data);
+//                        BaseBean<AirGuardWordTimeBean> data=new Gson().fromJson(s,new TypeToken<BaseBean<AirGuardWordTimeBean>>(){}.getType());
+                        AirGuardRunTimeListModel data = new Gson().fromJson(s,AirGuardRunTimeListModel.class);
+                        if (data.getCode()==0){
+                            mView.onSuccess(data.getData());
+                        }else {
+                            LoginIn.tokenOut(data.getCode(),data.getMsg(),mContext);
+                            mView.onFile(data.getMsg());
+                        }
+                    }
+                    @Override
+                    public void onError(Call call, Response response, Exception e) {
+                        super.onError(call, response, e);
+                        mView.onFile("信息获取失败");
+                    }
+                });
+    }
+
+    //删除运行时间间隔
+    @Override
+    public void delRunTime(int position) {
+        OkGo.get(ApiService.httpUrl1 + Data.getConfigUrl() +UrlConstants.AIRGUARD_DEL_RUNTIME)
+                .tag(this)
+                .params("id",mView.getListTime().get(position).getId())
+                .cacheKey("cacheGetKey")
+                .cacheMode(CacheMode.DEFAULT)
+                .headers("token", Data.getToken())
+                .execute(new StringCallback() {
+                    @Override
+                    public void onSuccess(String s, Call call, Response response) {
+                        BaseBean data = new Gson().fromJson(s,new TypeToken<BaseBean>(){}.getType());
+                        if (data.code == 0){
+                            mView.onFile("删除成功");
+                        }else {
+                            LoginIn.tokenOut(data.code,mContext);
+                            mView.onFile(data.msg);
+                        }
+                    }
+
+                    @Override
+                    public void onError(Call call, Response response, Exception e) {
+                        super.onError(call, response, e);
+                        mView.onFile("信息获取失败");
+                    }
+                });
+    }
+
+    //打开或关闭运行时间
+    @Override
+    public void openCloseRunTime(int position) {
+        OkGo.get(ApiService.httpUrl1 + Data.getConfigUrl() +UrlConstants.AIRGUARD_OPEN_CLOSE_RUNTIME)
+                .tag(this)
+                .params("id",mView.getListTime().get(position).getId())
+                .cacheKey("cacheGetKey")
+                .cacheMode(CacheMode.DEFAULT)
+                .headers("token", Data.getToken())
+                .execute(new StringCallback() {
+                    @Override
+                    public void onSuccess(String s, Call call, Response response) {
+                        BaseBean data = new Gson().fromJson(s,new TypeToken<BaseBean>(){}.getType());
+                        if (data.code == 0){
+                            mView.onFile(data.msg);
                         }else {
-                            LoginIn.tokenOut(data.code,data.msg,mContext);
-                            Toast.makeText(mContext,""+data.msg,Toast.LENGTH_SHORT).show();
+                            LoginIn.tokenOut(data.code,mContext);
+                            mView.onFile(data.msg);
                         }
                     }
+
+                    @Override
+                    public void onError(Call call, Response response, Exception e) {
+                        super.onError(call, response, e);
+                        mView.onFile("信息获取失败");
+                    }
+                });
+    }
+
+    //修改运行时间间隔
+    @Override
+    public void updateRunTime(int position) {
+        OkGo.get(ApiService.httpUrl1 + Data.getConfigUrl() +UrlConstants.AIRGUARD_RUNTIMELIST)
+                .tag(this)
+                .params("deviceId",mView.getDevId())
+                .cacheKey("cacheGetKey")
+                .cacheMode(CacheMode.DEFAULT)
+                .headers("token", Data.getToken())
+                .execute(new StringCallback() {
+                    @Override
+                    public void onSuccess(String s, Call call, Response response) {
+                        AirGuardRunTimeListModel data = new Gson().fromJson(s,AirGuardRunTimeListModel.class);
+                        System.out.println(data.getData());
+                        if (data.getCode() == 0){
+                            mView.onUpdateSuccess(position,data);
+                        }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("信息获取失败");
+                    }
+                });
+    }
+
+    //更新数据
+    @Override
+    public void updateRunTime() {
+        OkGo.get(ApiService.httpUrl1 + Data.getConfigUrl() +UrlConstants.AIRGUARD_RUNTIMELIST)
+                .tag(this)
+                .params("deviceId",mView.getDevId())
+                .cacheKey("cacheGetKey")
+                .cacheMode(CacheMode.DEFAULT)
+                .headers("token", Data.getToken())
+                .execute(new StringCallback() {
+                    @Override
+                    public void onSuccess(String s, Call call, Response response) {
+                        AirGuardRunTimeListModel data = new Gson().fromJson(s,AirGuardRunTimeListModel.class);
+                        if (data.getCode() == 0){
+                            mView.onUpdateSuccess(data);
+                        }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);

app/src/main/java/com/silence/commonframe/activity/presenter/CheckPresenter.java

@@ -8,6 +8,7 @@ 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.silence.commonframe.ApiService;
 import com.silence.commonframe.R;
 import com.silence.commonframe.activity.Interface.CheckListener;
 import com.silence.commonframe.bean.BaseBean;
@@ -28,7 +29,7 @@ public class CheckPresenter extends CheckListener.Presenter {
     //复核火警信息
     @Override
     public void reCheckTrouble() {
-        OkGo.get(UrlConstants.RECHECK_TROUBLE)
+        OkGo.get(ApiService.httpUrl1 + Data.getConfigUrl() +UrlConstants.RECHECK_TROUBLE)
                 .tag(this)
                 .params("processId",mView.getProcessId())
                 .params("recheckType",mView.getRecheckType())

app/src/main/java/com/silence/commonframe/activity/presenter/HistoryPresenter.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.ApiService;
 import com.silence.commonframe.activity.Interface.HistoryListener;
 import com.silence.commonframe.bean.BaseBean;
 import com.silence.commonframe.common.constant.BaseConstants;
@@ -26,7 +27,7 @@ public class HistoryPresenter extends HistoryListener.Presenter {
 
     @Override
     public void getData() {
-        OkGo.get(UrlConstants.GET_FIRE_ALARM)
+        OkGo.get(ApiService.httpUrl1 + Data.getConfigUrl() + UrlConstants.GET_FIRE_ALARM)
                 .tag(this)
                 .params("page",mView.getPage())
                 .params("pageSize",BaseConstants.PAGE_SIZE)
@@ -57,7 +58,7 @@ public class HistoryPresenter extends HistoryListener.Presenter {
 
     @Override
     public void getKnowMessage() {
-        OkGo.get(UrlConstants.READ_FIRE_ALARM)
+        OkGo.get(ApiService.httpUrl1 + Data.getConfigUrl() + UrlConstants.READ_FIRE_ALARM)
                 .tag(this)
                 .params("processId",mView.getProcessId())
                 .cacheKey("cacheGetKey")            // 设置当前请求的缓存key,建议每个不同功能的请求设置一个

app/src/main/java/com/silence/commonframe/activity/presenter/NewsDetailPresenter.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.ApiService;
 import com.silence.commonframe.activity.Interface.NewsDetailListener;
 import com.silence.commonframe.common.constant.UrlConstants;
 import com.silence.commonframe.model.RecheckMsgModel;
@@ -26,7 +27,7 @@ public class NewsDetailPresenter extends NewsDetailListener.Presenter {
 
     @Override
     public void getRecheckMsg() {
-        OkGo.get(UrlConstants.GET_RECHECK_MSG)
+        OkGo.get(ApiService.httpUrl1 + Data.getConfigUrl() +UrlConstants.GET_RECHECK_MSG)
                 .tag(this)
                 .params("id",mView.getId())
                 .cacheKey("cacheGetKey")

app/src/main/java/com/silence/commonframe/activity/presenter/SiteDetailPresenter.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.ApiService;
 import com.silence.commonframe.activity.Interface.SiteDetailListener;
 import com.silence.commonframe.common.constant.BaseConstants;
 import com.silence.commonframe.common.constant.UrlConstants;
@@ -25,7 +26,7 @@ public class SiteDetailPresenter extends SiteDetailListener.Presenter{
 
     @Override
     public void delSite() {
-        OkGo.get(UrlConstants.DELETE_SITE)
+        OkGo.get(ApiService.httpUrl1 + Data.getConfigUrl()+UrlConstants.DELETE_SITE)
                 .tag(this)
                 .params("ids",mView.getIds())
                 .cacheKey("cacheGetKey")
@@ -53,7 +54,7 @@ public class SiteDetailPresenter extends SiteDetailListener.Presenter{
 
     @Override
     public void getSite() {
-        OkGo.get(UrlConstants.GET_SITE_LIST)
+        OkGo.get(ApiService.httpUrl1 + Data.getConfigUrl()+UrlConstants.GET_SITE)
                 .tag(this)
                 .params("page",mView.getPage())
                 .params("pagesize",BaseConstants.PAGE_SIZE)

app/src/main/java/com/silence/commonframe/base/basemvp/BaseFragment.java

@@ -303,6 +303,28 @@ public abstract  class BaseFragment<T extends BasePresenter, E extends BaseModel
                 );
     }
 
+    public TitleBar clickTitle(final Activity activity, String title,int resoure,boolean isBack){
+        TitleBar titleBar=rootView.findViewById(R.id.base_title_bar);
+        titleBar
+                .setTitle(title)
+                .setTitleColor(R.color.white)
+                .setSubTitleColor(R.color.white)
+                .setLeftTextSize(66)
+                .setRightImageResource(resoure)
+                .setImmersive(activity,false,true)
+                .setLeftClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        activity.finish();
+                    }
+                })
+                .setLeftImageIsHite(isBack)
+                .setLeftImageResource(R.mipmap.whiteback)
+                .setBackgroundColor(ContextCompat.getColor(activity,R.color.myblue)
+                );
+        return titleBar;
+    }
+
     public static int getStatusBarHeight(Context context) {
         int statusBarHeight = 0;
         Resources res = context.getResources();

app/src/main/java/com/silence/commonframe/base/basemvp/TitleBar.java

@@ -280,15 +280,6 @@ public class TitleBar extends ViewGroup implements View.OnClickListener {
         return this;
     }
 
-    public TitleBar setLeftImageIsHite(boolean isHite) {
-        if (isHite){
-            mLeftText.setVisibility(VISIBLE);
-        }else {
-            mLeftText.setVisibility(GONE);
-        }
-        return this;
-    }
-
     public TitleBar setLeftClickListener(OnClickListener l) {
         mLeftText.setOnClickListener(l);
         return this;

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

@@ -28,7 +28,7 @@ public interface UrlConstants {
     String GET_UUID_CAMERA="/getCamDevDetail";  //获取摄像头详情
     String GET_DEVICE_DETAIL="/getFireDeviceDetail";  //获取烟感详情
     String GET_CONNECT_DEVICE="/getConnectDevice";  //获取关联设备
-
+    String DELETE_SITE = "/deleteSite";
 
     /*----------------------------------------------空气卫士接口---------------------------------------*/
     String BASE_LOCAl="http://192.168.1.111:8080/";
@@ -38,8 +38,8 @@ public interface UrlConstants {
     String AIR_DUARD_ISOPEN="/airGuard/openOrClose";
     String AIR_RUN_TIME="/airGuard/getRunTimeList";
     String AIRGUARD="/airGuard";
-    /*----------------------------------------------公司接口地址--------------------------------------------*/
 
+    /*----------------------------------------------公司接口地址--------------------------------------------*/
 
     //获取运行时间间隔列表
     String AIRGUARD_RUNTIMELIST = AIRGUARD + "/getRunTimeList";
@@ -59,9 +59,16 @@ public interface UrlConstants {
     /*--------------------------------消息界面-----------------------------------------*/
     String BASE_FIND_URL = "https://www.hsh-iot.com/test/hsh_app/";
     //获取异常的设备信息
-    String GET_TROUBLE_DEVICE = BASE_FIND_URL + "app/getTroubleDevice";
+    String GET_TROUBLE_DEVICE =  "/getTroubleDevice";
     //获取复核信息
-    String GET_RECHECK_MSG = BASE_FIND_URL + "app/getRecheckMsg";
+    String GET_RECHECK_MSG = "/getRecheckMsg";
     //复核火警信息
-    String RECHECK_TROUBLE = BASE_FIND_URL + "app/reCheckTrouble";
+    String RECHECK_TROUBLE = "/reCheckTrouble";
+    //获取火警信息
+    String GET_FIRE_ALARM = "/getFireAlarm";
+    //点击知道火警信息
+    String READ_FIRE_ALARM = "/readFireAlarm";
+
+
+
 }

app/src/main/java/com/silence/commonframe/fragment/FindFragment1.java

@@ -70,8 +70,6 @@ public class FindFragment1 extends BaseFragment implements NewFindListener.View
     @BindView(R.id.srl_refresh)
     SmartRefreshLayout srlRefresh;
 
-
-
     @BindView(R.id.no_message)
     LinearLayout no_message;
 
@@ -89,6 +87,7 @@ public class FindFragment1 extends BaseFragment implements NewFindListener.View
 
     private FindAdapter mAdapter;
     private List<HashMap<String, String>> listmap = new ArrayList<>();
+    private List<TroubleDeviceModel.DataBean> listData = new ArrayList<>();
 
     int page = 1;
     NewFindPresenter presenter;
@@ -105,6 +104,10 @@ public class FindFragment1 extends BaseFragment implements NewFindListener.View
 
     @Override
     protected void initView() {
+        mAdapter = new FindAdapter(R.layout.item_recylerview, listData, onclick);
+        myRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+        myRecyclerView.setAdapter(mAdapter);
+
         clickTitle(getActivity(),getResources().getString(R.string.text_tab_find),R.mipmap.search,false).setRightClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -112,6 +115,8 @@ public class FindFragment1 extends BaseFragment implements NewFindListener.View
                 startActivityForResult(intent, 1);
             }
         });
+        presenter.getData();
+
         srlRefresh.setOnRefreshListener(new OnRefreshListener() {
             @Override
             public void onRefresh(@NonNull RefreshLayout refreshLayout) {
@@ -123,7 +128,6 @@ public class FindFragment1 extends BaseFragment implements NewFindListener.View
                 presenter.getData();
             }
         });
-        srlRefresh.autoRefresh();
         srlRefresh.setEnableLoadMore(false);
     }
 
@@ -198,9 +202,10 @@ public class FindFragment1 extends BaseFragment implements NewFindListener.View
         } else {
             no_message.setVisibility(View.GONE);
         }
-        mAdapter = new FindAdapter(R.layout.item_recylerview, dataBean, onclick);
-        myRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-        myRecyclerView.setAdapter(mAdapter);
+        if (listData.size() != 0){
+            listData.clear();
+        }
+        listData.addAll(dataBean);
         mAdapter.notifyDataSetChanged();
         if (dataBean.size() >= Integer.valueOf(BaseConstants.PAGE_SIZE)){
             page = page + 1;

app/src/main/java/com/silence/commonframe/fragment/presenter/NewFindPresenter.java

@@ -7,6 +7,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.ApiService;
 import com.silence.commonframe.common.constant.BaseConstants;
 import com.silence.commonframe.common.constant.UrlConstants;
 import com.silence.commonframe.fragment.Interface.NewFindListener;
@@ -37,7 +38,7 @@ public class NewFindPresenter extends NewFindListener.Presenter {
         params.put("fromTime",mView.getFromTime());
         params.put("toTime",mView.getToTime());
         JSONObject jsonObject = new JSONObject(params);
-        OkGo.post(UrlConstants.GET_TROUBLE_DEVICE)
+        OkGo.post(ApiService.httpUrl1 + Data.getConfigUrl() +UrlConstants.GET_TROUBLE_DEVICE)
                 .tag(this)
                 .upJson(jsonObject)
                 .cacheKey("cachePostRegister11")

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

@@ -2,20 +2,30 @@ package com.silence.tech.adapter;
 
 import android.graphics.Color;
 import android.support.annotation.Nullable;
+import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.silence.commonframe.R;
+import com.silence.commonframe.adapter.FindAdapter;
+import com.silence.commonframe.model.TroubleDeviceModel;
 import com.silence.tech.bean.ArchvesBean;
 import com.silence.tech.bean.ArichiveBean;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class ArchivesAdapter extends BaseQuickAdapter<ArichiveBean.DataListBean,BaseViewHolder> {
-    public ArchivesAdapter(int layoutResId, @Nullable List<ArichiveBean.DataListBean> data) {
+
+    MyItemClickListener onclick;
+    List<ArichiveBean.DataListBean> listData = new ArrayList<>();
+
+    public ArchivesAdapter(int layoutResId, @Nullable List<ArichiveBean.DataListBean> data,MyItemClickListener onclick) {
         super(layoutResId, data);
+        this.onclick = onclick;
+        this.listData = data;
     }
 
     @Override
@@ -72,5 +82,20 @@ public class ArchivesAdapter extends BaseQuickAdapter<ArichiveBean.DataListBean,
             }
         }
 
+        helper.itemView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                onclick.onItemClick(helper.getLayoutPosition(),listData);
+            }
+        });
+
     }
+
+    /**
+     * 回调接口
+     */
+    public interface MyItemClickListener {
+        void onItemClick(int position, List<ArichiveBean.DataListBean> listData);
+    }
+
 }

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

@@ -1,6 +1,7 @@
 package com.silence.tech.ui.files.activity;
 
 import android.annotation.SuppressLint;
+import android.content.Intent;
 import android.graphics.Color;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -22,9 +23,13 @@ import com.github.mikephil.charting.formatter.ValueFormatter;
 import com.github.mikephil.charting.highlight.Highlight;
 import com.github.mikephil.charting.interfaces.datasets.ILineDataSet;
 import com.github.mikephil.charting.listener.OnChartValueSelectedListener;
+import com.google.gson.Gson;
 import com.silence.commonframe.R;
+import com.silence.commonframe.activity.NewsdetailActivity;
+import com.silence.commonframe.adapter.FindAdapter;
 import com.silence.commonframe.base.basemvp.BaseFragment;
 import com.silence.commonframe.common.constant.BaseConstants;
+import com.silence.commonframe.model.TroubleDeviceModel;
 import com.silence.tech.adapter.ArchivesAdapter;
 import com.silence.tech.bean.ArchvesBean;
 import com.silence.tech.bean.ArichiveBean;
@@ -102,12 +107,21 @@ public class ArchivesFragment extends BaseFragment implements ArchivesListener.V
         date = new TimeUtil().getNowYear() + "." + new TimeUtil().getNowMonth();
 
         rvList.setLayoutManager(new StaggeredGridLayoutManager(1, StaggeredGridLayoutManager.VERTICAL));
-        archivesAdapter=new ArchivesAdapter(R.layout.item_recylerview,archvesBeans);
+        archivesAdapter=new ArchivesAdapter(R.layout.item_recylerview,archvesBeans,onclick);
         rvList.setAdapter(archivesAdapter);
         presenter.getTrouble();
         presenter.getData();
     }
 
+    ArchivesAdapter.MyItemClickListener onclick = new ArchivesAdapter.MyItemClickListener() {
+        @Override
+        public void onItemClick(int position, List<ArichiveBean.DataListBean> listData) {
+            Intent intent = new Intent(getContext(), NewsdetailActivity.class);
+            intent.putExtra("listmap", new Gson().toJson(listData.get(position)));
+            startActivity(intent);
+        }
+    };
+
     @Override
     protected void lazyLoad() {
 

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

@@ -57,11 +57,12 @@ public class MoniFragment extends BaseFragment implements MoniListener.View{
     @BindView(R.id.srl_refresh)
     SmartRefreshLayout srlRefresh;
 
-    List<TroubleTypeBean.DataBean> listTroubleType = new ArrayList<>();
+    private List<TroubleTypeBean.DataBean> listTroubleType = new ArrayList<>();
+    private List<TroubleListBean.DataBean.DataListBean> listData = new ArrayList<>();
 
-    MoniPresenter presenter;
+    private MoniPresenter presenter;
 
-    MoniTroubleAdapter mTroubleListAdapter;
+    private MoniTroubleAdapter mTroubleListAdapter;
 
     private List<HashMap<String, String>> listmap = new ArrayList<>();
 
@@ -78,7 +79,12 @@ public class MoniFragment extends BaseFragment implements MoniListener.View{
     @Override
     protected void initView() {
 //        getActivity().getResources().getString(R.string.text_tab_moni)
+        mTroubleListAdapter = new MoniTroubleAdapter(R.layout.item_recylerview,listData,onclick);
+        rvTroubleList.setLayoutManager(new LinearLayoutManager(getContext()));
+        rvTroubleList.setAdapter(mTroubleListAdapter);
         setTitle(getActivity(),getResources().getString(R.string.text_tab_moni),"",false);
+        presenter.getTroubleType();
+        presenter.getTroubleList();
 
         srlRefresh.setOnRefreshListener(new OnRefreshListener() {
             @Override
@@ -184,9 +190,10 @@ public class MoniFragment extends BaseFragment implements MoniListener.View{
         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);
+            if (listData.size() != 0){
+                listData.clear();
+            }
+            listData.addAll(dataBean.getDataList());
             mTroubleListAdapter.notifyDataSetChanged();
         }
         if (dataBean.getRows() >= Integer.valueOf(BaseConstants.PAGE_SIZE)){

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

@@ -51,10 +51,10 @@ public class MoniTroubleActivity extends BaseActivity implements MoniTroubleList
     private String title;
     private String troubleType;
 
-    MoniTroublePresenter presenter;
-
-    MoniTroubleAdapter mTroubleListAdapter;
+    private MoniTroublePresenter presenter;
 
+    private MoniTroubleAdapter mTroubleListAdapter;
+    private List<TroubleListBean.DataBean.DataListBean> listData;
 
     @Override
     public int getLayoutId() {
@@ -68,7 +68,9 @@ public class MoniTroubleActivity extends BaseActivity implements MoniTroubleList
 
     @Override
     public void initView() {
-        initWindows();
+        mTroubleListAdapter = new MoniTroubleAdapter(R.layout.item_recylerview,listData,onclick);
+        rvTroubleList.setLayoutManager(new LinearLayoutManager(this));
+        rvTroubleList.setAdapter(mTroubleListAdapter);
         switch (getIntent().getStringExtra("troubleType")){
             case "1": {
                 title = getResources().getString(R.string.state_fire) + getResources().getString(R.string.text_tab_moni);
@@ -92,6 +94,8 @@ public class MoniTroubleActivity extends BaseActivity implements MoniTroubleList
             break;
         }
         setTitle(this,title,"",true);
+        presenter.getDevTroubleListByType();
+
 
         //刷新
         srlRefresh.setOnRefreshListener(new OnRefreshListener() {
@@ -107,7 +111,6 @@ public class MoniTroubleActivity extends BaseActivity implements MoniTroubleList
                 presenter.getDevTroubleListByType();
             }
         });
-        srlRefresh.autoRefresh();
 
     }
 
@@ -139,9 +142,10 @@ public class MoniTroubleActivity extends BaseActivity implements MoniTroubleList
             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);
+            if (listData.size() != 0){
+                listData.clear();
+            }
+            listData.addAll(dataBean.getDataList());
             mTroubleListAdapter.notifyDataSetChanged();
         }
         if (dataBean.getRows() >= Integer.valueOf(BaseConstants.PAGE_SIZE)){
@@ -153,20 +157,4 @@ public class MoniTroubleActivity extends BaseActivity implements MoniTroubleList
     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/res/layout/fragment_moni.xml

@@ -21,29 +21,6 @@
             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>
-
-            <LinearLayout
                 android:id="@+id/ll_top"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -149,6 +126,29 @@
                 android:layout_height="5dp"
                 android:background="@color/mygray"/>
 
+            <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_moni_msg"
                 android:layout_width="match_parent"