7.3.2

整理

app/src/main/AndroidManifest.xml

@@ -79,7 +79,8 @@
             android:exported="true"
             android:launchMode="singleTask"
             android:taskAffinity="com.silence.commonframe"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar" /> <!-- 登录 -->
+            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+        <!-- 登录 -->
         <activity
             android:name=".activity.login.LoginActivity"
             android:launchMode="singleTask"
@@ -103,7 +104,7 @@
             android:screenOrientation="portrait" />
         <!-- 图片浏览 -->
         <activity android:name=".utils.image.ImageBrowseActivity" />
-        <!-- 添加场景 -->
+        <!-- 添加场所 -->
         <activity android:name=".activity.home.activity.NewAddSiteActivity" />
         <!-- 定位需要的服务 使用2.0的定位需要加上这个 -->
         <service android:name="com.amap.api.location.APSService" />
@@ -179,7 +180,7 @@
             android:screenOrientation="portrait" />
         <!-- 火警报警弹窗 -->
         <activity
-            android:name=".activity.FireAlarmActivity"
+            android:name=".Dialog.FireAlarmActivity"
             android:theme="@style/Theme.Transparent" />
         <!-- 运行记录 -->
         <activity

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

@@ -1,4 +1,4 @@
-package com.silence.commonframe.activity;
+package com.silence.commonframe.Dialog;
 
 import android.content.Intent;
 import android.media.MediaPlayer;
@@ -10,6 +10,9 @@ import com.silence.commonframe.base.basemvp.BaseActivity;
 
 import butterknife.BindView;
 
+/**
+ * 报警弹窗
+ */
 public class FireAlarmActivity extends BaseActivity {
     private MediaPlayer mMediaPlayer;
 
@@ -24,42 +27,6 @@ public class FireAlarmActivity extends BaseActivity {
     @BindView(R.id.button9)
     TextView backButton;
 
-//    @Override
-//    protected void onCreate(Bundle savedInstanceState) {
-//        super.onCreate(savedInstanceState);
-//        supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
-//        setContentView(R.layout.activity_fire_alarm);
-//
-//        this.setFinishOnTouchOutside(false);
-//        Intent intent = getIntent();
-//        String data = intent.getStringExtra("deviceName1");
-//        String data1 = intent.getStringExtra("siteName1");
-//        String  time  = intent.getStringExtra("time");
-//        String  siteLocation  = intent.getStringExtra("siteLocation");
-//
-//        TextView dataTextView = (TextView) findViewById(R.id.textView17);
-//        TextView dataTextView1 = (TextView) findViewById(R.id.textView19);
-//        TextView time1 = (TextView) findViewById(R.id.time);
-//        TextView place = (TextView) findViewById(R.id.place);
-//        dataTextView.setText("设备名称："+data);
-//        dataTextView1.setText("场所名称："+data1);
-//        time1.setText("发生时间："+time);
-//        place.setText("详细地址："+siteLocation);
-//
-//        mMediaPlayer  = MediaPlayer.create(this, R.raw.bj); //
-//        mMediaPlayer.setLooping(true); // 设置循环播放
-//        mMediaPlayer.start(); //开始播放
-//
-//        TextView backButton = (TextView) findViewById(R.id.button9);
-//        backButton.setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View v) {
-//                mMediaPlayer.stop();
-//                finish();
-//            }
-//        });
-//    }
-
     @Override
     public int getLayoutId() {
         return R.layout.activity_fire_alarm;

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

@@ -1,7 +1,6 @@
 package com.silence.commonframe.activity;
 
 import android.annotation.SuppressLint;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Handler;
 import android.os.Message;
@@ -15,21 +14,21 @@ import android.widget.Button;
 
 import com.orhanobut.hawk.Hawk;
 import com.silence.commonframe.Dialog.BaseDialog;
-import com.silence.commonframe.Dialog.CDialog;
+import com.silence.commonframe.Dialog.FireAlarmActivity;
 import com.silence.commonframe.R;
+import com.silence.commonframe.activity.device.activity.NewDeviceFragment;
+import com.silence.commonframe.activity.home.activity.FirstFragment;
 import com.silence.commonframe.activity.message.activity.FindFragment1;
 import com.silence.commonframe.activity.mine.activity.MineFragment;
 import com.silence.commonframe.base.basemvp.BaseActivity;
 import com.silence.commonframe.bean.JushBean;
 import com.silence.commonframe.common.constant.BaseConstants;
-import com.silence.commonframe.activity.home.activity.FirstFragment;
-import com.silence.commonframe.activity.device.activity.NewDeviceFragment;
 import com.silence.commonframe.lib.funsdk.support.FunSupport;
 import com.silence.commonframe.lib.funsdk.support.OnFunLoginListener;
 import com.silence.commonframe.lib.funsdk.support.models.FunDevice;
 import com.silence.commonframe.lib.funsdk.support.models.FunLoginType;
 import com.silence.commonframe.tuisong.Logger;
-import com.silence.commonframe.utils1.GoSystemSetting;
+import com.silence.commonframe.utils.GoSystemSetting;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -154,22 +153,17 @@ public class MainActivity extends BaseActivity implements OnFunLoginListener {
             if ((System.currentTimeMillis() - lastTime) > 2000) {
                 lastTime = System.currentTimeMillis();
             } else {
-                CDialog.Builder builder = new CDialog.Builder(this);
-                builder.setTitle("提示");
-                builder.setMessage("你确定要退出系统吗？");
-                builder.setPositiveButton("确定", new DialogInterface.OnClickListener() {
+                BaseDialog.DialogCallBack dialogCallBack=new BaseDialog.DialogCallBack() {
                     @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        System.exit(0);
+                    public void leftBtn() {
                     }
-                });
-                builder.setNegativeButton("取消", new DialogInterface.OnClickListener() {
+
                     @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        dialog.dismiss();
+                    public void rightBtn() {
+                        System.exit(0);
                     }
-                });
-                builder.show();
+                };
+                new BaseDialog().BaseDialog(this,"提示","你确定要退出系统吗？","取消","确定",dialogCallBack);
             }
             return true;
         }

app/src/main/java/com/silence/commonframe/activity/device/activity/NewDeviceDetailActivity.java

@@ -29,7 +29,7 @@ import com.silence.commonframe.bean.IsDeviceChange;
 import com.silence.commonframe.common.constant.BaseConstants;
 import com.silence.commonframe.activity.device.activity.camera.ActivityGuideDeviceCamera;
 import com.silence.commonframe.lib.funsdk.support.models.FunDevice;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.Data;
 import com.silence.tech.ui.MainCompanyActivity;
 
 import java.util.ArrayList;

app/src/main/java/com/silence/commonframe/activity/device/activity/NewDeviceFragment.java

@@ -18,7 +18,11 @@ import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.silence.commonframe.Dialog.BaseDialog;
 import com.silence.commonframe.R;
 import com.silence.commonframe.activity.MainActivity;
+import com.silence.commonframe.activity.device.Interface.NewDeviceListener;
 import com.silence.commonframe.activity.device.activity.airguard.AirGuardActivity;
+import com.silence.commonframe.activity.device.activity.camera.ActivityGuideDeviceCamera;
+import com.silence.commonframe.activity.device.presenter.NewDevicePresenter;
+import com.silence.commonframe.activity.home.activity.AdddeviceActivity;
 import com.silence.commonframe.adapter.device.DeviceListAdapter;
 import com.silence.commonframe.adapter.device.DeviceTitleAdapter;
 import com.silence.commonframe.adapter.device.PlaceListAdapter;
@@ -28,13 +32,10 @@ import com.silence.commonframe.bean.DeviceListBean;
 import com.silence.commonframe.bean.DeviceTitleBean;
 import com.silence.commonframe.bean.PalceListBean;
 import com.silence.commonframe.common.constant.BaseConstants;
-import com.silence.commonframe.activity.device.activity.camera.ActivityGuideDeviceCamera;
-import com.silence.commonframe.activity.device.Interface.NewDeviceListener;
-import com.silence.commonframe.activity.device.presenter.NewDevicePresenter;
 import com.silence.commonframe.lib.funsdk.support.models.FunDevice;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.Data;
 import com.silence.commonframe.utils.TitlePopupMenu;
-import com.silence.commonframe.utils1.AddDeviceUtils;
+import com.silence.commonframe.utils.AddDeviceUtils;
 import com.silence.tech.ui.MainCompanyActivity;
 
 import java.util.ArrayList;
@@ -240,16 +241,9 @@ public class NewDeviceFragment extends BaseFragment implements NewDeviceListener
             }
         });
 
-        btnAddDevice.setVisibility(View.GONE);
         btnAddDevice.setOnClickListener(v -> {
             avoidDoubleClick(v);
-            if (listDeviceTypeTitle.get(0).getIsClick()){  //设备标题为烟感
-//                startActivity(new Intent().putExtra("deviceType",getResources().getString(R.string.device_smokedetector)).setClass(getContext(),CommonScanActivity.class));
-            }else if (listDeviceTypeTitle.get(1).getIsClick()){ //设备标题为摄像头
-//                startActivity(new Intent().putExtra("deviceType",getResources().getString(R.string.device_camera)).setClass(getContext(),CommonScanActivity.class));
-            }else if (listDeviceTypeTitle.get(2).getIsClick()){ //设备标题为空气卫士
-
-            }
+            startActivity(new Intent(getActivity(), AdddeviceActivity.class));
         });
     }
 

app/src/main/java/com/silence/commonframe/activity/device/activity/airguard/AirGuardActivity.java

@@ -23,7 +23,6 @@ import butterknife.OnClick;
 /**
  * 空气卫士界面
  * @author 郑嘉明
- * id: airguard_pic_top(顶部图片)、airguard_timeclock（实时时钟）、airguard_worktime（工作时间段）、airguard_buzzer（蜂鸣器）、buzzer_switch（蜂鸣器开关）、airguard_power（电源开关）、img_power（电源开关标志）
  */
 public class AirGuardActivity extends BaseActivity implements AirGuardListener.View {
 

app/src/main/java/com/silence/commonframe/activity/device/activity/airguard/AirGuardWordTimeActivity.java

@@ -16,7 +16,7 @@ import com.silence.commonframe.activity.device.activity.airguard.Interface.AirGu
 import com.silence.commonframe.activity.device.activity.airguard.presenter.AirGuardWordTimePresenter;
 import com.silence.commonframe.adapter.device.AirGuardWorKTimeAdapter;
 import com.silence.commonframe.base.basemvp.BaseActivity;
-import com.silence.commonframe.model.AirGuardRunTimeListModel;
+import com.silence.commonframe.bean.AirGuardRunTimeListModel;
 import com.silence.commonframe.utils.LinearItemDecoration;
 
 import java.util.ArrayList;

app/src/main/java/com/silence/commonframe/activity/device/activity/airguard/Interface/AirGuardWordTimeListener.java

@@ -2,7 +2,7 @@ package com.silence.commonframe.activity.device.activity.airguard.Interface;
 
 import com.silence.commonframe.base.basemvp.BaseModel;
 import com.silence.commonframe.base.basemvp.BasePresenter;
-import com.silence.commonframe.model.AirGuardRunTimeListModel;
+import com.silence.commonframe.bean.AirGuardRunTimeListModel;
 
 import java.util.List;
 

app/src/main/java/com/silence/commonframe/activity/device/activity/airguard/presenter/AirGuardDetailPresenter.java

@@ -11,7 +11,7 @@ import com.silence.commonframe.ApiService;
 import com.silence.commonframe.activity.device.activity.airguard.Interface.AirGuardDetailListener;
 import com.silence.commonframe.bean.BaseBean;
 import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.Data;
 import com.silence.commonframe.utils.LoginIn;
 
 import okhttp3.Call;

app/src/main/java/com/silence/commonframe/activity/device/activity/airguard/presenter/AirGuardNewTimePresenter.java

@@ -11,7 +11,7 @@ import com.silence.commonframe.ApiService;
 import com.silence.commonframe.activity.device.activity.airguard.Interface.AirGuardNewTimeListener;
 import com.silence.commonframe.bean.BaseBean;
 import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.Data;
 import com.silence.commonframe.utils.LoginIn;
 
 import okhttp3.Call;

app/src/main/java/com/silence/commonframe/activity/device/activity/airguard/presenter/AirGuardPresenter.java

@@ -13,7 +13,7 @@ import com.silence.commonframe.activity.device.activity.airguard.Interface.AirGu
 import com.silence.commonframe.bean.AirGuardDetailBean;
 import com.silence.commonframe.bean.BaseBean;
 import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.Data;
 import com.silence.commonframe.utils.LoginIn;
 
 import okhttp3.Call;

app/src/main/java/com/silence/commonframe/activity/device/activity/airguard/presenter/AirGuardTimeClockPresenter.java

@@ -11,7 +11,7 @@ import com.silence.commonframe.ApiService;
 import com.silence.commonframe.activity.device.activity.airguard.Interface.AirGuardTimeClockListener;
 import com.silence.commonframe.bean.BaseBean;
 import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.Data;
 import com.silence.commonframe.utils.LoginIn;
 
 import okhttp3.Call;

app/src/main/java/com/silence/commonframe/activity/device/activity/airguard/presenter/AirGuardWordTimePresenter.java

@@ -12,8 +12,8 @@ import com.silence.commonframe.ApiService;
 import com.silence.commonframe.activity.device.activity.airguard.Interface.AirGuardWordTimeListener;
 import com.silence.commonframe.bean.BaseBean;
 import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.model.AirGuardRunTimeListModel;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.AirGuardRunTimeListModel;
+import com.silence.commonframe.bean.Data;
 import com.silence.commonframe.utils.LoginIn;
 
 import okhttp3.Call;

app/src/main/java/com/silence/commonframe/activity/device/activity/camera/ActivityGuideDeviceCamera.java

@@ -65,7 +65,7 @@ import com.silence.commonframe.lib.funsdk.support.utils.TalkManager;
 import com.silence.commonframe.lib.funsdk.support.widget.FunVideoView;
 import com.silence.commonframe.lib.sdk.struct.H264_DVR_FILE_DATA;
 import com.silence.commonframe.utils.AtyContainer;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.Data;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;

app/src/main/java/com/silence/commonframe/activity/device/activity/camera/ActivityGuideDeviceListLan.java

@@ -26,8 +26,8 @@ import com.silence.commonframe.lib.funsdk.support.OnFunDeviceListener;
 import com.silence.commonframe.lib.funsdk.support.config.JsonConfig;
 import com.silence.commonframe.lib.funsdk.support.models.FunDevice;
 import com.silence.commonframe.lib.funsdk.support.models.FunLoginType;
-import com.silence.commonframe.utils1.DeviceActivitys;
-import com.silence.commonframe.utils1.ListAdapterFunDevice;
+import com.silence.commonframe.utils.DeviceActivitys;
+import com.silence.commonframe.utils.ListAdapterFunDevice;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/silence/commonframe/activity/device/activity/camera/presenter/CameraBasicSettingPresenter.java

@@ -10,7 +10,7 @@ import com.silence.commonframe.ApiService;
 import com.silence.commonframe.activity.device.activity.camera.Interface.CameraBasicSettingListener;
 import com.silence.commonframe.bean.BaseBean;
 import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.Data;
 import com.silence.commonframe.utils.LoginIn;
 
 import org.json.JSONObject;

app/src/main/java/com/silence/commonframe/activity/device/activity/context_device/NewContextManagementActivity.java

@@ -28,10 +28,10 @@ import com.silence.commonframe.bean.IsDeviceChange;
 import com.silence.commonframe.common.constant.BaseConstants;
 import com.silence.commonframe.activity.device.activity.camera.ActivityGuideDeviceCamera;
 import com.silence.commonframe.lib.funsdk.support.models.FunDevice;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.Data;
 import com.silence.commonframe.utils.ManagePopupMenu;
 import com.silence.commonframe.utils.TitlePopupMenu;
-import com.silence.commonframe.utils1.AddDeviceUtils;
+import com.silence.commonframe.utils.AddDeviceUtils;
 import com.silence.tech.ui.MainCompanyActivity;
 
 import java.util.ArrayList;
@@ -39,6 +39,10 @@ import java.util.List;
 
 import butterknife.BindView;
 
+/**
+ * 新关联设备管理
+ * @author zjm
+ */
 public class NewContextManagementActivity extends BaseActivity implements NewContextManagementListener.View {
 
     @BindView(R.id.context_device_del_submit)
@@ -169,15 +173,20 @@ public class NewContextManagementActivity extends BaseActivity implements NewCon
         @Override
         public void del() {
             //删除按钮
-            if (mFireAdapter.getShow() && mCameraAdapter.getShow()){
-                mFireAdapter.setIsShow(false);
-                mCameraAdapter.setIsShow(false);
-                llSubmit.setVisibility(View.GONE);
-            }else if (!mFireAdapter.getShow() && !mCameraAdapter.getShow()){
-                mFireAdapter.setIsShow(true);
-                mCameraAdapter.setIsShow(true);
-                llSubmit.setVisibility(View.VISIBLE);
+            if (listCameraData.size() != 0 || listFireData.size() != 0){
+                if (mFireAdapter.getShow() && mCameraAdapter.getShow()){
+                    mFireAdapter.setIsShow(false);
+                    mCameraAdapter.setIsShow(false);
+                    llSubmit.setVisibility(View.GONE);
+                }else if (!mFireAdapter.getShow() && !mCameraAdapter.getShow()){
+                    mFireAdapter.setIsShow(true);
+                    mCameraAdapter.setIsShow(true);
+                    llSubmit.setVisibility(View.VISIBLE);
+                }
+            }else {
+                onFile("还没有关联任何设备");
             }
+
         }
     };
 

app/src/main/java/com/silence/commonframe/activity/device/activity/context_device/presenter/NewAddContextDevicePresenter.java

@@ -12,7 +12,7 @@ import com.silence.commonframe.activity.device.activity.context_device.Interface
 import com.silence.commonframe.bean.BaseBean;
 import com.silence.commonframe.bean.DeviceTypeBean;
 import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.Data;
 import com.silence.commonframe.utils.LoginIn;
 
 import org.json.JSONObject;

app/src/main/java/com/silence/commonframe/activity/device/activity/context_device/presenter/NewContextManagementPresenter.java

@@ -13,7 +13,7 @@ import com.silence.commonframe.bean.BaseBean;
 import com.silence.commonframe.bean.CameraDetailBean;
 import com.silence.commonframe.bean.ConnectDeviceBean;
 import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.Data;
 import com.silence.commonframe.utils.LoginIn;
 
 import okhttp3.Call;

app/src/main/java/com/silence/commonframe/activity/device/activity/context_device/presenter/RunningRecordPresenter.java

@@ -13,7 +13,7 @@ import com.silence.commonframe.bean.BaseBean;
 import com.silence.commonframe.bean.DeviceDataChangedBean;
 import com.silence.commonframe.common.constant.BaseConstants;
 import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.Data;
 import com.silence.commonframe.utils.LoginIn;
 
 import java.util.List;

app/src/main/java/com/silence/commonframe/activity/device/presenter/NewDeviceDetailPresenter.java

@@ -15,7 +15,7 @@ import com.silence.commonframe.bean.CameraDetailBean;
 import com.silence.commonframe.bean.ConnectDeviceBean;
 import com.silence.commonframe.bean.DeviceDetailBean;
 import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.Data;
 import com.silence.commonframe.utils.LoginIn;
 
 import okhttp3.Call;

app/src/main/java/com/silence/commonframe/activity/device/presenter/NewDevicePresenter.java

@@ -15,7 +15,7 @@ import com.silence.commonframe.bean.PalceListBean;
 import com.silence.commonframe.common.constant.BaseConstants;
 import com.silence.commonframe.common.constant.UrlConstants;
 import com.silence.commonframe.activity.device.Interface.NewDeviceListener;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.Data;
 import com.silence.commonframe.utils.LoginIn;
 
 import org.json.JSONException;

app/src/main/java/com/silence/commonframe/activity/home/Interface/AddDeviceDetailListener.java

@@ -2,7 +2,7 @@ package com.silence.commonframe.activity.home.Interface;
 
 import com.silence.commonframe.base.basemvp.BaseModel;
 import com.silence.commonframe.base.basemvp.BasePresenter;
-import com.silence.commonframe.model.SiteModel;
+import com.silence.commonframe.bean.SiteModel;
 
 public interface AddDeviceDetailListener {
     interface View{

app/src/main/java/com/silence/commonframe/activity/home/Interface/AddDeviceListener.java

@@ -2,7 +2,7 @@ package com.silence.commonframe.activity.home.Interface;
 
 import com.silence.commonframe.base.basemvp.BaseModel;
 import com.silence.commonframe.base.basemvp.BasePresenter;
-import com.silence.commonframe.model.DeviceTypeModel;
+import com.silence.commonframe.bean.DeviceTypeModel;
 
 import java.util.List;
 

app/src/main/java/com/silence/commonframe/activity/home/Interface/DeviceListListener.java

@@ -2,7 +2,7 @@ package com.silence.commonframe.activity.home.Interface;
 
 import com.silence.commonframe.base.basemvp.BaseModel;
 import com.silence.commonframe.base.basemvp.BasePresenter;
-import com.silence.commonframe.model.Device;
+import com.silence.commonframe.bean.Device;
 
 import java.util.List;
 

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

@@ -19,7 +19,7 @@ import com.silence.commonframe.activity.home.Interface.AddDeviceListener;
 import com.silence.commonframe.activity.home.presenter.AddDevicePresenter;
 import com.silence.commonframe.adapter.home.AddDeviceAdapter;
 import com.silence.commonframe.base.basemvp.BaseActivity;
-import com.silence.commonframe.model.DeviceTypeModel;
+import com.silence.commonframe.bean.DeviceTypeModel;
 import com.silence.commonframe.utils.ScanUtil;
 
 import java.util.ArrayList;
@@ -28,7 +28,7 @@ import java.util.List;
 import butterknife.BindView;
 
 /**
- * 设备列表
+ * 添加设备设备列表
  */
 public class AdddeviceActivity extends BaseActivity implements AddDeviceListener.View {
     @BindView(R.id.rv_device_type_list)

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

@@ -19,7 +19,7 @@ import com.silence.commonframe.activity.home.Interface.AddDeviceDetailListener;
 import com.silence.commonframe.activity.home.presenter.AddDeviceDetailPresenter;
 import com.silence.commonframe.base.basemvp.BaseActivity;
 import com.silence.commonframe.bean.IsDeviceChange;
-import com.silence.commonframe.model.SiteModel;
+import com.silence.commonframe.bean.SiteModel;
 import com.silence.commonframe.utils.SpinerPopWindow;
 
 import java.util.ArrayList;

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

@@ -12,7 +12,7 @@ import com.silence.commonframe.activity.device.activity.NewDeviceDetailActivity;
 import com.silence.commonframe.activity.home.presenter.DeviceListPresenter;
 import com.silence.commonframe.adapter.home.MyAdapterSlideSite;
 import com.silence.commonframe.base.basemvp.BaseActivity;
-import com.silence.commonframe.model.Device;
+import com.silence.commonframe.bean.Device;
 import com.silence.commonframe.utils.LinearItemDecoration;
 
 import java.util.ArrayList;
@@ -20,6 +20,9 @@ import java.util.List;
 
 import butterknife.BindView;
 
+/**
+ * 主页异常场所的设备列表
+ */
 public class DeviceListActivity extends BaseActivity implements DeviceListListener.View {
 
     @BindView(R.id.id_item_remove_recyclerview)

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

@@ -26,7 +26,7 @@ import com.silence.commonframe.adapter.home.MyAdapter;
 import com.silence.commonframe.base.basemvp.BaseFragment;
 import com.silence.commonframe.bean.TroubleSiteBean;
 import com.silence.commonframe.utils.TitlePopupMenu;
-import com.silence.commonframe.utils1.AddDeviceUtils;
+import com.silence.commonframe.utils.AddDeviceUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -99,7 +99,7 @@ public class FirstFragment extends BaseFragment implements HomeInterface.View {
         titlePopup = new TitlePopupMenu(getActivity(), ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         new AddDeviceUtils().AddDevice(titlePopup,getActivity());
 
-        setImageAutoProportion();   //设置图片自动适配页面
+        setImageAutoProportion(R.drawable.home_normal);   //设置图片自动适配页面
         //头部内容,悬浮的部分
         tv_safe.setVisibility(View.VISIBLE);
         tv_security.setVisibility(View.VISIBLE);
@@ -127,12 +127,12 @@ public class FirstFragment extends BaseFragment implements HomeInterface.View {
 
     }
 
-    private void setImageAutoProportion() {
+    private void setImageAutoProportion(int resourse) {
         Display display = getActivity().getWindowManager().getDefaultDisplay();
         DisplayMetrics dm = new DisplayMetrics();
         display.getMetrics(dm);
         int width = dm.widthPixels;
-        Bitmap bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.header1);
+        Bitmap bitmap = BitmapFactory.decodeResource(getResources(), resourse);
         int bwidth = bitmap.getWidth();
         int bHeight = bitmap.getHeight();
         int imageWidth = width;
@@ -154,13 +154,28 @@ public class FirstFragment extends BaseFragment implements HomeInterface.View {
         troubleListBeans.addAll(data);
         myAdapter1.notifyDataSetChanged();
         if (troubleListBeans.size()>0){
-            rvList.setVisibility(View.VISIBLE);
-            ivHeader.setImageResource(R.drawable.guzhang);
-            llHeader.setBackgroundColor(Color.parseColor("#ff3333"));
-            tv_safe.setVisibility(View.GONE);
-            tv_security.setVisibility(View.GONE);
+            for (int i = 0; i < troubleListBeans.size(); i++){
+                if (!"1".equals(troubleListBeans.get(i).getTroubleType())){
+                    rvList.setVisibility(View.VISIBLE);
+                    ivHeader.setImageResource(R.drawable.home_fault);
+                    llHeader.setBackgroundColor(Color.parseColor("#ff9000"));
+                    tv_safe.setVisibility(View.GONE);
+                    tv_security.setVisibility(View.GONE);
+                    setImageAutoProportion(R.drawable.home_fault);   //设置图片自动适配页面
+                }
+            }
+            for (int i = 0; i < troubleListBeans.size(); i++){
+                if ("1".equals(troubleListBeans.get(i).getTroubleType())){
+                    rvList.setVisibility(View.VISIBLE);
+                    ivHeader.setImageResource(R.drawable.home_fire);
+                    llHeader.setBackgroundColor(Color.parseColor("#f32e2e"));
+                    tv_safe.setVisibility(View.GONE);
+                    tv_security.setVisibility(View.GONE);
+                    setImageAutoProportion(R.drawable.home_fire);   //设置图片自动适配页面
+                }
+            }
         }else {
-            ivHeader.setImageResource(R.drawable.header1);
+            ivHeader.setImageResource(R.drawable.home_normal);
             tv_safe.setVisibility(View.VISIBLE);
             tv_security.setVisibility(View.VISIBLE);
         }

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

@@ -45,7 +45,7 @@ import com.silence.commonframe.adapter.home.MapSearchAdapter;
 import com.silence.commonframe.base.basemvp.BaseActivity;
 import com.silence.commonframe.bean.PositionEntity;
 import com.silence.commonframe.common.constant.BaseConstants;
-import com.silence.commonframe.utils1.MaxHeightRecyclerView;
+import com.silence.commonframe.utils.MaxHeightRecyclerView;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/silence/commonframe/activity/home/presenter/AddDeviceDetailPresenter.java

@@ -11,8 +11,8 @@ import com.silence.commonframe.activity.home.Interface.AddDeviceDetailListener;
 import com.silence.commonframe.bean.BaseBean;
 import com.silence.commonframe.common.constant.BaseConstants;
 import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.model.SiteModel;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.SiteModel;
+import com.silence.commonframe.bean.Data;
 import com.silence.commonframe.utils.LoginIn;
 
 import org.json.JSONObject;

app/src/main/java/com/silence/commonframe/activity/home/presenter/AddDevicePresenter.java

@@ -10,8 +10,8 @@ import com.silence.commonframe.ApiService;
 import com.silence.commonframe.activity.home.Interface.AddDeviceListener;
 import com.silence.commonframe.bean.BaseBean;
 import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.model.DeviceTypeModel;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.DeviceTypeModel;
+import com.silence.commonframe.bean.Data;
 import com.silence.commonframe.utils.LoginIn;
 
 import okhttp3.Call;

app/src/main/java/com/silence/commonframe/activity/home/presenter/AddSitePresenter.java

@@ -10,7 +10,7 @@ import com.silence.commonframe.ApiService;
 import com.silence.commonframe.activity.home.Interface.AddSiteListener;
 import com.silence.commonframe.bean.BaseBean;
 import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.Data;
 import com.silence.commonframe.utils.LoginIn;
 
 import org.json.JSONObject;

app/src/main/java/com/silence/commonframe/activity/home/presenter/CommonScanPresenter.java

@@ -10,7 +10,7 @@ import com.silence.commonframe.ApiService;
 import com.silence.commonframe.activity.home.Interface.CommonScanListener;
 import com.silence.commonframe.bean.BaseBean;
 import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.Data;
 import com.silence.commonframe.utils.LoginIn;
 
 import okhttp3.Call;

app/src/main/java/com/silence/commonframe/activity/home/presenter/DeviceListPresenter.java

@@ -11,8 +11,8 @@ import com.silence.commonframe.activity.home.Interface.DeviceListListener;
 import com.silence.commonframe.bean.BaseBean;
 import com.silence.commonframe.common.constant.BaseConstants;
 import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.model.Device;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.Device;
+import com.silence.commonframe.bean.Data;
 import com.silence.commonframe.utils.LoginIn;
 
 import okhttp3.Call;

app/src/main/java/com/silence/commonframe/activity/home/presenter/HomePresenter.java

@@ -13,7 +13,7 @@ import com.silence.commonframe.bean.BaseBean;
 import com.silence.commonframe.bean.TroubleSiteBean;
 import com.silence.commonframe.common.constant.BaseConstants;
 import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.Data;
 import com.silence.commonframe.utils.LoginIn;
 
 import java.util.List;

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

@@ -23,8 +23,8 @@ import com.silence.commonframe.activity.login.presenface.LoginPresenter;
 import com.silence.commonframe.base.basemvp.BaseActivity;
 import com.silence.commonframe.bean.LoginBean;
 import com.silence.commonframe.common.constant.BaseConstants;
-import com.silence.commonframe.utils.Data;
-import com.silence.commonframe.utils1.GetMacUtils;
+import com.silence.commonframe.bean.Data;
+import com.silence.commonframe.utils.GetMacUtils;
 import com.tencent.mm.opensdk.modelmsg.SendAuth;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
 import com.tencent.mm.opensdk.openapi.WXAPIFactory;

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

@@ -16,8 +16,8 @@ import com.silence.commonframe.activity.login.presenface.LoginPresenter;
 import com.silence.commonframe.base.basemvp.BaseActivity;
 import com.silence.commonframe.bean.LoginBean;
 import com.silence.commonframe.common.constant.BaseConstants;
-import com.silence.commonframe.utils.Data;
-import com.silence.commonframe.utils1.GetMacUtils;
+import com.silence.commonframe.bean.Data;
+import com.silence.commonframe.utils.GetMacUtils;
 import com.silence.tech.ui.MainCompanyActivity;
 
 import butterknife.BindView;

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

@@ -11,7 +11,7 @@ import com.silence.commonframe.R;
 import com.silence.commonframe.activity.MainActivity;
 import com.silence.commonframe.base.basemvp.BaseActivity;
 import com.silence.commonframe.common.constant.BaseConstants;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.Data;
 import com.silence.tech.ui.MainCompanyActivity;
 
 public class WelcomeActivity extends BaseActivity {

app/src/main/java/com/silence/commonframe/activity/login/presenface/ForgetPassPresenter.java

@@ -10,7 +10,7 @@ import com.silence.commonframe.ApiService;
 import com.silence.commonframe.activity.login.Interface.ForgetPassListener;
 import com.silence.commonframe.common.constant.BaseConstants;
 import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.model.VerifyModel;
+import com.silence.commonframe.bean.VerifyModel;
 
 import okhttp3.Call;
 import okhttp3.Response;

app/src/main/java/com/silence/commonframe/activity/login/presenface/LoginPresenter.java

@@ -13,7 +13,7 @@ import com.silence.commonframe.bean.BaseBean;
 import com.silence.commonframe.bean.LoginBean;
 import com.silence.commonframe.common.constant.BaseConstants;
 import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.Data;
 
 import okhttp3.Call;
 import okhttp3.Response;

app/src/main/java/com/silence/commonframe/activity/login/presenface/RegisterPresenter.java

@@ -10,8 +10,8 @@ import com.silence.commonframe.ApiService;
 import com.silence.commonframe.activity.login.Interface.RegisterListener;
 import com.silence.commonframe.common.constant.BaseConstants;
 import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.model.VerifyModel;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.VerifyModel;
+import com.silence.commonframe.bean.Data;
 
 import org.json.JSONObject;
 

app/src/main/java/com/silence/commonframe/activity/message/Interface/NewDetailShowListener.java

@@ -2,7 +2,7 @@ package com.silence.commonframe.activity.message.Interface;
 
 import com.silence.commonframe.base.basemvp.BaseModel;
 import com.silence.commonframe.base.basemvp.BasePresenter;
-import com.silence.commonframe.model.RecheckMsgDetailModel;
+import com.silence.commonframe.bean.RecheckMsgDetailModel;
 
 public interface NewDetailShowListener {
     interface View{

app/src/main/java/com/silence/commonframe/activity/message/Interface/NewFindListener.java

@@ -2,7 +2,7 @@ package com.silence.commonframe.activity.message.Interface;
 
 import com.silence.commonframe.base.basemvp.BaseModel;
 import com.silence.commonframe.base.basemvp.BasePresenter;
-import com.silence.commonframe.model.TroubleDeviceModel;
+import com.silence.commonframe.bean.TroubleDeviceModel;
 
 import java.util.List;
 

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

@@ -3,7 +3,7 @@ package com.silence.commonframe.activity.message.Interface;
 import com.silence.commonframe.base.basemvp.BaseModel;
 import com.silence.commonframe.base.basemvp.BasePresenter;
 import com.silence.commonframe.bean.NewsDetailByMsgBean;
-import com.silence.commonframe.model.RecheckMsgModel;
+import com.silence.commonframe.bean.RecheckMsgModel;
 
 import java.util.List;
 

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

@@ -16,7 +16,7 @@ import com.silence.commonframe.activity.message.presenter.CheckPresenter;
 import com.silence.commonframe.base.basemvp.BaseActivity;
 import com.silence.commonframe.bean.BaseBean;
 import com.silence.commonframe.common.constant.BaseConstants;
-import com.silence.commonframe.model.TroubleDeviceModel;
+import com.silence.commonframe.bean.TroubleDeviceModel;
 
 import butterknife.BindView;
 

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

@@ -18,7 +18,7 @@ import com.silence.commonframe.activity.message.presenter.NewFindPresenter;
 import com.silence.commonframe.adapter.message.FindAdapter;
 import com.silence.commonframe.base.basemvp.BaseFragment;
 import com.silence.commonframe.common.constant.BaseConstants;
-import com.silence.commonframe.model.TroubleDeviceModel;
+import com.silence.commonframe.bean.TroubleDeviceModel;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -35,9 +35,9 @@ import com.silence.commonframe.activity.message.presenter.NewSubmitPresenter;
 import com.silence.commonframe.adapter.message.NewSubmitAdapter;
 import com.silence.commonframe.base.basemvp.BaseActivity;
 import com.silence.commonframe.bean.PhotoNormalBean;
-import com.silence.commonframe.soundrecording.AudioRecoderUtils;
-import com.silence.commonframe.soundrecording.PopupWindowFactory;
-import com.silence.commonframe.soundrecording.TimeUtils;
+import com.silence.commonframe.utils.soundrecording.AudioRecoderUtils;
+import com.silence.commonframe.utils.soundrecording.PopupWindowFactory;
+import com.silence.commonframe.utils.soundrecording.TimeUtils;
 import com.silence.commonframe.utils.BaseUtil;
 
 import java.text.SimpleDateFormat;
@@ -272,7 +272,7 @@ public class NewSubmitActivity extends BaseActivity implements NewSubmitListener
                     }
                 });
             }
-            Toast.makeText(NewSubmitActivity.this, "请长按录音", Toast.LENGTH_LONG).show();
+//            Toast.makeText(NewSubmitActivity.this, "请长按录音", Toast.LENGTH_LONG).show();
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -19,8 +19,8 @@ import com.silence.commonframe.adapter.message.RecheckMsgAdapter;
 import com.silence.commonframe.base.basemvp.BaseActivity;
 import com.silence.commonframe.bean.NewsDetailByMsgBean;
 import com.silence.commonframe.common.constant.BaseConstants;
-import com.silence.commonframe.model.RecheckMsgModel;
-import com.silence.commonframe.model.TroubleDeviceModel;
+import com.silence.commonframe.bean.RecheckMsgModel;
+import com.silence.commonframe.bean.TroubleDeviceModel;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -25,7 +25,7 @@ import com.silence.commonframe.activity.message.presenter.NewDetailShowPresenter
 import com.silence.commonframe.adapter.device.GroupInfoDetailsPhontoAdapter;
 import com.silence.commonframe.base.basemvp.BaseActivity;
 import com.silence.commonframe.base.basemvp.TitleBar;
-import com.silence.commonframe.model.RecheckMsgDetailModel;
+import com.silence.commonframe.bean.RecheckMsgDetailModel;
 import com.xiao.nicevideoplayer.NiceVideoPlayer;
 import com.xiao.nicevideoplayer.NiceVideoPlayerController;
 import com.xiao.nicevideoplayer.NiceVideoPlayerManager;
@@ -40,6 +40,9 @@ import java.util.TimerTask;
 import butterknife.BindView;
 import butterknife.OnClick;
 
+/**
+ * 复核详情
+ */
 public class NewsdetailActivityShow extends BaseActivity implements NewDetailShowListener.View {
     @BindView(R.id.base_title_bar)
     TitleBar baseTitleBar;

app/src/main/java/com/silence/commonframe/activity/message/presenter/CheckPresenter.java

@@ -12,7 +12,7 @@ import com.silence.commonframe.R;
 import com.silence.commonframe.activity.message.Interface.CheckListener;
 import com.silence.commonframe.bean.BaseBean;
 import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.Data;
 import com.silence.commonframe.utils.LoginIn;
 
 import okhttp3.Call;

app/src/main/java/com/silence/commonframe/activity/message/presenter/NewDetailShowPresenter.java

@@ -9,8 +9,8 @@ import com.lzy.okgo.callback.StringCallback;
 import com.silence.commonframe.ApiService;
 import com.silence.commonframe.activity.message.Interface.NewDetailShowListener;
 import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.model.RecheckMsgDetailModel;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.RecheckMsgDetailModel;
+import com.silence.commonframe.bean.Data;
 import com.silence.commonframe.utils.LoginIn;
 
 import okhttp3.Call;

app/src/main/java/com/silence/commonframe/activity/message/presenter/NewFindPresenter.java

@@ -10,8 +10,8 @@ import com.silence.commonframe.ApiService;
 import com.silence.commonframe.activity.message.Interface.NewFindListener;
 import com.silence.commonframe.common.constant.BaseConstants;
 import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.model.TroubleDeviceModel;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.TroubleDeviceModel;
+import com.silence.commonframe.bean.Data;
 import com.silence.commonframe.utils.LoginIn;
 
 import org.json.JSONObject;

app/src/main/java/com/silence/commonframe/activity/message/presenter/NewSubmitPresenter.java

@@ -3,7 +3,6 @@ package com.silence.commonframe.activity.message.presenter;
 import android.app.Activity;
 import android.os.Environment;
 import android.text.TextUtils;
-import android.widget.Toast;
 
 import com.google.gson.Gson;
 import com.lzy.okgo.OkGo;
@@ -13,8 +12,8 @@ import com.silence.commonframe.ApiService;
 import com.silence.commonframe.activity.message.Interface.NewSubmitListener;
 import com.silence.commonframe.common.constant.BaseConstants;
 import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.model.UploadModel;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.UploadModel;
+import com.silence.commonframe.bean.Data;
 
 import org.json.JSONException;
 import org.json.JSONObject;

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

@@ -10,8 +10,8 @@ import com.silence.commonframe.ApiService;
 import com.silence.commonframe.activity.message.Interface.NewsDetailListener;
 import com.silence.commonframe.bean.NewsDetailByMsgBean;
 import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.model.RecheckMsgModel;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.RecheckMsgModel;
+import com.silence.commonframe.bean.Data;
 import com.silence.commonframe.utils.LoginIn;
 
 import okhttp3.Call;

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

@@ -2,7 +2,7 @@ package com.silence.commonframe.activity.mine.Interface;
 
 import com.silence.commonframe.base.basemvp.BaseModel;
 import com.silence.commonframe.base.basemvp.BasePresenter;
-import com.silence.commonframe.model.SiteModel;
+import com.silence.commonframe.bean.SiteModel;
 
 import java.util.List;
 

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

@@ -2,7 +2,7 @@ package com.silence.commonframe.activity.mine.Interface;
 
 import com.silence.commonframe.base.basemvp.BaseModel;
 import com.silence.commonframe.base.basemvp.BasePresenter;
-import com.silence.commonframe.model.FireAlarmModel;
+import com.silence.commonframe.bean.FireAlarmModel;
 
 import java.util.List;
 

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

@@ -2,7 +2,7 @@ package com.silence.commonframe.activity.mine.Interface;
 
 import com.silence.commonframe.base.basemvp.BaseModel;
 import com.silence.commonframe.base.basemvp.BasePresenter;
-import com.silence.commonframe.model.WXLoginModel;
+import com.silence.commonframe.bean.WXLoginModel;
 
 public interface SetupListener {
     interface View{

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

@@ -2,7 +2,7 @@ package com.silence.commonframe.activity.mine.Interface;
 
 import com.silence.commonframe.base.basemvp.BaseModel;
 import com.silence.commonframe.base.basemvp.BasePresenter;
-import com.silence.commonframe.model.SiteModel;
+import com.silence.commonframe.bean.SiteModel;
 
 public interface SiteDetailListener {
     interface View{

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

@@ -29,6 +29,9 @@ import java.util.List;
 
 import butterknife.BindView;
 
+/**
+ * 联系人列表
+ */
 public class AddlinkmanActivity extends BaseActivity implements AddLinkManListener.View,NewLinkManAdapter.DeleteCallBack {
     @BindView(R.id.recView_linkman)
     RecyclerView recViewLinkman;

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

@@ -7,6 +7,9 @@ import android.view.View;
 import com.silence.commonframe.R;
 import com.silence.commonframe.base.basemvp.BaseActivity;
 
+/**
+ * 客服电话
+ */
 public class CoustomerActivity extends BaseActivity {
 
     @Override

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

@@ -12,13 +12,16 @@ import com.silence.commonframe.activity.mine.Interface.HistoryListener;
 import com.silence.commonframe.activity.mine.presenter.HistoryPresenter;
 import com.silence.commonframe.adapter.mine.HistoryAdapter;
 import com.silence.commonframe.base.basemvp.BaseActivity;
-import com.silence.commonframe.model.FireAlarmModel;
+import com.silence.commonframe.bean.FireAlarmModel;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.BindView;
 
+/**
+ * 火警通知
+ */
 public class HistoryActivity extends BaseActivity implements HistoryListener.View {
 
    @BindView(R.id.my_recycler_view)

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

@@ -17,7 +17,7 @@ import com.silence.commonframe.adapter.mine.SiteDetailsAdapter;
 import com.silence.commonframe.base.basemvp.BaseActivity;
 import com.silence.commonframe.base.basemvp.TitleBar;
 import com.silence.commonframe.common.constant.BaseConstants;
-import com.silence.commonframe.model.SiteModel;
+import com.silence.commonframe.bean.SiteModel;
 import com.silence.commonframe.utils.LinearItemDecoration;
 
 import java.util.ArrayList;
@@ -25,6 +25,9 @@ import java.util.List;
 
 import butterknife.BindView;
 
+/**
+ * 场所详情
+ */
 public class NewSiteDetailActivity extends BaseActivity implements SiteDetailListener.View,SiteDetailsAdapter.IonSlidingViewClickListener,SiteDetailsAdapter.ItemClickListener {
     @BindView(R.id.base_title_bar)
     TitleBar baseTitleBar;

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

@@ -9,6 +9,9 @@ import com.silence.commonframe.common.constant.UrlConstants;
 
 import butterknife.BindView;
 
+/**
+ * 常见问题
+ */
 public class QuesstionActivity extends BaseActivity {
 
 

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

@@ -10,10 +10,13 @@ import com.orhanobut.hawk.Hawk;
 import com.silence.commonframe.R;
 import com.silence.commonframe.base.basemvp.BaseActivity;
 import com.silence.commonframe.common.constant.BaseConstants;
-import com.silence.commonframe.model.SiteModel;
+import com.silence.commonframe.bean.SiteModel;
 
 import butterknife.BindView;
 
+/**
+ * 场所详情
+ */
 public class SiteManagementActivity extends BaseActivity {
    @BindView(R.id.tv_palce)
     TextView tvPalce;

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

@@ -1,275 +0,0 @@
-/*
-package com.silence.commonframe.activity.mine.activity;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-import android.widget.Button;
-import android.widget.Toast;
-
-import com.scwang.smartrefresh.layout.SmartRefreshLayout;
-import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener;
-import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
-import com.silence.commonframe.R;
-import com.silence.commonframe.activity.mine.Interface.SiteDetailListener;
-import com.silence.commonframe.activity.mine.presenter.SiteDetailPresenter;
-import com.silence.commonframe.adapter.SitedetailMineAdapter;
-import com.silence.commonframe.base.basemvp.BaseActivity;
-import com.silence.commonframe.bean.IsDeviceChange;
-import com.silence.commonframe.common.constant.BaseConstants;
-import com.silence.commonframe.model.IsChoose;
-import com.silence.commonframe.model.SiteModel;
-import com.silence.commonframe.utils.Data;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-
-
-import butterknife.BindView;
-
-public class SitedetailActivity extends BaseActivity implements SiteDetailListener.View {
-    private List<HashMap<String, String>> listmap = new ArrayList<HashMap<String, String>>();
-    private SitedetailMineAdapter myAdapter1;
-    private ArrayList<Integer> listChose = new ArrayList<Integer>();
-    private IsChoose isChoose;
-    private ArrayList<IsChoose> arrayList;
-    private ArrayList<IsChoose> deleteArrayList;
-    //  private    String siteId = "";
-
-    private String strId = "";
-    StringBuilder str = new StringBuilder();
-
-    @BindView(R.id.my_recycler_view)
-    RecyclerView myRecyclerView;
-    @BindView(R.id.edit)
-    Button bt;
-    @BindView(R.id.delete)
-    Button btdel;
-    @BindView(R.id.srl_refresh)
-    SmartRefreshLayout srlRefresh;
-
-    private ArrayList<String> listData = new ArrayList<>();
-    private int iSSHOW = GONECHECK;
-    private static final int GONECHECK = 0;
-    private static final int SHOWCHECK = 1;
-    private boolean flag = true;
-    private String flagId = "flagId";
-
-    ArrayList<Integer> listIndex = new ArrayList<>();
-
-    int page = 1;
-
-    SiteDetailPresenter presenter;
-
-    @Override
-    public int getLayoutId() {
-        return R.layout.activity_sitedetail;
-    }
-
-    @Override
-    public void initPresenter() {
-        presenter = new SiteDetailPresenter(this, this);
-    }
-
-    @Override
-    public void initView() {
-        setTitle(this, getResources().getString(R.string.site_list), "", true);
-        arrayList = new ArrayList<>();
-        deleteArrayList = new ArrayList<>();
-        myAdapter1 = new SitedetailMineAdapter(SitedetailActivity.this, listmap, arrayList);
-        //RecyclerView点击事件
-        myAdapter1.setOnItemClickLitener(new SitedetailMineAdapter.OnItemClickLitener() {
-            private IsChoose e;
-
-            @Override
-            public void onItemClick(View view, int position) {
-                //判断是否显示选择筐
-                if (iSSHOW == 1) {
-                    //获取当前条目然后设置是否为选中，这里没有直接用boolean值判断
-                    e = arrayList.get(position);
-
-                    if (e.getIsSelect() == 1) {
-                        //  e.setSelect(1);
-                        e.setIsSelect(0);
-                        listIndex.set(position, -1);     //listIndex中移除取消删除的值
-                        deleteArrayList.remove(e);
-                    } else {
-                        e.setIsSelect(1);
-                        listIndex.set(position, position);     //listIndex中加入要删除的值
-                        deleteArrayList.add(e);
-                    }
-                    myAdapter1.notifyDataSetChanged();
-                } else {
-                    Data.setLinkmanname(listData.get(position));
-                    Intent intent = new Intent(SitedetailActivity.this, SiteManagementActivity.class);
-                    Bundle bundle = new Bundle();
-                    bundle.putSerializable("listmap", listmap.get(position));
-                    intent.putExtras(bundle);
-                    startActivity(intent);
-                }
-            }
-
-            @Override
-            public void onItemLongClick(View view, final int position) {
-            }
-        });
-        myRecyclerView.setLayoutManager(new LinearLayoutManager(SitedetailActivity.this));
-        myRecyclerView.setAdapter(myAdapter1);
-        bt.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (myAdapter1 != null) {
-                    iSSHOW = (iSSHOW == GONECHECK) ? SHOWCHECK : GONECHECK;
-                    myAdapter1.setMode(iSSHOW);
-                }
-            }
-        });
-
-        presenter.getSite();
-
-        btdel.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (deleteArrayList.size() == 0) {
-                    Toast.makeText(SitedetailActivity.this, "请选中对应删除的场所！", Toast.LENGTH_SHORT).show();
-                    return;
-                } else {
-                    for (int i = 0; i < deleteArrayList.size(); i++) {
-                        myAdapter1.remove(deleteArrayList.get(i));
-                        //  myAdapter1.removeData(i);
-                    }
-                }
-                getSiteId();
-                presenter.delSite();
-                if (flagId.equals(Data.getListSiteid().toString())) {
-                    Toast.makeText(SitedetailActivity.this, "已经删除！", Toast.LENGTH_SHORT).show();
-                    return;
-                }
-                flagId = Data.getListSiteid().toString();
-            }
-        });
-
-        srlRefresh.setOnRefreshListener(new OnRefreshListener() {
-            @Override
-            public void onRefresh(@NonNull RefreshLayout refreshLayout) {
-                page = 1;
-                presenter.getSite();
-            }
-        });
-        srlRefresh.setOnLoadMoreListener(new OnLoadMoreListener() {
-            @Override
-            public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
-                page++;
-                presenter.getSite();
-            }
-        });
-    }
-
-    */
-/**
-     * 对设备的号码进行对应的拼接
-     *//*
-
-    private void getSiteId() {
-        for (int i = 0; i < Data.getListSiteid().size(); i++) {
-            str.append(Data.getListSiteid().get(i));
-            str.append(",");
-        }
-        strId = str.substring(0, str.length() - 1);
-        str.setLength(0);
-
-    }
-
-    @Override
-    public String getIds() {
-        return strId;
-    }
-
-    @Override
-    public int getPage() {
-        return page;
-    }
-
-    @Override
-    public void onDelSuccess() {
-        for (int i = 0; i < listIndex.size(); i++) {     //不需要删除的删掉
-            if (listIndex.get(i) == -1) {
-                listIndex.remove(i);
-                i--;
-            }
-        }
-        Collections.sort(listIndex);        //对listIndex存的值排序
-        for (int i = 0; i < listIndex.size(); i++) {
-            listData.remove((int) listIndex.get(listIndex.size() - i - 1));       //尾删
-        }
-        Data.getListSiteid().clear();
-        Data.setList(listData);
-        listIndex.clear();
-        IsDeviceChange.setChangeSize(true);                     //判断设备页面场所列表要进行刷新
-    }
-
-    @Override
-    public void onDelError() {
-        iSSHOW = 0;
-        deleteArrayList.clear();
-        presenter.getSite();
-        if (myAdapter1 != null) {
-            myAdapter1.setMode(iSSHOW);
-        }
-    }
-
-    @Override
-    public void onGetSiteSuccess(SiteModel.DataBean data) {
-        if (page == 1) {
-            listmap.clear();
-            listIndex.clear();
-            arrayList.clear();
-            listData.clear();
-        }
-        for (int i = 0; i < data.getDataList().size(); i++) {
-            isChoose = new IsChoose();
-            HashMap<String, String> hashMap = new HashMap<>();
-            String RegionName = data.getDataList().get(i).getRegionName();//区域
-            String Location = data.getDataList().get(i).getLocation();//详细地址
-            String id = data.getDataList().get(i).getId();//设备id
-            String deployment = data.getDataList().get(i).getDeployment();//位置
-            System.out.println("id:" + id);
-
-            hashMap.put("RegionName", RegionName);
-            hashMap.put("Location", Location);
-            hashMap.put("id", id);
-            hashMap.put("deployment", deployment);
-
-            listData.add(id);
-            //   listid.add(id);
-            listIndex.add(-1);
-            listmap.add(hashMap);
-            arrayList.add(isChoose);
-        }
-        myAdapter1.notifyDataSetChanged();
-        //设置分割线
-        if (data.getDataList().size() >= Integer.valueOf(BaseConstants.PAGE_SIZE)) {
-            srlRefresh.setEnableLoadMore(true);
-        }
-        if (srlRefresh != null) {
-            srlRefresh.finishRefresh();
-            srlRefresh.finishLoadMore();
-        }
-    }
-
-    @Override
-    public void onFile(String msg) {
-        Toast.makeText(this, "" + msg, Toast.LENGTH_SHORT).show();
-        if (srlRefresh != null) {
-            srlRefresh.finishRefresh();
-            srlRefresh.finishLoadMore();
-        }
-    }
-}
-*/

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

@@ -11,6 +11,9 @@ import com.silence.commonframe.bean.VersionBean;
 
 import butterknife.BindView;
 
+/**
+ * 关于我们
+ */
 public class AboutActivity extends BaseActivity implements AboutListener.View {
 
     @BindView(R.id.tv_version_code)

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

@@ -13,7 +13,7 @@ import com.silence.commonframe.activity.mine.Interface.FireMessageListener;
 import com.silence.commonframe.activity.mine.presenter.FireMessagePresenter;
 import com.silence.commonframe.adapter.mine.FireMessageAdapter;
 import com.silence.commonframe.base.basemvp.BaseActivity;
-import com.silence.commonframe.model.SiteModel;
+import com.silence.commonframe.bean.SiteModel;
 import com.silence.commonframe.utils.LinearItemDecoration;
 
 import java.util.ArrayList;
@@ -21,6 +21,9 @@ import java.util.List;
 
 import butterknife.BindView;
 
+/**
+ * 推送管理
+ */
 public class FireMessageActivity extends BaseActivity implements FireMessageListener.View {
 
     @BindView(R.id.my_recycler_view)

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

@@ -8,6 +8,9 @@ import com.silence.commonframe.common.constant.UrlConstants;
 
 import butterknife.BindView;
 
+/**
+ * 隐私政策
+ */
 public class PrivacyPolicyActivity extends BaseActivity {
 
    @BindView(R.id.webview)

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

@@ -16,7 +16,7 @@ import com.silence.commonframe.activity.mine.Interface.SetupListener;
 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.bean.WXLoginModel;
 import com.silence.commonframe.utils.AtyContainer;
 import com.tencent.mm.opensdk.modelmsg.SendAuth;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
@@ -28,6 +28,9 @@ import java.util.List;
 
 import butterknife.BindView;
 
+/**
+ * 设置界面
+ */
 public class SetupActivity extends BaseActivity implements SetupListener.View {
 
     @BindView(R.id.switch_wx_bind)

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

@@ -8,6 +8,9 @@ import com.silence.commonframe.common.constant.UrlConstants;
 
 import butterknife.BindView;
 
+/**
+ * 用户协议
+ */
 public class UserAgreementActivity extends BaseActivity {
    @BindView(R.id.webview)
     WebView webview;

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

@@ -24,9 +24,8 @@ import com.silence.commonframe.utils.SavePhotoUtil;
 import butterknife.BindView;
 
 /**
- * 微信公众号扫一扫界面
+ * 微信公众号推送界面
  * @author 郑嘉明
- * tv_save_code、qrcode、tv_openwx、img_openwx、tv_choose_qrcode、tv_yourwx_willget_msg、bt_no_mind、bt_iknow
  */
 public class WXPublicCodeActivity extends BaseActivity {
 

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

@@ -10,7 +10,7 @@ import com.silence.commonframe.ApiService;
 import com.silence.commonframe.activity.mine.Interface.AboutListener;
 import com.silence.commonframe.bean.VersionBean;
 import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.Data;
 import com.silence.commonframe.utils.LoginIn;
 
 import okhttp3.Call;

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

@@ -11,7 +11,7 @@ import com.silence.commonframe.activity.mine.Interface.AddLinkManListener;
 import com.silence.commonframe.bean.BaseBean;
 import com.silence.commonframe.bean.LinkManBean;
 import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.Data;
 import com.silence.commonframe.utils.LoginIn;
 
 import org.json.JSONObject;

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

@@ -11,8 +11,8 @@ import com.silence.commonframe.activity.mine.Interface.FireMessageListener;
 import com.silence.commonframe.bean.BaseBean;
 import com.silence.commonframe.common.constant.BaseConstants;
 import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.model.SiteModel;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.SiteModel;
+import com.silence.commonframe.bean.Data;
 import com.silence.commonframe.utils.LoginIn;
 
 import okhttp3.Call;

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

@@ -11,8 +11,8 @@ import com.silence.commonframe.activity.mine.Interface.HistoryListener;
 import com.silence.commonframe.bean.BaseBean;
 import com.silence.commonframe.common.constant.BaseConstants;
 import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.model.FireAlarmModel;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.FireAlarmModel;
+import com.silence.commonframe.bean.Data;
 import com.silence.commonframe.utils.LoginIn;
 
 import okhttp3.Call;

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

@@ -11,8 +11,8 @@ import com.silence.commonframe.R;
 import com.silence.commonframe.activity.mine.Interface.SetupListener;
 import com.silence.commonframe.bean.BaseBean;
 import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.model.WXLoginModel;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.WXLoginModel;
+import com.silence.commonframe.bean.Data;
 import com.silence.commonframe.utils.LoginIn;
 
 import okhttp3.Call;

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

@@ -10,8 +10,8 @@ import com.silence.commonframe.ApiService;
 import com.silence.commonframe.activity.mine.Interface.SiteDetailListener;
 import com.silence.commonframe.common.constant.BaseConstants;
 import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.model.SiteModel;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.bean.SiteModel;
+import com.silence.commonframe.bean.Data;
 import com.silence.commonframe.utils.LoginIn;
 
 import okhttp3.Call;

app/src/main/java/com/silence/commonframe/adapter/device/AirGuardWorKTimeAdapter.java

@@ -12,7 +12,7 @@ import android.widget.Switch;
 import android.widget.TextView;
 
 import com.silence.commonframe.R;
-import com.silence.commonframe.model.AirGuardRunTimeListModel;
+import com.silence.commonframe.bean.AirGuardRunTimeListModel;
 import com.silence.commonframe.utils.ItemSlideHelper;
 
 import java.util.List;

app/src/main/java/com/silence/commonframe/adapter/home/AddDeviceAdapter.java

@@ -9,7 +9,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.silence.commonframe.ApiService;
 import com.silence.commonframe.R;
-import com.silence.commonframe.model.DeviceTypeModel;
+import com.silence.commonframe.bean.DeviceTypeModel;
 
 import java.util.List;
 

app/src/main/java/com/silence/commonframe/adapter/home/MyAdapterSlideSite.java

@@ -11,7 +11,7 @@ import android.widget.LinearLayout;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.silence.commonframe.R;
-import com.silence.commonframe.model.Device;
+import com.silence.commonframe.bean.Device;
 import com.silence.commonframe.utils.ItemSlideHelper;
 
 import java.util.List;

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

@@ -10,7 +10,7 @@ import android.widget.TextView;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.silence.commonframe.R;
-import com.silence.commonframe.model.TroubleDeviceModel;
+import com.silence.commonframe.bean.TroubleDeviceModel;
 
 import java.util.List;
 

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

@@ -8,7 +8,7 @@ import android.widget.TextView;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.silence.commonframe.R;
-import com.silence.commonframe.model.RecheckMsgModel;
+import com.silence.commonframe.bean.RecheckMsgModel;
 
 import java.util.List;
 

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

@@ -10,7 +10,7 @@ import android.widget.TextView;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.silence.commonframe.R;
-import com.silence.commonframe.model.SiteModel;
+import com.silence.commonframe.bean.SiteModel;
 
 import java.util.List;
 

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

@@ -9,7 +9,7 @@ import android.widget.TextView;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.silence.commonframe.R;
-import com.silence.commonframe.model.FireAlarmModel;
+import com.silence.commonframe.bean.FireAlarmModel;
 
 import java.util.List;
 

app/src/main/java/com/silence/commonframe/adapter/mine/SiteDetailsAdapter.java

@@ -7,7 +7,7 @@ import android.widget.LinearLayout;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.silence.commonframe.R;
-import com.silence.commonframe.model.SiteModel;
+import com.silence.commonframe.bean.SiteModel;
 import com.silence.commonframe.utils.BaseUtil;
 import com.silence.commonframe.utils.DrawableCenterTextView;
 import com.silence.commonframe.utils.LeftSlideView;

app/src/main/java/com/silence/commonframe/model/AirGuardRunTimeListModel.java

@@ -1,4 +1,4 @@
-package com.silence.commonframe.model;
+package com.silence.commonframe.bean;
 
 import java.util.List;
 

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

@@ -1,4 +1,4 @@
-package com.silence.commonframe.utils;
+package com.silence.commonframe.bean;
 
 import android.os.Environment;
 

app/src/main/java/com/silence/commonframe/model/Device.java

@@ -1,4 +1,4 @@
-package com.silence.commonframe.model;
+package com.silence.commonframe.bean;
 
 import java.util.List;
 

app/src/main/java/com/silence/commonframe/model/DeviceTypeModel.java

@@ -1,4 +1,4 @@
-package com.silence.commonframe.model;
+package com.silence.commonframe.bean;
 
 import java.util.List;
 

app/src/main/java/com/silence/commonframe/model/FireAlarmModel.java

@@ -1,4 +1,4 @@
-package com.silence.commonframe.model;
+package com.silence.commonframe.bean;
 
 import java.util.List;
 

app/src/main/java/com/silence/commonframe/model/RecheckMsgDetailModel.java

@@ -1,4 +1,4 @@
-package com.silence.commonframe.model;
+package com.silence.commonframe.bean;
 
 public class RecheckMsgDetailModel {
 

app/src/main/java/com/silence/commonframe/model/RecheckMsgModel.java

@@ -1,4 +1,4 @@
-package com.silence.commonframe.model;
+package com.silence.commonframe.bean;
 
 import java.util.List;
 

app/src/main/java/com/silence/commonframe/model/SiteModel.java

@@ -1,4 +1,4 @@
-package com.silence.commonframe.model;
+package com.silence.commonframe.bean;
 
 import java.io.Serializable;
 import java.util.List;

app/src/main/java/com/silence/commonframe/model/TroubleDeviceModel.java

@@ -1,4 +1,4 @@
-package com.silence.commonframe.model;
+package com.silence.commonframe.bean;
 
 import java.util.List;
 

app/src/main/java/com/silence/commonframe/model/TuisongModel.java

@@ -1,4 +1,4 @@
-package com.silence.commonframe.model;
+package com.silence.commonframe.bean;
 
 import java.io.Serializable;
 

app/src/main/java/com/silence/commonframe/model/UploadModel.java

@@ -1,4 +1,4 @@
-package com.silence.commonframe.model;
+package com.silence.commonframe.bean;
 
 import java.util.List;
 

app/src/main/java/com/silence/commonframe/model/VerifyModel.java

@@ -1,4 +1,4 @@
-package com.silence.commonframe.model;
+package com.silence.commonframe.bean;
 
 public class VerifyModel {
     /**

app/src/main/java/com/silence/commonframe/model/WXLoginModel.java

@@ -1,4 +1,4 @@
-package com.silence.commonframe.model;
+package com.silence.commonframe.bean;
 
 public class WXLoginModel {