合并6.27

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

@@ -136,10 +136,12 @@ public class AddSiteActivity extends BaseActivity implements LocationSource, AMa
             .setRightClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                avoidDoubleClick(v);
                 if (TextUtils.isEmpty(editSite.getText().toString().trim())) {
                     Toast.makeText(AddSiteActivity.this, "场所名称不能为空", Toast.LENGTH_SHORT).show();
                     return;
                 }
+                startLoading();
                 presenter.addSite();
             }
         });
@@ -569,6 +571,7 @@ public class AddSiteActivity extends BaseActivity implements LocationSource, AMa
         IsDeviceChange.setChangeSize(true);                 //判断设备界面title列表要不要刷新
         Data.setLinkmanname(data1);
         showLinkManDialog();
+        stopLoading();
     }
 
     @Override

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

@@ -62,6 +62,7 @@ public class AdddeviceActivity extends BaseActivity implements AddDeviceListener
 
         adapterClickListener();
 
+        startLoading();
         presenter.getDeviceType();
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
@@ -123,6 +124,7 @@ public class AdddeviceActivity extends BaseActivity implements AddDeviceListener
         }
 
         addDeviceAdapter.notifyDataSetChanged();
+        stopLoading();
     }
 
     @Override

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

@@ -105,6 +105,7 @@ public class AdddevicedetailActivity extends BaseActivity implements AddDeviceDe
     }
 
     public void click(View view) {
+        avoidDoubleClick(view);
        str1 = devicePlace.getText().toString();
         if (TextUtils.isEmpty(str1)){
             Toast.makeText(AdddevicedetailActivity.this,"请添加对应的安装位置！",Toast.LENGTH_SHORT).show();
@@ -238,6 +239,7 @@ public class AdddevicedetailActivity extends BaseActivity implements AddDeviceDe
     @Override
     public void onSuccess() {
         IsDeviceChange.setChangeSize(true);
+        stopLoading();
         finish();
     }
 

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

@@ -1,13 +1,10 @@
 package com.silence.commonframe.activity.home.activity;
 
-import android.app.Activity;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.graphics.Color;
-import android.os.Build;
 import android.os.Bundle;
 import android.provider.MediaStore;
 import android.text.TextUtils;
@@ -19,38 +16,26 @@ import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import com.google.zxing.Result;
-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.Dialog.CDialog;
 import com.silence.commonframe.R;
 import com.silence.commonframe.activity.home.Interface.CommonScanListener;
 import com.silence.commonframe.activity.home.presenter.CommonScanPresenter;
 import com.silence.commonframe.base.basemvp.BaseActivity;
-import com.silence.commonframe.utils.Data;
 import com.silence.commonframe.zxing.utils.Constant;
 import com.silence.commonframe.zxing.zxing.ScanListener;
 import com.silence.commonframe.zxing.zxing.ScanManager;
 import com.silence.commonframe.zxing.zxing.decode.DecodeThread;
 import com.silence.commonframe.zxing.zxing.decode.Utils;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import butterknife.BindView;
-import okhttp3.Call;
-import okhttp3.Response;
 
 /**
  * 二维码扫描使用
  *
- * @author 刘红亮  2015年4月29日  下午5:49:45
  */
 public final class CommonScanActivity extends BaseActivity implements ScanListener, View.OnClickListener, CommonScanListener.View {
     static final String TAG = CommonScanActivity.class.getSimpleName();

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

@@ -43,7 +43,7 @@ import com.silence.commonframe.zxing.zxing.decode.Utils;
 import butterknife.BindView;
 
 /**
- * 二维码扫描
+ * 二维码扫描（关联设备）
  */
 @SuppressLint("Registered")
 public final class CommonScanDCActivity extends BaseActivity implements ScanListener, View.OnClickListener {
@@ -70,7 +70,7 @@ public final class CommonScanDCActivity extends BaseActivity implements ScanList
 
     private final int PERMISSION_REQUEST = 0xa01;
 
-    String deviceType;      //判断扫描什么设备
+//    String deviceType;      //判断扫描什么设备
     String deviceId;      //设备Id
 
     @Override
@@ -101,20 +101,17 @@ public final class CommonScanDCActivity extends BaseActivity implements ScanList
     }
 
     @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[], @NonNull int[] grantResults) {
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         if (permissions.length > 0) {
             for (String s : permissions)
                 Log.d(TAG + "权限列表", s + "");
         }
-        switch (requestCode) {
-            case PERMISSION_REQUEST:
-                if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                    Log.d(TAG, "授权获得");
-                } else {
-                    Log.d(TAG, "授权未获得");
-                }
-
-                break;
+        if (requestCode == PERMISSION_REQUEST) {
+            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                Log.d(TAG, "授权获得");
+            } else {
+                Log.d(TAG, "授权未获得");
+            }
         }
     }
 
@@ -125,8 +122,6 @@ public final class CommonScanDCActivity extends BaseActivity implements ScanList
         scanLine = (ImageView) findViewById(R.id.capture_scan_line);
         qrcode_g_gallery = (TextView) findViewById(R.id.qrcode_g_gallery);
         qrcode_g_gallery.setOnClickListener(this);
-     //   qrcode_ic_back = (TextView) findViewById(R.id.qrcode_ic_back);
-     //   qrcode_ic_back.setOnClickListener(this);
         iv_light = (TextView) findViewById(R.id.iv_light);
         iv_light.setOnClickListener(this);
         rescan.setOnClickListener(this);
@@ -147,8 +142,9 @@ public final class CommonScanDCActivity extends BaseActivity implements ScanList
         super.onPause();
         scanManager.onPause();
     }
+
     /**
-     *
+     *  扫描结果
      */
     public void scanResult(Result rawResult, Bundle bundle) {
         //扫描成功后，扫描器不会再连续扫描，如需连续扫描，调用reScan()方法。
@@ -237,39 +233,7 @@ public final class CommonScanDCActivity extends BaseActivity implements ScanList
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.qrcode_g_gallery:
-                CDialog.Builder builder = new CDialog.Builder(this);
-                builder.setCancelable(false);
-                builder.setTitle("请输入设备编号");
-                //    通过LayoutInflater来加载一个xml的布局文件作为一个View对象
-                View view = LayoutInflater.from(this).inflate(R.layout.item_addsite, null);
-                //    设置我们自己定义的布局文件作为弹出框的Content
-                builder.setView(view);
-                final EditText deviceno = (EditText)view.findViewById(R.id.deviceno);
-                builder.setPositiveButton("确定", new DialogInterface.OnClickListener()
-                {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which)
-                    {
-                        String t1 = deviceno.getText().toString().trim();
-                      if (TextUtils.isEmpty(t1)){
-                          Toast.makeText(CommonScanDCActivity.this,"设备编号为空，请重新输入对应的设备号！",Toast.LENGTH_SHORT).show();
-                          return;
-                      }
-                        Intent intent = new Intent(CommonScanDCActivity.this, AdddevicedetailActivity.class);
-                        intent.putExtra("id", deviceId);
-                        startActivity(intent);
-                        finish();
-                    }
-                });
-                builder.setNegativeButton("取消", new DialogInterface.OnClickListener()
-                {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which)
-                    {
-                        dialog.dismiss();
-                    }
-                });
-                builder.show();
+                showDialog();
                 break;
             case R.id.iv_light:
                 scanManager.switchLight();
@@ -279,4 +243,40 @@ public final class CommonScanDCActivity extends BaseActivity implements ScanList
         }
     }
 
+    private void showDialog() {
+        CDialog.Builder builder = new CDialog.Builder(this);
+        builder.setCancelable(false);
+        builder.setTitle("请输入设备编号");
+        //    通过LayoutInflater来加载一个xml的布局文件作为一个View对象
+        View view = LayoutInflater.from(this).inflate(R.layout.item_addsite, null);
+        //    设置我们自己定义的布局文件作为弹出框的Content
+        builder.setView(view);
+        final EditText deviceno = (EditText)view.findViewById(R.id.deviceno);
+        builder.setPositiveButton("确定", new DialogInterface.OnClickListener()
+        {
+            @Override
+            public void onClick(DialogInterface dialog, int which)
+            {
+                String t1 = deviceno.getText().toString().trim();
+              if (TextUtils.isEmpty(t1)){
+                  Toast.makeText(CommonScanDCActivity.this,"设备编号为空，请重新输入对应的设备号！",Toast.LENGTH_SHORT).show();
+                  return;
+              }
+                Intent intent = new Intent(CommonScanDCActivity.this, AdddevicedetailActivity.class);
+                intent.putExtra("id", deviceId);
+                startActivity(intent);
+                finish();
+            }
+        });
+        builder.setNegativeButton("取消", new DialogInterface.OnClickListener()
+        {
+            @Override
+            public void onClick(DialogInterface dialog, int which)
+            {
+                dialog.dismiss();
+            }
+        });
+        builder.show();
+    }
+
 }

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

@@ -18,10 +18,11 @@ import com.silence.commonframe.bean.BaseBean;
 import com.silence.commonframe.common.constant.BaseConstants;
 import com.silence.commonframe.model.TroubleDeviceModel;
 
-import java.util.HashMap;
-
 import butterknife.BindView;
 
+/**
+ * 复核页面
+ */
 public class CheckActivity extends BaseActivity implements CheckListener.View {
    @BindView(R.id.tv_place)
     TextView tvPlace;
@@ -52,7 +53,6 @@ public class CheckActivity extends BaseActivity implements CheckListener.View {
     static String processId;    //id
     static String proType="01";      //提交类型
 
-    private HashMap<String, String> list1;
     int SUB_CODE=102;
 
     TroubleDeviceModel.DataBean dataBean;
@@ -71,53 +71,51 @@ public class CheckActivity extends BaseActivity implements CheckListener.View {
     @Override
     public void initView() {
         setTitle(this,getResources().getString(R.string.fire_check),"",true);
-        list1 = new HashMap<>();
-        String jsonData = getIntent().getStringExtra("listmap");
+        Intent intent = getIntent();
+        String jsonData = intent.getStringExtra("listmap");
         //  list1 = (List<HashMap<String, String>>) bundle.getSerializable("listmap");
         dataBean = new Gson().fromJson(jsonData,TroubleDeviceModel.DataBean.class);
-        if (list1 != null) {
-            processId = dataBean.getId();
-            tvPlace.setText("场所名称：" + dataBean.getDeployment());
-            tvSitename.setText("设备名称：" + dataBean.getDeviceName());
-            tvSitepalce.setText("安装位置：" + dataBean.getLocation());
-            String mcuTemp ="环境温度：" + getIntent().getStringExtra("mcuTemp") + "℃";
-            String smoke ="烟雾浓度" + getIntent().getStringExtra("smokeConc") + "ppm";
-            tvTemp.setText(mcuTemp);
-            tvSmoke.setText(smoke);
-            if ("1".equals(dataBean.getTroubleType())) {
-                tvType.setText("火警");
-                tvType.setTextColor(Color.rgb(250, 85, 58));//imageViewfire
-            }
-
-            tvTime.setText("发生时间：" + dataBean.getGmtCreate());
-
-            btTypetest.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    fireType = "03";   //火警为火警测试
-                    proType = "03";
-                    changeType(btTypetest);
-                }
-            });
-
-            btTypeerror.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    fireType = "02";   //火警为火警误报
-                    proType = "02";
-                    changeType(btTypeerror);
-                }
-            });
-
-            btTypereal.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    fireType = "01";   //火警为真实火警
-                    proType = "01";
-                    changeType(btTypereal);
-                }
-            });
+
+        processId = dataBean.getId();
+
+        String mcuTemp ="环境温度：" + intent.getStringExtra("mcuTemp") + "℃";
+        String smoke ="烟雾浓度：" + intent.getStringExtra("smokeConc") + "ppm";
+        String place ="场所名称：" + dataBean.getDeployment();
+        String siteName ="设备名称：" + dataBean.getDeviceName();
+        String siteLocation ="安装位置：" + dataBean.getLocation();
+        String time ="发生时间：" + dataBean.getGmtCreate();
+
+        tvPlace.setText(place);
+        tvSitename.setText(siteName);
+        tvSitepalce.setText(siteLocation);
+        tvTemp.setText(mcuTemp);
+        tvSmoke.setText(smoke);
+
+        if ("1".equals(dataBean.getTroubleType())) {
+            tvType.setText("火警");
+            tvType.setTextColor(Color.rgb(250, 85, 58));//imageViewfire
         }
+
+        tvTime.setText(time);
+
+        btTypetest.setOnClickListener(v -> {
+            fireType = "03";   //火警为火警测试
+            proType = "03";
+            changeType(btTypetest);
+        });
+
+        btTypeerror.setOnClickListener(v -> {
+            fireType = "02";   //火警为火警误报
+            proType = "02";
+            changeType(btTypeerror);
+        });
+
+        btTypereal.setOnClickListener(v -> {
+            fireType = "01";   //火警为真实火警
+            proType = "01";
+            changeType(btTypereal);
+        });
+
     }
 
     private void changeType(TextView tvType) {

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

@@ -4,7 +4,6 @@ package com.silence.commonframe.activity.message.activity;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.support.annotation.NonNull;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
@@ -13,26 +12,21 @@ import android.widget.Toast;
 
 import com.google.gson.Gson;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
-import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener;
-import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 import com.silence.commonframe.R;
+import com.silence.commonframe.activity.message.Interface.NewFindListener;
+import com.silence.commonframe.activity.message.presenter.NewFindPresenter;
 import com.silence.commonframe.adapter.FindAdapter;
 import com.silence.commonframe.base.basemvp.BaseFragment;
 import com.silence.commonframe.common.constant.BaseConstants;
-import com.silence.commonframe.activity.message.Interface.NewFindListener;
-import com.silence.commonframe.activity.message.presenter.NewFindPresenter;
 import com.silence.commonframe.model.TroubleDeviceModel;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 
-
 import butterknife.BindView;
 
 /**
- * Created by Silence on 2016/4/5.
+ * 消息页面
  */
 public class FindFragment1 extends BaseFragment implements NewFindListener.View {
     protected Activity mActivity;
@@ -54,10 +48,8 @@ public class FindFragment1 extends BaseFragment implements NewFindListener.View
     private String timestart = "";
     private String overtime = "";
     private String checktime = "1";    //默认全部时间
-    private View view;
 
     private FindAdapter mAdapter;
-    private List<HashMap<String, String>> listmap = new ArrayList<>();
     private List<TroubleDeviceModel.DataBean> listData = new ArrayList<>();
 
     int page = 1;
@@ -79,33 +71,25 @@ public class FindFragment1 extends BaseFragment implements NewFindListener.View
         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) {
-                Intent intent = new Intent(getContext(), SearchMessageActivity.class);
-                startActivityForResult(intent, 1);
-            }
+        clickTitle(getActivity(),getResources().getString(R.string.text_tab_find),R.mipmap.search,false).setRightClickListener(v -> {
+            avoidDoubleClick(v);
+            Intent intent = new Intent(getContext(), SearchMessageActivity.class);
+            startActivityForResult(intent, 1);
         });
         startLoading();
         presenter.getData();
 
-        srlRefresh.setOnRefreshListener(new OnRefreshListener() {
-            @Override
-            public void onRefresh(@NonNull RefreshLayout refreshLayout) {
-                type1 = "ok";
-                type2 = "ok";
-                type3 = "ok";
-                checktime = "1";
-                page = 1;
-                presenter.getData();
-            }
+        srlRefresh.setOnRefreshListener(refreshLayout -> {
+            type1 = "ok";
+            type2 = "ok";
+            type3 = "ok";
+            checktime = "1";
+            page = 1;
+            presenter.getData();
         });
-        srlRefresh.setOnLoadMoreListener(new OnLoadMoreListener() {
-            @Override
-            public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
-                page++;
-                presenter.getData();
-            }
+        srlRefresh.setOnLoadMoreListener(refreshLayout -> {
+            page++;
+            presenter.getData();
         });
         srlRefresh.setEnableLoadMore(false);
     }
@@ -127,6 +111,9 @@ public class FindFragment1 extends BaseFragment implements NewFindListener.View
             overtime = intent.getStringExtra("overtime");
             page = 1;
             presenter.getData();
+        }else if ((requestCode == BaseConstants.RECHECK_CODE && resultCode == BaseConstants.RECHECK_CODE)){
+            page = 1;
+            presenter.getData();
         }
     }
 
@@ -193,13 +180,10 @@ public class FindFragment1 extends BaseFragment implements NewFindListener.View
         stopLoading();
     }
 
-    FindAdapter.MyItemClickListener onclick = new FindAdapter.MyItemClickListener() {
-        @Override
-        public void onItemClick(int position, List<TroubleDeviceModel.DataBean> listData) {
-            Intent intent = new Intent(getContext(), NewsdetailActivity.class);
-            intent.putExtra("listmap", new Gson().toJson(listData.get(position)));
-            startActivity(intent);
-        }
+    FindAdapter.MyItemClickListener onclick = (position, listData) -> {
+        Intent intent = new Intent(getContext(), NewsdetailActivity.class);
+        intent.putExtra("listmap", new Gson().toJson(listData.get(position)));
+        startActivityForResult(intent,BaseConstants.RECHECK_CODE);
     };
 
     @Override

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

@@ -2,22 +2,16 @@ package com.silence.commonframe.activity.message.activity;
 
 import android.content.Intent;
 import android.graphics.Color;
-import android.os.Build;
-import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import com.google.gson.Gson;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
-import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 import com.silence.commonframe.R;
 import com.silence.commonframe.activity.message.Interface.NewsDetailListener;
 import com.silence.commonframe.activity.message.presenter.NewsDetailPresenter;
@@ -33,6 +27,9 @@ import java.util.List;
 
 import butterknife.BindView;
 
+/**
+ * 消息详情界面
+ */
 public class NewsdetailActivity extends BaseActivity implements NewsDetailListener.View {
 
    @BindView(R.id.tv_sitename)
@@ -69,10 +66,8 @@ public class NewsdetailActivity extends BaseActivity implements NewsDetailListen
     TroubleDeviceModel.DataBean dataBean;
     List<RecheckMsgModel.DataBean> listDataBean = new ArrayList<>();
 
-    private String recheckId;
     private String processId;
     private String msgId;
-    private String name;
     private RecheckMsgAdapter recheckMsgAdapter;
     NewsDetailByMsgBean.DataBean dataDetailBean;
 
@@ -91,31 +86,27 @@ public class NewsdetailActivity extends BaseActivity implements NewsDetailListen
     @Override
     public void initView() {
         clickTitle(this,getResources().getString(R.string.message_detail),getResources().getString(R.string.recheck),true)
-                .setRightClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(NewsdetailActivity.this, CheckActivity.class);
-                intent.putExtra("listmap", new Gson().toJson(dataBean));
-                intent.putExtra("mcuTemp",dataDetailBean.getMcuTemp());
-                intent.putExtra("smokeConc",dataDetailBean.getSmokeConc());
-                startActivityForResult(intent,BaseConstants.CHECK_CODE);
-            }
-        });
+                .setRightClickListener(v -> {
+                    avoidDoubleClick(v);
+                    Intent intent = new Intent(NewsdetailActivity.this, CheckActivity.class);
+                    intent.putExtra("mcuTemp",dataDetailBean.getMcuTemp() + "");
+                    intent.putExtra("smokeConc",dataDetailBean.getSmokeConc() + "");
+                    intent.putExtra("listmap", new Gson().toJson(dataBean));
+                    startActivityForResult(intent,BaseConstants.CHECK_CODE);
+                });
 
         startLoading();
-
+        setResult(BaseConstants.RECHECK_CODE);
         RecyclerView_RecheckMsg.setLayoutManager(new LinearLayoutManager(NewsdetailActivity.this));
         recheckMsgAdapter = new RecheckMsgAdapter(R.layout.item_recheckmsg,listDataBean,itemClickListener);
         RecyclerView_RecheckMsg.setAdapter(recheckMsgAdapter);
         RecyclerView_RecheckMsg.setNestedScrollingEnabled(false);
 
-        //  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());
+            String place = "详细地址：" + dataBean.getLocation();
+            tvPlace.setText( place);
             tvTime.setText(dataBean.getGmtCreate());
             tvNo.setText(dataBean.getDeviceId());//deployment
             tvSitename.setText(dataBean.getDeployment());
@@ -136,17 +127,14 @@ public class NewsdetailActivity extends BaseActivity implements NewsDetailListen
             if ("2".equals(dataBean.getTroubleType())) {
                 tvFiretype.setText("其他");
             }
-            recheckId = dataBean.getRecheckId();
             processId = dataBean.getId();
             msgId = dataBean.getMessageId();
         }
         presenter.getDeviceDetail();
         presenter.getRecheckMsg();
-        srlRefresh.setOnRefreshListener(new OnRefreshListener() {
-            @Override
-            public void onRefresh(@NonNull RefreshLayout refreshLayout) {
-                presenter.getRecheckMsg();
-            }
+        srlRefresh.setOnRefreshListener(refreshLayout -> {
+            presenter.getDeviceDetail();
+            presenter.getRecheckMsg();
         });
         srlRefresh.setEnableLoadMore(false);
     }
@@ -172,21 +160,22 @@ public class NewsdetailActivity extends BaseActivity implements NewsDetailListen
     @Override
     public void onNewsDetailSuccess(NewsDetailByMsgBean.DataBean data) {
         dataDetailBean = data;
-        tvBatteryvoltage.setText(data.getBatteryVoltage() + "V");
-        tvSignalstrength.setText(data.getSignalStrength() + "dBm");
-        tv_cputem.setText(data.getMcuTemp() + "℃");
-        stopLoading();
-
+        String battrtyVoltage = data.getBatteryVoltage() + "V";
+        String signalStrength = data.getSignalStrength() + "dBm";
+        String cputem = data.getMcuTemp() + "℃";
+        tvBatteryvoltage.setText(battrtyVoltage);
+        tvSignalstrength.setText(signalStrength);
+        tv_cputem.setText(cputem);
+        if (srlRefresh != null){
+            srlRefresh.finishRefresh();
+        }
     }
 
     //复核信息点击事件
-    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);
-        }
+    RecheckMsgAdapter.MyItemClickListener itemClickListener = (position, dataBean) -> {
+        Intent intent = new Intent(NewsdetailActivity.this,NewsdetailActivityShow.class);
+        intent.putExtra("id",dataBean.get(position).getId());
+        startActivity(intent);
     };
 
     @Override
@@ -199,6 +188,9 @@ public class NewsdetailActivity extends BaseActivity implements NewsDetailListen
         }
         listDataBean.addAll(dataBean);
         recheckMsgAdapter.notifyDataSetChanged();
+        if (srlRefresh != null){
+            srlRefresh.finishRefresh();
+        }
         stopLoading();
     }
 

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

@@ -1,17 +1,9 @@
 package com.silence.commonframe.activity.message.activity;
 
-import android.app.DatePickerDialog;
 import android.content.Intent;
-import android.graphics.Color;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.CheckBox;
-import android.widget.DatePicker;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -21,8 +13,6 @@ import com.bigkoo.pickerview.listener.OnTimeSelectListener;
 import com.bigkoo.pickerview.view.TimePickerView;
 import com.silence.commonframe.R;
 import com.silence.commonframe.base.basemvp.BaseActivity;
-import com.silence.commonframe.base.basemvp.BasePresenter;
-import com.silence.commonframe.utils.AtyContainer;
 import com.silence.tech.bean.event.SelectTimeEvent;
 
 import org.greenrobot.eventbus.EventBus;
@@ -31,12 +21,12 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.Locale;
-
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 
+/**
+ * 消息搜索条件
+ */
 public class SearchMessageActivity extends BaseActivity {
 
     @BindView(R.id.checkBox_type_L)

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

@@ -1,6 +1,5 @@
 package com.silence.commonframe.activity.mine.activity;
 
-import android.support.annotation.NonNull;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
@@ -8,9 +7,6 @@ import android.widget.LinearLayout;
 import android.widget.Toast;
 
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
-import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener;
-import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 import com.silence.commonframe.R;
 import com.silence.commonframe.activity.mine.Interface.HistoryListener;
 import com.silence.commonframe.activity.mine.presenter.HistoryPresenter;

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

@@ -1,139 +0,0 @@
-package com.silence.commonframe.adapter;
-
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.graphics.Color;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-
-import com.silence.commonframe.R;
-
-import java.util.HashMap;
-import java.util.List;
-
-public class FireAlarmAdapter extends RecyclerView.Adapter<FireAlarmAdapter.MyViewHolder> {
-    private Context context;
-    private MyItemClickListener mListener;
-
-
-    private List<HashMap<String, String>> listmap1;
-
-    private ButtonInterface buttonInterface;
-
-    public FireAlarmAdapter(Context context, List<HashMap<String, String>> listmap, MyItemClickListener mListener) {
-        this.context = context;
-        this.mListener = mListener;
-        listmap1 = listmap;
-    }
-
-    @Override
-    public int getItemCount() {
-        return listmap1.size();
-
-    }
-
-    @NonNull
-    @Override
-    public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(context).inflate(R.layout.item_item_firealarm, parent, false);
-        FireAlarmAdapter.MyViewHolder viewHolder1 = new MyViewHolder(view);
-
-        return viewHolder1;
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull MyViewHolder holder, @SuppressLint("RecyclerView") final int position) {
-        holder.tv.setText("编号：" + listmap1.get(position).get("deviceId"));//tv_devicename
-        holder.tv_time.setText("时间：" + listmap1.get(position).get("gmtCreate"));
-        holder.tv_place.setText("区域名：" + listmap1.get(position).get("deployment"));
-        String tvplace = listmap1.get(position).get("deviceLocation");
-        holder.tv_place1.setText("位置：" + listmap1.get(position).get("deviceLocation"));
-        holder.tv_place3.setText("详细地址：" + listmap1.get(position).get("location"));//deployment
-
-        if ("1".equals(listmap1.get(position).get("troubleType"))) {
-            holder.tv_fire.setText("火警");
-            holder.tv_fire.setTextColor(Color.rgb(250, 85, 58));//imageViewfire
-        } else if ("0".equals(listmap1.get(position).get("troubleType"))) {
-            holder.tv_fire.setText("故障");
-            holder.tv_fire.setTextColor(Color.rgb(255, 153, 51));
-        } else if ("2".equals(listmap1.get(position).get("troubleType"))) {
-            holder.tv_fire.setText("其他");
-        }
-
-        final MyViewHolder holders = holder;
-
-        if ("0".equals(listmap1.get(position).get("ifRead"))) {
-            holders.bt_know.setVisibility(View.VISIBLE);
-        }
-
-        final int pos = position;
-        final MyViewHolder holder1 = holder;
-        holder.bt_know.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(final View v) {
-                if (buttonInterface != null) {
-                    buttonInterface.onclick(v, pos);
-                    holder1.bt_know.setVisibility(View.GONE);
-                }
-            }
-        });
-    }
-
-    public class MyViewHolder extends RecyclerView.ViewHolder {
-        // ImageView iv;
-        TextView tv_fire;
-        View itemView;
-        TextView tv;
-        TextView tv_devicename;
-        TextView tv_time;
-        TextView tv_place;
-        TextView tv_place1;
-        TextView tv_place3;
-        Button bt_know;
-
-        public MyViewHolder(View itemView) {
-            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);
-            bt_know = (Button) itemView.findViewById(R.id.id_know);
-            tv_fire = (TextView) itemView.findViewById(R.id.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);
-    }
-
-    public void buttonSetOnclick(ButtonInterface buttonInterface) {
-        this.buttonInterface = buttonInterface;
-    }
-
-    public interface ButtonInterface {
-        void onclick(View view, int position);
-    }
-
-
-}

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

@@ -0,0 +1,25 @@
+package com.silence.commonframe.adapter;
+
+import android.support.annotation.Nullable;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.silence.commonframe.R;
+import com.silence.commonframe.model.SiteModel;
+
+import java.util.List;
+
+public class FireMessageAdapter extends BaseQuickAdapter<SiteModel.DataBean.DataListBean, BaseViewHolder> {
+
+    private List<SiteModel.DataBean.DataListBean> listData;
+
+    public FireMessageAdapter(@Nullable List<SiteModel.DataBean.DataListBean> data) {
+        super(R.layout.recyclerview_itemtest1, data);
+        this.listData = data;
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, SiteModel.DataBean.DataListBean item) {
+
+    }
+}

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

@@ -0,0 +1,87 @@
+package com.silence.commonframe.adapter;
+
+import android.graphics.Color;
+import android.support.annotation.Nullable;
+import android.view.View;
+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.R;
+import com.silence.commonframe.model.FireAlarmModel;
+
+import java.util.List;
+
+public class HistoryAdapter extends BaseQuickAdapter<FireAlarmModel.DataBean, BaseViewHolder> {
+
+    List<FireAlarmModel.DataBean> listData;
+
+    public HistoryAdapter(@Nullable List<FireAlarmModel.DataBean> listData) {
+        super(R.layout.item_item_firealarm, listData);
+        this.listData = listData;
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, FireAlarmModel.DataBean data) {
+        TextView tvFire = helper.itemView.findViewById(R.id.fire);
+        TextView tvNumber = helper.itemView.findViewById(R.id.number);
+        TextView tvDeviceName = helper.itemView.findViewById(R.id.recycler_view_test_item_person_name_tv);
+        TextView tvDeployment = helper.itemView.findViewById(R.id.recycler_view_place);
+        TextView tvLocation = helper.itemView.findViewById(R.id.place);
+        TextView tvTime = helper.itemView.findViewById(R.id.time);
+        TextView tvAddress = helper.itemView.findViewById(R.id.place1);
+        Button btKnow = helper.itemView.findViewById(R.id.id_know);
+
+        String deviceName = data.getDeviceName();
+        String deployment = "区域名：" + data.getDeployment();
+        String number = "编号：" + data.getDeviceId();
+        String location = "位置：" + data.getDeviceLocation();
+        String time = "事件：" + data.getGmtCreate();
+        String address = "详细地址：" + data.getLocation();
+
+        tvDeviceName.setText(deviceName);
+        tvDeployment.setText(deployment);
+        tvNumber.setText(number);
+        tvLocation.setText(location);
+        tvTime.setText(time);
+        tvAddress.setText(address);
+
+        if ("1".equals(data.getTroubleType())){
+            tvFire.setText("火警");
+            tvFire.setTextColor(Color.rgb(250, 85, 58));
+        }else if ("0".equals(data.getTroubleType())){
+            tvFire.setText("故障");
+            tvFire.setTextColor(Color.rgb(255, 153, 51));
+        }else if ("2".equals(data.getTroubleType())){
+            tvFire.setText("其他");
+        }
+
+        if ("0".equals(listData.get(helper.getAdapterPosition()).getIfRead())){
+            btKnow.setVisibility(View.VISIBLE);
+        }else {
+            btKnow.setVisibility(View.GONE);
+        }
+
+        btKnow.setOnClickListener(v -> {
+            if (mListener != null){
+                mListener.onItemClick(helper.getAdapterPosition());
+            }
+        });
+    }
+
+    public void setKnow(String know,int position){
+        listData.get(position).setIfRead(know);
+        notifyDataSetChanged();
+    }
+
+    MyItenClickListener mListener;
+
+    public interface MyItenClickListener{
+        void onItemClick(int position);
+    }
+
+    public void setItemClickListener(MyItenClickListener mListener){
+        this.mListener = mListener;
+    }
+}

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

@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.SystemClock;
 import android.support.annotation.ColorRes;
 import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;
@@ -77,6 +78,9 @@ public abstract  class BaseFragment<T extends BasePresenter, E extends BaseModel
 
     private View mRoot;
 
+    private int oldId;
+    private static long lastClickTime;
+
     /**
      * 是否执行了lazyLoad方法
      */

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

@@ -89,6 +89,7 @@ public class MoniTroubleActivity extends BaseActivity implements MoniTroubleList
             break;
         }
         setTitle(this,title,"",true);
+        startLoading();
         presenter.getDevTroubleListByType();
 
         //刷新
@@ -107,7 +108,6 @@ public class MoniTroubleActivity extends BaseActivity implements MoniTroubleList
                 presenter.getDevTroubleListByType();
             }
         });
-        srlRefresh.setEnableLoadMore(false);
     }
 
     @Override

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

@@ -15,7 +15,7 @@ import com.silence.commonframe.activity.mine.activity.CoustomerActivity;
 import com.silence.commonframe.activity.mine.activity.HistoryActivity;
 import com.silence.commonframe.activity.mine.activity.NewSiteDetailActivity;
 import com.silence.commonframe.activity.mine.activity.QuesstionActivity;
-import com.silence.commonframe.activity.mine.activity.SetupActivity;
+import com.silence.commonframe.activity.mine.activity.setup.SetupActivity;
 import com.silence.commonframe.base.basemvp.BaseFragment;
 import com.silence.commonframe.utils.Data;
 

s

@@ -0,0 +1,10 @@
+core.repositoryformatversion=0
+core.filemode=false
+core.bare=false
+core.logallrefupdates=true
+core.symlinks=false
+core.ignorecase=true
+remote.origin.url=http://134.175.197.100:3000/app/hsh_android.git
+remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
+branch.master.remote=origin
+branch.master.merge=refs/heads/master

settings.gradle

@@ -1 +1 @@
-include ':app', ':library', ':photolibrary'
+include ':app', ':library', ':photolibrary',":nicevideoplayer"