Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/WeightScaleWifiBleActivity.java

app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "aicare.net.cn.sdk.ailinksdkdemoandroid"
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 5
-        versionName "1.5.5"
+        versionCode 7
+        versionName "1.5.7"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -46,5 +46,3 @@ dependencies {
 
 
 }
-
-

app/src/main/AndroidManifest.xml

@@ -64,7 +64,12 @@
         <activity android:name=".BroadcastBloodOxygenActivity" />
         <activity android:name=".SmartMaskActivity" />
         <activity android:name=".ToothBrushWifiBleActivity" />
+        <activity android:name=".TempHumidityActivity" />
+        <activity android:name=".SkateboardDataActivity" />
         <activity android:name=".HeightWeightScaleActivity" />
+        <activity android:name=".ClearShakeHandsActivity" />
+        <activity android:name=".BloodSugar4GActivity" />
+        <activity android:name=".BloodOxygenActivity" />
         <activity android:name=".RopeSkippingActivity" />
 
         <service android:name="com.pingwang.bluetoothlib.server.ELinkBleServer"/>

app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/BloodSugar4GActivity.java

@@ -103,10 +103,15 @@ public class BloodSugar4GActivity extends AppCompatActivity implements View.OnCl
 
             }
         });
+
     }
 
     public void login() throws Throwable {
-        String mUrl=url + "/api/user/login?key=inet_elink&username=dhls@qq.com&password=dc483e80a7a0bd9ef71d8cf973673924";
+        //以下登录信息为服务器key和用户账号密码,仅供测试使用上线使用会导致只有一个用户可用
+        String key = "inet_elink";//key
+        String username = "dhls@qq.com";//用户账号
+        String password = "dc483e80a7a0bd9ef71d8cf973673924";//用户密码
+        String mUrl = url + "/api/user/login?key=" + key + "&username=" + username + "&password=" + password;
         URL uri = new URL(mUrl);
         HttpURLConnection httpURLConnection = (HttpURLConnection) uri.openConnection();
         // Post请求必须设置允许输出

app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/TransmissionActivity.java

@@ -123,6 +123,8 @@ public class TransmissionActivity extends BleBaseActivity implements View.OnClic
 
     }
 
+
+
     @Override
     public void showdata(String data, int type) {
         mlogList.add(0, "收 payload数据"+ TimeUtils.getTime()+data);

app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/WeightScaleBleActivity.java

@@ -66,9 +66,6 @@ public class WeightScaleBleActivity extends BleBaseActivity implements View.OnCl
 
 
 
-
-
-
     }
 
     private void initView(){