修改PDF默认图标,增加旋转按钮功能,出库采集调整数据颜色错乱问题, 增加本地PDF文件的加载使用, 增加获取网络缩略图失败时的图片替换, 去除出库采集未使用功能, 增加出库采集页滑动功能, 修改条码采集成功后,返回字符中数量显示红色

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

@@ -6,6 +6,7 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
 import android.os.Bundle;
@@ -14,8 +15,11 @@ import android.os.Message;
 import android.support.v4.app.Fragment;
 import android.support.v7.app.AlertDialog;
 import android.text.Editable;
+import android.text.Spannable;
+import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.TextWatcher;
+import android.text.style.ForegroundColorSpan;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.KeyEvent;
@@ -247,10 +251,12 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                             mCollectResultTextView.setText(null);
                             JSONArray listArray = dataObject.optJSONArray("nolist");
                             if (mCollectType.equals("byBarcode") || mCollectType.equals("byBatchcode")) {
-                                String barcodeResult = "采集成功；" + JsonUtils.optStringNotNull(dataObject, "finishno")
+
+                                String part1 = "采集成功；" + JsonUtils.optStringNotNull(dataObject, "finishno")
                                         + "\n条码：" + JsonUtils.optStringNotNull(messageObject, "BAR_CODE")
-                                        + "；数量：" + CommonUtil.doubleFormat(messageObject.optDouble("BAR_REMAIN"))
-                                        + "；批号：" + JsonUtils.optStringNotNull(messageObject, "BAR_BATCHCODE")
+                                        + "；数量：" ;
+                                String part2 = CommonUtil.doubleFormat(messageObject.optDouble("BAR_REMAIN"));
+                                String part3 = "；批号：" + JsonUtils.optStringNotNull(messageObject, "BAR_BATCHCODE")
                                         + "；料号：" + JsonUtils.optStringNotNull(messageObject, "BAR_PRODCODE")
                                         + "；名称规格：" + messageObject.optString("PR_DETAIL")
                                         + "  " + JsonUtils.optStringNotNull(messageObject, "PR_SPEC")
@@ -259,7 +265,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                 if (listArray != null && listArray.length() > 0) {
                                     for (int i = 0; i < listArray.length(); i++) {
                                         JSONObject listObject = listArray.optJSONObject(i);
-                                        barcodeResult = barcodeResult
+                                        part3 = part3
                                                 + "\n单号：" + JsonUtils.optStringNotNull(listObject, "PI_INOUTNO")
                                                 + ";条码号：" + JsonUtils.optStringNotNull(listObject, "BAR_CODE")
                                                 + ";数量：" + CommonUtil.doubleFormat(JsonUtils.optDoubleNotNull(listObject, "BAR_REMAIN"));
@@ -269,8 +275,14 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                     //                                    initBreakPopupWindow(listArray);
                                 }
 
-                                mCollectResultTextView.setText(barcodeResult);
-                                mCollectResultTextView.setTextColor(getResources().getColor(R.color.green));
+                                SpannableStringBuilder style1 = new SpannableStringBuilder(part1);
+                                SpannableStringBuilder style2 = new SpannableStringBuilder(part2);
+                                SpannableStringBuilder style3 = new SpannableStringBuilder(part3);
+                                style1.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.green)),0,part1.length(),Spannable.SPAN_EXCLUSIVE_INCLUSIVE);     //设置指定位置文字的颜色
+                                style2.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.red)),0,part2.length(),Spannable.SPAN_EXCLUSIVE_INCLUSIVE);     //设置指定位置文字的颜色
+                                style3.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.green)),0,part3.length(),Spannable.SPAN_EXCLUSIVE_INCLUSIVE);     //设置指定位置文字的颜色
+                                style1 = style1.append(style2).append(style3);
+                                mCollectResultTextView.setText(style1);
 
                                 mBarcodeTableLayout.setVisibility(View.GONE);
                                 mBoxTableLayout.setVisibility(View.GONE);
@@ -292,27 +304,41 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
 
                                 PdaApplication.putDataCache2Map(Constants.FLAG.MATERIAL_COLLECT_BARCODE_RESULT + pi_inoutno, mResults);
                             } else if (false) {
-                                String boxResult = "采集成功；" + JsonUtils.optStringNotNull(dataObject, "finishno")
+                                String part1 = "采集成功；" + JsonUtils.optStringNotNull(dataObject, "finishno")
                                         + "\n箱号：" + JsonUtils.optStringNotNull(messageObject, "BAR_OUTBOXCODE1")
-                                        + "；数量：" + CommonUtil.doubleFormat(messageObject.optDouble("BAR_REMAIN"))
-                                        + "；批号：" + JsonUtils.optStringNotNull(messageObject, "BAR_BATCHCODE")
+                                        + "；数量：" ;
+                                String part2 = CommonUtil.doubleFormat(messageObject.optDouble("BAR_REMAIN"));
+                                String part3 = "；批号：" + JsonUtils.optStringNotNull(messageObject, "BAR_BATCHCODE")
                                         + "；料号：" + JsonUtils.optStringNotNull(messageObject, "BAR_PRODCODE")
-                                        + "；名称规格：" + JsonUtils.optStringNotNull(messageObject, "PR_DETAIL")
+                                        + "；名称规格：" + messageObject.optString("PR_DETAIL")
                                         + "  " + JsonUtils.optStringNotNull(messageObject, "PR_SPEC");
 
+//                                String boxResult = "采集成功；" + JsonUtils.optStringNotNull(dataObject, "finishno")
+//                                        + "\n箱号：" + JsonUtils.optStringNotNull(messageObject, "BAR_OUTBOXCODE1")
+//                                        + "；数量：" + CommonUtil.doubleFormat(messageObject.optDouble("BAR_REMAIN"))
+//                                        + "；批号：" + JsonUtils.optStringNotNull(messageObject, "BAR_BATCHCODE")
+//                                        + "；料号：" + JsonUtils.optStringNotNull(messageObject, "BAR_PRODCODE")
+//                                        + "；名称规格：" + JsonUtils.optStringNotNull(messageObject, "PR_DETAIL")
+//                                        + "  " + JsonUtils.optStringNotNull(messageObject, "PR_SPEC");
 
                                 if (listArray != null && listArray.length() > 0) {
                                     for (int i = 0; i < listArray.length(); i++) {
                                         JSONObject listObject = listArray.optJSONObject(i);
-                                        boxResult = boxResult
+                                        part3 = part3
                                                 + "\n单号：" + JsonUtils.optStringNotNull(listObject, "PI_INOUTNO")
                                                 + ";条码号：" + JsonUtils.optStringNotNull(listObject, "BAR_CODE")
                                                 + ";数量：" + CommonUtil.doubleFormat(JsonUtils.optDoubleNotNull(listObject, "BAR_REMAIN"));
                                     }
                                 }
 
-                                mCollectResultTextView.setText(boxResult);
-                                mCollectResultTextView.setTextColor(getResources().getColor(R.color.green));
+                                SpannableStringBuilder style1 = new SpannableStringBuilder(part1);
+                                SpannableStringBuilder style2 = new SpannableStringBuilder(part2);
+                                SpannableStringBuilder style3 = new SpannableStringBuilder(part3);
+                                style1.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.green)),0,part1.length(),Spannable.SPAN_EXCLUSIVE_INCLUSIVE);     //设置指定位置文字的颜色
+                                style2.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.red)),0,part2.length(),Spannable.SPAN_EXCLUSIVE_INCLUSIVE);     //设置指定位置文字的颜色
+                                style3.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.green)),0,part3.length(),Spannable.SPAN_EXCLUSIVE_INCLUSIVE);     //设置指定位置文字的颜色
+                                style1 = style1.append(style2).append(style3);
+                                mCollectResultTextView.setText(style1);
 
                                 mBarcodeTableLayout.setVisibility(View.GONE);
                                 mBoxTableLayout.setVisibility(View.GONE);
@@ -1113,31 +1139,37 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                         }
                     } else {
                         mCollectResultTextView.setVisibility(View.VISIBLE);
-                        mCollectResultTextView.setTextColor(getResources().getColor(R.color.green));
+//                        mCollectResultTextView.setTextColor(getResources().getColor(R.color.green));
                         mCollectResultTextView.setText(null);
                         JSONArray listArray = dataObject.optJSONArray("nolist");
                         if (mCollectType.equals("byBarcode") || mCollectType.equals("byBatchcode")) {
-                            String barcodeResult = "采集成功；" + JsonUtils.optStringNotNull(dataObject, "finishno")
+                            String part1 = "采集成功；" + JsonUtils.optStringNotNull(dataObject, "finishno")
                                     + "\n条码：" + JsonUtils.optStringNotNull(messageObject, "BAR_CODE")
-                                    + "；数量：" + CommonUtil.doubleFormat(messageObject.optDouble("BAR_REMAIN"))
-                                    + "；批号：" + JsonUtils.optStringNotNull(messageObject, "BAR_BATCHCODE")
+                                    + "；数量：" ;
+                            String part2 = CommonUtil.doubleFormat(messageObject.optDouble("BAR_REMAIN"));
+                            String part3 = "；批号：" + JsonUtils.optStringNotNull(messageObject, "BAR_BATCHCODE")
                                     + "；料号：" + JsonUtils.optStringNotNull(messageObject, "BAR_PRODCODE")
                                     + "；名称规格：" + messageObject.optString("PR_DETAIL")
                                     + "  " + JsonUtils.optStringNotNull(messageObject, "PR_SPEC")
                                     + "；仓位：" + JsonUtils.optStringNotNull(messageObject, "BAR_LOCATION");
-
                             if (listArray != null && listArray.length() > 0) {
                                 for (int i = 0; i < listArray.length(); i++) {
                                     JSONObject listObject = listArray.optJSONObject(i);
-                                    barcodeResult = barcodeResult
-                                            + "\n单号：" + JsonUtils.optStringNotNull(listObject, "PI_INOUTNO")
-                                            + ";条码号：" + JsonUtils.optStringNotNull(listObject, "BAR_CODE")
-                                            + ";数量：" + CommonUtil.doubleFormat(JsonUtils.optDoubleNotNull(listObject, "BAR_REMAIN"));
+                                    part3 = part3 + "\n单号：" + JsonUtils.optStringNotNull(listObject, "PI_INOUTNO")
+                                                  + ";条码号：" + JsonUtils.optStringNotNull(listObject, "BAR_CODE")
+                                                  + ";数量：" + CommonUtil.doubleFormat(JsonUtils.optDoubleNotNull(listObject, "BAR_REMAIN"));
                                 }
                             }
 
-                            mCollectResultTextView.setText(barcodeResult);
-                            mCollectResultTextView.setTextColor(getResources().getColor(R.color.green));
+                            SpannableStringBuilder style1 = new SpannableStringBuilder(part1);
+                            SpannableStringBuilder style2 = new SpannableStringBuilder(part2);
+                            SpannableStringBuilder style3 = new SpannableStringBuilder(part3);
+                             //style.setSpan(new BackgroundColorSpan(Color.RED),2,5, Spannable.SPAN_EXCLUSIVE_INCLUSIVE);     //设置指定位置textview的背景颜色
+                            style1.setSpan(new ForegroundColorSpan(Color.GREEN),0,part1.length(),Spannable.SPAN_EXCLUSIVE_INCLUSIVE);     //设置指定位置文字的颜色
+                            style2.setSpan(new ForegroundColorSpan(Color.RED),0,part2.length(),Spannable.SPAN_EXCLUSIVE_INCLUSIVE);     //设置指定位置文字的颜色
+                            style3.setSpan(new ForegroundColorSpan(Color.GREEN),0,part3.length(),Spannable.SPAN_EXCLUSIVE_INCLUSIVE);     //设置指定位置文字的颜色
+                            style1 = style1.append(style2).append(style3);
+                            mCollectResultTextView.setText(style1);
 
 
                             mBarcodeTableLayout.setVisibility(View.GONE);
@@ -1160,28 +1192,32 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
 
                             PdaApplication.putDataCache2Map(Constants.FLAG.MATERIAL_COLLECT_BARCODE_RESULT + pi_inoutno, mResults);
                         } else if (false) {
-                            String boxResult = "采集成功；" + JsonUtils.optStringNotNull(dataObject, "finishno")
+                            String part1 = "采集成功；" + JsonUtils.optStringNotNull(dataObject, "finishno")
                                     + "\n箱号：" + JsonUtils.optStringNotNull(messageObject, "BAR_OUTBOXCODE1")
-                                    + "；数量：" + CommonUtil.doubleFormat(messageObject.optDouble("BAR_REMAIN"))
-                                    + "；批号：" + JsonUtils.optStringNotNull(messageObject, "BAR_BATCHCODE")
+                                    + "；数量：" ;
+                            String part2 = CommonUtil.doubleFormat(messageObject.optDouble("BAR_REMAIN"));
+                            String part3 = "；批号：" + JsonUtils.optStringNotNull(messageObject, "BAR_BATCHCODE")
                                     + "；料号：" + JsonUtils.optStringNotNull(messageObject, "BAR_PRODCODE")
-                                    + "；名称规格：" + JsonUtils.optStringNotNull(messageObject, "PR_DETAIL")
+                                    + "；名称规格：" + messageObject.optString("PR_DETAIL")
                                     + "  " + JsonUtils.optStringNotNull(messageObject, "PR_SPEC");
-
-
                             if (listArray != null && listArray.length() > 0) {
                                 for (int i = 0; i < listArray.length(); i++) {
                                     JSONObject listObject = listArray.optJSONObject(i);
-                                    boxResult = boxResult
+                                    part3 = part3
                                             + "\n单号：" + JsonUtils.optStringNotNull(listObject, "PI_INOUTNO")
                                             + ";条码号：" + JsonUtils.optStringNotNull(listObject, "BAR_CODE")
                                             + ";数量：" + CommonUtil.doubleFormat(JsonUtils.optDoubleNotNull(listObject, "BAR_REMAIN"));
                                 }
                             }
 
-                            mCollectResultTextView.setText(boxResult);
-                            mCollectResultTextView.setTextColor(getResources().getColor(R.color.green));
-
+                            SpannableStringBuilder style1 = new SpannableStringBuilder(part1);
+                            SpannableStringBuilder style2 = new SpannableStringBuilder(part2);
+                            SpannableStringBuilder style3 = new SpannableStringBuilder(part3);
+                            style1.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.green)),0,part1.length(),Spannable.SPAN_EXCLUSIVE_INCLUSIVE);     //设置指定位置文字的颜色
+                            style2.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.red)),0,part2.length(),Spannable.SPAN_EXCLUSIVE_INCLUSIVE);     //设置指定位置文字的颜色
+                            style3.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.green)),0,part3.length(),Spannable.SPAN_EXCLUSIVE_INCLUSIVE);     //设置指定位置文字的颜色
+                            style1 = style1.append(style2).append(style3);
+                            mCollectResultTextView.setText(style1);
 
                             mBarcodeTableLayout.setVisibility(View.GONE);
                             mBoxTableLayout.setVisibility(View.GONE);
@@ -1231,7 +1267,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                         }
                     }
 
-                } catch (JSONException e) {
+                } catch (Exception e) {
                     e.printStackTrace();
                 }
             }
@@ -1247,7 +1283,6 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                     mCollectResultTextView.setTextColor(getResources().getColor(R.color.red));
                     mCollectResultTextView.setText(errorToast);
                 }
-
             }
         }) {
             @Override
@@ -1892,28 +1927,28 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                         }
                     } else {
                         mCollectResultTextView.setVisibility(View.VISIBLE);
-                        mCollectResultTextView.setTextColor(getResources().getColor(R.color.green));
                         mCollectResultTextView.setText(null);
                         //                        listArray = dataObject.optJSONArray("nolist");
                         listArray = FastjsonUtil.getJSONArray(dataObject.toString(), "nolist");
                         Log.e("listArraydata", listArray.toString());
                         if (mCollectType.equals("byBarcode") || mCollectType.equals("byBatchcode")) {
-                            String barcodeResult = "采集成功；" + JsonUtils.optStringNotNull(dataObject, "finishno")
+
+                            String part1 = "采集成功；" + JsonUtils.optStringNotNull(dataObject, "finishno")
                                     + "\n条码：" + JsonUtils.optStringNotNull(messageObject, "BAR_CODE")
-                                    + "；数量：" + CommonUtil.doubleFormat(messageObject.optDouble("BAR_REMAIN"))
-                                    + "；批号：" + JsonUtils.optStringNotNull(messageObject, "BAR_BATCHCODE")
+                                    + "；数量：" ;
+                            String part2 = CommonUtil.doubleFormat(messageObject.optDouble("BAR_REMAIN"));
+                            String part3 = "；批号：" + JsonUtils.optStringNotNull(messageObject, "BAR_BATCHCODE")
                                     + "；料号：" + JsonUtils.optStringNotNull(messageObject, "BAR_PRODCODE")
                                     + "；名称规格：" + messageObject.optString("PR_DETAIL")
                                     + "  " + JsonUtils.optStringNotNull(messageObject, "PR_SPEC")
                                     + "；仓位：" + JsonUtils.optStringNotNull(messageObject, "BAR_LOCATION");
-
                             if (listArray != null && listArray.size() > 0) {
                                 for (int i = 0; i < listArray.size(); i++) {
                                     com.alibaba.fastjson.JSONObject listObject = listArray.getJSONObject(i);
                                     //JsonUtils.optStringNotNull(listObject, "PI_INOUTNO")
                                     //JsonUtils.optStringNotNull(listObject, "BAR_CODE")
                                     //CommonUtil.doubleFormat(JsonUtils.optDoubleNotNull(listObject, "RESTQTY"));
-                                    barcodeResult = barcodeResult
+                                    part3 = part3
                                             + "\n单号：" + listObject.getString("PI_INOUTNO")
                                             + ";条码号：" + listObject.getString("BAR_CODE")
                                             + ";数量：" + listObject.getString("RESTQTY");
@@ -1923,9 +1958,15 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                 initBreakPopupWindow(listArray);
                             }
 
-                            mCollectResultTextView.setText(barcodeResult);
-                            mCollectResultTextView.setTextColor(getResources().getColor(R.color.green));
-
+                            SpannableStringBuilder style1 = new SpannableStringBuilder(part1);
+                            SpannableStringBuilder style2 = new SpannableStringBuilder(part2);
+                            SpannableStringBuilder style3 = new SpannableStringBuilder(part3);
+                            //style.setSpan(new BackgroundColorSpan(Color.RED),2,5, Spannable.SPAN_EXCLUSIVE_INCLUSIVE);     //设置指定位置textview的背景颜色
+                            style1.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.green)),0,part1.length(),Spannable.SPAN_EXCLUSIVE_INCLUSIVE);     //设置指定位置文字的颜色
+                            style2.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.red)),0,part2.length(),Spannable.SPAN_EXCLUSIVE_INCLUSIVE);     //设置指定位置文字的颜色
+                            style3.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.green)),0,part3.length(),Spannable.SPAN_EXCLUSIVE_INCLUSIVE);     //设置指定位置文字的颜色
+                            style1 = style1.append(style2).append(style3);
+                            mCollectResultTextView.setText(style1);
 
                             mBarcodeTableLayout.setVisibility(View.GONE);
                             mBoxTableLayout.setVisibility(View.GONE);
@@ -1947,14 +1988,22 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
 
                             PdaApplication.putDataCache2Map(Constants.FLAG.MATERIAL_COLLECT_BARCODE_RESULT + pi_inoutno, mResults);
                         } else if (false) {
-                            String boxResult = "采集成功；" + JsonUtils.optStringNotNull(dataObject, "finishno")
+                            String part1 = "采集成功；" + JsonUtils.optStringNotNull(dataObject, "finishno")
                                     + "\n箱号：" + JsonUtils.optStringNotNull(messageObject, "BAR_OUTBOXCODE1")
-                                    + "；数量：" + CommonUtil.doubleFormat(messageObject.optDouble("BAR_REMAIN"))
-                                    + "；批号：" + JsonUtils.optStringNotNull(messageObject, "BAR_BATCHCODE")
+                                    + "；数量：" ;
+                            String part2 = CommonUtil.doubleFormat(messageObject.optDouble("BAR_REMAIN"));
+                            String part3 = "；批号：" + JsonUtils.optStringNotNull(messageObject, "BAR_BATCHCODE")
                                     + "；料号：" + JsonUtils.optStringNotNull(messageObject, "BAR_PRODCODE")
-                                    + "；名称规格：" + JsonUtils.optStringNotNull(messageObject, "PR_DETAIL")
+                                    + "；名称规格：" + messageObject.optString("PR_DETAIL")
                                     + "  " + JsonUtils.optStringNotNull(messageObject, "PR_SPEC");
 
+//                            String boxResult = "采集成功；" + JsonUtils.optStringNotNull(dataObject, "finishno")
+//                                    + "\n箱号：" + JsonUtils.optStringNotNull(messageObject, "BAR_OUTBOXCODE1")
+//                                    + "；数量：" + CommonUtil.doubleFormat(messageObject.optDouble("BAR_REMAIN"))
+//                                    + "；批号：" + JsonUtils.optStringNotNull(messageObject, "BAR_BATCHCODE")
+//                                    + "；料号：" + JsonUtils.optStringNotNull(messageObject, "BAR_PRODCODE")
+//                                    + "；名称规格：" + JsonUtils.optStringNotNull(messageObject, "PR_DETAIL")
+//                                    + "  " + JsonUtils.optStringNotNull(messageObject, "PR_SPEC");
 
                             if (listArray != null && listArray.size() > 0) {
                                 for (int i = 0; i < listArray.size(); i++) {
@@ -1962,16 +2011,21 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                     //                                    + "\n单号：" + JsonUtils.optStringNotNull(listObject, "PI_INOUTNO")
                                     //                                            + ";条码号：" + JsonUtils.optStringNotNull(listObject, "BAR_CODE")
                                     //                                            + ";数量：" + CommonUtil.doubleFormat(JsonUtils.optDoubleNotNull(listObject, "BAR_REMAIN"));
-                                    boxResult = boxResult
+                                    part3 = part3
                                             + "\n单号：" + listObject.getString("PI_INOUTNO")
                                             + ";条码号：" + listObject.getString("BAR_CODE")
                                             + ";数量：" + listObject.getDouble("BAR_REMAIN");
                                 }
                             }
 
-                            mCollectResultTextView.setText(boxResult);
-                            mCollectResultTextView.setTextColor(getResources().getColor(R.color.green));
-
+                            SpannableStringBuilder style1 = new SpannableStringBuilder(part1);
+                            SpannableStringBuilder style2 = new SpannableStringBuilder(part2);
+                            SpannableStringBuilder style3 = new SpannableStringBuilder(part3);
+                            style1.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.green)),0,part1.length(),Spannable.SPAN_EXCLUSIVE_INCLUSIVE);     //设置指定位置文字的颜色
+                            style2.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.red)),0,part2.length(),Spannable.SPAN_EXCLUSIVE_INCLUSIVE);     //设置指定位置文字的颜色
+                            style3.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.green)),0,part3.length(),Spannable.SPAN_EXCLUSIVE_INCLUSIVE);     //设置指定位置文字的颜色
+                            style1 = style1.append(style2).append(style3);
+                            mCollectResultTextView.setText(style1);
 
                             mBarcodeTableLayout.setVisibility(View.GONE);
                             mBoxTableLayout.setVisibility(View.GONE);

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

@@ -7,15 +7,13 @@
             android:id="@+id/include_menuactionbar"
             layout="@layout/actionbar_withback" />-->
 
-    <android.support.v4.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        >
+
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical">
+
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -104,349 +102,363 @@
             </LinearLayout>
 
 
-            <ScrollView
+            <android.support.v4.widget.NestedScrollView
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="match_parent"
+                >
 
-                <LinearLayout
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                >
+
+                <ScrollView
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:padding="@dimen/padding_normal">
+                    android:layout_height="wrap_content">
 
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="单号："
-                            android:textColor="@color/body_text_1"
-                            android:textSize="14sp" />
-
-                        <TextView
-                            android:id="@+id/tv_pi_inoutno"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:textColor="@color/body_text_1"
-                            android:textSize="14sp"
-                            tools:text="YS1506002" />
-
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="仓库："
-                            android:textColor="@color/body_text_1"
-                            android:textSize="14sp"
-                            android:visibility="gone" />
+                        android:orientation="vertical"
+                        android:padding="@dimen/padding_normal">
 
-                        <TextView
-                            android:id="@+id/tv_pd_whcode"
-                            android:layout_width="wrap_content"
+                        <LinearLayout
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:textColor="@color/body_text_1"
-                            android:textSize="14sp"
-                            android:visibility="gone"
-                            tools:text="01" />
-
-                        <CheckBox
-                            android:id="@+id/stock_data_summary_cb"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:checked="true"
-                            android:text="未完成" />
-
-                    </LinearLayout>
-
-                    <TableLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/spacing_big"
-                        android:stretchColumns="1">
+                            android:orientation="horizontal">
 
-                        <TableRow>
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="单号："
+                                android:textColor="@color/body_text_1"
+                                android:textSize="14sp" />
 
                             <TextView
-                                android:id="@+id/iocout_material_type_tv"
-                                style="@style/tl_tv_style"
-                                android:layout_height="match_parent"
-                                android:background="@color/gray_light"
-                                android:drawableLeft="@drawable/switch_model"
-                                android:drawablePadding="5dp"
-                                android:gravity="center_vertical"
-                                android:padding="10dp"
-                                android:text="条码"
+                                android:id="@+id/tv_pi_inoutno"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
                                 android:textColor="@color/body_text_1"
-                                android:textSize="16sp" />
-                            <!--<TextView-->
-                            <!--android:id="@+id/iocout_material_type_tv"-->
-                            <!--style="@style/tl_tv_style"-->
-                            <!--android:layout_height="match_parent"-->
-                            <!--android:background="@color/gray_light"-->
-                            <!--android:gravity="center_vertical"-->
-                            <!--android:padding="10dp"-->
-                            <!--android:text="条码"-->
-                            <!--android:textColor="@color/body_text_1"-->
-                            <!--android:textSize="16sp" />-->
-
-                            <com.uas.pda_smart_com.view.ClearableEditText
-                                android:id="@+id/et_bar_code"
-                                style="@style/EditTextStyle"
-                                android:focusable="true"
-                                android:focusableInTouchMode="true"
-                                android:hint="@string/please_collect_barcode"
-                                android:textColor="@color/black" />
-                        </TableRow>
+                                android:textSize="14sp"
+                                tools:text="YS1506002" />
 
-                    </TableLayout>
-                    <!--no use-->
-                    <Button
-                        android:id="@+id/btn_confirm"
-                        style="@style/ButtonStyle"
-                        android:enabled="false"
-                        android:text="@string/confirm"
-                        android:visibility="gone" />
 
-                    <TableLayout
-                        android:id="@+id/iocout_collect_barcode_tl"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="5dp"
-                        android:layout_marginTop="@dimen/spacing_big"
-                        android:background="@drawable/bg_button_enabled"
-                        android:padding="10dp"
-                        android:stretchColumns="1"
-                        android:visibility="gone"
-                        tools:visibility="visible">
-
-                        <TableRow>
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="仓库："
+                                android:textColor="@color/body_text_1"
+                                android:textSize="14sp"
+                                android:visibility="gone" />
 
                             <TextView
-                                android:id="@+id/tv_barcode_collection_success"
-                                style="@style/tl_tv_style"
-                                android:layout_gravity="center_vertical"
-                                android:layout_marginLeft="10dp"
-                                android:textColor="@color/white"
+                                android:id="@+id/tv_pd_whcode"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:textColor="@color/body_text_1"
+                                android:textSize="14sp"
                                 android:visibility="gone"
-                                tools:visibility="visible"/>
-                        </TableRow>
-
-                        <TableRow>
+                                tools:text="01" />
 
-                            <TextView
-                                style="@style/tl_tv_style"
-                                android:layout_gravity="center_vertical"
-                                android:text="@string/text_barcode_tailback" />
+                            <CheckBox
+                                android:id="@+id/stock_data_summary_cb"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:checked="true"
+                                android:text="未完成" />
 
-                            <TextView
-                                android:id="@+id/iocout_bar_code_tv"
-                                style="@style/tv"
-                                android:layout_marginLeft="3dp" />
-                        </TableRow>
+                        </LinearLayout>
 
-                        <TableRow>
+                        <TableLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/spacing_big"
+                            android:stretchColumns="1">
+
+                            <TableRow>
+
+                                <TextView
+                                    android:id="@+id/iocout_material_type_tv"
+                                    style="@style/tl_tv_style"
+                                    android:layout_height="match_parent"
+                                    android:background="@color/gray_light"
+                                    android:drawableLeft="@drawable/switch_model"
+                                    android:drawablePadding="5dp"
+                                    android:gravity="center_vertical"
+                                    android:padding="10dp"
+                                    android:text="条码"
+                                    android:textColor="@color/body_text_1"
+                                    android:textSize="16sp" />
+                                <!--<TextView-->
+                                <!--android:id="@+id/iocout_material_type_tv"-->
+                                <!--style="@style/tl_tv_style"-->
+                                <!--android:layout_height="match_parent"-->
+                                <!--android:background="@color/gray_light"-->
+                                <!--android:gravity="center_vertical"-->
+                                <!--android:padding="10dp"-->
+                                <!--android:text="条码"-->
+                                <!--android:textColor="@color/body_text_1"-->
+                                <!--android:textSize="16sp" />-->
+
+                                <com.uas.pda_smart_com.view.ClearableEditText
+                                    android:id="@+id/et_bar_code"
+                                    style="@style/EditTextStyle"
+                                    android:focusable="true"
+                                    android:focusableInTouchMode="true"
+                                    android:hint="@string/please_collect_barcode"
+                                    android:textColor="@color/black" />
+                            </TableRow>
+
+                        </TableLayout>
+                        <!--no use-->
+                        <Button
+                            android:id="@+id/btn_confirm"
+                            style="@style/ButtonStyle"
+                            android:enabled="false"
+                            android:text="@string/confirm"
+                            android:visibility="gone" />
 
-                            <TextView
-                                style="@style/tl_tv_style"
-                                android:layout_gravity="center_vertical"
-                                android:text="@string/bar_remain" />
+                        <TableLayout
+                            android:id="@+id/iocout_collect_barcode_tl"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginBottom="5dp"
+                            android:layout_marginTop="@dimen/spacing_big"
+                            android:background="@drawable/bg_button_enabled"
+                            android:padding="10dp"
+                            android:stretchColumns="1"
+                            android:visibility="gone"
+                            tools:visibility="visible">
+
+                            <TableRow>
+
+                                <TextView
+                                    android:id="@+id/tv_barcode_collection_success"
+                                    style="@style/tl_tv_style"
+                                    android:layout_gravity="center_vertical"
+                                    android:layout_marginLeft="10dp"
+                                    android:textColor="@color/white"
+                                    android:visibility="gone"
+                                    tools:visibility="visible"/>
+                            </TableRow>
+
+                            <TableRow>
+
+                                <TextView
+                                    style="@style/tl_tv_style"
+                                    android:layout_gravity="center_vertical"
+                                    android:text="@string/text_barcode_tailback" />
+
+                                <TextView
+                                    android:id="@+id/iocout_bar_code_tv"
+                                    style="@style/tv"
+                                    android:layout_marginLeft="3dp" />
+                            </TableRow>
+
+                            <TableRow>
+
+                                <TextView
+                                    style="@style/tl_tv_style"
+                                    android:layout_gravity="center_vertical"
+                                    android:text="@string/bar_remain" />
+
+                                <TextView
+                                    android:id="@+id/iocout_bar_remain_tv"
+                                    style="@style/tv"
+                                    android:layout_marginLeft="3dp" />
+                            </TableRow>
+
+                            <TableRow>
+
+                                <TextView
+                                    style="@style/tl_tv_style"
+                                    android:layout_gravity="center_vertical"
+                                    android:text="@string/text_procode_tailback" />
+
+                                <TextView
+                                    android:id="@+id/iocout_bar_prodcode_tv"
+                                    style="@style/tv"
+                                    android:layout_marginLeft="3dp" />
+                            </TableRow>
+                        </TableLayout>
+
+                        <TableLayout
+                            android:id="@+id/iocout_collect_box_tl"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginBottom="5dp"
+                            android:layout_marginTop="@dimen/spacing_big"
+                            android:background="@drawable/bg_button_enabled"
+                            android:padding="10dp"
+                            android:stretchColumns="1"
+                            android:visibility="gone"
+                            tools:visibility="visible"
+                            >
+
+                            <TableRow>
+
+                                <TextView
+                                    android:id="@+id/tv_box_collection_success"
+                                    style="@style/tl_tv_style"
+                                    android:layout_gravity="center_vertical"
+                                    android:layout_marginLeft="10dp"
+                                    android:textColor="@color/white"
+                                    android:visibility="gone" />
+                            </TableRow>
+
+                            <TableRow>
+
+                                <TextView
+                                    style="@style/tl_tv_style"
+                                    android:layout_gravity="center_vertical"
+                                    android:text="箱号：" />
+
+                                <TextView
+                                    android:id="@+id/iocout_box_tv"
+                                    style="@style/tv"
+                                    android:layout_marginLeft="3dp" />
+                            </TableRow>
+
+                            <TableRow>
+
+                                <TextView
+                                    style="@style/tl_tv_style"
+                                    android:layout_gravity="center_vertical"
+                                    android:text="箱内总数：" />
+
+                                <TextView
+                                    android:id="@+id/iocout_box_num_tv"
+                                    style="@style/tv"
+                                    android:layout_marginLeft="3dp" />
+                            </TableRow>
+
+                            <TableRow>
+
+                                <TextView
+                                    style="@style/tl_tv_style"
+                                    android:layout_gravity="center_vertical"
+                                    android:text="@string/text_procode_tailback" />
+
+                                <TextView
+                                    android:id="@+id/iocout_box_prodcode_tv"
+                                    style="@style/tv"
+                                    android:layout_marginLeft="3dp" />
+                            </TableRow>
+
+                            <TableRow>
+
+                                <TextView
+                                    style="@style/tl_tv_style"
+                                    android:layout_gravity="center_vertical"
+                                    android:text="仓库：" />
+
+                                <TextView
+                                    android:id="@+id/iocout_box_whcode_tv"
+                                    style="@style/tv"
+                                    android:layout_marginLeft="3dp" />
+                            </TableRow>
+                        </TableLayout>
 
-                            <TextView
-                                android:id="@+id/iocout_bar_remain_tv"
-                                style="@style/tv"
-                                android:layout_marginLeft="3dp" />
-                        </TableRow>
+                        <TextView
+                            android:id="@+id/iocout_collect_result"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/spacing_big"
+                            android:background="@drawable/shape_msg_block"
+                            android:padding="10dp"
+                            android:visibility="gone"
+                            tools:text="boxResultboxResultboxResultboxResult"
+                            tools:visibility="visible"/>
 
-                        <TableRow>
+                        <TextView
+                            android:visibility="gone"
+                            android:id="@+id/iocout_next_material_information"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/spacing_big"
+                            android:background="@drawable/shape_msg_block"
+                            android:padding="10dp"
+                            tools:text="物料：PD_PRODCODE, 名称规格：PR_DETAIL || PR_SPEC未备料数: PD_RESTQTY,最小包装数：PR_ZXBZS,仓位：BAR_LOCATION,有PD_BATCHCODE 则显示批号：PD_BATCHCODE" />
+                    </LinearLayout>
 
-                            <TextView
-                                style="@style/tl_tv_style"
-                                android:layout_gravity="center_vertical"
-                                android:text="@string/text_procode_tailback" />
+                </ScrollView>
 
-                            <TextView
-                                android:id="@+id/iocout_bar_prodcode_tv"
-                                style="@style/tv"
-                                android:layout_marginLeft="3dp" />
-                        </TableRow>
-                    </TableLayout>
+                <LinearLayout
+                    android:visibility="gone"
+                    android:id="@+id/line_tab"
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1">
 
                     <TableLayout
-                        android:id="@+id/iocout_collect_box_tl"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="5dp"
-                        android:layout_marginTop="@dimen/spacing_big"
-                        android:background="@drawable/bg_button_enabled"
-                        android:padding="10dp"
-                        android:stretchColumns="1"
-                        android:visibility="gone"
-                        tools:visibility="visible"
-                        >
+                        android:layout_marginTop="@dimen/space_top_8"
+                        style="@style/CardWhiteStyle_wrapheight">
 
                         <TableRow>
-
                             <TextView
-                                android:id="@+id/tv_box_collection_success"
-                                style="@style/tl_tv_style"
-                                android:layout_gravity="center_vertical"
-                                android:layout_marginLeft="10dp"
-                                android:textColor="@color/white"
-                                android:visibility="gone" />
+                                style="@style/CardContentTextStylepopu"
+                                android:textSize="@dimen/textsize_12"
+                                android:text="未备料数"/>
+                            <TextView
+                                android:id="@+id/tv_pd_restqty"
+                                style="@style/CardContentTextStylepopu"
+                                android:textSize="@dimen/textsize_12"
+                                android:textColor="@color/text_search"/>
                         </TableRow>
 
                         <TableRow>
-
                             <TextView
-                                style="@style/tl_tv_style"
-                                android:layout_gravity="center_vertical"
-                                android:text="箱号：" />
-
+                                style="@style/CardContentTextStylepopu"
+                                android:textSize="@dimen/textsize_12"
+                                android:text="需求数"/>
                             <TextView
-                                android:id="@+id/iocout_box_tv"
-                                style="@style/tv"
-                                android:layout_marginLeft="3dp" />
+                                android:id="@+id/tv_pd_ouqty"
+                                style="@style/CardContentTextStylepopu"
+                                android:textSize="@dimen/textsize_12"
+                                android:textColor="@color/text_search"/>
                         </TableRow>
 
                         <TableRow>
-
                             <TextView
-                                style="@style/tl_tv_style"
-                                android:layout_gravity="center_vertical"
-                                android:text="箱内总数：" />
-
+                                style="@style/CardContentTextStylepopu"
+                                android:textSize="@dimen/textsize_12"
+                                android:text="@string/text_fragment_whcheck_pd_prodcode"/>
                             <TextView
-                                android:id="@+id/iocout_box_num_tv"
-                                style="@style/tv"
-                                android:layout_marginLeft="3dp" />
+                                android:id="@+id/tv_pd_prodcode"
+                                style="@style/CardContentTextStylepopu"
+                                android:textSize="@dimen/textsize_12"
+                                android:textColor="@color/text_search"/>
                         </TableRow>
-
                         <TableRow>
-
                             <TextView
-                                style="@style/tl_tv_style"
-                                android:layout_gravity="center_vertical"
-                                android:text="@string/text_procode_tailback" />
-
+                                style="@style/CardContentTextStylepopu"
+                                android:textSize="@dimen/textsize_12"
+                                android:text="@string/text_fragment_whcheck_pr_detail"/>
                             <TextView
-                                android:id="@+id/iocout_box_prodcode_tv"
-                                style="@style/tv"
-                                android:layout_marginLeft="3dp" />
+                                android:id="@+id/tv_pr_detail"
+                                android:textSize="@dimen/textsize_12"
+                                style="@style/CardContentTextStylepopu"
+                                android:textColor="@color/text_search"/>
                         </TableRow>
-
                         <TableRow>
-
                             <TextView
-                                style="@style/tl_tv_style"
-                                android:layout_gravity="center_vertical"
-                                android:text="仓库：" />
-
+                                style="@style/CardContentTextStylepopu"
+                                android:textSize="@dimen/textsize_12"
+                                android:text="@string/text_fragment_whcheck_pr_spec" />
                             <TextView
-                                android:id="@+id/iocout_box_whcode_tv"
-                                style="@style/tv"
-                                android:layout_marginLeft="3dp" />
+                                android:id="@+id/tv_pr_spec"
+                                style="@style/CardContentTextStylepopu"
+                                android:textSize="@dimen/textsize_12"
+                                android:textColor="@color/text_search" />
                         </TableRow>
                     </TableLayout>
 
-                    <TextView
-                        android:id="@+id/iocout_collect_result"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/spacing_big"
-                        android:background="@drawable/shape_msg_block"
-                        android:padding="10dp"
-                        android:visibility="gone"
-                        tools:text="boxResultboxResultboxResultboxResult"
-                        tools:visibility="visible"/>
-
-                    <TextView
-                        android:visibility="gone"
-                        android:id="@+id/iocout_next_material_information"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/spacing_big"
-                        android:background="@drawable/shape_msg_block"
-                        android:padding="10dp"
-                        tools:text="物料：PD_PRODCODE, 名称规格：PR_DETAIL || PR_SPEC未备料数: PD_RESTQTY,最小包装数：PR_ZXBZS,仓位：BAR_LOCATION,有PD_BATCHCODE 则显示批号：PD_BATCHCODE" />
                 </LinearLayout>
 
-            </ScrollView>
-
-            <LinearLayout
-                android:id="@+id/line_tab"
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1">
-
-                <TableLayout
-                    android:layout_marginTop="@dimen/space_top_8"
-                    style="@style/CardWhiteStyle_wrapheight">
-
-                    <TableRow>
-                        <TextView
-                            style="@style/CardContentTextStylepopu"
-                            android:textSize="@dimen/textsize_12"
-                            android:text="未备料数"/>
-                        <TextView
-                            android:id="@+id/tv_pd_restqty"
-                            style="@style/CardContentTextStylepopu"
-                            android:textSize="@dimen/textsize_12"
-                            android:textColor="@color/text_search"/>
-                    </TableRow>
-
-                    <TableRow>
-                        <TextView
-                            style="@style/CardContentTextStylepopu"
-                            android:textSize="@dimen/textsize_12"
-                            android:text="需求数"/>
-                        <TextView
-                            android:id="@+id/tv_pd_ouqty"
-                            style="@style/CardContentTextStylepopu"
-                            android:textSize="@dimen/textsize_12"
-                            android:textColor="@color/text_search"/>
-                    </TableRow>
-
-                    <TableRow>
-                        <TextView
-                            style="@style/CardContentTextStylepopu"
-                            android:textSize="@dimen/textsize_12"
-                            android:text="@string/text_fragment_whcheck_pd_prodcode"/>
-                        <TextView
-                            android:id="@+id/tv_pd_prodcode"
-                            style="@style/CardContentTextStylepopu"
-                            android:textSize="@dimen/textsize_12"
-                            android:textColor="@color/text_search"/>
-                    </TableRow>
-                    <TableRow>
-                        <TextView
-                            style="@style/CardContentTextStylepopu"
-                            android:textSize="@dimen/textsize_12"
-                            android:text="@string/text_fragment_whcheck_pr_detail"/>
-                        <TextView
-                            android:id="@+id/tv_pr_detail"
-                            android:textSize="@dimen/textsize_12"
-                            style="@style/CardContentTextStylepopu"
-                            android:textColor="@color/text_search"/>
-                    </TableRow>
-                    <TableRow>
-                        <TextView
-                            style="@style/CardContentTextStylepopu"
-                            android:textSize="@dimen/textsize_12"
-                            android:text="@string/text_fragment_whcheck_pr_spec" />
-                        <TextView
-                            android:id="@+id/tv_pr_spec"
-                            style="@style/CardContentTextStylepopu"
-                            android:textSize="@dimen/textsize_12"
-                            android:textColor="@color/text_search" />
-                    </TableRow>
-                </TableLayout>
-
                 <com.bin.david.form.core.SmartTable
                     android:id="@+id/st_data"
                     android:layout_width="match_parent"
@@ -454,9 +466,11 @@
 
             </LinearLayout>
 
+            </android.support.v4.widget.NestedScrollView>
+
+
         </LinearLayout>
 
-    </android.support.v4.widget.NestedScrollView>
 
 
 

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

@@ -1,5 +1,5 @@
 <resources>
-    <string name="my_app_name">仓库-UAS智能终端系统</string>
+    <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>

build.gradle

@@ -54,8 +54,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 46,
-            versionName      : "v2.4.4"
+            versionCode      : 50,
+            versionName      : "v2.4.8"
     ]
 
     depsVersion = [