Yangwl
/
SZXBGJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:里程

Browse Source
asv2022.3.1
wanghao 2 days ago
parent 0856647427
commit 4a08a468a9
14 changed files with 272 additions and 130 deletions
Show Stats Download Patch File Download Diff File

4
app/build.gradle
Unescape Escape View File

@ -10,8 +10,8 @@ android {
applicationId "com.example.tyre" applicationId "com.example.tyre"
minSdk 26 minSdk 26
targetSdk 34 targetSdk 34
versionCode 4 versionCode 5
versionName "3.1" versionName "3.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

32
app/src/main/java/com/example/tyre/UpActivity.java
Unescape Escape View File

@ -36,6 +36,8 @@ import com.lzy.okgo.request.base.Request;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.util.*; import java.util.*;
import cn.pda.serialport.Tools; import cn.pda.serialport.Tools;
import okhttp3.MediaType;
import okhttp3.RequestBody;
public class UpActivity extends AppCompatActivity implements AdapterView.OnItemSelectedListener { public class UpActivity extends AppCompatActivity implements AdapterView.OnItemSelectedListener {
@ -81,6 +83,8 @@ public class UpActivity extends AppCompatActivity implements AdapterView.OnItemS
String min = "EC0001012026010100000001"; // 左边界（包含） String min = "EC0001012026010100000001"; // 左边界（包含）
String max = "EC0001012026010100100000"; // 右边界（包含） String max = "EC0001012026010100100000"; // 右边界（包含）
private int startPosition=0;
private List<String> locationList;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@ -115,6 +119,22 @@ public class UpActivity extends AppCompatActivity implements AdapterView.OnItemS
// 默认显示加载框（如果需要预加载数据） // 默认显示加载框（如果需要预加载数据）
// showLoadingDialog(); // showLoadingDialog();
Intent intent=getIntent();
boolean dataType = intent.getBooleanExtra("dataType", false);
locationList=new ArrayList<>(Arrays.asList("左前轮","右前轮","右内轮","右外轮","左内轮","左外轮"));
if (dataType){
String location = intent.getStringExtra("location");
startPosition = locationList.indexOf(location);
String carNo = intent.getStringExtra("carNo");
carEdit.setText(carNo); ;
String licheng = intent.getStringExtra("licheng");
startEdit.setText(licheng); ;
}
} }
private void initViews() { private void initViews() {
@ -262,7 +282,7 @@ public class UpActivity extends AppCompatActivity implements AdapterView.OnItemS
.params("wheelPostion", wheel) .params("wheelPostion", wheel)
.params("selfNo", selfNo) .params("selfNo", selfNo)
.params("patternDepth", patternDepth) .params("patternDepth", patternDepth)
.params("CreateBy", SharedPreferencesUtils.getstring("user", "admin")) .params("createBy", SharedPreferencesUtils.getstring("user", "admin"))
.execute(new StringCallback() { .execute(new StringCallback() {
@Override @Override
public void onSuccess(Response<String> response) { public void onSuccess(Response<String> response) {
@ -285,7 +305,7 @@ public class UpActivity extends AppCompatActivity implements AdapterView.OnItemS
} }
}); });
} }
public MediaType JSON = MediaType.parse("application/json; charset=utf-8");
/** /**
* 根据车牌号查询车辆信息 * 根据车牌号查询车辆信息
* 对应之前的 car_spinner 逻辑 * 对应之前的 car_spinner 逻辑
@ -298,12 +318,14 @@ public class UpActivity extends AppCompatActivity implements AdapterView.OnItemS
new CommonDialog(UpActivity.this).setMessage("车牌号不能为空！").show(); new CommonDialog(UpActivity.this).setMessage("车牌号不能为空！").show();
return; return;
} }
Map<String, String> map = new HashMap<>();
map.put("carNo", carNo);
// 2. 发起网络请求 // 2. 发起网络请求
// 接口说明：通常调用车辆查询接口，传入车牌号 // 接口说明：通常调用车辆查询接口，传入车牌号
OkGo.<String>post(MyUrl.url + "/tyre/car/PdaQueryCarList") // 注意：这是根据车牌查询的接口，区别于之前的 RFID 查询 OkGo.<String>post(MyUrl.url + "/tyre/car/PdaQueryCarList") // 注意：这是根据车牌查询的接口，区别于之前的 RFID 查询
.tag(this) .tag(this)
.params("carNo", carNo) // 传递车牌号参数 // .params("carNo", carNo) // 传递车牌号参数
.upRequestBody(RequestBody.create(JSON, new Gson().toJson(map)))
.execute(new StringCallback() { .execute(new StringCallback() {
@Override @Override
public void onSuccess(Response<String> response) { public void onSuccess(Response<String> response) {
@ -635,7 +657,7 @@ public class UpActivity extends AppCompatActivity implements AdapterView.OnItemS
// 绑定到 Spinner // 绑定到 Spinner
conditionSpinner.setAdapter(adapter); conditionSpinner.setAdapter(adapter);
conditionSpinner.setSelection(startPosition);
} catch (JsonSyntaxException e) { } catch (JsonSyntaxException e) {
e.printStackTrace(); e.printStackTrace();
showErrorDialog("轮位数据解析失败"); showErrorDialog("轮位数据解析失败");

2
app/src/main/java/com/example/tyre/maintenance/CreateWorkOrderActivity.java
Unescape Escape View File

@ -132,7 +132,7 @@ public class CreateWorkOrderActivity extends BaseActivity {
OkGo.<MyResult>post(MyUrl.url + "/tyre/car/PdaQueryCarList").tag(this) OkGo.<MyResult>post(MyUrl.url + "/tyre/car/PdaQueryCarList").tag(this)
.upRequestBody(RequestBody.create(JSON, gson.toJson(map))) .upRequestBody(RequestBody.create(JSON, gson.toJson(map)))
.params("carNo", carNo).execute(new MyRecultCall(dialog, this) { .execute(new MyRecultCall(dialog, this) {
@Override @Override
public void onSuccess(Response<MyResult> response) { public void onSuccess(Response<MyResult> response) {
super.onSuccess(response); super.onSuccess(response);

180
app/src/main/java/com/example/tyre/maintenance/WorkExecuteActivity.java
Unescape Escape View File

@ -38,10 +38,14 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional;
public class WorkExecuteActivity extends BaseActivity { import okhttp3.RequestBody;
public class WorkExecuteActivity extends BaseActivity implements TireUpdateDialog.TireUpdateDialogSaveListener {
private ActivityWorkExecuteBinding binding; private ActivityWorkExecuteBinding binding;
private Map<String, BaseTyre> tyreMap; private Map<String, BaseTyre> tyreMap;
private Map<String, BizOrderTireDetail> infoMap;
private TireUpdateDialog tireUpdateDialog;// 点击轮胎弹窗 private TireUpdateDialog tireUpdateDialog;// 点击轮胎弹窗
private Map<String, Object> orderSubmitMap; private Map<String, Object> orderSubmitMap;
private List<BizOrderTireDetail> tireDetails; private List<BizOrderTireDetail> tireDetails;
@ -51,6 +55,8 @@ public class WorkExecuteActivity extends BaseActivity {
private String epcTag = "";// 屏蔽重复查询 private String epcTag = "";// 屏蔽重复查询
private String carNo; private String carNo;
private ActivityResultLauncher<Intent> launcher; private ActivityResultLauncher<Intent> launcher;
private boolean orderState;// 工单状态
private Order order;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@ -58,68 +64,30 @@ public class WorkExecuteActivity extends BaseActivity {
binding = DataBindingUtil.setContentView(this, R.layout.activity_work_execute); binding = DataBindingUtil.setContentView(this, R.layout.activity_work_execute);
initRFID(); initRFID();
Intent intent = getIntent(); Intent intent = getIntent();
infoMap = new HashMap<>();
// 订单状态
orderState = intent.getBooleanExtra("orderState", false);
binding.setOrderState(orderState);
carNo = intent.getStringExtra("carNo"); carNo = intent.getStringExtra("carNo");
binding.setCarNo(carNo); binding.setCarNo(carNo);
tyreMap = new HashMap<>(); tyreMap = new HashMap<>();
selectCarNo(carNo); // selectCarNo(carNo);
selectTire(carNo); selectTire(carNo);
orderSubmitMap = new HashMap<>(); orderSubmitMap = new HashMap<>();
Order order = gson.fromJson(intent.getStringExtra("json"), Order.class); order = gson.fromJson(intent.getStringExtra("json"), Order.class);
orderSubmitMap.put("order", order); orderSubmitMap.put("order", order);
tireDetails = new ArrayList<>(); tireDetails = new ArrayList<>();
fileList = new ArrayList<>(); fileList = new ArrayList<>();
orderSubmitMap.put("tireDetails", tireDetails); orderSubmitMap.put("tireDetails", tireDetails);
binding.setSite(intent.getStringExtra("site")); binding.setSite(intent.getStringExtra("site"));
binding.setDate(intent.getStringExtra("maintainDate")); binding.setDate(intent.getStringExtra("maintainDate"));
tireUpdateDialog = new TireUpdateDialog(this, new TireUpdateDialog.TireUpdateDialogSaveListener() { tireUpdateDialog = new TireUpdateDialog(this, this);
@Override
public void onSave(BizOrderTireDetail bizOrderTireDetail, File image, boolean isupdate, BizOrderTireDetail newTireDetail) {
// 返回轮胎信息
bizOrderTireDetail.setOrderId(order.getOrderId());
tireDetails.add(bizOrderTireDetail);
if (image != null) {
fileList.add(image);
}
tireUpdateDialog.dismiss();
if (isupdate) {
// 换新胎
tireDetails.add(newTireDetail);
BaseTyre baseTyre = newTireDetail.getBaseTyre();
String positionName = newTireDetail.getPositionName();
tyreMap.put(positionName, baseTyre);
initTire(positionName, baseTyre);// 页面信息修改
up_insert(baseTyre.getTyreEpc(), carNo,binding.workLicheng.getText().toString(), positionName, baseTyre.getSelfNo());
}
}
@Override
public void onTakePhoto() {
// 拍照
try {
teke_photo();
} catch (Exception e) {
e.printStackTrace();
}
}
});
tireClick(); tireClick();
tipDialog = new TipResultDialog(this, this); tipDialog = new TipResultDialog(this, this);
launcher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> { launcher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
if (result.getResultCode() == RESULT_OK) { if (result.getResultCode() == RESULT_OK) {
/* Intent data = result.getData();
// 返回json转换
String json = data.getStringExtra("json");
Log.e("TAG", "onCreate:" + json);
BaseTyre reBaseTyre = gson.fromJson(json, BaseTyre.class);
tyreMap.put(reBaseTyre.getWheelPostion(), reBaseTyre);*/
// initTire(reBaseTyre.getWheelPostion(), reBaseTyre);
selectTire(carNo); selectTire(carNo);
} }
}); });
@ -127,6 +95,9 @@ public class WorkExecuteActivity extends BaseActivity {
// 点击轮胎 // 点击轮胎
private void tireClick() { private void tireClick() {
if (orderState) {
return;
}
binding.tireClick1.layoutTireInfo.setOnClickListener(view -> { binding.tireClick1.layoutTireInfo.setOnClickListener(view -> {
showDialog("左前轮"); showDialog("左前轮");
}); });
@ -159,7 +130,6 @@ public class WorkExecuteActivity extends BaseActivity {
if (baseTyre == null) { if (baseTyre == null) {
try { try {
if (keyReceiver != null) { if (keyReceiver != null) {
unregisterReceiver(keyReceiver); unregisterReceiver(keyReceiver);
} }
} catch (Exception e) { } catch (Exception e) {
@ -174,7 +144,9 @@ public class WorkExecuteActivity extends BaseActivity {
launcher.launch(intent); launcher.launch(intent);
} else { } else {
initKeyRecriver(this::readEPC); initKeyRecriver(this::readEPC);
tireUpdateDialog.setBaseTyre(baseTyre); BizOrderTireDetail tag=
tireDetails.stream().filter(tire -> tire.getPositionName().equals(location)).findFirst().orElse(null);
tireUpdateDialog.setBaseTyre(baseTyre, tag);
} }
} }
@ -184,7 +156,12 @@ public class WorkExecuteActivity extends BaseActivity {
OkGo.<String>post(MyUrl.url + "/tyre/tyre/getCarBingTire").tag(this).params("carNo", carNo).execute(new StringCallback() { OkGo.<String>post(MyUrl.url + "/tyre/tyre/getCarBingTire").tag(this).params("carNo", carNo).execute(new StringCallback() {
@Override @Override
public void onSuccess(Response<String> response) { public void onSuccess(Response<String> response) {
binding.setTire1(new BaseTyre());
binding.setTire2(new BaseTyre());
binding.setTire3(new BaseTyre());
binding.setTire4(new BaseTyre());
binding.setTire5(new BaseTyre());
binding.setTire6(new BaseTyre());
baseTyreList = gson.fromJson(response.body(), new TypeToken<List<BaseTyre>>() { baseTyreList = gson.fromJson(response.body(), new TypeToken<List<BaseTyre>>() {
}.getType()); }.getType());
tireUpdateDialog.setBaseTyreList(baseTyreList); tireUpdateDialog.setBaseTyreList(baseTyreList);
@ -221,17 +198,14 @@ public class WorkExecuteActivity extends BaseActivity {
// 初始化轮胎信息 // 初始化轮胎信息
private void initTire(String wheelPostion, BaseTyre baseTyre) { private void initTire(String wheelPostion, BaseTyre baseTyre) {
binding.setTire1(new BaseTyre());
binding.setTire2(new BaseTyre());
binding.setTire3(new BaseTyre());
binding.setTire4(new BaseTyre());
binding.setTire5(new BaseTyre());
binding.setTire6(new BaseTyre());
switch (wheelPostion) { switch (wheelPostion) {
case "左前轮": case "左前轮":
binding.setTire1(baseTyre); binding.setTire1(baseTyre);
break; break;
case "右前轮": case "右前轮":
binding.setTire2(baseTyre); binding.setTire2(baseTyre);
break; break;
case "左外轮": case "左外轮":
@ -252,7 +226,9 @@ public class WorkExecuteActivity extends BaseActivity {
// 查询车辆信息 // 查询车辆信息
private void selectCarNo(String carNo) { private void selectCarNo(String carNo) {
OkGo.<MyResult>post(MyUrl.url + "/tyre/car/PdaQueryCarList").tag(this).params("carNo", carNo).execute(new MyRecultCall(dialog, this) { Map<String, String> map = new HashMap<>();
map.put("carNo", carNo);
OkGo.<MyResult>post(MyUrl.url + "/tyre/car/PdaQueryCarList").tag(this).upRequestBody(RequestBody.create(JSON, new Gson().toJson(map))).execute(new MyRecultCall(dialog, this) {
@Override @Override
public void onSuccess(Response<MyResult> response) { public void onSuccess(Response<MyResult> response) {
super.onSuccess(response); super.onSuccess(response);
@ -311,14 +287,7 @@ public class WorkExecuteActivity extends BaseActivity {
// 装车 // 装车
private void up_insert(String rfid, String carNo, String millage, String wheel, String selfNo) { private void up_insert(String rfid, String carNo, String millage, String wheel, String selfNo) {
OkGo.<String>post(MyUrl.url + "/tyre/install/PdaInstallTyre").tag(this) OkGo.<String>post(MyUrl.url + "/tyre/install/PdaInstallTyre").tag(this).params("tyreRfid", rfid).params("mileage", millage).params("carNo", carNo).params("wheelPostion", wheel).params("selfNo", selfNo).params("CreateBy", SharedPreferencesUtils.getstring("user", "admin")).execute(new StringCallback() {
.params("tyreRfid", rfid)
.params("mileage", millage)
.params("carNo", carNo)
.params("wheelPostion", wheel)
.params("selfNo", selfNo)
.params("CreateBy", SharedPreferencesUtils.getstring("user", "admin"))
.execute(new StringCallback() {
@Override @Override
public void onSuccess(Response<String> response) { public void onSuccess(Response<String> response) {
String body = response.body(); String body = response.body();
@ -371,4 +340,87 @@ public class WorkExecuteActivity extends BaseActivity {
break; break;
} }
} }
@Override
public void onSave(BizOrderTireDetail bizOrderTireDetail, File image, boolean isupdate, BizOrderTireDetail newTireDetail) {
// 返回轮胎信息
bizOrderTireDetail.setOrderId(order.getOrderId());
infoMap.put(bizOrderTireDetail.getPositionName(), bizOrderTireDetail);
tireDetails.stream().filter(tire -> tire.getPositionName().equals(bizOrderTireDetail.getPositionName())).findFirst().ifPresent(tire -> {
tireDetails.remove(tire);
});
tireDetails.add(bizOrderTireDetail);
if (image != null) {
fileList.add(image);
}
tireUpdateDialog.dismiss();
if (isupdate) {
// 换新胎
tireDetails.add(newTireDetail);
BaseTyre baseTyre = newTireDetail.getBaseTyre();
String positionName = newTireDetail.getPositionName();
tyreMap.put(positionName, baseTyre);
initTire(positionName, baseTyre);// 页面信息修改
up_insert(baseTyre.getTyreEpc(), carNo, binding.workLicheng.getText().toString(), positionName, baseTyre.getSelfNo());
}
}
@Override
public void onTakePhoto() {
// 拍照
try {
teke_photo();
} catch (Exception e) {
e.printStackTrace();
}
}
@Override
public void onChangeSave(String oldLocation, String newLocation) {
BaseTyre baseTyreOld = tyreMap.get(oldLocation);
BaseTyre baseTyreNew = tyreMap.get(newLocation);
OkGo.<MyResult>post(url + "/tyre/tyre/changeTyreForOneCar")
.params("oldTyreId", baseTyreOld.getTyreId())
.params("newTyreId", baseTyreNew.getTyreId())
.params("oldLocation", oldLocation)
.params("newLocation", newLocation)
.params("user", SharedPreferencesUtils.getstring("user", "admin"))
.execute(new MyRecultCall(dialog, this) {
@Override
public void onSuccess(Response<MyResult> response) {
super.onSuccess(response);
MyResult body = response.body();
if (body.getCode() == 0) {
tyreMap.put(newLocation, baseTyreOld);
initTire(newLocation, baseTyreOld);
tyreMap.put(oldLocation, baseTyreNew);
initTire(oldLocation, baseTyreNew);
tireDetails.forEach(tireDetail -> {
if (tireDetail.getPositionName().equals(oldLocation)) {
tireDetail.setPositionName(newLocation);
} else if (tireDetail.getPositionName().equals(newLocation)) {
tireDetail.setPositionName(oldLocation);
}
});
// BizOrderTireDetail info1 = infoMap.get(newLocation);
// BizOrderTireDetail info2 = infoMap.get(oldLocation);
return;
}
Toast.makeText(WorkExecuteActivity.this, body.getMsg(), Toast.LENGTH_SHORT).show();
}
});
}
} }

3
app/src/main/java/com/example/tyre/maintenance/WorkOrderActivity.java
Unescape Escape View File

@ -179,6 +179,7 @@ public class WorkOrderActivity extends BaseActivity implements OrderAdapter.Sele
intent.putExtra("site", binding.workOrderSite.getText().toString()); intent.putExtra("site", binding.workOrderSite.getText().toString());
intent.putExtra("carNo", order.getPlateNumber()); intent.putExtra("carNo", order.getPlateNumber());
intent.putExtra("maintainDate", order.getMaintainDate()); intent.putExtra("maintainDate", order.getMaintainDate());
intent.putExtra("orderState", status.get());
intent.putExtra("json", gson.toJson(order)); intent.putExtra("json", gson.toJson(order));
startActivity(intent); startActivity(intent);
} }
@ -187,6 +188,6 @@ public class WorkOrderActivity extends BaseActivity implements OrderAdapter.Sele
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
binding.workOrderSite.setText(SharedPreferencesUtils.getstring("workOrderSite", "光明修理厂")); binding.workOrderSite.setText(SharedPreferencesUtils.getstring("workOrderSite", "光明修理厂"));
selectWorkOrder(binding.workOrderDateStart.getText().toString(), binding.workOrderDateEnd.getText().toString(), getDeptId(binding.workOrderSite.getText().toString()), "PROCESSING"); selectWorkOrder(binding.workOrderDateStart.getText().toString(), binding.workOrderDateEnd.getText().toString(), getDeptId(binding.workOrderSite.getText().toString()), status.get() ? "COMPLETED" : "PROCESSING");
} }
} }

22
app/src/main/java/com/example/tyre/maintenance/been/BaseTyre.java
Unescape Escape View File

@ -191,5 +191,25 @@ public class BaseTyre extends BaseObservable {
this.team = team; this.team = team;
} }
@Override
public String toString() {
return "BaseTyre{" +
"tyreId=" + tyreId +
", tyreNo='" + tyreNo + '\'' +
", selfNo='" + selfNo + '\'' +
", tyreEpc='" + tyreEpc + '\'' +
", tyreBrand='" + tyreBrand + '\'' +
", tyreModel='" + tyreModel + '\'' +
", tyreLevel='" + tyreLevel + '\'' +
", tyrePattern='" + tyrePattern + '\'' +
", patternDepth='" + patternDepth + '\'' +
", patternDepth1='" + patternDepth1 + '\'' +
", grooves='" + grooves + '\'' +
", tyreType='" + tyreType + '\'' +
", team='" + team + '\'' +
", carNo='" + carNo + '\'' +
", wheelPostion='" + wheelPostion + '\'' +
", deptId=" + deptId +
'}';
}
} }

7
app/src/main/java/com/example/tyre/maintenance/been/BizOrderTireDetail.java
Unescape Escape View File

@ -46,6 +46,7 @@ public class BizOrderTireDetail {
* 胎压 * 胎压
*/ */
private String tirePress; private String tirePress;
private String tirePressOld;// 胎压（旧值）
/** /**
* 轮胎状态描述（截图中的“新胎”、“模拟数据”） * 轮胎状态描述（截图中的“新胎”、“模拟数据”）
@ -55,7 +56,13 @@ public class BizOrderTireDetail {
private String dataType; private String dataType;
private BaseTyre baseTyre;//基础轮胎信息 private BaseTyre baseTyre;//基础轮胎信息
public String getTirePressOld() {
return tirePressOld;
}
public void setTirePressOld(String tirePressOld) {
this.tirePressOld = tirePressOld;
}
public BaseTyre getBaseTyre() { public BaseTyre getBaseTyre() {
return baseTyre; return baseTyre;

16
app/src/main/java/com/example/tyre/maintenance/dialog/TireChangeDialog.java
Unescape Escape View File

@ -17,7 +17,6 @@ import androidx.databinding.DataBindingUtil;
import com.example.tyre.R; import com.example.tyre.R;
import com.example.tyre.databinding.DialogTireChangeBinding; import com.example.tyre.databinding.DialogTireChangeBinding;
import com.example.tyre.maintenance.been.BaseTyre; import com.example.tyre.maintenance.been.BaseTyre;
import com.example.tyre.maintenance.been.BizOrderTireDetail;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@ -29,6 +28,7 @@ public class TireChangeDialog extends Dialog {
private Map<String, BaseTyre> tyreMap; private Map<String, BaseTyre> tyreMap;
private String locationOld; private String locationOld;
private TireChangeListener tireChangeListener; private TireChangeListener tireChangeListener;
private String newLocation;
public TireChangeDialog(@NonNull Context context, TireChangeListener tireChangeListener) { public TireChangeDialog(@NonNull Context context, TireChangeListener tireChangeListener) {
super(context, R.style.MyMiddleDialogStyle); super(context, R.style.MyMiddleDialogStyle);
@ -36,7 +36,9 @@ public class TireChangeDialog extends Dialog {
binding = binding =
DataBindingUtil.inflate(LayoutInflater.from(context), R.layout.dialog_tire_change, null, false); DataBindingUtil.inflate(LayoutInflater.from(context), R.layout.dialog_tire_change, null, false);
binding.dialogTitle1.setOnClickListener(view -> dismiss()); binding.dialogTitle1.setOnClickListener(view -> dismiss());
binding.dialogChangeButton.setOnClickListener(view -> {
tireChangeListener. onChangeSave(locationOld,newLocation);
});
setContentView(binding.getRoot()); setContentView(binding.getRoot());
} }
@ -50,9 +52,9 @@ public class TireChangeDialog extends Dialog {
baseTyreList.forEach(tire -> { baseTyreList.forEach(tire -> {
String wheelPostion = tire.getWheelPostion(); String wheelPostion = tire.getWheelPostion();
tyreMap.put(wheelPostion, tire); tyreMap.put(wheelPostion, tire);
if (tire.getTyreNo() == null || tire.getTyreNo().equals("")) { // if (tire.getTyreNo() == null || tire.getTyreNo().equals("")) {
tire.setTyreNo("测试标识:" + wheelPostion); // tire.setTyreNo("测试标识:" + wheelPostion);
} // }
initTire(wheelPostion, tire); initTire(wheelPostion, tire);
}); });
@ -89,6 +91,7 @@ public class TireChangeDialog extends Dialog {
Toast.makeText(getContext(), "当前轮胎位置与选择位置相同", Toast.LENGTH_SHORT).show(); Toast.makeText(getContext(), "当前轮胎位置与选择位置相同", Toast.LENGTH_SHORT).show();
return; return;
} }
this.newLocation = location;
BaseTyre baseTyre = tyreMap.get(location); BaseTyre baseTyre = tyreMap.get(location);
BaseTyre baseTyreOld = tyreMap.get(this.locationOld); BaseTyre baseTyreOld = tyreMap.get(this.locationOld);
if (baseTyre == null) { if (baseTyre == null) {
@ -102,6 +105,7 @@ public class TireChangeDialog extends Dialog {
Log.e("TAG", "tireLayoutCllick:" + location + "," + baseTyreOld.toString()); Log.e("TAG", "tireLayoutCllick:" + location + "," + baseTyreOld.toString());
Toast.makeText(getContext(), "互换成功", Toast.LENGTH_SHORT).show(); Toast.makeText(getContext(), "互换成功", Toast.LENGTH_SHORT).show();
} }
/** /**
@ -150,7 +154,7 @@ public class TireChangeDialog extends Dialog {
} }
public interface TireChangeListener { public interface TireChangeListener {
void onChangeSave(BizOrderTireDetail bizOrderTireDetail); void onChangeSave(String oldLocation, String newLocation);
} }
} }

60
app/src/main/java/com/example/tyre/maintenance/dialog/TireUpdateDialog.java
Unescape Escape View File

@ -1,19 +1,13 @@
package com.example.tyre.maintenance.dialog; package com.example.tyre.maintenance.dialog;
import android.app.Activity;
import android.app.Dialog; import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.graphics.Rect;
import android.os.Bundle; import android.os.Bundle;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.view.Gravity; import android.view.Gravity;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.view.Window; import android.view.Window;
import android.view.WindowManager; import android.view.WindowManager;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@ -31,7 +25,7 @@ import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
public class TireUpdateDialog extends Dialog { public class TireUpdateDialog extends Dialog implements TireChangeDialog.TireChangeListener {
private DialogTireUpdateBinding binding; private DialogTireUpdateBinding binding;
private BaseTyre baseTyre; private BaseTyre baseTyre;
private ObservableBoolean isupdate; private ObservableBoolean isupdate;
@ -44,10 +38,13 @@ public class TireUpdateDialog extends Dialog {
private List<BaseTyre> baseTyreList; private List<BaseTyre> baseTyreList;
private BaseTyre newBaseTyre; private BaseTyre newBaseTyre;
private Context context; private Context context;
private DisposalFileAdapter disposalFileAdapter;
private List<CheckInstanceFiles> filesList;
public TireUpdateDialog(@NonNull Context context, TireUpdateDialogSaveListener listener) { public TireUpdateDialog(@NonNull Context context, TireUpdateDialogSaveListener listener) {
super(context, R.style.MyMiddleDialogStyle); super(context, R.style.MyMiddleDialogStyle);
this.context = context; this.context = context;
this.listener = listener;
binding = binding =
DataBindingUtil.inflate(LayoutInflater.from(context), R.layout.dialog_tire_update, null, false); DataBindingUtil.inflate(LayoutInflater.from(context), R.layout.dialog_tire_update, null, false);
isupdate = new ObservableBoolean(false); isupdate = new ObservableBoolean(false);
@ -59,8 +56,8 @@ public class TireUpdateDialog extends Dialog {
isupdate.set(isChecked); isupdate.set(isChecked);
}); });
// 保存按钮点击事件
binding.dialogTireUpdateSave.setOnClickListener(view -> {// 保存按钮点击事件 binding.dialogTireUpdateSave.setOnClickListener(view -> {
String shendu = binding.dialogTireShendu1.getText().toString(); String shendu = binding.dialogTireShendu1.getText().toString();
String taiya = binding.dialogTireTaiya1.getText().toString(); String taiya = binding.dialogTireTaiya1.getText().toString();
if (shendu.isEmpty()) { if (shendu.isEmpty()) {
@ -74,7 +71,7 @@ public class TireUpdateDialog extends Dialog {
bizOrderTireDetail.setRemark(binding.dialogTireRemark1.getText().toString()); bizOrderTireDetail.setRemark(binding.dialogTireRemark1.getText().toString());
bizOrderTireDetail.setTreadDepth(shendu);// 花纹深度 bizOrderTireDetail.setTreadDepth(shendu);// 花纹深度
bizOrderTireDetail.setTirePress(taiya);// 胎压 bizOrderTireDetail.setTirePress(taiya);// 胎压
bizOrderTireDetail.setTirePressOld(binding.dialogTireTaiyaOld.getText().toString());
boolean isupdate1 = isupdate.get(); boolean isupdate1 = isupdate.get();
if (isupdate1) { if (isupdate1) {
@ -106,18 +103,14 @@ public class TireUpdateDialog extends Dialog {
// photoState = new ObservableBoolean(false); // photoState = new ObservableBoolean(false);
// binding.setPhotoState(photoState); // binding.setPhotoState(photoState);
setContentView(binding.getRoot()); setContentView(binding.getRoot());
tireChangeDialog = new TireChangeDialog(context, new TireChangeDialog.TireChangeListener() { tireChangeDialog = new TireChangeDialog(context,this);
@Override
public void onChangeSave(BizOrderTireDetail bizOrderTireDetail) {
}
});
disposalFileAdapter = new DisposalFileAdapter(context, new DisposalFileAdapter.ItemClickCall() { disposalFileAdapter = new DisposalFileAdapter(context, new DisposalFileAdapter.ItemClickCall() {
@Override @Override
public void onClick(int position, boolean type) { public void onClick(int position, boolean type) {
if (!type) {
filesList.remove(position);
disposalFileAdapter.notifyDataSetChanged();
}
} }
}); });
filesList = new ArrayList<>(); filesList = new ArrayList<>();
@ -146,7 +139,7 @@ public class TireUpdateDialog extends Dialog {
this.baseTyreList = baseTyreList; this.baseTyreList = baseTyreList;
} }
public void setBaseTyre(BaseTyre baseTyre) { public void setBaseTyre(BaseTyre baseTyre, BizOrderTireDetail tag) {
this.baseTyre = baseTyre; this.baseTyre = baseTyre;
binding.setTire(baseTyre); binding.setTire(baseTyre);
bizOrderTireDetail = new BizOrderTireDetail(); bizOrderTireDetail = new BizOrderTireDetail();
@ -164,6 +157,19 @@ public class TireUpdateDialog extends Dialog {
// 重置ui // 重置ui
// photoState.set(false); // photoState.set(false);
binding.dialogUpdatePhoto.setImageResource(R.mipmap.ic_xiangji); binding.dialogUpdatePhoto.setImageResource(R.mipmap.ic_xiangji);
if (tag != null) {
binding.dialogTireRemark1.setText(tag.getRemark());
binding.dialogTireShendu1.setText(tag.getTreadDepth());
// 花纹深度
binding.dialogTireTaiya1.setText(tag.getTirePress());// 胎压
binding.dialogTireTaiyaOld.setText(tag.getTirePressOld());// 胎压
} else {
binding.dialogTireRemark1.setText(null);
binding.dialogTireShendu1.setText(null);
;// 花纹深度
binding.dialogTireTaiya1.setText(null);// 胎压
binding.dialogTireTaiyaOld.setText(null);// 胎压
}
show(); show();
} }
@ -192,8 +198,7 @@ public class TireUpdateDialog extends Dialog {
// 点击外部不关闭 // 点击外部不关闭
setCanceledOnTouchOutside(false); setCanceledOnTouchOutside(false);
} }
private DisposalFileAdapter disposalFileAdapter;
private List<CheckInstanceFiles> filesList ;
public void setImage(String fileUrl, File image) { public void setImage(String fileUrl, File image) {
this.image = image; this.image = image;
// photoState.set(true); // photoState.set(true);
@ -205,15 +210,22 @@ public class TireUpdateDialog extends Dialog {
disposalFileAdapter.notifyDataSetChanged(); disposalFileAdapter.notifyDataSetChanged();
} }
// 同车互换修改
@Override
public void onChangeSave(String oldLocation, String newLocation) {
tireChangeDialog. dismiss();
listener.onChangeSave(oldLocation, newLocation);
dismiss();
}
public interface TireUpdateDialogSaveListener { public interface TireUpdateDialogSaveListener {
void onSave(BizOrderTireDetail bizOrderTireDetail, File image, boolean isupdate, BizOrderTireDetail newTireDetail); void onSave(BizOrderTireDetail bizOrderTireDetail, File image, boolean isupdate, BizOrderTireDetail newTireDetail);
void onTakePhoto(); void onTakePhoto();
void onChangeSave(String oldLocation, String newLocation);
} }
} }

3
app/src/main/java/com/example/tyre/util/MyUrl.java
Unescape Escape View File

@ -8,5 +8,6 @@ package com.example.tyre.util;
public class MyUrl { public class MyUrl {
// public static String url="http://192.168.0.18:8020"; // public static String url="http://192.168.0.18:8020";
// public static String url="http://www.qdhys.xyz:8020"; // public static String url="http://www.qdhys.xyz:8020";
public static String url="http://10.11.187.77:8020"; // public static String url="http://10.11.187.77:8020";
public static String url="http://192.168.137.1:8020";
} }

2
app/src/main/res/layout/activity_up.xml
Unescape Escape View File

@ -129,6 +129,7 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingStart="12dp" android:paddingStart="12dp"
android:textColor="#555" android:textColor="#555"
android:inputType="textVisiblePassword"
android:textSize="16sp" android:textSize="16sp"
android:hint="请输入自编号" /> android:hint="请输入自编号" />
</LinearLayout> </LinearLayout>
@ -163,6 +164,7 @@
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:background="@drawable/rounded_input_bg" android:background="@drawable/rounded_input_bg"
android:gravity="center_vertical" android:gravity="center_vertical"
android:inputType="number"
android:paddingStart="12dp" android:paddingStart="12dp"
android:textColor="#555" android:textColor="#555"
android:textSize="16sp" android:textSize="16sp"

8
app/src/main/res/layout/activity_work_execute.xml
Unescape Escape View File

@ -21,6 +21,12 @@
name="line" name="line"
type="String" /> type="String" />
<variable
name="orderState"
type="boolean" />
<import type="android.view.View" />
<variable <variable
name="tire1" name="tire1"
type="com.example.tyre.maintenance.been.BaseTyre" /> type="com.example.tyre.maintenance.been.BaseTyre" />
@ -113,6 +119,7 @@
android:textSize="15sp" android:textSize="15sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_columnWeight="1" app:layout_columnWeight="1"
android:enabled="@{!orderState}"
tools:ignore="RtlHardcoded,RtlSymmetry" /> tools:ignore="RtlHardcoded,RtlSymmetry" />
@ -328,6 +335,7 @@
android:text="完成处理" android:text="完成处理"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="18sp" android:textSize="18sp"
android:visibility="@{orderState ? View.GONE : View.VISIBLE}"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>

12
app/src/main/res/layout/dialog_tire_change.xml
Unescape Escape View File

@ -161,6 +161,16 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<Button
android:id="@+id/dialog_change_button"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_margin="12dp"
android:background="@drawable/bg_button_blue"
android:text="互换完成"
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="bold"
app:layout_columnSpan="2" />
</LinearLayout> </LinearLayout>
</layout> </layout>

27
app/src/main/res/layout/dialog_tire_update.xml
Unescape Escape View File

@ -81,8 +81,22 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:textColor="@color/textColor1" android:textColor="@color/textColor1"
android:textOff="否" android:textOff="否"
android:textOn="是" /> android:textOn="是" />
</LinearLayout> </LinearLayout>
<Button
android:id="@+id/dialog_button_tong"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"
android:background="@drawable/bg_button_blue"
android:text="同车轮胎互换"
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="bold"
android:visibility="@{isUpdate?View.VISIBLE:View.GONE}"
app:layout_columnSpan="2" />
<androidx.gridlayout.widget.GridLayout <androidx.gridlayout.widget.GridLayout
style="@style/layout_card_style" style="@style/layout_card_style"
@ -481,18 +495,7 @@
app:columnCount="2" app:columnCount="2"
app:rowCount="5"> app:rowCount="5">
<Button
android:id="@+id/dialog_button_tong"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"
android:background="@drawable/bg_button_blue"
android:text="同车轮胎互换"
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="bold"
app:layout_columnSpan="2" />
<LinearLayout <LinearLayout
android:layout_height="40dp" android:layout_height="40dp"

Write Preview
Loading…
Cancel
Save