Browse Source

1,更新依赖库

2,修复部分activity没有再manifest注册的问题
master
陈福行 3 years ago
parent
commit
d6391ba590

+ 3
- 3
app/build.gradle View File

applicationId "aicare.net.cn.sdk.ailinksdkdemoandroid" applicationId "aicare.net.cn.sdk.ailinksdkdemoandroid"
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 29 targetSdkVersion 29
versionCode 5
versionName "1.5.5"
versionCode 6
versionName "1.5.6"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }
buildTypes { buildTypes {
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.12'
implementation 'com.github.elinkthings:AILinkSDKRepositoryAndroid:1.8.0'//蓝牙核心库 implementation 'com.github.elinkthings:AILinkSDKRepositoryAndroid:1.8.0'//蓝牙核心库
implementation 'com.github.elinkthings:AILinkSDKOtaLibraryAndroid:1.0.3'//OTA库,需要依赖核心库 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 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'com.jakewharton:butterknife:10.2.0' implementation 'com.jakewharton:butterknife:10.2.0'
annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.0' annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.0'

+ 6
- 0
app/src/main/AndroidManifest.xml View File

<activity android:name=".BroadcastBloodOxygenActivity" /> <activity android:name=".BroadcastBloodOxygenActivity" />
<activity android:name=".SmartMaskActivity" /> <activity android:name=".SmartMaskActivity" />
<activity android:name=".ToothBrushWifiBleActivity" /> <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"/> <service android:name="com.pingwang.bluetoothlib.server.ELinkBleServer"/>
</application> </application>

+ 6
- 1
app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/BloodSugar4GActivity.java View File



} }
}); });

} }


public void login() throws Throwable { 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); URL uri = new URL(mUrl);
HttpURLConnection httpURLConnection = (HttpURLConnection) uri.openConnection(); HttpURLConnection httpURLConnection = (HttpURLConnection) uri.openConnection();
// Post请求必须设置允许输出 // Post请求必须设置允许输出

+ 1
- 1
app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/ToothBrushWifiBleActivity.java View File

mMHandler.sendEmptyMessage(ConnectWifi); mMHandler.sendEmptyMessage(ConnectWifi);
} }
} }
if (type == CmdConfig.DISORCONNECTWIFI) {
if (type == CmdConfig.DISCONNECT_WIFI) {
mList.add(0, "发起连接 " + status); mList.add(0, "发起连接 " + status);
mMHandler.sendEmptyMessage(ToRefreUi); mMHandler.sendEmptyMessage(ToRefreUi);
} }

+ 3
- 1
app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/TransmissionActivity.java View File



} }




@Override @Override
public void showdata(String data) {
public void showdata(String data, int type) {
mlogList.add(0, "收 payload数据"+ TimeUtils.getTime()+data); mlogList.add(0, "收 payload数据"+ TimeUtils.getTime()+data);
mMHandler.sendEmptyMessage(ToRefreUi); mMHandler.sendEmptyMessage(ToRefreUi);
} }

+ 20
- 3
app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/WeightScaleBleActivity.java View File










} }


private void initView(){ private void initView(){


} }


@Override
public void onSetPortStatus(int status) {

}

@Override @Override
public void onSetIpUrlStatus(int status) { public void onSetIpUrlStatus(int status) {


} }


@Override
public void onIpData(String ip) {

}

@Override
public void onPortData(int port) {

}

@Override
public void onUrlData(String url) {

}



@Override @Override
public void onClick(View v) { public void onClick(View v) {

+ 23
- 3
app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/WeightScaleWifiBleActivity.java View File

*/ */
@Override @Override
public void OnSetWifiNameOrPwdOrConnectCallback(int type, int status) { public void OnSetWifiNameOrPwdOrConnectCallback(int type, int status) {
if (type == BodyFatDataUtil.SET_WIFI_MAC) {
if (type == CmdConfig.SET_WIFI_MAC) {
mList.add(0, "获取到设置的mac地址状态 " + status); mList.add(0, "获取到设置的mac地址状态 " + status);
if (status == BodyFatDataUtil.STATUS_SUCCESS) { if (status == BodyFatDataUtil.STATUS_SUCCESS) {
issetMac = true; issetMac = true;
} }


} }
if (type == BodyFatDataUtil.SET_WIFI_PAW) {
if (type == CmdConfig.SET_WIFI_PAW) {
mList.add(0, "获取到设置的密码状态 " + status); mList.add(0, "获取到设置的密码状态 " + status);


if (status == BodyFatDataUtil.STATUS_SUCCESS && issetMac) { if (status == BodyFatDataUtil.STATUS_SUCCESS && issetMac) {
mMHandler.sendEmptyMessage(ConnectWifi); mMHandler.sendEmptyMessage(ConnectWifi);
} }
} }
if (type == BodyFatDataUtil.DIS_OR_CON_WIFI) {
if (type == CmdConfig.DIS_OR_CON_WIFI) {
mList.add(0, "发起连接 " + status); mList.add(0, "发起连接 " + status);
mMHandler.sendEmptyMessage(ToRefreUi); mMHandler.sendEmptyMessage(ToRefreUi);
} }
listAdapter.notifyDataSetChanged(); listAdapter.notifyDataSetChanged();
} }


@Override
public void onSetPortStatus(int status) {

}

@Override @Override
public void onSetIpUrlStatus(int status) { public void onSetIpUrlStatus(int status) {
if (status == 0) { if (status == 0) {
listAdapter.notifyDataSetChanged(); listAdapter.notifyDataSetChanged();
} }


@Override
public void onIpData(String ip) {

}

@Override
public void onPortData(int port) {

}

@Override
public void onUrlData(String url) {

}

@Override @Override
public void onClick(View v) { public void onClick(View v) {
int id = v.getId(); int id = v.getId();

Loading…
Cancel
Save