7.1.2

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

@@ -245,15 +245,18 @@ public class AdddevicedetailActivity extends BaseActivity implements AddDeviceDe
 
     @Override
     public void onGetSiteSuccess(SiteModel.DataBean data) {
+        listData.clear();
         if (page == 1){
-            listData.clear();
             listSite.clear();
         }
-        listData.addAll(data.getDataList());
-        for (int i = 0; i < listData.size(); i++){
-            listSite.add(listData.get(i).getDeployment());
+        if (data.getDataList().size() != 0){
+            listData.addAll(data.getDataList());
+            listSite.remove("添加场所");
+            for (int i = 0; i < listData.size(); i++){
+                listSite.add(listData.get(i).getDeployment());
+            }
+            listSite.add("添加场所");
         }
-        listSite.add("添加场所");
         mSpinerPopWindow.notifyChange(listSite);
     }
 

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

@@ -13,7 +13,6 @@ import android.view.SurfaceView;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -46,21 +45,16 @@ public final class CommonScanActivity extends BaseActivity implements ScanListen
     ScanManager scanManager;
     TextView iv_light;
     TextView qrcode_g_gallery;
-    TextView qrcode_ic_back;
     final int PHOTOREQUESTCODE = 1111;
 
-    @BindView(R.id.service_register_rescan)
-    Button rescan;
     @BindView(R.id.scan_image)
     ImageView scan_image;
-    private int scanMode;//扫描模型（条形，二维码，全部）
-
     @BindView(R.id.scan_hint)
     TextView scan_hint;
     @BindView(R.id.tv_scan_result)
     TextView tv_scan_result;
 
-    private final int PERMISSION_REQUEST = 0xa01;
+    private int scanMode;//扫描模型（条形，二维码，全部）
 
     private String deviceType;      //判断扫描什么设备
     private String t_result;
@@ -85,8 +79,6 @@ public final class CommonScanActivity extends BaseActivity implements ScanListen
 
         setTitle(this,getResources().getString(R.string.scan_or_barcode),"",true);
 
-        rescan = (Button) findViewById(R.id.service_register_rescan);
-
         scanMode=getIntent().getIntExtra(Constant.REQUEST_SCAN_MODE,Constant.REQUEST_SCAN_MODE_ALL_MODE);
         init();
     }
@@ -102,7 +94,6 @@ public final class CommonScanActivity extends BaseActivity implements ScanListen
      //   qrcode_ic_back.setOnClickListener(this);
         iv_light = (TextView) findViewById(R.id.iv_light);
         iv_light.setOnClickListener(this);
-        rescan.setOnClickListener(this);
         //构造出扫描管理器
         scanManager = new ScanManager(this, scanPreview, scanContainer, scanCropView, scanLine, scanMode,this);
 
@@ -114,7 +105,6 @@ public final class CommonScanActivity extends BaseActivity implements ScanListen
     public void onResume() {
         super.onResume();
         scanManager.onResume();
-        rescan.setVisibility(View.INVISIBLE);
         scan_image.setVisibility(View.GONE);
     }
 
@@ -132,7 +122,6 @@ public final class CommonScanActivity extends BaseActivity implements ScanListen
 //		Toast.makeText(that, "result="+rawResult.getText(), Toast.LENGTH_LONG).show();
         if (!scanManager.isScanning()) { //如果当前不是在扫描状态
             //设置再次扫描按钮出现
-            rescan.setVisibility(View.VISIBLE);
             scan_image.setVisibility(View.VISIBLE);
             Bitmap barcode = null;
             byte[] compressedBitmap = bundle.getByteArray(DecodeThread.BARCODE_BITMAP);
@@ -142,7 +131,6 @@ public final class CommonScanActivity extends BaseActivity implements ScanListen
             }
             scan_image.setImageBitmap(barcode);
         }
-        rescan.setVisibility(View.VISIBLE);
         scan_image.setVisibility(View.VISIBLE);
         tv_scan_result.setVisibility(View.VISIBLE);
         t_result = rawResult.getText();
@@ -154,14 +142,6 @@ public final class CommonScanActivity extends BaseActivity implements ScanListen
 
     }
 
-    void startScan() {
-        if (rescan.getVisibility() == View.VISIBLE) {
-            rescan.setVisibility(View.INVISIBLE);
-            scan_image.setVisibility(View.GONE);
-            scanManager.reScan();
-        }
-    }
-
     @Override
     public void scanError(Exception e) {
         Toast.makeText(this, e.getMessage(), Toast.LENGTH_LONG).show();
@@ -171,12 +151,6 @@ public final class CommonScanActivity extends BaseActivity implements ScanListen
         }
     }
 
-    public void showPictures(int requestCode) {
-        Intent intent = new Intent(Intent.ACTION_PICK);
-        intent.setType("image/*");
-        startActivityForResult(intent, requestCode);
-    }
-
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);

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

@@ -2,14 +2,12 @@ package com.silence.commonframe.activity.home.activity;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 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;
@@ -23,10 +21,8 @@ import android.view.SurfaceView;
 import android.view.View;
 import android.view.Window;
 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;
 
@@ -57,8 +53,6 @@ public final class CommonScanDCActivity extends BaseActivity implements ScanList
     TextView qrcode_g_gallery;
     final int PHOTOREQUESTCODE = 1111;
 
-   @BindView(R.id.service_register_rescan)
-    Button rescan;
    @BindView(R.id.scan_image)
     ImageView scan_image;
     private int scanMode;//扫描模型（条形，二维码，全部）
@@ -122,7 +116,6 @@ public final class CommonScanDCActivity extends BaseActivity implements ScanList
         qrcode_g_gallery.setOnClickListener(this);
         iv_light = (TextView) findViewById(R.id.iv_light);
         iv_light.setOnClickListener(this);
-        rescan.setOnClickListener(this);
         //构造出扫描管理器
         scanManager = new ScanManager(this, scanPreview, scanContainer, scanCropView, scanLine, scanMode,this);
     }
@@ -131,7 +124,6 @@ public final class CommonScanDCActivity extends BaseActivity implements ScanList
     public void onResume() {
         super.onResume();
         scanManager.onResume();
-        rescan.setVisibility(View.INVISIBLE);
         scan_image.setVisibility(View.GONE);
     }
 
@@ -150,7 +142,6 @@ public final class CommonScanDCActivity extends BaseActivity implements ScanList
 
         if (!scanManager.isScanning()) { //如果当前不是在扫描状态
             //设置再次扫描按钮出现
-            rescan.setVisibility(View.VISIBLE);
             scan_image.setVisibility(View.VISIBLE);
             Bitmap barcode = null;
             byte[] compressedBitmap = bundle.getByteArray(DecodeThread.BARCODE_BITMAP);
@@ -160,7 +151,6 @@ public final class CommonScanDCActivity extends BaseActivity implements ScanList
             }
             scan_image.setImageBitmap(barcode);
         }
-        rescan.setVisibility(View.VISIBLE);
         scan_image.setVisibility(View.VISIBLE);
         tv_scan_result.setVisibility(View.VISIBLE);
         String t = rawResult.getText();
@@ -180,14 +170,6 @@ public final class CommonScanDCActivity extends BaseActivity implements ScanList
         finish();
     }
 
-    void startScan() {
-        if (rescan.getVisibility() == View.VISIBLE) {
-            rescan.setVisibility(View.INVISIBLE);
-            scan_image.setVisibility(View.GONE);
-            scanManager.reScan();
-        }
-    }
-
     @Override
     public void scanError(Exception e) {
         Toast.makeText(this, e.getMessage(), Toast.LENGTH_LONG).show();
@@ -197,12 +179,6 @@ public final class CommonScanDCActivity extends BaseActivity implements ScanList
         }
     }
 
-    public void showPictures(int requestCode) {
-        Intent intent = new Intent(Intent.ACTION_PICK);
-        intent.setType("image/*");
-        startActivityForResult(intent, requestCode);
-    }
-
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);

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

@@ -156,7 +156,7 @@ public class NewAddSiteActivity extends BaseActivity implements AddSiteListener.
     @Override
     public void onSuccess(String data) {
         Toast.makeText(NewAddSiteActivity.this,"场所添加成功",Toast.LENGTH_SHORT).show();
-
+        Hawk.put(BaseConstants.NEED_SITE_CHANGE,true);
         BaseDialog.DialogCallBack dialogCallBack = new BaseDialog.DialogCallBack() {
             @Override
             public void leftBtn() {

app/src/main/java/com/silence/commonframe/view/MaxHeightListView.java

@@ -1,4 +1,4 @@
-package com.silence.commonframe.view;
+package com.silence.commonframe.activity.home.view;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -9,7 +9,7 @@ import com.silence.commonframe.R;
 
 /**
  * 可设置最大高度的ListView
- * @author mm
+ * @author zjm
  */
 public class MaxHeightListView extends ListView {
     private float mMaxHeight = 100;

app/src/main/java/com/silence/commonframe/activity/login/LoginActivity.java

@@ -169,7 +169,7 @@ public class LoginActivity extends BaseActivity implements LoginListener.View {
         Hawk.put(BaseConstants.USER_NAME,beans.getUsername()+"");
         Hawk.put(BaseConstants.TOKEN,beans.getToken()+"");
         Hawk.put(BaseConstants.PHONE,beans.getPhone()+"");
-        if (beans.getHeadimgurl()!=null&&!"".equals(beans.getHeadimgurl()))
+        if (beans.getHeadimgurl()!=null/*&&!"".equals(beans.getHeadimgurl())*/)
             Hawk.put(BaseConstants.PICTIURE,beans.getHeadimgurl()+"");
         Hawk.put(BaseConstants.LOGIN_ID,beans.getLoginId()+"");
         //记住密码

app/src/main/java/com/silence/commonframe/activity/login/LoginCompanyActivity.java

@@ -104,7 +104,7 @@ public class LoginCompanyActivity extends BaseActivity implements LoginListener.
         Hawk.put(BaseConstants.USER_NAME,beans.getUsername()+"");
         Hawk.put(BaseConstants.TOKEN,beans.getToken()+"");
         Hawk.put(BaseConstants.PHONE,beans.getPhone()+"");
-        if (beans.getHeadimgurl()!=null&&!"".equals(beans.getHeadimgurl()))
+        if (beans.getHeadimgurl()!=null/*&&!"".equals(beans.getHeadimgurl())*/)
             Hawk.put(BaseConstants.PICTIURE,beans.getHeadimgurl()+"");
         Hawk.put(BaseConstants.LOGIN_ID,beans.getLoginId()+"");
         Data.setVisitionChange("1");//版本的切换

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

@@ -135,7 +135,7 @@ public class SearchMessageActivity extends BaseActivity {
         }else {
             monthOfYear3 = ""+month0;
         }
-        if (day<10){
+        if (day0<10){
             dayOfMonth3 = "0"+day0;
         }else {
             dayOfMonth3 = ""+day0;

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

@@ -4,7 +4,6 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
-import android.net.Uri;
 import android.view.View;
 import android.widget.TextView;
 
@@ -16,8 +15,7 @@ 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;
 
@@ -84,16 +82,6 @@ public class MineFragment extends BaseFragment {
         }
     }
 
-    private void getPicture(){
-        mActivity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                Uri uri = Uri.fromFile(new File(Data.getUrlPicture()));
-                image_head.setImageURI(uri);
-            }
-        });
-    }
-
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);

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

@@ -7,6 +7,7 @@ import android.support.v7.widget.StaggeredGridLayoutManager;
 import android.view.View;
 import android.widget.Toast;
 
+import com.orhanobut.hawk.Hawk;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.silence.commonframe.Dialog.BaseDialog;
 import com.silence.commonframe.R;
@@ -15,7 +16,7 @@ import com.silence.commonframe.activity.mine.presenter.SiteDetailPresenter;
 import com.silence.commonframe.adapter.SiteDetailsAdapter;
 import com.silence.commonframe.base.basemvp.BaseActivity;
 import com.silence.commonframe.base.basemvp.TitleBar;
-import com.silence.commonframe.bean.IsDeviceChange;
+import com.silence.commonframe.common.constant.BaseConstants;
 import com.silence.commonframe.model.SiteModel;
 import com.silence.commonframe.utils.LinearItemDecoration;
 
@@ -75,7 +76,7 @@ public class NewSiteDetailActivity extends BaseActivity implements SiteDetailLis
     @Override
     public void onDelSuccess() {
         presenter.getSite();
-        IsDeviceChange.setChangeSize(true);
+        Hawk.put(BaseConstants.NEED_SITE_CHANGE,true);
         Toast.makeText(this,"删除成功",Toast.LENGTH_SHORT).show();
         stopLoading();
     }

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

@@ -1,224 +0,0 @@
-package com.silence.commonframe.adapter;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.graphics.Color;
-import android.os.Bundle;
-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.TextView;
-
-import com.silence.commonframe.R;
-import com.silence.commonframe.activity.DevicedetailActivity;
-import com.silence.commonframe.activity.NewDeviceDetailActivity;
-import com.silence.commonframe.example.ActivityGuideDeviceCamera;
-import com.silence.commonframe.utils.Data;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * 关联设备构造器
- * @author 郑嘉明
- */
-public class DeviceContextAdapter extends RecyclerView.Adapter<DeviceContextAdapter.MyViewHolder> {
-
-    private Context context;
-    private LayoutInflater mInflater;
-    private List<HashMap<String,String>> listmap1;
-    private Boolean isShow = false;     //默认看不到checkbox
-
-    private List<String> checkBoxIDList;
-
-
-    public DeviceContextAdapter(Context context, List<HashMap<String,String>> listmap){
-        this.context = context;
-        this.listmap1 = listmap;
-        checkBoxIDList = new ArrayList<>();
-        mInflater = LayoutInflater.from(context);
-    }
-
-    @NonNull
-    @Override
-    public MyViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
-        View view = mInflater.inflate(R.layout.item_device_context_manager, viewGroup, false);      //实例化自己的界面
-        return (new MyViewHolder(view));
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull final MyViewHolder myViewHolder, int position) {
-        final int pos = position;
-        myViewHolder.device_context_name.setText(listmap1.get(position).get("deviceName"));
-        myViewHolder.device_context_location.setText(listmap1.get(position).get("location"));
-
-        String deviceType = listmap1.get(position).get("deviceType");
-        Resources res = context.getResources();
-        if (res.getString(R.string.device_smokedetector_number).equals(deviceType)){    //判断是烟感还是摄像头
-            if ("0".equals(listmap1.get(position).get("status"))){      //判断状态
-                myViewHolder.device_context_state.setText(R.string.state_fault);
-                myViewHolder.device_context_state.setTextColor(Color.rgb(255,144,0));
-            }else if ("1".equals(listmap1.get(position).get("status"))){
-                myViewHolder.device_context_state.setText(R.string.state_fire);
-                myViewHolder.device_context_state.setTextColor(Color.rgb(243,46,46));
-            }else {
-                myViewHolder.device_context_state.setText(R.string.state_normal);
-                myViewHolder.device_context_state.setTextColor(Color.rgb(78,105,255));
-            }
-        }else if (res.getString(R.string.device_camera_number).equals(deviceType)){
-            if ("0".equals(listmap1.get(position).get("status"))){
-                myViewHolder.device_context_state.setText(R.string.state_outline);
-                myViewHolder.device_context_state.setTextColor(Color.rgb(204,204,204));
-            }else {
-                myViewHolder.device_context_state.setText(R.string.state_online);
-                myViewHolder.device_context_state.setTextColor(Color.rgb(78,105,255));
-            }
-        }
-
-
-
-        if (!isShow){
-            myViewHolder.device_context_checkbox.setVisibility(View.GONE);
-            checkBoxIDList.clear();
-            if (res.getString(R.string.device_smokedetector_number).equals(deviceType)){
-                myViewHolder.itemView.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        Intent intent = new Intent(context,NewDeviceDetailActivity.class);
-                        intent.putExtra("deviceName",listmap1.get(pos).get("deviceName"));
-                        intent.putExtra("Location",listmap1.get(pos).get("location"));
-                        intent.putExtra("devicelocation",listmap1.get(pos).get("deviceLocation"));
-                        intent.putExtra("deviceId",listmap1.get(pos).get("deviceId"));
-                        context.startActivity(intent);
-                    }
-                });
-            }else if (res.getString(R.string.device_camera_number).equals(deviceType)) {
-                //摄像头跳转
-                myViewHolder.itemView.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        Intent intent = new Intent(context,NewDeviceDetailActivity.class);
-                        intent.putExtra("deviceName",listmap1.get(pos).get("deviceName"));
-                        intent.putExtra("Location",listmap1.get(pos).get("location"));
-                        intent.putExtra("devicelocation",listmap1.get(pos).get("deviceLocation"));
-                        intent.putExtra("deviceId",listmap1.get(pos).get("deviceId"));
-                        Data.setDevIdsCamera(listmap1.get(pos).get("deviceId"));
-                        Intent intent1 = new Intent();
-                        intent1.setClass(context,ActivityGuideDeviceCamera.class);
-
-                        Bundle bundle = new Bundle();
-
-                        int devId = 0;
-                        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
-                            devId = (Objects.requireNonNull(listmap1.get(pos).get("deviceId"))).hashCode();
-                        }
-                        bundle.putInt("FUN_DEVICE_ID", devId);
-                        // intent1.putExtra("deviceId",listCameraId.get(0));
-                        intent1.putExtras(bundle);
-                        intent1.putExtra("deviceId",listmap1.get(pos).get("deviceId"));
-                        Data.setCameraName(listmap1.get(pos).get("deviceName"));
-                        context.startActivity(intent1);
-//                        Toast.makeText(context,"摄像头",Toast.LENGTH_SHORT).show();
-                    }
-                });
-            }
-
-        }else {
-            myViewHolder.device_context_checkbox.setVisibility(View.VISIBLE);
-            myViewHolder.itemView.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (myViewHolder.device_context_checkbox.isChecked()){
-                        myViewHolder.device_context_checkbox.setChecked(false);
-                        checkBoxIDList.remove(listmap1.get(pos).get("id"));
-                    }else {
-                        myViewHolder.device_context_checkbox.setChecked(true);
-                        checkBoxIDList.add(listmap1.get(pos).get("id"));
-                    }
-                }
-            });
-            myViewHolder.device_context_checkbox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-                @Override
-                public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                    if (isChecked){
-                      //  checkBoxIDList.add(listmap1.get(pos).get("id"));
-
-                        if(!listmap1.get(pos).get("id").equals(listmap1.get(pos).get("id"))){
-                            checkBoxIDList.add(listmap1.get(pos).get("id"));
-                        }
-
-                        Data.setCheckBoxIDListData(checkBoxIDList);
-
-
-                    }else {
-                        checkBoxIDList.remove(listmap1.get(pos).get("id"));
-                    }
-                }
-            });
-        }
-
-    }
-
-    public List<String> getCheckBoxIDList(){
-        return checkBoxIDList;
-    }
-
-    public void setCheckBoxIDList(List<String> checkBoxIDList) {
-        this.checkBoxIDList = checkBoxIDList;
-    }
-
-    public void setIsShow(Boolean isShow){
-        this.isShow = isShow;
-        notifyDataSetChanged();
-    }
-
-    public Boolean getShow() {
-        return isShow;
-    }
-
-    public void removeAdapterItem(){
-        if (checkBoxIDList.size() > 0){
-            for (int i = 0; i<listmap1.size(); i++){
-                String id = listmap1.get(i).get("id");
-                for (int j = 0; j < checkBoxIDList.size(); j++){
-                    if (checkBoxIDList.get(j).equals(id)){
-                        listmap1.remove(i);
-                        notifyItemRemoved(i);
-                    }
-                }
-            }
-
-        }
-    }
-
-    @Override
-    public int getItemCount() {
-        return listmap1.size();
-    }
-
-    class MyViewHolder extends RecyclerView.ViewHolder {
-
-        View itemView;
-        CheckBox device_context_checkbox;
-        TextView device_context_name;
-        TextView device_context_location;
-        TextView device_context_state;
-
-        public MyViewHolder(@NonNull View itemView) {
-            super(itemView);
-            this.itemView = itemView;
-            device_context_checkbox = (CheckBox) itemView.findViewById(R.id.device_context_checkbox);
-            device_context_name = (TextView) itemView.findViewById(R.id.device_context_name);
-            device_context_location = (TextView) itemView.findViewById(R.id.device_context_location);
-            device_context_state = (TextView) itemView.findViewById(R.id.device_context_state);
-
-        }
-    }
-}

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

@@ -1,221 +0,0 @@
-package com.silence.commonframe.adapter;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.graphics.Color;
-import android.os.Bundle;
-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.TextView;
-
-import com.silence.commonframe.R;
-import com.silence.commonframe.activity.DevicedetailActivity;
-import com.silence.commonframe.activity.NewDeviceDetailActivity;
-import com.silence.commonframe.example.ActivityGuideDeviceCamera;
-import com.silence.commonframe.utils.Data;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * 关联设备构造器
- * @author 郑嘉明
- */
-public class DeviceContextAdapterCamera extends RecyclerView.Adapter<DeviceContextAdapterCamera.MyViewHolder> {
-
-    private Context context;
-    private LayoutInflater mInflater;
-    private List<HashMap<String,String>> listmap1;
-    private Boolean isShow;     //默认看不到checkbox
-
-    private List<String> checkBoxIDList;  //烟感关联的设备
-
-
-    public DeviceContextAdapterCamera(Context context, List<HashMap<String,String>> listmap){
-        this.context = context;
-        this.listmap1 = listmap;
-        checkBoxIDList = new ArrayList<>();
-        mInflater = LayoutInflater.from(context);
-    }
-
-    @NonNull
-    @Override
-    public MyViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
-        View view = mInflater.inflate(R.layout.item_device_context_manager, viewGroup, false);      //实例化自己的界面
-        return (new MyViewHolder(view));
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull final MyViewHolder myViewHolder, int position) {
-        final int pos = position;
-        myViewHolder.device_context_name.setText(listmap1.get(position).get("deviceName"));
-        myViewHolder.device_context_location.setText(listmap1.get(position).get("location"));
-
-        String deviceType = listmap1.get(position).get("deviceType");
-        Resources res = context.getResources();
-        if (res.getString(R.string.device_smokedetector_number).equals(deviceType)){    //判断是烟感还是摄像头
-            if ("0".equals(listmap1.get(position).get("status"))){      //判断状态
-                myViewHolder.device_context_state.setText(R.string.state_fault);
-                myViewHolder.device_context_state.setTextColor(Color.rgb(255,144,0));
-            }else if ("1".equals(listmap1.get(position).get("status"))){
-                myViewHolder.device_context_state.setText(R.string.state_fire);
-                myViewHolder.device_context_state.setTextColor(Color.rgb(243,46,46));
-            }else {
-                myViewHolder.device_context_state.setText(R.string.state_normal);
-                myViewHolder.device_context_state.setTextColor(Color.rgb(78,105,255));
-            }
-        }else if (res.getString(R.string.device_camera_number).equals(deviceType)){
-            if ("0".equals(listmap1.get(position).get("status"))){
-                myViewHolder.device_context_state.setText(R.string.state_outline);
-                myViewHolder.device_context_state.setTextColor(Color.rgb(204,204,204));
-            }else {
-                myViewHolder.device_context_state.setText(R.string.state_online);
-                myViewHolder.device_context_state.setTextColor(Color.rgb(78,105,255));
-            }
-        }
-
-        if (!isShow){
-            myViewHolder.device_context_checkbox.setVisibility(View.GONE);
-            checkBoxIDList.clear();
-            if (res.getString(R.string.device_smokedetector_number).equals(deviceType)){
-                myViewHolder.itemView.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        Intent intent = new Intent(context,NewDeviceDetailActivity.class);
-                        intent.putExtra("deviceName",listmap1.get(pos).get("deviceName"));
-                        intent.putExtra("Location",listmap1.get(pos).get("location"));
-                        intent.putExtra("devicelocation",listmap1.get(pos).get("deviceLocation"));
-                        intent.putExtra("deviceId",listmap1.get(pos).get("deviceId"));
-                        context.startActivity(intent);
-                    }
-                });
-            }else if (res.getString(R.string.device_camera_number).equals(deviceType)) {
-                //摄像头跳转
-                myViewHolder.itemView.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        Intent intent = new Intent(context,NewDeviceDetailActivity.class);
-                        intent.putExtra("deviceName",listmap1.get(pos).get("deviceName"));
-                        intent.putExtra("Location",listmap1.get(pos).get("location"));
-                        intent.putExtra("devicelocation",listmap1.get(pos).get("deviceLocation"));
-                        intent.putExtra("deviceId",listmap1.get(pos).get("deviceId"));
-                        Data.setDevIdsCamera(listmap1.get(pos).get("deviceId"));
-                        Intent intent1 = new Intent();
-                        intent1.setClass(context,ActivityGuideDeviceCamera.class);
-
-                        Bundle bundle = new Bundle();
-
-                        int devId = 0;
-                        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
-                            devId = (Objects.requireNonNull(listmap1.get(pos).get("deviceId"))).hashCode();
-                        }
-                        bundle.putInt("FUN_DEVICE_ID", devId);
-                        // intent1.putExtra("deviceId",listCameraId.get(0));
-                        intent1.putExtras(bundle);
-                        intent1.putExtra("deviceId",listmap1.get(pos).get("deviceId"));
-                        Data.setCameraName(listmap1.get(pos).get("deviceName"));
-                        context.startActivity(intent1);
-//                        Toast.makeText(context,"摄像头",Toast.LENGTH_SHORT).show();
-                    }
-                });
-            }
-
-        }else {
-            myViewHolder.device_context_checkbox.setVisibility(View.VISIBLE);
-            myViewHolder.itemView.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (myViewHolder.device_context_checkbox.isChecked()){
-                        myViewHolder.device_context_checkbox.setChecked(false);
-                        checkBoxIDList.remove(listmap1.get(pos).get("id"));
-                    }else {
-                        myViewHolder.device_context_checkbox.setChecked(true);
-                        checkBoxIDList.add(listmap1.get(pos).get("id"));
-                    }
-                }
-            });
-            myViewHolder.device_context_checkbox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-                @Override
-                public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                    if (isChecked){
-                        if(!listmap1.get(pos).get("id").equals(listmap1.get(pos).get("id"))){
-                            checkBoxIDList.add(listmap1.get(pos).get("id"));
-                        }
-
-
-                        Data.setCheckBoxIDListDataCamera(checkBoxIDList);
-
-
-                    }else {
-                        checkBoxIDList.remove(listmap1.get(pos).get("id"));
-                    }
-                }
-            });
-        }
-
-    }
-
-    public List<String> getCheckBoxIDList(){
-        return checkBoxIDList;
-    }
-
-    public void setCheckBoxIDList(List<String> checkBoxIDList) {
-        this.checkBoxIDList = checkBoxIDList;
-    }
-
-    public void setIsShow(Boolean isShow){
-        this.isShow = isShow;
-        notifyDataSetChanged();
-    }
-
-    public Boolean getShow() {
-        return isShow;
-    }
-
-    public void removeAdapterItem(){
-        if (checkBoxIDList.size() > 0){
-            for (int i = 0; i<listmap1.size(); i++){
-                String id = listmap1.get(i).get("id");
-                for (int j = 0; j < checkBoxIDList.size(); j++){
-                    if (checkBoxIDList.get(j).equals(id)){
-                        listmap1.remove(i);
-                        notifyItemRemoved(i);
-                    }
-                }
-            }
-
-        }
-    }
-
-    @Override
-    public int getItemCount() {
-        return listmap1.size();
-    }
-
-    class MyViewHolder extends RecyclerView.ViewHolder {
-
-        View itemView;
-        CheckBox device_context_checkbox;
-        TextView device_context_name;
-        TextView device_context_location;
-        TextView device_context_state;
-
-        public MyViewHolder(@NonNull View itemView) {
-            super(itemView);
-            this.itemView = itemView;
-            device_context_checkbox = (CheckBox) itemView.findViewById(R.id.device_context_checkbox);
-            device_context_name = (TextView) itemView.findViewById(R.id.device_context_name);
-            device_context_location = (TextView) itemView.findViewById(R.id.device_context_location);
-            device_context_state = (TextView) itemView.findViewById(R.id.device_context_state);
-
-        }
-    }
-}

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

@@ -118,7 +118,6 @@ public class DeviceDetailContextAdapter extends RecyclerView.Adapter<DeviceDetai
                     // intent1.putExtra("deviceId",listCameraId.get(0));
                     intent1.putExtras(bundle);
                     intent1.putExtra("deviceId",listmap1.get(pos).get("deviceId"));
-                    Data.setCameraName(listmap1.get(pos).get("deviceName"));
                     context.startActivity(intent1);
 //                        Toast.makeText(context,"摄像头",Toast.LENGTH_SHORT).show();
                 }

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

@@ -1,26 +1,17 @@
 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;
-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 BaseQuickAdapter<TroubleDeviceModel.DataBean, BaseViewHolder> {

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

@@ -1,211 +0,0 @@
-package com.silence.commonframe.adapter;
-
-
-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.ImageView;
-import android.widget.TextView;
-
-import com.silence.commonframe.R;
-import com.silence.commonframe.bean.JsonBean;
-
-import java.util.HashMap;
-import java.util.List;
-
-public class FindAdapter1 extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-
-
-    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<JsonBean> mList) {
-//        this.context = context;
-//        this.mList = mList;
-//        mInflater = LayoutInflater.from(context);
-//    }
-
-    public FindAdapter1(Context context, List<HashMap<String, String>> listmap) {
-//        mContext = context;
-//        mInflater = LayoutInflater.from(context);
-//        listmap1 = 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;
-
-
-        // return new FindAdapter.MyViewHolder(mInflater.inflate(R.layout.item_recylerview, parent, false));
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int i) {
-
-
-        //  viewHolder = (FindAdapter.MyViewHolder) holder;
-        //    viewHolder1.iv.setText(mList.get(position));
-
-//        viewHolder.content.setText("编号："+listmap1.get(position).get("id"));
-        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);
-        }
-
-//        if (!listmap1.get(i).get("recheckId").equals("11")){
-//
-//            viewHolder1.imageView.setImageResource(R.mipmap.unaudited3);
-//        }
-//        if (listmap1.get(i).get("troubleType").equals("1")){
-//            viewHolder1.fire.setText("火警");
-//            viewHolder1.fire.setTextColor(Color.rgb(250,85,58));//imageViewfire
-//            viewHolder1.imageViewfire.setImageResource(R.mipmap.redlinght);
-//            //     finalImageView.setImageResource(R.drawable.guzhang);
-//        }
-//        if (listmap1.get(i).get("troubleType").equals("0")){
-//            viewHolder1.fire.setText("故障");
-//            viewHolder1.fire.setTextColor(Color.rgb(255,153,51));//imageViewfire
-//            viewHolder1.imageViewfire.setImageResource(R.mipmap.redlinght0);
-//        }
-//        if (listmap1.get(i).get("troubleType").equals("2")){
-//            viewHolder1.fire.setText("其它");
-//            // viewHolder1.fire.setTextColor(Color.rgb(250,85,58));//imageViewfire
-//            viewHolder1.imageViewfire.setImageResource(R.mipmap.light);
-//        }
-
-
-
-    }
-
-//    @Override
-//    public void onBindViewHolder(final MyViewHolder holder, final int position) {
-////        holder.tv.setText(mList.get(position).getText());
-////        holder.iv.setOnClickListener(new View.OnClickListener() {
-////            @Override
-////            public void onClick(View v) {
-////                Toast.makeText(context, position + "" + "abc", Toast.LENGTH_SHORT).show();
-////            }
-////        });
-//    }
-
-
-    class MyViewHolder extends RecyclerView.ViewHolder {
-        // ImageView iv;
-
-
-
-
-        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);
-    }
-
-    /**
-     * 设置Item点击监听
-     *
-     * @param listener
-     */
-    public void setOnItemClickListener(MyItemClickListener listener) {
-        this.listener = listener;
-    }
-
-
-}

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

@@ -43,6 +43,8 @@ public interface BaseConstants {
    String PAGE_SIZE="15";
    int WIND_SPEED_HIGN = 100; //空气卫士最高风速
 
+   String NEED_SITE_CHANGE = "need_change";
+
    int TYPE_CAMERA=12;
    int TYPE_SMOKE=13;
    int TYPE_AIR_GUARD=14;

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

@@ -27,7 +27,6 @@ import com.silence.commonframe.base.basemvp.BaseFragment;
 import com.silence.commonframe.bean.CameraDetailBean;
 import com.silence.commonframe.bean.DeviceListBean;
 import com.silence.commonframe.bean.DeviceTitleBean;
-import com.silence.commonframe.bean.IsDeviceChange;
 import com.silence.commonframe.bean.PalceListBean;
 import com.silence.commonframe.common.constant.BaseConstants;
 import com.silence.commonframe.example.ActivityGuideDeviceCamera;
@@ -134,9 +133,11 @@ public class NewDeviceFragment extends BaseFragment implements NewDeviceListener
     @Override
     public void onResume() {
         super.onResume();
-        if (IsDeviceChange.getChangeSize()){
+        Boolean sizeChange = Hawk.get(BaseConstants.NEED_SITE_CHANGE);
+        if (Hawk.get(BaseConstants.NEED_SITE_CHANGE) != null && sizeChange){
+            page = 1;
             presenter.getPlace();
-            IsDeviceChange.setChangeSize(false);
+            Hawk.put(BaseConstants.NEED_SITE_CHANGE,false);
         }
     }
 

app/src/main/java/com/silence/commonframe/utils/Data.java

@@ -2,33 +2,23 @@ package com.silence.commonframe.utils;
 
 import android.os.Environment;
 
-import com.silence.commonframe.model.IsChoose;
-
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 
 public class Data {
-    private static  String name = "";
-    private  static String token;
-    private static  List<HashMap<String, String>> listmap;
-    private static ArrayList<String> listId; //场所的ID
-    private static  String photo;//注册电话
+    private static String name = "";
+    private static String token;
+    private static String photo;//注册电话
     private static String loginId; //注册id推送使用
-    private static String cb_photo = "0";//场所通知电话  cb_message
-    private static String cb_message  = "0";  //场所短信提示
-    public static ArrayList<String> list_cb_message; //场所短信提示
-    public  static  int  devId;
-    public static  String   configUrl;  //切换IP，个人版和企业版的切换
-    public  static  String devIdsCamera;//摄像头的id
-    private static   List<String> checkBoxIDListData;//烟感关联的设备
-    private static   List<String>  checkBoxIDListDataCamera; //摄像头关联的设备
-    private static  String  visitionChange = "0"; //版本切换
-    private  static  String  setBind = "0";//绑定或登录的设置
+    private static int devId;
+    private static String configUrl;  //切换IP，个人版和企业版的切换
+    private static String devIdsCamera;//摄像头的id
+    private static String visitionChange = "0"; //版本切换
+    private static String setBind = "0";//绑定或登录的设置
 
     public static String getUrlPicture() {
         return urlPicture;
@@ -47,9 +37,6 @@ public class Data {
     public static void setSetBind(String setBind) {
         Data.setBind = setBind;
     }
-    public static List<String> getCheckBoxIDListDataCamera() {
-        return checkBoxIDListDataCamera;
-    }
 
     public static String getConfigUrl() {
         return configUrl;
@@ -67,18 +54,6 @@ public class Data {
         Data.configUrl = configUrl;
     }
 
-    public static void setCheckBoxIDListDataCamera(List<String> checkBoxIDListDataCamera) {
-        Data.checkBoxIDListDataCamera = checkBoxIDListDataCamera;
-    }
-
-    public static List<String> getCheckBoxIDListData() {
-        return checkBoxIDListData;
-    }
-
-    public static void setCheckBoxIDListData(List<String> checkBoxIDListData) {
-        Data.checkBoxIDListData = checkBoxIDListData;
-    }
-
     public static int getDevId() {
         return devId;
     }
@@ -95,44 +70,6 @@ public class Data {
         Data.devId = devId;
     }
 
-    public static ArrayList<String> getList_cb_photo() {
-        return list_cb_photo;
-    }
-
-    public static void setList_cb_photo(ArrayList<String> list_cb_photo) {
-        Data.list_cb_photo = list_cb_photo;
-    }
-
-    public static ArrayList<String> list_cb_photo; //场所通知电话
-
-    public static ArrayList<String> getList_cb_message() {
-        return list_cb_message;
-    }
-
-    public static void setList_cb_message(ArrayList<String> list_cb_message) {
-        Data.list_cb_message = list_cb_message;
-    }
-    public static ArrayList<String> getListmapRegionName() {
-        return listmapRegionName;
-    }
-
-    public static void setListmapRegionName(ArrayList<String> listmapRegionName) {
-        Data.listmapRegionName = listmapRegionName;
-    }
-
-    private static  ArrayList<String> listmapRegionName;//全部的场所获取的区域名称
-
-
-    public static int getTestId() {
-        return testId;
-    }
-
-    public static void setTestId(int testId) {
-        Data.testId = testId;
-    }
-
-    private static  int testId ;//全局Id 在设备中做判断
-
     public static String getLoginId() {
         return loginId;
     }
@@ -141,50 +78,6 @@ public class Data {
         Data.loginId = loginId;
     }
 
-    public static String getCb_message() {
-        return cb_message;
-    }
-
-    public static void setCb_message(String cb_message) {
-        Data.cb_message = cb_message;
-    }
-
-    public static String getCb_photo() {
-        return cb_photo;
-    }
-
-    public static void setCb_photo(String cb_photo) {
-        Data.cb_photo = cb_photo;
-    }
-
-    public static String getLinkmanname() {
-        return linkmanname;
-    }
-
-    public static void setLinkmanname(String linkmanname) {
-        Data.linkmanname = linkmanname;
-    }
-
-    private static  String linkmanname;//联系人从首页面传递的值
-
-    public static ArrayList<String> getListId() {
-        return listId;
-    }
-
-    public static void setListId(ArrayList<String> listId) {
-        Data.listId = listId;
-    }
-
-    public static ArrayList<IsChoose> getArrayList() {
-        return arrayList;
-    }
-
-    public static void setArrayList(ArrayList<IsChoose> arrayList) {
-        Data.arrayList = arrayList;
-    }
-
-    private static    ArrayList<IsChoose> arrayList;   //场所删除选择
-
     public static ArrayList<String> getListSiteid() {
         return listSiteid;
     }
@@ -195,7 +88,6 @@ public class Data {
 
     private static  ArrayList<String>  listSiteid;    //删除场所的id
 
-
     public static List<String> getList() {
         return list;
     }
@@ -206,56 +98,6 @@ public class Data {
 
     private static   List<String> list;//注册的场所的位置  listlistlocation
 
-    public static List<String> getListlocation() {
-        return listlocation;
-    }
-
-    public static void setListlocation(List<String> listlocation) {
-        Data.listlocation = listlocation;
-    }
-
-    private static List<String>  listlocation;  //区域地址
-
-    public static List<String> getListregionalism() {
-        return listregionalism;
-    }
-
-    public static void setListregionalism(List<String> listregionalism) {
-        Data.listregionalism = listregionalism;
-    }
-
-    private static List<String>  listregionalism;
-
-    public static List<String> getListid() {
-        return listid;
-    }
-
-    public static void setListid(List<String> listid) {
-        Data.listid = listid;
-    }
-
-    private static  List<String>  listid;//注册场所设备的id
-
-    public static List<String> getListIdKnowid() {
-        return listIdKnowid;
-    }
-
-    public static void setListIdKnowid(List<String> listIdKnowid) {
-        Data.listIdKnowid = listIdKnowid;
-    }
-
-    private static List<String> listIdKnowid;  //我知道的
-
-    private static  String userid;//注册的useid
-
-    public static String getUserid() {
-        return userid;
-    }
-
-    public static void setUserid(String userid) {
-        Data.userid = userid;
-    }
-
     public static String getPhoto() {
         return photo;
     }
@@ -264,14 +106,6 @@ public class Data {
         Data.photo = photo;
     }
 
-    public static List<HashMap<String, String>> getListmap() {
-        return listmap;
-    }
-
-    public static void setListmap(List<HashMap<String, String>> listmap) {
-        Data.listmap = listmap;
-    }
-
     public static String getToken() {
         return token;
     }
@@ -288,26 +122,6 @@ public class Data {
         Data.name = name;
     }
 
-    private static String cameraId;
-
-    private static String cameraName;
-
-    public static String getCameraId() {
-        return cameraId;
-    }
-
-    public static void setCameraId(String cameraId) {
-        Data.cameraId = cameraId;
-    }
-
-    public static String getCameraName() {
-        return cameraName;
-    }
-
-    public static void setCameraName(String cameraName) {
-        Data.cameraName = cameraName;
-    }
-
     /**
      * 保存免登字段
      * @param str

app/src/main/java/com/silence/commonframe/utils/SpinerPopWindow.java

@@ -9,13 +9,12 @@ import android.view.ViewGroup.LayoutParams;
 import android.widget.AbsListView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.BaseAdapter;
-import android.widget.ListView;
 import android.widget.PopupWindow;
 import android.widget.TextView;
 
 
 import com.silence.commonframe.R;
-import com.silence.commonframe.view.MaxHeightListView;
+import com.silence.commonframe.activity.home.view.MaxHeightListView;
 
 import java.util.List;
 

app/src/main/res/drawable-hdpi/shape_popupwindow_list_bg.xml

@@ -1,13 +1,11 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <!-- This is the main color -->
     <item>
         <shape>
             <!-- 边框颜色 -->
             <solid android:color="@color/login_button_background"/>
         </shape>
     </item>
-    <!-- 给View的上 左  右设置8dp的边框 -->
+    <!-- 给View设置边框 -->
     <item
         android:top="1dp"
         android:left="1dp"
@@ -18,5 +16,4 @@
             <solid android:color="@color/white"/>
         </shape>
     </item>
-
 </layer-list>

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

@@ -4,11 +4,11 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@android:color/white" >
+
     <SurfaceView
         android:id="@+id/capture_preview"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        />
+        android:layout_height="match_parent" />
     <!-- 扫描框上面的布局 -->
     <RelativeLayout
         android:id="@+id/top_mask"
@@ -32,8 +32,7 @@
             android:textSize="14sp"
             android:layout_centerInParent="true"
             android:textColor="@android:color/white"
-            android:visibility="gone"
-            />
+            android:visibility="gone" />
 
     </RelativeLayout>
     <!-- 扫描框底部的布局 -->
@@ -44,8 +43,8 @@
         android:layout_alignParentBottom="true"
         android:background="#80000000"
         android:orientation="vertical"
-        android:paddingBottom="16dp"
-        >
+        android:paddingBottom="16dp">
+
         <TextView
             android:id="@+id/scan_hint"
             android:layout_width="wrap_content"
@@ -55,8 +54,7 @@
             android:textColor="#b4b4b4"
             android:textSize="14sp"
             android:paddingTop="20dp"
-            android:paddingBottom="20dp"
-            />
+            android:paddingBottom="20dp" />
 
         <TextView
             android:id="@+id/iv_light"
@@ -79,30 +77,14 @@
             android:clickable="true"
             android:textSize="20sp" />
 
-        <Button
-            android:id="@+id/service_register_rescan"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:background="@drawable/rescan_shape_button"
-            android:padding="10dp"
-            android:text="再次扫描"
-            android:textColor="@android:color/white"
-            android:textSize="18sp"
-            android:layout_centerHorizontal="true"
-            android:layout_below="@id/qrcode_g_gallery"
-            android:visibility="visible"
-            android:layout_marginTop="20dp"></Button>
-
-
     </RelativeLayout>
     <!-- 扫描框中间的布局 -->
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/top_mask"
-        android:layout_above="@id/bottom_mask"
-        >
+        android:layout_above="@id/bottom_mask">
+
         <ImageView
             android:id="@+id/left_mask"
             android:layout_width="34dp"
@@ -110,12 +92,14 @@
             android:layout_alignParentLeft="true"
             android:background="#80000000"
             android:contentDescription="@string/app_name" />
+
         <ImageView
             android:id="@+id/right_mask"
             android:layout_width="34dp"
             android:layout_height="match_parent"
             android:layout_alignParentRight="true"
             android:background="#80000000" />
+
         <RelativeLayout
             android:id="@+id/capture_crop_view"
             android:layout_width="match_parent"
@@ -124,6 +108,7 @@
             android:layout_toRightOf="@id/left_mask"
             android:layout_centerHorizontal="true"
             android:background="@android:color/transparent" >
+
             <ImageView
                 android:id="@+id/capture_scan_line"
                 android:layout_width="match_parent"
@@ -131,11 +116,14 @@
                 android:layout_alignParentTop="true"
                 android:layout_margin="5dp"
                 android:background="@drawable/scanning_line" />
+
             <com.silence.commonframe.zxing.defineview.MyImageView
                 android:id="@+id/scan_image"
                 android:layout_width="190dp"
-                android:layout_height="190dp"
-                />
+                android:layout_height="190dp" />
+
         </RelativeLayout>
+
     </RelativeLayout>
+
 </RelativeLayout>

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

@@ -6,14 +6,13 @@
     android:layout_alignParentRight="true"
     android:orientation="vertical">
 
-    <com.silence.commonframe.view.MaxHeightListView
+    <com.silence.commonframe.activity.home.view.MaxHeightListView
         android:id="@+id/listview"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         app:maxHeight="200dp"
         android:cacheColorHint="#00000000"
         android:background="@drawable/shape_popupwindow_list_bg"
-        android:scrollbars="none" >
-    </com.silence.commonframe.view.MaxHeightListView>
+        android:scrollbars="none" />
 
 </LinearLayout>