|
@@ -18,6 +18,8 @@ import com.blankj.utilcode.util.GsonUtils;
|
|
import com.blankj.utilcode.util.LogUtils;
|
|
import com.blankj.utilcode.util.LogUtils;
|
|
import com.blankj.utilcode.util.TimeUtils;
|
|
import com.blankj.utilcode.util.TimeUtils;
|
|
import com.bumptech.glide.Glide;
|
|
import com.bumptech.glide.Glide;
|
|
|
|
+import com.clj.fastble.BleManager;
|
|
|
|
+import com.clj.fastble.data.BleDevice;
|
|
import com.kongzue.dialogx.dialogs.PopTip;
|
|
import com.kongzue.dialogx.dialogs.PopTip;
|
|
import com.rc.core.ui.activity.BaseActivity;
|
|
import com.rc.core.ui.activity.BaseActivity;
|
|
import com.rc.httpcore.HttpConfig;
|
|
import com.rc.httpcore.HttpConfig;
|
|
@@ -31,6 +33,7 @@ import com.rc.httpcore.client.HttpTool;
|
|
|
|
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
import java.text.SimpleDateFormat;
|
|
import java.text.SimpleDateFormat;
|
|
|
|
+import java.util.ArrayList;
|
|
import java.util.Calendar;
|
|
import java.util.Calendar;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Locale;
|
|
import java.util.Locale;
|
|
@@ -146,7 +149,7 @@ public class AddActivity extends BaseActivity {
|
|
|
|
|
|
@Override
|
|
@Override
|
|
protected void onInit() {
|
|
protected void onInit() {
|
|
-// 化学品搜索
|
|
|
|
|
|
+ // 化学品搜索
|
|
binding.chemicalSearchBT.setOnClickListener(v -> {
|
|
binding.chemicalSearchBT.setOnClickListener(v -> {
|
|
Editable chemicalSearchETText = binding.chemicalSearchET.getText();
|
|
Editable chemicalSearchETText = binding.chemicalSearchET.getText();
|
|
if (null == chemicalSearchETText || TextUtils.isEmpty(chemicalSearchETText)) {
|
|
if (null == chemicalSearchETText || TextUtils.isEmpty(chemicalSearchETText)) {
|
|
@@ -336,6 +339,17 @@ public class AddActivity extends BaseActivity {
|
|
binding.belongET.setText(userName + "-" + account);
|
|
binding.belongET.setText(userName + "-" + account);
|
|
binding.belongET.setTag(belongingPerson.getUserId());
|
|
binding.belongET.setTag(belongingPerson.getUserId());
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ List<String> msclist = new ArrayList<>();
|
|
|
|
+ List<BleDevice> bleDeviceList = BleManager.getInstance().getAllConnectedDevice();
|
|
|
|
+ LogUtils.d(bleDeviceList);
|
|
|
|
+ if (null != bleDeviceList) {
|
|
|
|
+ for (int i = 0; i < bleDeviceList.size(); i++) {
|
|
|
|
+ BleDevice bleDevice = bleDeviceList.get(i);
|
|
|
|
+ msclist.add(bleDevice.getMac());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ LogUtils.d(msclist);
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|