修改App名字，gradle版本统一为4.8.1

app/src/main/AndroidManifest.xml

@@ -20,7 +20,7 @@
         android:name="com.uas.pda_smart_com.application.PdaApplication"
         android:allowBackup="true"
         android:icon="@mipmap/icon"
-        android:label="@string/my_app_name"
+        android:label="@string/my_app_name_test"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
         tools:replace="icon,label,theme">

app/src/main/java/com/uas/pda_smart_com/activity/IndexActivity.java

@@ -64,10 +64,10 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        //请求储位
+        //请求储位  no use
         VolleyUtil.requestGetUseLocationOrNot(getApplicationContext(), GloableParams.ADDRESS_GET_FIELD_DATA,
                 VolleyUtil.METHOD_POST, pageType);
-        //原材料出库采集方式
+        //原材料出库采集方式  CollectAlreadyFragment...
         VolleyUtil.requestProdOutType(getApplicationContext(), GloableParams.ADDRESS_GET_FIELD_DATA);
         //获取条码打印模板
         getPrintTemplate();

app/src/main/java/com/uas/pda_smart_com/fragment/IndexWareHouseContentFragment.java

@@ -71,7 +71,8 @@ public class IndexWareHouseContentFragment extends BaseFragment implements Adapt
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
         String gridName = (String) gridItemList.get(position).get(DataSourceManager.KEY_GRID_ITEMNAME);
         Fragment fragment;
-        if (isShop) {
+        if (isShop) {//车间
+            //条码数量修改
             if (GloableParams.GRIDNAME_MODIFY_QUANTITY.equals(gridName)) {
                 fragment = new ModifyBarcodeQuantityFragment();
                 Bundle bundle = new Bundle();
@@ -79,6 +80,7 @@ public class IndexWareHouseContentFragment extends BaseFragment implements Adapt
                 fragment.setArguments(bundle);
                 getFragmentManager().beginTransaction().addToBackStack(null)
                         .replace(R.id.container_function_fragment, fragment).commit();
+                //MSD管理
             } else if (GloableParams.GRIDNAME_MSD_MANAGER.equals(gridName)) {
                 fragment = new MSDManageFragment();
                 getFragmentManager().beginTransaction().addToBackStack(null)
@@ -86,7 +88,7 @@ public class IndexWareHouseContentFragment extends BaseFragment implements Adapt
             } else {
                 CommonUtil.toastNoRepeat(mActivity, getString(R.string.have_no_power));
             }
-        } else {
+        } else {//非车间
             switch (gridName) {
                 //货物核查
                 case GloableParams.GRIDNAME_GOOD_SEARCH:
@@ -125,11 +127,13 @@ public class IndexWareHouseContentFragment extends BaseFragment implements Adapt
                     getFragmentManager().beginTransaction().addToBackStack(null)
                             .replace(R.id.container_function_fragment, fragment).commit();
                     break;
+                    //条码数量修改
                 case GloableParams.GRIDNAME_MODIFY_QUANTITY:
                     fragment = new ModifyBarcodeQuantityFragment();
                     getFragmentManager().beginTransaction().addToBackStack(null)
                             .replace(R.id.container_function_fragment, fragment).commit();
                     break;
+                    //BOM校验
                 case GloableParams.GRIDNAME_BOM_CHECK:
                     fragment = new BomCheckFragment();
                     getFragmentManager().beginTransaction().addToBackStack(null)

app/src/main/java/com/uas/pda_smart_com/fragment/MaterialCollectionFragment.java

@@ -67,6 +67,7 @@ import java.util.Map;
  * Created by RaoMeng on 2016/7/27.
  * 材料入库采集页面
  */
+@Deprecated
 public class MaterialCollectionFragment extends BaseFragment {
     private final String TAG = "MaterialCollectionFragment";
     private String mPiId;

app/src/main/java/com/uas/pda_smart_com/fragment/MaterialStorageFragment.java

@@ -73,7 +73,7 @@ import java.util.Map;
 
 /**
  * Created by RaoMeng on 2016/7/26.
- * 材料入库单页面
+ * 入库管理--材料入库单页面
  */
 public class MaterialStorageFragment extends BaseFragment implements TextWatcher, View.OnClickListener {
     private AutoCompleteTextView mMaterialStorageTv;

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

@@ -95,7 +95,7 @@ public class StorageInFragment extends BaseFragment implements View.OnClickListe
                         mFragment = new BarcodeInCollectFragment();
                         break;
                     case GloableParams.MENU_STORAGE_BARCODE_INFO_COLLECT:
-                        //条码入库
+                        //条码信息采集
                         mFragment = new BarcodeInfoCollectFragment();
                         break;
                     default:

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

@@ -49,7 +49,8 @@
         <TableRow
             android:id="@+id/material_in_collect_old_tr"
             android:layout_marginTop="5dp"
-            android:visibility="gone">
+            android:visibility="gone"
+            tools:visibility="visible">
 
             <TextView
                 android:id="@+id/material_in_collect_old_tv"
@@ -113,7 +114,8 @@
         android:layout_marginLeft="4dp"
         android:orientation="vertical"
         android:padding="10dp"
-        android:visibility="gone">
+        android:visibility="gone"
+        tools:visibility="visible">
 
         <LinearLayout
             android:layout_width="match_parent"

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

@@ -102,7 +102,8 @@
         <TableRow
             android:id="@+id/material_in_collect_old_tr"
             android:layout_marginTop="5dp"
-            android:visibility="gone">
+            android:visibility="gone"
+            tools:visibility="visible">
 
             <TextView
                 android:id="@+id/material_in_collect_old_tv"
@@ -141,6 +142,7 @@
         android:background="@drawable/shape_msg_block"
         android:padding="10dp"
         android:visibility="gone"
+        tools:visibility="visible"
         tools:text="采集成功，条码：786528238；数量：2；料号：209837；名称规格：瓶子" />
 
 </LinearLayout>

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:orientation="vertical">
 
@@ -29,7 +30,8 @@
             android:layout_margin="0dp"
             android:layout_weight="1"
             android:text="在线"
-            android:visibility="gone"/>
+            android:visibility="gone"
+            tools:visibility="visible"/>
     </LinearLayout>
 
     <ScrollView
@@ -111,7 +113,8 @@
                 style="@style/ButtonStyle"
                 android:enabled="false"
                 android:text="@string/confirm"
-                android:visibility="gone"/>
+                android:visibility="gone"
+                tools:visibility="visible"/>
 
 
             <TableLayout
@@ -133,7 +136,9 @@
                         android:layout_gravity="center_vertical"
                         android:layout_marginLeft="10dp"
                         android:textColor="@color/white"
-                        android:visibility="gone"/>
+                        android:visibility="gone"
+                        tools:text="采集成功"
+                        tools:visibility="visible"/>
                 </TableRow>
 
                 <TableRow>

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

@@ -67,7 +67,8 @@
                 android:background="@drawable/shape_from_edit"
                 android:hint="@string/warehouse"
                 android:padding="6dp"
-                android:visibility="gone" />
+                android:visibility="gone"
+                tools:visibility="visible"/>
 
             <Button
                 android:id="@+id/submit_btn"

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

@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
-
+        <!--no use-->
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="60dp"
@@ -171,7 +171,7 @@
                     </TableRow>
 
                 </TableLayout>
-
+                 <!--no use-->
                 <Button
                     android:id="@+id/btn_confirm"
                     style="@style/ButtonStyle"
@@ -188,7 +188,8 @@
                     android:background="@drawable/bg_button_enabled"
                     android:padding="10dp"
                     android:stretchColumns="1"
-                    android:visibility="gone">
+                    android:visibility="gone"
+                    tools:visibility="visible">
 
                     <TableRow>
 
@@ -198,7 +199,8 @@
                             android:layout_gravity="center_vertical"
                             android:layout_marginLeft="10dp"
                             android:textColor="@color/white"
-                            android:visibility="gone" />
+                            android:visibility="gone"
+                            tools:visibility="visible"/>
                     </TableRow>
 
                     <TableRow>
@@ -250,7 +252,8 @@
                     android:background="@drawable/bg_button_enabled"
                     android:padding="10dp"
                     android:stretchColumns="1"
-                    android:visibility="gone">
+                    android:visibility="gone"
+                    tools:visibility="visible">
 
                     <TableRow>
 
@@ -323,7 +326,9 @@
                     android:layout_marginTop="@dimen/spacing_big"
                     android:background="@drawable/shape_msg_block"
                     android:padding="10dp"
-                    android:visibility="gone" />
+                    android:visibility="gone"
+                    tools:text="boxResultboxResultboxResultboxResult"
+                    tools:visibility="visible"/>
 
                 <TextView
                     android:id="@+id/iocout_next_material_information"

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

@@ -202,7 +202,8 @@
             <TableRow
                 android:id="@+id/material_in_collect_old_tr"
                 android:layout_marginTop="5dp"
-                android:visibility="gone">
+                android:visibility="gone"
+                tools:visibility="visible">
 
                 <TextView
                     android:id="@+id/material_in_collect_old_tv"
@@ -296,6 +297,7 @@
             android:background="@drawable/shape_msg_block"
             android:padding="10dp"
             android:visibility="gone"
+            tools:visibility="visible"
             tools:text="采集成功，条码：786528238；数量：2；料号：209837；名称规格：瓶子" />
 
     </LinearLayout>

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

@@ -87,5 +87,6 @@
         android:background="@drawable/shape_msg_block"
         android:padding="10dp"
         android:visibility="gone"
+        tools:visibility="visible"
         tools:text="物料：PD_PRODCODE, 名称规格：PR_DETAIL || PR_SPEC未备料数: PD_RESTQTY,最小包装数：PR_ZXBZS,仓位：BAR_LOCATION,有PD_BATCHCODE 则显示批号：PD_BATCHCODE" />
 </LinearLayout>

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

@@ -122,6 +122,7 @@
         android:background="@drawable/shape_msg_block"
         android:padding="10dp"
         android:visibility="gone"
-        tools:text="采集成功，条码：786528238；数量：2；料号：209837；名称规格：瓶子" />
+        tools:text="采集成功，条码：786528238；数量：2；料号：209837；名称规格：瓶子"
+        tools:visibility="visible"/>
 
 </LinearLayout>

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

@@ -43,7 +43,8 @@
         android:background="@color/white"
         android:orientation="vertical"
         android:padding="10dp"
-        android:visibility="gone">
+        android:visibility="gone"
+        tools:visibility="visible">
 
         <TextView
             android:layout_width="wrap_content"
@@ -131,7 +132,8 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
-        android:visibility="gone">
+        android:visibility="gone"
+        tools:visibility="visible">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -398,7 +400,8 @@
         android:layout_height="50dp"
         android:background="@color/gray_light"
         android:gravity="center_vertical"
-        android:visibility="gone">
+        android:visibility="gone"
+        tools:visibility="visible">
 
         <Button
             android:id="@+id/revoke_stock_revoke_btn"

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -10,7 +11,8 @@
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:padding="8dp"
-        android:visibility="gone">
+        android:visibility="gone"
+        tools:visibility="visible">
 
         <TextView
             android:id="@+id/storage_in_colect_delete_type_tv"

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

@@ -43,7 +43,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical"
-            android:visibility="gone">
+            android:visibility="gone"
+            tools:visibility="visible">
 
             <ListView
                 android:id="@+id/storage_inspection_data_lv"

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

@@ -43,7 +43,9 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical"
-            android:visibility="gone">
+            android:visibility="gone"
+            tools:visibility="visible"
+           >
 
             <ListView
                 android:id="@+id/storage_iqc_in_data_lv"

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

@@ -44,7 +44,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical"
-            android:visibility="gone">
+            android:visibility="gone"
+            tools:visibility="visible">
 
             <ListView
                 android:id="@+id/storage_recharge_data_lv"
@@ -66,7 +67,8 @@
                     android:layout_marginTop="20dp"
                     android:layout_weight="1"
                     android:text="转采购变更"
-                    android:visibility="gone"/>
+                    android:visibility="gone"
+                    tools:visibility="visible"/>
 
                 <Button
                     android:id="@+id/storage_recharge_transfer_btn"

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--表格ListItem：四列-->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="#FFFFFF"
@@ -96,7 +97,8 @@
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:background="#88867f7f"
-            android:visibility="gone">
+        android:visibility="gone"
+        tools:visibility="visible">
 
         <LinearLayout android:layout_width="match_parent"
                       android:layout_height="50dp"

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

@@ -1,6 +1,6 @@
 <resources>
     <string name="my_app_name">UAS智能终端系统</string>
-
+    <string name="my_app_name_test">PDA-仓库通用</string>
     <string name="hello_world">Hello world!</string>
     <string name="action_settings">Settings</string>
     <string name="title_activity_connect_server_fragment">ConnectServerFragment</string>

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip