更新demo

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

@@ -8,19 +8,18 @@ import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
 import com.pingwang.bluetoothlib.bean.BleValueBean;
 import com.pingwang.bluetoothlib.bean.SupportUnitBean;
 import com.pingwang.bluetoothlib.device.BleDevice;
 import com.pingwang.bluetoothlib.listener.OnCallbackBle;
-import aicare.net.cn.sdk.ailinksdkdemoandroid.base.BleBaseActivity;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
 
+import aicare.net.cn.sdk.ailinksdkdemoandroid.base.BleBaseActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import cn.net.aicare.modulelibrary.module.HeightWeightScale.HeightBodyFatBleData;
 import cn.net.aicare.modulelibrary.module.HeightWeightScale.HeightBodyFatBleUntils;
 
@@ -302,15 +301,16 @@ public class HeightWeightScaleActivity extends BleBaseActivity implements OnCall
     }
 
     @Override
-    public void onAdc(int workMode, int status, int adcType, int adc, int arithmetic) {
+    public void onAdc(int workMode, int status, int adcType, long adc, int arithmetic) {
         mMHandler.removeMessages(ADC);
         logList.add(0, "阻抗数据 模式:" + workMode + " 测量状态: " + status + "\n 阻抗类型: " + adcType
                 + "  阻抗: " + adc + " 算法位: " + arithmetic);
         listAdapter.notifyDataSetChanged();
 
-
     }
 
+
+
     @Override
     public void onHeart(int workMode, int status, int heart) {
         logList.add(0, "心率数据 模式:" + workMode + " 测量状态: " + status + " 心率: " + heart);

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

@@ -14,6 +14,10 @@ import com.pingwang.bluetoothlib.config.BleConfig;
 import com.pingwang.bluetoothlib.device.BleDevice;
 import com.pingwang.bluetoothlib.listener.OnBleHandshakeListener;
 import com.pingwang.bluetoothlib.listener.OnCallbackBle;
+
+import java.util.ArrayList;
+import java.util.List;
+
 import aicare.net.cn.sdk.ailinksdkdemoandroid.base.BleAppBaseActivity;
 import aicare.net.cn.sdk.ailinksdkdemoandroid.dialog.DialogStringImageAdapter;
 import aicare.net.cn.sdk.ailinksdkdemoandroid.dialog.ShowListDialogFragment;
@@ -21,12 +25,9 @@ import aicare.net.cn.sdk.ailinksdkdemoandroid.utils.FileUtils;
 import aicare.net.cn.sdk.ailinksdkdemoandroid.utils.L;
 import aicare.net.cn.sdk.ailinksdkdemoandroid.utils.MyBleStrUtils;
 import aicare.net.cn.sdk.ailinksdkdemoandroid.utils.TimeUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
 import butterknife.BindView;
 import cn.net.aicare.modulelibrary.module.scooter.BleWeatherBean;
+import cn.net.aicare.modulelibrary.module.scooter.OnScooterBleOTAListener;
 import cn.net.aicare.modulelibrary.module.scooter.SkateboardBleConfig;
 import cn.net.aicare.modulelibrary.module.scooter.SkateboardDevice;
 
@@ -36,7 +37,7 @@ import cn.net.aicare.modulelibrary.module.scooter.SkateboardDevice;
  * 滑板车界面
  */
 public class SkateboardDataActivity extends BleAppBaseActivity implements OnCallbackBle, View.OnClickListener, SkateboardDevice.onNotifyData,
-        RtkOtaManager.OnRtkOtaInfoListener, ShowListDialogFragment.onDialogListener, OnBleHandshakeListener {
+        RtkOtaManager.OnRtkOtaInfoListener, ShowListDialogFragment.onDialogListener, OnBleHandshakeListener , OnScooterBleOTAListener {
 
     private final int REFRESH_DATA = 1;
 
@@ -1006,7 +1007,7 @@ public class SkateboardDataActivity extends BleAppBaseActivity implements OnCall
 //                mRtkOtaManager.startOta(mRtkOtaType, step);
             } else if (mDevice != null) {
 
-                mDevice.setOnBleOTAListener(SkateboardDataActivity.this);
+                mDevice.setOnScooterBleOTAListener(SkateboardDataActivity.this);
                 mDevice.setUpdateData(byFileName, mOTAType, mOTAScope);
             }
         }

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

@@ -24,12 +24,12 @@ import com.pingwang.bluetoothlib.listener.OnMcuParameterListener;
 import com.pingwang.bluetoothlib.utils.BleDensityUtil;
 import com.pingwang.bluetoothlib.utils.BleLog;
 import com.pingwang.bluetoothlib.utils.BleStrUtils;
-import aicare.net.cn.sdk.ailinksdkdemoandroid.base.BleBaseActivity;
-import aicare.net.cn.sdk.ailinksdkdemoandroid.utils.TimeUtils;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import aicare.net.cn.sdk.ailinksdkdemoandroid.base.BleBaseActivity;
+import aicare.net.cn.sdk.ailinksdkdemoandroid.utils.TimeUtils;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import cn.net.aicare.modulelibrary.module.sphygmomanometer.SphyBleConfig;
@@ -256,8 +256,9 @@ public class SphyCmdActivity extends BleBaseActivity implements OnCallbackDis, O
         @Override
         public void onData(byte[] status, int type) {
             String data = "";
-            if (status != null)
+            if (status != null) {
                 data = BleStrUtils.byte2HexStr(status);
+            }
             if (type == 100) {
                 mList.add(TimeUtils.getTime() + "send->" + data);
             } else {
@@ -272,6 +273,11 @@ public class SphyCmdActivity extends BleBaseActivity implements OnCallbackDis, O
             mHandler.sendEmptyMessage(REFRESH_DATA);
         }
 
+        @Override
+        public void getSphyVoice(byte cmd) {
+
+        }
+
         @Override
         public void sphyDataNow(int dia, int sys, int decimal, int pul, int unit) {
             String diaStr = BleDensityUtil.getInstance().holdDecimals(dia, decimal);

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

@@ -251,6 +251,26 @@ public class TempCmdActivity extends BleBaseActivity implements OnCallbackDis, O
 
         }
 
+        @Override
+        public void onHistoryNum(long allNum, long sendNum) {
+
+        }
+
+        @Override
+        public void onHistory(long time, byte[] value) {
+
+        }
+
+        @Override
+        public void onHistoryLast(long time) {
+
+        }
+
+        @Override
+        public void onDelHistory(int result) {
+
+        }
+
         @Override
         public void onData(byte[] status,int type) {
             String data = "";

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

@@ -13,22 +13,21 @@ import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.RadioButton;
 
-import androidx.annotation.Nullable;
-
 import com.pingwang.bluetoothlib.bean.BleValueBean;
 import com.pingwang.bluetoothlib.config.CmdConfig;
 import com.pingwang.bluetoothlib.device.BleDevice;
 import com.pingwang.bluetoothlib.device.SendBleBean;
 import com.pingwang.bluetoothlib.listener.OnCallbackBle;
 import com.pingwang.bluetoothlib.utils.BleStrUtils;
-import aicare.net.cn.sdk.ailinksdkdemoandroid.base.BleBaseActivity;
-import aicare.net.cn.sdk.ailinksdkdemoandroid.config.BleDeviceConfig;
-import aicare.net.cn.sdk.ailinksdkdemoandroid.dialog.AddUserDialog;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
 
+import aicare.net.cn.sdk.ailinksdkdemoandroid.base.BleBaseActivity;
+import aicare.net.cn.sdk.ailinksdkdemoandroid.config.BleDeviceConfig;
+import aicare.net.cn.sdk.ailinksdkdemoandroid.dialog.AddUserDialog;
+import androidx.annotation.Nullable;
 import cn.net.aicare.modulelibrary.module.BodyFatScale.AppHistoryRecordBean;
 import cn.net.aicare.modulelibrary.module.BodyFatScale.BodyFatBleUtilsData;
 import cn.net.aicare.modulelibrary.module.BodyFatScale.BodyFatDataUtil;
@@ -361,8 +360,9 @@ public class WeightScaleBleActivity extends BleBaseActivity implements View.OnCl
     @Override
     public void requestSynTime() {
         mlogList.add(0, "同步时间");
-        if (bodyFatBleUtilsData != null)
+        if (bodyFatBleUtilsData != null) {
             bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance().synTime());
+        }
     }
 
     @Override
@@ -377,7 +377,7 @@ public class WeightScaleBleActivity extends BleBaseActivity implements View.OnCl
             msg = msg + status + " 成功";
         } else if (status == BodyFatDataUtil.STATUS_FAIL) {
             msg = msg + status + " 失败";
-        } else if (status == BodyFatDataUtil.STATUS_NOSUPORT) {
+        } else if (status == BodyFatDataUtil.STATUS_NOT_SUPPORT) {
             msg = msg + status + " 不支持";
         }
         mlogList.add(0, msg);

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

@@ -16,6 +16,7 @@ import android.widget.RadioButton;
 import android.widget.Toast;
 
 import com.elinkthings.bleotalibrary.listener.OnBleOTAListener;
+import com.elinkthings.bleotalibrary.netstrap.OPLOtaManager;
 import com.pingwang.bluetoothlib.bean.BleValueBean;
 import com.pingwang.bluetoothlib.config.CmdConfig;
 import com.pingwang.bluetoothlib.device.BleDevice;
@@ -343,7 +344,7 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.
             msg = msg + status + " 成功";
         } else if (status == BodyFatDataUtil.STATUS_FAIL) {
             msg = msg + status + " 失败";
-        } else if (status == BodyFatDataUtil.STATUS_NOSUPORT) {
+        } else if (status == BodyFatDataUtil.STATUS_NOT_SUPPORT) {
             msg = msg + status + " 不支持";
         }
         mList.add(0, msg);
@@ -815,7 +816,7 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.
             String path = uri.getPath();
             mList.add(0, "ota准备就绪，请勿操作");
             listAdapter.notifyDataSetChanged();
-            bodyFatBleUtilsData.initOtaUtil(this, uri, new OnBleOTAListener() {
+            OPLOtaManager build = OPLOtaManager.newBuilder(this).setFilePath(uri).setOnBleOTAListener(new OnBleOTAListener() {
                 @Override
                 public void onOtaSuccess() {
                     mList.add(0, "ota成功");
@@ -839,9 +840,8 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.
                         listAdapter.notifyDataSetChanged();
                     }
                 }
-            });
-        } else {
-
+            }).build(bodyFatBleUtilsData.getBleDevice());
+            build.startOta();
         }
     }