瀏覽代碼

调整

master
lujin 1 月之前
父節點
當前提交
72f5bb2d4d

+ 2
- 2
app/src/main/AndroidManifest.xml 查看文件

xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="com.huntersun.vkyes.etcopencard"> package="com.huntersun.vkyes.etcopencard">
<!-- 蓝牙相关 --> <!-- 蓝牙相关 -->
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
<uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
<!-- <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />-->
<!-- <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />-->
<uses-permission android:name="android.permission.BLUETOOTH" /> <uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <!-- 网络相关 --> <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <!-- 网络相关 -->
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />

+ 1
- 1
app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/MyRetrofit.java 查看文件

//加密 //加密
// parameters.setBizContent(SM4Utils.encryptCBC(parameters.getBizContent(), SM4_KEY)); // parameters.setBizContent(SM4Utils.encryptCBC(parameters.getBizContent(), SM4_KEY));
new MyRetrofit().getRetrofitGZ(code).create(Api.class) new MyRetrofit().getRetrofitGZ(code).create(Api.class)
.message3GZ(linkedTreeMap)
.message2GZ(linkedTreeMap)
.enqueue(new ConverterGZ<Result>(context, start, false, loadHint) { .enqueue(new ConverterGZ<Result>(context, start, false, loadHint) {
@Override @Override
protected void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) { protected void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {

+ 14
- 0
app/src/main/java/com/huntersun/vkyes/etcopencard/project/bluetooth/BluetoothDialog.java 查看文件

callBack.performOnSuccess(result.getData().split(",")); callBack.performOnSuccess(result.getData().split(","));
} }
} else if (isPlk == KC) { } else if (isPlk == KC) {
// String[] arr = {"00A40000023F00","00A40000021001","0020000003123456","00B201C400","00B202C400","00B203C400"};
//// ,"00B204C400","00B205C400","00B206C400","00B207C400","00B208C400","00B209C400","00B20aC400","00B20bC400","00B20cC400","00B20dC400","00B20eC400","00B20fC400","00B210C400","00B211C400","00B212C400","00B213C400","00B214C400","00B215C400","00B216C400","00B217C400","00B218C400","00B219C400","00B21aC400","00B21bC400","00B21cC400","00B21dC400","00B21eC400","00B21fC400","00B220C400","00B221C400","00B222C400","00B223C400","00B224C400","00B225C400","00B226C400","00B227C400","00B228C400","00B229C400","00B22aC400","00B22bC400","00B22cC400","00B22dC400","00B22eC400","00B22fC400","00B230C400","00B231C400","00B232C400"
//// };
// kcBleSDK.transCmd(arr, cmdType, new com.kcht.obublesdk.region.guizhou.Callback() {
// @Override
// public void onResult(com.kcht.obublesdk.region.guizhou.ResultStatus resultStatus) {
// if (resultStatus.getCode() == 0) {
// Log.e("KC执行","指令"+JSON.toJSONString(arr)+"结果~~"+JSONObject.toJSONString(resultStatus.getData()));
//
//// Log.e("指令执行成功", "指令~~" + JSONObject.toJSONString(cmdArray) + "执行结果" + JSONObject.toJSONString(resultStatus.getData()));
//// callBack.performOnSuccess(resultStatus.getData());
// }
// }
// });
kcBleSDK.transCmd(cmdArray, cmdType, new com.kcht.obublesdk.region.guizhou.Callback() { kcBleSDK.transCmd(cmdArray, cmdType, new com.kcht.obublesdk.region.guizhou.Callback() {
@Override @Override
public void onResult(com.kcht.obublesdk.region.guizhou.ResultStatus resultStatus) { public void onResult(com.kcht.obublesdk.region.guizhou.ResultStatus resultStatus) {

+ 2
- 2
common.gradle 查看文件

// 目标适配版本 // 目标适配版本
//noinspection ExpiredTargetSdkVersion,OldTargetApi //noinspection ExpiredTargetSdkVersion,OldTargetApi
targetSdkVersion 30 targetSdkVersion 30
versionName '1.0.4'
versionCode 6
versionName '1.3.3'
versionCode 10
//当前线上版本 103 5 //当前线上版本 103 5
} }



Loading…
取消
儲存