v2.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_test"
+        android:label="@string/my_app_name"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
         tools:replace="icon,label,theme">

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

@@ -518,17 +518,18 @@ public class StorageRechargeFragment extends BaseFragment implements View.OnClic
                 mStorageRechargeAdapter.notifyDataSetChanged();
             }
             String type = FastjsonUtil.getText(dataObject, "type");
-            if (!TextUtils.isEmpty(CommonUtil.getMaster(mActivity))
-                    && CommonUtil.getMaster(mActivity).contains("DIXIAN")) {
-                mChangeButton.setVisibility(View.GONE);
-            } else {
-                // type为OS则是委外收料单 ，如果是委外收料单，隐藏转采购变更按钮
-                if ("OS".equals(type)) {
-                    mChangeButton.setVisibility(View.GONE);
-                } else {
-                    mChangeButton.setVisibility(View.VISIBLE);
-                }
-            }
+            //转采购变更按钮彻底隐藏   2021-10-12   曹尚宇
+//            if (!TextUtils.isEmpty(CommonUtil.getMaster(mActivity))
+//                    && CommonUtil.getMaster(mActivity).contains("DIXIAN")) {
+//                mChangeButton.setVisibility(View.GONE);
+//            } else {
+//                // type为OS则是委外收料单 ，如果是委外收料单，隐藏转采购变更按钮
+//                if ("OS".equals(type)) {
+//                    mChangeButton.setVisibility(View.GONE);
+//                } else {
+//                    mChangeButton.setVisibility(View.VISIBLE);
+//                }
+//            }
             mErrorScrollView.setVisibility(View.GONE);
             mDataLinearLayout.setVisibility(View.VISIBLE);
         }

build.gradle

@@ -43,8 +43,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 20,
-            versionName      : "v2.0"
+            versionCode      : 21,
+            versionName      : "v2.1"
     ]
 
     depsVersion = [