合并6.27

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

@@ -17,8 +17,8 @@ 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.mine.activity.PrivacyPolicyActivity;
-import com.silence.commonframe.activity.mine.activity.UserAgreementActivity;
+import com.silence.commonframe.activity.mine.activity.setup.PrivacyPolicyActivity;
+import com.silence.commonframe.activity.mine.activity.setup.UserAgreementActivity;
 import com.silence.commonframe.model.VerifyModel;
 import com.silence.commonframe.utils.Data;
 import com.silence.commonframe.utils.TimeButton;

app/src/main/java/com/silence/commonframe/activity/mine/Interface/HistoryListener.java

@@ -15,6 +15,7 @@ public interface HistoryListener {
         void onSuccess(List<FireAlarmModel.DataBean> dataBean);
         void onError();
         void onReadSuccess(int position);
+        void onReadError(int position);
         void onFile(String msg);
     }
     abstract class Presenter extends BasePresenter<View, BaseModel> {

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

@@ -10,17 +10,13 @@ import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.silence.commonframe.R;
 import com.silence.commonframe.activity.mine.Interface.HistoryListener;
 import com.silence.commonframe.activity.mine.presenter.HistoryPresenter;
-import com.silence.commonframe.adapter.FireAlarmAdapter;
+import com.silence.commonframe.adapter.HistoryAdapter;
 import com.silence.commonframe.base.basemvp.BaseActivity;
-import com.silence.commonframe.bean.JsonBean;
 import com.silence.commonframe.model.FireAlarmModel;
-import com.silence.commonframe.utils.Data;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 
-
 import butterknife.BindView;
 
 public class HistoryActivity extends BaseActivity implements HistoryListener.View {
@@ -31,15 +27,14 @@ public class HistoryActivity extends BaseActivity implements HistoryListener.Vie
     LinearLayout no_message;
    @BindView(R.id.srl_refresh)
     SmartRefreshLayout srlRefresh;
-    private JsonBean jsonBean;
-    private List<HashMap<String, String>> listmap = new ArrayList<HashMap<String, String>>();
-    private FireAlarmAdapter mAdapter;
-    private ArrayList<String> listIdKnown = new ArrayList<String>();//我知道的ID
+    private HistoryAdapter mAdapter;
     private String id;
     private int page=1;
 
     private int itemPosition;
 
+    List<FireAlarmModel.DataBean> listData = new ArrayList<>();
+
     HistoryPresenter presenter;
 
     @Override
@@ -55,34 +50,22 @@ public class HistoryActivity extends BaseActivity implements HistoryListener.Vie
     @Override
     public void initView() {
         setTitle(this,getResources().getString(R.string.fire_history),"",true);
+        startLoading();
         presenter.getData();
-        mAdapter = new FireAlarmAdapter(HistoryActivity.this, listmap, myItemClickListener);
+        mAdapter = new HistoryAdapter(listData);
         myRecyclerView.setLayoutManager(new LinearLayoutManager(HistoryActivity.this));
         myRecyclerView.setAdapter(mAdapter);
 
-        srlRefresh.setOnRefreshListener(new OnRefreshListener() {
-            @Override
-            public void onRefresh(@NonNull RefreshLayout refreshLayout) {
-                page=1;
-                presenter.getData();
-            }
+        srlRefresh.setOnRefreshListener(refreshLayout -> {
+            page=1;
+            presenter.getData();
         });
-        srlRefresh.setOnLoadMoreListener(new OnLoadMoreListener() {
-            @Override
-            public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
-                page++;
-                presenter.getData();
-            }
+        srlRefresh.setOnLoadMoreListener(refreshLayout -> {
+            page++;
+            presenter.getData();
         });
     }
 
-    FireAlarmAdapter.MyItemClickListener myItemClickListener = new FireAlarmAdapter.MyItemClickListener() {
-        @Override
-        public void onItemClick(View view, int postion) {
-            //todo
-        }
-    };
-
     @Override
     public int getPage() {
         return page;
@@ -100,51 +83,25 @@ public class HistoryActivity extends BaseActivity implements HistoryListener.Vie
 
     @Override
     public void onSuccess(List<FireAlarmModel.DataBean> dataBean) {
-        if (page==1) listmap.clear();
-        for (int i = 0; i < dataBean.size(); i++) {
-            HashMap<String, String> hashMap = new HashMap<>();
-            String deviceName = dataBean.get(i).getDeviceName();
-            String deployment = dataBean.get(i).getDeployment();
-            String deviceLocation = dataBean.get(i).getDeviceLocation();
-            String troubleType = dataBean.get(i).getTroubleType();
-            String deviceId = dataBean.get(i).getDeviceId();
-            String regionName = dataBean.get(i).getRegionName();
-            String gmtCreate = dataBean.get(i).getGmtCreate();
-            String location = dataBean.get(i).getLocation();
-            String ifRead = dataBean.get(i).getIfRead();
-            String id = dataBean.get(i).getId();
-
-            hashMap.put("deviceName", deviceName);
-            hashMap.put("deployment", deployment);
-            hashMap.put("deviceLocation", deviceLocation);
-            hashMap.put("troubleType", troubleType);
-            hashMap.put("deviceId", deviceId);
-            hashMap.put("regionName", regionName);
-            hashMap.put("gmtCreate", gmtCreate);
-            hashMap.put("location", location);
-            hashMap.put("ifRead", ifRead);
-            hashMap.put("id", id);
-
-            listmap.add(hashMap);
-            listIdKnown.add(id);
-        }
-        Data.setListIdKnowid(listIdKnown);
-        mAdapter.notifyDataSetChanged();
-        if (listmap.size() == 0) {
+        if (page==1) listData.clear();
+        listData.addAll(dataBean);
+        if (listData.size() == 0){
             no_message.setVisibility(View.VISIBLE);
+        }else {
+            no_message.setVisibility(View.GONE);
         }
-        mAdapter.buttonSetOnclick(new FireAlarmAdapter.ButtonInterface() {
-            @Override
-            public void onclick(View view, int position) {
-                id = Data.getListIdKnowid().get(position);
-                itemPosition = position;
-                presenter.getKnowMessage();
-            }
+        mAdapter.notifyDataSetChanged();
+        mAdapter.setItemClickListener(position -> {
+            id = dataBean.get(position).getId();
+            itemPosition = position;
+            presenter.getKnowMessage();
         });
+
         if (srlRefresh!=null){
             srlRefresh.finishRefresh();
             srlRefresh.finishLoadMore();
         }
+        stopLoading();
     }
 
     @Override
@@ -153,10 +110,17 @@ public class HistoryActivity extends BaseActivity implements HistoryListener.Vie
             srlRefresh.finishRefresh();
             srlRefresh.finishLoadMore();
         }
+        stopLoading();
     }
 
     @Override
     public void onReadSuccess(int position) {
+        mAdapter.setKnow("1",position);
+    }
+
+    @Override
+    public void onReadError(int position) {
+        mAdapter.setKnow("0",position);
     }
 
     @Override

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

@@ -10,13 +10,14 @@ import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
+import com.orhanobut.hawk.Hawk;
 import com.shehuan.niv.NiceImageView;
 import com.silence.commonframe.R;
+import com.silence.commonframe.activity.mine.activity.setup.SetupActivity;
 import com.silence.commonframe.base.basemvp.BaseFragment;
+import com.silence.commonframe.common.constant.BaseConstants;
 import com.silence.commonframe.utils.Data;
-
 import java.io.File;
-
 import butterknife.BindView;
 import butterknife.OnClick;
 
@@ -51,9 +52,9 @@ public class MineFragment extends BaseFragment {
                 startActivity( new Intent().setClass(mActivity, SetupActivity.class));
             }
         }).setBackgroundColor(Color.parseColor("#00000000"));
-        name.setText(Data.getName());
-        tel.setText(Data.getPhoto());
-        Glide.with(this).load(Data.getUrlPicture()).apply(new RequestOptions().error(R.mipmap.people3)).into(image_head);
+        name.setText(Hawk.get(BaseConstants.PHONE).toString());
+        tel.setText(Hawk.get(BaseConstants.USER_NAME).toString());
+        Glide.with(this).load(Hawk.get(BaseConstants.PICTIURE).toString()).apply(new RequestOptions().error(R.mipmap.people3)).into(image_head);
     }
 
     @Override

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

@@ -44,6 +44,7 @@ public class QuesstionActivity extends BaseActivity {
         webview.getSettings().setJavaScriptEnabled(true);
         webview.getSettings().setJavaScriptCanOpenWindowsAutomatically(true);
         webview.requestFocus();
+        stopLoading();
         //点击超链接的时候重新在原来的进程上加载URL
         webview.setWebViewClient(new WebViewClient() {
             public boolean shouldOverrideUrlLoading(WebView view, String url) {

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

@@ -1,5 +1,4 @@
-package com.silence.commonframe.activity.mine.activity;
-
+package com.silence.commonframe.activity.mine.activity.setup;
 import android.content.pm.PackageManager;
 import android.widget.TextView;
 import android.widget.Toast;

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

@@ -1,4 +1,4 @@
-package com.silence.commonframe.activity.mine.activity;
+package com.silence.commonframe.activity.mine.activity.setup;
 
 import android.content.DialogInterface;
 import android.support.annotation.NonNull;

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

@@ -1,4 +1,4 @@
-package com.silence.commonframe.activity.mine.activity;
+package com.silence.commonframe.activity.mine.activity.setup;
 
 import android.graphics.Color;
 import android.os.Build;

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

@@ -1,4 +1,4 @@
-package com.silence.commonframe.activity.mine.activity;
+package com.silence.commonframe.activity.mine.activity.setup;
 
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -8,6 +8,7 @@ import android.widget.RelativeLayout;
 import android.widget.Switch;
 import android.widget.Toast;
 
+import com.orhanobut.hawk.Hawk;
 import com.silence.commonframe.App;
 import com.silence.commonframe.Dialog.CDialog;
 import com.silence.commonframe.R;
@@ -19,6 +20,7 @@ import com.silence.commonframe.activity.mine.Interface.SetupListener;
 import com.silence.commonframe.activity.WXPublicCodeActivity;
 import com.silence.commonframe.activity.mine.presenter.SetupPresenter;
 import com.silence.commonframe.base.basemvp.BaseActivity;
+import com.silence.commonframe.common.constant.BaseConstants;
 import com.silence.commonframe.model.WXLoginModel;
 import com.silence.commonframe.utils.AtyContainer;
 import com.silence.commonframe.utils.Data;
@@ -35,17 +37,17 @@ import butterknife.BindView;
 
 public class SetupActivity extends BaseActivity implements SetupListener.View {
 
-   @BindView(R.id.switch_wx_bind)
+    @BindView(R.id.switch_wx_bind)
     Switch switch_wx_bind;          //微信绑定
-   @BindView(R.id.wx_message_connect)
+    @BindView(R.id.wx_message_connect)
     RelativeLayout wx_message_connect;      //微信公众号推送   view_message_connect
-   @BindView(R.id.wx_bind)
+    @BindView(R.id.wx_bind)
     RelativeLayout wx_bind;
 
-   @BindView(R.id.view_message_connect)
+    @BindView(R.id.view_message_connect)
     View view_message_connect;
-   @BindView(R.id.view_message_line)
-   View viewMessageLine;
+    @BindView(R.id.view_message_line)
+    View viewMessageLine;
 
     private Boolean isBind = null;
     private IWXAPI iwxapi;
@@ -70,6 +72,8 @@ public class SetupActivity extends BaseActivity implements SetupListener.View {
         //创建WXAPI
         iwxapi = WXAPIFactory.createWXAPI(this, App.APP_ID,false);
 
+        startLoading();
+
         //检查微信是否绑定
         presenter.checkWXBind();
 
@@ -240,14 +244,16 @@ public class SetupActivity extends BaseActivity implements SetupListener.View {
     public void onCheckWXBindSuccess() {
         switch_wx_bind.setChecked(true);
         isBind = true;
+        stopLoading();
     }
 
     @Override
     public void onLoginWXSuccess(WXLoginModel.DataBean dataBean) {
-        Data.setName(dataBean.getUsername());     //设置登录所需信息
-        Data.setToken(dataBean.getToken());       //获取token值
-        Data.setLoginId(dataBean.getLoginId());   //登录id
-        Data.setPhoto(dataBean.getPhone());       //设置登录手机号
+        //设置登录所需信息
+        Hawk.put(BaseConstants.USER_NAME,dataBean.getUsername());   //获取用户名
+        Hawk.put(BaseConstants.TOKEN,dataBean.getToken());      //获取token值
+        Hawk.put(BaseConstants.LOGIN_ID,dataBean.getLoginId());   //登录id
+        Hawk.put(BaseConstants.PHONE,dataBean.getPhone());       //设置登录手机号
         switch_wx_bind.setChecked(true);
         isBind = true;
     }
@@ -262,6 +268,7 @@ public class SetupActivity extends BaseActivity implements SetupListener.View {
     public void onError() {
         switch_wx_bind.setChecked(false);
         isBind = false;
+        stopLoading();
     }
 
     @Override

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

@@ -1,4 +1,4 @@
-package com.silence.commonframe.activity.mine.activity;
+package com.silence.commonframe.activity.mine.activity.setup;
 
 import android.graphics.Color;
 import android.os.Build;

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

@@ -11,6 +11,7 @@ import android.content.res.Configuration;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.SystemClock;
 import android.support.annotation.ColorRes;
 import android.support.annotation.RequiresApi;
 import android.support.v4.content.ContextCompat;
@@ -82,6 +83,8 @@ public abstract class BaseActivity<T extends BasePresenter, E extends BaseModel>
     public boolean isTaobaoDialog=false;//是否弹窗淘口令
     NewLoadingDialog loadingDialog;
     Bundle savedInstanceState = new Bundle();
+    private int oldId;
+    private static long lastClickTime;
 
         @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -368,6 +371,26 @@ public abstract class BaseActivity<T extends BasePresenter, E extends BaseModel>
         return titleBar;
     }
 
+
+
+    public void avoidDoubleClick(View v){
+//        View clickView = v;
+        if (oldId == -1){
+            lastClickTime = SystemClock.elapsedRealtime();
+            oldId = v.getId();
+            return;
+        }else if (v.getId() == oldId){
+            long time = SystemClock.elapsedRealtime();
+            if (time - lastClickTime < 1000){
+                v.setId(0);
+                return;
+            }
+        }else if (v.getId() == 0){
+            lastClickTime = SystemClock.elapsedRealtime();
+            v.setId(oldId);
+        }
+    }
+
     public boolean hasLollipop() {
         return Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP_MR1;
     }

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

@@ -370,6 +370,24 @@ public abstract  class BaseFragment<T extends BasePresenter, E extends BaseModel
         return titleBar;
     }
 
+    public void avoidDoubleClick(View v){
+//        View clickView = v;
+        if (oldId == -1){
+            lastClickTime = SystemClock.elapsedRealtime();
+            oldId = v.getId();
+            return;
+        }else if (v.getId() == oldId){
+            long time = SystemClock.elapsedRealtime();
+            if (time - lastClickTime < 1000){
+                v.setId(0);
+                return;
+            }
+        }else if (v.getId() == 0){
+            lastClickTime = SystemClock.elapsedRealtime();
+            v.setId(oldId);
+        }
+    }
+
     public static int getStatusBarHeight(Context context) {
         int statusBarHeight = 0;
         Resources res = context.getResources();

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

@@ -37,5 +37,6 @@ public interface BaseConstants {
    int REFRESH=22;
    int LOADMORE=23;
    int CHECK_CODE = 31;
+   int RECHECK_CODE = 32;
 }
 

app/src/main/java/com/silence/commonframe/wxapi/WXEntryActivity.java

@@ -16,7 +16,7 @@ import com.silence.commonframe.App;
 import com.silence.commonframe.R;
 import com.silence.commonframe.activity.WXBindPhoneActivity;
 import com.silence.commonframe.activity.login.LoginActivity;
-import com.silence.commonframe.activity.mine.activity.SetupActivity;
+import com.silence.commonframe.activity.mine.activity.setup.SetupActivity;
 import com.silence.commonframe.uikit.NetworkUtil;
 import com.silence.commonframe.utils.Data;
 import com.tencent.mm.opensdk.constants.ConstantsAPI;

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

@@ -145,9 +145,7 @@ public class MoniTroubleActivity extends BaseActivity implements MoniTroubleList
             listData.addAll(dataBean.getDataList());
             mTroubleListAdapter.notifyDataSetChanged();
         }
-        if (dataBean.getRows() >= Integer.valueOf(BaseConstants.PAGE_SIZE)){
-            srlRefresh.setEnableLoadMore(true);
-        }
+        stopLoading();
     }
 
     @Override

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

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".activity.mine.activity.AboutActivity">
+    >
 
     <com.silence.commonframe.base.basemvp.TitleBar
         android:id="@+id/base_title_bar"

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

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".activity.mine.activity.FireMessageActivity">
+   >
 
     <com.silence.commonframe.base.basemvp.TitleBar
         android:id="@+id/base_title_bar"

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

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".activity.mine.activity.PrivacyPolicyActivity">
+    >
 
         <com.silence.commonframe.base.basemvp.TitleBar
             android:id="@+id/base_title_bar"

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

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".activity.mine.activity.UserAgreementActivity">
+    >
 
     <com.silence.commonframe.base.basemvp.TitleBar
         android:id="@+id/base_title_bar"

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

@@ -1,39 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
 
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="63dp"
-            android:background="@color/myblue"
-            >
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentBottom="true"
-                    android:layout_marginBottom="6dp"
-                    android:gravity="center"
-                    android:textSize="19sp"
-                    android:textColor="#fff"
-                    android:text="设备" />
-            <ImageView
-                android:id="@+id/iv_add"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:padding="10dp"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentBottom="true"
-                android:src="@mipmap/homeadd"
-                />
-        </RelativeLayout>
+    <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"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"