From ac35fad7127c52ad56fdc1e3bc8674e7883e6acd Mon Sep 17 00:00:00 2001
From: liuwenzheng <329541594@qq.com>
Date: Tue, 4 Sep 2018 16:27:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B8=A9=E6=B9=BF=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/moko/beacon/entity/BeaconInfo.java    |  4 +++
 .../com/moko/beacon/entity/IBeaconType.java   | 27 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 app/src/main/java/com/moko/beacon/entity/IBeaconType.java

diff --git a/app/src/main/java/com/moko/beacon/entity/BeaconInfo.java b/app/src/main/java/com/moko/beacon/entity/BeaconInfo.java
index de17b5d..6c91886 100644
--- a/app/src/main/java/com/moko/beacon/entity/BeaconInfo.java
+++ b/app/src/main/java/com/moko/beacon/entity/BeaconInfo.java
@@ -23,6 +23,8 @@ public class BeaconInfo implements Serializable{
     public int version;
     public String scanRecord;
     public String threeAxis;
+    public String temp;
+    public String humidity;
 
 
     @Override
@@ -42,6 +44,8 @@ public String toString() {
                 ", version=" + version +
                 ", scanRecord='" + scanRecord + '\'' +
                 ", threeAxis='" + threeAxis + '\'' +
+                ", temp='" + temp + '\'' +
+                ", humidity='" + humidity + '\'' +
                 '}';
     }
 }
diff --git a/app/src/main/java/com/moko/beacon/entity/IBeaconType.java b/app/src/main/java/com/moko/beacon/entity/IBeaconType.java
new file mode 100644
index 0000000..91dfe40
--- /dev/null
+++ b/app/src/main/java/com/moko/beacon/entity/IBeaconType.java
@@ -0,0 +1,27 @@
+package com.moko.beacon.entity;
+
+/**
+ * Created by liuwenzheng on 2018/7/13.
+ */
+
+public enum IBeaconType {
+    IBEACON("0000ff00"),
+    IBEACON_THREE_AXIS("0000ff01"),
+
+    ;
+
+    IBeaconType(String service) {
+        this.service = service;
+    }
+
+    public String getService() {
+        return service;
+    }
+
+    public void setService(String service) {
+        this.service = service;
+    }
+
+    private String service;
+
+}