Parcourir la source

7.1.1
小调整以及清理无用activity

Moon il y a 6 ans
Parent
commit
17001362f6
21 fichiers modifiés avec 149 ajouts et 1496 suppressions
  1. 0 2
      app/app.iml
  2. 6 27
      app/src/main/AndroidManifest.xml
  3. 0 123
      app/src/main/java/com/silence/commonframe/activity/AdddeviceActivity1.java
  4. 0 65
      app/src/main/java/com/silence/commonframe/activity/CameraCommonActivity.java
  5. 0 92
      app/src/main/java/com/silence/commonframe/activity/CameraDetailActivity.java
  6. 0 67
      app/src/main/java/com/silence/commonframe/activity/CameraSavemanagementActivity.java
  7. 0 701
      app/src/main/java/com/silence/commonframe/activity/DeviceContextManagementActivity.java
  8. 1 6
      app/src/main/java/com/silence/commonframe/activity/DevicedetailActivity.java
  9. 62 13
      app/src/main/java/com/silence/commonframe/activity/FireAlarmActivity.java
  10. 0 19
      app/src/main/java/com/silence/commonframe/activity/NavigationActivity.java
  11. 0 67
      app/src/main/java/com/silence/commonframe/activity/QuickSetupActivity.java
  12. 0 66
      app/src/main/java/com/silence/commonframe/activity/RouterActivity.java
  13. 5 2
      app/src/main/java/com/silence/commonframe/activity/mine/activity/setup/SetupActivity.java
  14. 1 1
      app/src/main/java/com/silence/commonframe/wxapi/WXEntryActivity.java
  15. 0 13
      app/src/main/res/layout/activity_adddevice3.xml
  16. 1 1
      app/src/main/res/layout/activity_camera_common.xml
  17. 1 1
      app/src/main/res/layout/activity_camera_savemanagement.xml
  18. 2 80
      app/src/main/res/layout/activity_devicedetail.xml
  19. 70 73
      app/src/main/res/layout/activity_fire_alarm.xml
  20. 0 60
      app/src/main/res/layout/activity_navigation.xml
  21. 0 17
      app/src/main/res/layout/activity_router.xml

+ 0 - 2
app/app.iml

@@ -91,7 +91,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-libraries" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkDebugClasspath" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkReleaseClasspath" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
@@ -111,7 +110,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />

+ 6 - 27
app/src/main/AndroidManifest.xml

@@ -66,7 +66,6 @@
         <!-- android:value="4abbaf9cb40a64046f30ccf9970a7f26" /> -->
         <!-- android:value="70d24ce161a21cb552b195b743058b3a" /> -->
 
-
         <!-- <activity android:name=".activity.MainActivity">   .activity.WelcomeActivity" -->
         <activity
             android:name=".activity.login.WelcomeActivity"
@@ -77,6 +76,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <!-- 雄迈摄像头相关界面 -->
         <activity android:name=".activity.ActivityGuideDeviceSetupStorage" />
         <activity android:name=".example.ActivityGuideDeviceList" />
         <activity android:name=".activity.ActivityGuideDeviceSystemInfo" />
@@ -114,7 +114,7 @@
         <activity
             android:name=".activity.login.NewForgetPasswordActivity"
             android:screenOrientation="portrait" />
-        <!-- 设备列表 -->
+        <!-- 添加设备设备列表 -->
         <activity
             android:name=".activity.home.activity.AdddeviceActivity"
             android:screenOrientation="portrait" />
@@ -167,6 +167,7 @@
         <activity
             android:name=".activity.message.activity.SearchMessageActivity"
             android:screenOrientation="portrait" />
+        <!-- 主页异常场所设备列表 -->
         <activity
             android:name=".activity.DeviceListActivity"
             android:screenOrientation="portrait" />
@@ -188,17 +189,10 @@
         <activity
             android:name=".activity.mine.activity.QuesstionActivity"
             android:launchMode="singleTop" />
-        <activity
-            android:name=".activity.AdddeviceActivity1"
-            android:screenOrientation="portrait" />
         <!-- 复核 -->
         <activity
             android:name=".activity.message.activity.CheckActivity"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".activity.NavigationActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/Transparent" />
         <!-- 选择地址页 -->
         <activity android:name=".activity.home.activity.MapSearchActivity"/>
         <!-- 设置界面 -->
@@ -213,6 +207,7 @@
         <!-- 信息上报 -->
         <activity android:name=".activity.message.activity.NewSubmitActivity"
             android:screenOrientation="portrait"/>
+        <!-- 火警报警弹窗 -->
         <activity
             android:name=".activity.FireAlarmActivity"
             android:theme="@style/Theme.Transparent" />
@@ -274,9 +269,6 @@
         <activity
             android:name=".activity.mine.activity.setup.PrivacyPolicyActivity"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".activity.DeviceContextManagementActivity"
-            android:screenOrientation="portrait" />
         <!-- 新设备关联管理 -->
         <activity
             android:name=".activity.NewContextManagementActivity"
@@ -285,28 +277,18 @@
         <activity
             android:name=".activity.NewAddContextDeviceActivity"
             android:screenOrientation="portrait" />
+        <!-- 摄像头设置界面 -->
         <activity
             android:name=".activity.CameraSetupActivity"
             android:screenOrientation="portrait" />
+        <!-- 摄像头基本设置 -->
         <activity
             android:name=".activity.CameraBasicsettingActivity"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".activity.CameraSavemanagementActivity"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name=".activity.CameraCommonActivity"
-            android:screenOrientation="portrait" />
         <!-- 添加设备(摄像头) -->
         <activity
             android:name=".activity.home.activity.AddDeviceCameraActivity"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".activity.RouterActivity"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name=".activity.CameraDetailActivity"
-            android:screenOrientation="portrait" />
 
         <!-- 微信绑定手机界面 -->
         <activity
@@ -318,9 +300,6 @@
             android:name=".activity.mine.activity.setup.WXPublicCodeActivity"
             android:theme="@style/Theme.Transparent"
             />
-        <activity
-            android:name=".activity.QuickSetupActivity"
-            android:screenOrientation="portrait" />
         <!-- 复核详情 -->
         <activity android:name=".activity.message.activity.NewsdetailActivityShow"
             android:configChanges="orientation|screenSize|keyboardHidden"

+ 0 - 123
app/src/main/java/com/silence/commonframe/activity/AdddeviceActivity1.java

@@ -1,123 +0,0 @@
-package com.silence.commonframe.activity;
-
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.RecyclerView;
-import android.util.Log;
-import android.widget.Toast;
-
-import com.google.gson.Gson;
-import com.lzy.okgo.OkGo;
-import com.lzy.okgo.cache.CacheMode;
-import com.lzy.okgo.callback.StringCallback;
-import com.silence.commonframe.ApiService;
-import com.silence.commonframe.R;
-import com.silence.commonframe.model.DeviceTypeModel;
-import com.silence.commonframe.utils.AtyContainer;
-import com.silence.commonframe.utils.Data;
-import com.silence.commonframe.utils.LoginIn;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import okhttp3.Call;
-import okhttp3.Response;
-
-
-public class AdddeviceActivity1 extends AppCompatActivity {
-    public List<HashMap<String,String>>  listmap = new ArrayList<HashMap<String, String>>();
-   @BindView(R.id.recycleAdd)
-    RecyclerView recycleAdd;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_adddevice3);
-        ButterKnife.bind(this);
-        AtyContainer.getInstance().addActivity(this);
-        getdata();
-    }
-
-    private void getdata() {
-        HashMap<String, String> params = new HashMap<>();
-      //  params.put("siteid", "7");//id
-        //   params.put("dLocation", stringplace);
-//        params.put("name", "liming");
-//        params.put("siteid", "191");
-//        params.put("phone", "13124257879");
-//    params.put("phone", "13333311338");
-        JSONObject jsonObject = new JSONObject(params);
-        String s = Data.getToken();
-        Log.v("Tag",s);
-        String str = jsonObject.toString();
-        OkGo.post(ApiService.httpUrl+"getdevicetype")
-                .tag(this)
-                .cacheKey("cachePostRegister11")
-                .cacheMode(CacheMode.DEFAULT)
-                .upJson(jsonObject.toString())
-
-                .headers("token", Data.getToken())
-
-                .execute(new StringCallback() {
-                    @Override
-                    public void onSuccess(String s, Call call, Response response) {
-                        try {
-                            JSONObject jsonObject = new JSONObject(s);
-                            String message = jsonObject.get("msg").toString();
-                            DeviceTypeModel deviceType = new Gson().fromJson(s, DeviceTypeModel.class);
-                            if (message.equalsIgnoreCase("success")){
-//                                for (int i = 0;i<deviceType.getObject().size();i++){
-//                                    HashMap<String,String>  hashMap = new HashMap<>();
-//                                    String typeExp = deviceType.getObject().get(i).getTypeExp();
-//                                    String typePic = deviceType.getObject().get(i).getTypePic();
-//                                    String getGroupId = String.valueOf(deviceType.getObject().get(i).getGroup_id());
-//                                    String explain = String.valueOf(deviceType.getObject().get(i).getExplain());
-//                                    hashMap.put("typeExp",typeExp);
-//                                    hashMap.put("typePic",typePic);
-//                                    hashMap.put("getGroupId",getGroupId);
-//                                    hashMap.put("explain",explain);
-//                                  //  list.add(place);
-//
-//                                    listmap.add(hashMap);
-//                                }
-        //
-        //
-        //                        Data.setList(list);
-        //                        Data.setListmap(listmap);
-        //
-        //
-                                runOnUiThread(new Runnable() {
-                                    @Override
-                                    public void run() {
-        //                                myAdapter1 = new MyAdapter( listmap,getContext());
-        //                                listView.setAdapter(myAdapter1);
-                                    }
-                                });
-
-                                Toast.makeText(AdddeviceActivity1.this,"联系中人添加成功!"+s,Toast.LENGTH_SHORT).show();
-        //                    System.out.println(""+s);
-                            }else{
-                                LoginIn.tokenOut(message,AdddeviceActivity1.this);
-                            }
-
-                        } catch (JSONException e) {
-                            e.printStackTrace();
-                        }
-
-                    }
-                    @Override
-                    public void onError(Call call, Response response, Exception e) {
-                        super.onError(call, response, e);
-//                        Toast.makeText(getContext(),"NOsuccess "+e,Toast.LENGTH_SHORT).show();
-                        System.out.println("sss"+e);
-                    }
-                    });
-    }
-}

+ 0 - 65
app/src/main/java/com/silence/commonframe/activity/CameraCommonActivity.java

@@ -1,65 +0,0 @@
-package com.silence.commonframe.activity;
-
-import android.graphics.Color;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.TextView;
-
-import com.silence.commonframe.R;
-import com.silence.commonframe.utils.AtyContainer;
-
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-/**
- * 摄像头通用界面
- * @author 郑嘉明
- * common_deviceid、common_cameratype、common_lastupdatetime、common_videomodel
- */
-public class CameraCommonActivity extends AppCompatActivity {
-    /**
-     * 导航栏信息
-     * back_pic、navi_head_back_text(透明)、navi_head_text、navi_head_text_right(右侧文字)、navi_head_img_right(右侧图片)
-     */
-   @BindView(R.id.navi_head_text)
-    TextView navi_head_text;    //标题
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_camera_common);
-        ButterKnife.bind(this);
-        AtyContainer.getInstance().addActivity(this);
-        navi_head_text.setText(R.string.camerasetup_common);       //设置标题
-        //设置全屏
-        initWindows();
-    }
-
-    /**
-     * 页面全屏
-     */
-    private void initWindows() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            Window window = getWindow();
-            window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS
-                    | WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
-            window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
-            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-            window.setStatusBarColor(Color.TRANSPARENT);
-            window.setNavigationBarColor(Color.BLACK);
-        }
-    }
-
-    /**
-     * 返回按钮
-     */
-    public void click_back(View view) {
-        finish();
-    }
-}

+ 0 - 92
app/src/main/java/com/silence/commonframe/activity/CameraDetailActivity.java

@@ -1,92 +0,0 @@
-package com.silence.commonframe.activity;
-
-import android.content.Intent;
-import android.graphics.Color;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.silence.commonframe.R;
-import com.silence.commonframe.utils.AtyContainer;
-
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-/**
- * 摄像头设备详情
- */
-public class CameraDetailActivity extends AppCompatActivity {
-
-    /**
-     * 导航栏信息
-     * back_pic、navi_head_back_text(透明)、navi_head_text、navi_head_text_right(右侧文字)、navi_head_img_right(右侧图片)
-     */
-   @BindView(R.id.navi_head_text)
-    TextView navi_head_text;    //标题
-   @BindView(R.id.navi_head_img_right)
-    ImageView navi_head_img_right;      //导航栏右侧图片
-
-    String deviceId;        //摄像头设备ID
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_camera_detail);
-        ButterKnife.bind(this);
-        AtyContainer.getInstance().addActivity(this);
-        navi_head_text.setText(R.string.devicedetail);       //设置标题
-        navi_head_img_right.setVisibility(View.VISIBLE);
-        navi_head_img_right.setImageResource(R.drawable.setup);
-        //设置全屏
-        initWindows();
-
-        //“设置“点击事件
-        setupOnClickListener();
-
-    }
-
-    /**
-     * 跳转到摄像头设置界面
-     */
-    private void setupOnClickListener() {
-        Intent intent_camera = getIntent();
-        deviceId = intent_camera.getStringExtra("deviceId");
-        navi_head_img_right.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(CameraDetailActivity.this,CameraSetupActivity.class);
-                intent.putExtra("deviceId",deviceId);
-                startActivity(intent);
-            }
-        });
-    }
-
-    /**
-     * 页面全屏
-     */
-    private void initWindows() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            Window window = getWindow();
-            window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS
-                    | WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
-            window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
-            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-            window.setStatusBarColor(Color.TRANSPARENT);
-            window.setNavigationBarColor(Color.BLACK);
-        }
-    }
-
-    /**
-     * 返回按钮
-     */
-    public void click_back(View view) {
-        finish();
-    }
-}

+ 0 - 67
app/src/main/java/com/silence/commonframe/activity/CameraSavemanagementActivity.java

@@ -1,67 +0,0 @@
-package com.silence.commonframe.activity;
-
-import android.graphics.Color;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.TextView;
-
-import com.silence.commonframe.R;
-import com.silence.commonframe.utils.AtyContainer;
-
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-/**
- * 摄像头储存管理
- * @author 郑嘉明
- * savemanagement_totalcapacity、savemanagement_remaincapacity、savemanagement_videocapacity、savemanagement_videoremaincapacity、
- * savemanagement_picturecapacity、savemanagement_pictureremaincapacity、savemanagement_clearstorage
- */
-public class CameraSavemanagementActivity extends AppCompatActivity {
-    /**
-     * 导航栏信息
-     * back_pic、navi_head_back_text(透明)、navi_head_text、navi_head_text_right(右侧文字)、navi_head_img_right(右侧图片)
-     */
-   @BindView(R.id.navi_head_text)
-    TextView navi_head_text;    //标题
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_camera_savemanagement);
-        ButterKnife.bind(this);
-        AtyContainer.getInstance().addActivity(this);
-        navi_head_text.setText(R.string.camerasetup_savemanagement);       //设置标题
-        //设置全屏
-        initWindows();
-    }
-
-    /**
-     * 页面全屏
-     */
-    private void initWindows() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            Window window = getWindow();
-            window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS
-                    | WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
-            window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
-            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-            window.setStatusBarColor(Color.TRANSPARENT);
-            window.setNavigationBarColor(Color.BLACK);
-        }
-    }
-
-    /**
-     * 返回按钮
-     */
-    public void click_back(View view) {
-        finish();
-    }
-
-}

+ 0 - 701
app/src/main/java/com/silence/commonframe/activity/DeviceContextManagementActivity.java

@@ -1,701 +0,0 @@
-package com.silence.commonframe.activity;
-
-import android.content.Intent;
-import android.graphics.Color;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.google.gson.Gson;
-import com.lzy.okgo.OkGo;
-import com.lzy.okgo.cache.CacheMode;
-import com.lzy.okgo.callback.StringCallback;
-import com.silence.commonframe.ApiService;
-import com.silence.commonframe.R;
-import com.silence.commonframe.adapter.DeviceContextAdapter;
-import com.silence.commonframe.adapter.DeviceContextAdapterCamera;
-import com.silence.commonframe.base.basemvp.BaseActivity;
-import com.silence.commonframe.bean.IsDeviceChange;
-import com.silence.commonframe.model.DelContextDevice;
-import com.silence.commonframe.model.DelContextDevice_success;
-import com.silence.commonframe.utils.AtyContainer;
-import com.silence.commonframe.utils.Data;
-import com.silence.commonframe.utils.LoginIn;
-import com.silence.commonframe.utils.ManagePopupMenu;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import okhttp3.Call;
-import okhttp3.Response;
-
-/**
- * 关联设备管理
- * @author 郑嘉明
- * device_context_checkbox、device_context_name、device_context_state、device_context_location、context_device_camera_amount、context_device_smokedetector_amount
- */
-public class DeviceContextManagementActivity extends BaseActivity {
-
-    /**
-     * 导航栏信息
-     * back_pic、navi_head_back_text(透明)、navi_head_text、navi_head_text_right(右侧文字)
-     */
-   @BindView(R.id.navi_head_text)
-    TextView navi_head_text;    //标题
-   @BindView(R.id.navi_head_text_right)
-    TextView navi_head_text_right;  //导航栏右侧文字
-
-   @BindView(R.id.recycleview_camera)
-    RecyclerView recycleview_camera;    //摄像头列表
-   @BindView(R.id.recyclerview_smoke)
-    RecyclerView recyclerview_smoke;    //烟感列表
-   @BindView(R.id.context_device_camera_amount)
-    TextView context_device_camera_amount;      //摄像头数量
-   @BindView(R.id.context_device_smokedetector_amount)
-    TextView context_device_smokedetector_amount;   //烟感数量
-   @BindView(R.id.hint_camera)
-    TextView hint_camera;   //提示无摄像头
-   @BindView(R.id.hint_smoke)
-    TextView hint_smoke;    //提示无烟感
-   @BindView(R.id.context_device_del_submit)
-    LinearLayout context_device_del_submit;
-
-    private List<HashMap<String,String>> listmap_camera = new ArrayList<>();
-    private List<HashMap<String,String>> listmap_smoke = new ArrayList<>();
-    DeviceContextAdapterCamera cameraAdapter;     //设置关联摄像头构造器
-    DeviceContextAdapter smokeAdapter;      //设置关联烟感构造器
-
-    List<String> listCameraDel = new ArrayList<>();
-    List<String> listSmokeDel = new ArrayList<>();
-
-    private String device_id = "0000000000000051";
-
-    private ManagePopupMenu manageMenu;     //管理菜单
-
-    private int change = 0;
-
-    private int rowsCameradata;
-    private int rowCamere;
-    private  int rowSmoke;
-    private int rowsFiredata;
-
-    private int devId;
-    private    Boolean flag = false;
-
-//    @Override
-//    protected void onCreate(Bundle savedInstanceState) {
-//        super.onCreate(savedInstanceState);
-//        setContentView(R.layout.activity_device_context_management);
-//        ButterKnife.bind(this);
-//        AtyContainer.getInstance().addActivity(this);
-//        navi_head_text.setText(R.string.devicedetail_associateddevicemanagement);       //设置标题
-//        navi_head_text_right.setText(R.string.devicecontext_management);                //设置导航栏右侧文字
-//        context_device_del_submit.setVisibility(View.GONE);     //提交按钮默认消失
-//        //设置全屏
-//        initWindows();
-//
-//        IsDeviceChange.setIsContextCamera(true);
-//
-//        //获取传递过来的值
-//        getIntentMsg();
-////        device_id = Data.getDevIdsCamera();
-//
-//        //获取关联设备
-//        getContextDevice();
-//        //设置管理菜单
-//        getManageMenu();
-//        //提交点击事件
-//        del_sumbitOnClickListener();
-//
-////        context_device_del_submit.setOnClickListener(new View.OnClickListener() {
-////            @Override
-////            public void onClick(View v) {
-////                listCameraDel.addAll(cameraAdapter.getCheckBoxIDList());
-////                listSmokeDel.addAll(smokeAdapter.getCheckBoxIDList());
-//
-////                if (listCameraDel.size() != 0 || listSmokeDel.size() != 0){
-////                    //解除设备关联关系
-////                    delContextDevice();
-////                    change = 1;     //页面改变
-////                    cameraAdapter.removeAdapterItem();  //adapter中删除要删除的item并刷新
-////                    smokeAdapter.removeAdapterItem();
-////                    listCameraDel.clear();              //删完清空
-////                    listSmokeDel.clear();
-////                    cameraAdapter.setIsShow(false);                    //设置checkbox不显示
-////                    cameraAdapter.notifyDataSetChanged();                    //刷新adapter
-////                    smokeAdapter.setIsShow(false);                    //设置checkbox不显示
-////                    smokeAdapter.notifyDataSetChanged();                    //刷新adapter
-////                    context_device_del_submit.setVisibility(View.GONE);     //提交按钮消失
-////                }else {
-////                    Toast.makeText(DeviceContextManagementActivity.this,"请先选择要解除关联的设备",Toast.LENGTH_SHORT).show();
-////                }
-////
-////            }
-////        });
-//
-//    }
-
-    @Override
-    public int getLayoutId() {
-        return R.layout.activity_device_context_management;
-    }
-
-    @Override
-    public void initPresenter() {
-
-    }
-
-    @Override
-    public void initView() {
-
-    }
-
-    /**
-     * 若新增关联设备成功,刷新
-     * @param requestCode 3
-     * @param resultCode 3
-     * @param data 无
-     */
-//    @Override
-//    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-//        super.onActivityResult(requestCode, resultCode, data);
-//        if (requestCode == 3 && resultCode == 3){
-//            if (listmap_smoke.size() != 0){
-//                listmap_smoke.clear();          //清空刷新重新获取
-//            }
-//            if (listmap_camera.size() != 0){
-//                listmap_camera.clear();
-//            }
-//            change = 1;
-//            //获取关联设备
-//            getContextDevice();
-//        }
-//    }
-
-    /**
-     * 获取传递过来的值
-     * device_id
-     */
-    private void getIntentMsg() {
-        Intent intent = getIntent();
-        device_id = intent.getStringExtra("deviceId");
-    }
-
-    /**
-     * 提交解除关联设备
-     */
-    private void del_sumbitOnClickListener() {
-        context_device_del_submit.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-              //  listCameraDel.addAll(cameraAdapter.getCheckBoxIDList());
-              //  listSmokeDel.addAll(smokeAdapter.getCheckBoxIDList());
-
-//                if (Data.getCheckBoxIDListData().size() == 0&&Data.getCheckBoxIDListDataCamera().size() == 0){
-//
-//                    Toast.makeText(DeviceContextManagementActivity.this,"请选择要删除的数据!",Toast.LENGTH_SHORT).show();
-//                //    return;
-//                }
-
-                if (Data.getCheckBoxIDListData()!= null&&Data.getCheckBoxIDListData().size()!= 0){
-                   //Data.getCheckBoxIDListDataCamera()
-                    listSmokeDel.addAll(Data.getCheckBoxIDListData());
-                }
-                if (Data.getCheckBoxIDListDataCamera()!= null&&Data.getCheckBoxIDListDataCamera().size()!= 0){
-                 //   listSmokeDel.addAll(Data.getCheckBoxIDListData());
-                    listCameraDel.addAll(Data.getCheckBoxIDListDataCamera());
-                }
-
-                if (listSmokeDel.size() == 0&&listCameraDel.size() == 0){
-//
-                    Toast.makeText(DeviceContextManagementActivity.this,"请选择要删除的数据!",Toast.LENGTH_SHORT).show();
-//                    return;
-                }
-
-                if (listCameraDel.size() != 0 /*|| listSmokeDel.size() != 0*/){
-                    //解除设备关联关系
-                 //   delContextDevice();
-                    delContextDeviceCamera();
-                    change = 1;     //页面改变
-                //    cameraAdapter.removeAdapterItem();  //adapter中删除要删除的item并刷新
-                //    smokeAdapter.removeAdapterItem();
-                    listCameraDel.clear();              //删完清空
-             //       listSmokeDel.clear();
-                    cameraAdapter.setIsShow(false);                    //设置checkbox不显示
-               //     cameraAdapter.notifyDataSetChanged();                    //刷新adapter
-//                    smokeAdapter.setIsShow(false);                    //设置checkbox不显示
-//                    smokeAdapter.notifyDataSetChanged();                    //刷新adapter
-                    context_device_del_submit.setVisibility(View.GONE);     //提交按钮消失
-                   final String rowCamereString = String.valueOf(rowCamere);
-                    runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            context_device_camera_amount.setText(rowCamereString+"个");
-                        }
-                    });
-
-                }
-                if (listSmokeDel.size() != 0){
-                    delContextDevice();
-                    change = 1;     //页面改变
-                  //  smokeAdapter.removeAdapterItem();
-                    listSmokeDel.clear();
-                    smokeAdapter.setIsShow(false);                    //设置checkbox不显示
-                    smokeAdapter.notifyDataSetChanged();
-                    context_device_del_submit.setVisibility(View.GONE);
-
-                  final  String rowSmokeString = String.valueOf(rowSmoke);
-                  runOnUiThread(new Runnable() {
-                      @Override
-                      public void run() {
-                          context_device_smokedetector_amount.setText(rowSmokeString+"个");
-                      }
-                  });
-
-                }
-
-             //   onResume();
-             //   context_device_del_submit.setVisibility(View.GONE);
-
-//                if (listCameraDel.size() == 0 || listSmokeDel.size() == 0){
-//                    Toast.makeText(DeviceContextManagementActivity.this,"请先选择要解除关联的设备",Toast.LENGTH_SHORT).show();
-//                    return;
-//                }
-
-            }
-        });
-    }
-
-    /**
-     * 删除关联设备关系
-     */
-    private void delContextDevice() {
-//        for (int i = 0; i < listCameraDel.size(); i++){
-//            String url1 = ApiService.httpUrl1 + "/app/deleteDeviceConnect?id="+listCameraDel.get(i);
-//            OkGo.get(url1)
-//                    .tag(this)
-//                    .cacheKey("cacheGetKey")
-//                    .cacheMode(CacheMode.DEFAULT)
-//                    .headers("token",Data.getToken())
-//                    .execute(new StringCallback() {
-//                        @Override
-//                        public void onSuccess(String s, Call call, Response response) {
-//                            DelContextDevice delContextDevice = new Gson().fromJson(s,DelContextDevice.class);
-//                            String message = delContextDevice.getMsg();
-//                            int code = delContextDevice.getCode();
-//                            if ("success".equals(message)){
-//                                DelContextDevice_success.setSuccess1(true);
-//                            }else {
-//                                LoginIn.tokenOut(code,message,DeviceContextManagementActivity.this);
-//                                Toast.makeText(DeviceContextManagementActivity.this,""+message,Toast.LENGTH_SHORT).show();
-//                            }
-//                        }
-//                    });
-//        }
-
-        if (listSmokeDel.size() == 1){
-            Boolean flag = false;
-            String url1 = ApiService.httpUrl1 +Data.getConfigUrl()+ "/deleteDeviceConnect?id="+listSmokeDel.get(0);
-            OkGo.get(url1)
-                    .tag(this)
-                    .cacheKey("cacheGetKey")
-                    .cacheMode(CacheMode.DEFAULT)
-                    .headers("token",Data.getToken())
-                    .execute(new StringCallback() {
-                        @Override
-                        public void onSuccess(String s, Call call, Response response) {
-                            DelContextDevice delContextDevice = new Gson().fromJson(s,DelContextDevice.class);
-                            String message = delContextDevice.getMsg();
-                            int code = delContextDevice.getCode();
-                            if ("success".equals(message)){
-                                DelContextDevice_success.setSuccess1(true);
-                                runOnUiThread(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        //   listmap_camera.remove(listCameraDel.get(0));
-                                        //     cameraAdapter.removeAdapterItem();
-                                        smokeAdapter.notifyDataSetChanged();
-                                    }
-                                });
-
-
-
-                            }else {
-                                LoginIn.tokenOut(code,message,DeviceContextManagementActivity.this);
-                                Toast.makeText(DeviceContextManagementActivity.this,""+message,Toast.LENGTH_SHORT).show();
-                            }
-                        }
-                    });
-            flag = true;
-        }
-
-        for (int i = 0; i < listSmokeDel.size(); i++) {
-            String url2 = ApiService.httpUrl1 +Data.getConfigUrl()+ "/deleteDeviceConnect?id=" + listSmokeDel.get(i);
-            OkGo.get(url2)
-                    .tag(this)
-                    .cacheKey("cacheGetKey")
-                    .cacheMode(CacheMode.DEFAULT)
-                    .headers("token", Data.getToken())
-                    .execute(new StringCallback() {
-                        @Override
-                        public void onSuccess(String s, Call call, Response response) {
-                            DelContextDevice delContextDevice = new Gson().fromJson(s, DelContextDevice.class);
-                            String message = delContextDevice.getMsg();
-                            int code = delContextDevice.getCode();
-                            if ("success".equals(message)) {
-                                DelContextDevice_success.setSuccess2(true);
-
-
-
-                            } else {
-                                LoginIn.tokenOut(code, message, DeviceContextManagementActivity.this);
-                                Toast.makeText(DeviceContextManagementActivity.this,""+message,Toast.LENGTH_SHORT).show();
-                            }
-                        }
-                    });
-
-            smokeAdapter.removeAdapterItem();
-        }
-        rowSmoke =  rowsFiredata  - listSmokeDel.size();
-      //  Toast.makeText(DeviceContextManagementActivity.this, "烟感设备删除成功", Toast.LENGTH_SHORT).show();
-    }
-
-    private void delContextDeviceCamera() {
-     //   listmap_camera
-        if (listCameraDel.size() == 1){
-            Boolean flag = false;
-            String url1 = ApiService.httpUrl1 +Data.getConfigUrl()+ "/deleteDeviceConnect?id="+listCameraDel.get(0);
-            OkGo.get(url1)
-                    .tag(this)
-                    .cacheKey("cacheGetKey")
-                    .cacheMode(CacheMode.DEFAULT)
-                    .headers("token",Data.getToken())
-                    .execute(new StringCallback() {
-                        @Override
-                        public void onSuccess(String s, Call call, Response response) {
-                            DelContextDevice delContextDevice = new Gson().fromJson(s,DelContextDevice.class);
-                            String message = delContextDevice.getMsg();
-                            int code = delContextDevice.getCode();
-                            if ("success".equals(message)){
-                                DelContextDevice_success.setSuccess1(true);
-                                runOnUiThread(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                     //   listmap_camera.remove(listCameraDel.get(0));
-                                   //     cameraAdapter.removeAdapterItem();
-                                        cameraAdapter.notifyDataSetChanged();
-                                    }
-                                });
-
-
-
-                            }else {
-                                LoginIn.tokenOut(code,message,DeviceContextManagementActivity.this);
-                                Toast.makeText(DeviceContextManagementActivity.this,""+message,Toast.LENGTH_SHORT).show();
-                            }
-                        }
-                    });
-
-            if (flag){
-                    cameraAdapter.removeAdapterItem();
-                    }
-            flag = true;
-        }
-    //    if (listCameraDel.size() > 1){
-            for (int i = 0; i < listCameraDel.size(); i++){
-              //  listmap_camera.remove(listCameraDel.get(i));
-                String url1 = ApiService.httpUrl1 +Data.getConfigUrl()+ "/deleteDeviceConnect?id="+listCameraDel.get(i);
-                final int finalI = i;
-                OkGo.get(url1)
-                        .tag(this)
-                        .cacheKey("cacheGetKey")
-                        .cacheMode(CacheMode.DEFAULT)
-                        .headers("token",Data.getToken())
-                        .execute(new StringCallback() {
-                            @Override
-                            public void onSuccess(String s, Call call, Response response) {
-                                DelContextDevice delContextDevice = new Gson().fromJson(s,DelContextDevice.class);
-                                String message = delContextDevice.getMsg();
-                                int code = delContextDevice.getCode();
-                                if ("success".equals(message)){
-                                    DelContextDevice_success.setSuccess1(true);
-                                    runOnUiThread(new Runnable() {
-                                        @Override
-                                        public void run() {
-                                           // cameraAdapter.removeAdapterItem();
-                                         //   listmap_camera.remove(listCameraDel.get(finalI));
-                                          //  cameraAdapter.notifyDataSetChanged();
-                                        }
-                                    });
-                                }else {
-                                    LoginIn.tokenOut(code,message,DeviceContextManagementActivity.this);
-                                    Toast.makeText(DeviceContextManagementActivity.this,""+message,Toast.LENGTH_SHORT).show();
-                                }
-                            }
-                        });
-//                if (listCameraDel.size()!=0){
-//                    cameraAdapter.removeAdapterItem();
-//                }
-                cameraAdapter.removeAdapterItem();
-            }
-    //    }
-        rowCamere =   rowsCameradata  - listCameraDel.size();
-//        for (int i = 0; i < listSmokeDel.size(); i++) {
-//            String url2 = ApiService.httpUrl1 + "/app/deleteDeviceConnect?id=" + listSmokeDel.get(i);
-//            OkGo.get(url2)
-//                    .tag(this)
-//                    .cacheKey("cacheGetKey")
-//                    .cacheMode(CacheMode.DEFAULT)
-//                    .headers("token", Data.getToken())
-//                    .execute(new StringCallback() {
-//                        @Override
-//                        public void onSuccess(String s, Call call, Response response) {
-//                            DelContextDevice delContextDevice = new Gson().fromJson(s, DelContextDevice.class);
-//                            String message = delContextDevice.getMsg();
-//                            int code = delContextDevice.getCode();
-//                            if ("success".equals(message)) {
-//                                DelContextDevice_success.setSuccess2(true);
-//                            } else {
-//                                LoginIn.tokenOut(code, message, DeviceContextManagementActivity.this);
-//                                Toast.makeText(DeviceContextManagementActivity.this,""+message,Toast.LENGTH_SHORT).show();
-//                            }
-//                        }
-//                    });
-  //      }
-        Toast.makeText(DeviceContextManagementActivity.this, "摄像头设备删除成功!", Toast.LENGTH_SHORT).show();
-    }
-
-    /**
-     *  设置管理菜单
-     */
-    private void getManageMenu() {
-        //设置新的菜单
-        manageMenu = new ManagePopupMenu(DeviceContextManagementActivity.this, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-        manageMenu.addItem(getResources().getDrawable(R.mipmap.homeadd1),"添加");     //加添加选项
-        manageMenu.addItem(getResources().getDrawable(R.mipmap.del),"删除");          //加删除选项
-        //设置菜单选项点击事件
-        manageMenu.setItemOnClickListener(new ManagePopupMenu.OnItemOnClickListener() {
-            @Override
-            public void onItemClick(String desc) {
-                if ("添加".equals(desc)){         //添加事件
-//                    Toast.makeText(DeviceContextManagementActivity.this,"添加",Toast.LENGTH_SHORT).show();
-                    Intent intent_contextdevice_management = new Intent(DeviceContextManagementActivity.this,NewAddContextDeviceActivity.class);
-                    intent_contextdevice_management.putExtra("deviceId",device_id);
-                    startActivityForResult(intent_contextdevice_management,3);
-                }else if ("删除".equals(desc)){   //删除事件
-//                    Toast.makeText(DeviceContextManagementActivity.this,"删除",Toast.LENGTH_SHORT).show();
-                    if (listmap_camera.size() == 0 && listmap_smoke.size() == 0){
-                        Toast.makeText(DeviceContextManagementActivity.this,"还没有任何关联的设备哦",Toast.LENGTH_SHORT).show();
-                        context_device_del_submit.setVisibility(View.GONE);
-                    }else {
-                        if (listmap_camera.size() != 0){
-                            cameraAdapter.setIsShow(!cameraAdapter.getShow());      //checkbox点击显示或隐藏
-                            if (cameraAdapter.getShow()){
-                                context_device_del_submit.setVisibility(View.VISIBLE);      //显示提交按钮
-                            }
-                        }
-                        if (listmap_smoke.size() != 0){
-                            smokeAdapter.setIsShow(!smokeAdapter.getShow());        //checkbox点击显示或隐藏
-                            if (smokeAdapter.getShow()){
-                                context_device_del_submit.setVisibility(View.VISIBLE);      //显示提交按钮
-                            }
-                        }
-//                        if (!smokeAdapter.getShow() && !cameraAdapter.getShow()){
-//                            context_device_del_submit.setVisibility(View.GONE);
-//                        }
-
-                    }
-                }
-            }
-        });
-
-        //点击显示管理菜单或消失
-        navi_head_text_right.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                manageMenu.show(v, ManagePopupMenu.STYLE_ALIGN_THIS_BOTTOM_WINDOW_RIGHT);
-            }
-        });
-    }
-
-    /**
-     * 获取关联设备
-     * Camera、smoke
-     */
-    private void getContextDevice() {
-        String url = ApiService.httpUrl1 + Data.getConfigUrl()+ "/getConnectDevice?deviceId="+device_id;     //获取关联设备列表
-        OkGo.get(url)
-                .tag(this)                       // 请求的 tag, 主要用于取消对应的请求
-                .cacheKey("cacheGetKey")            // 设置当前请求的缓存key,建议每个不同功能的请求设置一个
-                .cacheMode(CacheMode.DEFAULT)    // 缓存模式,详细请看缓存介绍
-                .headers("token", Data.getToken())
-                .execute(new StringCallback() {
-                    @Override
-                    public void onSuccess(String s, Call call, Response response) {
-                        try {
-                            JSONObject jsonObject = new JSONObject(s);
-                            String message = jsonObject.get("msg").toString();
-                            System.out.println(jsonObject);
-                            if (message.equalsIgnoreCase("success")){
-                                JSONObject jsonData = jsonObject.getJSONObject("data");
-                                JSONObject jsonCameardata = jsonData.getJSONObject("cameradata");
-                                JSONObject jsonFiredata = jsonData.getJSONObject("firedata");
-                                JSONArray listCameradata = jsonCameardata.getJSONArray("dataList");
-                                JSONArray listFiredata = jsonFiredata.getJSONArray("dataList");
-                                rowsCameradata = jsonCameardata.getInt("rows");       //总的关联的摄像头设备的数量
-
-
-                                rowsFiredata = jsonFiredata.getInt("rows");         //总的关联的烟感设备的数量
-
-                                for (int i = 0; i < listCameradata.length(); i++){          //循环取出摄像头里面的信息,List
-                                    HashMap<String,String> hashMapCameradata = new HashMap<>();
-
-                                    JSONObject jsonObjectCameradata = listCameradata.getJSONObject(i);
-                                    String cameraId = jsonObjectCameradata.get("id").toString();
-                                    String cameraDeviceName = jsonObjectCameradata.get("deviceName").toString();
-                                    String cameraLocation = jsonObjectCameradata.get("location").toString();
-                                    String cameraDeviceId= jsonObjectCameradata.get("deviceId").toString();
-                                    String cameraAddTime = jsonObjectCameradata.get("addTime").toString();
-                                    String cameraStatus = jsonObjectCameradata.get("status").toString();
-                                    String cameraDeviceType = jsonObjectCameradata.get("deviceType").toString();
-
-                                    hashMapCameradata.put("id",cameraId);
-                                    hashMapCameradata.put("location",cameraLocation);
-                                    hashMapCameradata.put("deviceName",cameraDeviceName);
-                                    hashMapCameradata.put("deviceId",cameraDeviceId);
-                                    hashMapCameradata.put("addTime",cameraAddTime);
-                                    hashMapCameradata.put("status",cameraStatus);
-                                    hashMapCameradata.put("deviceType",cameraDeviceType);
-
-                                    listmap_camera.add(hashMapCameradata);
-                                }
-
-                                for (int i = 0; i < listFiredata.length(); i++){            //循环取出烟感设备里面的信息、List
-                                    HashMap<String,String> hashMapFiredata = new HashMap<>();
-
-                                    JSONObject jsonObjectFiredata = listFiredata.getJSONObject(i);
-                                    String firedataId = jsonObjectFiredata.get("id").toString();
-                                    String firedataDeviceName = jsonObjectFiredata.get("deviceName").toString();
-                                    String firedataLocation = jsonObjectFiredata.get("location").toString();
-                                    String firedataDeviceId= jsonObjectFiredata.get("deviceId").toString();
-                                    String firedataAddTime = jsonObjectFiredata.get("addTime").toString();
-                                    String firedataStatus = jsonObjectFiredata.get("status").toString();
-                                    String firedataDeviceType = jsonObjectFiredata.get("deviceType").toString();
-
-                                    hashMapFiredata.put("id",firedataId);
-                                    hashMapFiredata.put("deviceName",firedataDeviceName);
-                                    hashMapFiredata.put("location",firedataLocation);
-                                    hashMapFiredata.put("deviceId",firedataDeviceId);
-                                    hashMapFiredata.put("addTime",firedataAddTime);
-                                    hashMapFiredata.put("status",firedataStatus);
-                                    hashMapFiredata.put("deviceType",firedataDeviceType);
-
-                                    listmap_smoke.add(hashMapFiredata);
-                                }
-
-                                runOnUiThread(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        String rowsFire = rowsFiredata + "个";
-                                        String rowsCamera = rowsCameradata + "个";
-                                        context_device_smokedetector_amount.setText(rowsFire);
-                                        context_device_camera_amount.setText(rowsCamera);
-
-                                        if (listmap_camera.size() == 0){
-                                            hint_camera.setVisibility(View.VISIBLE);    //如果没有关联摄像头,出现文字提示
-                                        }else {
-                                            hint_camera.setVisibility(View.GONE);
-                                            //setAdapter
-                                            cameraAdapter = new DeviceContextAdapterCamera(DeviceContextManagementActivity.this,listmap_camera);
-                                            recycleview_camera.setLayoutManager(new LinearLayoutManager(DeviceContextManagementActivity.this));
-                                            recycleview_camera.setAdapter(cameraAdapter);
-                                            //设置checkbox不显示
-                                            cameraAdapter.setIsShow(false);
-                                            //刷新adapter
-                                         //   cameraAdapter.notifyDataSetChanged();
-                                        }
-
-                                        if (listmap_smoke.size() == 0){
-                                            hint_smoke.setVisibility(View.VISIBLE);    //如果没有关联烟感,出现文字提示
-                                        }else {
-                                            hint_smoke.setVisibility(View.GONE);
-                                            //setAdapter
-                                            smokeAdapter = new DeviceContextAdapter(DeviceContextManagementActivity.this,listmap_smoke);
-                                            recyclerview_smoke.setLayoutManager(new LinearLayoutManager(DeviceContextManagementActivity.this));
-                                            recyclerview_smoke.setAdapter(smokeAdapter);
-                                            //设置checkbox不显示
-                                            smokeAdapter.setIsShow(false);
-                                            //刷新adapter
-                                         //   smokeAdapter.notifyDataSetChanged();
-                                        }
-
-                                    }
-                                });
-
-                            }else {
-                                //登录失败
-                                LoginIn.tokenOut(message,DeviceContextManagementActivity.this);
-                            }
-                        } catch (JSONException e) {
-                            e.printStackTrace();
-                        }
-
-
-                    }
-                });
-    }
-
-    /**
-     * 页面全屏
-     */
-    private void initWindows() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            Window window = getWindow();
-            window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS
-                    | WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
-            window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
-            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-            window.setStatusBarColor(Color.TRANSPARENT);
-            window.setNavigationBarColor(Color.BLACK);
-        }
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        if (flag){
-            listmap_camera.clear();
-            listmap_smoke.clear();
-            getContextDevice();
-        }
-        flag = true;
-
-    }
-
-    public void click_back(View view) {
-        if (change == 1){
-            setResult(4);
-        }
-        IsDeviceChange.setIsContextCamera(false);
-        finish();
-    }
-}

+ 1 - 6
app/src/main/java/com/silence/commonframe/activity/DevicedetailActivity.java

@@ -1,12 +1,10 @@
 package com.silence.commonframe.activity;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -23,7 +21,6 @@ import com.lzy.okgo.OkGo;
 import com.lzy.okgo.cache.CacheMode;
 import com.lzy.okgo.callback.StringCallback;
 import com.silence.commonframe.ApiService;
-import com.silence.commonframe.Dialog.LoadingDialog;
 import com.silence.commonframe.R;
 import com.silence.commonframe.adapter.DeviceDetailContextAdapter;
 import com.silence.commonframe.bean.IsDeviceChange;
@@ -34,7 +31,6 @@ import com.silence.commonframe.utils.Data;
 import com.silence.commonframe.utils.LoginIn;
 import com.silence.commonframe.utils.ThrottleFirst;
 
-import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -42,7 +38,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import okhttp3.Call;
@@ -320,7 +315,7 @@ public class DevicedetailActivity extends AppCompatActivity {
         context_device_add.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent intent_contextdevice_management = new Intent(DevicedetailActivity.this,DeviceContextManagementActivity.class);
+                Intent intent_contextdevice_management = new Intent(DevicedetailActivity.this,NewContextManagementActivity.class);
                 intent_contextdevice_management.putExtra("deviceId",deviceid);
                 startActivityForResult(intent_contextdevice_management,4);
             }

+ 62 - 13
app/src/main/java/com/silence/commonframe/activity/FireAlarmActivity.java

@@ -2,22 +2,76 @@ package com.silence.commonframe.activity;
 
 import android.content.Intent;
 import android.media.MediaPlayer;
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
-import android.view.Window;
 import android.widget.TextView;
 
 import com.silence.commonframe.R;
+import com.silence.commonframe.base.basemvp.BaseActivity;
 
-public class FireAlarmActivity extends AppCompatActivity {
+import butterknife.BindView;
+
+public class FireAlarmActivity extends BaseActivity {
     private MediaPlayer mMediaPlayer;
+
+    @BindView(R.id.textView17)
+    TextView dataTextView;
+    @BindView(R.id.textView19)
+    TextView dataTextView1;
+    @BindView(R.id.time)
+    TextView time1;
+    @BindView(R.id.place)
+    TextView place;
+    @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;
+    }
+
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
-        setContentView(R.layout.activity_fire_alarm);
+    public void initPresenter() {
 
+    }
+
+    @Override
+    public void initView() {
         this.setFinishOnTouchOutside(false);
         Intent intent = getIntent();
         String data = intent.getStringExtra("deviceName1");
@@ -25,10 +79,6 @@ public class FireAlarmActivity extends AppCompatActivity {
         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);
@@ -38,7 +88,6 @@ public class FireAlarmActivity extends AppCompatActivity {
         mMediaPlayer.setLooping(true); // 设置循环播放
         mMediaPlayer.start(); //开始播放
 
-        TextView backButton = (TextView) findViewById(R.id.button9);
         backButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

+ 0 - 19
app/src/main/java/com/silence/commonframe/activity/NavigationActivity.java

@@ -1,19 +0,0 @@
-package com.silence.commonframe.activity;
-
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-
-import com.silence.commonframe.R;
-
-public class NavigationActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_navigation);
-
-
-//        ConstraintLayout v = (ConstraintLayout) findViewById(R.id.ll);//找到你要设透明背景的layout 的id
-//        v.getBackground().setAlpha(255);//0~255透明度值
-    }
-}

+ 0 - 67
app/src/main/java/com/silence/commonframe/activity/QuickSetupActivity.java

@@ -1,67 +0,0 @@
-package com.silence.commonframe.activity;
-
-import android.graphics.Color;
-import android.os.Build;
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.TextView;
-
-import com.silence.commonframe.R;
-import com.silence.commonframe.utils.AtyContainer;
-
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-/**
- * WiFi快速配置
- */
-public class QuickSetupActivity extends AppCompatActivity {
-
-    /**
-     * 导航栏信息
-     * back_pic、navi_head_back_text(透明)、navi_head_text、navi_head_text_right(右侧文字)、navi_head_img_right(右侧图片)
-     */
-   @BindView(R.id.navi_head_text)
-    TextView navi_head_text;    //标题
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_quick_setup);
-        ButterKnife.bind(this);
-        AtyContainer.getInstance().addActivity(this);
-        navi_head_text.setText(R.string.quick_setup);       //设置标题
-        //设置全屏
-        initWindows();
-
-
-    }
-
-    /**
-     * 页面全屏
-     */
-    private void initWindows() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            Window window = getWindow();
-            window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS
-                    | WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
-            window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
-            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-            window.setStatusBarColor(Color.TRANSPARENT);
-            window.setNavigationBarColor(Color.BLACK);
-        }
-    }
-
-    /**
-     * 返回按钮
-     */
-    public void click_back(View view) {
-        finish();
-    }
-
-}

+ 0 - 66
app/src/main/java/com/silence/commonframe/activity/RouterActivity.java

@@ -1,66 +0,0 @@
-package com.silence.commonframe.activity;
-
-import android.graphics.Color;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.TextView;
-
-import com.silence.commonframe.R;
-import com.silence.commonframe.utils.AtyContainer;
-
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-/**
- * 添加路由器上的设备
- * @author 郑嘉明
- */
-public class RouterActivity extends AppCompatActivity {
-
-    /**
-     * 导航栏信息
-     * back_pic、navi_head_back_text(透明)、navi_head_text、navi_head_text_right(右侧文字)、navi_head_img_right(右侧图片)
-     */
-   @BindView(R.id.navi_head_text)
-    TextView navi_head_text;    //标题
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_router);
-        ButterKnife.bind(this);
-        AtyContainer.getInstance().addActivity(this);
-        navi_head_text.setText(R.string.search_router_device);       //设置标题
-        //设置全屏
-        initWindows();
-
-    }
-
-    /**
-     * 页面全屏
-     */
-    private void initWindows() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            Window window = getWindow();
-            window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS
-                    | WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
-            window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
-            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-            window.setStatusBarColor(Color.TRANSPARENT);
-            window.setNavigationBarColor(Color.BLACK);
-        }
-    }
-
-    /**
-     * 返回按钮
-     */
-    public void click_back(View view) {
-        finish();
-    }
-}

+ 5 - 2
app/src/main/java/com/silence/commonframe/activity/mine/activity/setup/SetupActivity.java

@@ -6,6 +6,7 @@ import android.widget.CompoundButton;
 import android.widget.RelativeLayout;
 import android.widget.Switch;
 import android.widget.Toast;
+
 import com.orhanobut.hawk.Hawk;
 import com.silence.commonframe.App;
 import com.silence.commonframe.Dialog.BaseDialog;
@@ -17,13 +18,14 @@ import com.silence.commonframe.base.basemvp.BaseActivity;
 import com.silence.commonframe.common.constant.BaseConstants;
 import com.silence.commonframe.model.WXLoginModel;
 import com.silence.commonframe.utils.AtyContainer;
-import com.silence.commonframe.utils.Data;
 import com.tencent.mm.opensdk.modelmsg.SendAuth;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
 import com.tencent.mm.opensdk.openapi.WXAPIFactory;
+
 import java.net.NetworkInterface;
 import java.util.Collections;
 import java.util.List;
+
 import butterknife.BindView;
 
 public class SetupActivity extends BaseActivity implements SetupListener.View {
@@ -75,7 +77,8 @@ public class SetupActivity extends BaseActivity implements SetupListener.View {
         changeWxPublic();
         mac =  getNewMac();
 
-        if ("1".equals(Data.getVisitionChange())){
+        String loginType = Hawk.get(BaseConstants.LOGIN_TYPE);
+        if (loginType.equals(BaseConstants.TECH_LOGIN)){
             wx_bind.setVisibility(View.GONE);
             wx_message_connect.setVisibility(View.GONE);
             view_message_connect.setVisibility(View.GONE);

+ 1 - 1
app/src/main/java/com/silence/commonframe/wxapi/WXEntryActivity.java

@@ -236,7 +236,7 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
                 message.setData(data);
                 handler.sendMessage(message);
             }
-            }
+        }
         finish();
     }
     private void phoneBindWx(String wxCode){

+ 0 - 13
app/src/main/res/layout/activity_adddevice3.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".activity.AdddeviceActivity1">
-    <android.support.v7.widget.RecyclerView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/recycleAdd"></android.support.v7.widget.RecyclerView>
-
-</android.support.constraint.ConstraintLayout>

+ 1 - 1
app/src/main/res/layout/activity_camera_common.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.silence.commonframe.activity.CameraCommonActivity">
+    tools:context="com.silence.commonframe.activity.ActivityGuideDeviceSystemInfo">
 
     <LinearLayout
         android:layout_width="match_parent"

+ 1 - 1
app/src/main/res/layout/activity_camera_savemanagement.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.silence.commonframe.activity.CameraSavemanagementActivity">
+    tools:context="com.silence.commonframe.activity.ActivityGuideDeviceSetupStorage">
 
     <LinearLayout
         android:layout_width="match_parent"

+ 2 - 80
app/src/main/res/layout/activity_devicedetail.xml

@@ -35,15 +35,6 @@
                     android:layout_height="20dp"
                     android:background="@mipmap/whiteback" />
 
-                <!--<TextView-->
-                <!--android:id="@+id/textView15"-->
-                <!--android:layout_width="wrap_content"-->
-                <!--android:layout_height="wrap_content"-->
-                <!--android:gravity="center"-->
-                <!--android:textColor="#00000000"-->
-                <!--android:textSize="19sp"-->
-                <!--android:text="返回" />-->
-
             </LinearLayout>
 
             <LinearLayout
@@ -70,19 +61,8 @@
                 android:layout_alignParentBottom="true"
                 android:layout_marginLeft="10dp"
                 android:layout_marginBottom="6dp"
-
                 android:gravity="center_vertical">
 
-
-                <!--<TextView-->
-                <!--android:id="@+id/textView151"-->
-                <!--android:layout_width="wrap_content"-->
-                <!--android:layout_height="wrap_content"-->
-                <!--android:gravity="center"-->
-                <!---->
-                <!--android:textSize="19sp"-->
-                <!--android:text="添加" />-->
-
                 <TextView
                     android:id="@+id/context_device_add"
                     android:layout_width="wrap_content"
@@ -96,14 +76,6 @@
 
             </LinearLayout>
 
-
-            <!--<ImageView-->
-            <!--android:id="@+id/imageView_daohang"-->
-            <!--android:layout_width="35dp"-->
-            <!--android:layout_height="31dp"-->
-            <!--android:layout_marginBottom="9dp"-->
-            <!--app:srcCompat="@mipmap/daohang" />-->
-
         </LinearLayout>
 
         <LinearLayout
@@ -134,7 +106,6 @@
                     android:layout_weight="1"></View>
 
                 <TextView
-
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginRight="9dp"
@@ -142,7 +113,6 @@
                     android:textColor="#fa5656"
                     android:visibility="gone" />
 
-
             </LinearLayout>
 
             <LinearLayout
@@ -153,7 +123,6 @@
 
 
                 <ImageView
-
                     android:layout_width="70dp"
                     android:layout_height="70dp"
                     android:layout_gravity="center"
@@ -195,7 +164,6 @@
                                 android:layout_weight="1"
                                 android:textColor="@color/myblack"></View>
 
-
                         </LinearLayout>
 
                         <LinearLayout
@@ -232,16 +200,13 @@
                                 android:textColor="@color/myblack"
                                 android:textSize="14sp" />
 
-
                             <View
                                 android:layout_width="0dp"
                                 android:layout_height="match_parent"
                                 android:layout_weight="1"></View>
 
-
                         </LinearLayout>
 
-
                         <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
@@ -276,7 +241,6 @@
                                 android:textColor="@color/myblack"
                                 android:textSize="14sp" />
 
-
                         </LinearLayout>
 
                         <LinearLayout
@@ -292,10 +256,8 @@
                                 android:textColor="@color/myblack"
                                 android:textSize="14sp" />
 
-
                         </LinearLayout>
 
-
                     </LinearLayout>
 
                     <LinearLayout
@@ -309,23 +271,6 @@
                             android:layout_height="wrap_content"
                             android:layout_marginRight="5dp">
 
-                            <!--<TextView-->
-
-                            <!--android:layout_width="wrap_content"-->
-                            <!--android:layout_height="wrap_content"-->
-                            <!--android:textColor="@color/myblack"-->
-                            <!--android:textSize="14sp"-->
-                            <!--android:text="电池电压:" />-->
-
-                            <!--<TextView-->
-
-                            <!--android:layout_width="wrap_content"-->
-                            <!--android:layout_height="wrap_content"-->
-
-                            <!--android:textColor="@color/myblack"-->
-                            <!--android:textSize="14sp"-->
-                            <!--android:text="3.0V" />-->
-
                         </LinearLayout>
 
                         <LinearLayout
@@ -333,31 +278,21 @@
                             android:layout_height="wrap_content"
                             android:layout_marginRight="5dp">
 
-                            <!--  <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:textColor="@color/myblack"
-                                android:textSize="14sp"
-                                android:text="网关状态:" />-->
-
                             <TextView
                                 android:id="@+id/textView9"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-
                                 android:text="离线  "
                                 android:textColor="@color/myblack"
                                 android:textSize="14sp" />
                         </LinearLayout>
-                    </LinearLayout>
 
+                    </LinearLayout>
 
                 </RelativeLayout>
 
-
             </LinearLayout>
 
-
         </LinearLayout>
 
         <View
@@ -366,7 +301,6 @@
             android:layout_marginTop="5dp"
             android:background="@color/mygray"></View>
 
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -385,6 +319,7 @@
                 android:text="@string/devicedetail_runningmessage"
                 android:textColor="@color/myblue"
                 android:textSize="16sp" />
+
         </LinearLayout>
 
         <LinearLayout
@@ -403,15 +338,6 @@
                 android:textSize="16sp"
                 android:textStyle="bold" />
 
-            <!--<TextView-->
-            <!--android:id="@+id/context_device_add"-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:layout_alignParentRight="true"-->
-            <!--android:textColor="@color/myblue"-->
-            <!--android:textStyle="bold"-->
-            <!--android:textSize="16sp"-->
-            <!--android:text="@string/devicecontext_management"/>-->
             <View
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
@@ -423,7 +349,6 @@
                 android:layout_height="25dp"
                 android:background="@mipmap/homeadd1" />
 
-
         </LinearLayout>
 
         <ScrollView
@@ -439,7 +364,6 @@
                 android:layout_marginRight="10dp"
                 android:orientation="vertical">
 
-
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
@@ -483,7 +407,6 @@
 
                 </android.support.v7.widget.RecyclerView>
 
-
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
@@ -527,7 +450,6 @@
 
                 </android.support.v7.widget.RecyclerView>
 
-
             </LinearLayout>
 
         </ScrollView>

+ 70 - 73
app/src/main/res/layout/activity_fire_alarm.xml

@@ -1,86 +1,83 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_width="wrap_content"
+    android:layout_height="260dp"
+    android:background="@drawable/bg_corner"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:paddingLeft="10dp"
+    android:paddingTop="10dp"
+    android:paddingRight="10dp"
     tools:context=".activity.FireAlarmActivity">
 
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="260dp"
-        android:background="@drawable/bg_corner"
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="25dp"
+        android:layout_marginBottom="5dp"
         android:gravity="center"
-        android:orientation="vertical"
-        android:paddingLeft="10dp"
-        android:paddingTop="10dp"
-        android:paddingRight="10dp">
+        android:text="尊敬的用户,你的设备发生警情"
+        android:textColor="#000"
+        android:textSize="19sp" />
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="25dp"
-            android:layout_marginBottom="5dp"
-            android:gravity="center"
-            android:text="尊敬的用户,你的设备发生警情"
-            android:textColor="#000"
-            android:textSize="19sp" />
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="25dp"
+        android:layout_marginBottom="5dp"
+        android:gravity="center"
+        android:text="敬请及时处理"
+        android:textColor="#000"
+        android:textSize="19sp" />
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="25dp"
-            android:layout_marginBottom="5dp"
-            android:gravity="center"
-            android:text="敬请及时处理"
-            android:textColor="#000"
-            android:textSize="19sp" />
 
+    <TextView
+        android:id="@+id/time"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
+        android:gravity="center"
+        android:text="发生时间:2019-4-01"
+        android:textColor="#444" />
 
-        <TextView
-            android:id="@+id/time"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="5dp"
-            android:gravity="center"
-            android:text="发生时间:2019-4-01"
-            android:textColor="#444" />
 
+    <TextView
+        android:id="@+id/textView17"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
+        android:gravity="center"
+        android:text="TextView1"
+        android:textColor="#444" />
 
-        <TextView
-            android:id="@+id/textView17"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="5dp"
-            android:gravity="center"
-            android:text="TextView1"
-            android:textColor="#444" />
+    <TextView
+        android:id="@+id/textView19"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
+        android:gravity="center"
+        android:text="TextView2"
+        android:textColor="#444" />
 
-        <TextView
-            android:id="@+id/textView19"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="5dp"
-            android:gravity="center"
-            android:text="TextView2"
-            android:textColor="#444" />
+    <TextView
+        android:id="@+id/place"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
+        android:gravity="center"
+        android:text="详细地址:杭州市余杭区"
+        android:textColor="#444" />
+
+    <TextView
+        android:id="@+id/button9"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:layout_gravity="center"
+        android:layout_marginTop="20dp"
+        android:layout_marginBottom="10dp"
+        android:background="@drawable/bg_corner_dialog"
+        android:gravity="center"
+        android:text="知道了"
+        android:textColor="@color/myblue"
+        android:textSize="18sp" />
 
-        <TextView
-            android:id="@+id/place"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="5dp"
-            android:gravity="center"
-            android:text="详细地址:杭州市余杭区"
-            android:textColor="#444" />
-        <TextView
-            android:id="@+id/button9"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:layout_gravity="center"
-            android:layout_marginTop="20dp"
-            android:layout_marginBottom="10dp"
-            android:background="@drawable/bg_corner_dialog"
-            android:gravity="center"
-            android:text="知道了"
-            android:textColor="@color/myblue"
-            android:textSize="18sp" />
-    </LinearLayout>
-</android.support.constraint.ConstraintLayout>
+</LinearLayout>

+ 0 - 60
app/src/main/res/layout/activity_navigation.xml

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/ll"
-    tools:context=".activity.NavigationActivity">
-
-   <RelativeLayout
-       android:layout_width="match_parent"
-       android:layout_height="63dp"
-       android:gravity="bottom"
-       android:background="#4e69ff">
-
-      <LinearLayout
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_marginBottom="6dp"
-          android:layout_alignParentBottom="true"
-          android:gravity="center_vertical"
-          android:onClick="click"
-          android:layout_marginLeft="10dp">
-
-         <ImageView
-             android:id="@+id/imageView4"
-             android:layout_width="20dp"
-             android:layout_height="20dp"
-             android:background="@mipmap/whiteback"
-             />
-
-         <TextView
-             android:id="@+id/textView15"
-             android:layout_width="wrap_content"
-             android:layout_height="wrap_content"
-             android:gravity="center"
-             android:textColor="#00000000"
-             android:textSize="19sp"
-             android:text="返回" />
-
-      </LinearLayout>
-
-      <LinearLayout
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_alignParentBottom="true"
-          android:gravity="center_horizontal"
-          android:layout_marginBottom="6dp">
-
-         <TextView
-             android:layout_width="wrap_content"
-             android:layout_height="wrap_content"
-             android:text="设备详情"
-             android:textColor="#fff"
-             android:textSize="19sp"/>
-
-      </LinearLayout>
-
-   </RelativeLayout>
-</android.support.constraint.ConstraintLayout>

+ 0 - 17
app/src/main/res/layout/activity_router.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.silence.commonframe.activity.RouterActivity">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <include layout="@layout/navi_head"/>
-
-    </LinearLayout>
-
-</android.support.constraint.ConstraintLayout>