6.17

app/app.iml

@@ -96,6 +96,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/legacy_multidex_aapt_derived_proguard_rules" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/legacy_multidex_main_dex_list" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />

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

@@ -117,9 +117,6 @@ public class LoginActivity extends Activity {
             password.setText(sp.getString("upswd", null));
             checkBox.setChecked(true);
         }
-        if ("0".equals(Data.getSetBind())) {
-            //todo
-        }
         button2.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {

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

@@ -0,0 +1,136 @@
+package com.silence.commonframe.bean;
+
+import java.util.List;
+
+public class AirGuardBean {
+
+    /**
+     * code : 0
+     * msg : success
+     * data : [{"id":"10797825afd744a8b5d6d78bd32bd5c7","deviceId":"H030000000000001","deviceName":"测试空气卫士0001","buzzerState":"1","isValid":"1","userIdCreate":null,"gmtCreate":"2019-06-17 14:42:20","userIdUpdate":null,"gmtUpdate":null}]
+     */
+
+    private int code;
+    private String msg;
+    private List<DataBean> 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 List<DataBean> getData() {
+        return data;
+    }
+
+    public void setData(List<DataBean> data) {
+        this.data = data;
+    }
+
+    public static class DataBean {
+        /**
+         * id : 10797825afd744a8b5d6d78bd32bd5c7
+         * deviceId : H030000000000001
+         * deviceName : 测试空气卫士0001
+         * buzzerState : 1
+         * isValid : 1
+         * userIdCreate : null
+         * gmtCreate : 2019-06-17 14:42:20
+         * userIdUpdate : null
+         * gmtUpdate : null
+         */
+
+        private String id;
+        private String deviceId;
+        private String deviceName;
+        private String buzzerState;
+        private String isValid;
+        private Object userIdCreate;
+        private String gmtCreate;
+        private Object userIdUpdate;
+        private Object gmtUpdate;
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public String getDeviceId() {
+            return deviceId;
+        }
+
+        public void setDeviceId(String deviceId) {
+            this.deviceId = deviceId;
+        }
+
+        public String getDeviceName() {
+            return deviceName;
+        }
+
+        public void setDeviceName(String deviceName) {
+            this.deviceName = deviceName;
+        }
+
+        public String getBuzzerState() {
+            return buzzerState;
+        }
+
+        public void setBuzzerState(String buzzerState) {
+            this.buzzerState = buzzerState;
+        }
+
+        public String getIsValid() {
+            return isValid;
+        }
+
+        public void setIsValid(String isValid) {
+            this.isValid = isValid;
+        }
+
+        public Object getUserIdCreate() {
+            return userIdCreate;
+        }
+
+        public void setUserIdCreate(Object userIdCreate) {
+            this.userIdCreate = userIdCreate;
+        }
+
+        public String getGmtCreate() {
+            return gmtCreate;
+        }
+
+        public void setGmtCreate(String gmtCreate) {
+            this.gmtCreate = gmtCreate;
+        }
+
+        public Object getUserIdUpdate() {
+            return userIdUpdate;
+        }
+
+        public void setUserIdUpdate(Object userIdUpdate) {
+            this.userIdUpdate = userIdUpdate;
+        }
+
+        public Object getGmtUpdate() {
+            return gmtUpdate;
+        }
+
+        public void setGmtUpdate(Object gmtUpdate) {
+            this.gmtUpdate = gmtUpdate;
+        }
+    }
+}

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

@@ -16,5 +16,8 @@ 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 BASE_LOCAl="http://192.168.1.111:8080/";
+    String AIR_GUARD_LIST=BASE_LOCAl +"app/airGuard/getDevList";
 }
 

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

@@ -28,6 +28,7 @@ import com.google.gson.Gson;
 import com.lib.MsgContent;
 import com.lzy.okgo.OkGo;
 import com.lzy.okgo.cache.CacheMode;
+import com.lzy.okgo.callback.AbsCallback;
 import com.lzy.okgo.callback.StringCallback;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
@@ -44,9 +45,11 @@ import com.silence.commonframe.activity.DevicedetailActivity;
 import com.silence.commonframe.adapter.DeviceTypeTitleAdapter;
 import com.silence.commonframe.adapter.MyAdapterSlide;
 import com.silence.commonframe.adapter.RecViewAdapter;
+import com.silence.commonframe.bean.AirGuardBean;
 import com.silence.commonframe.bean.DeviceTypeTitleBean;
 import com.silence.commonframe.bean.IsDeviceChange;
 import com.silence.commonframe.bean.TestBean;
+import com.silence.commonframe.common.constant.UrlConstants;
 import com.silence.commonframe.example.ActivityGuideDeviceCamera;
 import com.silence.commonframe.lib.funsdk.support.FunSupport;
 import com.silence.commonframe.lib.funsdk.support.OnAddSubDeviceResultListener;
@@ -527,9 +530,7 @@ public class DeviceFragment extends Fragment implements OnFunRegisterListener, O
                                         });
                                     }
                                 });
-
                             }
-
                         }else {
                             LoginIn.tokenOut(code,message,getContext());
                             Toast.makeText(getContext(),""+message,Toast.LENGTH_SHORT).show();
@@ -890,7 +891,27 @@ public class DeviceFragment extends Fragment implements OnFunRegisterListener, O
      * 获取空气卫士列表
      */
     private void getAirGuide(){
+        OkGo.get(UrlConstants.AIR_GUARD_LIST)
+                .tag(this)                       // 请求的 tag, 主要用于取消对应的请求
+                .cacheKey("cacheGetKey")            // 设置当前请求的缓存key,建议每个不同功能的请求设置一个
+                .cacheMode(CacheMode.DEFAULT)    // 缓存模式，详细请看缓存介绍
+                .headers("token", Data.getToken())
+                .execute(new AbsCallback<AirGuardBean>() {
 
+                    @Override
+                    public AirGuardBean convertSuccess(Response response) throws Exception {
+                        return null;
+                    }
+
+                    @Override
+                    public void onSuccess(AirGuardBean airGuardBean, Call call, Response response) {
+
+                    }
+                    /** 请求失败，响应错误，数据解析错误等，都会回调该方法， UI线程 */
+                    public void onError(Call call, Response response, Exception e) {
+
+                    }
+                });
     }
     @Override
     public void onAttach(Context context) {