Bläddra i källkod

1,更新SDK版本

master
陈福行 3 år sedan
förälder
incheckning
db1322a454

+ 2
- 2
app/build.gradle Visa fil

@@ -35,9 +35,9 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
testImplementation 'junit:junit:4.12'
implementation 'com.github.elinkthings:AILinkSDKRepositoryAndroid:1.9.2'//蓝牙核心库
implementation 'com.github.elinkthings:AILinkSDKRepositoryAndroid:1.9.4'//蓝牙核心库
implementation 'com.github.elinkthings:AILinkSDKOtaLibraryAndroid:1.0.3'//OTA库,需要依赖核心库
implementation 'com.github.elinkthings:AILinkSDKParsingLibraryAndroid:1.6.2'//蓝牙解析库
implementation 'com.github.elinkthings:AILinkSDKParsingLibraryAndroid:1.6.6'//蓝牙解析库
implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'com.jakewharton:butterknife:10.2.0'
annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.0'

+ 2
- 2
app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/MainActivity.java Visa fil

@@ -2,11 +2,12 @@ package aicare.net.cn.sdk.ailinksdkdemoandroid;

import android.content.Intent;
import android.os.Message;
import android.util.Log;
import android.view.View;
import android.widget.TextView;

import com.besthealth.bhBodyComposition120.BhBodyComposition;
import com.pingwang.bluetoothlib.AILinkSDK;
import com.pingwang.bluetoothlib.config.BleConfig;
import com.pingwang.bluetoothlib.utils.BleLog;

import java.util.ArrayList;
@@ -179,7 +180,6 @@ public class MainActivity extends BleAppBaseActivity {
((TextView) findViewById(R.id.tv_app_version)).setText(version);
AILinkSDK.getInstance().init(getApplication());//sdk
// AILinkBleManager.getInstance().init(getApplication());
BleConfig.addVendorID(0xac05);
SP.init(this);
}


+ 35
- 5
app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/TempCmdActivity.java Visa fil

@@ -11,9 +11,6 @@ import android.widget.Button;
import android.widget.EditText;
import android.widget.ListView;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import com.pingwang.bluetoothlib.device.BleDevice;
import com.pingwang.bluetoothlib.device.BleSendCmdUtil;
import com.pingwang.bluetoothlib.device.SendBleBean;
@@ -26,12 +23,14 @@ 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.thermometer.TempDeviceData;


@@ -221,6 +220,37 @@ public class TempCmdActivity extends BleBaseActivity implements OnCallbackDis, O
//-----------------通知-------------------

private class NotifyData implements TempDeviceData.onNotifyData {

@Override
public void mcuHistory(int maxSize, int curSize, List<TempDeviceData.HistoryBean> list) {

}

@Override
public void mcuGetMode(int mode) {

}

@Override
public void mcuSetMode(int status) {

}

@Override
public void mcuGetTemp(int temp, int unit, int decimal) {

}

@Override
public void mcuSetTemp(int status) {

}

@Override
public void mcuSetUnixStamp(int status) {

}

@Override
public void onData(byte[] status,int type) {
String data = "";

+ 4
- 2
app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/TransmissionActivity.java Visa fil

@@ -124,7 +124,8 @@ public class TransmissionActivity extends BleBaseActivity implements View.OnClic
}

@Override
public void showdata(String data, int type) {
public void showData(String data, int type) {

mlogList.add(0, "收 payload数据" + TimeUtils.getTime() +"cid=" + type + "\n" + data);
mMHandler.sendEmptyMessage(ToRefreUi);
}
@@ -143,7 +144,8 @@ public class TransmissionActivity extends BleBaseActivity implements View.OnClic
}

@Override
public void otherdata(String data) {
public void otherData(byte[] hex, String data) {

mlogList.add(0, "收 透传数据" + TimeUtils.getTime() + data);
mMHandler.sendEmptyMessage(ToRefreUi);
}

+ 1
- 1
app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/WeightScaleWifiBleActivity.java Visa fil

@@ -627,7 +627,7 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.
bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance().getSelectWifiMac());
break;
case R.id.setedpaw:
bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance().getSelectWifiPwd());
bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance().getConnectWifiPwd());
break;
case R.id.setedname:
bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance().getConnectWifiName());

Laddar…
Avbryt
Spara