elink
/
AILinkSDK_Android
Следить 1
В избранное 0
Форкнуть 0
Код Задачи 0 Pull Request'ы 0 Релизы 0 Вики Активность
Просмотр исходного кода

1,wifi+ble体脂秤增加翻译

master
陈福行 1 год назад
Родитель
fe053fdcbe
Сommit
34dffd4565
4 измененных файлов: 374 добавлений и 199 удалений
Разделённый вид Показать статистику Diff
  1. 142
    149
      app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/WeightScaleWifiBleActivity.java
  2. 85
    50
      app/src/main/res/layout/activity_weight_scale_wifi_ble.xml
  3. 72
    0
      app/src/main/res/values-zh/strings.xml
  4. 75
    0
      app/src/main/res/values/strings.xml

+ 142
- 149
app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/WeightScaleWifiBleActivity.java Просмотреть файл

@@ -115,7 +115,7 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.
listView.setAdapter(listAdapter);

tv_path = findViewById(R.id.tv_path);
tv_path.setText("文件路径:手机" + File.separator + Environment.DIRECTORY_DOCUMENTS + File.separator + FileUtils.FILE_DIR);
tv_path.setText("file path:" + File.separator + Environment.DIRECTORY_DOCUMENTS + File.separator + FileUtils.FILE_DIR);

WeakReference weakReference = new WeakReference(new MHandler());
mMHandler = (MHandler) weakReference.get();
@@ -123,7 +123,8 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
if (isChecked) {
bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance().setWeightUnit(BodyFatDataUtil.KG, BleDeviceConfig.WEIGHT_BODY_FAT_SCALE_WIFI_BLE));
bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance()
.setWeightUnit(BodyFatDataUtil.KG, BleDeviceConfig.WEIGHT_BODY_FAT_SCALE_WIFI_BLE));
}
}
});
@@ -131,7 +132,8 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
if (isChecked) {
bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance().setWeightUnit(BodyFatDataUtil.JIN, BleDeviceConfig.WEIGHT_BODY_FAT_SCALE_WIFI_BLE));
bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance()
.setWeightUnit(BodyFatDataUtil.JIN, BleDeviceConfig.WEIGHT_BODY_FAT_SCALE_WIFI_BLE));
}
}
});
@@ -139,7 +141,8 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
if (isChecked) {
bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance().setWeightUnit(BodyFatDataUtil.ST, BleDeviceConfig.WEIGHT_BODY_FAT_SCALE_WIFI_BLE));
bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance()
.setWeightUnit(BodyFatDataUtil.ST, BleDeviceConfig.WEIGHT_BODY_FAT_SCALE_WIFI_BLE));
}
}
});
@@ -147,7 +150,8 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
if (isChecked) {
bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance().setWeightUnit(BodyFatDataUtil.LB, BleDeviceConfig.WEIGHT_BODY_FAT_SCALE_WIFI_BLE));
bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance()
.setWeightUnit(BodyFatDataUtil.LB, BleDeviceConfig.WEIGHT_BODY_FAT_SCALE_WIFI_BLE));
}
}
});
@@ -157,7 +161,7 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.
initLauncher();
}

private User getDefault(){
private User getDefault() {
User user = new User();
user.setModeType(BodyFatDataUtil.MODE_ORDINARY);
user.setSex(BodyFatDataUtil.SEX_MAN);
@@ -173,7 +177,7 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.
launcher = registerForActivityResult(new ResultContact(), result -> {
if (!TextUtils.isEmpty(result)) {
SP.getInstance().putOtaFileName(result);
mList.add(0, "选择文件:" + result);
mList.add(0, getString(R.string.select_document) + result);
listAdapter.notifyDataSetChanged();
}
});
@@ -250,7 +254,7 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.

@Override
public void onWeightData(int status, float weight, int weightUnit, int decimals) {
String data = "体重数据类型：" + (status==BodyFatDataUtil.WEIGHT_TESTING?"实时":"稳定") + "\n体重: " + weight + " 单位：" + weightUnit + " 小数点位: " + decimals;
String data = "Data Type：" + (status == BodyFatDataUtil.WEIGHT_TESTING ? getString(R.string.real_time) : getString(R.string.stable)) + "\nWeight: " + weight + " \nUnit：" + weightUnit + " \nDecimal point: " + decimals;
if (mOldData.equals(data)) {
return;
}
@@ -270,41 +274,41 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.

switch (status) {
case BodyFatDataUtil.WEIGHT_TESTING:
mList.add(0, "测量状态：" + status + " 测量实时体重");
mList.add(0, getString(R.string.measurement_status) + status + "\n" + getString(R.string.real_time_weight));
break;
case BodyFatDataUtil.WEIGHT_RESULT:
mList.add(0, "测量状态：" + status + " 稳定体重");
mList.add(0, getString(R.string.measurement_status) + status + "\n" + getString(R.string.stable_weight));
break;
case BodyFatDataUtil.IMPEDANCE_TESTING:
mList.add(0, "测量状态：" + status + " 阻抗测量中");
mList.add(0, getString(R.string.measurement_status) + status + "\n" + getString(R.string.impedance_test_progress));
break;
case BodyFatDataUtil.IMPEDANCE_SUCCESS_DATA:
case BodyFatDataUtil.IMPEDANCE_SUCCESS:
mList.add(0, "测量状态：" + status + " 阻抗测量成功");
mList.add(0, getString(R.string.measurement_status) + status + "\n" + getString(R.string.impedance_test_successful));
break;
case BodyFatDataUtil.IMPEDANCE_FAIL:
mList.add(0, "测量状态：" + status + " 阻抗测量失败");
mList.add(0, getString(R.string.measurement_status) + status + "\n" + getString(R.string.impedance_test_failed));
break;
case BodyFatDataUtil.HEART_TESTING:
mList.add(0, "测量状态：" + status + " 心率测量中");
mList.add(0, getString(R.string.measurement_status) + status + "\n" + getString(R.string.heart_rate_measuring));
break;
case BodyFatDataUtil.HEART_SUCCESS:
mList.add(0, "测量状态：" + status + " 心率测量成功");
mList.add(0, getString(R.string.measurement_status) + status + "\n" + getString(R.string.heart_rate_test_successful));
break;
case BodyFatDataUtil.HEART_FAIL:
mList.add(0, "测量状态：" + status + " 心率测量失败");
mList.add(0, getString(R.string.measurement_status) + status + "\n" + getString(R.string.heart_rate_test_failed));
break;
case BodyFatDataUtil.TEST_FINISH:
mList.add(0, "测量状态：" + status + " 测量完成");
mList.add(0, getString(R.string.measurement_status) + status + "\n" + getString(R.string.test_completed));
if (bodyFatBleUtilsData != null) {
bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance().sendTestStatus(1));
}
break;
case BodyFatDataUtil.MUC_REQUEST_USER_INFO:
mList.add(0, "测量状态：" + status + "请求用户信息");
mList.add(0, getString(R.string.measurement_status) + status + "\n" + getString(R.string.request_user_information));
break;
default:
mList.add(0, "测量状态：" + status);
mList.add(0, getString(R.string.measurement_status) + status);

}
mMHandler.sendEmptyMessage(ToRefreUi);
@@ -314,16 +318,16 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.
public void onOtaCallback(int status) {
switch (status) {
case 0x00:
mList.add(0, "ota状态：" + status + " wifiOTA成功");
mList.add(0, "ota：" + status + " wifiOTA成功");
break;
case 0x01:
mList.add(0, "ota状态：" + status + " wifiOTA失败");
mList.add(0, "ota：" + status + " wifiOTA失败");
break;
case 0x02:
mList.add(0, "ota状态：" + status + " 不支持wifiOTA");
mList.add(0, "ota：" + status + " 不支持wifiOTA");
break;
case 0x03:
mList.add(0, "ota状态：" + status + " 模块主动开始wifiOTA（MCU收到该指令后不能断电，需要等待OTA成功或者失败）");
mList.add(0, "ota：" + status + " 模块主动开始wifiOTA（MCU收到该指令后不能断电，需要等待OTA成功或者失败）");
break;

}
@@ -332,64 +336,64 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.

@Override
public void onAdc(int adc, int algorithmic) {
mList.add(0, "阻抗：" + adc + " 算法位：" + algorithmic);
mList.add(0, "impedance：" + adc + " 算法位：" + algorithmic);
mMHandler.sendEmptyMessage(ToRefreUi);
}

@Override
public void onHeartRate(int heartrate) {
mList.add(0, "心率：" + heartrate);
mList.add(0, "HR：" + heartrate);
mMHandler.sendEmptyMessage(ToRefreUi);
}

@Override
public void onBodyFat(BodyFatRecord bodyFatRecord) {
mList.add(0, "体脂数据：" + bodyFatRecord.toString());
mList.add(0, bodyFatRecord.toString());
mMHandler.sendEmptyMessage(ToRefreUi);
}

@Override
public void onError(int code) {
mList.add(0, "历史记录Mcu：" + code);
mList.add(0, "ERR：" + code);
mMHandler.sendEmptyMessage(ToRefreUi);
}

@Override
public void onHistoryMcu(McuHistoryRecordBean mcuHistoryRecordBean) {
mList.add(0, "历史记录Mcu：" + mcuHistoryRecordBean.toString());
mList.add(0, getString(R.string.history_mcu) + mcuHistoryRecordBean.toString());
mMHandler.sendEmptyMessage(ToRefreUi);
// mMHandler.sendEmptyMessage(ToRefreUi);
}

@Override
public void onHistoryApp(AppHistoryRecordBean appHistoryRecordBean) {
mList.add(0, "历史记录app：" + appHistoryRecordBean.toString());
mList.add(0, getString(R.string.history_app) + appHistoryRecordBean.toString());
mMHandler.sendEmptyMessage(ToRefreUi);

}

@Override
public void onVersion(String version) {
mList.add(0, "版本号：" + version);
mList.add(0, "Version：" + version);
mMHandler.sendEmptyMessage(ToRefreUi);

}

@Override
public void onMcuBatteryStatus(int status, int battery) {
mList.add(0, "电量状态" + status + " 电量：" + battery);
mList.add(0, "status:" + status + "\n" + getString(R.string.power) + battery + "%");
mMHandler.sendEmptyMessage(ToRefreUi);
}

@Override
public void onSysTime(int status, int[] times) {
mList.add(0, "时间状态" + status);
mList.add(0, getString(R.string.time_status) + status);
mMHandler.sendEmptyMessage(ToRefreUi);
}

@Override
public void requestSynTime() {
mList.add(0, "同步时间");
mList.add(0, getString(R.string.syn_time));
bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance().synTime());
}

@@ -397,16 +401,16 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.
public void setTimeCallback(int type, int status) {
String msg = "";
if (type == CmdConfig.SET_SYS_TIME) {
msg = "设置系统当前时间：";
msg = getString(R.string.set_current_system_time);
} else if (type == CmdConfig.SET_DEVICE_TIME) {
msg = "同步时间";
msg = getString(R.string.syn_time);
}
if (status == BodyFatDataUtil.STATUS_SUCCESS) {
msg = msg + status + " 成功";
msg = msg + status + getString(R.string.success);
} else if (status == BodyFatDataUtil.STATUS_FAIL) {
msg = msg + status + " 失败";
msg = msg + status + getString(R.string.failure);
} else if (status == BodyFatDataUtil.STATUS_NOT_SUPPORT) {
msg = msg + status + " 不支持";
msg = msg + status + getString(R.string.not_support);
}
mList.add(0, msg);
mMHandler.sendEmptyMessage(ToRefreUi);
@@ -415,11 +419,11 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.
@Override
public void requestSynHistoryCallback(int status) {
if (status == 0) {
mList.add(0, "" + status + " 无历史记录");
mList.add(0, status + getString(R.string.no_history));
} else if (status == 1) {
mList.add(0, "请求历史记录" + status + " 开始发送历史记录");
mList.add(0, status + getString(R.string.start_sending_history));
} else {
mList.add(0, "请求历史记录" + status + " 发送历史记录结束");
mList.add(0, status + getString(R.string.end_sending_history));
}
mMHandler.sendEmptyMessage(ToRefreUi);
}
@@ -427,13 +431,13 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.
@Override
public void updateUserCallback(int status) {
if (status == 0) {
mList.add(0, "更新用户或列表回调" + status + " 更新列表成功");
mList.add(0, status + getString(R.string.update_user_list_success));
} else if (status == 1) {
mList.add(0, "更新用户或列表回调" + status + " 更新个人用户成功");
mList.add(0, status + getString(R.string.update_user_success));
} else if (status == 2) {
mList.add(0, "更新用户或列表回调" + status + " 更新列表失败");
mList.add(0, status + getString(R.string.update_user_list_failed));
} else {
mList.add(0, "更新用户或列表回调" + status + " 更新个人用户失败");
mList.add(0, status + getString(R.string.update_user_failed));
}
mMHandler.sendEmptyMessage(ToRefreUi);
}
@@ -441,11 +445,11 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.
@Override
public void setUnitCallback(int status) {
if (status == 0) {
mList.add(0, "下发单位回调" + status + " 成功");
mList.add(0, getString(R.string.issued_unit_callback) + status + getString(R.string.success));
} else if (status == 1) {
mList.add(0, "下发单位回调" + status + " 失败");
mList.add(0, getString(R.string.issued_unit_callback) + status + getString(R.string.failure));
} else {
mList.add(0, "下发单位回调" + status + " 不支持");
mList.add(0, getString(R.string.issued_unit_callback) + status + getString(R.string.not_support));
}
mMHandler.sendEmptyMessage(ToRefreUi);
}
@@ -453,11 +457,11 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.
@Override
public void requestUserData(int status) {
if (status == 0x01) {
mList.add(0, "下发用户信息 " + status);
mList.add(0, getString(R.string.send_user_info) + status);
} else if (status == 0x03) {
mList.add(0, "下发用户信息成功 " + status);
mList.add(0, getString(R.string.send_user_info_success) + status);
} else {
mList.add(0, "下发用户信息失败 " + status);
mList.add(0, getString(R.string.send_user_info_failure) + status);
}
mMHandler.sendEmptyMessage(ToRefreUi);
}
@@ -465,15 +469,16 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.

@Override
public void OnBleAndWifiStatus(int blestatus, int wifistatus, int workstatus) {
BleLog.e(TAG, "蓝牙状态：" + blestatus + " wifi状态：" + " 工作状态：" + workstatus);
mList.add(0, "蓝牙状态：" + blestatus + " wifi状态：" + wifistatus + " 工作状态：" + workstatus);
mList.add(0, getString(R.string.ble_status) + blestatus +"\n"+
getString(R.string.wifi_status) + wifistatus +"\n"+
getString(R.string.work_status) + workstatus);
mMHandler.sendEmptyMessage(ToRefreUi);

}

@Override
public void OnWifiScanStatus(int Status) {
mList.add(0, "扫描wifi状态: " + Status);
mList.add(0, getString(R.string.scan_wifi_status) + Status);
mMHandler.sendEmptyMessage(ToRefreUi);
}

@@ -493,19 +498,19 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.
public void OnWifiListInfo(int no, String mac, int db, int type, int wifistatus) {

wifimacMap.put(no, mac);
mList.add(0, "WIFI序号: " + no + " WIFI名称：" + mHashMap.get(no) + " WIFImac: " + mac + " db: " + db + " type: " + type + " wifistata" + wifistatus);
mList.add(0, "WIFI no: " + no + " WIFI name：" + mHashMap.get(no) + " WIFI mac: " + mac + " db: " + db + " type: " + type + " wifistata" + wifistatus);
mMHandler.sendEmptyMessage(ToRefreUi);
}

@Override
public void OnWifiCurrentConnect(String name) {
mList.add(0, "当前连接wifi名称: " + name);
mList.add(0, getString(R.string.current_connected_wifi_name) + name);
mMHandler.sendEmptyMessage(ToRefreUi);
}

@Override
public void OnWifiScanFinish(int wifiNum) {
mList.add(0, "扫描结束 扫描的wifi个数 " + wifiNum);
mList.add(0, getString(R.string.scan_wifi_number) + wifiNum);
mMHandler.sendEmptyMessage(ToRefreUi);
}

@@ -518,23 +523,20 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.
@Override
public void OnSetWifiNameOrPwdOrConnectCallback(int type, int status) {
if (type == CmdConfig.SET_WIFI_MAC) {
mList.add(0, "获取到设置的mac地址状态 " + status);
mList.add(0, getString(R.string.get_set_mac_address_status) + status);
if (status == BodyFatDataUtil.STATUS_SUCCESS) {
issetMac = true;
} else {

}

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

mList.add(0, getString(R.string.get_set_password_status) + status);
if (status == BodyFatDataUtil.STATUS_SUCCESS && issetMac) {
mMHandler.sendEmptyMessage(ConnectWifi);
}
}
if (type == CmdConfig.DIS_OR_CON_WIFI) {
mList.add(0, "发起连接 " + status);
mList.add(0, getString(R.string.initiate_connection)+":" + status);
mMHandler.sendEmptyMessage(ToRefreUi);
}

@@ -542,13 +544,13 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.

@Override
public void getSelectWifiMac(String mac) {
mList.add(0, "获取到设置的wifi的mac地址 " + mac);
mList.add(0, getString(R.string.get_set_wifi_mac_address) + mac);
mMHandler.sendEmptyMessage(ToRefreUi);
}

@Override
public void getSelectWifiPaw(String paw) {
mList.add(0, "获取到设置的wifi的密码 " + paw);
mList.add(0, getString(R.string.get_set_wifi_password) + paw);
mMHandler.sendEmptyMessage(ToRefreUi);
}

@@ -561,26 +563,13 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.

@Override
public void onSetIpStatus(int status) {
// if (status == 0) {
// if (isTest) {
// mList.add(0, "设置环境IP为生产环境成功");
// mList.add(0, "设置环境路径为生产环境");
// } else {
// mList.add(0, "设置环境IP为测试环境成功");
// mList.add(0, "设置环境路径为测试环境");
// }
// setIpUrl(IpUrl);
// } else {
// mList.add(0, "设置环境IP失败");
// }
// listAdapter.notifyDataSetChanged();
if (status == 0) {
mList.add(0, "设置环境IP成功");
mList.add(0, getString(R.string.set_environment_ip_success));
int port = Integer.parseInt(et_port.getText().toString());
mList.add(0, "设置环境端口为：" + port);
mList.add(0, getString(R.string.set_environment_port) + port);
setPort(port);
} else {
mList.add(0, "设置环境IP失败");
mList.add(0, getString(R.string.set_environment_ip_failure));
}
listAdapter.notifyDataSetChanged();
}
@@ -588,55 +577,41 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.
@Override
public void onSetPortStatus(int status) {
if (status == 0) {
mList.add(0, "设置环境端口成功");
mList.add(0, getString(R.string.set_environment_port_success));
String ipUrlStr = et_url.getText().toString();
mList.add(0, "设置环境url为：" + ipUrlStr);
mList.add(0, getString(R.string.set_environment_url) + ipUrlStr);
setIpUrl(convertToASCII(ipUrlStr));
} else {
mList.add(0, "设置环境端口失败");
mList.add(0, getString(R.string.set_environment_port_failure));
}
listAdapter.notifyDataSetChanged();
}

@Override
public void onSetIpUrlStatus(int status) {
// if (status == 0) {
// if (isTest) {
// mList.add(0, "设置环境路径为生产环境成功");
// isTest = false;
//
// } else {
// mList.add(0, "设置环境路径为测试环境成功");
// isTest = true;
//
// }
// } else {
// mList.add(0, "设置环境路径失败");
// }
// listAdapter.notifyDataSetChanged();
if (status == 0) {
mList.add(0, "设置环境url成功");
mList.add(0, getString(R.string.set_environment_url_success));
} else {
mList.add(0, "设置环境url失败");
mList.add(0, getString(R.string.set_environment_url_failure));
}
listAdapter.notifyDataSetChanged();
}

@Override
public void onIpData(String ip) {
mList.add(0, "环境ip：" + ip);
mList.add(0, "ip：" + ip);
listAdapter.notifyDataSetChanged();
}

@Override
public void onPortData(int port) {
mList.add(0, "环境端口：" + port);
mList.add(0, "port：" + port);
listAdapter.notifyDataSetChanged();
}

@Override
public void onUrlData(String url) {
mList.add(0, "环境url：" + url);
mList.add(0, "url：" + url);
listAdapter.notifyDataSetChanged();
}

@@ -645,7 +620,7 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.
int id = v.getId();
switch (id) {
case R.id.reset:
mList.add(0, "恢复出厂设置");
mList.add(0, getString(R.string.reset));
listAdapter.notifyDataSetChanged();
bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance().reset());
break;
@@ -662,28 +637,32 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.
try {
int selectWifi = Integer.valueOf(mEditText.getText().toString().trim());
if (mHashMap.get(selectWifi) != null && wifimacMap.get(selectWifi) != null) {
WifiDialog
.newInstance().setTitle(mHashMap.get(selectWifi), wifimacMap.get(selectWifi)).setOnDialogListener(new WifiDialog.OnDialogListener() {
@Override
public void tvCancelListener(View v) {

}

@Override
public void tvSucceedListener(View v, String data) {
bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance().setWifiMac(wifimacMap.get(selectWifi)));
if (data.equals("") || data.length() >= 8) {
setPaw(data);
} else {
Toast.makeText(WeightScaleWifiBleActivity.this, "密码格式不对", Toast.LENGTH_SHORT).show();
}
}

@Override
public void etModifyName(EditText v) {

}
}).show(getSupportFragmentManager());
WifiDialog.newInstance()
.setTitle(mHashMap.get(selectWifi), wifimacMap.get(selectWifi))
.setOnDialogListener(new WifiDialog.OnDialogListener() {
@Override
public void tvCancelListener(View v) {

}

@Override
public void tvSucceedListener(View v, String data) {
bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance()
.setWifiMac(wifimacMap.get(selectWifi)));
if (data.equals("") || data.length() >= 8) {
setPaw(data);
} else {
Toast.makeText(WeightScaleWifiBleActivity.this, R.string.password_format_err, Toast.LENGTH_SHORT)
.show();
}
}

@Override
public void etModifyName(EditText v) {

}
})
.show(getSupportFragmentManager());
}
} catch (NumberFormatException e) {
e.printStackTrace();
@@ -712,21 +691,21 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.

String ipStr = et_ip.getText().toString();
setIp(convertToASCII(ipStr));
mList.add(0, "设置环境IP为：" + ipStr);
mList.add(0, getString(R.string.set_environment_ip) + ipStr);
listAdapter.notifyDataSetChanged();
break;
case R.id.check_ip:
mList.add(0, "查看环境ip");
mList.add(0, getString(R.string.view_environment_ip));
listAdapter.notifyDataSetChanged();
bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance().checkIp());
break;
case R.id.check_port:
mList.add(0, "查看环境端口");
mList.add(0, getString(R.string.view_environment_port));
listAdapter.notifyDataSetChanged();
bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance().checkPort());
break;
case R.id.check_url:
mList.add(0, "查看环境url");
mList.add(0, getString(R.string.view_environment_url));
listAdapter.notifyDataSetChanged();
bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance().checkUrl());
break;
@@ -740,17 +719,24 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.
for (String s : list) {
mDialogList.add(new DialogStringImageBean(s, 0));
}
ShowListDialogFragment
.newInstance().setTitle("").setCancel("", 0).setCancelBlank(true).setBackground(true).setBottom(false).setList(mDialogList).setOnDialogListener(new ShowListDialogFragment.onDialogListener() {
@Override
public void onItemListener(int position) {
if (mDialogList.size() > position) {
DialogStringImageBean dialogStringImageBean = mDialogList.get(position);
String name = dialogStringImageBean.getName();
SP.getInstance().putOtaFileName(name);
}
}
}).show(getSupportFragmentManager());
ShowListDialogFragment.newInstance()
.setTitle("")
.setCancel("", 0)
.setCancelBlank(true)
.setBackground(true)
.setBottom(false)
.setList(mDialogList)
.setOnDialogListener(new ShowListDialogFragment.onDialogListener() {
@Override
public void onItemListener(int position) {
if (mDialogList.size() > position) {
DialogStringImageBean dialogStringImageBean = mDialogList.get(position);
String name = dialogStringImageBean.getName();
SP.getInstance().putOtaFileName(name);
}
}
})
.show(getSupportFragmentManager());
}
break;

@@ -780,14 +766,16 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.
if (byte1.length > 14) {
byte[] bytes = new byte[14];
System.arraycopy(ips, i, bytes, 0, bytes.length);
bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance().environmentIp(1, bytes));
bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance()
.environmentIp(1, bytes));
i = i + 14;
byte1 = Arrays.copyOf(ips, ips.length - i);
} else {
isend = true;
byte[] bytes = new byte[ips.length - i];
System.arraycopy(ips, i, bytes, 0, bytes.length);
bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance().environmentIp(0, bytes));
bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance()
.environmentIp(0, bytes));
}

}
@@ -810,14 +798,16 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.
if (byte1.length > 14) {
byte[] bytes = new byte[14];
System.arraycopy(setIpUrl, i, bytes, 0, bytes.length);
bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance().environmentUrl(1, bytes));
bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance()
.environmentUrl(1, bytes));
i = i + 14;
byte1 = Arrays.copyOf(setIpUrl, setIpUrl.length - i);
} else {
isend = true;
byte[] bytes = new byte[setIpUrl.length - i];
System.arraycopy(setIpUrl, i, bytes, 0, bytes.length);
bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance().environmentUrl(0, bytes));
bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance()
.environmentUrl(0, bytes));
}

}
@@ -862,7 +852,8 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.
byte[] password = BleStrUtils.stringToBytes(paw);
if (password != null) {
if (password.length < 14)
bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance().setWifiPwd(0, password));
bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance()
.setWifiPwd(0, password));
else {
boolean isend = false;
int i = 0;
@@ -872,7 +863,8 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.
byte[] bytes = new byte[14];
System.arraycopy(password, i, bytes, 0, bytes.length);

bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance().setWifiPwd(1, bytes));
bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance()
.setWifiPwd(1, bytes));
i = i + 14;
byte1 = Arrays.copyOf(password, password.length - i);
} else {
@@ -880,7 +872,8 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.
byte[] bytes = new byte[password.length - i];
System.arraycopy(password, i, bytes, 0, bytes.length);

bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance().setWifiPwd(0, bytes));
bodyFatBleUtilsData.sendData(BodyFatDataUtil.getInstance()
.setWifiPwd(0, bytes));
}

}
@@ -898,7 +891,7 @@ public class WeightScaleWifiBleActivity extends BleBaseActivity implements View.
Uri uri = data.getData();
String path = uri.getPath();
SP.getInstance().put("WIFI_BLE_OTA_FILE_PATH", path);
mList.add(0, "选择文件:" + path);
mList.add(0, "select file:" + path);
listAdapter.notifyDataSetChanged();
} else {


+ 85
- 50
app/src/main/res/layout/activity_weight_scale_wifi_ble.xml Просмотреть файл

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical">

<ScrollView
@@ -23,23 +23,29 @@

<Button
android:id="@+id/wifistatus"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="查看wifi状态" />
android:layout_weight="1"
android:text="@string/check_wifi_status"
android:textAllCaps="false" />

<Button
android:id="@+id/scan_wifi"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:text="搜索wifi热点" />
android:layout_weight="1"
android:text="@string/search_wifi_hotspots"
android:textAllCaps="false" />

<EditText
android:id="@+id/select_wifi_et"
android:layout_width="90dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="22dp"
android:hint="选择wifi序号"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_weight="1"
android:hint="@string/select_wifi_serial_number"
android:inputType="number"
android:textSize="14dp" />

@@ -48,30 +54,34 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:orientation="horizontal">

<Button
android:id="@+id/sn"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="查看设备did号" />
android:text="@string/show_device_did_number"
android:textAllCaps="false" />

<Button
android:id="@+id/connect_wifi"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_marginStart="13dp"
android:layout_marginTop="11dp"
android:text="发起连接" />
android:text="@string/initiate_connection"
android:textAllCaps="false" />

<Button
android:id="@+id/disconnect"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_marginStart="9dp"
android:layout_marginTop="5dp"
android:text="断开连接" />
android:text="@string/disconnect"
android:textAllCaps="false" />

</LinearLayout>

@@ -79,24 +89,25 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:orientation="horizontal">

<Button
android:id="@+id/setedmac"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_marginStart="9dp"
android:layout_marginTop="5dp"
android:text="获取希望设置的MAC" />
android:text="@string/get_set_mac"
android:textAllCaps="false" />

<Button
android:id="@+id/setedpaw"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_marginStart="9dp"
android:layout_marginTop="5dp"
android:text="获取希望设置的密码" />

android:text="@string/get_set_password"
android:textAllCaps="false" />


</LinearLayout>
@@ -104,59 +115,64 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:orientation="horizontal">

<Button
android:id="@+id/setedname"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_weight="2"
android:layout_height="wrap_content"
android:layout_marginStart="9dp"
android:layout_marginTop="5dp"
android:text="获取当前连接wifi名称" />

android:text="@string/get_current_connect_wifi_name"
android:textAllCaps="false" />


<Button
android:id="@+id/reset"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_below="@+id/setedmac"
android:layout_marginStart="9dp"
android:layout_marginTop="5dp"
android:text="恢复出厂设置" />
android:text="@string/reset"
android:textAllCaps="false" />

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:weightSum="3"
android:layout_marginTop="5dp">

<Button
android:id="@+id/btn_select_file"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_below="@+id/setedmac"
android:layout_marginStart="9dp"
android:layout_marginTop="5dp"
android:layout_toEndOf="@+id/setedname"
android:text="选择OTA文件" />
android:text="@string/select_ota_file"
android:textAllCaps="false" />

<Button
android:id="@+id/ota"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_below="@+id/setedmac"
android:layout_marginStart="9dp"
android:layout_marginTop="5dp"
android:layout_toEndOf="@+id/setedname"
android:text="开始OTA" />
android:text="@string/start_ota"
android:textAllCaps="false" />
</LinearLayout>

<TextView
android:id="@+id/tv_path"
android:layout_marginStart="12dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="请将OTA文件放到:Documents/AiLinkBleDemo目录下" />
android:layout_marginStart="12dp"
tools:text="@string/ota_file_path_hint" />

<EditText
android:id="@+id/et_ip"
@@ -166,6 +182,7 @@
android:layout_marginEnd="10dp"
android:inputType="text"
android:maxLines="1"
android:hint="IP or Url"
android:text="47.113.114.70" />

<EditText
@@ -176,6 +193,7 @@
android:layout_marginEnd="10dp"
android:inputType="number"
android:maxLines="1"
android:hint="port"
android:text="8092" />

<EditText
@@ -186,6 +204,7 @@
android:layout_marginEnd="10dp"
android:inputType="text"
android:maxLines="1"
android:hint="path"
android:text="/index/" />


@@ -196,27 +215,42 @@

<Button
android:id="@+id/surroundings"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_weight="1.5"
android:layout_height="wrap_content"
android:layout_marginStart="9dp"
android:layout_marginTop="5dp"
android:text="切换环境" />
android:text="@string/switch_environment"
android:textAllCaps="false" />

<Button
android:id="@+id/check_ip"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_marginStart="9dp"
android:layout_marginTop="5dp"
android:text="查看ip" />
android:text="@string/view_ip"
android:textAllCaps="false" />

<Button
android:id="@+id/check_port"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_marginStart="9dp"
android:layout_marginTop="5dp"
android:text="查看端口" />
android:text="@string/view_port"
android:textAllCaps="false" />



</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">

<Button
android:id="@+id/check_url"
@@ -224,7 +258,8 @@
android:layout_height="wrap_content"
android:layout_marginStart="9dp"
android:layout_marginTop="5dp"
android:text="查看url" />
android:text="@string/view_url"
android:textAllCaps="false" />

</LinearLayout>


+ 72
- 0
app/src/main/res/values-zh/strings.xml Просмотреть файл

@@ -42,4 +42,76 @@
<string name="check_version">校验版本:</string>
<string name="upgrade_controller">升级控制器</string>
<string name="upgrade_watch">升级表盘</string>

<string name="check_wifi_status">查看wifi状态</string>
<string name="search_wifi_hotspots">搜索wifi热点</string>
<string name="select_wifi_serial_number">选择wifi序号</string>
<string name="show_device_did_number">查看设备did号</string>
<string name="initiate_connection">发起连接</string>
<string name="disconnect">断开连接</string>
<string name="get_set_mac">获取希望设置的MAC</string>
<string name="get_set_password">获取希望设置的密码</string>
<string name="get_current_connect_wifi_name">获取当前连接wifi名称</string>
<string name="reset">恢复出厂设置</string>
<string name="select_ota_file">选择OTA文件</string>
<string name="start_ota">开始OTA</string>
<string name="ota_file_path_hint">请将OTA文件放到:Documents/AiLinkBleDemo目录下</string>
<string name="switch_environment">切换环境</string>
<string name="view_ip">查看ip</string>
<string name="view_port">查看端口</string>
<string name="view_url">查看url</string>
<string name="select_document">选择文件:</string>
<string name="real_time">实时</string>
<string name="stable">稳定</string>
<string name="measurement_status">测量状态：</string>
<string name="stable_weight">稳定体重</string>
<string name="real_time_weight">实时体重</string>
<string name="impedance_test_progress">阻抗测量中</string>
<string name="impedance_test_successful">阻抗测量成功</string>
<string name="impedance_test_failed">阻抗测量失败</string>
<string name="heart_rate_measuring">心率测量中</string>
<string name="heart_rate_test_failed">心率测量失败</string>
<string name="test_completed">测量完成</string>
<string name="request_user_information">请求用户信息</string>
<string name="time_status">时间状态</string>
<string name="power">电量: </string>
<string name="history_app">历史记录app：</string>
<string name="history_mcu">历史记录Mcu：</string>
<string name="syn_time">同步时间</string>
<string name="set_current_system_time">设置系统当前时间：</string>
<string name="not_support">不支持</string>
<string name="no_history">无历史记录</string>
<string name="start_sending_history">开始发送历史记录</string>
<string name="end_sending_history">发送历史记录结束</string>
<string name="update_user_list_success">更新列表成功</string>
<string name="update_user_success">更新个人用户成功</string>
<string name="update_user_list_failed">更新列表失败</string>
<string name="update_user_failed">更新个人用户失败</string>
<string name="issued_unit_callback">下发单位回调:</string>
<string name="send_user_info">下发用户信息:</string>
<string name="send_user_info_success">下发用户信息成功:</string>
<string name="send_user_info_failure">下发用户信息失败:</string>
<string name="ble_status">蓝牙状态：</string>
<string name="wifi_status">wifi状态：</string>
<string name="work_status">工作状态：</string>
<string name="scan_wifi_status">扫描wifi状态: </string>
<string name="current_connected_wifi_name">当前连接wifi名称: </string>
<string name="scan_wifi_number">扫描到wifi个数:</string>
<string name="get_set_password_status">获取到设置的密码状态:</string>
<string name="get_set_mac_address_status">获取到设置的mac地址状态:</string>
<string name="get_set_wifi_mac_address">获取到设置的wifi的mac地址:</string>
<string name="get_set_wifi_password">获取到设置的wifi的密码:</string>
<string name="set_environment_ip_success">设置环境IP成功</string>
<string name="set_environment_port">设置环境端口：</string>
<string name="set_environment_ip_failure">设置环境IP失败</string>
<string name="set_environment_port_success">设置环境端口成功</string>
<string name="set_environment_url">设置环境url：</string>
<string name="set_environment_port_failure">设置环境端口失败</string>
<string name="set_environment_url_success">设置环境url成功</string>
<string name="set_environment_url_failure">设置环境url失败</string>
<string name="password_format_err">密码格式不对</string>
<string name="set_environment_ip">设置环境IP：</string>
<string name="view_environment_ip">查看环境ip</string>
<string name="view_environment_port">查看环境端口</string>
<string name="view_environment_url">查看环境url</string>
</resources>

+ 75
- 0
app/src/main/res/values/strings.xml Просмотреть файл

@@ -43,4 +43,79 @@
<string name="check_version">version:</string>
<string name="upgrade_controller">Upgrade controller</string>
<string name="upgrade_watch">Upgrade instrument</string>

<!-- wifi+ble体脂秤 -->
<string name="check_wifi_status">Check wifi status</string>
<string name="search_wifi_hotspots">Search wifi hotspots</string>
<string name="select_wifi_serial_number">Select wifi serial number</string>
<string name="show_device_did_number">View device did number</string>
<string name="initiate_connection">Initiate connection</string>
<string name="disconnect">Disconnect</string>
<string name="get_set_mac">Get the MAC you want to set</string>
<string name="get_set_password">Get the password you want to set</string>
<string name="get_current_connect_wifi_name">Get the current connected wifi name</string>
<string name="reset">Reset</string>
<string name="select_ota_file">Select OTA file</string>
<string name="start_ota">Start OTA</string>
<string name="ota_file_path_hint">Please put the OTA file in the directory: Documents/AiLinkBleDemo</string>
<string name="switch_environment">Switch environment</string>
<string name="view_ip">View IP</string>
<string name="view_port">View port</string>
<string name="view_url">View url</string>
<string name="select_document">Select a document:</string>
<string name="real_time">Real-time data</string>
<string name="stable">Stable data</string>
<string name="measurement_status">Measurement status：</string>
<string name="stable_weight">Stable weight</string>
<string name="real_time_weight">Real time weight</string>
<string name="impedance_test_progress">Impedance measurement in progress</string>
<string name="impedance_test_successful">Impedance measurement successful</string>
<string name="impedance_test_failed">Impedance measurement failed</string>
<string name="heart_rate_measuring">Heart rate measuring</string>
<string name="heart_rate_test_successful">Heart rate measurement successful</string>
<string name="heart_rate_test_failed">Heart rate measurement failed</string>
<string name="test_completed">Measurement completed</string>
<string name="request_user_information">Request user information</string>
<string name="time_status">Time status</string>
<string name="power">Power: </string>
<string name="history_app">History APP：</string>
<string name="history_mcu">History Mcu：</string>
<string name="syn_time">synchronised time</string>
<string name="set_current_system_time">Set the current system time：</string>
<string name="not_support">Not support</string>
<string name="no_history">No history</string>
<string name="start_sending_history">Start sending history</string>
<string name="end_sending_history">End of sending history</string>
<string name="update_user_list_success">List updated successfully</string>
<string name="update_user_success">Update personal user successfully</string>
<string name="update_user_list_failed">Update list failed</string>
<string name="update_user_failed">Failed to update individual user</string>
<string name="issued_unit_callback">Issued unit callback:</string>
<string name="send_user_info">Send user information:</string>
<string name="send_user_info_success">User information is delivered successfully:</string>
<string name="send_user_info_failure">Failed to deliver user information:</string>
<string name="ble_status">Bluetooth status：</string>
<string name="wifi_status">Wifi status：</string>
<string name="work_status">Working status：</string>
<string name="scan_wifi_status">Scan wifi status: </string>
<string name="current_connected_wifi_name">Current connected wifi name: </string>
<string name="scan_wifi_number">Scan to wifi number:</string>
<string name="get_set_password_status">Get the set password status:</string>
<string name="get_set_mac_address_status">Get the set mac address status:</string>
<string name="get_set_wifi_mac_address">Get the mac address of the set wifi:</string>
<string name="get_set_wifi_password">Get the password of the set wifi:</string>
<string name="set_environment_ip_success">Setting environment IP successfully</string>
<string name="set_environment_port">Set environment port：</string>
<string name="set_environment_ip_failure">Failed to set environment IP</string>
<string name="set_environment_port_success">Set environment port successfully</string>
<string name="set_environment_url">Set environment url：</string>
<string name="set_environment_port_failure">Failed to set environment port</string>
<string name="set_environment_url_success">Set environment url successfully</string>
<string name="set_environment_url_failure">Failed to set environment url</string>
<string name="password_format_err">Password format is wrong</string>
<string name="set_environment_ip">Set environment IP：</string>
<string name="view_environment_ip">View environment ip</string>
<string name="view_environment_port">View environment port</string>
<string name="view_environment_url">View environment url</string>

</resources>

Редактирование Предпросмотр
Загрузка…
Отмена
Сохранить