Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/MainActivity.java
#	app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/ShowBleActivity.java
#	app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/config/BleDeviceConfig.java
#	app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/modules/airdetector_test/AirDetectorActivityTest.java
#	app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/modules/broadcast_height/BroadcastHeightActivity.java
#	app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/modules/meat_probe/MeatProbeActivity.java
#	app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/modules/meat_probe_charger/MeatProbeChargerActivity.java
#	app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/modules/weight_scale/WeightScaleActivity.java
#	app/src/main/res/layout/activity_main.xml
#	app/src/main/res/values/colors.xml

app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/base/MyApplication.java

@@ -2,6 +2,8 @@ package aicare.net.cn.sdk.ailinksdkdemoandroid.base;
 
 import android.app.Application;
 
+import com.pingwang.bluetoothlib.AILinkSDK;
+
 public class MyApplication extends Application {
 
     private static MyApplication sInstance;
@@ -10,6 +12,7 @@ public class MyApplication extends Application {
     public void onCreate() {
         super.onCreate();
         sInstance = this;
+        AILinkSDK.getInstance().init(this);
     }
 
     public static MyApplication getInstance(){

app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/modules/airdetector_test/AirDetectorActivityTest.java

@@ -8,10 +8,6 @@ import android.util.SparseArray;
 import android.widget.Button;
 import android.widget.Toast;
 
-import androidx.lifecycle.Lifecycle;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
 import com.pingwang.bluetoothlib.device.BleDevice;
 import com.pingwang.bluetoothlib.listener.OnCallbackBle;
 import com.pingwang.bluetoothlib.utils.BleLog;
@@ -21,11 +17,12 @@ import java.util.List;
 
 import aicare.net.cn.sdk.ailinksdkdemoandroid.R;
 import aicare.net.cn.sdk.ailinksdkdemoandroid.base.BleAppBaseActivity;
-import aicare.net.cn.sdk.ailinksdkdemoandroid.modules.airdetector.AirUtil;
+import androidx.lifecycle.Lifecycle;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import cn.net.aicare.modulelibrary.module.airDetector.AirConst;
 import cn.net.aicare.modulelibrary.module.airDetector.AirDetectorWifeBleData;
 import cn.net.aicare.modulelibrary.module.airDetector.AirSendUtil;
-import cn.net.aicare.modulelibrary.module.airDetector.AlarmClockStatement;
 import cn.net.aicare.modulelibrary.module.airDetector.StatusBean;
 import cn.net.aicare.modulelibrary.module.airDetector.SupportBean;
 

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

@@ -142,7 +142,7 @@
                     android:id="@+id/btn_broadcast_scale"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="广播秤" />
+                    android:text="广播体脂秤" />
 
                 <Button
                     android:id="@+id/btn_broadcast_blood_oxygen"
@@ -476,15 +476,7 @@
                     android:id="@+id/btn_weight_scale"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="体重秤"/>
-
-            </LinearLayout>
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-
-
+                    android:text="连接体重秤"/>
 
             </LinearLayout>