1.养护管理，提醒保养项目跟随保养项目展示完整，排序调整，预览附件文字改成蓝色

2.扫一扫界面不需要退出可以直接扫码
4.养护管理标题文字对齐 ，备注窗体和下拉窗体位置切换
5.提交完成后焦点切换到扫码框清楚内容
6.养护管理提交按钮置底

app/src/main/java/com/uas/rd_equipment/fragment/BreakdownRepairFragment.java

@@ -72,6 +72,7 @@ public class BreakdownRepairFragment extends BaseFragment{
 
     @Override
     protected void initEvents() {
+        ce_de_code.requestFocus();
         ce_de_code.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
@@ -163,6 +164,8 @@ public class BreakdownRepairFragment extends BaseFragment{
                 tv_prompt.setVisibility(View.VISIBLE);
                 tv_prompt.setTextColor(Color.GREEN);
                 tv_prompt.setText("提交成功");
+                ce_de_code.setText("");
+                ce_de_code.requestFocus();
             }
 
             @Override
@@ -171,6 +174,8 @@ public class BreakdownRepairFragment extends BaseFragment{
                 tv_prompt.setVisibility(View.VISIBLE);
                 tv_prompt.setTextColor(Color.RED);
                 tv_prompt.setText(failStr);
+                ce_de_code.setText("");
+                ce_de_code.requestFocus();
 //                CommonUtil.toastNoRepeat(mActivity, failStr);
 
             }
@@ -190,6 +195,8 @@ public class BreakdownRepairFragment extends BaseFragment{
                 tv_prompt.setVisibility(View.VISIBLE);
                 tv_prompt.setTextColor(Color.GREEN);
                 tv_prompt.setText("确认故障成功");
+                ce_de_code.setText("");
+                ce_de_code.requestFocus();
             }
 
             @Override
@@ -198,6 +205,8 @@ public class BreakdownRepairFragment extends BaseFragment{
                 tv_prompt.setVisibility(View.VISIBLE);
                 tv_prompt.setTextColor(Color.RED);
                 tv_prompt.setText(failStr);
+                ce_de_code.setText("");
+                ce_de_code.requestFocus();
 //                CommonUtil.toastNoRepeat(mActivity, failStr);
 
             }

app/src/main/java/com/uas/rd_equipment/fragment/DeliveryForRepairFragment.java

@@ -92,7 +92,7 @@ public class DeliveryForRepairFragment extends BaseFragment{
         ce_de_code = root.findViewById(R.id.ce_de_code);
         storage_recharge_scan_iv = root.findViewById(R.id.storage_recharge_scan_iv);
         btn_confirm_repair = root.findViewById(R.id.btn_confirm_repair);
-
+        ce_de_code.requestFocus();
     }
 
     @Override
@@ -255,6 +255,8 @@ public class DeliveryForRepairFragment extends BaseFragment{
                 tv_prompt.setVisibility(View.VISIBLE);
                 tv_prompt.setTextColor(Color.GREEN);
                 tv_prompt.setText("提交成功");
+                ce_de_code.setText("");
+                ce_de_code.requestFocus();
             }
 
             @Override
@@ -263,6 +265,8 @@ public class DeliveryForRepairFragment extends BaseFragment{
                 tv_prompt.setVisibility(View.VISIBLE);
                 tv_prompt.setTextColor(Color.RED);
                 tv_prompt.setText(failStr);
+                ce_de_code.setText("");
+                ce_de_code.requestFocus();
 //                CommonUtil.toastNoRepeat(mActivity, failStr);
 
             }
@@ -286,6 +290,8 @@ public class DeliveryForRepairFragment extends BaseFragment{
                 tv_prompt.setVisibility(View.VISIBLE);
                 tv_prompt.setTextColor(Color.GREEN);
                 tv_prompt.setText("确认已维修成功");
+                ce_de_code.setText("");
+                ce_de_code.requestFocus();
             }
 
             @Override
@@ -295,6 +301,8 @@ public class DeliveryForRepairFragment extends BaseFragment{
                 tv_prompt.setVisibility(View.VISIBLE);
                 tv_prompt.setTextColor(Color.RED);
                 tv_prompt.setText(failStr);
+                ce_de_code.setText("");
+                ce_de_code.requestFocus();
             }
         });
     }

app/src/main/java/com/uas/rd_equipment/fragment/RemouIdRepairFragment.java

@@ -105,6 +105,7 @@ public class RemouIdRepairFragment extends BaseFragment{
 
     @Override
     protected void initEvents() {
+        ce_de_code.requestFocus();
         ce_de_code.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {

app/src/main/java/com/uas/rd_equipment/fragment/RequisitionTransferFragment.java

@@ -155,6 +155,7 @@ public class RequisitionTransferFragment extends BaseFragment{
 
     @Override
     protected void initEvents() {
+        ce_de_code.requestFocus();
         tv_dc_linecode.setEnabled(false);
         tv_dc_linecode.setFocusable(false);
         tv_dc_linecode.setKeyListener(null);//重点
@@ -436,6 +437,8 @@ public class RequisitionTransferFragment extends BaseFragment{
                 tv_apply_forcode.setText(dc_code);
                 getNewNameData();
                 EventBus.getDefault().post(new MessageOutboundEvents("提交单据后刷新列表"));
+                ce_de_code.setText("");
+                ce_de_code.requestFocus();
 
             }
 
@@ -445,6 +448,8 @@ public class RequisitionTransferFragment extends BaseFragment{
                 tv_prompt.setVisibility(View.VISIBLE);
                 tv_prompt.setTextColor(Color.RED);
                 tv_prompt.setText(failStr);
+                ce_de_code.setText("");
+                ce_de_code.requestFocus();
 //                CommonUtil.toastNoRepeat(mActivity, failStr);
 
             }
@@ -471,6 +476,8 @@ public class RequisitionTransferFragment extends BaseFragment{
 //                String dc_code = FastjsonUtil.getText(dataObject, "dc_code");
                 EventBus.getDefault().post(new MessageOutboundEvents("提交单据后刷新列表"));
                 getNewNameData();
+                ce_de_code.setText("");
+                ce_de_code.requestFocus();
             }
 
             @Override
@@ -480,7 +487,8 @@ public class RequisitionTransferFragment extends BaseFragment{
                 tv_prompt.setTextColor(Color.RED);
                 tv_prompt.setText(failStr);
 //                CommonUtil.toastNoRepeat(mActivity, failStr);
-
+                ce_de_code.setText("");
+                ce_de_code.requestFocus();
             }
         });
     }
@@ -505,6 +513,8 @@ public class RequisitionTransferFragment extends BaseFragment{
 //                String dc_code = FastjsonUtil.getText(dataObject, "dc_code");
                 EventBus.getDefault().post(new MessageOutboundEvents("提交单据后刷新列表"));
                 getNewNameData();
+                ce_de_code.setText("");
+                ce_de_code.requestFocus();
 
             }
 
@@ -514,6 +524,8 @@ public class RequisitionTransferFragment extends BaseFragment{
                 tv_prompt.setVisibility(View.VISIBLE);
                 tv_prompt.setTextColor(Color.RED);
                 tv_prompt.setText(failStr);
+                ce_de_code.setText("");
+                ce_de_code.requestFocus();
 //                CommonUtil.toastNoRepeat(mActivity, failStr);
 
             }
@@ -534,7 +546,8 @@ public class RequisitionTransferFragment extends BaseFragment{
                 tv_prompt.setVisibility(View.VISIBLE);
                 tv_prompt.setTextColor(Color.GREEN);
                 tv_prompt.setText("上架成功");
-
+                ce_de_code.setText("");
+                ce_de_code.requestFocus();
 
             }
 
@@ -545,7 +558,8 @@ public class RequisitionTransferFragment extends BaseFragment{
                 tv_prompt.setTextColor(Color.RED);
                 tv_prompt.setText(failStr);
 //                CommonUtil.toastNoRepeat(mActivity, failStr);
-
+                ce_de_code.setText("");
+                ce_de_code.requestFocus();
             }
         });
     }

app/src/main/java/com/uas/rd_equipment/fragment/StorageInFragment.java

@@ -15,6 +15,7 @@ import android.view.KeyEvent;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 import android.widget.TextView;
@@ -91,6 +92,7 @@ public class StorageInFragment extends BaseFragment implements View.OnClickListe
     private TextView tv_de_lefttime;
     private TextView tv_de_manageman;
     private TextView de_managemantel;
+    private ImageView btn_actionbar_scan_iv;
 
     @Override
     protected int getLayout() {
@@ -103,8 +105,11 @@ public class StorageInFragment extends BaseFragment implements View.OnClickListe
         ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
         root.setBackgroundColor(getResources().getColor(R.color.background_color_second));
         mMoreBtn = mActivity.findViewById(R.id.btn_actionbar_more);
+        btn_actionbar_scan_iv = mActivity.findViewById(R.id.btn_actionbar_scan_iv);
+        btn_actionbar_scan_iv.setVisibility(View.VISIBLE);
 //        打开相机扫一扫
         CommonUtil.scanBarcode(mActivity, this, 0x10);
+
     }
 
     @Override
@@ -128,8 +133,8 @@ public class StorageInFragment extends BaseFragment implements View.OnClickListe
 
         mSmartTable2 = root.findViewById(R.id.smar_item1);
         ra_data = root.findViewById(R.id.ra_Data);
-
         mMenuButton.setOnClickListener(this);
+        btn_actionbar_scan_iv.setOnClickListener(this);
         if (!EventBus.getDefault().isRegistered(this)) {
             EventBus.getDefault().register(this);
         }
@@ -365,6 +370,9 @@ public class StorageInFragment extends BaseFragment implements View.OnClickListe
                 CommonUtil.setBackgroundAlpha(getActivity(), 0.5f);
                 mMenuPopupWindow.showAsDropDown(mMenuButton);
                 break;
+            case R.id.btn_actionbar_scan_iv:
+                CommonUtil.scanBarcode(mActivity, this, 0x10);
+                break;
         }
 //        getFragmentManager().beginTransaction().addToBackStack(null).replace(R.id.container_function_fragment, mFragment).commit();
 
@@ -375,6 +383,7 @@ public class StorageInFragment extends BaseFragment implements View.OnClickListe
                 .url(GloableParams.ASTATIONTHE_SWEEP_DATA)
                 .method(Request.Method.GET)
                 .addParam("de_code", de_code)
+                .addParam("checkdevice","nocheck")
                 .build(), new HttpCallback() {
             @Override
             public void onSuccess(int flag, Object o) throws Exception {
@@ -383,6 +392,7 @@ public class StorageInFragment extends BaseFragment implements View.OnClickListe
                     beanitemsList.clear();
                     beanitemsList2.clear();
                     String result = o.toString();
+                    JSONObject resultObject = JSON.parseObject(result);
                     Gson gson = new Gson();
                     UrlDataBean urlDataBean = gson.fromJson(o.toString(), UrlDataBean.class);
                     UrlDataBean.DeviceBean device = urlDataBean.getDevice();
@@ -400,7 +410,7 @@ public class StorageInFragment extends BaseFragment implements View.OnClickListe
                         ra_data.setVisibility(View.GONE);
                     }
 
-                    JSONObject resultObject = JSON.parseObject(result);
+
                     JSONObject dataObject = resultObject.getJSONObject("device");
                     de_code1 = FastjsonUtil.getText(dataObject, "DE_CODE");//编号
                     tv_de_code.setText(FastjsonUtil.getText(dataObject, "DE_CODE"));
@@ -421,7 +431,6 @@ public class StorageInFragment extends BaseFragment implements View.OnClickListe
                     JSONArray items = resultObject.getJSONArray("items");
                     for (int i=0;i<items.size();i++){
                         JSONObject dataObjectitems = items.getJSONObject(i);
-
                         BeanitemsBean beanitemsBean=new BeanitemsBean();
                         beanitemsBean.setDC_KIND(FastjsonUtil.getText(dataObjectitems, "DC_KIND"));
                         beanitemsBean.setDC_ACTIONDATE(FastjsonUtil.getText(dataObjectitems, "DC_ACTIONDATE"));

app/src/main/java/com/uas/rd_equipment/fragment/StorageRechargeListFragment.java

@@ -145,11 +145,11 @@ public class StorageRechargeListFragment extends BaseFragment implements OnColum
         tv_add = mActivity.findViewById(R.id.tv_add);
 
         if (!StringUtil.isEmpty(de_code)){
-            tv_de_code.setText("编号："+de_code);
+            tv_de_code.setText(""+de_code);
         }else if (!StringUtil.isEmpty(de_name)){
-            tv_de_name.setText("名称:"+de_name);
+            tv_de_name.setText(""+de_name);
         }
-
+        ce_de_code.requestFocus();
         mFilterStorageInBeans = Collections.synchronizedList(new ArrayList<>());
 
         ce_de_code.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@@ -169,6 +169,7 @@ public class StorageRechargeListFragment extends BaseFragment implements OnColum
         storage_recharge_scan_iv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                ce_de_code.setText("");
                 ce_de_code.requestFocus();
                 if (CameraUtil.hasCamera()) {
                     if (root.findFocus() != null) {
@@ -526,6 +527,8 @@ public class StorageRechargeListFragment extends BaseFragment implements OnColum
                 tv_prompt.setVisibility(View.VISIBLE);
                 tv_prompt.setTextColor(Color.GREEN);
                 tv_prompt.setText("提交成功");
+                ce_de_code.setText("");
+                ce_de_code.requestFocus();
             }
 
             @Override
@@ -534,6 +537,8 @@ public class StorageRechargeListFragment extends BaseFragment implements OnColum
                 tv_prompt.setVisibility(View.VISIBLE);
                 tv_prompt.setTextColor(Color.RED);
                 tv_prompt.setText(failStr);
+                ce_de_code.setText("");
+                ce_de_code.requestFocus();
 //                CommonUtil.toastNoRepeat(mActivity, failStr);
 
             }
@@ -956,8 +961,8 @@ public class StorageRechargeListFragment extends BaseFragment implements OnColum
                 String de_name1 = FastjsonUtil.getText(dataObject, "DE_NAME");
                 de_code=de_code1;
                 de_name=de_name1;
-                tv_de_code.setText("编号："+de_code1);
-                tv_de_name.setText("名称:"+de_name1);
+                tv_de_code.setText(""+de_code1);
+                tv_de_name.setText(""+de_name1);
                 getNewDataChange(de_code1);
                 ce_de_code.clearFocus();
                 index_position_resource.clearFocus();

app/src/main/res/layout/fragment_storage_in.xml

@@ -34,194 +34,196 @@
             <android.support.v4.widget.NestedScrollView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
-
-                    <LinearLayout
-                        android:background="@color/white"
-                        android:layout_marginTop="@dimen/dp_10"
-                        android:orientation="vertical"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent">
-                        <TableLayout
+                        <LinearLayout
                             android:background="@color/white"
+                            android:layout_marginTop="@dimen/dp_10"
                             android:orientation="vertical"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
-                            <TableRow
-                                android:layout_marginLeft="@dimen/dp_10"
-                                android:layout_marginTop="7dp">
-                                <TextView
-                                    android:text="编号："
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:gravity="right"
-                                    android:textColor="@color/black"/>
-                                <TextView
-                                    android:id="@+id/tv_de_code"
-                                    android:text=""
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"/>
-                            </TableRow>
-                            <TableRow
-                                android:layout_marginLeft="@dimen/dp_10">
-                                <TextView
-                                    android:text="名称："
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:gravity="right"
-                                    android:textColor="@color/black"/>
-                                <TextView
-                                    android:id="@+id/tv_de_name"
-                                    android:text=""
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"/>
-                            </TableRow>
-                            <TableRow
-                                android:layout_marginLeft="@dimen/dp_10">
-                                <TextView
-                                    android:text="规格："
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:gravity="right"
-                                    android:textColor="@color/black"/>
-                                <TextView
-                                    android:id="@+id/tv_de_spec"
-                                    android:text=""
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"/>
-                            </TableRow>
-                            <TableRow
-                                android:layout_marginLeft="@dimen/dp_10">
-                                <TextView
-                                    android:text="使用部门："
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:gravity="right"
-                                    android:textColor="@color/black"/>
-                                <TextView
-                                    android:id="@+id/tv_de_currentcentername"
-                                    android:text=""
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"/>
-                            </TableRow>
-                            <TableRow
-                                android:layout_marginLeft="@dimen/dp_10">
-                                <TextView
-                                    android:text="使用线体："
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:gravity="right"
-                                    android:textColor="@color/black"/>
-                                <TextView
-                                    android:id="@+id/tv_de_currentlinecode"
-                                    android:text=""
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"/>
-                            </TableRow>
-                            <TableRow
-                                android:layout_marginLeft="@dimen/dp_10">
-                                <TextView
-                                    android:text="寿命剩余(天)："
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:gravity="right"
-                                    android:textColor="@color/black"/>
-                                <TextView
-                                    android:id="@+id/tv_de_lefttime"
-                                    android:text=""
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"/>
-                            </TableRow>
-                            <TableRow
-                                android:layout_marginLeft="@dimen/dp_10">
-                                <TextView
-                                    android:text="管理人员："
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:gravity="right"
-                                    android:textColor="@color/black"
-                                    />
-                                <TextView
-                                    android:id="@+id/tv_de_manageman"
-                                    android:text=""
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"/>
-                            </TableRow>
-                            <TableRow
-                                android:layout_marginLeft="@dimen/dp_10">
-                                <TextView
-                                    android:text="管理人员电话："
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:gravity="right"
-                                    android:textColor="@color/black"/>
-                                <TextView
-                                    android:id="@+id/de_managemantel"
-                                    android:text=""
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content" />
-                            </TableRow>
-                            <TableRow
-                                android:layout_marginLeft="@dimen/dp_10">
-                                <TextView
-                                    android:text="设备厂商："
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:gravity="right"
-                                    android:textColor="@color/black"/>
-                                <TextView
-                                    android:id="@+id/tv_de_vendor"
-                                    android:text=""
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"/>
-                            </TableRow>
-                            <TableRow
-                                android:layout_marginLeft="@dimen/dp_10">
-                                <TextView
-                                    android:text="厂商人员："
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:gravity="right"
-                                    android:textColor="@color/black"/>
-                                <TextView
-                                    android:id="@+id/tv_de_contact"
-                                    android:text=""
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"/>
-                            </TableRow>
-                            <TableRow
-                                android:layout_marginLeft="@dimen/dp_10">
-                                <TextView
-                                    android:text="厂商电话："
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:gravity="right"
-                                    android:textColor="@color/black"/>
-                                <TextView
-                                    android:id="@+id/tv_de_telvendor"
-                                    android:text=""
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"/>
-                            </TableRow>
+                            android:layout_height="match_parent">
+                            <TableLayout
+                                android:background="@color/white"
+                                android:orientation="vertical"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+                                <TableRow
+                                    android:layout_marginLeft="@dimen/dp_10"
+                                    android:layout_marginTop="7dp">
+                                    <TextView
+                                        android:text="编号："
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:gravity="right"
+                                        android:textColor="@color/black"/>
+                                    <TextView
+                                        android:id="@+id/tv_de_code"
+                                        android:text=""
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"/>
+                                </TableRow>
+                                <TableRow
+                                    android:layout_marginLeft="@dimen/dp_10">
+                                    <TextView
+                                        android:text="名称："
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:gravity="right"
+                                        android:textColor="@color/black"/>
+                                    <TextView
+                                        android:id="@+id/tv_de_name"
+                                        android:text=""
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"/>
+                                </TableRow>
+                                <TableRow
+                                    android:layout_marginLeft="@dimen/dp_10">
+                                    <TextView
+                                        android:text="规格："
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:gravity="right"
+                                        android:textColor="@color/black"/>
+                                    <TextView
+                                        android:id="@+id/tv_de_spec"
+                                        android:text=""
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"/>
+                                </TableRow>
+                                <TableRow
+                                    android:layout_marginLeft="@dimen/dp_10">
+                                    <TextView
+                                        android:text="使用部门："
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:gravity="right"
+                                        android:textColor="@color/black"/>
+                                    <TextView
+                                        android:id="@+id/tv_de_currentcentername"
+                                        android:text=""
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"/>
+                                </TableRow>
+                                <TableRow
+                                    android:layout_marginLeft="@dimen/dp_10">
+                                    <TextView
+                                        android:text="使用线体："
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:gravity="right"
+                                        android:textColor="@color/black"/>
+                                    <TextView
+                                        android:id="@+id/tv_de_currentlinecode"
+                                        android:text=""
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"/>
+                                </TableRow>
+                                <TableRow
+                                    android:layout_marginLeft="@dimen/dp_10">
+                                    <TextView
+                                        android:text="寿命剩余(天)："
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:gravity="right"
+                                        android:textColor="@color/black"/>
+                                    <TextView
+                                        android:id="@+id/tv_de_lefttime"
+                                        android:text=""
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"/>
+                                </TableRow>
+                                <TableRow
+                                    android:layout_marginLeft="@dimen/dp_10">
+                                    <TextView
+                                        android:text="管理人员："
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:gravity="right"
+                                        android:textColor="@color/black"
+                                        />
+                                    <TextView
+                                        android:id="@+id/tv_de_manageman"
+                                        android:text=""
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"/>
+                                </TableRow>
+                                <TableRow
+                                    android:layout_marginLeft="@dimen/dp_10">
+                                    <TextView
+                                        android:text="管理人员电话："
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:gravity="right"
+                                        android:textColor="@color/black"/>
+                                    <TextView
+                                        android:id="@+id/de_managemantel"
+                                        android:text=""
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content" />
+                                </TableRow>
+                                <TableRow
+                                    android:layout_marginLeft="@dimen/dp_10">
+                                    <TextView
+                                        android:text="设备厂商："
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:gravity="right"
+                                        android:textColor="@color/black"/>
+                                    <TextView
+                                        android:id="@+id/tv_de_vendor"
+                                        android:text=""
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"/>
+                                </TableRow>
+                                <TableRow
+                                    android:layout_marginLeft="@dimen/dp_10">
+                                    <TextView
+                                        android:text="厂商人员："
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:gravity="right"
+                                        android:textColor="@color/black"/>
+                                    <TextView
+                                        android:id="@+id/tv_de_contact"
+                                        android:text=""
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"/>
+                                </TableRow>
+                                <TableRow
+                                    android:layout_marginLeft="@dimen/dp_10">
+                                    <TextView
+                                        android:text="厂商电话："
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:gravity="right"
+                                        android:textColor="@color/black"/>
+                                    <TextView
+                                        android:id="@+id/tv_de_telvendor"
+                                        android:text=""
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"/>
+                                </TableRow>
+                            </TableLayout>
+                            <com.bin.david.form.core.SmartTable
+                                android:id="@+id/smar_item1"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"/>
+                            <android.support.v7.widget.RecyclerView
+                                android:id="@+id/ra_Data"
+                                android:visibility="gone"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+                            </android.support.v7.widget.RecyclerView>
+
+                            <com.bin.david.form.core.SmartTable
+                                android:background="@color/white"
+                                android:layout_marginTop="5dp"
+                                android:id="@+id/pda_wms_in_filter_list_st"
+                                android:layout_width="match_parent"
+                                android:layout_height="500dp"
+                                />
+                        </LinearLayout>
+
 
-                        </TableLayout>
-                        <android.support.v7.widget.RecyclerView
-                            android:id="@+id/ra_Data"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
-                        </android.support.v7.widget.RecyclerView>
-                        <com.bin.david.form.core.SmartTable
-                            android:id="@+id/smar_item1"
-                            android:layout_width="match_parent"
-                            android:layout_height="110dp"
-                            />
-                        <com.bin.david.form.core.SmartTable
-                            android:background="@color/white"
-                            android:layout_marginTop="5dp"
-                            android:id="@+id/pda_wms_in_filter_list_st"
-                            android:layout_width="match_parent"
-                            android:layout_height="400dp"
-                            />
-                    </LinearLayout>
             </android.support.v4.widget.NestedScrollView>
 
         </android.support.design.widget.CollapsingToolbarLayout>

app/src/main/res/layout/fragment_storage_recharge_list.xml

@@ -25,7 +25,9 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_margin="15dp"
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginRight="15dp"
+                        android:layout_marginTop="5dp"
                         android:background="@drawable/bg_line_edittext">
 
                         <com.uas.rd_equipment.view.ClearableEditText
@@ -41,61 +43,66 @@
 
                         <ImageView
                             android:id="@+id/storage_recharge_scan_iv"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
+                            android:layout_width="30dp"
+                            android:layout_height="30dp"
                             android:layout_gravity="center"
                             android:layout_marginRight="10dp"
                             android:clickable="false"
+                            android:scaleType="fitXY"
                             android:src="@drawable/ic_edittext_scan" />
                     </LinearLayout>
                     <LinearLayout
+                        android:layout_marginTop="5dp"
                         android:layout_marginLeft="15dp"
                         android:orientation="vertical"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
-                        <TextView
-                            android:id="@+id/tv_de_code"
-                            android:text="编号："
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textColor="@color/blueq">
-                        </TextView>
-                        <TextView
-                            android:layout_marginTop="5dp"
-                            android:id="@+id/tv_de_name"
-                            android:text="名称："
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textColor="@color/blueq">
-                        </TextView>
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_marginLeft="15dp"
-                        android:layout_marginTop="15dp"
-                        android:orientation="horizontal"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:text="备注："
-                            android:textColor="@color/blueq">
-                        </TextView>
-                        <com.uas.rd_equipment.view.ClearableEditText
-                            android:id="@+id/index_position_resource"
-                            style="@style/EditTextLineStyle"
+                        <LinearLayout
+                            android:orientation="horizontal"
                             android:layout_width="match_parent"
-                            android:layout_height="40dp"
-                            android:layout_marginRight="50dp"
-                            android:layout_marginLeft="36dp"
-                            />
+                            android:layout_height="wrap_content">
+                            <TextView
+                                android:text="设备编号："
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:textColor="@color/black">
+                            </TextView>
+                            <TextView
+                                android:id="@+id/tv_de_code"
+                                android:text=""
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:textColor="@color/blue">
+                            </TextView>
+                        </LinearLayout>
+                        <LinearLayout
+                            android:orientation="horizontal"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+                            <TextView
+                                android:layout_marginTop="5dp"
+                                android:text="设备名称："
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:textColor="@color/black">
+                            </TextView>
+                            <TextView
+                                android:layout_marginTop="5dp"
+                                android:id="@+id/tv_de_name"
+                                android:text=""
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:textColor="@color/blue">
+                            </TextView>
+                        </LinearLayout>
+
 
                     </LinearLayout>
+
+
                     <LinearLayout
                         android:layout_marginLeft="15dp"
-                        android:layout_marginTop="15dp"
+                        android:layout_marginTop="5dp"
                         android:orientation="horizontal"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
@@ -103,22 +110,22 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="保养类型："
-                            android:textColor="@color/blueq">
+                            android:textColor="@color/black">
                         </TextView>
                         <LinearLayout
                             android:background="@drawable/bg_edittext_black"
                             android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="7dp">
+                            android:layout_height="wrap_content">
                             <Spinner
                                 android:id="@+id/spinner02"
                                 android:layout_width="wrap_content"
-                                android:layout_height="wrap_content">
+                                android:layout_height="23dp">
                             </Spinner>
                         </LinearLayout>
 
 
                     </LinearLayout>
+
                     <LinearLayout
                         android:orientation="vertical"
                         android:layout_width="match_parent"
@@ -139,7 +146,30 @@
                             android:layout_height="300dp"
                             />
 
+                        <LinearLayout
+                            android:layout_marginTop="5dp"
+                            android:orientation="horizontal"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:paddingLeft="@dimen/dp_10"
+                                android:paddingRight="@dimen/dp_10"
+                                android:text="备注说明："
+                                android:textColor="@color/black">
+                            </TextView>
+                            <com.uas.rd_equipment.view.ClearableEditText
+                                android:id="@+id/index_position_resource"
+                                style="@style/EditTextLineStyle"
+                                android:layout_width="match_parent"
+                                android:layout_height="50dp"
+                                android:layout_marginRight="@dimen/textsize_20"
+                                android:layout_marginLeft="7dp"
+                                />
 
+                        </LinearLayout>
                         <TextView
                             android:layout_marginTop="@dimen/dp_10"
                             android:id="@+id/tv_add"
@@ -180,8 +210,10 @@
 
     <Button
         android:id="@+id/btn_commit"
-        android:layout_width="150dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginRight="@dimen/dp_10"
+        android:layout_marginLeft="@dimen/dp_10"
         android:background="@drawable/bg_button"
         android:layout_gravity="center"
         android:text="提交"

app/src/main/res/layout/item_spinner.xml

@@ -6,5 +6,10 @@
 
     <TextView
         android:id="@+id/text_spinner"
-        style="@style/SpinnerItemStyle" />
+        style="@style/SpinnerItemStyle"
+        android:layout_marginLeft="5dp"
+        android:layout_marginRight="5dp"
+        android:layout_marginBottom="5dp"
+        android:gravity="center"
+        android:textColor="@color/black"/>
 </LinearLayout>

app/src/main/res/layout/layout_url_item.xml

@@ -17,6 +17,7 @@
         android:layout_height="wrap_content"
         android:paddingLeft="@dimen/dp_10"
         android:paddingRight="@dimen/dp_10"
-        android:layout_marginRight="@dimen/textsize_20">
+        android:layout_marginRight="@dimen/textsize_20"
+        android:textColor="@color/blue">
     </TextView>
 </LinearLayout>

app/src/main/res/values/styles.xml

@@ -70,7 +70,7 @@
 
     <style name="SpinnerItemStyle">
         <item name="android:gravity">left|center</item>
-        <item name="android:layout_height">43dp</item>
+        <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:textSize">16sp</item>
         <item name="android:textColor">@color/text_normal</item>

build.gradle

@@ -58,8 +58,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 10,
-            versionName      : "v1.0"
+            versionCode      : 12,
+            versionName      : "v1.0.2"
     ]
 
     depsVersion = [