diff --git a/app/build.gradle b/app/build.gradle index 6545b93..089921b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -57,4 +57,5 @@ dependencies { implementation 'io.github.scwang90:refresh-layout-kernel:2.0.6' //核心必须依赖 implementation 'io.github.scwang90:refresh-footer-classics:2.0.6' //经典加载 implementation 'com.contrarywind:Android-PickerView:4.1.9' + implementation 'com.github.bumptech.glide:glide:4.16.0' } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6ce514a..1dfd9b9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,7 +2,21 @@ + + + + + + + + + + @@ -69,6 +86,28 @@ + + + + + + + + @@ -78,6 +117,17 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/example/haiwei_mom/HomePageActivity.java b/app/src/main/java/com/example/haiwei_mom/HomePageActivity.java index 07251b1..d2921b5 100644 --- a/app/src/main/java/com/example/haiwei_mom/HomePageActivity.java +++ b/app/src/main/java/com/example/haiwei_mom/HomePageActivity.java @@ -13,6 +13,11 @@ import com.example.haiwei_mom.base.MyResult; import com.example.haiwei_mom.data.MenuBeen; import com.example.haiwei_mom.data.PdaRouters; import com.example.haiwei_mom.databinding.ActivityHomePageBinding; +import com.example.haiwei_mom.device.BxActivity; +import com.example.haiwei_mom.device.DeviceCheckActivity; +import com.example.haiwei_mom.device.DeviceRepairListActivity; +import com.example.haiwei_mom.device.LubricationActivity; +import com.example.haiwei_mom.device.MaintainActivity; import com.example.haiwei_mom.ipc.FeedingMaterialsActivity; import com.example.haiwei_mom.qm.CheckActivity; import com.example.haiwei_mom.uitls.SharedPreferencesUtils; @@ -23,6 +28,7 @@ import com.example.haiwei_mom.wms.raw.RawInActivity; import com.example.haiwei_mom.wms.raw.RawOutActivity; import com.example.haiwei_mom.wms.raw.RawReturnActivity; import com.example.haiwei_mom.wms.raw.StoreCheckActivity; +import com.example.haiwei_mom.wms.semi.BindingActivity; import com.example.haiwei_mom.wms.semi.SeimMoveActivity; import com.example.haiwei_mom.wms.semi.SemiInActivity; import com.example.haiwei_mom.wms.semi.SemiOutActivity; @@ -59,6 +65,7 @@ public class HomePageActivity extends BaseActivity implements ItemClickCall { map.put("半成品调拨", SeimMoveActivity.class); map.put("半成品盘点", StoreCheckActivity.class); map.put("半成品退库", RawReturnActivity.class); + map.put("绑定", BindingActivity.class); map.put("入库工装绑定", BindVehicleActivity.class); map.put("成品批量入库", ProductInActivity.class); map.put("成品出库", ProductOutActivity.class); @@ -73,6 +80,11 @@ public class HomePageActivity extends BaseActivity implements ItemClickCall { map.put("载具绑定", FeedingMaterialsActivity.class); map.put("系统配置", ConfigActivity.class); map.put("班组管理", ClassItemActivity.class); + map.put("故障报修", BxActivity.class); + map.put("故障维修", DeviceRepairListActivity.class); + map.put("设备巡检", DeviceCheckActivity.class); + map.put("设备保养", MaintainActivity.class); + map.put("设备润滑", LubricationActivity.class); } private void initRequest() { diff --git a/app/src/main/java/com/example/haiwei_mom/adapter/check/CheckSelectAdapter.java b/app/src/main/java/com/example/haiwei_mom/adapter/check/CheckSelectAdapter.java new file mode 100644 index 0000000..5de0253 --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/adapter/check/CheckSelectAdapter.java @@ -0,0 +1,68 @@ +package com.example.haiwei_mom.adapter.check; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.databinding.DataBindingUtil; +import androidx.recyclerview.widget.RecyclerView; + +import com.example.haiwei_mom.BR; +import com.example.haiwei_mom.R; +import com.example.haiwei_mom.adapter.ItemClickCall; +import com.example.haiwei_mom.databinding.ItemCheckSelectBinding; +import com.example.haiwei_mom.data.check.CheckResult; + +import java.util.List; + +/** + * @author wanghao + * @date 2024/1/31 15:18 + */ +public class CheckSelectAdapter extends RecyclerView.Adapter { + private List list; + private Context context; + private LayoutInflater inflater; + private ItemClickCall clickCall; + public CheckSelectAdapter(Context context, ItemClickCall clickCall) { + this.context = context; + this.clickCall = clickCall; + inflater = LayoutInflater.from(context); + } + + public void setList(List list) { + this.list = list; + } + + @NonNull + @Override + public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + ItemCheckSelectBinding binding = DataBindingUtil.inflate(inflater, R.layout.item_check_select, parent, false); + return new MyViewHolder(binding); + } + + @Override + public void onBindViewHolder(@NonNull MyViewHolder holder, int position) { + var outstock = list.get(position); + var binding = holder.binding; + binding.setVariable(BR.vm,outstock); + binding.checkSelectClick.setOnClickListener(v -> clickCall.onClick(position)); + } + + @Override + public int getItemCount() { + return list==null?0:list.size(); + } + + class MyViewHolder extends RecyclerView.ViewHolder { + private ItemCheckSelectBinding binding; + + public MyViewHolder(ItemCheckSelectBinding binding) { + super(binding.getRoot()); + this.binding = binding; + } + + + } +} diff --git a/app/src/main/java/com/example/haiwei_mom/adapter/check/CheckSelectDetalAdapter.java b/app/src/main/java/com/example/haiwei_mom/adapter/check/CheckSelectDetalAdapter.java new file mode 100644 index 0000000..f493e6c --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/adapter/check/CheckSelectDetalAdapter.java @@ -0,0 +1,68 @@ +package com.example.haiwei_mom.adapter.check; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.databinding.DataBindingUtil; +import androidx.recyclerview.widget.RecyclerView; + +import com.example.haiwei_mom.BR; +import com.example.haiwei_mom.R; +import com.example.haiwei_mom.adapter.ItemClickCall; +import com.example.haiwei_mom.databinding.ItemCheckSelectDetalBinding; +import com.example.haiwei_mom.data.check.CheckResultDetal; + +import java.util.List; + +/** + * @author wanghao + * @date 2024/1/31 15:18 + */ +public class CheckSelectDetalAdapter extends RecyclerView.Adapter { + private List list; + private Context context; + private LayoutInflater inflater; + private ItemClickCall clickCall; + public CheckSelectDetalAdapter(Context context, ItemClickCall clickCall) { + this.context = context; + this.clickCall = clickCall; + inflater = LayoutInflater.from(context); + } + + public void setList(List list) { + this.list = list; + } + + @NonNull + @Override + public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + ItemCheckSelectDetalBinding binding = DataBindingUtil.inflate(inflater, R.layout.item_check_select_detal, parent, false); + return new MyViewHolder(binding); + } + + @Override + public void onBindViewHolder(@NonNull MyViewHolder holder, int position) { + var outstock = list.get(position); + var binding = holder.binding; + binding.setVariable(BR.vm,outstock); + binding.checkSelectDetalClick.setOnClickListener(v -> clickCall.onClick(position)); + } + + @Override + public int getItemCount() { + return list==null?0:list.size(); + } + + class MyViewHolder extends RecyclerView.ViewHolder { + private ItemCheckSelectDetalBinding binding; + + public MyViewHolder(ItemCheckSelectDetalBinding binding) { + super(binding.getRoot()); + this.binding = binding; + } + + + } +} diff --git a/app/src/main/java/com/example/haiwei_mom/adapter/check/CheckWorkAdapter.java b/app/src/main/java/com/example/haiwei_mom/adapter/check/CheckWorkAdapter.java new file mode 100644 index 0000000..35287a6 --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/adapter/check/CheckWorkAdapter.java @@ -0,0 +1,99 @@ +package com.example.haiwei_mom.adapter.check; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.databinding.DataBindingUtil; +import androidx.recyclerview.widget.RecyclerView; + +import com.example.haiwei_mom.R; +import com.example.haiwei_mom.databinding.ItemCheck1Binding; +import com.example.haiwei_mom.databinding.ItemCheck2Binding; +import com.example.haiwei_mom.data.check.CheckResultDetal; + +import java.util.List; + +/** + * @author wanghao + * @date 2024/3/1 17:23 + */ +public class CheckWorkAdapter extends RecyclerView.Adapter { + private List list; + private Context context; + private boolean enabledState; + + public void setEnabledState(boolean enabledState) { + this.enabledState = enabledState; + } + + public CheckWorkAdapter(Context context) { + this.context = context; + } + + public void setList(List list) { + this.list = list; + } + + @NonNull + @Override + public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + var inflater = LayoutInflater.from(context); + if (viewType==1){ + ItemCheck1Binding binding = DataBindingUtil.inflate(inflater, R.layout.item_check_1, parent, false); + return new MyHolder1(binding); + } else { + ItemCheck2Binding binding = DataBindingUtil.inflate(inflater, R.layout.item_check_2, parent, false); + return new MyHolder2(binding); + } + + } + + @Override + public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) { + var checkResultDetal = list.get(position); + checkResultDetal.setIndex(position+1); + if (holder instanceof MyHolder1){ + MyHolder1 holder1= (MyHolder1) holder; + holder1.binding.setItem(checkResultDetal); + holder1.binding.setEnabledState(enabledState); + holder1.binding.executePendingBindings(); + }else { + MyHolder2 holder2= (MyHolder2) holder; + holder2.binding.setItem(checkResultDetal); + holder2.binding.setEnabledState(enabledState); + holder2.binding.executePendingBindings(); + } + } + + @Override + public int getItemCount() { + return list==null?0:list.size(); + } + + @Override + public int getItemViewType(int position) { + return Integer.parseInt(list.get(position).getCheckProjectProperty()); + } + + class MyHolder1 extends RecyclerView.ViewHolder { + private ItemCheck1Binding binding; + + public MyHolder1(@NonNull ItemCheck1Binding binding) { + super(binding.getRoot()); + this.binding = binding; + } + } + + class MyHolder2 extends RecyclerView.ViewHolder { + private ItemCheck2Binding binding; + + public MyHolder2(@NonNull ItemCheck2Binding binding) { + super(binding.getRoot()); + this.binding = binding; + } + } + + +} diff --git a/app/src/main/java/com/example/haiwei_mom/adapter/check/DisposalFileAdapter.java b/app/src/main/java/com/example/haiwei_mom/adapter/check/DisposalFileAdapter.java new file mode 100644 index 0000000..c82924a --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/adapter/check/DisposalFileAdapter.java @@ -0,0 +1,77 @@ +package com.example.haiwei_mom.adapter.check; + +import android.content.Context; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.databinding.DataBindingUtil; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.example.haiwei_mom.BR; +import com.example.haiwei_mom.R; +import com.example.haiwei_mom.databinding.ItemDisposalImgBinding; +import com.example.haiwei_mom.data.check.CheckInstanceFiles; + +import java.util.List; +/** + * @author wanghao + * @date 2024/3/11 + */ +public class DisposalFileAdapter extends RecyclerView.Adapter { + private List list; + private static Context context; + private LayoutInflater inflater; + private ItemClickCall clickCall; + public DisposalFileAdapter(Context context, ItemClickCall clickCall) { + this.context = context; + this.clickCall = clickCall; + inflater = LayoutInflater.from(context); + } + + public void setList(List list) { + this.list = list; + } + + @NonNull + @Override + public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + ItemDisposalImgBinding binding = DataBindingUtil.inflate(inflater, R.layout.item_disposal_img, parent, false); + return new MyViewHolder(binding); + } + + // @SuppressLint("CheckResult") + @Override + public void onBindViewHolder(@NonNull MyViewHolder holder, int position) { + var outstock = list.get(position); + var binding = holder.binding; + binding.setVariable(BR.vm,outstock); + Log.e("TAG", "onBindViewHolder:" + outstock.isState()); + Glide.with(context) + .load(outstock.getFaultFile()) + .into(binding.disFile); + binding.disFile.setOnClickListener(v -> clickCall.onClick(position,true)); + binding.disposalDelect.setOnClickListener(v -> clickCall.onClick(position,false)); + } + + @Override + public int getItemCount() { + return list==null?0:list.size(); + } + + class MyViewHolder extends RecyclerView.ViewHolder { + private ItemDisposalImgBinding binding; + + public MyViewHolder(ItemDisposalImgBinding binding) { + super(binding.getRoot()); + this.binding = binding; + } + + + } + public interface ItemClickCall { + void onClick(int position,boolean type); + } +} diff --git a/app/src/main/java/com/example/haiwei_mom/adapter/check/DisposalInfoAdapter.java b/app/src/main/java/com/example/haiwei_mom/adapter/check/DisposalInfoAdapter.java new file mode 100644 index 0000000..4a12ba6 --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/adapter/check/DisposalInfoAdapter.java @@ -0,0 +1,61 @@ +package com.example.haiwei_mom.adapter.check; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.databinding.DataBindingUtil; +import androidx.recyclerview.widget.RecyclerView; + +import com.example.haiwei_mom.BR; +import com.example.haiwei_mom.R; +import com.example.haiwei_mom.databinding.ItemDisposalBinding; +import com.example.haiwei_mom.data.check.CheckActivitieBeen; + +import java.util.List; + +/** + * @author wanghao + * @date 2024/3/12 14:32 + */ +public class DisposalInfoAdapter extends RecyclerView.Adapter { + + private Context context; + private List list; +private LayoutInflater from; + public DisposalInfoAdapter(Context context) { + this.context = context; + + from = LayoutInflater.from(context); + } + + public void setList(List list) { + this.list = list; + } + + @NonNull + @Override + public MyViewHoder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + ItemDisposalBinding binding= DataBindingUtil.inflate(from, R.layout.item_disposal,parent,false); + return new MyViewHoder(binding); + } + + @Override + public void onBindViewHolder(@NonNull MyViewHoder holder, int position) { + holder.binding.setVariable(BR.vm,list.get(position)); + } + + @Override + public int getItemCount() { + return list==null?0:list.size(); + } + + public static class MyViewHoder extends RecyclerView.ViewHolder{ + private ItemDisposalBinding binding; + public MyViewHoder(ItemDisposalBinding binding) { + super(binding.getRoot()); + this.binding=binding; + } + } +} diff --git a/app/src/main/java/com/example/haiwei_mom/adapter/device/DeviceInspectionInfoAdapter.java b/app/src/main/java/com/example/haiwei_mom/adapter/device/DeviceInspectionInfoAdapter.java new file mode 100644 index 0000000..b8624fe --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/adapter/device/DeviceInspectionInfoAdapter.java @@ -0,0 +1,93 @@ +package com.example.haiwei_mom.adapter.device; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.databinding.DataBindingUtil; +import androidx.recyclerview.widget.RecyclerView; + +import com.example.haiwei_mom.R; +import com.example.haiwei_mom.databinding.ItemDeviceInspection1Binding; +import com.example.haiwei_mom.databinding.ItemDeviceInspection2Binding; +import com.example.haiwei_mom.data.device.DeviceInspectionItem; + +import java.util.List; + +/** + * @author wanghao + * @date 2024/3/1 17:23 + */ +public class DeviceInspectionInfoAdapter extends RecyclerView.Adapter { + private List list; + private Context context; + private LayoutInflater inflater; + public DeviceInspectionInfoAdapter(Context context,List list) { + this.context = context; + inflater = LayoutInflater.from(context); + this.list = list; + } + + + + @NonNull + @Override + public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + + + if (viewType==1){ + ItemDeviceInspection1Binding binding = DataBindingUtil.inflate(inflater, R.layout.item_device_inspection_1, parent, false); + return new MyHolder1(binding); + } else { + ItemDeviceInspection2Binding binding = DataBindingUtil.inflate(inflater, R.layout.item_device_inspection_2, parent, false); + return new MyHolder2(binding); + } + + } + + @Override + public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) { + var checkResultDetal = list.get(position); + checkResultDetal.setIndex(position+1); + if (holder instanceof MyHolder1){ + MyHolder1 holder1= (MyHolder1) holder; + holder1.binding.setItem(checkResultDetal); + holder1.binding.executePendingBindings(); + }else { + MyHolder2 holder2= (MyHolder2) holder; + holder2.binding.setItem(checkResultDetal); + holder2.binding.executePendingBindings(); + } + } + + @Override + public int getItemCount() { + return list==null?0:list.size(); + } + + @Override + public int getItemViewType(int position) { + return Integer.parseInt(list.get(position).getInspectProjectProperty()); + } + + class MyHolder1 extends RecyclerView.ViewHolder { + private ItemDeviceInspection1Binding binding; + + public MyHolder1(@NonNull ItemDeviceInspection1Binding binding) { + super(binding.getRoot()); + this.binding = binding; + } + } + + class MyHolder2 extends RecyclerView.ViewHolder { + private ItemDeviceInspection2Binding binding; + + public MyHolder2(@NonNull ItemDeviceInspection2Binding binding) { + super(binding.getRoot()); + this.binding = binding; + } + } + + +} diff --git a/app/src/main/java/com/example/haiwei_mom/adapter/device/DeviceInspectiontAdapter.java b/app/src/main/java/com/example/haiwei_mom/adapter/device/DeviceInspectiontAdapter.java new file mode 100644 index 0000000..fdc2b02 --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/adapter/device/DeviceInspectiontAdapter.java @@ -0,0 +1,68 @@ +package com.example.haiwei_mom.adapter.device; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.databinding.DataBindingUtil; +import androidx.recyclerview.widget.RecyclerView; + +import com.example.haiwei_mom.BR; +import com.example.haiwei_mom.R; +import com.example.haiwei_mom.adapter.ItemClickCall; +import com.example.haiwei_mom.databinding.ItemDeviceInspectionBinding; +import com.example.haiwei_mom.data.device.DeviceInspectionDetail; + +import java.util.List; + +/** + * @author wanghao + * @date 2024/1/31 15:18 + */ +public class DeviceInspectiontAdapter extends RecyclerView.Adapter { + private List list; + private Context context; + private LayoutInflater inflater; + private ItemClickCall clickCall; + public DeviceInspectiontAdapter(Context context, ItemClickCall clickCall) { + this.context = context; + this.clickCall = clickCall; + inflater = LayoutInflater.from(context); + } + + public void setList(List list) { + this.list = list; + } + + @NonNull + @Override + public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + ItemDeviceInspectionBinding binding = DataBindingUtil.inflate(inflater, R.layout.item_device_inspection, parent, false); + return new MyViewHolder(binding); + } + + @Override + public void onBindViewHolder(@NonNull MyViewHolder holder, int position) { + var DeviceInspectionDetail = list.get(position); + var binding = holder.binding; + binding.setVariable(BR.vm,DeviceInspectionDetail); + binding.deviceInspectionClick.setOnClickListener(v -> clickCall.onClick(position)); + } + + @Override + public int getItemCount() { + return list==null?0:list.size(); + } + + class MyViewHolder extends RecyclerView.ViewHolder { + private ItemDeviceInspectionBinding binding; + + public MyViewHolder(ItemDeviceInspectionBinding binding) { + super(binding.getRoot()); + this.binding = binding; + } + + + } +} diff --git a/app/src/main/java/com/example/haiwei_mom/adapter/device/DeviceRepairListAdapter.java b/app/src/main/java/com/example/haiwei_mom/adapter/device/DeviceRepairListAdapter.java new file mode 100644 index 0000000..39a5bce --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/adapter/device/DeviceRepairListAdapter.java @@ -0,0 +1,74 @@ +package com.example.haiwei_mom.adapter.device; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.databinding.DataBindingUtil; +import androidx.recyclerview.widget.RecyclerView; + +import com.example.haiwei_mom.BR; +import com.example.haiwei_mom.R; +import com.example.haiwei_mom.databinding.ItemDeviceRepairBinding; +import com.example.haiwei_mom.data.device.DeviceRepair; + +import java.util.List; + +/** + * @author wanghao + * @date 2024/1/31 15:18 + */ +public class DeviceRepairListAdapter extends RecyclerView.Adapter { + private List list; + private Context context; + private LayoutInflater inflater; + private ItemClickCall clickCall; + public DeviceRepairListAdapter(Context context, ItemClickCall clickCall) { + this.context = context; + this.clickCall = clickCall; + inflater = LayoutInflater.from(context); + } + + public void setList(List list) { + this.list = list; + } + + @NonNull + @Override + public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + ItemDeviceRepairBinding binding = DataBindingUtil.inflate(inflater, R.layout.item_device_repair, parent, false); + return new MyViewHolder(binding); + } + + @Override + public void onBindViewHolder(@NonNull MyViewHolder holder, int position) { + var outstock = list.get(position); + + var binding = holder.binding; + binding.setVariable(BR.vm,outstock); + binding.deviceRepairModify.setOnClickListener(v -> clickCall.clickItemForModify(position)); + binding.deviceRepairSelect.setOnClickListener(v -> clickCall.clickItemForSelect(position)); + } + + @Override + public int getItemCount() { + return list==null?0:list.size(); + } + + class MyViewHolder extends RecyclerView.ViewHolder { + private ItemDeviceRepairBinding binding; + + public MyViewHolder(ItemDeviceRepairBinding binding) { + super(binding.getRoot()); + this.binding = binding; + } + + + } + + public interface ItemClickCall{ + void clickItemForModify(int index); + void clickItemForSelect(int index); + } +} diff --git a/app/src/main/java/com/example/haiwei_mom/adapter/device/DeviceRepairPartAdapter.java b/app/src/main/java/com/example/haiwei_mom/adapter/device/DeviceRepairPartAdapter.java new file mode 100644 index 0000000..c3e22ed --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/adapter/device/DeviceRepairPartAdapter.java @@ -0,0 +1,68 @@ +package com.example.haiwei_mom.adapter.device; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.databinding.DataBindingUtil; +import androidx.recyclerview.widget.RecyclerView; + +import com.example.haiwei_mom.BR; +import com.example.haiwei_mom.R; +import com.example.haiwei_mom.adapter.ItemClickCall; +import com.example.haiwei_mom.databinding.ItemRepairPartBinding; +import com.example.haiwei_mom.data.device.DeviceRepairPart; + +import java.util.List; + +/** + * @author wanghao + * @date 2024/1/31 15:18 + */ +public class DeviceRepairPartAdapter extends RecyclerView.Adapter { + private List list; + private Context context; + private LayoutInflater inflater; + private ItemClickCall clickCall; + public DeviceRepairPartAdapter(Context context, ItemClickCall clickCall) { + this.context = context; + this.clickCall = clickCall; + inflater = LayoutInflater.from(context); + } + + public void setList(List list) { + this.list = list; + } + + @NonNull + @Override + public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + ItemRepairPartBinding binding = DataBindingUtil.inflate(inflater, R.layout.item_repair_part, parent, false); + return new MyViewHolder(binding); + } + + @Override + public void onBindViewHolder(@NonNull MyViewHolder holder, int position) { + var DeviceInspectionDetail = list.get(position); + var binding = holder.binding; + binding.setVariable(BR.vm,DeviceInspectionDetail); + binding.pairDelete.setOnClickListener(v -> clickCall.onClick(position)); + } + + @Override + public int getItemCount() { + return list==null?0:list.size(); + } + + class MyViewHolder extends RecyclerView.ViewHolder { + private ItemRepairPartBinding binding; + + public MyViewHolder(ItemRepairPartBinding binding) { + super(binding.getRoot()); + this.binding = binding; + } + + + } +} diff --git a/app/src/main/java/com/example/haiwei_mom/adapter/device/LubricationAdapter.java b/app/src/main/java/com/example/haiwei_mom/adapter/device/LubricationAdapter.java new file mode 100644 index 0000000..6d9403d --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/adapter/device/LubricationAdapter.java @@ -0,0 +1,68 @@ +package com.example.haiwei_mom.adapter.device; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.databinding.DataBindingUtil; +import androidx.recyclerview.widget.RecyclerView; + +import com.example.haiwei_mom.BR; +import com.example.haiwei_mom.R; +import com.example.haiwei_mom.adapter.ItemClickCall; +import com.example.haiwei_mom.databinding.ItemDeviceLubricationBinding; +import com.example.haiwei_mom.data.device.LubricationDetail; + +import java.util.List; + +/** + * @author wanghao + * @date 2024/1/31 15:18 + */ +public class LubricationAdapter extends RecyclerView.Adapter { + private List list; + private Context context; + private LayoutInflater inflater; + private ItemClickCall clickCall; + public LubricationAdapter(Context context, ItemClickCall clickCall) { + this.context = context; + this.clickCall = clickCall; + inflater = LayoutInflater.from(context); + } + + public void setList(List list) { + this.list = list; + } + + @NonNull + @Override + public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + ItemDeviceLubricationBinding binding = DataBindingUtil.inflate(inflater, R.layout.item_device_lubrication, parent, false); + return new MyViewHolder(binding); + } + + @Override + public void onBindViewHolder(@NonNull MyViewHolder holder, int position) { + var been = list.get(position); + var binding = holder.binding; + binding.setVariable(BR.vm,been); + binding.deviceMaintainClick.setOnClickListener(v -> clickCall.onClick(position)); + } + + @Override + public int getItemCount() { + return list==null?0:list.size(); + } + + class MyViewHolder extends RecyclerView.ViewHolder { + private ItemDeviceLubricationBinding binding; + + public MyViewHolder(ItemDeviceLubricationBinding binding) { + super(binding.getRoot()); + this.binding = binding; + } + + + } +} diff --git a/app/src/main/java/com/example/haiwei_mom/adapter/device/MaintainAdapter.java b/app/src/main/java/com/example/haiwei_mom/adapter/device/MaintainAdapter.java new file mode 100644 index 0000000..0fe0d6e --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/adapter/device/MaintainAdapter.java @@ -0,0 +1,68 @@ +package com.example.haiwei_mom.adapter.device; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.databinding.DataBindingUtil; +import androidx.recyclerview.widget.RecyclerView; + +import com.example.haiwei_mom.BR; +import com.example.haiwei_mom.R; +import com.example.haiwei_mom.adapter.ItemClickCall; +import com.example.haiwei_mom.databinding.ItemDeviceMaintainBinding; +import com.example.haiwei_mom.data.device.MaintainDetail; + +import java.util.List; + +/** + * @author wanghao + * @date 2024/1/31 15:18 + */ +public class MaintainAdapter extends RecyclerView.Adapter { + private List list; + private Context context; + private LayoutInflater inflater; + private ItemClickCall clickCall; + public MaintainAdapter(Context context, ItemClickCall clickCall) { + this.context = context; + this.clickCall = clickCall; + inflater = LayoutInflater.from(context); + } + + public void setList(List list) { + this.list = list; + } + + @NonNull + @Override + public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + ItemDeviceMaintainBinding binding = DataBindingUtil.inflate(inflater, R.layout.item_device_maintain, parent, false); + return new MyViewHolder(binding); + } + + @Override + public void onBindViewHolder(@NonNull MyViewHolder holder, int position) { + MaintainDetail been = list.get(position); + var binding = holder.binding; + binding.setVariable(BR.vm,been); + binding.deviceMaintainClick.setOnClickListener(v -> clickCall.onClick(position)); + } + + @Override + public int getItemCount() { + return list==null?0:list.size(); + } + + class MyViewHolder extends RecyclerView.ViewHolder { + private ItemDeviceMaintainBinding binding; + + public MyViewHolder(ItemDeviceMaintainBinding binding) { + super(binding.getRoot()); + this.binding = binding; + } + + + } +} diff --git a/app/src/main/java/com/example/haiwei_mom/adapter/device/MaintainProjectAdapter.java b/app/src/main/java/com/example/haiwei_mom/adapter/device/MaintainProjectAdapter.java new file mode 100644 index 0000000..7cb80da --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/adapter/device/MaintainProjectAdapter.java @@ -0,0 +1,64 @@ +package com.example.haiwei_mom.adapter.device; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.databinding.DataBindingUtil; +import androidx.recyclerview.widget.RecyclerView; + +import com.example.haiwei_mom.BR; +import com.example.haiwei_mom.R; +import com.example.haiwei_mom.databinding.ItemMaintainInfoProjectBinding; +import com.example.haiwei_mom.data.device.MaintainProject; + +import java.util.List; + +/** + * @author wanghao + * @date 2024/1/31 15:18 + */ +public class MaintainProjectAdapter extends RecyclerView.Adapter { + private List list; + private Context context; + private LayoutInflater inflater; + public MaintainProjectAdapter(Context context) { + this.context = context; + inflater = LayoutInflater.from(context); + } + + public void setList(List list) { + this.list = list; + } + + @NonNull + @Override + public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + ItemMaintainInfoProjectBinding binding = DataBindingUtil.inflate(inflater, R.layout.item_maintain_info_project, parent, false); + return new MyViewHolder(binding); + } + + @Override + public void onBindViewHolder(@NonNull MyViewHolder holder, int position) { + var been = list.get(position); + var binding = holder.binding; + binding.setVariable(BR.item,been); + } + + @Override + public int getItemCount() { + return list==null?0:list.size(); + } + + class MyViewHolder extends RecyclerView.ViewHolder { + private ItemMaintainInfoProjectBinding binding; + + public MyViewHolder(ItemMaintainInfoProjectBinding binding) { + super(binding.getRoot()); + this.binding = binding; + } + + + } +} diff --git a/app/src/main/java/com/example/haiwei_mom/base/BaseActivity.java b/app/src/main/java/com/example/haiwei_mom/base/BaseActivity.java index b75b1d7..32003cc 100644 --- a/app/src/main/java/com/example/haiwei_mom/base/BaseActivity.java +++ b/app/src/main/java/com/example/haiwei_mom/base/BaseActivity.java @@ -41,7 +41,6 @@ import okhttp3.MediaType; public class BaseActivity extends AppCompatActivity implements MyScannerCall { public static final int CAMERA_PHOTO = 1; - // public static String url = "http://172.20.10.4:6080"; public static String url = "http://10.11.180.67:6080"; // public static String url = "http://1.13.177.47:6080"; public ProgressDialog dialog; diff --git a/app/src/main/java/com/example/haiwei_mom/data/check/CheckActivitieBeen.java b/app/src/main/java/com/example/haiwei_mom/data/check/CheckActivitieBeen.java new file mode 100644 index 0000000..b749299 --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/data/check/CheckActivitieBeen.java @@ -0,0 +1,71 @@ +package com.example.haiwei_mom.data.check; + +import androidx.databinding.BaseObservable; + +/** + * @author wanghao + * @date 2024/3/11 10:12 + */ +public class CheckActivitieBeen extends BaseObservable{ + + + private String createBy; + private String createTime; + private String processHandleResolution; + private int processActivityId; + private int processStepOrder; + private boolean editedAble; + + + + public boolean isEditedAble() { + return editedAble; + } + + public void setEditedAble(boolean editedAble) { + this.editedAble = editedAble; + } + + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + + } + + public String getProcessHandleResolution() { + return processHandleResolution; + } + + public void setProcessHandleResolution(String processHandleResolution) { + this.processHandleResolution = processHandleResolution; + } + + public int getProcessActivityId() { + return processActivityId; + } + + public void setProcessActivityId(int processActivityId) { + this.processActivityId = processActivityId; + } + + public int getProcessStepOrder() { + return processStepOrder; + } + + public void setProcessStepOrder(int processStepOrder) { + this.processStepOrder = processStepOrder; + } + + +} diff --git a/app/src/main/java/com/example/haiwei_mom/data/check/CheckDisposalBeen.java b/app/src/main/java/com/example/haiwei_mom/data/check/CheckDisposalBeen.java new file mode 100644 index 0000000..21915a2 --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/data/check/CheckDisposalBeen.java @@ -0,0 +1,118 @@ +package com.example.haiwei_mom.data.check; + +import java.util.List; +import java.util.Optional; + +/** + * @author wanghao + * @date 2024/3/11 10:09 + */ +public class CheckDisposalBeen { + + /** + * batchAmount : 0 + * passAmount : 0 + * failAmount : 1 + * checkMode : 1 + * checkSample : 10 + * materialCode : 111 + * materialName : 物料测试 + */ + + private int batchAmount; + private int passAmount; + private int failAmount; + private String checkMode; + private int checkSample; + private String materialCode; + private String materialName; + private List qmsCheckInstanceFiles; + private String checkRuleType; + private List qmsQualityInstanceActivities; + /** + * 1来料检验,2,半成品检验，3成品检验,4工序检验 + * + * @return + */ + public String getCheckRuleType() { + + return checkRuleType; + } + + public List getQmsQualityInstanceActivities() { + return qmsQualityInstanceActivities; + } + + public void setQmsQualityInstanceActivities(List qmsQualityInstanceActivities) { + this.qmsQualityInstanceActivities = qmsQualityInstanceActivities; + } + + public void setCheckRuleType(String checkRuleType) { + this.checkRuleType = checkRuleType; + } + + public List getQmsCheckInstanceFiles() { + return qmsCheckInstanceFiles; + } + + public void setQmsCheckInstanceFiles(List qmsCheckInstanceFiles) { + this.qmsCheckInstanceFiles = qmsCheckInstanceFiles; + } + + public int getBatchAmount() { + return batchAmount; + } + + public void setBatchAmount(int batchAmount) { + this.batchAmount = batchAmount; + } + + public int getPassAmount() { + return passAmount; + } + + public void setPassAmount(int passAmount) { + this.passAmount = passAmount; + } + + public int getFailAmount() { + return failAmount; + } + + public void setFailAmount(int failAmount) { + this.failAmount = failAmount; + } + + public String getCheckMode() { + return Optional.ofNullable(checkMode).map(t->t.equals("1") ? "全检" : "抽检").orElse(null); + + } + + public void setCheckMode(String checkMode) { + this.checkMode = checkMode; + } + + public int getCheckSample() { + return checkSample; + } + + public void setCheckSample(int checkSample) { + this.checkSample = checkSample; + } + + public String getMaterialCode() { + return materialCode; + } + + public void setMaterialCode(String materialCode) { + this.materialCode = materialCode; + } + + public String getMaterialName() { + return materialName; + } + + public void setMaterialName(String materialName) { + this.materialName = materialName; + } +} diff --git a/app/src/main/java/com/example/haiwei_mom/data/check/CheckInstanceFiles.java b/app/src/main/java/com/example/haiwei_mom/data/check/CheckInstanceFiles.java new file mode 100644 index 0000000..9aed548 --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/data/check/CheckInstanceFiles.java @@ -0,0 +1,37 @@ +package com.example.haiwei_mom.data.check; + +import androidx.databinding.BaseObservable; + +/** + * @author wanghao + * 图片用 + * @date 2024/3/11 10:00 + */ +public class CheckInstanceFiles extends BaseObservable { + private String faultFile; + private boolean state=false; + + public boolean isState() { + return state; + } + + public void setState(boolean state) { + this.state = state; + + } + + public String getFaultFile() { + return faultFile; + } + + public void setFaultFile(String faultFile) { + this.faultFile = faultFile; + } + + @Override + public String toString() { + return "CheckInstanceFiles{" + + "faultFile='" + faultFile + '\'' + + '}'; + } +} diff --git a/app/src/main/java/com/example/haiwei_mom/data/check/CheckResult.java b/app/src/main/java/com/example/haiwei_mom/data/check/CheckResult.java new file mode 100644 index 0000000..edc8104 --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/data/check/CheckResult.java @@ -0,0 +1,260 @@ +package com.example.haiwei_mom.data.check; + +import androidx.databinding.BaseObservable; + +import java.util.List; + +/** + * @author wanghao + * @date 2024/3/1 8:56 + */ +public class CheckResult extends BaseObservable { + + /** + * createBy : + * createTime : 2024-02-27 15:05:30 + * updateBy : + * updateTime : 2024-02-27 15:06:49 + * remark : null + * checkResultDetailId : 17 + * checkResultId : 2 + * materialBarcode : 12 + * materialId : 2 + * checkRuleId : 1 + * checkRuleType : 3 + * checkRuleName : 规则1 + * checkMode : 2 + * checkSample : 1.0 + * checkStatus : 3 + * materialCode : null + * materialName : null + * poNo : null + * saleorderCode : null + */ + + private int checkResultDetailId; + private int checkResultId; + private String materialBarcode; + private int materialId; + private int checkRuleId; + private String checkRuleType; + private String checkRuleName; + private String checkMode; + private double checkSample; + private String checkStatus; + private String materialCode; + private String materialName; + private String poNo; + private String saleorderCode; + private String materialType; + + + private boolean visbleStatus=true; + + public boolean isVisbleStatus() { + return visbleStatus; + } + + public void setVisbleStatus(boolean visbleStatus) { + this.visbleStatus = visbleStatus; + notifyChange(); + } + + public String getMaterialType() { + + switch (materialType){ + case "1" : return "原材料"; + case "2" : return "半成品"; + case "3" : return "成品"; + } + + + return null; + } + + public void setMaterialType(String materialType) { + this.materialType = materialType; + } + + private List qmsCheckResultDetailProjectList; + private List qmsCheckRuleProjectList; + + public List getQmsCheckRuleProjectList() { + return qmsCheckRuleProjectList; + } + + public void setQmsCheckRuleProjectList(List qmsCheckRuleProjectList) { + this.qmsCheckRuleProjectList = qmsCheckRuleProjectList; + } + + /** + * 批次号 + */ + private String materialBatch; + + public String getMaterialBatch() { + return materialBatch; + } + + public void setMaterialBatch(String materialBatch) { + this.materialBatch = materialBatch; + } + + public int getCheckResultDetailId() { + return checkResultDetailId; + } + + + + public void setCheckResultDetailId(int checkResultDetailId) { + this.checkResultDetailId = checkResultDetailId; + } + + public int getCheckResultId() { + return checkResultId; + } + + public void setCheckResultId(int checkResultId) { + this.checkResultId = checkResultId; + } + + public String getMaterialBarcode() { + return materialBarcode; + } + + public void setMaterialBarcode(String materialBarcode) { + this.materialBarcode = materialBarcode; + } + + public int getMaterialId() { + return materialId; + } + + public void setMaterialId(int materialId) { + this.materialId = materialId; + } + + public int getCheckRuleId() { + return checkRuleId; + } + + public void setCheckRuleId(int checkRuleId) { + this.checkRuleId = checkRuleId; + } + + /** + * 1来料检验,2,半成品检验，3成品检验,4工序检验 + * @return + */ + public String getCheckRuleType() { + switch (checkRuleType){ + case "1" : return "来料检验"; + case "2" : return "半成品检验"; + case "3" : return "成品检验"; + case "4" : return "工序检验"; + } + return checkRuleType; + } + public String getCheckRuleTypeVel() { + return checkRuleType; + } + + public void setCheckRuleType(String checkRuleType) { + this.checkRuleType = checkRuleType; + } + + public String getCheckRuleName() { + return checkRuleName; + } + + public void setCheckRuleName(String checkRuleName) { + this.checkRuleName = checkRuleName; + } + + public String getCheckMode() { + + return checkMode.equals("1") ? "全检" : "抽检"; + } + public String getCheckModeText() { + + return checkMode; + } + + public void setCheckMode(String checkMode) { + this.checkMode = checkMode; + } + + public double getCheckSample() { + return checkSample; + } + + public void setCheckSample(double checkSample) { + this.checkSample = checkSample; + } + + public String getCheckStatus() { + if (checkStatus==null) return ""; + switch (checkStatus) { + case "0": + setCheckStatus("待检验"); + break; + case "1": + setCheckStatus("检验中"); + break; + case "2": + setCheckStatus("质检通过"); + break; + case "3": + setCheckStatus("质检不通过"); + break; + + } + + return checkStatus; + } + + public void setCheckStatus(String checkStatus) { + this.checkStatus = checkStatus; + notifyChange(); + } + + public String getMaterialCode() { + return materialCode; + } + + public void setMaterialCode(String materialCode) { + this.materialCode = materialCode; + } + + public String getMaterialName() { + return materialName; + } + + public void setMaterialName(String materialName) { + this.materialName = materialName; + } + + public String getPoNo() { + return poNo; + } + + public void setPoNo(String poNo) { + this.poNo = poNo; + } + + public String getSaleorderCode() { + return saleorderCode; + } + + public void setSaleorderCode(String saleorderCode) { + this.saleorderCode = saleorderCode; + } + + public List getQmsCheckResultDetailProjectList() { + return qmsCheckResultDetailProjectList; + } + + public void setQmsCheckResultDetailProjectList(List qmsCheckResultDetailProjectList) { + this.qmsCheckResultDetailProjectList = qmsCheckResultDetailProjectList; + } +} diff --git a/app/src/main/java/com/example/haiwei_mom/data/check/CheckResultDetailVo.java b/app/src/main/java/com/example/haiwei_mom/data/check/CheckResultDetailVo.java new file mode 100644 index 0000000..235aa9c --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/data/check/CheckResultDetailVo.java @@ -0,0 +1,59 @@ +package com.example.haiwei_mom.data.check; + + +import java.util.Optional; + +public class CheckResultDetailVo { + + /** + * 批次数量 + */ + private int batchAmount; + private int passAmount; + private int failAmount; + private int checkSample; + private String checkMode; + + public String getCheckMode() { + return Optional.ofNullable(checkMode).map(t->t.equals("1") ? "全检" : "抽检").orElse(null); + + } + + public void setCheckMode(String checkMode) { + this.checkMode = checkMode; + } + + public int getBatchAmount() { + return batchAmount; + } + + public void setBatchAmount(int batchAmount) { + this.batchAmount = batchAmount; + } + + public int getPassAmount() { + return passAmount; + } + + public void setPassAmount(int passAmount) { + this.passAmount = passAmount; + } + + public int getFailAmount() { + return failAmount; + } + + public void setFailAmount(int failAmount) { + this.failAmount = failAmount; + } + + + + public int getCheckSample() { + return checkSample; + } + + public void setCheckSample(int checkSample) { + this.checkSample = checkSample; + } +} diff --git a/app/src/main/java/com/example/haiwei_mom/data/check/CheckResultDetal.java b/app/src/main/java/com/example/haiwei_mom/data/check/CheckResultDetal.java new file mode 100644 index 0000000..e9ca953 --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/data/check/CheckResultDetal.java @@ -0,0 +1,261 @@ +package com.example.haiwei_mom.data.check; + +import android.text.Editable; +import android.util.Log; + +import androidx.databinding.BaseObservable; + +/** + * @author wanghao + * @date 2024/3/1 9:27 + */ +public class CheckResultDetal extends BaseObservable { + + private int index; + + /** + * 质检结果详情项目信息ID + */ + private Long resultDetailProjectId; + /** + * 质检结果详情ID，关联qms_check_result_detail的check_result_detail_id + */ + private Long checkResultDetailId; + /** + * 检验项目ID，关联qms_check_project的check_project_id + */ + private Long checkProjectId; + /** + * 检验结果(1合格,0不合格);定性需选择，定量的话根据检验结果的具体值自动选择 + */ + private String checkProjectStatus; + /** + * 检验结果,具体值 + */ + private String checkProjectResult; + /** + * 检验项目顺序 + */ + private Long projectStepOrder; + /** + * 标准值 + */ + private double standardValue; + /** + * 检验项目名称（冗余字段） + */ + private String checkProjectName; + /** + * 检验项目属性(1定性,2定量),冗余字段 + */ + private String checkProjectProperty; + /** + * 上差值，检验时从检验项目复制过来的值 + */ + private double upperDiff; + /** + * 下差值，检验时从检验项目复制过来的值 + */ + private double downDiff; + + private String checkStatusShow; + + + private String checkStatus; + /** 创建者 */ + private String createBy; + + /** 创建时间 */ + private String createTime; + + private String materialCode; + private String materialBarcode; + + public String getMaterialBarcode() { + return materialBarcode; + } + + public void setMaterialBarcode(String materialBarcode) { + this.materialBarcode = materialBarcode; + } + + public String getMaterialCode() { + return materialCode; + } + + public void setMaterialCode(String materialCode) { + this.materialCode = materialCode; + } + + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCheckStatus() { + switch (checkStatus) { + case "0": + setCheckStatus("待检验"); + break; + case "1": + setCheckStatus("检验中"); + break; + case "2": + setCheckStatus("质检通过"); + break; + case "3": + setCheckStatus("质检不通过"); + break; + + } + return checkStatus; + } + + public void setCheckStatus(String checkStatus) { + this.checkStatus = checkStatus; + } + + public int getIndex() { + return index; + } + + public void setIndex(int index) { + this.index = index; + } + + public Long getResultDetailProjectId() { + return resultDetailProjectId; + } + + public void setResultDetailProjectId(Long resultDetailProjectId) { + this.resultDetailProjectId = resultDetailProjectId; + } + + public Long getCheckResultDetailId() { + return checkResultDetailId; + } + + public void setCheckResultDetailId(Long checkResultDetailId) { + this.checkResultDetailId = checkResultDetailId; + } + + public Long getCheckProjectId() { + return checkProjectId; + } + + public void setCheckProjectId(Long checkProjectId) { + this.checkProjectId = checkProjectId; + } + + public String getCheckProjectStatus() { + return checkProjectStatus; + } + + public void setCheckProjectStatus(String checkProjectStatus) { + this.checkProjectStatus = checkProjectStatus; + } + + public String getCheckProjectResult() { + return checkProjectResult; + } + + public void setCheckProjectResult(String checkProjectResult) { + this.checkProjectResult = checkProjectResult; + } + + public Long getProjectStepOrder() { + return projectStepOrder; + } + + public void setProjectStepOrder(Long projectStepOrder) { + this.projectStepOrder = projectStepOrder; + } + + public double getStandardValue() { + return standardValue; + } + + public void setStandardValue(double standardValue) { + this.standardValue = standardValue; + } + + public String getCheckProjectName() { + return checkProjectName; + } + + public void setCheckProjectName(String checkProjectName) { + this.checkProjectName = checkProjectName; + } + + public String getCheckProjectProperty() { + return checkProjectProperty; + } + + public void setCheckProjectProperty(String checkProjectProperty) { + this.checkProjectProperty = checkProjectProperty; + } + + public double getUpperDiff() { + return upperDiff; + } + + public void setUpperDiff(double upperDiff) { + this.upperDiff = upperDiff; + } + + public double getDownDiff() { + return downDiff; + } + + public void setDownDiff(double downDiff) { + this.downDiff = downDiff; + } + + public String getCheckStatusShow() { + if (checkProjectStatus==null||checkProjectStatus.isEmpty()){ + setCheckStatusShow(""); + // setCheckStatusShow("未检验"); + }else if (checkProjectStatus.equals("1")){ + setCheckStatusShow("合格"); + } else if (checkProjectStatus.equals("0")) { + setCheckStatusShow("不合格"); + } + + return checkStatusShow; + } + + public void setCheckStatusShow(String checkStatusShow) { + this.checkStatusShow = checkStatusShow; + notifyChange(); + } + + public void click(String status){ + Log.e("TAG", "click:" + status); + setCheckProjectStatus(status); + // if (status.equals("1")){ + // setCheckStatusShow("合格"); + // } else if (checkProjectStatus.equals("0")) { + // setCheckStatusShow("不合格"); + // } + } + public void textChanged(Editable s){ + double result=Double.parseDouble(s.toString()); + checkProjectResult=result+""; + if (result>=downDiff && result<= upperDiff){ + setCheckProjectStatus("1"); + }else { + setCheckProjectStatus("0"); + } + } +} diff --git a/app/src/main/java/com/example/haiwei_mom/data/device/BxSubmitBeen.java b/app/src/main/java/com/example/haiwei_mom/data/device/BxSubmitBeen.java new file mode 100644 index 0000000..ac2731e --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/data/device/BxSubmitBeen.java @@ -0,0 +1,145 @@ +package com.example.haiwei_mom.data.device; + +import android.view.View; +import android.widget.AdapterView; + +import androidx.databinding.BaseObservable; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author wanghao + * @date 2024/4/1 9:41 + */ +public class BxSubmitBeen extends BaseObservable { + + private int deviceld; + private String faultType; + private String faultDescription; + private String designOperations; + private int repairType; + private int outsrcld; + // + private String deviceCode; + private List faultTypeS; + private List faultTypeList; + private boolean outsrcVis; + private List outsourcingList; + private List outsourcingStringList; + private String selectName; + + public List getOutsourcingStringList() { + return outsourcingStringList; + } + + public void setOutsourcingList(List outsourcingList) { + this.outsourcingList = outsourcingList; + outsourcingStringList=new ArrayList<>(outsourcingList.size()); + outsourcingList.forEach(t->outsourcingStringList.add(t.getOutsrcName())); + notifyChange(); + } + + public void setFaultTypeList(List faultTypeList) { + this.faultTypeList = faultTypeList; + faultTypeS = new ArrayList<>(); + faultTypeList.forEach(t -> faultTypeS.add(t.getDictLabel())); + notifyChange(); + } + + public void repairTypeSelect(int type) { + repairType = type; + outsrcVis = (type == 2); + notifyChange(); + + } + public void setOutsrcld(AdapterView parent, View view, int position, long id ) { + this.outsrcld = outsourcingList.get(position).getOutsrcId(); + } + public boolean isOutsrcVis() { + return outsrcVis; + } + + public List getFaultTypeS() { + return faultTypeS; + } + + public void setFaultTypeS(List faultTypeS) { + this.faultTypeS = faultTypeS; + } + + public List getFaultTypeList() { + return faultTypeList; + } + + public void setOutsrcVis(boolean outsrcVis) { + this.outsrcVis = outsrcVis; + } + + public int getDeviceld() { + return deviceld; + } + + public void setDeviceld(int deviceld) { + this.deviceld = deviceld; + } + + public String getFaultType() { + return faultType; + } + + public void setFaultType(String faultType) { + this.faultType = faultType; + } + + public String getFaultDescription() { + return faultDescription; + } + + public void setFaultDescription(String faultDescription) { + this.faultDescription = faultDescription; + } + + public void selectFaultDescription(AdapterView parent, View view, int position, long id) { + this.faultType = faultTypeList.get(position).getDictValue(); + } + + public String getDesignOperations() { + return designOperations; + } + + public void setDesignOperations(String designOperations) { + this.designOperations = designOperations; + notifyChange(); + } + + public int getRepairType() { + return repairType; + } + + public void setRepairType(int repairType) { + this.repairType = repairType; + } + + public int getOutsrcld() { + return outsrcld; + } + + + + public String getDeviceCode() { + return deviceCode; + } + + public void setDeviceCode(String deviceCode) { + this.deviceCode = deviceCode; + } + + public String getSelectName() { + return selectName; + } + + public void setSelectName(String selectName) { + this.selectName = selectName; + } +} diff --git a/app/src/main/java/com/example/haiwei_mom/data/device/DeviceBeen.java b/app/src/main/java/com/example/haiwei_mom/data/device/DeviceBeen.java new file mode 100644 index 0000000..096799a --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/data/device/DeviceBeen.java @@ -0,0 +1,73 @@ +package com.example.haiwei_mom.data.device; + +/** + * @author wanghao + * @date 2024/4/1 10:00 + */ +public class DeviceBeen { + + + private int deviceId; + private String deviceCode; + private String deviceName; + private String deviceLocation; + private Long deviceTypeId; + private String deviceSpec; + private int deviceStatus; + + public int getDeviceId() { + return deviceId; + } + + public void setDeviceId(int deviceId) { + this.deviceId = deviceId; + } + + public String getDeviceCode() { + return deviceCode; + } + + public void setDeviceCode(String deviceCode) { + this.deviceCode = deviceCode; + } + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public String getDeviceLocation() { + return deviceLocation; + } + + public void setDeviceLocation(String deviceLocation) { + this.deviceLocation = deviceLocation; + } + + public Long getDeviceTypeId() { + return deviceTypeId; + } + + public void setDeviceTypeId(Long deviceTypeId) { + this.deviceTypeId = deviceTypeId; + } + + public String getDeviceSpec() { + return deviceSpec; + } + + public void setDeviceSpec(String deviceSpec) { + this.deviceSpec = deviceSpec; + } + + public int getDeviceStatus() { + return deviceStatus; + } + + public void setDeviceStatus(int deviceStatus) { + this.deviceStatus = deviceStatus; + } +} diff --git a/app/src/main/java/com/example/haiwei_mom/data/device/DeviceInspection.java b/app/src/main/java/com/example/haiwei_mom/data/device/DeviceInspection.java new file mode 100644 index 0000000..568ebf5 --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/data/device/DeviceInspection.java @@ -0,0 +1,104 @@ +package com.example.haiwei_mom.data.device; + +import androidx.databinding.BaseObservable; + +import java.util.List; + +/** + * @author wanghao + * @date 2024/3/20 16:32 + */ +public class DeviceInspection extends BaseObservable { + + /** + * inspectInstanceId : 7 + * billsInspectCode : 123 + * createTime : 2024-02-19 17:35:43 + * inspectType : 1 + * inspectStatus : 1 + * routeName : 测试线路1 + */ + + private int inspectInstanceId; + private String billsInspectCode; + private String createTime; + private String inspectType; + private String inspectStatus; + private String inspectStatusName; + private String routeName; + private List dmsInspectInstanceDetailList; + + + public String getInspectStatusName() { + switch (inspectStatus) { + case "1": + inspectStatusName = "待巡检"; + break; + case "2": + inspectStatusName = "巡检中"; + break; + case "3": + inspectStatusName = "已完成"; + break; + + } + return inspectStatusName; + } + + + public int getInspectInstanceId() { + return inspectInstanceId; + } + + public void setInspectInstanceId(int inspectInstanceId) { + this.inspectInstanceId = inspectInstanceId; + } + + public String getBillsInspectCode() { + return billsInspectCode; + } + + public void setBillsInspectCode(String billsInspectCode) { + this.billsInspectCode = billsInspectCode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getInspectType() { + return inspectType; + } + + public void setInspectType(String inspectType) { + this.inspectType = inspectType; + } + + public String getInspectStatus() { + return inspectStatus; + } + + public void setInspectStatus(String inspectStatus) { + this.inspectStatus = inspectStatus; + } + + public String getRouteName() { + return routeName; + } + + public void setRouteName(String routeName) { + this.routeName = routeName; + } + + public List getDmsInspectInstanceDetailList() { + return dmsInspectInstanceDetailList; + } + + public void setDmsInspectInstanceDetailList(List dmsInspectInstanceDetailList) { + this.dmsInspectInstanceDetailList = dmsInspectInstanceDetailList; + } +} diff --git a/app/src/main/java/com/example/haiwei_mom/data/device/DeviceInspectionDetail.java b/app/src/main/java/com/example/haiwei_mom/data/device/DeviceInspectionDetail.java new file mode 100644 index 0000000..d17fd2f --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/data/device/DeviceInspectionDetail.java @@ -0,0 +1,122 @@ +package com.example.haiwei_mom.data.device; + +import java.util.List; + +/** + * @author wanghao + * @date 2024/3/20 16:33 + */ +public class DeviceInspectionDetail { + + + private int instanceDetailId; + private int inspectInstanceId; + private int deviceId; + /** + * 点巡检状态：1-待巡检；2-巡检中；3-已完成 + */ + private String instanceDetailStatus; + private String instanceDetailStatusName; + /** + * 巡检描述 + */ + private String inspectDesc; + /** + * 设备状态 1正常 0异常 + */ + private String inspectStatus; + private String deviceCode; + private String deviceName; + + private List dmsInspectInstanceDetailProjectList; + + public String getInstanceDetailStatusName() { + switch (instanceDetailStatus) { + case "1": + instanceDetailStatusName = "待巡检"; + break; + case "2": + instanceDetailStatusName = "巡检中"; + break; + case "3": + instanceDetailStatusName = "已完成"; + break; + + } + return instanceDetailStatusName; + } + + public List getDmsInspectInstanceDetailProjectList() { + return dmsInspectInstanceDetailProjectList; + } + + public void setDmsInspectInstanceDetailProjectList(List dmsInspectInstanceDetailProjectList) { + this.dmsInspectInstanceDetailProjectList = dmsInspectInstanceDetailProjectList; + } + + public int getInstanceDetailId() { + return instanceDetailId; + } + + public void setInstanceDetailId(int instanceDetailId) { + this.instanceDetailId = instanceDetailId; + } + + public int getInspectInstanceId() { + return inspectInstanceId; + } + + public void setInspectInstanceId(int inspectInstanceId) { + this.inspectInstanceId = inspectInstanceId; + } + + public int getDeviceId() { + return deviceId; + } + + public void setDeviceId(int deviceId) { + this.deviceId = deviceId; + } + + public String getInstanceDetailStatus() { + return instanceDetailStatus; + } + + public void setInstanceDetailStatus(String instanceDetailStatus) { + this.instanceDetailStatus = instanceDetailStatus; + } + + + + public String getInspectDesc() { + return inspectDesc; + } + + public void setInspectDesc(String inspectDesc) { + this.inspectDesc = inspectDesc; + } + + public String getInspectStatus() { + return inspectStatus; + } + + public void setInspectStatus(String inspectStatus) { + this.inspectStatus = inspectStatus; + } + + public String getDeviceCode() { + return deviceCode; + } + + public void setDeviceCode(String deviceCode) { + this.deviceCode = deviceCode; + } + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } +} diff --git a/app/src/main/java/com/example/haiwei_mom/data/device/DeviceInspectionItem.java b/app/src/main/java/com/example/haiwei_mom/data/device/DeviceInspectionItem.java new file mode 100644 index 0000000..74e30ca --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/data/device/DeviceInspectionItem.java @@ -0,0 +1,145 @@ +package com.example.haiwei_mom.data.device; + +import androidx.databinding.BaseObservable; + +/** + * @author wanghao + * @date 2024/3/21 16:03 + */ +public class DeviceInspectionItem extends BaseObservable { + + /** + * instanceDetailProjectId : null + * defValue : 10 + * upLimit : 12 + * lowLimit : 9 + * inspectProjectProperty : 2 + * inspectProjectResult : 11 + * inspectProjectStatus : + * inspectProjectDesc : 测试121 + */ + private int index; + private Long instanceDetailProjectId; + private double defValue; + private double upLimit; + private double lowLimit; + private String inspectProjectProperty; + private String inspectProjectName; + /** + * 值 + */ + private String inspectProjectResult; + /** + * 巡检结果 ，0 异常 1 正常 + */ + private String inspectProjectStatus; + private String statusName; + /** + * 描述 + */ + private String inspectProjectDesc; + + public String getStatusName() { + if (inspectProjectStatus==null) return ""; + else if (inspectProjectStatus.equals("0")) + return "异常"; + else if (inspectProjectStatus.equals("1")) return "正常"; + return ""; + } + + public int getIndex() { + return index; + } + + public void setIndex(int index) { + this.index = index; + } + + public Long getInstanceDetailProjectId() { + return instanceDetailProjectId; + } + + public void setInstanceDetailProjectId(Long instanceDetailProjectId) { + this.instanceDetailProjectId = instanceDetailProjectId; + } + + public String getInspectProjectName() { + return inspectProjectName; + } + + public void setInspectProjectName(String inspectProjectName) { + this.inspectProjectName = inspectProjectName; + } + + public double getDefValue() { + return defValue; + } + + public void setDefValue(double defValue) { + this.defValue = defValue; + } + + public double getUpLimit() { + return upLimit; + } + + public void setUpLimit(double upLimit) { + this.upLimit = upLimit; + } + + public double getLowLimit() { + return lowLimit; + } + + public void setLowLimit(double lowLimit) { + this.lowLimit = lowLimit; + } + + public String getInspectProjectProperty() { + return inspectProjectProperty; + } + + public void setInspectProjectProperty(String inspectProjectProperty) { + this.inspectProjectProperty = inspectProjectProperty; + } + + public String getInspectProjectResult() { + return inspectProjectResult; + } + + public void setInspectProjectResult(String inspectProjectResult) { + this.inspectProjectResult = inspectProjectResult; + } + + public String getInspectProjectStatus() { + return inspectProjectStatus; + } + + public void setInspectProjectStatus(String inspectProjectStatus) { + this.inspectProjectStatus = inspectProjectStatus; + } + + public String getInspectProjectDesc() { + return inspectProjectDesc; + } + + public void setInspectProjectDesc(String inspectProjectDesc) { + this.inspectProjectDesc = inspectProjectDesc; + } + + @Override + public String toString() { + return "DeviceInspectionItem{" + + "index=" + index + + ", instanceDetailProjectId=" + instanceDetailProjectId + + ", defValue=" + defValue + + ", upLimit=" + upLimit + + ", lowLimit=" + lowLimit + + ", inspectProjectProperty='" + inspectProjectProperty + '\'' + + ", inspectProjectName='" + inspectProjectName + '\'' + + ", inspectProjectResult='" + inspectProjectResult + '\'' + + ", inspectProjectStatus='" + inspectProjectStatus + '\'' + + ", inspectProjectDesc='" + inspectProjectDesc + '\'' + + '}'; + } +} diff --git a/app/src/main/java/com/example/haiwei_mom/data/device/DeviceRepair.java b/app/src/main/java/com/example/haiwei_mom/data/device/DeviceRepair.java new file mode 100644 index 0000000..e948817 --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/data/device/DeviceRepair.java @@ -0,0 +1,508 @@ +package com.example.haiwei_mom.data.device; + +import android.util.Log; +import android.view.View; +import android.widget.AdapterView; + +import androidx.databinding.BaseObservable; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author wanghao + * @date 2024/3/22 14:46 + */ +public class DeviceRepair extends BaseObservable { + + /** + * repairInstanceId : 17 + * faultSourceType : 1 + * faultSourceId : 15 + * wfProcessId : 102 + * billsFaultCode : 202402281121 + * billsStatus : 2 + * applyUser : null + * applyTime : 2024-02-28 + * realBeginTime : 2024-02-28 + * realEndTime : 2024-02-28 + * requireEndTime : 2024-02-29 + * instanceType : null + * deviceCode : 22601 + * deviceName : 设备一号 + * deviceLocation : 一楼 + * deviceSpec : 111 + */ + + private Long repairInstanceId; + + private Long faultSourceId; + private Long wfProcessId; + private String billsFaultCode; + /** + * 工单状态：0-待维修，1-维修中，2-维修完成 + */ + private String billsStatus; + private String applyUser; + private String applyTime; + private String deviceCode; + private String deviceName; + // + private String deviceLocation; + private String deviceSpec; + private String realBeginTime; + private String realEndTime; + private String requireEndTime; + private String instanceType; + // 显示数据 + + private String billsStatusName; + private boolean selectStatus; + /** + * isFlag : 1 + * instanceActivityId : null + * faultType : 2 + * faultDescription : 故障测试修改 + * designOperations : 关火,断电 + */ + + private String isFlag; + private String faultType; + private String faultDescription; + private String designOperations; + + // 图片 + private List dmsInstanceFiles; + + // 提交 + private Long instanceActivityId; + + + private int repairType; + + // 故障类别 + private String faultSourceType; + private String faultSourceTypeName; + + // 外协单位 + private List outsourcingList; + private List outsourcingNameList; + private int outsrcId; + private int outsrcIdIndex; + private String outsrcName; + + // 新增 待审批字段，1是待审批，2成功，3失败，不是2的情况下才可以修改，只有2的时候才可以开始 + private String approveStatus; + public List getOutsourcingNameList() { + return outsourcingNameList; + } + + public String getApproveStatus() { + return approveStatus; + } + + public void setApproveStatus(String approveStatus) { + this.approveStatus = approveStatus; + } + + public void setOutsourcingNameList(List outsourcingNameList) { + this.outsourcingNameList = outsourcingNameList; + notifyChange(); + } + + public List getOutsourcingList() { + return outsourcingList; + } + + private String checkedFault;// 检查后的故障判断 + + + public void setOutsourcingList(List outsourcingList) { + this.outsourcingList = outsourcingList; + outsourcingNameList = new ArrayList<>(outsourcingList.size()); + for (int i = 0; i < outsourcingList.size(); i++) { + Outsourcing outsourcing = outsourcingList.get(i); + outsourcingNameList.add(outsourcing.getOutsrcName()); + if (outsourcing.getOutsrcId() == outsrcId) { + // this.outsrcName=t.getOutsrcName(); + this.outsrcIdIndex = i; + Log.e("TAG", "setOutsourcingList:" + i); + } + } + /* (t->{ + ; + + });*/ + notifyChange(); + } + + public int getOutsrcIdIndex() { + + return outsrcIdIndex; + } + + public void selectOutSourcingID(AdapterView parent, View view, int position, long id) { + this.outsrcId = outsourcingList.get(position).getOutsrcId(); + this.outsrcIdIndex = position; + } + + public String getOutsrcName() { + return outsrcName; + } + + public void setOutsrcName(String outsrcName) { + this.outsrcName = outsrcName; + } + + public String getFaultSourceTypeName() { + return faultSourceTypeName; + } + + public void setFaultSourceTypeName(String faultSourceTypeName) { + this.faultSourceTypeName = faultSourceTypeName; + notifyChange(); + } + + public int getRepairType() { + + return repairType; + } + + public String getCheckedFault() { + return checkedFault; + } + + public void setCheckedFault(String checkedFault) { + this.checkedFault = checkedFault; + } + + public void setOutsrcIdIndex(int outsrcIdIndex) { + this.outsrcIdIndex = outsrcIdIndex; + notifyChange(); + } + + public void setRepairType(int repairType) { + this.repairType = repairType; + } + + private boolean radioState1; + private boolean radioState2; + + public void repairTypeSelect(int type) { + repairType = type; + // radioState = (type == 2); + if (type == 1) { + + setRadioState1(true); + setRadioState2(false); + } else { + setRadioState1(false); + setRadioState2(true); + } + + // notifyChange(); + + } + + public boolean isRadioState1() { + return radioState1; + } + + public void setRadioState1(boolean radioState1) { + this.radioState1 = radioState1; + notifyChange(); + } + + public boolean isRadioState2() { + return radioState2; + } + + public void setRadioState2(boolean radioState2) { + this.radioState2 = radioState2; + notifyChange(); + } + + public Long getInstanceActivityId() { + return instanceActivityId; + } + + public void setInstanceActivityId(Long instanceActivityId) { + this.instanceActivityId = instanceActivityId; + } + + public int getOutsrcId() { + return outsrcId; + } + + public void setOutsrcId(int outsrcId) { + this.outsrcId = outsrcId; + } + + public List getDmsInstanceFiles() { + return dmsInstanceFiles; + } + + public void setDmsInstanceFiles(List dmsInstanceFiles) { + this.dmsInstanceFiles = dmsInstanceFiles; + } + + public String getBillsStatusName() { + switch (billsStatus) { + case "0": + return "待维修"; + case "1": + return "维修中"; + case "2": + return "维修完成"; + } + + return billsStatusName; + } + + public boolean isSelectStatus() { + try { + // Log.e("TAG", billsFaultCode+"-" + billsStatus+"-"+approveStatus); + if (billsStatus.equals("0")&& !approveStatus.equals("2")) { + selectStatus = true; + } else { + selectStatus = false; + } + + }catch (NullPointerException e){ + // e.printStackTrace(); + Log.e("TAG", "状态字段为null，单号:" +billsFaultCode ); + return false; + } + return selectStatus; + } + + public Long getRepairInstanceId() { + return repairInstanceId; + } + + public void setRepairInstanceId(Long repairInstanceId) { + this.repairInstanceId = repairInstanceId; + } + + public String getFaultSourceType() { + return faultSourceType; + } + + public void setFaultSourceType(String faultSourceType) { + this.faultSourceType = faultSourceType; + + } + + public Long getFaultSourceId() { + return faultSourceId; + } + + public void setFaultSourceId(Long faultSourceId) { + this.faultSourceId = faultSourceId; + } + + public Long getWfProcessId() { + return wfProcessId; + } + + public void setWfProcessId(Long wfProcessId) { + this.wfProcessId = wfProcessId; + } + + public String getBillsFaultCode() { + return billsFaultCode; + } + + public void setBillsFaultCode(String billsFaultCode) { + this.billsFaultCode = billsFaultCode; + } + + public String getBillsStatus() { + return billsStatus; + } + + public void setBillsStatus(String billsStatus) { + this.billsStatus = billsStatus; + } + + public String getApplyUser() { + return applyUser; + } + + public void setApplyUser(String applyUser) { + this.applyUser = applyUser; + } + + public String getApplyTime() { + return applyTime; + } + + public void setApplyTime(String applyTime) { + this.applyTime = applyTime; + } + + public String getRealBeginTime() { + return realBeginTime; + } + + public void setRealBeginTime(String realBeginTime) { + this.realBeginTime = realBeginTime; + } + + public String getRealEndTime() { + return realEndTime; + } + + public void setRealEndTime(String realEndTime) { + this.realEndTime = realEndTime; + } + + public String getRequireEndTime() { + return requireEndTime; + } + + public void setRequireEndTime(String requireEndTime) { + this.requireEndTime = requireEndTime; + } + + public String getInstanceType() { + return instanceType; + } + + public void setInstanceType(String instanceType) { + this.instanceType = instanceType; + } + + public String getDeviceCode() { + return deviceCode; + } + + public void setDeviceCode(String deviceCode) { + this.deviceCode = deviceCode; + } + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public String getDeviceLocation() { + return deviceLocation; + } + + public void setDeviceLocation(String deviceLocation) { + this.deviceLocation = deviceLocation; + } + + public String getDeviceSpec() { + return deviceSpec; + } + + public void setDeviceSpec(String deviceSpec) { + this.deviceSpec = deviceSpec; + } + + public String getIsFlag() { + return isFlag; + } + + public void setIsFlag(String isFlag) { + this.isFlag = isFlag; + } + + public String getFaultType() { + return faultType; + } + + public void setFaultType(String faultType) { + this.faultType = faultType; + } + + public String getFaultDescription() { + return faultDescription; + } + + public void setFaultDescription(String faultDescription) { + this.faultDescription = faultDescription; + } + + public String getDesignOperations() { + return designOperations; + } + + public void setDesignOperations(String designOperations) { + this.designOperations = designOperations; + notifyChange(); + } + + private String processHandleResolution;// 维修描述 + + public String getProcessHandleResolution() { + return processHandleResolution; + } + + public void setProcessHandleResolution(String processHandleResolution) { + this.processHandleResolution = processHandleResolution; + } + + /** + * 11-19新增字段 + * 点击开始保养后才可以输入提交 + */ + + private String repairContent; // 维修内容 + private String protectedMethod;// 保护措施 + private List parts;// 所用零部件 + private List dmsInstanceFiles1;//维修完成的图片 + + public List getDmsInstanceFiles1() { + return dmsInstanceFiles1; + } + + public void setDmsInstanceFiles1(List dmsInstanceFiles1) { + this.dmsInstanceFiles1 = dmsInstanceFiles1; + } + + public List getParts() { + return parts; + } + + public void setParts(List parts) { + this.parts = parts; + } + + public String getRepairContent() { + return repairContent; + } + + public void setRepairContent(String repairContent) { + this.repairContent = repairContent; + } + + public String getProtectedMethod() { + return protectedMethod; + } + + public void setProtectedMethod(String protectedMethod) { + this.protectedMethod = protectedMethod; + } + + /** + * 修改 增加 + */ + private String deviceCodeTag;// 开始前 验证的设备编码 + + public String getDeviceCodeTag() { + return deviceCodeTag; + } + + public void setDeviceCodeTag(String deviceCodeTag) { + this.deviceCodeTag = deviceCodeTag; + notifyChange(); + } + + +} diff --git a/app/src/main/java/com/example/haiwei_mom/data/device/DeviceRepairPart.java b/app/src/main/java/com/example/haiwei_mom/data/device/DeviceRepairPart.java new file mode 100644 index 0000000..407aabc --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/data/device/DeviceRepairPart.java @@ -0,0 +1,32 @@ +package com.example.haiwei_mom.data.device; + +public class DeviceRepairPart { + + private String partName; + private String partSpecifications; + private String amount; + + public String getPartName() { + return partName; + } + + public void setPartName(String partName) { + this.partName = partName; + } + + public String getPartSpecifications() { + return partSpecifications; + } + + public void setPartSpecifications(String partSpecifications) { + this.partSpecifications = partSpecifications; + } + + public String getAmount() { + return amount; + } + + public void setAmount(String amount) { + this.amount = amount; + } +} diff --git a/app/src/main/java/com/example/haiwei_mom/data/device/Dict.java b/app/src/main/java/com/example/haiwei_mom/data/device/Dict.java new file mode 100644 index 0000000..6f9cb45 --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/data/device/Dict.java @@ -0,0 +1,52 @@ +package com.example.haiwei_mom.data.device; + +/** + * @author wanghao + * @date 2024/3/22 10:36 + */ +public class Dict { + private String dictLabel; + private String dictValue; + private String dictType; + private String dictCode; + + public String getDictLabel() { + return dictLabel; + } + + public void setDictLabel(String dictLabel) { + this.dictLabel = dictLabel; + } + + public String getDictValue() { + return dictValue; + } + + public void setDictValue(String dictValue) { + this.dictValue = dictValue; + } + + public String getDictType() { + return dictType; + } + + public void setDictType(String dictType) { + this.dictType = dictType; + } + + public String getDictCode() { + return dictCode; + } + + public void setDictCode(String dictCode) { + this.dictCode = dictCode; + } + + @Override + public String toString() { + return "Dict{" + + "dictLabel='" + dictLabel + '\'' + + ", dictValue='" + dictValue + '\'' + + '}'; + } +} diff --git a/app/src/main/java/com/example/haiwei_mom/data/device/InstanceFile.java b/app/src/main/java/com/example/haiwei_mom/data/device/InstanceFile.java new file mode 100644 index 0000000..9c8d929 --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/data/device/InstanceFile.java @@ -0,0 +1,57 @@ +package com.example.haiwei_mom.data.device; + +/** + * @author wanghao + * @date 2024/3/25 14:41 + */ +public class InstanceFile { + + /** + * createBy : null + * createTime : null + * updateBy : null + * updateTime : null + * remark : null + * instanceFileId : 1 + * targetType : 1 + * targetId : 27 + * filePath : http://127.0.0.1:9300/statics/2024/03/13/1709885329511_20240313181334A001.png + */ + + private int instanceFileId; + private String targetType; + private int targetId; + private String filePath; + + public int getInstanceFileId() { + return instanceFileId; + } + + public void setInstanceFileId(int instanceFileId) { + this.instanceFileId = instanceFileId; + } + + public String getTargetType() { + return targetType; + } + + public void setTargetType(String targetType) { + this.targetType = targetType; + } + + public int getTargetId() { + return targetId; + } + + public void setTargetId(int targetId) { + this.targetId = targetId; + } + + public String getFilePath() { + return filePath; + } + + public void setFilePath(String filePath) { + this.filePath = filePath; + } +} diff --git a/app/src/main/java/com/example/haiwei_mom/data/device/LubricationBeen.java b/app/src/main/java/com/example/haiwei_mom/data/device/LubricationBeen.java new file mode 100644 index 0000000..4fff829 --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/data/device/LubricationBeen.java @@ -0,0 +1,135 @@ +package com.example.haiwei_mom.data.device; + +import java.util.List; + +/** + * @author wanghao + * @date 2024/3/29 16:02 + */ +public class LubricationBeen { + + /** + * createBy : null + * createTime : null + * updateBy : null + * updateTime : null + * remark : null + * lubeInstanceId : 1 + * planLubeId : null + * billsLubeCode : 1111 + * planBeginTime : null + * realBeginTime : null + * planEndTime : null + * realEndTime : null + * lubeStatus : 2 + * isFlag : null + * lubeGroup : 23 + * lubeSupervisor : 233 + * lubeLevel : 1 + * lubeStatusStr : null + * dmsBillsLubeDetailList : [] + */ + + private int lubeInstanceId; + private String billsLubeCode; + private Long lubeStatus; + private String lubeGroup; + private String lubeSupervisor; + private Long lubeLevel; + private String lubeStatusStr; + // 显示 + private String lubeLevelName; + private String maintStatusStr; + + public String getLubeLevelName() { + if (lubeLevel == null) return ""; + if (lubeLevel == 1) { + return "日常润滑"; + } else if (lubeLevel == 2) { + return "月度润滑"; + } else if (lubeLevel == 3) { + return "年度润滑"; + } + return lubeLevelName; + } + + public String getMaintStatusStr() { + if (lubeStatus == null) return "null"; + if (lubeStatus == 1) { + return "待润滑"; + } else if (lubeStatus == 2) { + return "润滑中"; + } else if (lubeStatus == 3) { + return "润滑完成"; + } + + return maintStatusStr; + } + + private List dmsBillsLubeDetailList; + + public int getLubeInstanceId() { + return lubeInstanceId; + } + + public void setLubeInstanceId(int lubeInstanceId) { + this.lubeInstanceId = lubeInstanceId; + } + + public String getBillsLubeCode() { + return billsLubeCode; + } + + public void setBillsLubeCode(String billsLubeCode) { + this.billsLubeCode = billsLubeCode; + } + + public Long getLubeStatus() { + return lubeStatus; + } + + public void setLubeStatus(Long lubeStatus) { + this.lubeStatus = lubeStatus; + } + + public String getLubeGroup() { + return lubeGroup; + } + + public void setLubeGroup(String lubeGroup) { + this.lubeGroup = lubeGroup; + } + + public String getLubeSupervisor() { + return lubeSupervisor; + } + + public void setLubeSupervisor(String lubeSupervisor) { + this.lubeSupervisor = lubeSupervisor; + } + + public Long getLubeLevel() { + + return lubeLevel; + } + + public void setLubeLevel(Long lubeLevel) { + this.lubeLevel = lubeLevel; + } + + public String getLubeStatusStr() { + return lubeStatusStr; + } + + public void setLubeStatusStr(String lubeStatusStr) { + this.lubeStatusStr = lubeStatusStr; + } + + public List getDmsBillsLubeDetailList() { + return dmsBillsLubeDetailList; + } + + public void setDmsBillsLubeDetailList(List dmsBillsLubeDetailList) { + this.dmsBillsLubeDetailList = dmsBillsLubeDetailList; + } +} diff --git a/app/src/main/java/com/example/haiwei_mom/data/device/LubricationDetail.java b/app/src/main/java/com/example/haiwei_mom/data/device/LubricationDetail.java new file mode 100644 index 0000000..b9b3459 --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/data/device/LubricationDetail.java @@ -0,0 +1,176 @@ +package com.example.haiwei_mom.data.device; + +import androidx.databinding.BaseObservable; + +/** + * @author wanghao + * @date 2024/3/29 15:54 + */ +public class LubricationDetail extends BaseObservable { + + /** + * billsLubeDetailId : 1 + * lubeInstanceId : 1 + * deviceId : 1 + * lubeStationId : 1 + * lubeStandardId : 1 + * operationDescription : ddd1d + * maintStatus : 3 + * isFlag : null + * beginTime : null + * endTime : null + * typeName : 测试类型1 + * deviceCode : 22601 + * deviceName : 设备一号 + * lubeStationName : null + * lubeProtocol : 标准1 + * lubeOperationDescription : null + */ + + private int billsLubeDetailId; + private int lubeInstanceId; + private int deviceId; + private int lubeStationId; + private int lubeStandardId; + private String operationDescription; + private Long maintStatus; + private String typeName; + private String deviceCode; + private String deviceName; + private String lubeStationName; + private String lubeProtocol; + private String lubeOperationDescription; + // 显示 + private String maintStatusStr; + private String buttonText; + private boolean buttonVisb; + + public boolean isButtonVisb() { + if (maintStatus != null && maintStatus==3) { + return false; + } + return true; + } + public String getButtonText() { + if (maintStatus == null || maintStatus == 1) { + return "开始润滑"; + } + return "完成润滑"; + } + public String getMaintStatusStr() { + if (maintStatus == null){ + return "待润滑"; + } else if (maintStatus==1) { + return "待润滑"; + } else if (maintStatus ==2) { + return "润滑中"; + } else if (maintStatus ==3) { + return "润滑完成"; + } + + return null; + } + public int getBillsLubeDetailId() { + return billsLubeDetailId; + } + + public void setBillsLubeDetailId(int billsLubeDetailId) { + this.billsLubeDetailId = billsLubeDetailId; + } + + public int getLubeInstanceId() { + return lubeInstanceId; + } + + public void setLubeInstanceId(int lubeInstanceId) { + this.lubeInstanceId = lubeInstanceId; + } + + public int getDeviceId() { + return deviceId; + } + + public void setDeviceId(int deviceId) { + this.deviceId = deviceId; + } + + public int getLubeStationId() { + return lubeStationId; + } + + public void setLubeStationId(int lubeStationId) { + this.lubeStationId = lubeStationId; + } + + public int getLubeStandardId() { + return lubeStandardId; + } + + public void setLubeStandardId(int lubeStandardId) { + this.lubeStandardId = lubeStandardId; + } + + public String getOperationDescription() { + return operationDescription; + } + + public void setOperationDescription(String operationDescription) { + this.operationDescription = operationDescription; + } + + public Long getMaintStatus() { + return maintStatus; + } + + public void setMaintStatus(Long maintStatus) { + this.maintStatus = maintStatus; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + + public String getDeviceCode() { + return deviceCode; + } + + public void setDeviceCode(String deviceCode) { + this.deviceCode = deviceCode; + } + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public String getLubeStationName() { + return lubeStationName; + } + + public void setLubeStationName(String lubeStationName) { + this.lubeStationName = lubeStationName; + } + + public String getLubeProtocol() { + return lubeProtocol; + } + + public void setLubeProtocol(String lubeProtocol) { + this.lubeProtocol = lubeProtocol; + } + + public String getLubeOperationDescription() { + return lubeOperationDescription; + } + + public void setLubeOperationDescription(String lubeOperationDescription) { + this.lubeOperationDescription = lubeOperationDescription; + } +} diff --git a/app/src/main/java/com/example/haiwei_mom/data/device/MaintainBeen.java b/app/src/main/java/com/example/haiwei_mom/data/device/MaintainBeen.java new file mode 100644 index 0000000..7802502 --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/data/device/MaintainBeen.java @@ -0,0 +1,180 @@ +package com.example.haiwei_mom.data.device; + +import java.util.List; + +/** + * @author wanghao + * @date 2024/3/27 15:48 + */ +public class MaintainBeen { + + /** + * createBy : null + * createTime : 2024-03-21 15:49:38 + * updateBy : null + * updateTime : null + * remark : null + * maintInstanceId : 9 + * planMaintId : null + * wfProcessId : 103 + * billsMaintCode : 20240321154938MI005 + * planBeginTime : 2024-03-21 + * realBeginTime : null + * planEndTime : 2024-03-22 + * realEndTime : null + * maintStatus : 1 + * maintCompRate : null + * isFlag : null + * maintLevel : 1 + * maintGroup : 组别1 + * maintSupervisor : 张三 + * maintStatusStr : null + * dmsBillsMaintDetailList : [] + */ + + private String createTime; + private int maintInstanceId; + private int wfProcessId; + private String billsMaintCode; + private String planEndTime; + private Long maintLevel; + private String maintLevelName; + private String maintGroup; + private String maintSupervisor; + private String maintStatusStr; + private Long maintStatus; + private List dmsBillsMaintDetailList; + + public void setMaintLevelName(String maintLevelName) { + this.maintLevelName = maintLevelName; + } + + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public int getMaintInstanceId() { + return maintInstanceId; + } + + public void setMaintInstanceId(int maintInstanceId) { + this.maintInstanceId = maintInstanceId; + } + + public int getWfProcessId() { + return wfProcessId; + } + + public void setWfProcessId(int wfProcessId) { + this.wfProcessId = wfProcessId; + } + + public String getBillsMaintCode() { + return billsMaintCode; + } + + public void setBillsMaintCode(String billsMaintCode) { + this.billsMaintCode = billsMaintCode; + } + + public String getPlanEndTime() { + return planEndTime; + } + + public void setPlanEndTime(String planEndTime) { + this.planEndTime = planEndTime; + } + + public Long getMaintLevel() { + // 保养级别：1-日常保养；2-月度保养；3-年度保养 + + return maintLevel; + } + + public String getMaintLevelName() { + if (maintLevel==null) return ""; + if (maintLevel ==1 ) { + return "日常保养"; + } else if (maintLevel ==2) { + return "月度保养"; + } else if (maintLevel ==3) { + return "年度保养"; + } + return maintLevelName; + } + + public void setMaintLevel(Long maintLevel) { + this.maintLevel = maintLevel; + } + + public Long getMaintStatus() { + return maintStatus; + } + + public void setMaintStatus(Long maintStatus) { + this.maintStatus = maintStatus; + } + + public String getMaintGroup() { + return maintGroup; + } + + public void setMaintGroup(String maintGroup) { + this.maintGroup = maintGroup; + } + + public String getMaintSupervisor() { + return maintSupervisor; + } + + public void setMaintSupervisor(String maintSupervisor) { + this.maintSupervisor = maintSupervisor; + } + + public String getMaintStatusStr() { + if (maintStatus==null) return "null"; + if (maintStatus==1) { + return "待保养"; + } else if (maintStatus==2) { + return "保养中"; + } else if (maintStatus ==3) { + return "保养完成"; + } + return maintStatusStr; + } + + public void setMaintStatusStr(String maintStatusStr) { + this.maintStatusStr = maintStatusStr; + } + + public List getDmsBillsMaintDetailList() { + return dmsBillsMaintDetailList; + } + + public void setDmsBillsMaintDetailList(List dmsBillsMaintDetailList) { + this.dmsBillsMaintDetailList = dmsBillsMaintDetailList; + } + + @Override + public String toString() { + return "MaintainBeen{" + + "createTime='" + createTime + '\'' + + ", maintInstanceId=" + maintInstanceId + + ", wfProcessId=" + wfProcessId + + ", billsMaintCode='" + billsMaintCode + '\'' + + ", planEndTime='" + planEndTime + '\'' + + ", maintLevel='" + maintLevel + '\'' + + ", maintLevelName='" + maintLevelName + '\'' + + ", maintGroup='" + maintGroup + '\'' + + ", maintSupervisor='" + maintSupervisor + '\'' + + ", maintStatusStr='" + maintStatusStr + '\'' + + ", maintStatus='" + maintStatus + '\'' + + ", dmsBillsMaintDetailList=" + dmsBillsMaintDetailList + + '}'; + } +} diff --git a/app/src/main/java/com/example/haiwei_mom/data/device/MaintainDetail.java b/app/src/main/java/com/example/haiwei_mom/data/device/MaintainDetail.java new file mode 100644 index 0000000..e608c9f --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/data/device/MaintainDetail.java @@ -0,0 +1,241 @@ +package com.example.haiwei_mom.data.device; + +import androidx.databinding.BaseObservable; + +import java.util.List; + +/** + * @author wanghao + * @date 2024/3/27 16:05 + */ +public class MaintainDetail extends BaseObservable { + + /** + * createBy : null + * createTime : null + * updateBy : null + * updateTime : null + * remark : null + * billsMaintDetailId : 18 + * maintInstanceId : 9 + * deviceId : 1 + * stationId : 2 + * maintStandardId : 2 + * operationDescription : null + * maintStatus : null + * isFlag : null + * beginTime : null + * endTime : null + * deviceCode : 22601 + * deviceName : 设备一号 + * maintStationName : 部位2 + * maintProtocol : 2 + * maintOperationDescription : 2 + * typeName : 测试类型1 + */ + + + private int billsMaintDetailId; + private int maintInstanceId; + private int deviceId; + private int stationId; + private int maintStandardId; + private String operationDescription; + private String deviceCode; + private String deviceName; + private String maintStationName; + private String maintProtocol; + private String maintOperationDescription; + private String typeName; + private Long maintStatus; + private String maintStatusStr; + // 显示数据 + private String buttonText; + private boolean buttonVisb; + + private List dmsBillsMaintDetailProjectList; + + public List getDmsBillsMaintDetailProjectList() { + return dmsBillsMaintDetailProjectList; + } + + public void setDmsBillsMaintDetailProjectList(List dmsBillsMaintDetailProjectList) { + this.dmsBillsMaintDetailProjectList = dmsBillsMaintDetailProjectList; + } + + public String getButtonText() { + try { + if ( maintStatus !=3) { + return "开始保养"; + } + }catch (Exception exception){ + return "子表maintStatus报错"; + } + + // return "完成保养"; + return "查看保养"; + + + } + + public Long getMaintStatus() { + return maintStatus; + } + + public void setMaintStatus(Long maintStatus) { + this.maintStatus = maintStatus; + } + + public boolean isButtonVisb() { + if (maintStatus != null && maintStatus==3) { + return false; + } + return true; + } + + public String getMaintStatusStr() { + if (maintStatus == null){ + return "待保养"; + } else if (maintStatus==1) { + return "待保养"; + } else if (maintStatus ==2) { + return "保养中"; + } else if (maintStatus ==3) { + return "保养完成"; + } + + return null; + } + + public int getBillsMaintDetailId() { + return billsMaintDetailId; + } + + + + public void setMaintStatusStr(String maintStatusStr) { + this.maintStatusStr = maintStatusStr; + } + + public void setButtonText(String buttonText) { + this.buttonText = buttonText; + } + + public void setButtonVisb(boolean buttonVisb) { + this.buttonVisb = buttonVisb; + } + + public void setBillsMaintDetailId(int billsMaintDetailId) { + this.billsMaintDetailId = billsMaintDetailId; + } + + public int getMaintInstanceId() { + return maintInstanceId; + } + + public void setMaintInstanceId(int maintInstanceId) { + this.maintInstanceId = maintInstanceId; + } + + public int getDeviceId() { + return deviceId; + } + + public void setDeviceId(int deviceId) { + this.deviceId = deviceId; + } + + public int getStationId() { + return stationId; + } + + public void setStationId(int stationId) { + this.stationId = stationId; + } + + public int getMaintStandardId() { + return maintStandardId; + } + + public void setMaintStandardId(int maintStandardId) { + this.maintStandardId = maintStandardId; + } + + public String getOperationDescription() { + return operationDescription; + } + + public void setOperationDescription(String operationDescription) { + this.operationDescription = operationDescription; + } + + public String getDeviceCode() { + return deviceCode; + } + + public void setDeviceCode(String deviceCode) { + this.deviceCode = deviceCode; + } + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public String getMaintStationName() { + return maintStationName; + } + + public void setMaintStationName(String maintStationName) { + this.maintStationName = maintStationName; + } + + public String getMaintProtocol() { + return maintProtocol; + } + + public void setMaintProtocol(String maintProtocol) { + this.maintProtocol = maintProtocol; + } + + public String getMaintOperationDescription() { + return maintOperationDescription; + } + + public void setMaintOperationDescription(String maintOperationDescription) { + this.maintOperationDescription = maintOperationDescription; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + + @Override + public String toString() { + return "MaintainDetail{" + + "billsMaintDetailId=" + billsMaintDetailId + + ", maintInstanceId=" + maintInstanceId + + ", deviceId=" + deviceId + + ", stationId=" + stationId + + ", maintStandardId=" + maintStandardId + + ", operationDescription='" + operationDescription + '\'' + + ", deviceCode='" + deviceCode + '\'' + + ", deviceName='" + deviceName + '\'' + + ", maintStationName='" + maintStationName + '\'' + + ", maintProtocol='" + maintProtocol + '\'' + + ", maintOperationDescription='" + maintOperationDescription + '\'' + + ", typeName='" + typeName + '\'' + + ", maintStatus='" + maintStatus + '\'' + + ", maintStatusStr='" + getMaintStatusStr() + '\'' + + ", buttonText='" + buttonText + '\'' + + ", buttonVisb=" + buttonVisb + + '}'; + } +} diff --git a/app/src/main/java/com/example/haiwei_mom/data/device/MaintainProject.java b/app/src/main/java/com/example/haiwei_mom/data/device/MaintainProject.java new file mode 100644 index 0000000..1f6a479 --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/data/device/MaintainProject.java @@ -0,0 +1,61 @@ +package com.example.haiwei_mom.data.device; + +import androidx.databinding.BaseObservable; + +public class MaintainProject extends BaseObservable { + + private String remark; + private int maintDetailProjectId; + private int billsMaintDetailId; + private int maintProjectId; + private String maintProjectName; + private String maintProjectDesc; + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public int getMaintDetailProjectId() { + return maintDetailProjectId; + } + + public void setMaintDetailProjectId(int maintDetailProjectId) { + this.maintDetailProjectId = maintDetailProjectId; + } + + public int getBillsMaintDetailId() { + return billsMaintDetailId; + } + + public void setBillsMaintDetailId(int billsMaintDetailId) { + this.billsMaintDetailId = billsMaintDetailId; + } + + public int getMaintProjectId() { + return maintProjectId; + } + + public void setMaintProjectId(int maintProjectId) { + this.maintProjectId = maintProjectId; + } + + public String getMaintProjectName() { + return maintProjectName; + } + + public void setMaintProjectName(String maintProjectName) { + this.maintProjectName = maintProjectName; + } + + public String getMaintProjectDesc() { + return maintProjectDesc; + } + + public void setMaintProjectDesc(String maintProjectDesc) { + this.maintProjectDesc = maintProjectDesc; + } +} diff --git a/app/src/main/java/com/example/haiwei_mom/data/device/Outsourcing.java b/app/src/main/java/com/example/haiwei_mom/data/device/Outsourcing.java new file mode 100644 index 0000000..646b638 --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/data/device/Outsourcing.java @@ -0,0 +1,43 @@ +package com.example.haiwei_mom.data.device; + +/** + * @author wanghao + * @date 2024/4/1 14:02 + * 外协单位 + */ +public class Outsourcing { + + /** + * outsrcId : 1 + * outsrcCode : code0001 + * outsrcName : 青岛软控 + */ + + private int outsrcId; + private String outsrcCode; + private String outsrcName; + + public int getOutsrcId() { + return outsrcId; + } + + public void setOutsrcId(int outsrcId) { + this.outsrcId = outsrcId; + } + + public String getOutsrcCode() { + return outsrcCode; + } + + public void setOutsrcCode(String outsrcCode) { + this.outsrcCode = outsrcCode; + } + + public String getOutsrcName() { + return outsrcName; + } + + public void setOutsrcName(String outsrcName) { + this.outsrcName = outsrcName; + } +} diff --git a/app/src/main/java/com/example/haiwei_mom/device/BxActivity.java b/app/src/main/java/com/example/haiwei_mom/device/BxActivity.java new file mode 100644 index 0000000..bf76a96 --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/device/BxActivity.java @@ -0,0 +1,271 @@ +package com.example.haiwei_mom.device; + +import android.annotation.SuppressLint; +import android.os.Bundle; +import android.view.View; +import android.widget.ArrayAdapter; +import android.widget.ListPopupWindow; + +import androidx.databinding.DataBindingUtil; + +import com.example.haiwei_mom.R; +import com.example.haiwei_mom.adapter.check.DisposalFileAdapter; +import com.example.haiwei_mom.base.BaseActivity; +import com.example.haiwei_mom.base.MyRecultCall; +import com.example.haiwei_mom.base.MyResult; +import com.example.haiwei_mom.databinding.ActivityBxBinding; +import com.example.haiwei_mom.dialog.ImgDialog; +import com.example.haiwei_mom.data.check.CheckInstanceFiles; +import com.example.haiwei_mom.data.device.BxSubmitBeen; +import com.example.haiwei_mom.data.device.DeviceBeen; +import com.example.haiwei_mom.data.device.Dict; +import com.example.haiwei_mom.data.device.Outsourcing; +import com.example.haiwei_mom.uitls.SharedPreferencesUtils; +import com.google.gson.reflect.TypeToken; +import com.lzy.okgo.OkGo; +import com.lzy.okgo.model.Response; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +/** + * 故障报修 + */ +public class BxActivity extends BaseActivity implements DisposalFileAdapter.ItemClickCall { + private DisposalFileAdapter adapter; + private List filesList; + private List files; + private BxSubmitBeen been; + private ActivityBxBinding binding; + private ListPopupWindow lpw; + private ListPopupWindow deviceCodeLpw; + private ArrayList designList; + private ImgDialog imgDialog; + private boolean aBoolean; + + @SuppressLint("ClickableViewAccessibility") + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + binding = DataBindingUtil.setContentView(this, R.layout.activity_bx); + adapter = new DisposalFileAdapter(this, this); + filesList = new ArrayList<>(); + files = new ArrayList<>(); + adapter.setList(filesList); + binding.setAdapter1(adapter); + been = new BxSubmitBeen(); + outStrRequest(); + binding.setVm(been); + initSlectLpw(); + initRequestLpw(); + imgDialog = new ImgDialog(this); + + } + + private void initSlectLpw() { + deviceCodeLpw = new ListPopupWindow(this); + deviceCodeLpw.setAnchorView(binding.selectNameView); + deviceCodeLpw.setOnItemClickListener((parent, view, position, id) -> { + var deviceBeen = list.get(position); + been.setDeviceld(deviceBeen.getDeviceId()); + binding.setDevice(deviceBeen); + aBoolean = true; + deviceCodeLpw.dismiss(); + }); + } + + private void initRequestLpw() { + initRequest("dms_fault_type"); + lpw = new ListPopupWindow(this); + lpw.setAnchorView(binding.bxDesOpe); + designList = new ArrayList<>(); + aBoolean = false; + initRequest("dms_device_design_operations"); + lpw.setOnItemClickListener((parent, view, position, id) -> { + var designOperations = been.getDesignOperations(); + var addStr = designList.get(position); + if (designOperations != null && designOperations.contains(addStr)) { + String tagStr = null; + if (designOperations.indexOf(addStr) == 0) { + tagStr = addStr + ","; + } else { + tagStr = "," + addStr; + } + designOperations = designOperations.replace(tagStr, "") + .replace(addStr, ""); + been.setDesignOperations(designOperations); + } else { + been.setDesignOperations(Optional.ofNullable(designOperations).map(t -> t.isEmpty() ? t : t + ",").orElse("") + addStr); + } + + lpw.dismiss(); + }); + binding.bxDesOpe.setOnTouchListener((v, event) -> { + int clickX = (int) event.getX(); + if (clickX > 450) { + lpw.show(); + } + return true; + }); + } + + + // 查询外协 + private void outStrRequest() { + OkGo.get(url + "/dms/mobile/getOutsrcInfos").tag(this) + .execute(new MyRecultCall(dialog, this) { + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + if (body.getCode() == 200) { + List outsourcingList = gson.fromJson(body.getData().toString(), new TypeToken>() { + }.getType()); + been.setOutsourcingList(outsourcingList); + return; + } + } + }); + } + + // 维修 + private void initRequest(String uri) { + OkGo.get(url + "/system/dict/data/type/" + uri).tag(this) + .execute(new MyRecultCall(dialog, this) { + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + if (body.getCode() == 200) { + List list = gson.fromJson(body.getData().toString(), new TypeToken>() { + }.getType()); + + if (uri.equals("dms_fault_type")) { + been.setFaultTypeList(list); + } else { + list.forEach(t -> designList.add(t.getDictLabel())); + lpw.setAdapter(new ArrayAdapter<>(context, + androidx.appcompat.R.layout.support_simple_spinner_dropdown_item, + designList)); + } + } + } + }); + + } + + @SuppressLint("NotifyDataSetChanged") + @Override + public void onClick(int position, boolean type) { + if (type) { + imgDialog.setRawReturn(filesList.get(position).getFaultFile()); + return; + } + filesList.remove(position); + files.remove(position); + adapter.notifyDataSetChanged(); + } + + public void bxTackphoto(View view) { + try { + teke_photo(); + } catch (IOException e) { + throw new RuntimeException(e); + } + + + } + + + @SuppressLint("NotifyDataSetChanged") + @Override + public void tekePhotoResult(String fileUrl, File file) { + super.tekePhotoResult(fileUrl, file); + CheckInstanceFiles checkInstanceFiles = new CheckInstanceFiles(); + checkInstanceFiles.setFaultFile(fileUrl); + checkInstanceFiles.setState(true); + filesList.add(checkInstanceFiles); + adapter.notifyDataSetChanged(); + files.add(file); + } + + private List list; + + // 模糊查询 + public void bxSelect(View view) { + OkGo.get(url + "/dms/mobile/likeDeviceName").tag(this) + .params("deviceName", been.getSelectName()) + .execute(new MyRecultCall(dialog, this) { + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + if (body.getCode() == 200) { + list = gson.fromJson(body.getData().toString(), new TypeToken>() { + }.getType()); + if (list == null || list.isEmpty()) { + aBoolean = false; + return; + } + List tagList = new ArrayList<>(list.size()); + list.forEach(deviceBeen -> tagList.add(deviceBeen.getDeviceName())); + deviceCodeLpw.setAdapter(new ArrayAdapter<>(context, + androidx.appcompat.R.layout.support_simple_spinner_dropdown_item, + tagList)); + deviceCodeLpw.show(); + + } else { + binding.setDevice(null); + } + } + }); + } + + public void bxSelectCode(String code) { + OkGo.get(url + "/dms/mobile/getDeviceByDeviceCode/" + code).tag(this) + .execute(new MyRecultCall(dialog, this) { + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + aBoolean = (body.getCode() == 200); + if (aBoolean) { + DeviceBeen deviceBeen = gson.fromJson(body.getData().toString(), DeviceBeen.class); + been.setDeviceld(deviceBeen.getDeviceId()); + binding.setDevice(deviceBeen); + } else { + binding.setDevice(null); + } + } + }); + } + + public void bxSubmit(View view) { + if (!aBoolean) { + myToastUitls.show("数据异常，提交失败"); + return; + } + OkGo.post(url + "/dms/mobile/insertFaultInstsanceActivity") + .params("deviceId", been.getDeviceld()) + .params("faultType", been.getFaultType()) + .params("faultDescription", been.getFaultDescription()) + .params("designOperations", been.getDesignOperations()) + .params("repairType", been.getRepairType()) + .params("outsrcId", been.getOutsrcld()) + .addFileParams("files", files) + .execute(new MyRecultCall(dialog, this) { + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + if (body.getCode() == 200) { + finish(); + } + myToastUitls.show(body.getMsg()); + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/haiwei_mom/device/DeviceCheckActivity.java b/app/src/main/java/com/example/haiwei_mom/device/DeviceCheckActivity.java new file mode 100644 index 0000000..7b4a0c9 --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/device/DeviceCheckActivity.java @@ -0,0 +1,93 @@ +package com.example.haiwei_mom.device; + +import android.content.Intent; +import android.os.Bundle; +import android.view.View; + +import androidx.databinding.DataBindingUtil; + +import com.example.haiwei_mom.R; +import com.example.haiwei_mom.adapter.ItemClickCall; +import com.example.haiwei_mom.adapter.device.DeviceInspectiontAdapter; +import com.example.haiwei_mom.base.BaseActivity; +import com.example.haiwei_mom.base.MyRecultCall; +import com.example.haiwei_mom.base.MyResult; +import com.example.haiwei_mom.databinding.ActivityDeviceCheckBinding; +import com.example.haiwei_mom.data.device.DeviceInspection; +import com.example.haiwei_mom.data.device.DeviceInspectionDetail; +import com.example.haiwei_mom.uitls.SharedPreferencesUtils; +import com.lzy.okgo.OkGo; +import com.lzy.okgo.model.Response; + +import java.util.List; + +public class DeviceCheckActivity extends BaseActivity implements ItemClickCall { + private DeviceInspection deviceInspection; + private List list; + private DeviceInspectiontAdapter adapter; + + private ActivityDeviceCheckBinding binding; + private Intent intent; + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + binding = DataBindingUtil.setContentView(this,R.layout.activity_device_check); + adapter=new DeviceInspectiontAdapter(this,this); + binding.setAdapter(adapter); + + intent=new Intent(this, DeviceCheckInfoActivity.class); + } + + @Override + protected void onResume() { + super.onResume(); + initRequest(); + } + + private void initRequest() { + OkGo.get(url+ "/dms/mobile/getNewestInspectInstance").tag(this) + .params("inspectType",1/*getIntent().getStringExtra("inspectType")*/) + .execute(new MyRecultCall(dialog, this) { + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + if (body.getCode() == 200) { + deviceInspection= gson.fromJson(body.getData().toString(), DeviceInspection.class); + binding.setVm(deviceInspection); + list=deviceInspection.getDmsInspectInstanceDetailList(); + adapter.setList(list); + adapter.notifyDataSetChanged(); + } + } + }); + } + + @Override + public void onClick(int position) { + + } + + public void deviceCheckSelect(View view){ + + } + public void deviceCheckStart(View view){ + var code = binding.inspectionDeviceCode.getText().toString().trim(); + if (code==null || code.isEmpty()) return; + OkGo.get(url+ "/dms/mobile/scanInspectInstanceDetail").tag(this) + .params("inspectInstanceId",deviceInspection.getInspectInstanceId()) + .params("deviceCode",code) + .execute(new MyRecultCall(dialog, this) { + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + if (body.getCode() == 200) { + intent.putExtra("json",body.getData().toString()); + startActivity(intent); + } + } + }); + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/example/haiwei_mom/device/DeviceCheckInfoActivity.java b/app/src/main/java/com/example/haiwei_mom/device/DeviceCheckInfoActivity.java new file mode 100644 index 0000000..9b52231 --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/device/DeviceCheckInfoActivity.java @@ -0,0 +1,51 @@ +package com.example.haiwei_mom.device; + +import android.os.Bundle; +import android.view.View; + +import androidx.databinding.DataBindingUtil; + +import com.example.haiwei_mom.R; +import com.example.haiwei_mom.adapter.device.DeviceInspectionInfoAdapter; +import com.example.haiwei_mom.base.BaseActivity; +import com.example.haiwei_mom.base.MyRecultCall; +import com.example.haiwei_mom.base.MyResult; +import com.example.haiwei_mom.databinding.ActivityDeviceCheckInfoBinding; +import com.example.haiwei_mom.data.device.DeviceInspectionDetail; +import com.example.haiwei_mom.uitls.SharedPreferencesUtils; +import com.lzy.okgo.OkGo; +import com.lzy.okgo.model.Response; + +import okhttp3.RequestBody; + +public class DeviceCheckInfoActivity extends BaseActivity { + private DeviceInspectionDetail detail; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + ActivityDeviceCheckInfoBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_device_check_info); + detail = gson.fromJson(getIntent().getStringExtra("json"), DeviceInspectionDetail.class); + binding.setVm(detail); + var list = detail.getDmsInspectInstanceDetailProjectList(); + // Log.e("TAG", "onCreate:" + list.toString()); + DeviceInspectionInfoAdapter adapter =new DeviceInspectionInfoAdapter(this,list); + binding.setAdapter(adapter); + adapter.notifyDataSetChanged(); + } + public void deviceCheckInfoSubmit(View view){ + OkGo.post(url+"/dms/mobile/saveInspectInstanceDetail") + .upRequestBody(RequestBody.create(JSON,gson.toJson(detail))) + .execute(new MyRecultCall(dialog,this){ + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + if (body.getCode()==200){ + finish(); + } + myToastUitls.show( body.getMsg()); + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/haiwei_mom/device/DeviceRepairInfoActivity.java b/app/src/main/java/com/example/haiwei_mom/device/DeviceRepairInfoActivity.java new file mode 100644 index 0000000..8487130 --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/device/DeviceRepairInfoActivity.java @@ -0,0 +1,423 @@ +package com.example.haiwei_mom.device; + +import android.annotation.SuppressLint; +import android.os.Bundle; +import android.util.Log; +import android.view.View; +import android.widget.ArrayAdapter; +import android.widget.ListPopupWindow; + +import androidx.databinding.DataBindingUtil; + +import com.example.haiwei_mom.R; +import com.example.haiwei_mom.adapter.check.DisposalFileAdapter; +import com.example.haiwei_mom.adapter.device.DeviceRepairPartAdapter; +import com.example.haiwei_mom.base.BaseActivity; +import com.example.haiwei_mom.base.MyRecultCall; +import com.example.haiwei_mom.base.MyResult; +import com.example.haiwei_mom.databinding.ActivityDeviceRepairInfoBinding; +import com.example.haiwei_mom.dialog.ImgDialog; +import com.example.haiwei_mom.dialog.RepairPartAddDialog; +import com.example.haiwei_mom.data.check.CheckInstanceFiles; +import com.example.haiwei_mom.data.device.DeviceRepair; +import com.example.haiwei_mom.data.device.DeviceRepairPart; +import com.example.haiwei_mom.data.device.Dict; +import com.example.haiwei_mom.data.device.Outsourcing; +import com.example.haiwei_mom.uitls.SharedPreferencesUtils; +import com.google.gson.reflect.TypeToken; +import com.lzy.okgo.OkGo; +import com.lzy.okgo.model.Response; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +import okhttp3.RequestBody; + +public class DeviceRepairInfoActivity extends BaseActivity { + + private ImgDialog imgDialog; + private DisposalFileAdapter fileAdapter; + private ActivityDeviceRepairInfoBinding binding; + private DeviceRepair deviceRepair;// 显示数据 + private boolean activityType;// 活动状态 true修改 false查看 + private ListPopupWindow faultTypeLpw; + private ListPopupWindow opeLpw; + private List faultList; + private List opeList; + // 图片 + private List submitFileList; + private List filesList; + private int fileTagIndex = 0; + // 维修部件 + private DeviceRepairPartAdapter deviceRepairPartAdapter; + private RepairPartAddDialog repairPartAddDialog;// 添加 + // 维修完成拍照 + private List overRepairLookList;// 显示列表 + private DisposalFileAdapter fileAdapter2; + + @SuppressLint("NotifyDataSetChanged") + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + binding = DataBindingUtil.setContentView(this, R.layout.activity_device_repair_info); + var intent = getIntent(); + activityType = intent.getBooleanExtra("activityType", false); + binding.setVisState(activityType); + // 主要 + deviceRepair = gson.fromJson(intent.getStringExtra("json"), DeviceRepair.class); + initfaultTypeSelect(); + initopeSelect(); + initRequest("dms_fault_type"); + binding.setVm(deviceRepair); // 显示数据 + deviceRepair.repairTypeSelect(deviceRepair.getRepairType());// 显示维修类型 + if (activityType) { // 报修修改 + initRequest("dms_device_design_operations"); + + } else {// 显示完成 + var billsStatus = deviceRepair.getBillsStatus(); + if (billsStatus.equals("0")) { + if (deviceRepair.getApproveStatus() != null && deviceRepair.getApproveStatus().equals("2")) { + binding.setStartState(true); + } + } else if (billsStatus.equals("1")) { + binding.setSubmitState(true); + binding.setOverState(true); + } else if (billsStatus.equals("2")) { + binding.setSubmitState(true); + } + + + deviceRepairPartAdapter = new DeviceRepairPartAdapter(this, position -> { + deviceRepair.getParts().remove(position); + deviceRepairPartAdapter.notifyDataSetChanged(); + }); + deviceRepairPartAdapter.setList(deviceRepair.getParts()); + binding.setPartAdapter(deviceRepairPartAdapter); + repairPartAddDialog = new RepairPartAddDialog(this, deviceRepairPart -> { + DeviceRepairPart addTag = new DeviceRepairPart(); + addTag.setAmount(deviceRepairPart.getAmount()); + addTag.setPartName(deviceRepairPart.getPartName()); + addTag.setPartSpecifications(deviceRepairPart.getPartSpecifications()); + deviceRepair.getParts().add(addTag); + repairPartAddDialog.dismiss(); + deviceRepairPartAdapter.notifyDataSetChanged(); + }); + // 显示维修完成的图片 + var dmsInstanceFiles1 = deviceRepair.getDmsInstanceFiles1(); + overRepairLookList = new ArrayList<>(); + if (dmsInstanceFiles1 != null && !dmsInstanceFiles1.isEmpty()) { + dmsInstanceFiles1.stream().forEach(t -> { + CheckInstanceFiles files = new CheckInstanceFiles(); + files.setFaultFile(t.getFilePath()); + files.setState(false); + overRepairLookList.add(files); + }); + } + + // 维修完成的图片 + + fileAdapter2 = new DisposalFileAdapter(this, (position, type) -> { + CheckInstanceFiles checkInstanceFiles = overRepairLookList.get(position); + if (type) { + imgDialog.setRawReturn(checkInstanceFiles.getFaultFile()); + return; + } + overRepairLookList.remove(position); + try { + int index = position - fileTagIndex; + Log.e("TAG", "file List delete:" + index); + submitFileList.get(index).delete(); + submitFileList.remove(index); + } catch (Exception er) { + er.printStackTrace(); + } + + fileAdapter2.notifyDataSetChanged(); + }); + fileAdapter2.setList(overRepairLookList); + fileAdapter2.notifyDataSetChanged(); + binding.setAdapter2(fileAdapter2); + } + + outStrRequest(); // 查询外协 + + initFile(); // 初始化图片 + + } + + private void initopeSelect() { + opeLpw = new ListPopupWindow(context); + opeLpw.setAnchorView(binding.operations); + opeLpw.setOnItemClickListener((parent, view, position, id) -> { + String designOperations = deviceRepair.getDesignOperations(); + var addStr = opeList.get(position).getDictLabel(); + if (designOperations != null && designOperations.contains(addStr)) { + String tagStr = null; + if (designOperations.indexOf(addStr) == 0) { + tagStr = addStr + ","; + } else { + tagStr = "," + addStr; + } + designOperations = designOperations.replace(tagStr, "").replace(addStr, ""); + deviceRepair.setDesignOperations(designOperations); + } else { + deviceRepair.setDesignOperations(Optional.ofNullable(designOperations).map(t -> t.isEmpty() ? t : t + ",").orElse("") + addStr); + } + opeLpw.dismiss(); + }); + } + + private void initfaultTypeSelect() { + faultTypeLpw = new ListPopupWindow(context); + faultTypeLpw.setAnchorView(binding.faultType); + faultTypeLpw.setOnItemClickListener((parent, view, position, id) -> { + Dict dict = faultList.get(position); + deviceRepair.setFaultSourceTypeName(dict.getDictLabel()); + Log.e("TAG", "onCreate:" + dict.getDictValue()); + deviceRepair.setFaultSourceType(dict.getDictValue()); + faultTypeLpw.dismiss(); + }); + } + + private void initFile() { + fileAdapter = new DisposalFileAdapter(this, (position, type) -> { + CheckInstanceFiles checkInstanceFiles = filesList.get(position); + if (type) { + imgDialog.setRawReturn(checkInstanceFiles.getFaultFile()); + return; + } + filesList.remove(position); + try { + int index = position - fileTagIndex; + Log.e("TAG", "file List delete:" + index); + submitFileList.get(index).delete(); + submitFileList.remove(index); + } catch (Exception er) { + er.printStackTrace(); + } + + fileAdapter.notifyDataSetChanged(); + }); + filesList = new ArrayList<>(); + submitFileList = new ArrayList<>(); + var dmsInstanceFiles = deviceRepair.getDmsInstanceFiles(); + if (dmsInstanceFiles != null && !dmsInstanceFiles.isEmpty()) { + dmsInstanceFiles.forEach(t -> { + CheckInstanceFiles files = new CheckInstanceFiles(); + files.setFaultFile(t.getFilePath()); + files.setState(false); + filesList.add(files); + }); + fileTagIndex = filesList.size(); + } + fileAdapter.setList(filesList); + binding.setAdapter1(fileAdapter); + imgDialog = new ImgDialog(this); + } + + // 查询故障 和 ope接口 + private void initRequest(String uri) { + OkGo.get(url + "/system/dict/data/type/" + uri).tag(this) + .execute(new MyRecultCall(dialog, this) { + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + if (body.getCode() == 200) { + List list = gson.fromJson(body.getData().toString(), new TypeToken>() { + }.getType()); + List strings = new ArrayList<>(); + list.forEach(t -> strings.add(t.getDictLabel())); + if (uri.equals("dms_fault_type")) { + // 显示故障类别 + String faultSourceType = deviceRepair.getFaultSourceType(); + if (faultSourceType != null) { + Optional s = list.stream().filter(t -> t.getDictValue().equals(faultSourceType)).findFirst().map(Dict::getDictLabel); + deviceRepair.setFaultSourceTypeName(s.get()); + } + if (activityType) { + faultList = new ArrayList<>(); + faultList.addAll(list); + faultTypeLpw.setAdapter(new ArrayAdapter<>(context, androidx.appcompat.R.layout.support_simple_spinner_dropdown_item, strings)); + } + } else { + opeList = new ArrayList<>(); + opeList.addAll(list); + opeLpw.setAdapter(new ArrayAdapter<>(context, androidx.appcompat.R.layout.support_simple_spinner_dropdown_item, strings)); + } + + + } + } + }); + + } + + + // 开始维修 + public void startRepair(View view) { + String deviceCodeTag = deviceRepair.getDeviceCodeTag(); + if (deviceCodeTag == null) { + myToastUitls.show("数据异常"); + return; + } + if (!deviceRepair.getDeviceCode().equals(deviceCodeTag)) { + myToastUitls.show("设备扫描错误"); + return; + } + OkGo.post(url + "/dms/mobile/startRepair").headers("Authorization", SharedPreferencesUtils.getstring("access_token", "")).upRequestBody(RequestBody.create(JSON, gson.toJson(deviceRepair))).execute(new MyRecultCall(dialog, this) { + @Override + public void onSuccess(Response response) { + if (response.body().getCode() == 200) { + binding.setSubmitState(true); + binding.setOverState(true); + binding.setStartState(false); + } + } + }); + } + + + // 完成维修 + public void endRepair(View view) { + // try { + // Log.e("TAG", "repairInstanceId" + deviceRepair.getRepairInstanceId()); + // Log.e("TAG", "instanceActivityId" + deviceRepair.getInstanceActivityId()); + + OkGo.post(url + "/dms/mobile/completeRepair") + .params("repairInstanceId", deviceRepair.getRepairInstanceId()) + .params("instanceActivityId", deviceRepair.getInstanceActivityId()) + .params("designOperations", deviceRepair.getDesignOperations()) + .params("faultType", deviceRepair.getFaultSourceType()) + .params("processHandleResolution", deviceRepair.getProcessHandleResolution()) + .params("repairType", deviceRepair.getRepairType()) + .params("outsrcId", deviceRepair.getOutsrcId()) + .params("repairContent", deviceRepair.getRepairContent()) + .params("protectedMethod", deviceRepair.getProtectedMethod()) + .params("repairer", SharedPreferencesUtils.getstring("user", "")) + .params("parts1", gson.toJson(deviceRepair.getParts())) + .addFileParams("files", submitFileList) + .execute(new MyRecultCall(dialog, this) { + @Override + public void onSuccess(Response response) { + MyResult body = response.body(); + if (body.getCode() == 200) { + submitFileList.forEach(File::delete); + finish(); + } else { + myToastUitls.show(body.getMsg()); + } + } + }); + // } catch (Exception e) { + // e.printStackTrace(); + // } + + } + + // 选择故障类别 + public void selectFaultType(View view) { + faultTypeLpw.show(); + } + + // 选择涉及操作 + public void selectOperation(View view) { + opeLpw.show(); + } + + // 查询外协 + private void outStrRequest() { + OkGo.get(url + "/dms/mobile/getOutsrcInfos").tag(this) + .execute(new MyRecultCall(dialog, this) { + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + if (body.getCode() == 200) { + List outsourcingList = gson.fromJson(body.getData().toString(), new TypeToken>() { + }.getType()); + deviceRepair.setOutsourcingList(outsourcingList); + return; + } + + } + }); + } + + // 拍照 + public void updateTackphoto(View view) { + try { + teke_photo(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + // 拍照 维修完成 + public void overRepairTackphoto(View view) { + try { + teke_photo(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + // 拍照回传 + @SuppressLint("NotifyDataSetChanged") + @Override + public void tekePhotoResult(String fileUrl, File file) { + super.tekePhotoResult(fileUrl, file); + CheckInstanceFiles checkInstanceFiles = new CheckInstanceFiles(); + checkInstanceFiles.setFaultFile(fileUrl); + checkInstanceFiles.setState(true); + submitFileList.add(file); + if (activityType) { + // 修改时添加到上方 + filesList.add(checkInstanceFiles); + fileAdapter.notifyDataSetChanged(); + + } else { + // 查看时，添加到维修完成的列表 + overRepairLookList.add(checkInstanceFiles); + fileAdapter2.notifyDataSetChanged(); + } + + } + + + // 提交修改 维修工单 + public void submitUpdateRepair(View view) { + Log.e("TAG", "submitUpdateRepair:" + deviceRepair.getInstanceActivityId()); + int repairType = deviceRepair.getRepairType(); + OkGo.post(url + "/dms/mobile/updateFaultInstanceActivity") + .params("instanceActivityId", deviceRepair.getInstanceActivityId()) + .params("faultSourceType", deviceRepair.getFaultSourceType()) + .params("faultDescription", deviceRepair.getFaultDescription()) + .params("designOperations", deviceRepair.getDesignOperations()) + .params("repairType", repairType) + .params("checkedFault", deviceRepair.getCheckedFault()) + .params("outsrcId", deviceRepair.getOutsrcId()) + .addFileParams("files", submitFileList).execute(new MyRecultCall(dialog, this) { + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + if (body.getCode() == 200) { + if (!submitFileList.isEmpty()) { + submitFileList.forEach(File::delete); + } + finish(); + } + myToastUitls.show(body.getMsg()); + } + }); + } + + public void addRepairPart(View view) { + repairPartAddDialog.show(); + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/example/haiwei_mom/device/DeviceRepairListActivity.java b/app/src/main/java/com/example/haiwei_mom/device/DeviceRepairListActivity.java new file mode 100644 index 0000000..80faa67 --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/device/DeviceRepairListActivity.java @@ -0,0 +1,98 @@ +package com.example.haiwei_mom.device; + +import android.annotation.SuppressLint; +import android.content.Intent; +import android.os.Bundle; + +import androidx.databinding.DataBindingUtil; + +import com.example.haiwei_mom.R; +import com.example.haiwei_mom.adapter.device.DeviceRepairListAdapter; +import com.example.haiwei_mom.base.BaseActivity; +import com.example.haiwei_mom.base.MyRecultCall; +import com.example.haiwei_mom.base.MyResult; +import com.example.haiwei_mom.databinding.ActivityDeviceRepairListBinding; +import com.example.haiwei_mom.data.device.DeviceRepair; +import com.example.haiwei_mom.uitls.SharedPreferencesUtils; +import com.google.gson.reflect.TypeToken; +import com.lzy.okgo.OkGo; +import com.lzy.okgo.model.Response; + +import java.util.List; + +public class DeviceRepairListActivity extends BaseActivity implements DeviceRepairListAdapter.ItemClickCall { + private DeviceRepairListAdapter adapter; + private List list; + private Intent intent; + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + ActivityDeviceRepairListBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_device_repair_list); + adapter = new DeviceRepairListAdapter(this, this); + binding.setAdapter(adapter); + intent=new Intent(this, DeviceRepairInfoActivity.class); + } + + @Override + protected void onResume() { + super.onResume(); + OkGo.get(url + "/dms/mobile/getBillsFaultInstances") + .execute(new MyRecultCall(dialog, this) { + @SuppressLint("NotifyDataSetChanged") + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + if (body.getTotal() == 0) { + myToastUitls.show( body.getCode()==200?"暂无记录":body.getMsg() ); + return; + } + list=gson.fromJson(gson.toJson(body.getRows()),new TypeToken>(){}.getType()); + adapter.setList(list); + adapter.notifyDataSetChanged(); + } + }); + } + + @Override + public void clickItemForModify(int index) { + var repairInstanceId = list.get(index).getRepairInstanceId(); + // Toast.makeText(context, repairInstanceId+"", Toast.LENGTH_SHORT).show(); + OkGo.get(url+"/dms/mobile/getBillsFaultInstanceByRepairInstanceId/"+repairInstanceId) + .execute(new MyRecultCall(dialog,this){ + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + if (body.getCode()==200){ + intent.putExtra("json",body.getData().toString()); + intent.putExtra("activityType",true); + startActivity(intent); + return; + } + String msg = body.getMsg(); + myToastUitls.show(msg==null?"服务器500":msg ); + } + }); + } + + @Override + public void clickItemForSelect(int index) { + var repairInstanceId = list.get(index).getRepairInstanceId(); + OkGo.get(url+"/dms/mobile/getBillsFaultInstance4Repair/"+repairInstanceId) + .execute(new MyRecultCall(dialog,this){ + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + if (body.getCode()==200){ + intent.putExtra("json",body.getData().toString()); + intent.putExtra("activityType",false); + startActivity(intent); + return; + } + myToastUitls.show( body.getMsg()); + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/haiwei_mom/device/LubricationActivity.java b/app/src/main/java/com/example/haiwei_mom/device/LubricationActivity.java new file mode 100644 index 0000000..42ffa06 --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/device/LubricationActivity.java @@ -0,0 +1,81 @@ +package com.example.haiwei_mom.device; + +import android.os.Bundle; + +import androidx.databinding.DataBindingUtil; + +import com.example.haiwei_mom.R; +import com.example.haiwei_mom.adapter.ItemClickCall; +import com.example.haiwei_mom.adapter.device.LubricationAdapter; +import com.example.haiwei_mom.base.BaseActivity; +import com.example.haiwei_mom.base.MyRecultCall; +import com.example.haiwei_mom.base.MyResult; +import com.example.haiwei_mom.databinding.ActivityLubricationBinding; +import com.example.haiwei_mom.data.device.LubricationBeen; +import com.example.haiwei_mom.data.device.LubricationDetail; +import com.example.haiwei_mom.uitls.SharedPreferencesUtils; +import com.lzy.okgo.OkGo; +import com.lzy.okgo.model.Response; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import okhttp3.RequestBody; + +public class LubricationActivity extends BaseActivity implements ItemClickCall { + private LubricationAdapter adapter; + private List list; + private ActivityLubricationBinding binding; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + binding = DataBindingUtil.setContentView(this, R.layout.activity_lubrication); + adapter = new LubricationAdapter(this, this); + binding.setAdapter(adapter); + initRequest(); + } + + private void initRequest() { + OkGo.get(url + "/dms/mobile/getNewestLubeInstance").tag(this) + .execute(new MyRecultCall(dialog, this) { + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + if (body.getCode() == 200) { + LubricationBeen been = gson.fromJson(body.getData().toString(), LubricationBeen.class); + + binding.setVm(been); + list = been.getDmsBillsLubeDetailList(); + adapter.setList(list); + adapter.notifyDataSetChanged(); + } + } + }); + } + + @Override + public void onClick(int position) { + var maintainDetail = list.get(position); + var uri = maintainDetail.getButtonText().equals("开始润滑") ? "/dms/mobile/startLube" : "/dms/mobile/completeLube"; + Map map=new HashMap<>(); + + OkGo.post(url + uri) + .upRequestBody(RequestBody.create(JSON, gson.toJson(maintainDetail))) + .execute(new MyRecultCall(dialog, this) { + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + if (body.getCode() == 200) { + initRequest(); + return; + } + myToastUitls.show( body.getMsg()); + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/haiwei_mom/device/MaintainActivity.java b/app/src/main/java/com/example/haiwei_mom/device/MaintainActivity.java new file mode 100644 index 0000000..f60b0d8 --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/device/MaintainActivity.java @@ -0,0 +1,72 @@ +package com.example.haiwei_mom.device; + +import android.content.Intent; +import android.os.Bundle; + +import androidx.databinding.DataBindingUtil; + +import com.example.haiwei_mom.R; +import com.example.haiwei_mom.adapter.ItemClickCall; +import com.example.haiwei_mom.adapter.device.MaintainAdapter; +import com.example.haiwei_mom.base.BaseActivity; +import com.example.haiwei_mom.base.MyRecultCall; +import com.example.haiwei_mom.base.MyResult; +import com.example.haiwei_mom.databinding.ActivityMaintainBinding; +import com.example.haiwei_mom.data.device.MaintainBeen; +import com.example.haiwei_mom.data.device.MaintainDetail; +import com.example.haiwei_mom.uitls.SharedPreferencesUtils; +import com.lzy.okgo.OkGo; +import com.lzy.okgo.model.Response; + +import java.util.List; + +public class MaintainActivity extends BaseActivity implements ItemClickCall { + private MaintainAdapter adapter; + private List list; + private ActivityMaintainBinding binding; + private Intent intent; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + binding = DataBindingUtil.setContentView(this, R.layout.activity_maintain); + adapter = new MaintainAdapter(this, this); + binding.setAdapter(adapter); + intent=new Intent(this,MaintainInfoActivity.class); + + } + + @Override + protected void onResume() { + super.onResume(); + initRequest(); + } + + private void initRequest() { + OkGo.get(url + "/dms/mobile/getNewestMaintInstance").tag(this) + .execute(new MyRecultCall(dialog, this) { + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + if (body.getCode() == 200) { + MaintainBeen been = gson.fromJson(body.getData().toString(), MaintainBeen.class); + + binding.setVm(been); + list = been.getDmsBillsMaintDetailList(); + adapter.setList(list); + adapter.notifyDataSetChanged(); + } + } + }); + } + + @Override + public void onClick(int position) { + var maintainDetail = list.get(position); + intent.putExtra("json", gson.toJson(maintainDetail)); + startActivity(intent); + + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/haiwei_mom/device/MaintainInfoActivity.java b/app/src/main/java/com/example/haiwei_mom/device/MaintainInfoActivity.java new file mode 100644 index 0000000..7e65a1b --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/device/MaintainInfoActivity.java @@ -0,0 +1,81 @@ +package com.example.haiwei_mom.device; + +import android.annotation.SuppressLint; +import android.os.Bundle; +import android.view.View; + +import androidx.databinding.DataBindingUtil; +import androidx.databinding.ObservableBoolean; + +import com.example.haiwei_mom.R; +import com.example.haiwei_mom.adapter.device.MaintainProjectAdapter; +import com.example.haiwei_mom.base.BaseActivity; +import com.example.haiwei_mom.base.MyRecultCall; +import com.example.haiwei_mom.base.MyResult; +import com.example.haiwei_mom.databinding.ActivityMaintainInfoBinding; +import com.example.haiwei_mom.data.device.MaintainDetail; +import com.example.haiwei_mom.data.device.MaintainProject; +import com.example.haiwei_mom.uitls.SharedPreferencesUtils; +import com.lzy.okgo.OkGo; +import com.lzy.okgo.model.Response; + +import java.util.List; + +import okhttp3.RequestBody; + +public class MaintainInfoActivity extends BaseActivity { + private MaintainProjectAdapter adapter; + private List list; + private MaintainDetail maintainDetail; + private ObservableBoolean state; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + ActivityMaintainInfoBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_maintain_info); + adapter = new MaintainProjectAdapter(this); + binding.setAdapter(adapter); + state = new ObservableBoolean(); + state.set(false); + binding.setState(state); + // var uri = maintainDetail.getButtonText().equals("开始保养") ? "" : "/dms/mobile/completeMaint"; + OkGo.post(url + "/dms/mobile/startMaint") + .upRequestBody(RequestBody.create(JSON, getIntent().getStringExtra("json"))) + .execute(new MyRecultCall(dialog, this) { + @SuppressLint("NotifyDataSetChanged") + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + if (body.getCode() == 200) { + maintainDetail = gson.fromJson(body.getData().toString(), MaintainDetail.class); + state.set(maintainDetail.getMaintStatus() == 3); + list = maintainDetail.getDmsBillsMaintDetailProjectList(); + adapter.setList(list); + adapter.notifyDataSetChanged(); + return; + } + myToastUitls.show( body.getMsg()); + } + }); + + } + + + public void maintainInfoSubmit(View view) { + OkGo.post(url + "/dms/mobile/completeMaint") + .upRequestBody(RequestBody.create(JSON, gson.toJson(maintainDetail))).execute(new MyRecultCall(dialog, this) { + @SuppressLint("NotifyDataSetChanged") + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + if (body.getCode() == 200) { + finish(); + return; + } + myToastUitls.show( body.getMsg()); + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/haiwei_mom/dialog/ImgDialog.java b/app/src/main/java/com/example/haiwei_mom/dialog/ImgDialog.java new file mode 100644 index 0000000..2bceaa9 --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/dialog/ImgDialog.java @@ -0,0 +1,39 @@ +package com.example.haiwei_mom.dialog; + +import android.app.Dialog; +import android.content.Context; +import android.view.LayoutInflater; + +import androidx.annotation.NonNull; +import androidx.databinding.DataBindingUtil; + +import com.bumptech.glide.Glide; +import com.example.haiwei_mom.R; +import com.example.haiwei_mom.databinding.DialogImgBinding; + +/** + * @author wanghao + * @date 2024/2/22 11:07 + */ +public class ImgDialog extends Dialog { + private DialogImgBinding binding; + + private Context context; + + public void setRawReturn(String url) { + Glide.with(context).load(url).into(binding.dialogImg); + binding.executePendingBindings(); + show(); + + } + + public ImgDialog(@NonNull Context context) { + super(context,R.style.dialog_style); + this.context=context; + binding = DataBindingUtil.inflate(LayoutInflater.from(context), R.layout.dialog_img, null, false); + setContentView(binding.getRoot()); + binding.dialogImgDis.setOnClickListener(v -> dismiss()); + } + + +} diff --git a/app/src/main/java/com/example/haiwei_mom/dialog/RepairPartAddDialog.java b/app/src/main/java/com/example/haiwei_mom/dialog/RepairPartAddDialog.java new file mode 100644 index 0000000..538f826 --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/dialog/RepairPartAddDialog.java @@ -0,0 +1,41 @@ +package com.example.haiwei_mom.dialog; + +import android.app.Dialog; +import android.content.Context; +import android.view.LayoutInflater; + +import androidx.annotation.NonNull; +import androidx.databinding.DataBindingUtil; + +import com.example.haiwei_mom.R; +import com.example.haiwei_mom.databinding.DialogAddPartBinding; +import com.example.haiwei_mom.data.device.DeviceRepairPart; + +/** + * @author wanghao + * @date 2024/2/22 11:07 + */ +public class RepairPartAddDialog extends Dialog { + + + private RepairPartAddDialogCall stockReturnDialogCall; + private Context context; + + + public RepairPartAddDialog(@NonNull Context context, RepairPartAddDialogCall call) { + super(context, R.style.dialog_style); + this.context = context; + this.stockReturnDialogCall = call; + DialogAddPartBinding binding = DataBindingUtil.inflate(LayoutInflater.from(context), R.layout.dialog_add_part, null, false); + setContentView(binding.getRoot()); + DeviceRepairPart deviceRepairPart=new DeviceRepairPart(); + binding.setVm(deviceRepairPart); + binding.dialogAddpartFalse.setOnClickListener(v -> dismiss()); + binding.dialogAddpartTrue.setOnClickListener(v -> call.returnResult(deviceRepairPart)); + } + + public interface RepairPartAddDialogCall { + void returnResult(DeviceRepairPart deviceRepairPart); + } + +} diff --git a/app/src/main/java/com/example/haiwei_mom/wms/raw/RawReturnActivity.java b/app/src/main/java/com/example/haiwei_mom/wms/raw/RawReturnActivity.java index c7e6b14..7db4fce 100644 --- a/app/src/main/java/com/example/haiwei_mom/wms/raw/RawReturnActivity.java +++ b/app/src/main/java/com/example/haiwei_mom/wms/raw/RawReturnActivity.java @@ -90,7 +90,6 @@ public class RawReturnActivity extends BaseActivity { sub.setOutstockRecordId(params.getOutstockRecordId()); // 修改出库 sub.setOutstockRecordId(params.getOutstockRecordId()); - OkGo.post(url + "/wms/pda/raw/returnSubmit") .upRequestBody(RequestBody.create(JSON, gson.toJson(sub))) .execute(new MyRecultCall(dialog, context) { @@ -110,9 +109,7 @@ public class RawReturnActivity extends BaseActivity { @Override public void getScannerData(String data) { super.getScannerData(data); - binding.rawReturnCode.setText(data); - selectCode(); } diff --git a/app/src/main/java/com/example/haiwei_mom/wms/semi/BindingActivity.java b/app/src/main/java/com/example/haiwei_mom/wms/semi/BindingActivity.java new file mode 100644 index 0000000..398987f --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/wms/semi/BindingActivity.java @@ -0,0 +1,23 @@ +package com.example.haiwei_mom.wms.semi; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; +import android.view.View; +import android.widget.Toast; + +import com.example.haiwei_mom.R; + +public class BindingActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_binding); + } + + public void submit(View view) { + Toast.makeText(this, "绑定成功", Toast.LENGTH_SHORT).show(); + finish(); + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/button_bg.xml b/app/src/main/res/drawable/button_bg.xml new file mode 100644 index 0000000..64b9b24 --- /dev/null +++ b/app/src/main/res/drawable/button_bg.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_xl.png b/app/src/main/res/drawable/ic_xl.png new file mode 100644 index 0000000..9446e21 Binary files /dev/null and b/app/src/main/res/drawable/ic_xl.png differ diff --git a/app/src/main/res/layout/activity_binding.xml b/app/src/main/res/layout/activity_binding.xml new file mode 100644 index 0000000..ddc43d9 --- /dev/null +++ b/app/src/main/res/layout/activity_binding.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +