6.20.4

app/src/main/java/com/silence/commonframe/activity/Interface/NewsDetailListener.java

@@ -0,0 +1,19 @@
+package com.silence.commonframe.activity.Interface;
+
+import com.silence.commonframe.base.basemvp.BaseModel;
+import com.silence.commonframe.base.basemvp.BasePresenter;
+import com.silence.commonframe.model.RecheckMsgModel;
+
+import java.util.List;
+
+public interface NewsDetailListener {
+    interface View{
+        String getId();
+
+        void onRecheckMsgSuccess(List<RecheckMsgModel.DataBean> dataBean);
+        void onFile(String msg);
+    }
+    abstract class Presenter extends BasePresenter<View,BaseModel>{
+        public abstract void getRecheckMsg();
+    }
+}

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

@@ -21,9 +21,13 @@ 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;
@@ -41,7 +45,7 @@ import butterknife.ButterKnife;
 import okhttp3.Call;
 import okhttp3.Response;
 
-public class NewsdetailActivity extends AppCompatActivity {
+public class NewsdetailActivity extends BaseActivity implements NewsDetailListener.View {
    @BindView(R.id.imageView4)
     ImageView imageView4;
    @BindView(R.id.textView15)
@@ -77,82 +81,65 @@ public class NewsdetailActivity extends AppCompatActivity {
    @BindView(R.id.tv_cputem)
     TextView tv_cputem;
 
-    private List<HashMap<String,String>> list;
-    private HashMap<String,String> list1;
-    private List<HashMap<String, String>> listmap = new ArrayList<HashMap<String, String>>();
+    TroubleDeviceModel.DataBean dataBean;
 
     private String recheckId;
     private String processId;
     private String name;
-    private RecheckMsgAdapter   recheckMsgAdapter;
+    private RecheckMsgAdapter recheckMsgAdapter;
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_newsdetail);
-        ButterKnife.bind(this);
-        AtyContainer.getInstance().addActivity(this);
-        initWindows();
-        list = new ArrayList<HashMap<String, String>>();
-        list1 = new HashMap<>();
-        Intent intent = getIntent();
-        Bundle bundle = intent.getExtras();
-      //  list1 = (List<HashMap<String, String>>) bundle.getSerializable("listmap");
-        if (bundle != null) {
-            list1 = (HashMap<String, String>) bundle.getSerializable("listmap");
-            if (list1 != null) {
-                //System.out.println("jj" + list);
-              //  tvPlace.setText( list1.get("location"));
-                tvPlace.setText( "详细地址："+list1.get("location"));
-                tvTime.setText(list1.get("gmtCreate"));
-                tvNo.setText(list1.get("deviceId"));//deployment
-                tvSitename.setText(list1.get("deployment"));
-                tv_location.setText(list1.get("deviceLocation"));
-                if (TextUtils.isEmpty(list1.get("batteryvoltage"))) {
-                    tvBatteryvoltage.setText("0V");
-                } else {
-                    tvBatteryvoltage.setText(list1.get("batteryvoltage") + "V");
-                }
-                if (TextUtils.isEmpty(list1.get("signalstrength"))) {
-                    tvSignalstrength.setText("0dB");
-                } else {
-                    tvSignalstrength.setText(list1.get("signalstrength") + "dB");
-                }
-
-                if (TextUtils.isEmpty(list1.get("mcuTemp"))) {
-                    tv_cputem.setText("0℃");
-                } else {
-                    tv_cputem.setText(list1.get("mcuTemp") + "℃");
-                }
+    NewsDetailPresenter presenter;
 
-                tvDevicetype.setText(list1.get("deviceName"));
+    @Override
+    public int getLayoutId() {
+        return R.layout.activity_newsdetail;
+    }
 
-                if ("1".equals(list1.get("troubleType"))) {//troubleType
-                    tvFiretype.setText("火警");
-                    tvFiretype.setTextColor(Color.rgb(250, 85, 58));//imageViewfire
-                    img_fire.setImageResource(R.mipmap.redlinght);
-                    //     finalImageView.setImageResource(R.drawable.guzhang);
-                }
-                if ("0".equals(list1.get("troubleType"))) {
-                    tvFiretype.setText("故障");
-                    tvFiretype.setTextColor(Color.rgb(255, 153, 51));
-                    img_fire.setImageResource(R.mipmap.redlinght0);
-                }
-                if ("2".equals(list1.get("troubleType"))) {
-                    tvFiretype.setText("其他");
-                }
+    @Override
+    public void initPresenter() {
+        presenter = new NewsDetailPresenter(this,this);
+    }
 
-                recheckId = list1.get("recheckId");
-                processId = list1.get("processId");
-                if ("11".equals(recheckId)) {
-                  //  tv_name.setText("--");
-                } else {
-              //      getUserById();
-                    //  firestatus.setText(name);
-                }
+    @Override
+    public void initView() {
+        initWindows();
+        Intent intent = getIntent();
+        //  list1 = (List<HashMap<String, String>>) bundle.getSerializable("listmap");
+        String jsonData = getIntent().getStringExtra("listmap");
+        dataBean = new Gson().fromJson(jsonData,TroubleDeviceModel.DataBean.class);
+        if (dataBean != null) {
+            //System.out.println("jj" + list);
+            //  tvPlace.setText( list1.get("location"));
+            tvPlace.setText( "详细地址："+dataBean.getLocation());
+            tvTime.setText(dataBean.getGmtCreate());
+            tvNo.setText(dataBean.getDeviceId());//deployment
+            tvSitename.setText(dataBean.getDeployment());
+            tv_location.setText(dataBean.getDeviceLocation());
+
+            //还没有值
+            tvBatteryvoltage.setText("0V");
+            tvSignalstrength.setText("0dB");
+            tv_cputem.setText("0℃");
+
+            tvDevicetype.setText(dataBean.getDeviceName());
+            if ("1".equals(dataBean.getTroubleType())) {//troubleType
+                tvFiretype.setText("火警");
+                tvFiretype.setTextColor(Color.rgb(250, 85, 58));//imageViewfire
+                img_fire.setImageResource(R.mipmap.redlinght);
+                //     finalImageView.setImageResource(R.drawable.guzhang);
+            }
+            if ("0".equals(dataBean.getTroubleType())) {
+                tvFiretype.setText("故障");
+                tvFiretype.setTextColor(Color.rgb(255, 153, 51));
+                img_fire.setImageResource(R.mipmap.redlinght0);
+            }
+            if ("2".equals(dataBean.getTroubleType())) {
+                tvFiretype.setText("其他");
             }
+            recheckId = dataBean.getRecheckId();
+            processId = dataBean.getMessageId();
         }
-        getData1();
+        presenter.getRecheckMsg();
     }
 
     private void initWindows() {
@@ -175,92 +162,34 @@ public class NewsdetailActivity extends AppCompatActivity {
 
     public void check(View view) {
         Intent intent = new Intent(this, CheckActivity.class);
-        Bundle bundle = new Bundle();
-        bundle.putSerializable("listmap", list1);
-        intent.putExtras(bundle);
+        intent.putExtra("listmap", new Gson().toJson(dataBean));
         startActivity(intent);
     }
 
-    private void getData1(){
-        String  url =   ApiService.httpUrl1 +Data.getConfigUrl()+"/getRecheckMsg?id="+processId;//recheckId
-        OkGo.get(url)
-                .tag(this)                       // 请求的 tag, 主要用于取消对应的请求
-                .cacheKey("cacheGetKey")            // 设置当前请求的缓存key,建议每个不同功能的请求设置一个
-                .cacheMode(CacheMode.DEFAULT)    // 缓存模式，详细请看缓存介绍
-                .headers("token", Data.getToken())
-                .execute(new StringCallback() {
-                    @Override
-                    public void onSuccess(String s, Call call, Response response) {
-                        RecheckMsgModel  recheckMsgModel = new Gson().fromJson(s,RecheckMsgModel.class);
-                        List<RecheckMsgModel.DataBean>   dataBeans = recheckMsgModel.getData();
-                        String message =recheckMsgModel.getMsg();
-
-                        int code = recheckMsgModel.getCode();
-                        if (message.equalsIgnoreCase("success")) {
-                            for (int i = 0; i < dataBeans.size(); i++) {
-                                HashMap<String, String> hashMap = new HashMap<>();
-//                            String location = jsonBean.getObject().get(i).getLocation();
-                                String Name = dataBeans.get(i).getUsername();
-                                String time = dataBeans.get(i).getRecheckTime();
-                                String result = dataBeans.get(i).getRecheckResult();
-                                String id = dataBeans.get(i).getId();
-                                String recheckName = dataBeans.get(i).getRecheckName();
-
-                                hashMap.put("Name", Name);
-                                hashMap.put("time", time);
-                                hashMap.put("result", result);
-                                hashMap.put("id", id);
-                                hashMap.put("recheckName", recheckName);
-
-                                listmap.add(hashMap);
-
-                            }
-
-                            recheckMsgAdapter = new RecheckMsgAdapter(NewsdetailActivity.this, listmap);
-                            RecyclerView_RecheckMsg.setLayoutManager(new LinearLayoutManager(NewsdetailActivity.this));
-                            RecyclerView_RecheckMsg.setAdapter(recheckMsgAdapter);
-
-                            recheckMsgAdapter.setOnItemClickListener(new RecheckMsgAdapter.MyItemClickListener() {
-                                    @Override
-                                    public void onItemClick(View view, int postion) {
-                                   //   Toast.makeText(NewsdetailActivity.this,""+postion,Toast.LENGTH_SHORT).show();
-                                    String id = listmap.get(postion).get("id");
-                                    Intent intent = new Intent(NewsdetailActivity.this,NewsdetailActivityShow.class);
-                                    intent.putExtra("id",id);
-                                    startActivity(intent);
-                                    }
-                                });
-                        } else {
-                            LoginIn.tokenOut(code,message,NewsdetailActivity.this);
-                        }
-                    }
-                });
+    @Override
+    public String getId() {
+        return processId;
     }
 
+    RecheckMsgAdapter.MyItemClickListener itemClickListener = new RecheckMsgAdapter.MyItemClickListener() {
+        @Override
+        public void onItemClick(int postion, List<RecheckMsgModel.DataBean> dataBean) {
+            Intent intent = new Intent(NewsdetailActivity.this,NewsdetailActivityShow.class);
+            intent.putExtra("id",dataBean.get(postion).getId());
+            startActivity(intent);
+        }
+    };
 
+    @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);
+        recheckMsgAdapter.notifyDataSetChanged();
+    }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    @Override
+    public void onFile(String msg) {
+        Toast.makeText(this,""+msg,Toast.LENGTH_SHORT).show();
+    }
 }

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

@@ -0,0 +1,54 @@
+package com.silence.commonframe.activity.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.activity.Interface.NewsDetailListener;
+import com.silence.commonframe.common.constant.UrlConstants;
+import com.silence.commonframe.model.RecheckMsgModel;
+import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.utils.LoginIn;
+
+import java.util.List;
+
+import okhttp3.Call;
+import okhttp3.Response;
+
+public class NewsDetailPresenter extends NewsDetailListener.Presenter {
+
+    public NewsDetailPresenter(Activity mContext, NewsDetailListener.View mView){
+        this.mContext=mContext;
+        this.mView=mView;
+    }
+
+    @Override
+    public void getRecheckMsg() {
+        OkGo.get(UrlConstants.GET_RECHECK_MSG)
+                .tag(this)
+                .params("id",mView.getId())
+                .cacheKey("cacheGetKey")
+                .cacheMode(CacheMode.DEFAULT)
+                .headers("token", Data.getToken())
+                .execute(new StringCallback() {
+                    @Override
+                    public void onSuccess(String s, Call call, Response response) {
+                        RecheckMsgModel data = new Gson().fromJson(s,RecheckMsgModel.class);
+                        if (data.getCode() == 0){
+                            mView.onRecheckMsgSuccess(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/java/com/silence/commonframe/adapter/FindAdapter.java

@@ -4,6 +4,7 @@ package com.silence.commonframe.adapter;
 import android.content.Context;
 import android.graphics.Color;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -11,138 +12,181 @@ import android.view.ViewGroup;
 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.bean.JsonBean;
+import com.silence.commonframe.model.TroubleDeviceModel;
+import com.silence.tech.adapter.MoniTroubleAdapter;
+import com.silence.tech.bean.TroubleListBean;
 
 import java.util.HashMap;
 import java.util.List;
 
-public class FindAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+public class FindAdapter extends BaseQuickAdapter<TroubleDeviceModel.DataBean, BaseViewHolder> {
+    MyItemClickListener onclick;
+    List<TroubleDeviceModel.DataBean> listData;
 
-
-    private Context context;
-    private List<JsonBean> mList;
-    private LayoutInflater mInflater;
-    private View view;
-    private MyItemClickListener listener;
-
-
-    private List<HashMap<String, String>> listmap1;
-    private MyViewHolder viewHolder1;
-
-    public FindAdapter(Context context, List<HashMap<String, String>> listmap) {
-        this.context = context;
-        listmap1 = listmap;
-        mInflater = LayoutInflater.from(context);
-    }
-
-
-    @Override
-    public int getItemCount() {
-        return listmap1.size();
-
-    }
-
-    @NonNull
-    @Override
-    public MyViewHolder onCreateViewHolder(@NonNull final ViewGroup parent, int viewType) {
-        view = mInflater.inflate(R.layout.item_recylerview, parent, false);
-        viewHolder1 = new MyViewHolder(view, listener);
-        return viewHolder1;
+    public FindAdapter(int layoutResId, @Nullable List<TroubleDeviceModel.DataBean> data,MyItemClickListener onclick) {
+        super(layoutResId, data);
+        this.onclick = onclick;
+        this.listData = data;
     }
 
     @Override
-    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int i) {
-        viewHolder1.tv.setText("编号："+listmap1.get(i).get("deviceId"));//tv_devicename
-        viewHolder1.tv_devicename.setText("设备："+listmap1.get(i).get("deviceName"));//tv_time
-        viewHolder1.tv_time.setText("时间："+listmap1.get(i).get("gmtCreate"));
-        viewHolder1.tv_place.setText("区域名："+listmap1.get(i).get("deployment"));
-        viewHolder1.tv_place1.setText("位置："+listmap1.get(i).get("deviceLocation"));
-        viewHolder1.tv_place3.setText("地址："+listmap1.get(i).get("location"));//deployment
-        System.out.println("pp1"+listmap1.get(i).get("recheckId"));
-
-        if ("11".equals(listmap1.get(i).get("recheckId"))){
-            viewHolder1.imageView.setImageResource(R.mipmap.unaudited1);
-        }else {
-           if ("0".equals(listmap1.get(i).get("isValid"))){
-               viewHolder1.imageView.setImageResource(R.mipmap.unaudited3);
-           }
-            if ("1".equals(listmap1.get(i).get("isValid"))){
-               viewHolder1.imageView.setImageResource(R.mipmap.unaudited0);
-           }
-        }
-        if ("1".equals(listmap1.get(i).get("troubleType"))){
-            viewHolder1.fire.setText("火警");
-            viewHolder1.fire.setTextColor(Color.rgb(250,85,58));//imageViewfire
-            viewHolder1.imageViewfire.setImageResource(R.mipmap.redlinght);
-       //     finalImageView.setImageResource(R.drawable.guzhang);
-        }
-        if ("0".equals(listmap1.get(i).get("troubleType"))){
-            viewHolder1.fire.setText("故障");
-            viewHolder1.fire.setTextColor(Color.rgb(255,153,51));//imageViewfire
-            viewHolder1.imageViewfire.setImageResource(R.mipmap.redlinght0);
+    protected void convert(BaseViewHolder helper, TroubleDeviceModel.DataBean 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);           //位置
+        TextView tvTime = helper.itemView.findViewById(R.id.time);                  //时间
+        TextView tvLocation = helper.itemView.findViewById(R.id.place1);            //地址
+        ImageView ivCheck = helper.itemView.findViewById(R.id.imageView_check);     //是否复核
+
+        tvDeviceName.setText(data.getDeviceName());
+        String regionName = "区域名：" + data.getRegionName();
+        tvRegionName.setText(regionName);
+
+        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);
         }
-        if ("2".equals(listmap1.get(i).get("troubleType"))){
-            viewHolder1.fire.setText("其它");
-           // viewHolder1.fire.setTextColor(Color.rgb(250,85,58));//imageViewfire
-            viewHolder1.imageViewfire.setImageResource(R.mipmap.light);
-        }
-    }
-
 
-    class MyViewHolder extends RecyclerView.ViewHolder {
-        View itemView;
-        TextView tv;
-        TextView tv_devicename;
-        TextView tv_time;
-        TextView tv_place;
-        TextView tv_place1;
-        TextView tv_place3;
-        MyItemClickListener mListener;
-        ImageView  imageView;
-        ImageView  imageViewfire;
-        TextView  fire;
-
-        public MyViewHolder(View itemView, final MyItemClickListener mListener) {
-            super(itemView);
-            this.itemView = itemView;
-            // iv = (ImageView) itemView.findViewById(R.id.number);
-            tv = (TextView) itemView.findViewById(R.id.number);//recycler_view_test_item_person_name_tv
-            tv_devicename = (TextView) itemView.findViewById(R.id.recycler_view_test_item_person_name_tv);//recycler_view_place
-
-            tv_time = (TextView) itemView.findViewById(R.id.time);
-            tv_place = (TextView) itemView.findViewById(R.id.recycler_view_place);
-            tv_place1 = (TextView) itemView.findViewById(R.id.place);
-            tv_place3 = (TextView) itemView.findViewById(R.id.place1);//imageView_check  fire
-            fire = (TextView) itemView.findViewById(R.id.fire);
-            imageView = (ImageView) itemView.findViewById(R.id.imageView_check); //imageView_fire
-            imageViewfire = (ImageView) itemView.findViewById(R.id.imageView_fire);
-
-            itemView.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    mListener.onItemClick(v, getAdapterPosition());
-                }
-            });
+        String deviceId = "编号：" + data.getDeviceId();
+        tvDeviceId.setText(deviceId);
+        String deviceLocation = "位置：" + data.getDeviceLocation();
+        tvDeviceLocation.setText(deviceLocation);
+        String time = "时间：" + data.getGmtCreate();
+        tvTime.setText(time);
+        String location = "地址：" + data.getLocation();
+        tvLocation.setText(location);
+
+        if (data.getRecheckId() == null){
+            ivCheck.setImageResource(R.mipmap.unaudited1);
+        }else {
+            if ("0".equals(data.getIsValid())){
+                ivCheck.setImageResource(R.mipmap.unaudited3);
+            }
+            if ("1".equals(data.getIsValid())){
+                ivCheck.setImageResource(R.mipmap.unaudited0);
+            }
         }
 
+        helper.itemView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                onclick.onItemClick(helper.getLayoutPosition(),listData);
+            }
+        });
     }
 
+//    @Override
+//    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int i) {
+//        viewHolder1.tv.setText("编号："+listmap1.get(i).get("deviceId"));//tv_devicename
+//        viewHolder1.tv_devicename.setText("设备："+listmap1.get(i).get("deviceName"));//tv_time
+//        viewHolder1.tv_time.setText("时间："+listmap1.get(i).get("gmtCreate"));
+//        viewHolder1.tv_place.setText("区域名："+listmap1.get(i).get("deployment"));
+//        viewHolder1.tv_place1.setText("位置："+listmap1.get(i).get("deviceLocation"));
+//        viewHolder1.tv_place3.setText("地址："+listmap1.get(i).get("location"));//deployment
+//        System.out.println("pp1"+listmap1.get(i).get("recheckId"));
+//
+//        if ("11".equals(listmap1.get(i).get("recheckId"))){
+//            viewHolder1.imageView.setImageResource(R.mipmap.unaudited1);
+//        }else {
+//           if ("0".equals(listmap1.get(i).get("isValid"))){
+//               viewHolder1.imageView.setImageResource(R.mipmap.unaudited3);
+//           }
+//            if ("1".equals(listmap1.get(i).get("isValid"))){
+//               viewHolder1.imageView.setImageResource(R.mipmap.unaudited0);
+//           }
+//        }
+//        if ("1".equals(listmap1.get(i).get("troubleType"))){
+//            viewHolder1.fire.setText("火警");
+//            viewHolder1.fire.setTextColor(Color.rgb(250,85,58));//imageViewfire
+//            viewHolder1.imageViewfire.setImageResource(R.mipmap.redlinght);
+//       //     finalImageView.setImageResource(R.drawable.guzhang);
+//        }
+//        if ("0".equals(listmap1.get(i).get("troubleType"))){
+//            viewHolder1.fire.setText("故障");
+//            viewHolder1.fire.setTextColor(Color.rgb(255,153,51));//imageViewfire
+//            viewHolder1.imageViewfire.setImageResource(R.mipmap.redlinght0);
+//        }
+//        if ("2".equals(listmap1.get(i).get("troubleType"))){
+//            viewHolder1.fire.setText("其它");
+//           // viewHolder1.fire.setTextColor(Color.rgb(250,85,58));//imageViewfire
+//            viewHolder1.imageViewfire.setImageResource(R.mipmap.light);
+//        }
+//    }
+
+
+//    class MyViewHolder extends RecyclerView.ViewHolder {
+//        View itemView;
+//        TextView tv;
+//        TextView tv_devicename;
+//        TextView tv_time;
+//        TextView tv_place;
+//        TextView tv_place1;
+//        TextView tv_place3;
+//        MyItemClickListener mListener;
+//        ImageView  imageView;
+//        ImageView  imageViewfire;
+//        TextView  fire;
+//
+//        public MyViewHolder(View itemView, final MyItemClickListener mListener) {
+//            super(itemView);
+//            this.itemView = itemView;
+//            // iv = (ImageView) itemView.findViewById(R.id.number);
+//            tv = (TextView) itemView.findViewById(R.id.number);//recycler_view_test_item_person_name_tv
+//            tv_devicename = (TextView) itemView.findViewById(R.id.recycler_view_test_item_person_name_tv);//recycler_view_place
+//
+//            tv_time = (TextView) itemView.findViewById(R.id.time);
+//            tv_place = (TextView) itemView.findViewById(R.id.recycler_view_place);
+//            tv_place1 = (TextView) itemView.findViewById(R.id.place);
+//            tv_place3 = (TextView) itemView.findViewById(R.id.place1);//imageView_check  fire
+//            fire = (TextView) itemView.findViewById(R.id.fire);
+//            imageView = (ImageView) itemView.findViewById(R.id.imageView_check); //imageView_fire
+//            imageViewfire = (ImageView) itemView.findViewById(R.id.imageView_fire);
+//
+//            itemView.setOnClickListener(new View.OnClickListener() {
+//                @Override
+//                public void onClick(View v) {
+//                    mListener.onItemClick(v, getAdapterPosition());
+//                }
+//            });
+//        }
+//
+//    }
+
     /**
      * 回调接口
      */
     public interface MyItemClickListener {
-        void onItemClick(View view, int postion);
+        void onItemClick(int postion, List<TroubleDeviceModel.DataBean> listData);
     }
 
-    /**
-     * 设置Item点击监听
-     *
-     * @param listener
-     */
-    public void setOnItemClickListener(MyItemClickListener listener) {
-        this.listener = listener;
-    }
+//    /**
+//     * 设置Item点击监听
+//     *
+//     * @param listener
+//     */
+//    public void setOnItemClickListener(MyItemClickListener listener) {
+//        this.listener = listener;
+//    }
 
 
 }

app/src/main/java/com/silence/commonframe/adapter/RecheckMsgAdapter.java

@@ -7,182 +7,64 @@ import android.content.DialogInterface;
 import android.graphics.Color;
 import android.os.Handler;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
 import com.silence.commonframe.Dialog.CDialog;
 import com.silence.commonframe.R;
 import com.silence.commonframe.bean.JsonBean;
+import com.silence.commonframe.model.RecheckMsgModel;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
-public class RecheckMsgAdapter extends RecyclerView.Adapter<RecheckMsgAdapter.MyViewHolder> {
+public class RecheckMsgAdapter extends BaseQuickAdapter<RecheckMsgModel.DataBean,BaseViewHolder> {
 
-
-//    public static enum ITEM_TYPE {
-//        ITEM_TYPE_Theme,
-//        ITEM_TYPE_Video
-//    }
-    public static final int TYPE_SEARCH = 0;
-    public static final int TYPE_NORMAL = 1;
-
-
-    private Context context;
-    private List<JsonBean> mList;
-    private LayoutInflater mInflater;
-    private View view;
     private MyItemClickListener listener;
 
+    private List<RecheckMsgModel.DataBean> listData;
 
-    private List<HashMap<String, String>> listmap1;
-    private MyViewHolder viewHolder1;
-
-
-    ArrayList<Integer>  arrayList = new ArrayList<>();
-    Handler handler = new Handler();
-
-//    public FindAdapter(Context context, List<JsonBean> mList) {
-//        this.context = context;
-//        this.mList = mList;
-//        mInflater = LayoutInflater.from(context);
-//    }
-
-    public RecheckMsgAdapter(Context context, List<HashMap<String, String>> listmap) {
-//        mContext = context;
-//        mInflater = LayoutInflater.from(context);
-//        listmap1 = listmap;
-
-
-        this.context = context;
-        listmap1 = listmap;
-      //  mInflater = LayoutInflater.from(context);
+    public RecheckMsgAdapter(int layoutResId, @Nullable List<RecheckMsgModel.DataBean> data,MyItemClickListener onclick) {
+        super(layoutResId, data);
+        this.listener = onclick;
+        this.listData = data;
     }
 
-
     @Override
-    public int getItemCount() {
-        return listmap1.size();
-
+    protected void convert(BaseViewHolder helper, RecheckMsgModel.DataBean data) {
+        TextView tvName = helper.itemView.findViewById(R.id.tv_name);
+        TextView tvTime = helper.itemView.findViewById(R.id.tv_time);
+        TextView tvResult = helper.itemView.findViewById(R.id.tv_result);
+
+        tvName.setText(data.getUsername());
+        tvTime.setText(data.getRecheckTime());
+        tvResult.setText(data.getRecheckName());
+
+        helper.itemView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                listener.onItemClick(helper.getAdapterPosition(),listData);
+            }
+        });
     }
 
-    @NonNull
-    @Override
-    public MyViewHolder onCreateViewHolder(@NonNull  ViewGroup parent, int viewType) {
-      //  view = mInflater.inflate(R.layout.item_item_firealarm, parent, false);
-        View view = LayoutInflater.from(context).inflate(R.layout.item_recheckmsg, parent, false);
-        RecheckMsgAdapter.MyViewHolder    viewHolder1 = new MyViewHolder(view, listener);
-
-        return viewHolder1;
-
-
-
-//        view = mInflater.inflate(R.layout.linkmanrececlyview_item, parent, false);
-//        LinkmanAdapter.MyViewHolder  viewHolder1 = new LinkmanAdapter.MyViewHolder(view);
-//        return viewHolder1;
-
-
-        // return new FindAdapter.MyViewHolder(mInflater.inflate(R.layout.item_recylerview, parent, false));
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull MyViewHolder holder, @SuppressLint("RecyclerView") final   int position) {
-
-
-        holder.tv_time.setText(listmap1.get(position).get("time"));
-        holder.tv_name.setText(listmap1.get(position).get("Name"));//result
-        holder.tv_result.setText(listmap1.get(position).get("recheckName"));
-
-      //  final MyViewHolder holders = holder;
-
-
-//        handler.postDelayed(new Runnable() {
-//
-//            @Override
-//            public void run() {
-//                //  Log.d("MainActivity", "---------handler.postOne---------"+System.currentTimeMillis());
-//                if ("0".equals(listmap1.get(position).get("ifRead"))){
-//                    // viewHolder1.bt_know.setVisibility(View.GONE);
-//                    holders.bt_know.setVisibility(View.VISIBLE);
-//                }
-//
-//            }
-//        }, 600);
-
-
-//        if ("1".equals(listmap1.get(position).get("ifRead"))){
-//           // viewHolder1.bt_know.setVisibility(View.GONE);
-//            holder.bt_know.setVisibility(View.GONE);
-//        }
-
-
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    public   class MyViewHolder extends RecyclerView.ViewHolder {
-        // ImageView iv;
-
-
-
-        TextView tv_name;
-
-        TextView tv_time;
-        TextView tv_result;
-
-
-
-
-        public MyViewHolder(View itemViewfinal,final MyItemClickListener mListener) {
-            super(itemViewfinal);
-         //   this.itemView = itemView;
-
-
-            tv_name = (TextView) itemView.findViewById(R.id.tv_name);
-            tv_time = (TextView) itemView.findViewById(R.id.tv_time);
-
-            tv_result = (TextView) itemView.findViewById(R.id.tv_result);
-
-            itemView.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    mListener.onItemClick(v, getAdapterPosition());
-                }
-            });
-
-        }
-
-    }
 
     /**
      * 回调接口
      */
     public interface MyItemClickListener {
-        void onItemClick(View view, int postion);
+        void onItemClick(int postion,List<RecheckMsgModel.DataBean> dataBean);
     }
 
-
-
     /**
      * 设置Item点击监听
      *

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

@@ -280,7 +280,7 @@ public abstract class BaseActivity<T extends BasePresenter, E extends BaseModel>
      //   ButterKnife.bind(this);
 
     }
-    public void setTitle(final Activity activity, String title,String rightText){
+    public void setTitle(final Activity activity, String title,String rightText,boolean isBack){
         TitleBar titleBar=findViewById(R.id.base_title_bar);
         titleBar
                 .setTitle(title)
@@ -295,11 +295,13 @@ public abstract class BaseActivity<T extends BasePresenter, E extends BaseModel>
                         activity.finish();
                     }
                 })
+                .setLeftImageIsHite(isBack)
                 .setLeftImageResource(R.mipmap.whiteback)
-                .setBackgroundColor(ContextCompat.getColor(activity,R.color.myblue));
-
+                .setBackgroundColor(ContextCompat.getColor(activity,R.color.myblue)
+                );
     }
 
+
     public boolean hasLollipop() {
         return Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP_MR1;
     }

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

@@ -285,6 +285,68 @@ public abstract  class BaseFragment<T extends BasePresenter, E extends BaseModel
       //  unbindDrawables(getView());
     }
 
+    public void setTitle(final Activity activity, String title,String rightText,boolean isBack){
+        TitleBar titleBar=rootView.findViewById(R.id.base_title_bar);
+        titleBar
+                .setTitle(title)
+                .setTitleColor(R.color.white)
+                .setSubTitleColor(R.color.white)
+                .setLeftTextSize(66)
+                .setRightText(rightText)
+                .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)
+                );
+    }
+
+    public void setTitle(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)
+                );
+    }
+    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;

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

@@ -271,6 +271,15 @@ 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;
@@ -300,11 +309,19 @@ public class TitleBar extends ViewGroup implements View.OnClickListener {
         mLeftText.setVisibility(visible ? View.VISIBLE : View.GONE);
         return this;
     }
+    public TitleBar setRightClickListener(OnClickListener l) {
+        mRightText.setOnClickListener(l);
+        return this;
+    }
     public TitleBar setRightText(CharSequence title) {
         mRightText.setText(title);
         return this;
     }
 
+    public TitleBar setRightImageResource(int resId) {
+        mRightText.setCompoundDrawablesWithIntrinsicBounds(resId, 0, 0, 0);
+        return this;
+    }
     public TitleBar setRightText(int resid) {
         mRightText.setText(resid);
         return this;

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

@@ -51,4 +51,11 @@ public interface UrlConstants {
     String AIRGUARD_DEL_RUNTIME = AIRGUARD + "/delRunTime";
     //修改运行时间间隔
     String AIRGUARD_UPDATE_RUNTIME = AIRGUARD + "/updateRunTime";
+
+    /*--------------------------------消息界面-----------------------------------------*/
+    String BASE_FIND_URL = "https://www.hsh-iot.com/test/hsh_app/";
+    //获取异常的设备信息
+    String GET_TROUBLE_DEVICE = BASE_FIND_URL + "app/getTroubleDevice";
+    //获取复核信息
+    String GET_RECHECK_MSG = BASE_FIND_URL + "app/getRecheckMsg";
 }

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

@@ -26,16 +26,24 @@ import com.google.gson.Gson;
 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.OnRefreshListener;
 import com.silence.commonframe.ApiService;
 import com.silence.commonframe.R;
 import com.silence.commonframe.activity.NewsdetailActivity;
 import com.silence.commonframe.activity.SearchMessageActivity;
 import com.silence.commonframe.adapter.FindAdapter;
+import com.silence.commonframe.base.basemvp.BaseFragment;
 import com.silence.commonframe.bean.JsonBean;
 import com.silence.commonframe.bean.Person1;
+import com.silence.commonframe.common.constant.BaseConstants;
+import com.silence.commonframe.fragment.Interface.NewFindListener;
+import com.silence.commonframe.fragment.presenter.NewFindPresenter;
 import com.silence.commonframe.model.TroubleDeviceModel;
 import com.silence.commonframe.utils.Data;
 import com.silence.commonframe.utils.LoginIn;
+import com.silence.tech.adapter.MoniTroubleAdapter;
 
 import org.json.JSONObject;
 
@@ -55,75 +63,72 @@ import okhttp3.Response;
 /**
  * Created by Silence on 2016/4/5.
  */
-public class FindFragment1 extends Fragment {
+public class FindFragment1 extends BaseFragment implements NewFindListener.View {
     protected Activity mActivity;
     @BindView(R.id.my_recycler_view)
     RecyclerView myRecyclerView;
-    @BindView(R.id.swipeRefreshLayout)
-    SwipeRefreshLayout mSwipeRefreshLayout;
+    @BindView(R.id.srl_refresh)
+    SmartRefreshLayout srlRefresh;
+
 
-    @BindView(R.id.imageView4)
-    ImageView imageView;
 
     @BindView(R.id.no_message)
     LinearLayout no_message;
 
-    Unbinder butterKnife;
     /**
      * 搜索条件：
      */
-    private String type1;
-    private String type2;
-    private String type3;
+    private String type1 = "ok";
+    private String type2 = "ok";
+    private String type3 = "ok";
     private String type = "";  //默认全部搜索
-    private String timestart;
-    private String overtime;
+    private String timestart = "";
+    private String overtime = "";
     private String checktime = "1";    //默认全部时间
     private View view;
 
     private FindAdapter mAdapter;
-    private List<HashMap<String, String>> listmap = new ArrayList<HashMap<String, String>>();
+    private List<HashMap<String, String>> listmap = new ArrayList<>();
 
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        view = inflater.inflate(R.layout.fragment_find, container, false);
-        butterKnife=ButterKnife.bind(this, view);
+    int page = 1;
+    NewFindPresenter presenter;
 
-        mAdapter = new FindAdapter(getContext(), listmap);
-        myRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-        myRecyclerView.setAdapter(mAdapter);
-        mSwipeRefreshLayout.setColorSchemeColors(Color.GRAY);
-        mSwipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                new Handler().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        int size = listmap.size();
-                        if (size > 0) {
-                            listmap.clear();
-                            mAdapter.notifyDataSetChanged();
-                        }
-                        type = "";
-                        checktime = "1";
-                        getData();
-                        mSwipeRefreshLayout.setRefreshing(false);
+    @Override
+    protected int getLayoutResource() {
+        return R.layout.fragment_find;
+    }
 
-                        Toast.makeText(getContext(), "数据加载完毕", Toast.LENGTH_SHORT).show();
-                    }
-                }, 1000);
-            }
-        });
+    @Override
+    public void initPresenter() {
+        presenter = new NewFindPresenter(getActivity(),this);
+    }
 
-        imageView.setOnClickListener(new View.OnClickListener() {
+    @Override
+    protected void initView() {
+        presenter.getData();
+        clickTitle(getActivity(),getResources().getString(R.string.text_tab_find),R.mipmap.search,false).setRightClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 Intent intent = new Intent(getContext(), SearchMessageActivity.class);
                 startActivityForResult(intent, 1);
             }
         });
-        return view;
+        srlRefresh.setOnRefreshListener(new OnRefreshListener() {
+            @Override
+            public void onRefresh(@NonNull RefreshLayout refreshLayout) {
+                type = "";
+                checktime = "1";
+                presenter.getData();
+            }
+        });
+        srlRefresh.setEnableAutoLoadMore(false);
     }
+
+    @Override
+    protected void lazyLoad() {
+
+    }
+
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent intent) {
         super.onActivityResult(requestCode, resultCode, intent);
@@ -134,21 +139,18 @@ public class FindFragment1 extends Fragment {
             checktime = intent.getStringExtra("checktime");
             timestart = intent.getStringExtra("timestart");
             overtime = intent.getStringExtra("overtime");
-            getType();
+            dealType();
+            presenter.getData();
         }
     }
+
     @Override
     public void onResume() {
         super.onResume();
-        mSwipeRefreshLayout.setRefreshing(true);
-        int size = listmap.size();
-        if (size > 0) {
-            listmap.clear();
-            mAdapter.notifyDataSetChanged();
-        }
-        getData();
-        mSwipeRefreshLayout.setRefreshing(false);
+
     }
+
+    /*
     private void getData() {
         HashMap<String, Object> params = new HashMap<>();
         params.put("pagesize", 125);
@@ -233,17 +235,17 @@ public class FindFragment1 extends Fragment {
                         mActivity.runOnUiThread(new Runnable() {
                             @Override
                             public void run() {
-                                mAdapter.setOnItemClickListener(new FindAdapter.MyItemClickListener() {
-                                    @Override
-                                    public void onItemClick(View view, int postion) {
-                                        Intent intent = new Intent(getContext(), NewsdetailActivity.class);
-                                        Bundle bundle = new Bundle();
-                                        bundle.putSerializable("listmap", (Serializable) listmap.get(postion));
-                                        intent.putExtras(bundle);
-                                        startActivity(intent);
-                                    }
-                                });
-                                mAdapter.notifyDataSetChanged();
+//                                mAdapter.setOnItemClickListener(new FindAdapter.MyItemClickListener() {
+//                                    @Override
+//                                    public void onItemClick(View view, int postion) {
+//                                        Intent intent = new Intent(getContext(), NewsdetailActivity.class);
+//                                        Bundle bundle = new Bundle();
+//                                        bundle.putSerializable("listmap", (Serializable) listmap.get(postion));
+//                                        intent.putExtras(bundle);
+//                                        startActivity(intent);
+//                                    }
+//                                });
+//                                mAdapter.notifyDataSetChanged();
                             }
                         });
                     }
@@ -255,7 +257,9 @@ public class FindFragment1 extends Fragment {
                     }
                 });
     }
-    private void getType() {
+    */
+
+    private String dealType() {
         if ((type1.equals("ok")) && (type2.equals("ok")) && (type3.equals("ok"))) {
             type = "";
         }
@@ -274,12 +278,64 @@ public class FindFragment1 extends Fragment {
         if ((type1.equals("1")) && (type2.equals("1")) && (type3.equals("1"))) {
             type = "1,0,2";
         }
+        return type;
+    }
+
+    @Override
+    public String getType() {
+        return dealType();
+    }
+
+    @Override
+    public int getPage() {
+        return page;
+    }
+
+    @Override
+    public String getFromTime() {
+        return checktime.equals("1")?"":timestart;
+    }
+
+    @Override
+    public String getToTime() {
+        return checktime.equals("1")?"":overtime;
+    }
+
+    @Override
+    public void onSuccess(List<TroubleDeviceModel.DataBean> dataBean) {
+        if (srlRefresh != null){
+            srlRefresh.finishRefresh();
+        }
+        if (dataBean.size() == 0){
+            no_message.setVisibility(View.VISIBLE);
+        } else {
+            no_message.setVisibility(View.GONE);
+        }
+        mAdapter = new FindAdapter(R.layout.item_recylerview, dataBean, onclick);
+        myRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+        myRecyclerView.setAdapter(mAdapter);
+        mAdapter.notifyDataSetChanged();
+        if (dataBean.size() >= Integer.valueOf(BaseConstants.PAGE_SIZE)){
+            page = page + 1;
+            srlRefresh.setEnableAutoLoadMore(true);
+        }
+
     }
+
+    FindAdapter.MyItemClickListener onclick = new FindAdapter.MyItemClickListener() {
+        @Override
+        public void onItemClick(int postion, List<TroubleDeviceModel.DataBean> listData) {
+            Intent intent = new Intent(getContext(), NewsdetailActivity.class);
+            intent.putExtra("listmap", new Gson().toJson(listData.get(postion)));
+            startActivity(intent);
+        }
+    };
+
     @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        butterKnife.unbind();
+    public void onFile(String msg) {
+        Toast.makeText(mActivity,""+msg,Toast.LENGTH_SHORT).show();
     }
+
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);

app/src/main/java/com/silence/commonframe/fragment/Interface/NewFindListener.java

@@ -0,0 +1,23 @@
+package com.silence.commonframe.fragment.Interface;
+
+import com.lzy.okgo.OkGo;
+import com.silence.commonframe.base.basemvp.BaseModel;
+import com.silence.commonframe.base.basemvp.BasePresenter;
+import com.silence.commonframe.model.TroubleDeviceModel;
+
+import java.util.List;
+
+public interface NewFindListener {
+    interface View{
+        String getType();
+        int getPage();
+        String getFromTime();
+        String getToTime();
+
+        void onSuccess(List<TroubleDeviceModel.DataBean> dataBean);
+        void onFile(String msg);
+    }
+    abstract class Presenter extends BasePresenter<View,BaseModel> {
+        public abstract void getData();
+    }
+}

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

@@ -0,0 +1,65 @@
+package com.silence.commonframe.fragment.presenter;
+
+import android.app.Activity;
+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.common.constant.BaseConstants;
+import com.silence.commonframe.common.constant.UrlConstants;
+import com.silence.commonframe.fragment.Interface.NewFindListener;
+import com.silence.commonframe.model.TroubleDeviceModel;
+import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.utils.LoginIn;
+
+import org.json.JSONObject;
+
+import java.util.HashMap;
+
+import okhttp3.Call;
+import okhttp3.Response;
+
+public class NewFindPresenter extends NewFindListener.Presenter {
+
+    public NewFindPresenter(Activity mContext, NewFindListener.View mView){
+        this.mContext=mContext;
+        this.mView=mView;
+    }
+
+    @Override
+    public void getData() {
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("pagesize", BaseConstants.PAGE_SIZE);
+        params.put("page", mView.getPage());
+        params.put("type", mView.getType());
+        params.put("fromTime",mView.getFromTime());
+        params.put("toTime",mView.getToTime());
+        JSONObject jsonObject = new JSONObject(params);
+        OkGo.post(UrlConstants.GET_TROUBLE_DEVICE)
+                .tag(this)
+                .upJson(jsonObject)
+                .cacheKey("cachePostRegister11")
+                .cacheMode(CacheMode.DEFAULT)
+                .headers("token", Data.getToken())
+                .execute(new StringCallback() {
+                    @Override
+                    public void onSuccess(String s, Call call, Response response) {
+                        TroubleDeviceModel data = new Gson().fromJson(s,TroubleDeviceModel.class);
+                        if (data.getCode() == 0){
+                            mView.onSuccess(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/java/com/silence/tech/ui/moni/activity/MoniFragment.java

@@ -33,15 +33,6 @@ import butterknife.OnClick;
 
 public class MoniFragment extends BaseFragment implements MoniListener.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.back_pic)
-    ImageView ivBackPic;
-
     private String TROUBLE_FIRE_ALARM = "1";        //类型火警
     private String TROUBLE_FAULT = "2";             //类型故障
     private String TROUBLE_ABNORMAL = "0";          //类型异常
@@ -84,8 +75,8 @@ public class MoniFragment extends BaseFragment implements MoniListener.View{
 
     @Override
     protected void initView() {
-        navi_head_text.setText(R.string.text_tab_moni);
-        ivBackPic.setVisibility(View.GONE);
+//        getActivity().getResources().getString(R.string.text_tab_moni)
+        setTitle(getActivity(),getResources().getString(R.string.text_tab_moni),"",true);
 
         srlRefresh.setOnRefreshListener(new OnRefreshListener() {
             @Override

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

@@ -35,8 +35,7 @@ public class MoniTroubleActivity extends BaseActivity implements MoniTroubleList
      * 导航栏信息
      * 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)
@@ -89,7 +88,7 @@ public class MoniTroubleActivity extends BaseActivity implements MoniTroubleList
             }
             break;
         }
-        navi_head_text.setText(title);      //标题
+        setTitle(this,title,"",true);
 
         //刷新
         srlRefresh.setOnRefreshListener(new OnRefreshListener() {
@@ -109,13 +108,6 @@ public class MoniTroubleActivity extends BaseActivity implements MoniTroubleList
 
     }
 
-    /**
-     * 返回按钮
-     */
-    public void click_back(View view) {
-        finish();
-    }
-
     @Override
     public String getTroubleType() {
         return troubleType;

app/src/main/java/com/silence/tech/ui/my/activity/MineTechFragment.java

@@ -23,15 +23,18 @@ import com.silence.commonframe.activity.HistoryActivity;
 import com.silence.commonframe.activity.QuesstionActivity;
 import com.silence.commonframe.activity.SetupActivity;
 import com.silence.commonframe.activity.SitedetailActivity;
+import com.silence.commonframe.base.basemvp.BaseFragment;
 import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.utils.TitlePopupMenu;
 
 import java.io.File;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.OnClick;
 import butterknife.Unbinder;
 
-public class MineTechFragment extends Fragment {
+public class MineTechFragment extends BaseFragment {
     protected Activity mActivity;
     @BindView(R.id.name)
     TextView name;
@@ -42,55 +45,48 @@ public class MineTechFragment extends Fragment {
     @BindView(R.id.btn_menu)
     ImageView imageViewset;//btn_menu
 
-    Unbinder butterKnife;
+    @Override
+    protected int getLayoutResource() {
+        return R.layout.fragment_mine_tech;
+    }
 
     @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_mine_tech, container, false);
-        RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(R.id.rl);
-        relativeLayout.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(getContext(), SitedetailActivity.class);
-                startActivity(intent);
-            }
-        });
-        RelativeLayout relativeLayoutcustomer = (RelativeLayout) view.findViewById(R.id.customer);//customer  ll_tuisong
-        relativeLayoutcustomer.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(getContext(), CoustomerActivity.class);
-                startActivity(intent);
-            }
-        });
-        RelativeLayout relativeLayoutcustomer3 = (RelativeLayout) view.findViewById(R.id.rl_fire);//customer  ll_tuisong  rl_history   rl_qusstion
-        relativeLayoutcustomer3.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(getContext(), HistoryActivity.class);
-                startActivity(intent);
-            }
-        });
-        RelativeLayout relativeLayoutcustomer4 = (RelativeLayout) view.findViewById(R.id.rl_qusstion);//customer  ll_tuisong  rl_history   rl_qusstion
-        relativeLayoutcustomer4.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(getContext(), QuesstionActivity.class);
-                startActivity(intent);
-            }
-        });
-        butterKnife=ButterKnife.bind(this, view);
+    public void initPresenter() {
+
+    }
+
+    @Override
+    protected void initView() {
         name.setText(Data.getName());
         tel.setText(Data.getPhoto());
         Glide.with(this).load(Data.getUrlPicture()).apply(new RequestOptions().error(R.mipmap.people3)).into(image_head);
-        imageViewset.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(getContext(),SetupActivity.class);
-                startActivity(intent);
-            }
-        });
-        return view;
+    }
+
+    @Override
+    protected void lazyLoad() {
+
+    }
+
+    //点击事件
+    @OnClick({R.id.rl,R.id.customer,R.id.rl_fire ,R.id.rl_qusstion,R.id.btn_menu})
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.rl:
+                startActivity( new Intent().setClass(mActivity, SitedetailActivity.class));
+                break;
+            case R.id.customer:
+                startActivity( new Intent().setClass(mActivity, CoustomerActivity.class));
+                break;
+            case R.id.rl_fire:
+                startActivity( new Intent().setClass(mActivity, HistoryActivity.class));
+                break;
+            case R.id.rl_qusstion:
+                startActivity( new Intent().setClass(mActivity, QuesstionActivity.class));
+                break;
+            case R.id.btn_menu:
+                startActivity( new Intent().setClass(mActivity, SetupActivity.class));
+                break;
+        }
     }
 
     private void getPicture(){
@@ -104,11 +100,6 @@ public class MineTechFragment extends Fragment {
     }
 
     @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        butterKnife.unbind();
-    }
-    @Override
     public void onAttach(Context context) {
         super.onAttach(context);
         this.mActivity = (Activity) context;

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

@@ -7,7 +7,10 @@
     android:orientation="vertical"
     tools:context="com.silence.tech.ui.moni.activity.MoniTroubleActivity">
 
-    <include layout="@layout/navi_head"/>
+    <com.silence.commonframe.base.basemvp.TitleBar
+        android:id="@+id/base_title_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
 
     <com.scwang.smartrefresh.layout.SmartRefreshLayout
         android:id="@+id/srl_refresh"

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

@@ -1,88 +1,58 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="63dp"
-        android:gravity="bottom"
-        android:background="@color/myblue">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_marginBottom="6dp"
-            android:gravity="center_horizontal">
-
-            <TextView
-                android:id="@+id/textView3"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:text="消息"
-                android:textColor="#fff"
-                android:textSize="19sp" />
-
-        </LinearLayout>
 
-        <LinearLayout
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentBottom="true"
-            android:layout_marginRight="10dp"
-            android:layout_marginBottom="4dp"
-            android:gravity="right">
+    <com.silence.commonframe.base.basemvp.TitleBar
+        android:id="@+id/base_title_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
 
-            <ImageView
-                android:id="@+id/imageView4"
-                android:layout_width="23dp"
-                android:layout_height="23dp"
-                android:layout_marginTop="4dp"
-                android:background="@mipmap/search"
-                />
-        </LinearLayout>
-    </RelativeLayout>
-    <android.support.v4.widget.SwipeRefreshLayout
-        android:id="@+id/swipeRefreshLayout"
+    <com.scwang.smartrefresh.layout.SmartRefreshLayout
+        android:id="@+id/srl_refresh"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
+
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent">
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/my_recycler_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scrollbars="vertical" />
-        <LinearLayout
-            android:id="@+id/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"/>
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/my_recycler_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scrollbars="vertical" />
 
-            <View
+            <LinearLayout
+                android:id="@+id/no_message"
                 android:layout_width="match_parent"
-                android:layout_height="50dp"/>
+                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>
         </RelativeLayout>
-    </android.support.v4.widget.SwipeRefreshLayout>
+
+    </com.scwang.smartrefresh.layout.SmartRefreshLayout>
 
 </LinearLayout>

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

@@ -5,7 +5,10 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <include layout="@layout/navi_head"/>
+    <com.silence.commonframe.base.basemvp.TitleBar
+        android:id="@+id/base_title_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
 
     <com.scwang.smartrefresh.layout.SmartRefreshLayout
         android:id="@+id/srl_refresh"