@@ -3,8 +3,8 @@ | |||
xmlns:tools="http://schemas.android.com/tools" | |||
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_ADMIN" /> <!-- 网络相关 --> | |||
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /> |
@@ -257,7 +257,7 @@ public class MyRetrofit implements ToastAction { | |||
//加密 | |||
// parameters.setBizContent(SM4Utils.encryptCBC(parameters.getBizContent(), SM4_KEY)); | |||
new MyRetrofit().getRetrofitGZ(code).create(Api.class) | |||
.message3GZ(linkedTreeMap) | |||
.message2GZ(linkedTreeMap) | |||
.enqueue(new ConverterGZ<Result>(context, start, false, loadHint) { | |||
@Override | |||
protected void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) { |
@@ -731,6 +731,20 @@ public class BluetoothDialog { | |||
callBack.performOnSuccess(result.getData().split(",")); | |||
} | |||
} 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() { | |||
@Override | |||
public void onResult(com.kcht.obublesdk.region.guizhou.ResultStatus resultStatus) { |
@@ -9,8 +9,8 @@ android { | |||
// 目标适配版本 | |||
//noinspection ExpiredTargetSdkVersion,OldTargetApi | |||
targetSdkVersion 30 | |||
versionName '1.0.4' | |||
versionCode 6 | |||
versionName '1.3.3' | |||
versionCode 10 | |||
//当前线上版本 103 5 | |||
} | |||