更新依赖库

app/build.gradle

@@ -40,9 +40,9 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.4.2'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     testImplementation 'junit:junit:4.12'
-    implementation 'com.github.elinkthings:AILinkSDKRepositoryAndroid:1.10.9'//蓝牙核心库
+    implementation 'com.github.elinkthings:AILinkSDKRepositoryAndroid:1.13.11'//蓝牙核心库
     implementation 'com.github.elinkthings:AILinkSDKOtaLibraryAndroid:1.0.3'//OTA库,需要依赖核心库
-    implementation 'com.github.elinkthings:AILinkSDKParsingLibraryAndroid:1.8.0'//蓝牙解析库
+    implementation 'com.github.elinkthings:AILinkSDKParsingLibraryAndroid:1.8.4'//蓝牙解析库
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'com.jakewharton:butterknife:10.2.0'
     annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.0'

app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/modules/airdetector/AirDetectorActivity.java

@@ -15,6 +15,11 @@ import android.widget.ListView;
 import android.widget.RadioGroup;
 import android.widget.Toast;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatSpinner;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.lifecycle.Lifecycle;
+
 import com.pingwang.bluetoothlib.device.BleDevice;
 import com.pingwang.bluetoothlib.device.SendDataBean;
 import com.pingwang.bluetoothlib.listener.OnBleOtherDataListener;
@@ -33,10 +38,6 @@ import aicare.net.cn.sdk.ailinksdkdemoandroid.R;
 import aicare.net.cn.sdk.ailinksdkdemoandroid.base.BleAppBaseActivity;
 import aicare.net.cn.sdk.ailinksdkdemoandroid.modules.airdetector_test.AirDetectorActivityTest;
 import aicare.net.cn.sdk.ailinksdkdemoandroid.utils.TimeUtils;
-import androidx.annotation.Nullable;
-import androidx.appcompat.widget.AppCompatSpinner;
-import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.lifecycle.Lifecycle;
 import cn.net.aicare.modulelibrary.module.airDetector.AirConst;
 import cn.net.aicare.modulelibrary.module.airDetector.AirDetectorWifeBleData;
 import cn.net.aicare.modulelibrary.module.airDetector.AirSendUtil;
@@ -415,8 +416,7 @@ public class AirDetectorActivity extends BleAppBaseActivity implements AirDetect
                     String valueMin = ed_min.getText().toString().trim();
                     float myValueMax = valueMax.contains("\\.") ? Float.parseFloat(valueMax) : Integer.parseInt(valueMax);
                     float myValueMin = valueMin.contains("\\.") ? Float.parseFloat(valueMin) : Integer.parseInt(valueMin);
-                    sendDataBean = AirSendUtil.setWarmTemp(supportBean.getPoint(),
-                            supportBean.getUnit(), myValueMax, myValueMin);
+                    sendDataBean = AirSendUtil.setWarmTemp(supportBean.getPoint(), supportBean.getUnit(), myValueMax, myValueMin,1);
                     break;
                 case AirConst.AIR_TYPE_HUMIDITY:
                     valueMax = ed_max.getText().toString().trim();
@@ -424,7 +424,7 @@ public class AirDetectorActivity extends BleAppBaseActivity implements AirDetect
                     myValueMax = valueMax.contains("\\.") ? Float.parseFloat(valueMax) : Integer.parseInt(valueMax);
                     myValueMin = valueMin.contains("\\.") ? Float.parseFloat(valueMin) : Integer.parseInt(valueMin);
                     sendDataBean = AirSendUtil.setWarmHumidity(supportBean.getPoint(),
-                            myValueMax, myValueMin);
+                            myValueMax, myValueMin,1);
                     break;
                 case AirConst.AIR_SETTING_VOICE:
                     warmState = Integer.parseInt(ed_warm_state.getText().toString().trim());

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

@@ -8,6 +8,10 @@ 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;
@@ -17,9 +21,6 @@ import java.util.List;
 
 import aicare.net.cn.sdk.ailinksdkdemoandroid.R;
 import aicare.net.cn.sdk.ailinksdkdemoandroid.base.BleAppBaseActivity;
-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;
@@ -324,14 +325,14 @@ public class AirDetectorActivityTest extends BleAppBaseActivity implements AirDe
                 type = AirConst.AIR_TYPE_TEMP;
                 if (isSupportWarmType(type)) {
                     addTest("设置温度报警");
-                    mAirDetectorWifeBleData.sendData(AirSendUtil.setWarmTemp(0, AirConst.UNIT_C, 30f, 0f));
+                    mAirDetectorWifeBleData.sendData(AirSendUtil.setWarmTemp(0, AirConst.UNIT_C, 30f, 0f,1));
                 }
                 break;
             case STEP_WARM_HUMIDITY:
                 type = AirConst.AIR_TYPE_HUMIDITY;
                 if (isSupportWarmType(type)) {
                     addTest("设置湿度报警");
-                    mAirDetectorWifeBleData.sendData(AirSendUtil.setWarmHumidity(0, 60f, 7f));
+                    mAirDetectorWifeBleData.sendData(AirSendUtil.setWarmHumidity(0, 60f, 7f,1));
                 }
                 break;
             case STEP_WARM_PM2_5:

app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/modules/weight_scale/WeightScaleActivity.java

@@ -8,6 +8,9 @@ import android.widget.CompoundButton;
 import android.widget.ListView;
 import android.widget.RadioButton;
 
+import androidx.annotation.Nullable;
+
+import com.pingwang.bluetoothlib.bean.SupportUnitBean;
 import com.pingwang.bluetoothlib.device.BleDevice;
 
 import java.text.SimpleDateFormat;
@@ -17,7 +20,6 @@ import java.util.Locale;
 
 import aicare.net.cn.sdk.ailinksdkdemoandroid.R;
 import aicare.net.cn.sdk.ailinksdkdemoandroid.base.BleBaseActivity;
-import androidx.annotation.Nullable;
 import cn.net.aicare.modulelibrary.module.weightscale.WeightScaleDevice;
 
 /**
@@ -35,7 +37,7 @@ public class WeightScaleActivity extends BleBaseActivity implements WeightScaleD
 
     private WeightScaleDevice mWeightScaleDevice;
 
-    private Button btn_weight_battery, btn_weight_sync_time,btn_weight_query_unit;
+    private Button btn_weight_battery, btn_weight_sync_time, btn_weight_query_unit;
 
     private RadioButton kg, jing, stlb, lb;
 
@@ -228,6 +230,11 @@ public class WeightScaleActivity extends BleBaseActivity implements WeightScaleD
         addText("收到的A7 PayLoad:[" + A7DataStr + "]");
     }
 
+    @Override
+    public void onSupportUnit(List<SupportUnitBean> list) {
+
+    }
+
     @Override
     public void onMeasureOk() {
         addText("测量完成");
@@ -278,19 +285,6 @@ public class WeightScaleActivity extends BleBaseActivity implements WeightScaleD
         addText("版本号：" + version);
     }
 
-    /**
-     * 请求同步时间
-     *
-     * @param quest 1-请求同步时间
-     */
-    @Override
-    public void onSyncTime(int quest) {
-        if (quest == 1) {
-            if (mWeightScaleDevice != null) {
-                mWeightScaleDevice.appSyncTime();
-            }
-        }
-    }
 
     @Override
     public void onBattery(int status, int battery) {
@@ -307,7 +301,7 @@ public class WeightScaleActivity extends BleBaseActivity implements WeightScaleD
             if (mWeightScaleDevice != null) {
                 mWeightScaleDevice.appSyncTime();
             }
-        }else if (view.getId()==R.id.btn_weight_query_unit){
+        } else if (view.getId() == R.id.btn_weight_query_unit) {
             if (mWeightScaleDevice != null) {
                 mWeightScaleDevice.queryUnit();
             }