6.27.3

..

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

@@ -10,9 +10,11 @@ import java.util.List;
 public interface FireMessageListener {
     interface View{
         int getPage();
-        ArrayList<String> getListId();
+        List<SiteModel.DataBean.DataListBean> getListData();
 
         void onSuccess(List<SiteModel.DataBean.DataListBean> listData);
+        void onSuccess();
+        void onError();
         void onFile(String msg);
     }
     abstract class Presenter extends BasePresenter<View, BaseModel>{

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

@@ -1,49 +1,35 @@
 package com.silence.commonframe.activity.mine.activity.setup;
 
-import android.content.DialogInterface;
-import android.support.annotation.NonNull;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.view.View;
 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.Dialog.CDialog;
 import com.silence.commonframe.R;
 import com.silence.commonframe.activity.mine.Interface.FireMessageListener;
 import com.silence.commonframe.activity.mine.presenter.FireMessagePresenter;
-import com.silence.commonframe.adapter.SitedetailAdapter1;
+import com.silence.commonframe.adapter.FireMessageAdapter;
 import com.silence.commonframe.base.basemvp.BaseActivity;
 import com.silence.commonframe.model.SiteModel;
-import com.silence.commonframe.utils.Data;
 import com.silence.commonframe.utils.DividerItemDecoration;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 
-
 import butterknife.BindView;
 
 public class FireMessageActivity extends BaseActivity implements FireMessageListener.View {
 
-
     @BindView(R.id.my_recycler_view)
     RecyclerView myRecyclerView;
     @BindView(R.id.srl_refresh)
     SmartRefreshLayout srlRefresh;
 
-    private List<HashMap<String, String>> listmap = new ArrayList<HashMap<String, String>>();
+    List<SiteModel.DataBean.DataListBean> listDataBean = new ArrayList<>();
 
     public ArrayList<String> list = new ArrayList<String>(); //数据源
-    private ArrayList<String>  listId  = new ArrayList<String>(); //场所id
-    private SitedetailAdapter1 myAdapter1;
-
-    private ArrayList<String> listCheckphone = new ArrayList<>();
-    private ArrayList<String> listCheckmessage = new ArrayList<>();
+    private FireMessageAdapter myAdapter;
 
     private FireMessagePresenter presenter;
 
@@ -64,53 +50,34 @@ public class FireMessageActivity extends BaseActivity implements FireMessageList
         setTitle(this,getResources().getString(R.string.message_management),"",true);
         startLoading();
         presenter.getData();
-        myAdapter1 = new SitedetailAdapter1(FireMessageActivity.this, listmap);
+        myAdapter = new FireMessageAdapter(listDataBean);
         myRecyclerView.setLayoutManager(new LinearLayoutManager(FireMessageActivity.this));
-        myRecyclerView.setAdapter(myAdapter1);
+        myRecyclerView.setAdapter(myAdapter);
         //设置分割线
         myRecyclerView.addItemDecoration(new DividerItemDecoration(FireMessageActivity.this, DividerItemDecoration.VERTICAL_LIST));
 
-        myAdapter1.buttonSetOnclick(new SitedetailAdapter1.ButtonInterface() {
-            @Override
-            public void onclick(View view, int position) {
-                CDialog.Builder builder = new CDialog.Builder(FireMessageActivity.this);
-                builder.setCancelable(false);
-                builder.setTitle("提示");
-                builder.setMessage("你确定要提交推送管理吗？");
-
-                builder.setPositiveButton("确定", new DialogInterface.OnClickListener()
-                {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which)
-                    {
-                        presenter.updatePhonePush();
-                    }
-                });
-                builder.setNegativeButton("取消", new DialogInterface.OnClickListener()
-                {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which)
-                    {
-                        dialog.dismiss();
-                    }
-                });
-                builder.show();
-            }
+        myAdapter.setButtonClickListener((view, position) -> {
+            CDialog.Builder builder = new CDialog.Builder(FireMessageActivity.this);
+            builder.setCancelable(false);
+            builder.setTitle("提示");
+            builder.setMessage("你确定要提交推送管理吗？");
+
+            builder.setPositiveButton("确定", (dialog, which) -> {
+                    startLoading();
+                    presenter.updatePhonePush();
+            });
+            builder.setNegativeButton("取消", (dialog, which) -> dialog.dismiss());
+            builder.show();
         });
 
-        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();
         });
     }
 
@@ -120,46 +87,15 @@ public class FireMessageActivity extends BaseActivity implements FireMessageList
     }
 
     @Override
-    public ArrayList<String> getListId() {
-        return listId;
+    public List<SiteModel.DataBean.DataListBean> getListData() {
+        return myAdapter.getListData();
     }
 
     @Override
     public void onSuccess(List<SiteModel.DataBean.DataListBean> listData) {
-        if (page==1){
-            listmap.clear();
-            listId.clear();
-            list.clear();
-            listCheckmessage.clear();
-            listCheckphone.clear();
-        }
-        for (int i = 0;i<listData.size();i++){
-            HashMap<String,String>  hashMap = new HashMap<>();
-            String RegionName = listData.get(i).getRegionName();
-            String Location = listData.get(i).getLocation();
-            String id = listData.get(i).getId();
-            String deployment  = listData.get(i).getDeployment();
-            String isTel  = listData.get(i).getIsTel();
-            String isMsg  = listData.get(i).getIsMsg();
-
-            hashMap.put("RegionName",RegionName);
-            hashMap.put("Location",Location);
-            hashMap.put("id",id);
-            hashMap.put("deployment",deployment);
-            hashMap.put("isTel",isTel);
-            hashMap.put("isMsg",isMsg);
-
-            listId.add(id);
-            list.add(deployment);
-            listmap.add(hashMap);
-
-            listCheckphone.add("");
-            listCheckmessage.add("");
-        }
-        myAdapter1.notifyDataSetChanged();
-        Data.setListmap(listmap);
-        Data.setList_cb_photo(listCheckphone);
-        Data.setList_cb_message(listCheckmessage);
+        if (page==1) listDataBean.clear();
+        listDataBean.addAll(listData);
+        myAdapter.notifyDataSetChanged();
         if (srlRefresh != null){
             srlRefresh.finishRefresh();
             srlRefresh.finishLoadMore();
@@ -168,6 +104,16 @@ public class FireMessageActivity extends BaseActivity implements FireMessageList
     }
 
     @Override
+    public void onSuccess() {
+        stopLoading();
+    }
+
+    @Override
+    public void onError() {
+        stopLoading();
+    }
+
+    @Override
     public void onFile(String msg) {
         Toast.makeText(this,""+msg,Toast.LENGTH_SHORT).show();
     }

app/src/main/java/com/silence/commonframe/activity/mine/presenter/FireMessagePresenter.java

@@ -43,6 +43,7 @@ public class FireMessagePresenter extends FireMessageListener.Presenter{
                         }else {
                             LoginIn.tokenOut(data.getCode(),mContext);
                             mView.onFile(data.getMsg());
+                            mView.onError();
                         }
                     }
 
@@ -50,18 +51,19 @@ public class FireMessagePresenter extends FireMessageListener.Presenter{
                     public void onError(Call call, Response response, Exception e) {
                         super.onError(call, response, e);
                         mView.onFile("信息获取失败");
+                        mView.onError();
                     }
                 });
     }
 
     @Override
     public void updatePhonePush() {
-        for (int i = 0; i < mView.getListId().size(); i++) {
+        for (int i = 0; i < mView.getListData().size(); i++) {
             OkGo.get(ApiService.httpUrl1 +Data.getConfigUrl() + UrlConstants.UPDATE_PHONE_PUSH)
                     .tag(this)
-                    .params("siteId",mView.getListId().get(i))
-                    .params("isTel",Data.getList_cb_photo().get(i))
-                    .params("isMsg",Data.getList_cb_message().get(i))
+                    .params("siteId",mView.getListData().get(i).getId())
+                    .params("isTel",mView.getListData().get(i).getIsTel())
+                    .params("isMsg",mView.getListData().get(i).getIsMsg())
                     .cacheKey("cacheGetKey")
                     .cacheMode(CacheMode.DEFAULT)
                     .headers("token", Data.getToken())
@@ -72,6 +74,7 @@ public class FireMessagePresenter extends FireMessageListener.Presenter{
                             if (data.code != 0){
                                 LoginIn.tokenOut(data.getCode(),mContext);
                                 mView.onFile(data.getMsg());
+                                mView.onError();
                             }
                         }
 
@@ -79,10 +82,12 @@ public class FireMessagePresenter extends FireMessageListener.Presenter{
                         public void onError(Call call, Response response, Exception e) {
                             super.onError(call, response, e);
                             mView.onFile("信息获取失败");
+                            mView.onError();
                         }
                     });
 
         }
+        mView.onSuccess();
         mView.onFile("设置成功！");
     }
 }

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

@@ -1,6 +1,11 @@
 package com.silence.commonframe.adapter;
 
 import android.support.annotation.Nullable;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
@@ -19,7 +24,90 @@ public class FireMessageAdapter extends BaseQuickAdapter<SiteModel.DataBean.Data
     }
 
     @Override
-    protected void convert(BaseViewHolder helper, SiteModel.DataBean.DataListBean item) {
+    protected void convert(BaseViewHolder helper, SiteModel.DataBean.DataListBean data) {
+        TextView tvDeployment = helper.itemView.findViewById(R.id.re_item);
+        LinearLayout llPhoto = helper.itemView.findViewById(R.id.cb_photo_L);
+        LinearLayout llMessage = helper.itemView.findViewById(R.id.cb_message_L);
+        CheckBox cbPhoto = helper.itemView.findViewById(R.id.cb_photo);
+        CheckBox cbMessage = helper.itemView.findViewById(R.id.cb_message);
+        TextView tvSubmit = helper.itemView.findViewById(R.id.submit);
 
+        tvDeployment.setText(data.getDeployment());
+
+        if ("1".equals(data.getIsTel())){
+            cbPhoto.setChecked(true);
+        }else {
+            cbPhoto.setChecked(false);
+        }
+
+        if ("1".equals(data.getIsMsg())){
+            cbMessage.setChecked(true);
+        }else {
+            cbMessage.setChecked(false);
+        }
+
+        tvSubmit.setOnClickListener(v -> {
+            if (mListener != null){
+                mListener.buttonClick(v,helper.getAdapterPosition());
+            }
+        });
+
+        llPhoto.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (cbPhoto.isChecked()){
+                    cbPhoto.setChecked(false);
+                }else {
+                    cbPhoto.setChecked(true);
+                }
+            }
+        });
+
+        cbPhoto.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                if (isChecked){
+                    listData.get(helper.getAdapterPosition()).setIsTel("1");
+                }else {
+                    listData.get(helper.getAdapterPosition()).setIsTel("0");
+                }
+            }
+        });
+
+        llMessage.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (cbMessage.isChecked()){
+                    cbMessage.setChecked(false);
+                }else {
+                    cbMessage.setChecked(true);
+                }
+            }
+        });
+
+        cbMessage.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                if (isChecked){
+                    listData.get(helper.getAdapterPosition()).setIsMsg("1");
+                }else {
+                    listData.get(helper.getAdapterPosition()).setIsMsg("0");
+                }
+            }
+        });
+    }
+
+    public List<SiteModel.DataBean.DataListBean> getListData() {
+        return listData;
+    }
+
+    public interface buttonClickListener{
+        void buttonClick(View view, int position);
+    }
+
+    buttonClickListener mListener;
+
+    public void setButtonClickListener(buttonClickListener mListener){
+        this.mListener = mListener;
     }
 }

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

@@ -1,301 +0,0 @@
-package com.silence.commonframe.adapter;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-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.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.silence.commonframe.R;
-import com.silence.commonframe.utils.Data;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * Created by 曹博 on 2016/9/27.
- */
-
-public class SitedetailAdapter1 extends RecyclerView.Adapter<SitedetailAdapter1.MyViewHolder> {
-
-    private List<String> mDatas1;
-
-
-    private LayoutInflater mInflater;
-
-    private List<Integer> mHeights;
-    private List<HashMap<String, String>> listmap;
-    private ButtonInterface buttonInterface;
-
-
-    private ArrayList<String> mDatas_msg = new ArrayList<>();
-    private ArrayList<String> mDatas_photo = new ArrayList<>();
-
-
-
-//    public SitedetailAdapter1(Context context, List<String> datas)
-//    {
-//        mInflater = LayoutInflater.from(context);
-//        mDatas1 = datas;
-//
-//
-//    }
-
-    public SitedetailAdapter1(Context context, List<HashMap<String, String>> datas)
-    {
-        mInflater = LayoutInflater.from(context);
-        listmap = datas;
-
-    }
-
-    @NonNull
-    @Override
-    public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType)
-    {
-//        MyViewHolder holder = new MyViewHolder(mInflater.inflate(
-//                R.layout.recyclerview_item_devicedetail, parent, false));
-
-        MyViewHolder holder = new MyViewHolder(mInflater.inflate(
-                R.layout.recyclerview_itemtest1, parent, false));
-        return holder;
-    }
-
-
-
-    @Override
-    public void onBindViewHolder(@NonNull final MyViewHolder holder, @SuppressLint("RecyclerView") final int position)
-    {
-        String deployment = listmap.get(position).get("deployment");
-
-        holder.tv.setText(deployment);
-
-        String isTel = listmap.get(position).get("isTel");
-        String isMsg = listmap.get(position).get("isMsg");
-
-
-        if ("1".equals(isMsg)){
-            holder.cb_message.setChecked(true);
-            //      Data.setCb_message("1");
-//            mDatas_msg.add("1");
-//            Data.setList_cb_message(mDatas_msg);
-            if ("".equals(Data.getList_cb_message().get(position))){
-                Data.getList_cb_message().set(position,"1");
-            }
-        }else {
-            holder.cb_message.setChecked(false);
-            //     Data.setCb_message("0");
-//            mDatas_msg.add("0");
-//            Data.setList_cb_message(mDatas_msg);
-            if (Data.getList_cb_message().get(position).equals("")){
-                Data.getList_cb_message().set(position,"0");
-            }
-        }
-
-        if ("1".equals(isTel)){
-            holder.cb_photo.setChecked(true);
-            //   Data.setCb_photo("1");
-//            mDatas_photo.add("1");
-//            Data.setList_cb_photo(mDatas_photo);
-            if (Data.getList_cb_photo().get(position).equals("")){
-                Data.getList_cb_photo().set(position,"1");
-            }
-        }else {
-            holder.cb_photo.setChecked(false);
-            //     Data.setCb_photo("0");
-//            mDatas_photo.add("0");
-//            Data.setList_cb_photo(mDatas_photo);
-            if (Data.getList_cb_photo().get(position).equals("")){
-                Data.getList_cb_photo().set(position,"0");
-            }
-        }
-
-
-
-
-        // 如果设置了回调，则设置点击事件
-        if (mOnItemClickLitener != null) {
-            holder.itemView.setOnClickListener(new View.OnClickListener()
-            {
-                @Override
-                public void onClick(View v)
-                {
-                    int pos = holder.getLayoutPosition();
-                    mOnItemClickLitener.onItemClick(holder.itemView, pos);
-                }
-            });
-
-            holder.itemView.setOnLongClickListener(new View.OnLongClickListener()
-            {
-                @Override
-                public boolean onLongClick(View v)
-                {
-                    int pos = holder.getLayoutPosition();
-                    mOnItemClickLitener.onItemLongClick(holder.itemView, pos);
-                    //removeData(pos);
-                    return false;
-                }
-            });
-        }
-
-        holder.submit.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                    if (buttonInterface != null){
-                        buttonInterface.onclick(v,position);
-                    }
-            }
-        });
-
-
-        holder.cb_photo_L.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-//                holder.cb_photo.setChecked(!holder.cb_photo.isChecked());
-                if (holder.cb_photo.isChecked()){
-                    holder.cb_photo.setChecked(false);
-                    Data.getList_cb_photo().set(position,"0");
-                }else {
-                    holder.cb_photo.setChecked(true);
-                    Data.getList_cb_photo().set(position,"1");
-                }
-
-            }
-        });
-
-
-        holder.cb_photo.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
-                if (b) {
-//                    Data.setCb_photo("1");
-                    Data.getList_cb_photo().set(position,"1");
-                } else {
-//                    Data.setCb_photo("0");
-                    Data.getList_cb_photo().set(position,"0");
-                }
-            }
-        });
-
-        holder.cb_message_L.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-//                holder.cb_message.setChecked(!holder.cb_message.isChecked());
-
-            if (holder.cb_message.isChecked()){
-                holder.cb_message.setChecked(false);
-
-                Data.getList_cb_message().set(position,"0");
-            }else {
-                holder.cb_message.setChecked(true);
-
-                Data.getList_cb_message().set(position,"1");
-            }
-
-
-
-            }
-
-
-
-        });
-
-        holder.cb_message.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
-
-                if (b) {
-//                    Data.setCb_message("1");
-                    Data.getList_cb_message().set(position,"1");
-                } else {
-//                    Data.setCb_message("0");
-                    Data.getList_cb_message().set(position,"0");
-                }
-            }
-        });
-
-
-
-
-    }
-
-
-    public  void buttonSetOnclick(ButtonInterface buttonInterface){
-        this.buttonInterface = buttonInterface;
-    }
-
-
-    public interface ButtonInterface{
-
-        public void onclick(View view, int position);
-
-    }
-
-
-
-
-//    //添加和删除方法
-//    public void addData(int position)
-//    {
-//        listmap.add(position, "Insert One");
-//        notifyItemInserted(position);
-//    }
-
-    public void removeData(int position)
-    {
-        listmap.remove(position);
-        notifyItemRemoved(position);
-    }
-
-    @Override
-    public int getItemCount()
-    {
-        return listmap.size();
-    }
-
-    class MyViewHolder extends RecyclerView.ViewHolder
-    {
-
-        TextView tv;
-        TextView submit;
-        LinearLayout cb_photo_L,cb_message_L;
-
-        CheckBox  cb_photo;
-        CheckBox  cb_message;
-        public MyViewHolder(View view)
-        {
-            super(view);
-            tv = (TextView) view.findViewById(R.id.re_item);
-            submit = (TextView) view.findViewById(R.id.submit);
-            cb_photo = (CheckBox) view.findViewById(R.id.cb_photo);
-            cb_message = (CheckBox) view.findViewById(R.id.cb_message);
-
-
-            cb_photo_L = (LinearLayout) view.findViewById(R.id.cb_photo_L);
-            cb_message_L = (LinearLayout) view.findViewById(R.id.cb_message_L);
-        }
-    }
-
-
-
-
-    //点击事件
-    public interface OnItemClickLitener
-    {
-        void onItemClick(View view, int position);
-        void onItemLongClick(View view, int position);
-    }
-
-    private OnItemClickLitener mOnItemClickLitener;
-
-    public void setOnItemClickLitener(OnItemClickLitener mOnItemClickLitener)
-    {
-        this.mOnItemClickLitener = mOnItemClickLitener;
-    }
-}