Browse Source

修改崩溃,成功跑起来

master
cym 3 years ago
parent
commit
cc694b8f8d

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

import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;


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


import java.util.ArrayList; import java.util.ArrayList;
import aicare.net.cn.sdk.ailinksdkdemoandroid.config.BleDeviceConfig; import aicare.net.cn.sdk.ailinksdkdemoandroid.config.BleDeviceConfig;
import aicare.net.cn.sdk.ailinksdkdemoandroid.find.FindDeviceNewActivity; 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_height.BroadcastHeightActivity;
import aicare.net.cn.sdk.ailinksdkdemoandroid.modules.broadcast_nutrition.BroadNutritionActivity;
import aicare.net.cn.sdk.ailinksdkdemoandroid.utils.SP; import aicare.net.cn.sdk.ailinksdkdemoandroid.utils.SP;





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

import aicare.net.cn.sdk.ailinksdkdemoandroid.config.BleDeviceConfig; import aicare.net.cn.sdk.ailinksdkdemoandroid.config.BleDeviceConfig;
import aicare.net.cn.sdk.ailinksdkdemoandroid.dialog.LoadingIosDialogFragment; import aicare.net.cn.sdk.ailinksdkdemoandroid.dialog.LoadingIosDialogFragment;
import aicare.net.cn.sdk.ailinksdkdemoandroid.find.FindDeviceNewActivity; 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.coffee_scale.CoffeeScaleActivity;
import aicare.net.cn.sdk.ailinksdkdemoandroid.modules.food_temp.FoodTempActivity; import aicare.net.cn.sdk.ailinksdkdemoandroid.modules.food_temp.FoodTempActivity;
import aicare.net.cn.sdk.ailinksdkdemoandroid.modules.share_charger.ShareChargerActivity; import aicare.net.cn.sdk.ailinksdkdemoandroid.modules.share_charger.ShareChargerActivity;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.core.app.ActivityCompat; import androidx.core.app.ActivityCompat;

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





+ 5
- 5
app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/SkateboardDataActivity.java View File

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


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


mDevice.setOnBleOTAListener(SkateboardDataActivity.this); mDevice.setOnBleOTAListener(SkateboardDataActivity.this);

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

*/ */
public final static int CLEAR_SHAKE_HANDS = -6; public final static int CLEAR_SHAKE_HANDS = -6;


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

/** /**
* 广播营养秤 * 广播营养秤
*/ */

Loading…
Cancel
Save