6.18.1

app/src/main/java/com/silence/commonframe/ApiService.java

@@ -8,7 +8,9 @@ public interface ApiService {
 
 //   String httpUrl1   = "https://www.hsh-iot.com/hsh_app";
 
-  String httpUrl1   =   "https://www.hsh-iot.com/test/hsh_app";
+//   String httpUrl1   =   "https://www.hsh-iot.com/test/hsh_app";
+
+    String httpUrl1   =   "http://192.168.1.111:8080";
 
   //  String httpUrl1   =   "https://www.hsh-iot.com/hsh_app";
 

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

@@ -16,6 +16,7 @@ import android.widget.Switch;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.orhanobut.hawk.Hawk;
 import com.silence.commonframe.R;
 import com.silence.commonframe.utils.AtyContainer;
 import com.silence.commonframe.utils.TitlePopupMenu;

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

@@ -15,19 +15,31 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.lzy.okgo.OkGo;
+import com.lzy.okgo.cache.CacheMode;
+import com.lzy.okgo.callback.StringCallback;
 import com.silence.commonframe.Dialog.CDialog;
 import com.silence.commonframe.R;
+import com.silence.commonframe.base.basemvp.BaseActivity;
+import com.silence.commonframe.common.constant.UrlConstants;
 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 butterknife.BindView;
 import butterknife.ButterKnife;
+import okhttp3.Call;
+import okhttp3.Response;
 
 /**
  * 空气卫士-设备详情
  * @author 郑嘉明
  * tv_airguard_id、et_airguard_name、airguard_update_name
  */
-public class AirGuardDetailActivity extends AppCompatActivity {
+public class AirGuardDetailActivity extends BaseActivity {
 
     /**
      * 导航栏信息
@@ -43,19 +55,26 @@ public class AirGuardDetailActivity extends AppCompatActivity {
     @BindView(R.id.airguard_update_name)
     ImageView airguard_update_name;     //（笔）修改名称
 
+    private String deviceId = "000";
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.activity_air_guard_detail;
+    }
+
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_air_guard_detail);
-        ButterKnife.bind(this);
-        AtyContainer.getInstance().addActivity(this);
+    public void initPresenter() {
+
+    }
+
+    @Override
+    public void initView() {
         navi_head_text.setText(R.string.airguard_detail);       //设置标题
         //设置全屏
         initWindows();
 
         //修改名字事件
         updateAirName();
-
     }
 
     /**
@@ -63,25 +82,19 @@ public class AirGuardDetailActivity extends AppCompatActivity {
      */
     private void updateAirName() {
         //输入框右边“笔”的点击事件
-        airguard_update_name.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                //修改名称提示框
-                dialogUpdateName();
-            }
+        airguard_update_name.setOnClickListener(v -> {
+            //修改名称提示框
+            dialogUpdateName();
         });
 
         //键盘回车事件
-        et_airguard_name.setOnEditorActionListener(new TextView.OnEditorActionListener() {
-            @Override
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE || (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)){
-                    //修改名称提示框
-                    dialogUpdateName();
-                    return true;
-                }
-                return false;
+        et_airguard_name.setOnEditorActionListener((v, actionId, event) -> {
+            if (actionId == EditorInfo.IME_ACTION_DONE || (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)){
+                //修改名称提示框
+                dialogUpdateName();
+                return true;
             }
+            return false;
         });
     }
 
@@ -93,23 +106,44 @@ public class AirGuardDetailActivity extends AppCompatActivity {
         builder.setCancelable(false);
         builder.setTitle(getResources().getString(R.string.tips));
         builder.setMessage(getResources().getString(R.string.dialog_update_name));
-        builder.setPositiveButton(getResources().getString(R.string.sure), new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                //确定修改后的操作
-                Toast.makeText(AirGuardDetailActivity.this,"确定修改",Toast.LENGTH_SHORT).show();
-                //这里修改名称的接口
-            }
-        });
-        builder.setNegativeButton(getResources().getString(R.string.cancle), new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                dialog.dismiss();
-            }
+        builder.setPositiveButton(getResources().getString(R.string.sure), (dialog, which) -> {
+            //确定修改后的操作
+            Toast.makeText(AirGuardDetailActivity.this,"确定修改",Toast.LENGTH_SHORT).show();
+            //这里修改名称的接口
+            updateDeviceName();
         });
+        builder.setNegativeButton(getResources().getString(R.string.cancle), (dialog, which) -> dialog.dismiss());
         builder.show();
     }
 
+    private void updateDeviceName() {
+        OkGo.get(UrlConstants.AIRGUARD_DEV_DETAIL)
+                .tag(this)
+                .params("deviceId",deviceId)
+                .params("deviceName",et_airguard_name.getText().toString())
+                .cacheKey("cacheGetKey")
+                .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);
+                            int code = jsonObject.getInt("code");
+                            String message = jsonObject.get("msg").toString();
+                            if (code == 0){
+                                Toast.makeText(AirGuardDetailActivity.this,"修改成功",Toast.LENGTH_SHORT).show();
+                            }else {
+                                LoginIn.tokenOut(code,AirGuardDetailActivity.this);
+                                Toast.makeText(AirGuardDetailActivity.this,""+message,Toast.LENGTH_SHORT).show();
+                            }
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                });
+    }
+
     /**
      * 页面全屏
      */

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

@@ -12,22 +12,37 @@ import android.widget.FrameLayout;
 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.R;
+import com.silence.commonframe.activity.Interface.NewSubmitListener;
 import com.silence.commonframe.adapter.MyWheelAdapter;
+import com.silence.commonframe.base.basemvp.BaseActivity;
+import com.silence.commonframe.bean.BaseBean;
+import com.silence.commonframe.common.constant.UrlConstants;
 import com.silence.commonframe.utils.AtyContainer;
+import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.utils.LoginIn;
 import com.wx.wheelview.widget.WheelView;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.util.ArrayList;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import okhttp3.Call;
+import okhttp3.Response;
 
 /**
  * 空气卫士-新建时间段
  * @author 郑嘉明
  * start_time_hour、start_time_minute、end_time_hour、end_time_minute、wind_speed_level(风速等级)、wind_speed_reduce（降低风速）、wind_speed_increase（提高风速）
  */
-public class AirGuardNewTimeActivity extends AppCompatActivity {
+public class AirGuardNewTimeActivity extends BaseActivity  {
 
     public static int WHEEL_SIZE = 5;      //显示的滚动的数量
     public static int WIND_SPEED_HIGN = 20;     //最高风速
@@ -65,12 +80,23 @@ public class AirGuardNewTimeActivity extends AppCompatActivity {
 
     private Intent intent;
 
+    private String deviceId = "000";
+    private String id;
+    private String startTime;
+    private String endTime;
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.activity_air_guard_new_time;
+    }
+
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_air_guard_new_time);
-        ButterKnife.bind(this);
-        AtyContainer.getInstance().addActivity(this);
+    public void initPresenter() {
+
+    }
+
+    @Override
+    public void initView() {
         navi_head_text.setText(R.string.airguard_newtime);       //设置标题
         navi_head_text_right.setText(R.string.sure);            //设置导航右侧文字
         //设置全屏
@@ -139,6 +165,8 @@ public class AirGuardNewTimeActivity extends AppCompatActivity {
                     listMin = getMinuteData();
                     start_time = listHour.get(start_hour2) + ":" + listMin.get(start_min2);
                     end_time = listHour.get(end_hour2) + ":" +listMin.get(end_min2);
+                    startTime = listHour.get(start_hour2) + listMin.get(start_min2);
+                    endTime = listHour.get(end_hour2) + listMin.get(end_min2);
 
                     String work_time = start_time + "-" + end_time;
                     Intent intent_result = new Intent();
@@ -146,18 +174,82 @@ public class AirGuardNewTimeActivity extends AppCompatActivity {
                     intent_result.putExtra("wind_speed",wind_speed);
                     if ("add".equals(type)){
                         setResult(222,intent_result);
+                        addTime();
                         finish();
                     }else if ("update".equals(type)){
                         intent_result.putExtra("position",intent.getIntExtra("position",-1));
+                        updateTime();
                         setResult(333,intent_result);
                         finish();
                     }
-
                 }
             }
         });
     }
 
+    private void updateTime() {
+        OkGo.get(UrlConstants.AIRGUARD_UPDATE_RUNTIME)
+                .params("id",id)
+                .params("startTime",startTime)
+                .params("endTime",endTime)
+                .params("speedType",wind_speed)
+                .cacheKey("cacheGetKey")
+                .cacheMode(CacheMode.DEFAULT)
+                .headers("token", Data.getToken())
+                .execute(new StringCallback() {
+                    @Override
+                    public void onSuccess(String s, Call call, Response response) {
+                        BaseBean data = new Gson().fromJson(s,BaseBean.class);
+                        if (data.code == 0){
+                            Toast.makeText(AirGuardNewTimeActivity.this,"修改成功",Toast.LENGTH_SHORT).show();
+                        }else {
+                            LoginIn.tokenOut(data.code,AirGuardNewTimeActivity.this);
+                            Toast.makeText(AirGuardNewTimeActivity.this,""+data.msg,Toast.LENGTH_SHORT).show();
+                        }
+                    }
+
+                    @Override
+                    public void onError(Call call, Response response, Exception e) {
+                        super.onError(call, response, e);
+
+                    }
+                });
+    }
+
+    /**
+     * 添加时间间隔接口
+     */
+    private void addTime() {
+        OkGo.get(UrlConstants.AIRGUARD_RUNTIME)
+                .tag(this)
+                .params("deviceId",deviceId)
+                .params("startTime",startTime)
+                .params("endTime",endTime)
+                .params("speedType",wind_speed)
+                .cacheKey("cacheGetKey")
+                .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);
+                            int code = jsonObject.getInt("code");
+                            String message = jsonObject.get("msg").toString();
+                            if (code == 0){
+                                Toast.makeText(AirGuardNewTimeActivity.this,"添加成功",Toast.LENGTH_SHORT).show();
+                            }else {
+                                LoginIn.tokenOut(code,AirGuardNewTimeActivity.this);
+                                Toast.makeText(AirGuardNewTimeActivity.this,""+message,Toast.LENGTH_SHORT).show();
+                            }
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                });
+
+    }
+
     /**
      * 初始化时间选择的属性
      */

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

@@ -11,18 +11,32 @@ import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.lzy.okgo.OkGo;
+import com.lzy.okgo.cache.CacheMode;
+import com.lzy.okgo.callback.StringCallback;
 import com.silence.commonframe.R;
+import com.silence.commonframe.base.basemvp.BaseActivity;
+import com.silence.commonframe.common.constant.UrlConstants;
 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.Calendar;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import okhttp3.Call;
+import okhttp3.Response;
 
 /**
  * 空气卫士-实时闹钟
  * @author 郑嘉明
- * id：airguard_current_time（当前时间）、bt_syn_nettime（同步时间按钮）
+ * id：tv_current_time（当前时间）、bt_syn_nettime（同步时间按钮）
  */
-public class AirGuardTimeClockActivity extends AppCompatActivity {
+public class AirGuardTimeClockActivity extends BaseActivity {
 
     /**
      * 导航栏信息
@@ -31,29 +45,87 @@ public class AirGuardTimeClockActivity extends AppCompatActivity {
     @BindView(R.id.navi_head_text)
     TextView navi_head_text;    //标题
 
-    @BindView(R.id.airguard_current_time)
-    TextView airguard_current_time;
+    @BindView(R.id.tv_current_time)
+    TextView tvCurrentTime;         //当前时间
     @BindView(R.id.bt_syn_nettime)
     Button bt_syn_nettime;
 
+    private String currentHour;
+    private String currentMinute;
+    private String currentTime;
+
+    private String deviceId = "000";
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.activity_air_guard_time_clock;
+    }
+
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_air_guard_time_clock);
-        ButterKnife.bind(this);
-        AtyContainer.getInstance().addActivity(this);
+    public void initPresenter() {
+
+    }
+
+    @Override
+    public void initView() {
         navi_head_text.setText(R.string.airguard_timeclock);       //设置标题
         //设置全屏
         initWindows();
 
+        getCurrentTime();
+
         //同步网络时间
         bt_syn_nettime.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Toast.makeText(AirGuardTimeClockActivity.this,"同步",Toast.LENGTH_SHORT).show();
+                setTimeClock();
             }
         });
+    }
+
+    private void setTimeClock() {
+        String url = UrlConstants.AIRGUARD_SETTIME;
+        OkGo.get(url)
+                .tag(this)
+                .cacheKey("cacheGetKey")
+                .cacheMode(CacheMode.DEFAULT)
+                .headers("token", Data.getToken())
+                .params("deviceId",deviceId)
+                .execute(new StringCallback() {
+                    @Override
+                    public void onSuccess(String s, Call call, Response response) {
+                        try {
+                            JSONObject jsonObject = new JSONObject(s);
+                            int code = jsonObject.getInt("code");
+                            String message = jsonObject.get("msg").toString();
+                            if (code == 0){
+                                Toast.makeText(AirGuardTimeClockActivity.this,"同步成功",Toast.LENGTH_SHORT).show();
+                            }else {
+                                LoginIn.tokenOut(code,AirGuardTimeClockActivity.this);
+                                Toast.makeText(AirGuardTimeClockActivity.this,""+message,Toast.LENGTH_SHORT).show();
+                            }
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                });
+    }
 
+    /**
+     *
+     */
+    private void getCurrentTime() {
+        Calendar calendar = Calendar.getInstance();
+        currentHour = String.valueOf(calendar.get(Calendar.HOUR_OF_DAY));
+        currentMinute = String.valueOf(calendar.get(Calendar.MINUTE));
+        if (Integer.valueOf(currentHour) < 10){
+            currentHour = "0" + currentHour;
+        }
+        if (Integer.valueOf(currentMinute) < 10){
+            currentMinute = "0" + currentMinute;
+        }
+        currentTime = currentHour + ":" + currentMinute;
+        tvCurrentTime.setText(currentTime);
     }
 
     /**

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

@@ -3,9 +3,7 @@ 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;
@@ -14,23 +12,37 @@ import android.view.WindowManager;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.lzy.okgo.OkGo;
+import com.lzy.okgo.cache.CacheMode;
+import com.lzy.okgo.callback.StringCallback;
 import com.silence.commonframe.R;
 import com.silence.commonframe.adapter.AirGuardWorKTimeAdapter;
-import com.silence.commonframe.utils.AtyContainer;
+import com.silence.commonframe.base.basemvp.BaseActivity;
+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.utils.LinearItemDecoration;
+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;
 
 /**
  * 空气卫士-工作时间段
  * @author 郑嘉明
  */
-public class AirGuardWordTimeActivity extends AppCompatActivity {
+public class AirGuardWordTimeActivity extends BaseActivity {
 
     /**
      * 导航栏信息
@@ -46,14 +58,23 @@ public class AirGuardWordTimeActivity extends AppCompatActivity {
 
     AirGuardWorKTimeAdapter airGuardWorKTimeAdapter;    //工作时间适配器
 
-    List<HashMap<String,String>> listTime = new ArrayList<>();
+    List<AirGuardRunTimeListModel> listTime = new ArrayList<>();
+
+    private String id;
+    private String deviceId = "000";
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_air_guard_word_time);
-        ButterKnife.bind(this);
-        AtyContainer.getInstance().addActivity(this);
+    public int getLayoutId() {
+        return R.layout.activity_air_guard_word_time;
+    }
+
+    @Override
+    public void initPresenter() {
+
+    }
+
+    @Override
+    public void initView() {
         navi_head_text.setText(R.string.airguard_worktime);       //设置标题
         navi_head_text_right.setText(R.string.add);            //设置右侧文字
         //设置全屏
@@ -73,12 +94,38 @@ public class AirGuardWordTimeActivity extends AppCompatActivity {
 //        listTime.add(hashMap2);
 //        //测试数据
 
-        //设置工作时间数据
-        setTimeDate();
+        getRunTime();
+
+
 
         //导航栏添加按钮点击事件
         addNewTimeListener();
+    }
 
+    private void getRunTime() {
+        OkGo.get(UrlConstants.AIRGUARD_RUNTIMELIST)
+                .tag(this)
+                .params("deviceId",deviceId)
+                .cacheKey("cacheGetKey")
+                .cacheMode(CacheMode.DEFAULT)
+                .headers("token", Data.getToken())
+                .execute(new StringCallback() {
+                    @Override
+                    public void onSuccess(String s, Call call, Response response) {
+                        AirGuardRunTimeListModel data = new Gson().fromJson(s,AirGuardRunTimeListModel.class);
+                        System.out.println(data.getData());
+                        if (data.getCode() == 0){
+                            //设置工作时间数据
+                            setTimeDate(data.getData());
+                        }
+                    }
+
+                    @Override
+                    public void onError(Call call, Response response, Exception e) {
+                        super.onError(call, response, e);
+
+                    }
+                });
     }
 
     /**
@@ -99,8 +146,8 @@ public class AirGuardWordTimeActivity extends AppCompatActivity {
 
     /**
      * 获取添加和修改的时间，添加修改时间的接口在这加
-     * @param requestCode 222
-     * @param resultCode 222
+     * @param requestCode 222 333
+     * @param resultCode 222 333
      * @param data worktime
      */
     @Override
@@ -108,35 +155,31 @@ public class AirGuardWordTimeActivity extends AppCompatActivity {
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == 222 && resultCode == 222){
             assert data != null;
-            String newtime = data.getStringExtra("worktime");
-            int wind_speed = data.getIntExtra("wind_speed",0);
-            HashMap<String,String> hashMap = new HashMap<>();
-            hashMap.put("time",newtime);
-            hashMap.put("wind_speed",String.valueOf(wind_speed));
-            airGuardWorKTimeAdapter.addWorkTime(hashMap);           //适配器增加数据刷新
-            //这里加添加时间的接口方法。
+            //获取运行时间段
+            getRunTime();
 
         }else if (requestCode == 333 && resultCode == 333){
             assert data != null;
-            String newtime = data.getStringExtra("worktime");
-            int pos = data.getIntExtra("position",-1);
-            int wind_speed = data.getIntExtra("wind_speed",0);
-            HashMap<String,String> hashMap = new HashMap<>();
-            hashMap.put("time",newtime);
-            hashMap.put("wind_speed",String.valueOf(wind_speed));
-            hashMap.put("switch_state","0");            //开关状态，0是关，1是开。有接口后要传值
-            airGuardWorKTimeAdapter.updateWorkTime(hashMap,pos);           //适配器修改数据刷新
-            //这里加修改时间的接口方法。
+//            String newtime = data.getStringExtra("worktime");
+//            int pos = data.getIntExtra("position",-1);
+//            int wind_speed = data.getIntExtra("wind_speed",0);
+//            HashMap<String,String> hashMap = new HashMap<>();
+//            hashMap.put("time",newtime);
+//            hashMap.put("wind_speed",String.valueOf(wind_speed));
+//            hashMap.put("switch_state","0");            //开关状态，0是关，1是开。有接口后要传值
+//            airGuardWorKTimeAdapter.updateWorkTime(hashMap,pos);           //适配器修改数据刷新
 
+            //这里加修改时间的接口方法。
+            getRunTime();
         }
     }
 
     /**
      * 设置工作时间数据
      */
-    private void setTimeDate() {
+    private void setTimeDate(List<AirGuardRunTimeListModel.DataBean> listRunTime) {
 
-        airGuardWorKTimeAdapter = new AirGuardWorKTimeAdapter(AirGuardWordTimeActivity.this,listTime);
+        airGuardWorKTimeAdapter = new AirGuardWorKTimeAdapter(AirGuardWordTimeActivity.this,listRunTime);
         worktime_recyclerview.setLayoutManager(new LinearLayoutManager(AirGuardWordTimeActivity.this));
         worktime_recyclerview.addItemDecoration(new LinearItemDecoration(AirGuardWordTimeActivity.this,LinearLayoutManager.HORIZONTAL,R.drawable.decoration_item));     //设置分割线
         worktime_recyclerview.setAdapter(airGuardWorKTimeAdapter);
@@ -153,7 +196,7 @@ public class AirGuardWordTimeActivity extends AppCompatActivity {
                 Toast.makeText(AirGuardWordTimeActivity.this,"删除成功",Toast.LENGTH_SHORT).show();
                 airGuardWorKTimeAdapter.deleteWorkTime(position);           //适配器删除数据刷新
                 //这里加删除时间的接口方法。
-
+                delRunTime();
             }
 
             @Override
@@ -163,18 +206,19 @@ public class AirGuardWordTimeActivity extends AppCompatActivity {
                 intent.putExtra("wind_speed",wind);
                 intent.putExtra("type","update");
                 intent.putExtra("position",position);
+                intent.putExtra("id","");
                 startActivityForResult(intent,333);
             }
 
             @Override
             public void onSwitchListener(Boolean isCheck, int position) {
-                //蜂鸣器的开关
+                //开关
                 if (isCheck){
-                    Toast.makeText(AirGuardWordTimeActivity.this,"打开",Toast.LENGTH_SHORT).show();
-
+//                    Toast.makeText(AirGuardWordTimeActivity.this,"打开",Toast.LENGTH_SHORT).show();
+                    openCloseRunTime();
                 }else {
-                    Toast.makeText(AirGuardWordTimeActivity.this,"关闭",Toast.LENGTH_SHORT).show();
-
+//                    Toast.makeText(AirGuardWordTimeActivity.this,"关闭",Toast.LENGTH_SHORT).show();
+                    openCloseRunTime();
                 }
             }
 
@@ -184,6 +228,66 @@ public class AirGuardWordTimeActivity extends AppCompatActivity {
     }
 
     /**
+     * 删除运行时间间隔
+     */
+    private void delRunTime() {
+        OkGo.get(UrlConstants.AIRGUARD_DEL_RUNTIME)
+                .tag(this)
+                .params("id",id)
+                .cacheKey("cacheGetKey")
+                .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);
+                            int code = jsonObject.getInt("code");
+                            String message = jsonObject.get("msg").toString();
+                            if (code == 0){
+                                Toast.makeText(AirGuardWordTimeActivity.this,"删除成功",Toast.LENGTH_SHORT).show();
+                            }else {
+                                LoginIn.tokenOut(code,AirGuardWordTimeActivity.this);
+                                Toast.makeText(AirGuardWordTimeActivity.this,""+message,Toast.LENGTH_SHORT).show();
+                            }
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                });
+    }
+
+    /**
+     * 打开或关闭运行时间间隔
+     */
+    private void openCloseRunTime() {
+        OkGo.get(UrlConstants.AIRGUARD_OPEN_CLOSE_RUNTIME)
+                .tag(this)
+                .params("id",id)        //
+                .cacheKey("cacheGetKey")
+                .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);
+                            int code = jsonObject.getInt("code");
+                            String message = jsonObject.get("msg").toString();
+                            if (code == 0){
+                                Toast.makeText(AirGuardWordTimeActivity.this,"0",Toast.LENGTH_SHORT).show();
+                            }else {
+                                LoginIn.tokenOut(code,AirGuardWordTimeActivity.this);
+                                Toast.makeText(AirGuardWordTimeActivity.this,""+message,Toast.LENGTH_SHORT).show();
+                            }
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                });
+    }
+
+    /**
      * 页面全屏
      */
     private void initWindows() {

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

@@ -12,6 +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.utils.ItemSlideHelper;
 
 import java.util.HashMap;
@@ -20,14 +21,14 @@ import java.util.List;
 public class AirGuardWorKTimeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements ItemSlideHelper.Callback {
 
     private Context context;
-    private List<HashMap<String,String>> listTime;
+    private List<AirGuardRunTimeListModel.DataBean> listTime;
     private int windSpeed;
 
     private RecyclerView mRecyclerView;
 
     private ItemSlideHelper itemSlideHelper;
 
-    public AirGuardWorKTimeAdapter(Context context, List<HashMap<String,String>> listTime){
+    public AirGuardWorKTimeAdapter(Context context, List<AirGuardRunTimeListModel.DataBean> listTime){
         this.context = context;
         this.listTime = listTime;
     }
@@ -43,17 +44,15 @@ public class AirGuardWorKTimeAdapter extends RecyclerView.Adapter<RecyclerView.V
     public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder viewHolder, int i) {
         final MyViewHolder myViewHolder = (MyViewHolder) viewHolder;
 
-        myViewHolder.tv_worktime.setText(listTime.get(i).get("time"));
-        if ("1".equals(listTime.get(i).get("switch_state"))){
+        String runTime = listTime.get(i).getStartTime() + "-" + listTime.get(i).getEndTime();
+        myViewHolder.tv_worktime.setText(runTime);
+        if ("1".equals(listTime.get(i).getIsValid())){
             myViewHolder.switch_worktime.setChecked(true);
         }else {
             myViewHolder.switch_worktime.setChecked(false);
         }
 
-        final String wind_speed = listTime.get(i).get("wind_speed");
-        if (wind_speed != null){
-            windSpeed = Integer.valueOf(wind_speed);
-        }
+        final int wind_speed = listTime.get(i).getSpeed();
 
         if (mListener != null){
             myViewHolder.itemView.setOnClickListener(new View.OnClickListener() {
@@ -68,7 +67,7 @@ public class AirGuardWorKTimeAdapter extends RecyclerView.Adapter<RecyclerView.V
                 @Override
                 public void onClick(View v) {
                     int pos = myViewHolder.getAdapterPosition();
-                    mListener.onUpdateClick(pos,windSpeed);
+                    mListener.onUpdateClick(pos,wind_speed);
                 }
             });
 
@@ -97,8 +96,7 @@ public class AirGuardWorKTimeAdapter extends RecyclerView.Adapter<RecyclerView.V
      * 添加时间
      * @param time worktime
      */
-    public void addWorkTime(HashMap<String,String> time){
-        time.put("switch_state","0");
+    public void addWorkTime(AirGuardRunTimeListModel.DataBean time){
         listTime.add(time);
         this.notifyItemInserted(listTime.size() - 1);
     }
@@ -117,7 +115,7 @@ public class AirGuardWorKTimeAdapter extends RecyclerView.Adapter<RecyclerView.V
      * 修改时间
      * @param postion delete_position
      */
-    public void updateWorkTime(HashMap<String,String> time,int postion){
+    public void updateWorkTime(AirGuardRunTimeListModel.DataBean time,int postion){
 
         listTime.set(postion,time);
         this.notifyDataSetChanged();

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

@@ -25,6 +25,7 @@ import com.silence.commonframe.R;
 import com.silence.commonframe.base.base.AppManager;
 import com.silence.commonframe.base.utils.StatusBarCompat;
 import com.silence.commonframe.base.utils.TUtil;
+import com.silence.commonframe.utils.AtyContainer;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -94,6 +95,7 @@ public abstract class BaseActivity<T extends BasePresenter, E extends BaseModel>
             mPresenter.mContext=this;
         }
             butterKnife = ButterKnife.bind(this);
+            AtyContainer.getInstance().addActivity(this);
         this.initPresenter();
         this.initView();
         }

app/src/main/java/com/silence/commonframe/bean/BaseBean.java

@@ -0,0 +1,32 @@
+package com.silence.commonframe.bean;
+
+public class BaseBean<T> {
+
+    public int code;
+    public String msg;
+    public T data;
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public T getData() {
+        return data;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
+}

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

@@ -16,5 +16,23 @@ public interface UrlConstants {
 
     String WEBVIEW_URL_QUESTION="https://www.hsh-iot.com/app_page/index.html";
     String WEBVIEW_URL_SZC= "https://www.hsh-iot.com/app_page/hshyszc.html";
+
+    /*----------------------------------------------空气卫士接口---------------------------------------*/
+    String AIRGUARD = ApiService.httpUrl1 + "/app/airGuard";
+
+    //获取运行时间间隔列表
+    String AIRGUARD_RUNTIMELIST = AIRGUARD + "/getRunTimeList";
+    //添加运行时间间隔
+    String AIRGUARD_RUNTIME = AIRGUARD + "/setRunTime";
+    //设置实时时钟
+    String AIRGUARD_SETTIME = AIRGUARD + "/setTime";
+    //设置设备基本信息
+    String AIRGUARD_DEV_DETAIL = AIRGUARD + "/updateDevDetail";
+    //打开或关闭运行时间间隔
+    String AIRGUARD_OPEN_CLOSE_RUNTIME = AIRGUARD + "/openCloseRunTime";
+    //删除运行时间间隔
+    String AIRGUARD_DEL_RUNTIME = AIRGUARD + "/delRunTime";
+    //修改运行时间间隔
+    String AIRGUARD_UPDATE_RUNTIME = AIRGUARD + "/updateRunTime";
 }
 

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

@@ -38,6 +38,7 @@ import com.silence.commonframe.Dialog.CDialog;
 import com.silence.commonframe.R;
 import com.silence.commonframe.activity.AddSiteActivity;
 import com.silence.commonframe.activity.AdddeviceActivity;
+import com.silence.commonframe.activity.AirGuardActivity;
 import com.silence.commonframe.activity.CommonScanActivity;
 import com.silence.commonframe.activity.DeviceContextManagementActivity;
 import com.silence.commonframe.activity.DevicedetailActivity;
@@ -890,13 +891,16 @@ public class DeviceFragment extends Fragment implements OnFunRegisterListener, O
      * 获取空气卫士列表
      */
     private void getAirGuide(){
-
+        Intent intent = new Intent(getContext(),AirGuardActivity.class);
+        startActivity(intent);
     }
+
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
         this.mActivity = (Activity) context;
     }
+
     private void refreshLanDeviceList() {
         mLanDeviceList.clear();
         mLanDeviceList.addAll(FunSupport.getInstance().getDeviceList());

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

@@ -112,4 +112,30 @@ public class LoginIn {
             builder.show();
         }
     }
+    public static void tokenOut(int code, final Context context){
+        if (code ==10001 ||code == 10002 || code== 10003){
+            CDialog.Builder builder = new CDialog.Builder(context);
+            builder.setCancelable(false);
+            builder.setTitle("提示");
+            builder.setMessage("登陆失效，请重新登陆！");
+
+            builder.setPositiveButton("确定", new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    AtyContainer.getInstance().finishAllActivity();
+                    Intent i2 = new Intent(context,LoginActivity.class);
+                    context.startActivity(i2);
+                }
+            });
+
+            builder.setNegativeButton("退出", true, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    dialog.dismiss();
+                    AtyContainer.getInstance().finishAllActivity();
+                }
+            });
+            builder.show();
+        }
+    }
 }

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

@@ -35,7 +35,7 @@
                     />
 
                 <TextView
-                    android:id="@+id/airguard_current_time"
+                    android:id="@+id/tv_current_time"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"