wuhb před 1 rokem
rodič
revize
aae36e888a

+ 2 - 2
app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "com.ygtx.emcs"
         minSdk 27
         targetSdk 31
-        versionCode 7
-        versionName "1.1.7"
+        versionCode 8
+        versionName "1.1.8"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 

+ 2 - 0
app/src/main/java/com/ygtx/emcs/activity/StockInNewActivity.java

@@ -86,12 +86,14 @@ public class StockInNewActivity extends BaseActivity {
             ToastUtils.showToast(context, "请设置入库单编码的标识");
             finish();
         }
+//=====================test=====================
 //        binding.tvScanTips.setOnClickListener(view->{
 //            receiverTask("RK_20250331004");
 //        });
 //        binding.tvInCode.setOnClickListener(view->{
 //            receiverTask("1119201513");
 //        });
+//=====================test=====================
     }
 
     private void stockIn(StockLineModel stockLineModel){

+ 12 - 6
app/src/main/java/com/ygtx/emcs/util/ToastUtils.java

@@ -74,8 +74,10 @@ public class ToastUtils {
             Toast mToast = Toast.makeText(context, "", Toast.LENGTH_LONG);
             mToast.setText(text);
             LinearLayout linearLayout = (LinearLayout) mToast.getView();
-            TextView messageTextView = (TextView) linearLayout.getChildAt(0);
-            messageTextView.setTextSize(20);
+            if(linearLayout!=null) {
+                TextView messageTextView = (TextView) linearLayout.getChildAt(0);
+                messageTextView.setTextSize(20);
+            }
             mToast.show();
         }
     }
@@ -89,8 +91,10 @@ public class ToastUtils {
             Toast mToast = Toast.makeText(context, "", Toast.LENGTH_SHORT);
             mToast.setText(text);
             LinearLayout linearLayout = (LinearLayout) mToast.getView();
-            TextView messageTextView = (TextView) linearLayout.getChildAt(0);
-            messageTextView.setTextSize(25);
+            if(linearLayout!=null) {
+                TextView messageTextView = (TextView) linearLayout.getChildAt(0);
+                messageTextView.setTextSize(25);
+            }
             mToast.show();
         }
     }
@@ -141,8 +145,10 @@ public class ToastUtils {
                     }else{
                         mToast = Toast.makeText(context, "", length);
                         LinearLayout linearLayout = (LinearLayout) mToast.getView();
-                        TextView messageTextView = (TextView) linearLayout.getChildAt(0);
-                        messageTextView.setTextSize(25);
+                        if(linearLayout!=null) {
+                            TextView messageTextView = (TextView) linearLayout.getChildAt(0);
+                            messageTextView.setTextSize(25);
+                        }
                         mToast.setText(msg);
                     }
                     mToast.show();