1,更新依赖库

2,修复部分activity没有再manifest注册的问题

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 6
+        versionName "1.5.6"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -37,7 +37,7 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     implementation 'com.github.elinkthings:AILinkSDKRepositoryAndroid:1.8.0'//蓝牙核心库
     implementation 'com.github.elinkthings:AILinkSDKOtaLibraryAndroid:1.0.3'//OTA库,需要依赖核心库
-    implementation 'com.github.elinkthings:AILinkSDKParsingLibraryAndroid:1.6.0'
+    implementation 'com.github.elinkthings:AILinkSDKParsingLibraryAndroid:1.6.1'//蓝牙解析库
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'com.jakewharton:butterknife:10.2.0'
     annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.0'

app/src/main/AndroidManifest.xml

@@ -64,6 +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" />
 
         <service android:name="com.pingwang.bluetoothlib.server.ELinkBleServer"/>
     </application>

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/ToothBrushWifiBleActivity.java

@@ -221,7 +221,7 @@ public class ToothBrushWifiBleActivity extends BleBaseActivity implements View.O
                 mMHandler.sendEmptyMessage(ConnectWifi);
             }
         }
-        if (type == CmdConfig.DISORCONNECTWIFI) {
+        if (type == CmdConfig.DISCONNECT_WIFI) {
             mList.add(0, "发起连接 " + status);
             mMHandler.sendEmptyMessage(ToRefreUi);
         }

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

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

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(){
@@ -446,11 +443,31 @@ public class WeightScaleBleActivity extends BleBaseActivity implements View.OnCl
 
     }
 
+    @Override
+    public void onSetPortStatus(int status) {
+
+    }
+
     @Override
     public void onSetIpUrlStatus(int status) {
 
     }
 
+    @Override
+    public void onIpData(String ip) {
+
+    }
+
+    @Override
+    public void onPortData(int port) {
+
+    }
+
+    @Override
+    public void onUrlData(String url) {
+
+    }
+
 
     @Override
     public void onClick(View v) {

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

@@ -460,7 +460,7 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.
      */
     @Override
     public void OnSetWifiNameOrPwdOrConnectCallback(int type, int status) {
-        if (type == BodyFatDataUtil.SET_WIFI_MAC) {
+        if (type == CmdConfig.SET_WIFI_MAC) {
             mList.add(0, "获取到设置的mac地址状态 " + status);
             if (status == BodyFatDataUtil.STATUS_SUCCESS) {
                 issetMac = true;
@@ -469,14 +469,14 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.
             }
 
         }
-        if (type == BodyFatDataUtil.SET_WIFI_PAW) {
+        if (type == CmdConfig.SET_WIFI_PAW) {
             mList.add(0, "获取到设置的密码状态 " + status);
 
             if (status == BodyFatDataUtil.STATUS_SUCCESS && issetMac) {
                 mMHandler.sendEmptyMessage(ConnectWifi);
             }
         }
-        if (type == BodyFatDataUtil.DIS_OR_CON_WIFI) {
+        if (type == CmdConfig.DIS_OR_CON_WIFI) {
             mList.add(0, "发起连接 " + status);
             mMHandler.sendEmptyMessage(ToRefreUi);
         }
@@ -519,6 +519,11 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.
         listAdapter.notifyDataSetChanged();
     }
 
+    @Override
+    public void onSetPortStatus(int status) {
+
+    }
+
     @Override
     public void onSetIpUrlStatus(int status) {
         if (status == 0) {
@@ -537,6 +542,21 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.
         listAdapter.notifyDataSetChanged();
     }
 
+    @Override
+    public void onIpData(String ip) {
+
+    }
+
+    @Override
+    public void onPortData(int port) {
+
+    }
+
+    @Override
+    public void onUrlData(String url) {
+
+    }
+
     @Override
     public void onClick(View v) {
         int id = v.getId();