1.修改设备文件名称

2.//TODO (采购新增，设备采购-维修列表接口,新增维修的部门接口，接单显示规则)，坩埚下单，下单时间选择器当前时间验证，mes其他页面，mes用户反馈空也展示，编辑任务担当无法修改

app/src/main/AndroidManifest.xml

@@ -1890,7 +1890,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.work.WorkDeviceActivity"
+            android:name=".ui.activity.bat.work.DeviceActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="设备"
             android:launchMode="singleTop"
@@ -1898,7 +1898,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.work.WorkDeviceListActivity"
+            android:name=".ui.activity.bat.work.DeviceListActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="设备列表"
             android:launchMode="singleTop"
@@ -1970,7 +1970,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.work.WorkDeviceDetailActivity"
+            android:name=".ui.activity.bat.work.DeviceDetailActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="设备详情"
             android:launchMode="singleTop"
@@ -1978,7 +1978,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.work.WorkDeviceNextActivity"
+            android:name=".ui.activity.bat.work.DeviceNextActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="部件详情"
             android:launchMode="singleTop"
@@ -1994,7 +1994,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.work.WorkDeviceRepairActivity"
+            android:name=".ui.activity.bat.work.DeviceRepairActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="设备维修"
             android:launchMode="singleTop"
@@ -2002,7 +2002,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.work.WorkDeviceBuyActivity"
+            android:name=".ui.activity.bat.work.DeviceBuyActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="设备采购"
             android:launchMode="singleTop"
@@ -2011,7 +2011,7 @@
             android:windowSoftInputMode="adjustPan" />
 
         <activity
-            android:name=".ui.activity.bat.work.WorkDeviceBuyAddActivity"
+            android:name=".ui.activity.bat.work.DeviceBuyAddActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="添加设备采购"
             android:launchMode="singleTop"
@@ -2019,7 +2019,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.work.WorkDeviceBuyProductActivity"
+            android:name=".ui.activity.bat.work.DeviceBuyProductActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="选择产品"
             android:launchMode="singleTop"
@@ -2027,7 +2027,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.work.WorkDeviceBuyCarActivity"
+            android:name=".ui.activity.bat.work.DeviceBuyCarActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="购物车"
             android:launchMode="singleTop"
@@ -2035,7 +2035,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.work.WorkDeviceBuyConfirmActivity"
+            android:name=".ui.activity.bat.work.DeviceBuyConfirmActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="确认"
             android:launchMode="singleTop"

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkDeviceActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceActivity.java

@@ -16,7 +16,7 @@ import butterknife.OnClick;
  * email : lgd19940421@163.com
  * github: https://github.com/FlexibleXd
  **/
-public class WorkDeviceActivity extends WorkToolBarActivity {
+public class DeviceActivity extends WorkToolBarActivity {
 
 
     @BindView(R.id.rl_device)
@@ -49,13 +49,13 @@ public class WorkDeviceActivity extends WorkToolBarActivity {
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.rl_device:
-                startActivity(WorkDeviceListActivity.class);
+                startActivity(DeviceListActivity.class);
                 break;
             case R.id.rl_service:
-                startActivity(WorkDeviceRepairActivity.class);
+                startActivity(DeviceRepairActivity.class);
                 break;
             case R.id.rl_buy:
-                startActivity(WorkDeviceBuyActivity.class);
+                startActivity(DeviceBuyActivity.class);
                 break;
         }
     }

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkDeviceBuyActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceBuyActivity.java

@@ -3,18 +3,14 @@ package com.wd.workoffice.ui.activity.bat.work;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
 
 import com.google.android.material.tabs.TabLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.workEnum.PagePermissionType;
-import com.wd.workoffice.ui.activity.bat.order.CrucibleOrderSearchActivity;
 import com.wd.workoffice.ui.adapter.VpDataAdapter;
 import com.wd.workoffice.ui.fg.DeviceBuyCheckFragment;
 import com.wd.workoffice.ui.fg.DeviceBuyFragment;
-import com.wd.workoffice.ui.fg.DeviceRepairCheckFragment;
-import com.wd.workoffice.ui.fg.DeviceRepairFragment;
 import com.wd.workoffice.util.WorkUtils;
 
 import java.util.ArrayList;
@@ -34,7 +30,7 @@ import static com.google.android.material.tabs.TabLayout.MODE_FIXED;
  * email : lgd19940421@163.com
  * github: https://github.com/FlexibleXd
  **/
-public class WorkDeviceBuyActivity extends WorkToolBarActivity {
+public class DeviceBuyActivity extends WorkToolBarActivity {
 
     @BindView(R.id.tl_tab)
     TabLayout tlTab;
@@ -93,7 +89,7 @@ public class WorkDeviceBuyActivity extends WorkToolBarActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.add:
-                startActivity(WorkDeviceBuyAddActivity.class);
+                startActivity(DeviceBuyAddActivity.class);
                 break;
         }
         return super.onOptionsItemSelected(item);

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkDeviceBuyAddActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceBuyAddActivity.java

 package com.wd.workoffice.ui.activity.bat.work;
 
 import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Bundle;
 import android.view.View;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -13,23 +11,13 @@ import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.DepBean;
-import com.wd.workoffice.bean.ProcessBean;
-import com.wd.workoffice.bean.StockBean;
-import com.wd.workoffice.bean.workEnum.PagePermissionType;
-import com.wd.workoffice.bean.workEnum.PermissionType;
-import com.wd.workoffice.contract.BatSaleContract;
-import com.wd.workoffice.presenter.BatSalePresenter;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.activity.bat.store.StoreSaleClientActivity;
-import com.wd.workoffice.ui.activity.bat.store.StoreSaleProductActivity;
 import com.wd.workoffice.util.DialogUtils;
-import com.wd.workoffice.util.WorkUtils;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.annotation.Nullable;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -42,7 +30,7 @@ import io.reactivex.disposables.Disposable;
  * email : lgd19940421@163.com
  * github: https://github.com/FlexibleXd
  **/
-public class WorkDeviceBuyAddActivity extends WorkToolBarActivity  {
+public class DeviceBuyAddActivity extends WorkToolBarActivity  {
 
     @BindView(R.id.tv_dep)
     TextView tvDep;
@@ -123,7 +111,7 @@ public class WorkDeviceBuyAddActivity extends WorkToolBarActivity  {
                     toast("请选择接单部门");
                     return;
                 }
-                startActivity(WorkDeviceBuyProductActivity.class,
+                startActivity(DeviceBuyProductActivity.class,
                         "depId", chooseDep.getId() + "",
                         "depName", chooseDep.getName() + "");
                 break;

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkDeviceBuyCarActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceBuyCarActivity.java

@@ -11,11 +11,8 @@ import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.DeviceBean;
-import com.wd.workoffice.bean.ProductBean;
 import com.wd.workoffice.bean.event.ModifyCarEvent;
-import com.wd.workoffice.ui.activity.bat.store.StoreSaleConfirmActivity;
 import com.wd.workoffice.ui.adapter.DeviceCarAdapter;
-import com.wd.workoffice.ui.adapter.StoreCarAdapter;
 import com.wd.workoffice.util.DialogUtils;
 import com.wd.workoffice.util.MathUtils;
 
@@ -38,7 +35,7 @@ import butterknife.OnClick;
  * email : lgd19940421@163.com
  * github: https://github.com/FlexibleXd
  **/
-public class WorkDeviceBuyCarActivity extends WorkToolBarActivity {
+public class DeviceBuyCarActivity extends WorkToolBarActivity {
 
     @BindView(R.id.tv_num)
     TextView tvNum;
@@ -75,7 +72,7 @@ public class WorkDeviceBuyCarActivity extends WorkToolBarActivity {
         productAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
             @Override
             public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
-                QMUIDialog.MessageDialogBuilder dialog = DialogUtils.okAndCancelDialog(WorkDeviceBuyCarActivity.this);
+                QMUIDialog.MessageDialogBuilder dialog = DialogUtils.okAndCancelDialog(DeviceBuyCarActivity.this);
                 dialog.setMessage("是否删除").addAction("取消", new QMUIDialogAction.ActionListener() {
                     @Override
                     public void onClick(QMUIDialog dialog, int index) {
@@ -105,7 +102,7 @@ public class WorkDeviceBuyCarActivity extends WorkToolBarActivity {
         for (DeviceBean.RecordsBean recordsBean : productList) {
             allPrice = MathUtils.add(allPrice, MathUtils.multiply(recordsBean.getCarNum() + "", recordsBean.getCarPrice()+"", 2), 2);
         }
-        startActivity(WorkDeviceBuyConfirmActivity.class, "pro", JSON.toJSONString(productList),
+        startActivity(DeviceBuyConfirmActivity.class, "pro", JSON.toJSONString(productList),
                 "depId", getIntent().getStringExtra("depId"),
                 "depName", getIntent().getStringExtra("depName"),
                 "launchOrderAmount", allPrice);

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkDeviceBuyConfirmActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceBuyConfirmActivity.java

@@ -72,7 +72,7 @@ import okhttp3.RequestBody;
  * email : lgd19940421@163.com
  * github: https://github.com/FlexibleXd
  **/
-public class WorkDeviceBuyConfirmActivity extends WorkToolBarActivity {
+public class DeviceBuyConfirmActivity extends WorkToolBarActivity {
 
     @BindView(R.id.tv_num)
     TextView tvNum;

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkDeviceBuyProductActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceBuyProductActivity.java

 package com.wd.workoffice.ui.activity.bat.work;
 
-import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -16,14 +15,10 @@ import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.DeviceBean;
-import com.wd.workoffice.bean.ProductBean;
 import com.wd.workoffice.bean.event.ModifyCarEvent;
-import com.wd.workoffice.bean.workEnum.PermissionType;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.activity.bat.store.StoreSaleCarActivity;
 import com.wd.workoffice.ui.adapter.DeviceProductAdapter;
-import com.wd.workoffice.ui.adapter.StoreProductAdapter;
 import com.wd.workoffice.util.WorkUtils;
 import com.wd.workoffice.widget.AddAndReduceView;
 
@@ -40,7 +35,6 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import butterknife.OnClick;
 import flexible.xd.android_base.network.rtfhttp.Transformer;
 import io.reactivex.disposables.Disposable;
 
@@ -50,7 +44,7 @@ import io.reactivex.disposables.Disposable;
  * email : lgd19940421@163.com
  * github: https://github.com/FlexibleXd
  **/
-public class WorkDeviceBuyProductActivity extends WorkToolBarActivity {
+public class DeviceBuyProductActivity extends WorkToolBarActivity {
     @BindView(R.id.rv_product)
     RecyclerView rvProduct;
     private Map<String, Object> param;
@@ -219,7 +213,7 @@ public class WorkDeviceBuyProductActivity extends WorkToolBarActivity {
                     toast("购物车没有产品");
                     return super.onOptionsItemSelected(item);
                 }
-                startActivity(WorkDeviceBuyCarActivity.class,
+                startActivity(DeviceBuyCarActivity.class,
                         "pro", JSON.toJSONString(carList),
                         "depId", getIntent().getStringExtra("depId"),
                         "depName", getIntent().getStringExtra("depName"));

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkDeviceDetailActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceDetailActivity.java

@@ -29,7 +29,7 @@ import io.reactivex.disposables.Disposable;
  * email : lgd19940421@163.com
  * github: https://github.com/FlexibleXd
  **/
-public class WorkDeviceDetailActivity extends WorkToolBarActivity {
+public class DeviceDetailActivity extends WorkToolBarActivity {
     @BindView(R.id.tv_type)
     TextView tvType;
     @BindView(R.id.tv_big_clazz)

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkDeviceListActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceListActivity.java

@@ -29,7 +29,7 @@ import butterknife.ButterKnife;
  * email : lgd19940421@163.com
  * github: https://github.com/FlexibleXd
  **/
-public class WorkDeviceListActivity extends WorkToolBarActivity {
+public class DeviceListActivity extends WorkToolBarActivity {
 
     @BindView(R.id.tl_tab)
     TabLayout tlTab;

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkDeviceNextActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceNextActivity.java

 package com.wd.workoffice.ui.activity.bat.work;
 
-import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
@@ -37,7 +36,7 @@ import io.reactivex.disposables.Disposable;
  * email : lgd19940421@163.com
  * github: https://github.com/FlexibleXd
  **/
-public class WorkDeviceNextActivity extends WorkToolBarActivity {
+public class DeviceNextActivity extends WorkToolBarActivity {
 
     @BindView(R.id.rv_data)
     RecyclerView rvData;
@@ -138,7 +137,7 @@ public class WorkDeviceNextActivity extends WorkToolBarActivity {
         dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                startActivity(WorkDeviceDetailActivity.class,
+                startActivity(DeviceDetailActivity.class,
                         "info", JSON.toJSONString(dataList.get(position)));
             }
         });
@@ -147,7 +146,7 @@ public class WorkDeviceNextActivity extends WorkToolBarActivity {
             public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
                 switch (view.getId()) {
                     case R.id.tv_component:
-                        startActivity(WorkDeviceNextActivity.class,
+                        startActivity(DeviceNextActivity.class,
                                 "id", dataList.get(position).getId()+"");
                         break;
                     case R.id.tv_agree:

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkDeviceRepairActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceRepairActivity.java

@@ -8,10 +8,7 @@ import com.google.android.material.tabs.TabLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.workEnum.PagePermissionType;
-import com.wd.workoffice.ui.activity.bat.order.CrucibleOrderSearchActivity;
 import com.wd.workoffice.ui.adapter.VpDataAdapter;
-import com.wd.workoffice.ui.fg.CrucibleOrderBuyFragment;
-import com.wd.workoffice.ui.fg.CrucibleOrderSaleFragment;
 import com.wd.workoffice.ui.fg.DeviceRepairCheckFragment;
 import com.wd.workoffice.ui.fg.DeviceRepairFragment;
 import com.wd.workoffice.util.WorkUtils;
@@ -33,7 +30,7 @@ import static com.google.android.material.tabs.TabLayout.MODE_FIXED;
  * email : lgd19940421@163.com
  * github: https://github.com/FlexibleXd
  **/
-public class WorkDeviceRepairActivity extends WorkToolBarActivity {
+public class DeviceRepairActivity extends WorkToolBarActivity {
 
     @BindView(R.id.tl_tab)
     TabLayout tlTab;
@@ -92,7 +89,7 @@ public class WorkDeviceRepairActivity extends WorkToolBarActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.add:
-                startActivity(WorkDeviceBuyAddActivity.class);
+                startActivity(DeviceBuyAddActivity.class);
                 break;
         }
         return super.onOptionsItemSelected(item);

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkSparePartsActivity.java

 package com.wd.workoffice.ui.activity.bat.work;
 
-import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
@@ -11,7 +10,6 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseBean;
-import com.wd.workoffice.app.WorkBaseFg;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.SparePartsBean;
 import com.wd.workoffice.bean.workEnum.PagePermissionType;
@@ -24,7 +22,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
@@ -140,7 +137,7 @@ public class WorkSparePartsActivity extends WorkToolBarActivity {
         dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                startActivity(WorkDeviceDetailActivity.class,
+                startActivity(DeviceDetailActivity.class,
                         "info", JSON.toJSONString(dataList.get(position)));
             }
         });

app/src/main/java/com/wd/workoffice/ui/fg/DeviceListFragment.java

@@ -15,9 +15,8 @@ import com.wd.workoffice.bean.DeviceBean;
 import com.wd.workoffice.bean.workEnum.PagePermissionType;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.activity.bat.order.SendApplyDetailActivity;
-import com.wd.workoffice.ui.activity.bat.work.WorkDeviceDetailActivity;
-import com.wd.workoffice.ui.activity.bat.work.WorkDeviceNextActivity;
+import com.wd.workoffice.ui.activity.bat.work.DeviceDetailActivity;
+import com.wd.workoffice.ui.activity.bat.work.DeviceNextActivity;
 import com.wd.workoffice.ui.activity.bat.work.WorkSparePartsActivity;
 import com.wd.workoffice.ui.adapter.DeviceAdapter;
 import com.wd.workoffice.util.WorkUtils;
@@ -147,7 +146,7 @@ public class DeviceListFragment extends WorkBaseFg {
         dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                startActivity(WorkDeviceDetailActivity.class,
+                startActivity(DeviceDetailActivity.class,
                         "info", JSON.toJSONString(dataList.get(position)));
             }
         });
@@ -156,7 +155,7 @@ public class DeviceListFragment extends WorkBaseFg {
             public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
                 switch (view.getId()) {
                     case R.id.tv_component:
-                        startActivity(WorkDeviceNextActivity.class,
+                        startActivity(DeviceNextActivity.class,
                                 "id", dataList.get(position).getId()+"");
                         break;
                     case R.id.tv_spare_parts:

app/src/main/java/com/wd/workoffice/ui/fg/SparePartsFragment.java

@@ -11,15 +11,11 @@ import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseBean;
 import com.wd.workoffice.app.WorkBaseFg;
-import com.wd.workoffice.bean.DeviceBean;
 import com.wd.workoffice.bean.SparePartsBean;
 import com.wd.workoffice.bean.workEnum.PagePermissionType;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.activity.bat.order.SendApplyDetailActivity;
-import com.wd.workoffice.ui.activity.bat.work.WorkDeviceDetailActivity;
-import com.wd.workoffice.ui.activity.bat.work.WorkDeviceNextActivity;
-import com.wd.workoffice.ui.adapter.DeviceAdapter;
+import com.wd.workoffice.ui.activity.bat.work.DeviceDetailActivity;
 import com.wd.workoffice.ui.adapter.SparePartsAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
@@ -148,7 +144,7 @@ public class SparePartsFragment extends WorkBaseFg {
         dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                startActivity(WorkDeviceDetailActivity.class,
+                startActivity(DeviceDetailActivity.class,
                         "info", JSON.toJSONString(dataList.get(position)));
             }
         });

app/src/main/java/com/wd/workoffice/ui/fg/WorkFragment.java

@@ -11,10 +11,9 @@ import com.wd.workoffice.bean.vo.BatLayoutVo;
 import com.wd.workoffice.ui.activity.WorkOrderActivity;
 import com.wd.workoffice.ui.activity.bat.approval.ApprovalFromMeActivity;
 import com.wd.workoffice.ui.activity.bat.approval.ApprovalToMeActivity;
-import com.wd.workoffice.ui.activity.bat.work.WorkAccountActivity;
+import com.wd.workoffice.ui.activity.bat.work.DeviceActivity;
 import com.wd.workoffice.ui.activity.bat.work.WorkContactsActivity;
 import com.wd.workoffice.ui.activity.bat.work.WorkDepActivity;
-import com.wd.workoffice.ui.activity.bat.work.WorkDeviceActivity;
 import com.wd.workoffice.ui.activity.bat.work.WorkFinancialActivity;
 import com.wd.workoffice.ui.activity.bat.work.WorkInStockActivity;
 import com.wd.workoffice.ui.activity.bat.work.WorkProActivity;
@@ -179,7 +178,7 @@ public class WorkFragment extends WorkBaseFg {
                         startActivity(WorkFinancialActivity.class);
                         break;
                     case 5:
-                        startActivity(WorkDeviceActivity.class);
+                        startActivity(DeviceActivity.class);
                         break;
 //                    case 7:
 //                        toast("暂无数据");