Bladeren bron

修改崩溃,成功跑起来

master
cym 3 jaren geleden
bovenliggende
commit
cc694b8f8d

+ 3
- 0
app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/MainActivity.java Bestand weergeven

@@ -5,7 +5,9 @@ import android.os.Message;
import android.view.View;
import android.widget.TextView;

import com.pingwang.bluetoothlib.AILinkBleManager;
import com.pingwang.bluetoothlib.AILinkSDK;
import com.pingwang.bluetoothlib.config.BleConfig;
import com.pingwang.bluetoothlib.utils.BleLog;

import java.util.ArrayList;
@@ -16,6 +18,7 @@ import aicare.net.cn.sdk.ailinksdkdemoandroid.config.AppConfig;
import aicare.net.cn.sdk.ailinksdkdemoandroid.config.BleDeviceConfig;
import aicare.net.cn.sdk.ailinksdkdemoandroid.find.FindDeviceNewActivity;
import aicare.net.cn.sdk.ailinksdkdemoandroid.modules.broadcast_height.BroadcastHeightActivity;
import aicare.net.cn.sdk.ailinksdkdemoandroid.modules.broadcast_nutrition.BroadNutritionActivity;
import aicare.net.cn.sdk.ailinksdkdemoandroid.utils.SP;



+ 3
- 0
app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/ShowBleActivity.java Bestand weergeven

@@ -43,6 +43,7 @@ import java.util.UUID;
import aicare.net.cn.sdk.ailinksdkdemoandroid.config.BleDeviceConfig;
import aicare.net.cn.sdk.ailinksdkdemoandroid.dialog.LoadingIosDialogFragment;
import aicare.net.cn.sdk.ailinksdkdemoandroid.find.FindDeviceNewActivity;
import aicare.net.cn.sdk.ailinksdkdemoandroid.modules.ble_nutrition.BleNutritionActivity;
import aicare.net.cn.sdk.ailinksdkdemoandroid.modules.coffee_scale.CoffeeScaleActivity;
import aicare.net.cn.sdk.ailinksdkdemoandroid.modules.food_temp.FoodTempActivity;
import aicare.net.cn.sdk.ailinksdkdemoandroid.modules.share_charger.ShareChargerActivity;
@@ -52,6 +53,8 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.app.ActivityCompat;

import cn.net.aicare.modulelibrary.module.RopeSkipping.RopeSkippingBleData;
import cn.net.aicare.modulelibrary.module.scooter.SkateboardBleConfig;



+ 5
- 5
app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/SkateboardDataActivity.java Bestand weergeven

@@ -213,7 +213,7 @@ public class SkateboardDataActivity extends BleAppBaseActivity implements OnCall
* rtk升级方式
* 默认静默升级
*/
private int mRtkOtaType = RtkOtaManager.OTA_MODE_SILENT_FUNCTION;
// private int mRtkOtaType = RtkOtaManager.OTA_MODE_SILENT_FUNCTION;
/**
* ota作用域
*/
@@ -825,14 +825,14 @@ public class SkateboardDataActivity extends BleAppBaseActivity implements OnCall
//OTA类型
case R.id.btn_ota_type:
List<DialogStringImageAdapter.DialogStringImageBean> list = new ArrayList<>();
list.add(new DialogStringImageAdapter.DialogStringImageBean("静默升级", RtkOtaManager.OTA_MODE_SILENT_FUNCTION));
list.add(new DialogStringImageAdapter.DialogStringImageBean("普通升级", RtkOtaManager.OTA_MODE_NORMAL_FUNCTION));
// list.add(new DialogStringImageAdapter.DialogStringImageBean("静默升级", RtkOtaManager.OTA_MODE_SILENT_FUNCTION));
// list.add(new DialogStringImageAdapter.DialogStringImageBean("普通升级", RtkOtaManager.OTA_MODE_NORMAL_FUNCTION));
ShowListDialogFragment.newInstance().setTitle("").setCancel("", 0).setCancelBlank(true).setBackground(true).setBottom(false)
.setList(list).setOnDialogListener(new ShowListDialogFragment.onDialogListener() {
@Override
public void onItemListener(int position) {
DialogStringImageAdapter.DialogStringImageBean dialogStringImageBean = list.get(position);
mRtkOtaType = (int) dialogStringImageBean.getType();
// mRtkOtaType = (int) dialogStringImageBean.getType();
btn_ota_type.setText(dialogStringImageBean.getName());
}
}).show(getSupportFragmentManager());
@@ -1003,7 +1003,7 @@ public class SkateboardDataActivity extends BleAppBaseActivity implements OnCall
mList.add("OTA包中包含:" + stepSize + "个小包\n现在升级" + ((step >= 0) ? step + "包" : "全部包"));
mHandler.sendEmptyMessage(REFRESH_DATA);

mRtkOtaManager.startOta(mRtkOtaType, step);
// mRtkOtaManager.startOta(mRtkOtaType, step);
} else if (mDevice != null) {

mDevice.setOnBleOTAListener(SkateboardDataActivity.this);

+ 0
- 5
app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/config/BleDeviceConfig.java Bestand weergeven

@@ -192,11 +192,6 @@ public class BleDeviceConfig {
*/
public final static int CLEAR_SHAKE_HANDS = -6;

/**
* 跳绳
*/
public final static int ROPE_SKIPPING = 0x002f;

/**
* 广播营养秤
*/

Laden…
Annuleren
Opslaan