Skip to content

W
workoffice
提交 91710de2 authored 作者: lgd's avatar lgd
浏览文件
操作

1.添加新增设备维修，修改部门接口 

2.//TODO 坩埚下单，mes其他页面，mes用户反馈空也展示，编辑任务担当无法修改
上级 07a5c215
显示空白字符变更
内嵌 并排
正在显示 包含 1795 行增加 和 6 行删除
app/src/main/AndroidManifest.xml
浏览文件 @ 91710de2
...@@ -2060,6 +2060,32 @@ ...@@ -2060,6 +2060,32 @@
android:theme="@style/Work.Base" android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" /> android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.work.DeviceBuyRepairAddActivity"
android:configChanges="keyboardHidden|orientation"
android:label="添加设备维修"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.work.DeviceBuyRepairProductActivity"
android:configChanges="keyboardHidden|orientation"
android:label="选择维修产品"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.work.DeviceBuyRepairConfirmActivity"
android:configChanges="keyboardHidden|orientation"
android:label="确认"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<provider <provider
android:name="androidx.core.content.FileProvider" android:name="androidx.core.content.FileProvider"
android:authorities="com.wd.workoffice.fileprovider" android:authorities="com.wd.workoffice.fileprovider"
......
app/src/main/java/com/wd/workoffice/bean/event/AddDeviceEvent.java 0 → 100644
浏览文件 @ 91710de2
package com.wd.workoffice.bean.event;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class AddDeviceEvent {
public AddDeviceEvent() {
}
}
app/src/main/java/com/wd/workoffice/bean/vo/DeviceRepairVo.java 0 → 100644
浏览文件 @ 91710de2
package com.wd.workoffice.bean.vo;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class DeviceRepairVo {
private int equipmentId;
private int subEquipmentId;
private int replaceSparePartId;
private String equipmentName;
private String subEquipmentName;
private String replaceSparePartName;
public int getEquipmentId() {
return equipmentId;
}
public void setEquipmentId(int equipmentId) {
this.equipmentId = equipmentId;
}
public int getSubEquipmentId() {
return subEquipmentId;
}
public void setSubEquipmentId(int subEquipmentId) {
this.subEquipmentId = subEquipmentId;
}
public int getReplaceSparePartId() {
return replaceSparePartId;
}
public void setReplaceSparePartId(int replaceSparePartId) {
this.replaceSparePartId = replaceSparePartId;
}
public String getEquipmentName() {
return equipmentName;
}
public void setEquipmentName(String equipmentName) {
this.equipmentName = equipmentName;
}
public String getSubEquipmentName() {
return subEquipmentName;
}
public void setSubEquipmentName(String subEquipmentName) {
this.subEquipmentName = subEquipmentName;
}
public String getReplaceSparePartName() {
return replaceSparePartName;
}
public void setReplaceSparePartName(String replaceSparePartName) {
this.replaceSparePartName = replaceSparePartName;
}
}
app/src/main/java/com/wd/workoffice/retrofit/ApiService.java
浏览文件 @ 91710de2
...@@ -1761,6 +1761,14 @@ public interface ApiService { ...@@ -1761,6 +1761,14 @@ public interface ApiService {
*/ */
@GET("/equipment/page/list") @GET("/equipment/page/list")
Observable<BaseBean> equipmentList(@QueryMap Map<String, Object> param); Observable<BaseBean> equipmentList(@QueryMap Map<String, Object> param);
/**
* 获取设备列表
*
* @return
*/
@GET("/equipment/list")
Observable<BaseBean> equipmentNoPageList(@QueryMap Map<String, Object> param);
/** /**
* 获取设备列表 * 获取设备列表
* *
...@@ -1791,6 +1799,13 @@ public interface ApiService { ...@@ -1791,6 +1799,13 @@ public interface ApiService {
*/ */
@POST("/equipmentPurchase") @POST("/equipmentPurchase")
Observable<BaseBean> addEquipmentPurchase(@Body RequestBody requestBody); Observable<BaseBean> addEquipmentPurchase(@Body RequestBody requestBody);
/**
* 下单设备采购
*
* @return
*/
@POST("/equipmentRepair")
Observable<BaseBean> addEquipmentRepair(@Body RequestBody requestBody);
/** /**
* 设备采购明细列表（不分页) * 设备采购明细列表（不分页)
* *
......
app/src/main/java/com/wd/workoffice/ui/activity/MainActivity.java
浏览文件 @ 91710de2
...@@ -198,7 +198,7 @@ public class MainActivity extends WorkBaseActivity implements BottomNavigationBa ...@@ -198,7 +198,7 @@ public class MainActivity extends WorkBaseActivity implements BottomNavigationBa
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
public void login(LoginEvent lg) { public void login(LoginEvent lg) {
if (!UserKeeper.getInstance().getMesLogin() && TextUtils.isEmpty(UserKeeper.getInstance().getLoginInfo())) { if (!UserKeeper.getInstance().getMesLogin()) {
Intent intent = new Intent(MainActivity.this, LoginActivity.class); Intent intent = new Intent(MainActivity.this, LoginActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
UserKeeper.getInstance().clearAll(); UserKeeper.getInstance().clearAll();
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceBuyAddActivity.java
浏览文件 @ 91710de2
...@@ -11,12 +11,19 @@ import com.wd.workoffice.R; ...@@ -11,12 +11,19 @@ import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean; import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.DepBean; import com.wd.workoffice.bean.DepBean;
import com.wd.workoffice.bean.event.AddDeviceEvent;
import com.wd.workoffice.retrofit.RtfUtils; import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver; import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.util.DialogUtils; import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
...@@ -54,7 +61,9 @@ public class DeviceBuyAddActivity extends WorkToolBarActivity { ...@@ -54,7 +61,9 @@ public class DeviceBuyAddActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
// batSalePresenter.getDep(PermissionType.REPAIR_BUY.getCode()); // batSalePresenter.getDep(PermissionType.REPAIR_BUY.getCode());
RtfUtils.getRtf().depList().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() { Map<String, Object> param = WorkUtils.simpleParam();
param.put("includeCO","0");
RtfUtils.getRtf().getDep(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override @Override
public void doOnSubscribe(Disposable d) { public void doOnSubscribe(Disposable d) {
} }
...@@ -117,6 +126,21 @@ public class DeviceBuyAddActivity extends WorkToolBarActivity { ...@@ -117,6 +126,21 @@ public class DeviceBuyAddActivity extends WorkToolBarActivity {
break; break;
} }
} }
@Override
public void onStart() {
super.onStart();
EventBus.getDefault().register(this);
}
@Override
public void onStop() {
super.onStop();
EventBus.getDefault().unregister(this);
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onMessageEvent(AddDeviceEvent event) {
finish();
}
} }
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceBuyCarActivity.java
浏览文件 @ 91710de2
...@@ -11,6 +11,7 @@ import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction; ...@@ -11,6 +11,7 @@ import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.DeviceBean; import com.wd.workoffice.bean.DeviceBean;
import com.wd.workoffice.bean.event.AddDeviceEvent;
import com.wd.workoffice.bean.event.ModifyCarEvent; import com.wd.workoffice.bean.event.ModifyCarEvent;
import com.wd.workoffice.ui.adapter.DeviceCarAdapter; import com.wd.workoffice.ui.adapter.DeviceCarAdapter;
import com.wd.workoffice.util.DialogUtils; import com.wd.workoffice.util.DialogUtils;
...@@ -133,4 +134,10 @@ public class DeviceBuyCarActivity extends WorkToolBarActivity { ...@@ -133,4 +134,10 @@ public class DeviceBuyCarActivity extends WorkToolBarActivity {
} }
tvPrice.setText("总计: ¥ ".concat(allPrice)); tvPrice.setText("总计: ¥ ".concat(allPrice));
} }
@Subscribe(threadMode = ThreadMode.MAIN)
public void onMessageEvent(AddDeviceEvent event) {
finish();
}
} }
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceBuyConfirmActivity.java
浏览文件 @ 91710de2
...@@ -25,6 +25,7 @@ import com.wd.workoffice.app.BaseBean; ...@@ -25,6 +25,7 @@ import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.DeviceBean; import com.wd.workoffice.bean.DeviceBean;
import com.wd.workoffice.bean.ProductBean; import com.wd.workoffice.bean.ProductBean;
import com.wd.workoffice.bean.event.AddDeviceEvent;
import com.wd.workoffice.bean.workEnum.PermissionType; import com.wd.workoffice.bean.workEnum.PermissionType;
import com.wd.workoffice.retrofit.ApiService; import com.wd.workoffice.retrofit.ApiService;
import com.wd.workoffice.retrofit.RtfUtils; import com.wd.workoffice.retrofit.RtfUtils;
...@@ -43,6 +44,8 @@ import com.zhihu.matisse.Matisse; ...@@ -43,6 +44,8 @@ import com.zhihu.matisse.Matisse;
import com.zhihu.matisse.MimeType; import com.zhihu.matisse.MimeType;
import com.zhihu.matisse.internal.entity.CaptureStrategy; import com.zhihu.matisse.internal.entity.CaptureStrategy;
import org.greenrobot.eventbus.EventBus;
import java.io.File; import java.io.File;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -209,8 +212,9 @@ public class DeviceBuyConfirmActivity extends WorkToolBarActivity { ...@@ -209,8 +212,9 @@ public class DeviceBuyConfirmActivity extends WorkToolBarActivity {
toast(data.getMessage()); toast(data.getMessage());
return; return;
} }
toast("下单成功"); toast("提交成功");
startActivity(StoreOrderSuccessActivity.class); EventBus.getDefault().post(new AddDeviceEvent());
finish();
} }
}); });
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceBuyProductActivity.java
浏览文件 @ 91710de2
...@@ -241,5 +241,4 @@ public class DeviceBuyProductActivity extends WorkToolBarActivity { ...@@ -241,5 +241,4 @@ public class DeviceBuyProductActivity extends WorkToolBarActivity {
carList.clear(); carList.clear();
carList.addAll(JSON.parseArray(pro, DeviceBean.RecordsBean.class)); carList.addAll(JSON.parseArray(pro, DeviceBean.RecordsBean.class));
} }
} }
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceBuyRepairAddActivity.java 0 → 100644
浏览文件 @ 91710de2
package com.wd.workoffice.ui.activity.bat.work;
import android.content.DialogInterface;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import android.widget.EditText;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.bigkoo.pickerview.listener.OnTimeSelectListener;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.DepBean;
import com.wd.workoffice.bean.event.AddDeviceEvent;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.PickTimeUtils;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import flexible.xd.android_base.utils.TimeUtils;
import io.reactivex.disposables.Disposable;
/**
* 设备维修新增
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class DeviceBuyRepairAddActivity extends WorkToolBarActivity {
@BindView(R.id.tv_dep)
TextView tvDep;
@BindView(R.id.rl_dep)
RelativeLayout rlDep;
@BindView(R.id.et_price)
EditText etPrice;
@BindView(R.id.tv_time)
TextView tvTime;
@BindView(R.id.rl_time)
RelativeLayout rlTime;
@BindView(R.id.tv_product)
TextView tvProduct;
@BindView(R.id.rl_product)
RelativeLayout rlProduct;
private QMUIDialog.MenuDialogBuilder depDialog;
private List<DepBean> depList;
List<String> depNameList = new ArrayList<>();
private DepBean chooseDep;
@Override
protected void initView() {
ButterKnife.bind(this);
depDialog = DialogUtils.listDialog(this);
}
@Override
protected void initData() {
// batSalePresenter.getDep(PermissionType.REPAIR_BUY.getCode());
Map<String, Object> param = WorkUtils.simpleParam();
param.put("includeCO", "0");
RtfUtils.getRtf().getDep(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseBean data) {
hideLoading();
if (data.getCode() != 0) {
toast(data.getMessage());
return;
}
List<DepBean> getList = JSON.parseArray(data.getData().toString(), DepBean.class);
depList = getList;
depNameList.clear();
for (DepBean dep : getList) {
depNameList.add(dep.getName());
}
depDialog.addItems(depNameList.toArray(new String[depNameList.size()]), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
chooseDep = depList.get(which);
tvDep.setText(depNameList.get(which));
dialog.dismiss();
}
});
}
});
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_device_buy_repair;
}
@OnClick({R.id.rl_dep, R.id.rl_time, R.id.rl_product})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.rl_time:
PickTimeUtils.showPickThree(this, new OnTimeSelectListener() {
@Override
public void onTimeSelect(Date date, View view) {
tvTime.setText(TimeUtils.date2String(date, new SimpleDateFormat("yyyy-MM-dd")));
}
}).show();
break;
case R.id.rl_dep:
depDialog.show();
break;
case R.id.rl_product:
if (chooseDep == null) {
toast("请选择接单部门");
return;
}
if (TextUtils.isEmpty(etPrice.getText().toString())) {
toast("请填写金额");
return;
}
if (TextUtils.isEmpty(tvTime.getText().toString())) {
toast("请填写时间");
return;
}
startActivity(DeviceBuyRepairProductActivity.class,
"depId", chooseDep.getId() + "",
"depName", chooseDep.getName(),
"amount", etPrice.getText().toString(),
"repairDateTime", tvTime.getText().toString());
break;
}
}
@Override
public void onStart() {
super.onStart();
EventBus.getDefault().register(this);
}
@Override
public void onStop() {
super.onStop();
EventBus.getDefault().unregister(this);
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onMessageEvent(AddDeviceEvent event) {
finish();
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceBuyRepairConfirmActivity.java 0 → 100644
浏览文件 @ 91710de2
package com.wd.workoffice.ui.activity.bat.work;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.EditText;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.AddDeviceEvent;
import com.wd.workoffice.bean.vo.DeviceRepairVo;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.bat.store.StoreOrderSuccessActivity;
import com.wd.workoffice.ui.adapter.DeviceRepairProductAdapter;
import com.wd.workoffice.util.UserKeeper;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
/**
* 设备维修-确认订单
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class DeviceBuyRepairConfirmActivity extends WorkToolBarActivity {
@BindView(R.id.tv_num)
TextView tvNum;
@BindView(R.id.tv_price)
TextView tvPrice;
@BindView(R.id.tv_ok)
TextView tvOk;
@BindView(R.id.ll_bottom)
RelativeLayout llBottom;
@BindView(R.id.tv_dep)
TextView tvDep;
@BindView(R.id.tv_time)
TextView tvTime;
@BindView(R.id.rv_pro)
RecyclerView rvPro;
@BindView(R.id.et_input5)
EditText etInput5;
@BindView(R.id.tv_input5)
TextView tvInput5;
private List<DeviceRepairVo> proList;
private DeviceRepairProductAdapter proAdapter;
private Map<String, Object> param;
@Override
protected void initView() {
ButterKnife.bind(this);
rvPro.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
}
@Override
protected void initData() {
tvDep.setText(getIntent().getStringExtra("depName"));
tvPrice.setText(getIntent().getStringExtra("amount"));
tvTime.setText(getIntent().getStringExtra("repairDateTime"));
proList = new ArrayList<>();
proAdapter = new DeviceRepairProductAdapter(R.layout.item_device_product_repair, proList, 1);
proAdapter.bindToRecyclerView(rvPro);
proList.addAll(JSON.parseArray(getIntent().getStringExtra("pro"), DeviceRepairVo.class));
proAdapter.notifyDataSetChanged();
param = new HashMap<>();
param.put("receiveDeptId", getIntent().getStringExtra("depId"));
param.put("launchUserId", UserKeeper.getInstance().getUserId());
param.put("launchDeptId", UserKeeper.getInstance().getUserDepId());
param.put("repairDateTime", getIntent().getStringExtra("repairDateTime"));
param.put("amount", getIntent().getStringExtra("amount"));
}
@Override
protected void initEvent() {
addNumListener(etInput5, tvInput5);
}
/**
* 添加字数监听器
*
* @param et
* @param tv
*/
private void addNumListener(EditText et, TextView tv) {
et.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void afterTextChanged(Editable s) {
tv.setText(s.length() + "/140");
}
});
}
@Override
protected int layoutId() {
return R.layout.activity_device_buy_repair_confirm;
}
/**
* 下单
*/
private void submitOrder() {
param.put("equipmentRepairItem", proList);
showLoading();
RtfUtils.getRtf().addEquipmentRepair(WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseBean data) {
hideLoading();
if (data.getCode() != 0) {
toast(data.getMessage());
return;
}
toast("提交成功");
EventBus.getDefault().post(new AddDeviceEvent());
finish();
}
});
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_report, menu);
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.report:
param.put("remark", etInput5.getText().toString());
submitOrder();
break;
}
return super.onOptionsItemSelected(item);
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceBuyRepairProductActivity.java 0 → 100644
浏览文件 @ 91710de2
package com.wd.workoffice.ui.activity.bat.work;
import android.content.DialogInterface;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.DeviceBean;
import com.wd.workoffice.bean.SparePartsBean;
import com.wd.workoffice.bean.event.AddDeviceEvent;
import com.wd.workoffice.bean.event.ModifyCarEvent;
import com.wd.workoffice.bean.vo.DeviceRepairVo;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.DeviceRepairProductAdapter;
import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
/**
* 设备维修-产品列表
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class DeviceBuyRepairProductActivity extends WorkToolBarActivity {
@BindView(R.id.rv_product)
RecyclerView rvProduct;
@BindView(R.id.tv_add)
TextView tvAdd;
@BindView(R.id.tv_machine)
TextView tvMachine;
@BindView(R.id.rl_machine)
RelativeLayout rlMachine;
@BindView(R.id.tv_components)
TextView tvComponents;
@BindView(R.id.rl_components)
RelativeLayout rlComponents;
@BindView(R.id.tv_spare_parts)
TextView tvSpareParts;
@BindView(R.id.rl_spare_parts)
RelativeLayout rlSpareParts;
@BindView(R.id.tv_cancel)
TextView tvCancel;
@BindView(R.id.tv_ok)
TextView tvOk;
@BindView(R.id.ll_add)
LinearLayout llAdd;
private Map<String, Object> param;
private List<DeviceRepairVo> dataList;
private DeviceRepairProductAdapter dataAdapter;
private List<DeviceBean.RecordsBean> carList = new ArrayList<>();
private QMUIDialog.MenuDialogBuilder machineDialog;
private QMUIDialog.MenuDialogBuilder componentsDialog;
private QMUIDialog.MenuDialogBuilder sparePartsDialog;
private List<DeviceBean.RecordsBean> machineList;
private List<String> machineNameList = new ArrayList<>();
private List<String> componentsNameList = new ArrayList<>();
private List<String> sparePartsNameList = new ArrayList<>();
private DeviceBean.RecordsBean chooseMachine;
private List<DeviceBean.RecordsBean> componentsList;
private DeviceBean.RecordsBean chooseComponents;
private SparePartsBean.RecordsBean chooseSpareParts;
private List<SparePartsBean.RecordsBean> sparePartsList;
@Override
protected void initView() {
ButterKnife.bind(this);
rvProduct.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
machineDialog = DialogUtils.listDialog(this);
componentsDialog = DialogUtils.listDialog(this);
sparePartsDialog = DialogUtils.listDialog(this);
}
@Override
protected void initData() {
dataList = new ArrayList<>();
dataAdapter = new DeviceRepairProductAdapter(R.layout.item_device_product_repair, dataList, 0);
dataAdapter.bindToRecyclerView(rvProduct);
param = WorkUtils.pageKey();
param.put("parentId", 0);
getData();
}
private void getData() {
RtfUtils.getRtf().equipmentNoPageList(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseBean data) {
hideLoading();
if (data.getCode() != 0) {
toast(data.getMessage());
return;
}
List<DeviceBean.RecordsBean> getList = JSON.parseArray(data.getData().toString(), DeviceBean.RecordsBean.class);
machineList = getList;
machineNameList.clear();
for (DeviceBean.RecordsBean device : getList) {
machineNameList.add(device.getTitle());
}
machineDialog.addItems(machineNameList.toArray(new String[machineNameList.size()]), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
chooseMachine = machineList.get(which);
tvMachine.setText(machineNameList.get(which));
dialog.dismiss();
getComponents(chooseMachine.getId());
getSparePart(chooseMachine.getId());
clearViewData();
}
});
}
});
}
private void clearViewData() {
chooseComponents = null;
chooseSpareParts = null;
tvComponents.setText("");
tvSpareParts.setText("");
}
private void getComponents(int id) {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("parentId", id);
RtfUtils.getRtf().equipmentNoPageList(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseBean data) {
hideLoading();
if (data.getCode() != 0) {
toast(data.getMessage());
return;
}
List<DeviceBean.RecordsBean> getList = JSON.parseArray(data.getData().toString(), DeviceBean.RecordsBean.class);
componentsList = getList;
componentsNameList.clear();
for (DeviceBean.RecordsBean device : getList) {
componentsNameList.add(device.getTitle());
}
componentsDialog = DialogUtils.listDialog(DeviceBuyRepairProductActivity.this);
componentsDialog.addItems(componentsNameList.toArray(new String[componentsNameList.size()]), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
chooseComponents = componentsList.get(which);
tvComponents.setText(componentsNameList.get(which));
dialog.dismiss();
}
});
}
});
}
private void getSparePart(int id) {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("assetId", id);
RtfUtils.getRtf().sparePartList(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseBean data) {
hideLoading();
if (data.getCode() != 0) {
toast(data.getMessage());
return;
}
List<SparePartsBean.RecordsBean> getList = JSON.parseObject(data.getData().toString(), SparePartsBean.class).getRecords();
sparePartsList = getList;
sparePartsNameList.clear();
for (SparePartsBean.RecordsBean device : getList) {
sparePartsNameList.add(device.getItemName());
}
sparePartsDialog = DialogUtils.listDialog(DeviceBuyRepairProductActivity.this);
sparePartsDialog.addItems(sparePartsNameList.toArray(new String[sparePartsNameList.size()]), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
chooseSpareParts = sparePartsList.get(which);
tvSpareParts.setText(sparePartsNameList.get(which));
dialog.dismiss();
}
});
}
});
}
@Override
protected void initEvent() {
dataAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override
public void onItemChildClick(BaseQuickAdapter baseQuickAdapter, View view, int i) {
dataList.remove(i);
dataAdapter.notifyItemRemoved(i);
}
});
}
@Override
protected int layoutId() {
return R.layout.activity_device_buy_pro_repair;
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_next, menu);
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.next:
if (dataList.size() == 0) {
toast("请添加产品明细");
return super.onOptionsItemSelected(item);
}
startActivity(DeviceBuyRepairConfirmActivity.class,
"pro", JSON.toJSONString(dataList),
"depId",getIntent().getStringExtra("depId"),
"depName", getIntent().getStringExtra("depName"),
"amount", getIntent().getStringExtra("amount"),
"repairDateTime", getIntent().getStringExtra("repairDateTime"));
break;
}
return super.onOptionsItemSelected(item);
}
@OnClick({R.id.tv_add, R.id.rl_machine, R.id.rl_components, R.id.rl_spare_parts, R.id.tv_cancel, R.id.tv_ok})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.rl_machine:
machineDialog.show();
break;
case R.id.rl_components:
componentsDialog.show();
break;
case R.id.rl_spare_parts:
sparePartsDialog.show();
break;
case R.id.tv_cancel:
clearViewData();
llAdd.setVisibility(View.GONE);
break;
case R.id.tv_ok:
addData();
break;
case R.id.tv_add:
llAdd.setVisibility(View.VISIBLE);
break;
}
}
private void addData() {
if (chooseMachine == null) {
toast("请选择设备");
return;
}
if (chooseComponents == null) {
toast("请选择组件");
return;
}
if (chooseSpareParts == null) {
toast("请选择备件");
return;
}
DeviceRepairVo deviceRepairVo = new DeviceRepairVo();
deviceRepairVo.setEquipmentId(chooseMachine.getId());
deviceRepairVo.setEquipmentName(chooseMachine.getTitle());
deviceRepairVo.setSubEquipmentId(chooseComponents.getId());
deviceRepairVo.setSubEquipmentName(chooseComponents.getTitle());
deviceRepairVo.setReplaceSparePartId(chooseSpareParts.getId());
deviceRepairVo.setReplaceSparePartName(chooseSpareParts.getItemName());
dataList.add(deviceRepairVo);
dataAdapter.notifyDataSetChanged();
clearViewData();
llAdd.setVisibility(View.GONE);
}
@Override
public void onStart() {
super.onStart();
EventBus.getDefault().register(this);
}
@Override
public void onStop() {
super.onStop();
EventBus.getDefault().unregister(this);
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onMessageEvent(AddDeviceEvent event) {
finish();
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceRepairActivity.java
浏览文件 @ 91710de2
...@@ -89,7 +89,7 @@ public class DeviceRepairActivity extends WorkToolBarActivity { ...@@ -89,7 +89,7 @@ public class DeviceRepairActivity extends WorkToolBarActivity {
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.add: case R.id.add:
startActivity(DeviceBuyAddActivity.class); startActivity(DeviceBuyRepairAddActivity.class);
break; break;
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
......
app/src/main/java/com/wd/workoffice/ui/adapter/DeviceRepairProductAdapter.java 0 → 100644
浏览文件 @ 91710de2
package com.wd.workoffice.ui.adapter;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
import com.wd.workoffice.bean.vo.DeviceRepairVo;
import java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class DeviceRepairProductAdapter extends BaseQuickAdapter<DeviceRepairVo, BaseViewHolder> {
int type;// 0 有删除 1无删除， 确认页面
public DeviceRepairProductAdapter(int layoutResId, List data, int type) {
super(layoutResId, data);
this.type = type;
}
@Override
protected void convert(BaseViewHolder helper, DeviceRepairVo item) {
helper.setText(R.id.tv_component_name, item.getSubEquipmentName());
helper.setText(R.id.tv_spare_parts_name, item.getReplaceSparePartName());
helper.setText(R.id.tv_machine_name, item.getEquipmentName());
helper.addOnClickListener(R.id.tv_delete);
if (type == 1) {
helper.setGone(R.id.tv_delete, false);
}
}
}
app/src/main/java/com/wd/workoffice/ui/fg/DeviceBuyCheckListFragment.java
浏览文件 @ 91710de2
...@@ -12,6 +12,7 @@ import com.wd.workoffice.app.BaseBean; ...@@ -12,6 +12,7 @@ import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkBaseFg; import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.DeviceBuyBean; import com.wd.workoffice.bean.DeviceBuyBean;
import com.wd.workoffice.bean.RepairBean; import com.wd.workoffice.bean.RepairBean;
import com.wd.workoffice.bean.event.AddDeviceEvent;
import com.wd.workoffice.bean.event.CheckDeviceEvent; import com.wd.workoffice.bean.event.CheckDeviceEvent;
import com.wd.workoffice.bean.event.CheckOrderEvent; import com.wd.workoffice.bean.event.CheckOrderEvent;
import com.wd.workoffice.retrofit.RtfUtils; import com.wd.workoffice.retrofit.RtfUtils;
...@@ -25,6 +26,7 @@ import com.wd.workoffice.util.WorkUtils; ...@@ -25,6 +26,7 @@ import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -174,4 +176,11 @@ public class DeviceBuyCheckListFragment extends WorkBaseFg { ...@@ -174,4 +176,11 @@ public class DeviceBuyCheckListFragment extends WorkBaseFg {
param.put("current", page); param.put("current", page);
getData(); getData();
} }
@Subscribe(threadMode = ThreadMode.MAIN)
public void onMessageEvent(AddDeviceEvent event) {
page = 1;
param.put("current", page);
getData();
}
} }
app/src/main/java/com/wd/workoffice/ui/fg/DeviceBuyListFragment.java
浏览文件 @ 91710de2
...@@ -12,6 +12,7 @@ import com.wd.workoffice.app.BaseBean; ...@@ -12,6 +12,7 @@ import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkBaseFg; import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.DeviceBuyBean; import com.wd.workoffice.bean.DeviceBuyBean;
import com.wd.workoffice.bean.RepairBean; import com.wd.workoffice.bean.RepairBean;
import com.wd.workoffice.bean.event.AddDeviceEvent;
import com.wd.workoffice.bean.event.CheckDeviceEvent; import com.wd.workoffice.bean.event.CheckDeviceEvent;
import com.wd.workoffice.bean.event.CheckOrderEvent; import com.wd.workoffice.bean.event.CheckOrderEvent;
import com.wd.workoffice.retrofit.RtfUtils; import com.wd.workoffice.retrofit.RtfUtils;
...@@ -25,6 +26,7 @@ import com.wd.workoffice.util.WorkUtils; ...@@ -25,6 +26,7 @@ import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -174,4 +176,10 @@ public class DeviceBuyListFragment extends WorkBaseFg { ...@@ -174,4 +176,10 @@ public class DeviceBuyListFragment extends WorkBaseFg {
param.put("current", page); param.put("current", page);
getData(); getData();
} }
@Subscribe(threadMode = ThreadMode.MAIN)
public void onMessageEvent(AddDeviceEvent event) {
page = 1;
param.put("current", page);
getData();
}
} }
app/src/main/java/com/wd/workoffice/ui/fg/DeviceRepairCheckListFragment.java
浏览文件 @ 91710de2
...@@ -13,6 +13,7 @@ import com.wd.workoffice.app.WorkBaseFg; ...@@ -13,6 +13,7 @@ import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.DeviceBean; import com.wd.workoffice.bean.DeviceBean;
import com.wd.workoffice.bean.OrderBean; import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.bean.RepairBean; import com.wd.workoffice.bean.RepairBean;
import com.wd.workoffice.bean.event.AddDeviceEvent;
import com.wd.workoffice.bean.event.CheckDeviceEvent; import com.wd.workoffice.bean.event.CheckDeviceEvent;
import com.wd.workoffice.bean.event.CheckOrderEvent; import com.wd.workoffice.bean.event.CheckOrderEvent;
import com.wd.workoffice.retrofit.RtfUtils; import com.wd.workoffice.retrofit.RtfUtils;
...@@ -26,6 +27,7 @@ import com.wd.workoffice.util.WorkUtils; ...@@ -26,6 +27,7 @@ import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -173,4 +175,11 @@ public class DeviceRepairCheckListFragment extends WorkBaseFg { ...@@ -173,4 +175,11 @@ public class DeviceRepairCheckListFragment extends WorkBaseFg {
param.put("current", page); param.put("current", page);
getData(); getData();
} }
@Subscribe(threadMode = ThreadMode.MAIN)
public void onMessageEvent(AddDeviceEvent event) {
page = 1;
param.put("current", page);
getData();
}
} }
app/src/main/java/com/wd/workoffice/ui/fg/DeviceRepairFragment.java
浏览文件 @ 91710de2
...@@ -78,4 +78,6 @@ public class DeviceRepairFragment extends WorkBaseFg { ...@@ -78,4 +78,6 @@ public class DeviceRepairFragment extends WorkBaseFg {
protected int layoutId() { protected int layoutId() {
return R.layout.activity_order; return R.layout.activity_order;
} }
} }
app/src/main/java/com/wd/workoffice/ui/fg/DeviceRepairListFragment.java
浏览文件 @ 91710de2
...@@ -13,6 +13,7 @@ import com.wd.workoffice.app.WorkBaseFg; ...@@ -13,6 +13,7 @@ import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.DeviceBean; import com.wd.workoffice.bean.DeviceBean;
import com.wd.workoffice.bean.OrderBean; import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.bean.RepairBean; import com.wd.workoffice.bean.RepairBean;
import com.wd.workoffice.bean.event.AddDeviceEvent;
import com.wd.workoffice.bean.event.CheckDeviceEvent; import com.wd.workoffice.bean.event.CheckDeviceEvent;
import com.wd.workoffice.bean.event.CheckOrderEvent; import com.wd.workoffice.bean.event.CheckOrderEvent;
import com.wd.workoffice.retrofit.RtfUtils; import com.wd.workoffice.retrofit.RtfUtils;
...@@ -26,6 +27,7 @@ import com.wd.workoffice.util.WorkUtils; ...@@ -26,6 +27,7 @@ import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -176,4 +178,12 @@ public class DeviceRepairListFragment extends WorkBaseFg { ...@@ -176,4 +178,12 @@ public class DeviceRepairListFragment extends WorkBaseFg {
param.put("current", page); param.put("current", page);
getData(); getData();
} }
@Subscribe(threadMode = ThreadMode.MAIN)
public void onMessageEvent(AddDeviceEvent event) {
page = 1;
param.put("current", page);
getData();
}
} }
app/src/main/java/com/wd/workoffice/util/PickTimeUtils.java
浏览文件 @ 91710de2
...@@ -6,6 +6,8 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; ...@@ -6,6 +6,8 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder;
import com.bigkoo.pickerview.listener.OnTimeSelectListener; import com.bigkoo.pickerview.listener.OnTimeSelectListener;
import com.bigkoo.pickerview.view.TimePickerView; import com.bigkoo.pickerview.view.TimePickerView;
import java.util.Calendar;
public class PickTimeUtils { public class PickTimeUtils {
public static TimePickerView showPick(Context ctx, OnTimeSelectListener listener) { public static TimePickerView showPick(Context ctx, OnTimeSelectListener listener) {
...@@ -20,7 +22,18 @@ public class PickTimeUtils { ...@@ -20,7 +22,18 @@ public class PickTimeUtils {
} }
public static TimePickerView showPickThree(Context ctx, OnTimeSelectListener listener) { public static TimePickerView showPickThree(Context ctx, OnTimeSelectListener listener) {
// TimePickerBuilder pvTime = new TimePickerBuilder(ctx, listener);
// pvTime.setType(new boolean[]{true, true, true, false, false, false}).setTitleSize(16).setContentTextSize(16).
// setSubCalSize(16);
//// .setRangDate(startDate, endDate);
return showPickThree(ctx,listener,true);
}
public static TimePickerView showPickThree(Context ctx, OnTimeSelectListener listener, boolean todayStart) {
TimePickerBuilder pvTime = new TimePickerBuilder(ctx, listener); TimePickerBuilder pvTime = new TimePickerBuilder(ctx, listener);
if (todayStart) {
pvTime.setRangDate(Calendar.getInstance(), null);
}
pvTime.setType(new boolean[]{true, true, true, false, false, false}).setTitleSize(16).setContentTextSize(16). pvTime.setType(new boolean[]{true, true, true, false, false, false}).setTitleSize(16).setContentTextSize(16).
setSubCalSize(16); setSubCalSize(16);
// .setRangDate(startDate, endDate); // .setRangDate(startDate, endDate);
......
app/src/main/res/layout/activity_device_buy_pro_repair.xml 0 → 100644
浏览文件 @ 91710de2
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_product"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/tv_add"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
android:layout_marginTop="30mm"
android:text="添加产品明细"
android:textColor="@color/white" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_add"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#70000000"
android:paddingHorizontal="40mm"
android:paddingVertical="40mm">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="60mm"
android:layout_centerInParent="true"
android:gravity="center"
android:text="添加明细"
android:textColor="#ff9eaab1"
android:textSize="16sp" />
<RelativeLayout
android:id="@+id/rl_machine"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="22mm">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:gravity="center_vertical">
<View
android:layout_width="12mm"
android:layout_height="12mm"
android:background="#FF3F617F" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="选择设备"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_machine"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:hint="请选择设备"
android:textSize="16sp"
android:textStyle="bold" />
<ImageView
android:layout_width="6mm"
android:layout_height="10mm"
android:background="@mipmap/arrow_right_blue" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_components"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="22mm">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:gravity="center_vertical">
<View
android:layout_width="12mm"
android:layout_height="12mm"
android:background="#C45D5D" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="选择组件"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_components"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:hint="请选择组件"
android:textSize="16sp"
android:textStyle="bold" />
<ImageView
android:layout_width="6mm"
android:layout_height="10mm"
android:background="@mipmap/arrow_right_blue" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_spare_parts"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="22mm">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:gravity="center_vertical">
<View
android:layout_width="12mm"
android:layout_height="12mm"
android:background="#FFE3AD6E" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="替换备件"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_spare_parts"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:hint="请选择替换备件"
android:textSize="16sp"
android:textStyle="bold" />
<ImageView
android:layout_width="6mm"
android:layout_height="10mm"
android:background="@mipmap/arrow_right_blue" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:gravity="center"
android:paddingVertical="15mm">
<TextView
android:id="@+id/tv_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
android:text="取消"
android:textColor="@color/white" />
<TextView
android:id="@+id/tv_ok"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10mm"
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
android:text="确认"
android:textColor="@color/white" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>
</RelativeLayout>
\ No newline at end of file
app/src/main/res/layout/activity_device_buy_repair.xml 0 → 100644
浏览文件 @ 91710de2
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="60mm"
android:layout_centerInParent="true"
android:gravity="center"
android:text="第一步"
android:textColor="#ff9eaab1"
android:textSize="16sp" />
<RelativeLayout
android:id="@+id/rl_dep"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="22mm">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:gravity="center_vertical">
<View
android:layout_width="12mm"
android:layout_height="12mm"
android:background="#FF3F617F" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="选择接单部门"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_dep"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:text="请选择接单部门"
android:textSize="16sp"
android:textStyle="bold" />
<ImageView
android:layout_width="6mm"
android:layout_height="10mm"
android:background="@mipmap/arrow_right_blue" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="22mm">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:gravity="center_vertical">
<View
android:layout_width="12mm"
android:layout_height="12mm"
android:background="#C45D5D" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="下单金额"
android:textSize="16sp" />
</LinearLayout>
<EditText
android:id="@+id/et_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="10mm"
android:background="@null"
android:gravity="right"
android:inputType="numberDecimal"
android:hint="请输入下单金额"
android:textSize="16sp"
android:textStyle="bold" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="22mm">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:gravity="center_vertical">
<View
android:layout_width="12mm"
android:layout_height="12mm"
android:background="#FFE3AD6E" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="选择接维修时间"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:text="请选择维修时间"
android:textSize="16sp"
android:textStyle="bold" />
<ImageView
android:layout_width="6mm"
android:layout_height="10mm"
android:background="@mipmap/arrow_right_blue" />
</LinearLayout>
</RelativeLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="60mm"
android:layout_centerInParent="true"
android:gravity="center"
android:text="第二步"
android:textColor="#ff9eaab1"
android:textSize="16sp" />
<!--Product selection-->
<RelativeLayout
android:id="@+id/rl_product"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="22mm">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:gravity="center_vertical">
<View
android:layout_width="12mm"
android:layout_height="12mm"
android:background="#FF3F617F" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="选择产品"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_product"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:textSize="16sp"
android:textStyle="bold" />
<ImageView
android:layout_width="6mm"
android:layout_height="10mm"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@mipmap/arrow_right_blue" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/activity_device_buy_repair_confirm.xml 0 → 100644
浏览文件 @ 91710de2
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:id="@+id/ll_bottom"
android:layout_width="match_parent"
android:layout_height="60mm"
android:layout_alignParentBottom="true"
android:orientation="horizontal"
android:visibility="gone">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentLeft="true"
android:layout_marginLeft="15mm"
android:gravity="center_vertical"
android:orientation="vertical">
<TextView
android:id="@+id/tv_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="共 0 件"
android:textSize="13sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:text="总计: ¥ "
android:textSize="16sp" />
</LinearLayout>
<TextView
android:id="@+id/tv_ok"
android:layout_width="80mm"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:background="@color/red_btn_bg"
android:gravity="center"
android:text="申请下单"
android:textColor="@color/white" />
</RelativeLayout>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/ll_bottom"
android:background="@color/white">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/ll_bottom"
android:orientation="vertical"
android:paddingBottom="20mm">
<View style="@style/ViewX" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingVertical="10mm">
<View
android:layout_width="8mm"
android:layout_height="18mm"
android:background="@color/red_btn_bg" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10mm"
android:text="基本信息"
android:textSize="16sp" />
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="接单部门"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_dep"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="下单金额"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="维修时间"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/ViewX" />
<View style="@style/ViewX" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingVertical="10mm"
android:visibility="gone">
<View
android:layout_width="8mm"
android:layout_height="18mm"
android:background="@color/red_btn_bg" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10mm"
android:text="货品信息"
android:textSize="16sp" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_pro"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<View style="@style/ViewX" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_marginLeft="18mm"
android:paddingVertical="15mm"
android:text="备注"
android:textSize="16sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:background="@drawable/shape_confirm_order"
android:orientation="vertical">
<EditText
android:id="@+id/et_input5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:background="@null"
android:gravity="top"
android:hint="请输入"
android:minLines="4"
android:padding="5mm"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_input5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_margin="4mm"
android:text="0/140"
android:textColor="@color/flexible_text_gray" />
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</RelativeLayout>
\ No newline at end of file
app/src/main/res/layout/item_device_product_repair.xml 0 → 100644
浏览文件 @ 91710de2
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:layout_marginTop="10mm"
android:orientation="vertical"
android:paddingHorizontal="20mm"
android:paddingVertical="10mm">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#FCFCFD"
android:orientation="vertical"
android:padding="10mm">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="设备名字"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_machine_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="组件名称"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_component_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_num"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="替换组件名称"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_spare_parts_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
</RelativeLayout>
</LinearLayout>
<TextView
android:id="@+id/tv_delete"
android:layout_width="90mm"
android:layout_height="26mm"
android:layout_gravity="right"
android:layout_marginTop="10mm"
android:text="删除"
android:textColor="@color/white"
android:gravity="center"
android:background="@drawable/shape_blue_btn" />
</LinearLayout>
\ No newline at end of file
app/src/main/res/menu/menu_next.xml 0 → 100644
浏览文件 @ 91710de2
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/next"
android:title="下一步"
app:showAsAction="always" />
</menu>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论