修改页面中站台显示,增加料号显示,调整与站位相关页面的站位,料号显示格式,对比万利达PDA项目, 去除入库采集页面, 调整与站位相关页面的站位,料号显示格式

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

@@ -195,7 +195,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
 //        if (!itemName.equals(GloableParams.GRIDNAME_SHOPCONTENT)) {
 
         List<String> powerList = (List<String>) PdaApplication.getDataCacheFromMap(Constants.FLAG.POWER_CALLER_CACHE);
-        boolean isPower = false;
+        boolean isPower = true;
         if (itemName.equals(GloableParams.GRIDNAME_SETTING)) {
             isPower = true;
         } else if (GloableParams.GRIDNAME_SOLDER_MANAGER.equals(itemName)) {

app/src/main/java/com/uas/pda_wps/fragment/SCSMTCheckFragment.java

@@ -358,24 +358,24 @@ public class SCSMTCheckFragment extends BaseFragment implements View.OnClickList
                                     tvMsgNotice.setTextColor(getResources().getColor(R.color.green));
                                     tvMsgNotice.setText(notice);
                                 } else {
-                                    notice = notice + "未校验站位"
-                                            + CommonUtil.doubleFormat(notCheckCount) + "条";
-
+                                    notice = notice + "未校验站位" + CommonUtil.doubleFormat(notCheckCount) + "条";
                                     JSONArray notFeedArray = dataObject.optJSONArray("NotCheckLocation");
                                     if (notFeedArray != null && notFeedArray.length() != 0) {
-                                        notice = notice + "\n站位:\n";
+                                        //notice = notice + "\n站位:\n";
                                         for (int i = 0; i < notFeedArray.length(); i++) {
                                             JSONObject notCheckObject = notFeedArray.optJSONObject(i);
                                             if (notCheckObject != null) {
                                                 String psl_location = JsonUtils.optStringNotNull(notCheckObject, "PSL_LOCATION");
+                                                String psl_prodcode = JsonUtils.optStringNotNull(notCheckObject, "PSL_PRODCODE");
                                                 if (i == 0 && mOrderSwitch) {
                                                     mCollectEditText.setText(psl_location);
                                                     confirmEvent(psl_location);
                                                 }
-                                                notice = notice + psl_location + ",";
+                                                //notice = notice + psl_location + ",";
+                                                notice += "\n站位:"  + psl_location + " 料号:" + psl_prodcode;
                                             }
                                         }
-                                        notice = notice.substring(0, notice.length() - 1);
+                                       //notice = notice.substring(0, notice.length() - 1);
                                     }
                                     mNoticeStr = notice;
                                     tvMsgNotice.setTextColor(getResources().getColor(R.color.green));
@@ -383,11 +383,9 @@ public class SCSMTCheckFragment extends BaseFragment implements View.OnClickList
                                     tvMsgNotice.setText(spannableString);
                                 }
                             }
-
                         } catch (Exception e) {
-
+                            e.printStackTrace();
                         }
-
                     }
                 },
                 new Response.ErrorListener() {
@@ -893,27 +891,29 @@ public class SCSMTCheckFragment extends BaseFragment implements View.OnClickList
                                     tvMsgNotice.setText(notice);
                                 } else {
                                     String buffer = notice;
-                                    notice = notice + "\n未校验站位"
-                                            + CommonUtil.doubleFormat(notCheckCount) + "条";
+                                    notice = notice + "\n未校验站位" + CommonUtil.doubleFormat(notCheckCount) + "条";
                                     String noticeStr = "未校验站位" + CommonUtil.doubleFormat(notCheckCount) + "条";
                                     JSONArray notCheckArray = dataObject.optJSONArray("NotCheckLocation");
                                     if (notCheckArray != null && notCheckArray.length() != 0) {
-                                        notice = notice + "\n站位:";
-                                        noticeStr = noticeStr + "\n站位:";
+                                        //notice = notice + "\n站位:";
+                                        //noticeStr = noticeStr + "\n站位:";
                                         for (int i = 0; i < notCheckArray.length(); i++) {
                                             JSONObject notCheckObject = notCheckArray.optJSONObject(i);
                                             if (notCheckObject != null) {
                                                 String psl_location = JsonUtils.optStringNotNull(notCheckObject, "PSL_LOCATION");
+                                                String psl_prodcode = JsonUtils.optStringNotNull(notCheckObject, "PSL_PRODCODE");
                                                 if (i == 0 && mOrderSwitch) {
                                                     mCollectEditText.setText(psl_location);
                                                     confirmEvent(psl_location);
                                                 }
-                                                notice = notice + psl_location + ",";
-                                                noticeStr = noticeStr + psl_location + ",";
+                                                //notice = notice + psl_location + ",";
+                                                //noticeStr = noticeStr + psl_location + ",";
+                                                notice += "\n站位:"  + psl_location + " 料号:" + psl_prodcode;
+                                                noticeStr += "\n站位:"  + psl_location + " 料号:" + psl_prodcode;
                                             }
                                         }
-                                        notice = notice.substring(0, notice.length() - 1);
-                                        noticeStr = noticeStr.substring(0, noticeStr.length() - 1);
+                                        //notice = notice.substring(0, notice.length() - 1);
+                                        //noticeStr = noticeStr.substring(0, noticeStr.length() - 1);
                                     }
                                     mNoticeStr = noticeStr;
                                     tvMsgNotice.setTextColor(getResources().getColor(R.color.green));
@@ -1087,24 +1087,24 @@ public class SCSMTCheckFragment extends BaseFragment implements View.OnClickList
                                     tvMsgNotice.setTextColor(getResources().getColor(R.color.green));
                                     tvMsgNotice.setText(notice);
                                 } else {
-                                    notice = notice + "未校验站位"
-                                            + CommonUtil.doubleFormat(notCheckCount) + "条";
-
+                                    notice = notice + "未校验站位" + CommonUtil.doubleFormat(notCheckCount) + "条";
                                     JSONArray notFeedArray = dataObject.optJSONArray("NotCheckLocation");
                                     if (notFeedArray != null && notFeedArray.length() != 0) {
-                                        notice = notice + "\n站位:";
+                                        //notice = notice + "\n站位:";
                                         for (int i = 0; i < notFeedArray.length(); i++) {
                                             JSONObject notCheckObject = notFeedArray.optJSONObject(i);
                                             if (notCheckObject != null) {
                                                 String psl_location = JsonUtils.optStringNotNull(notCheckObject, "PSL_LOCATION");
+                                                String psl_prodcode = JsonUtils.optStringNotNull(notCheckObject, "PSL_PRODCODE");
                                                 if (i == 0 && mOrderSwitch) {
                                                     mCollectEditText.setText(psl_location);
                                                     confirmEvent(psl_location);
                                                 }
-                                                notice = notice + psl_location + ",";
+                                                //notice = notice + psl_location + ",";
+                                                notice += "\n站位:"  + psl_location + " 料号:" + psl_prodcode;
                                             }
                                         }
-                                        notice = notice.substring(0, notice.length() - 1);
+                                        //notice = notice.substring(0, notice.length() - 1);
                                     }
                                     mNoticeStr = notice;
                                     tvMsgNotice.setTextColor(getResources().getColor(R.color.green));
@@ -1112,9 +1112,8 @@ public class SCSMTCheckFragment extends BaseFragment implements View.OnClickList
                                     tvMsgNotice.setText(spannableString);
                                 }
                             }
-
                         } catch (Exception e) {
-
+                            e.printStackTrace();
                         }
 
                     }

app/src/main/java/com/uas/pda_wps/fragment/SCSMTInFragment.java

@@ -314,19 +314,21 @@ public class SCSMTInFragment extends BaseFragment implements View.OnClickListene
                                     tvMsgSpec.setText(notice);
                                 } else {
                                     String buffer = notice;
-                                    notice = notice + "\n\n未上料站位"
-                                            + CommonUtil.doubleFormat(notCheckCount) + "条";
+                                    notice = notice + "\n\n未上料站位" + CommonUtil.doubleFormat(notCheckCount) + "条";
                                     String noticeStr = "未上料站位" + CommonUtil.doubleFormat(notCheckCount) + "条";
                                     JSONArray notFeedArray = dataObject.optJSONArray("NotFeedLocation");
                                     if (notFeedArray != null && notFeedArray.length() != 0) {
-                                        notice = notice + "\n站位:\n";
-                                        noticeStr = noticeStr + "\n站位:\n";
+                                        //notice = notice + "\n站位:\n";
+                                        //noticeStr = noticeStr + "\n站位:\n";
                                         for (int i = 0; i < notFeedArray.length(); i++) {
                                             JSONObject notCheckObject = notFeedArray.optJSONObject(i);
                                             if (notCheckObject != null) {
                                                 String psl_location = JsonUtils.optStringNotNull(notCheckObject, "PSL_LOCATION");
-                                                notice = notice + psl_location + "\n";
-                                                noticeStr = noticeStr + psl_location + "\n";
+                                                String psl_prodcode = JsonUtils.optStringNotNull(notCheckObject, "PSL_PRODCODE");
+                                                //notice = notice + psl_location + "\n";
+                                                //noticeStr = noticeStr + psl_location + "\n";
+                                                notice += "\n站位:"  + psl_location + " 料号:" + psl_prodcode;
+                                                noticeStr += "\n站位:"  + psl_location + " 料号:" + psl_prodcode;
                                                 if (i == 0 && mOrderSwitch) {
                                                     //过滤|,取前面的字段
                                                     if(!TextUtils.isEmpty(psl_location)&&psl_location.contains("|")){
@@ -338,8 +340,8 @@ public class SCSMTInFragment extends BaseFragment implements View.OnClickListene
                                                 }
                                             }
                                         }
-                                        notice = notice.substring(0, notice.length() - 1);
-                                        noticeStr = noticeStr.substring(0, noticeStr.length() - 1);
+                                        //notice = notice.substring(0, notice.length() - 1);
+                                        //noticeStr = noticeStr.substring(0, noticeStr.length() - 1);
                                     }
                                     mNoticeStr = noticeStr;
                                     SpannableString spannableString = CommonUtil.spanString(notice, mActivity, (buffer + "\n\n未上料站位").length(), (buffer + "\n\n未上料站位").length() + CommonUtil.doubleFormat(notCheckCount).length(), R.color.blue_800);
@@ -435,17 +437,17 @@ public class SCSMTInFragment extends BaseFragment implements View.OnClickListene
                                     tvMsgNotice.setTextColor(getResources().getColor(R.color.green));
                                     tvMsgNotice.setText(notice);
                                 } else {
-                                    notice = notice + "未上料站位"
-                                            + CommonUtil.doubleFormat(NotFeedCount) + "条";
-
+                                    notice = notice + "未上料站位" + CommonUtil.doubleFormat(NotFeedCount) + "条";
                                     JSONArray notFeedArray = dataObject.optJSONArray("NotFeedLocation");
                                     if (notFeedArray != null && notFeedArray.length() != 0) {
-                                        notice = notice + "\n站位:\n";
+                                        //notice = notice + "\n站位:\n";
                                         for (int i = 0; i < notFeedArray.length(); i++) {
                                             JSONObject notCheckObject = notFeedArray.optJSONObject(i);
                                             if (notCheckObject != null) {
                                                 String psl_location = JsonUtils.optStringNotNull(notCheckObject, "PSL_LOCATION");
-                                                notice = notice + psl_location + "\n";
+                                                String psl_prodcode = JsonUtils.optStringNotNull(notCheckObject, "PSL_PRODCODE");
+                                                //notice = notice + psl_location + "\n";
+                                                notice += "\n站位:"  + psl_location + " 料号:" + psl_prodcode;
                                                 if (i == 0 && mOrderSwitch) {
                                                     //过滤|,取前面的字段
                                                     if(!TextUtils.isEmpty(psl_location)&&psl_location.contains("|")){
@@ -457,7 +459,7 @@ public class SCSMTInFragment extends BaseFragment implements View.OnClickListene
                                                 }
                                             }
                                         }
-                                        notice = notice.substring(0, notice.length() - 1);
+                                        //notice = notice.substring(0, notice.length() - 1);
                                     }
                                     mNoticeStr = notice;
                                     tvMsgNotice.setTextColor(getResources().getColor(R.color.green));
@@ -467,7 +469,7 @@ public class SCSMTInFragment extends BaseFragment implements View.OnClickListene
                             }
 
                         } catch (Exception e) {
-
+                            e.printStackTrace();
                         }
 
                     }

app/src/main/java/com/uas/pda_wps/fragment/SCSMTInspectionFragment.java

@@ -358,24 +358,24 @@ public class SCSMTInspectionFragment extends BaseFragment implements View.OnClic
                                     tvMsgNotice.setTextColor(getResources().getColor(R.color.green));
                                     tvMsgNotice.setText(notice);
                                 } else {
-                                    notice = notice + "未校验站位"
-                                            + CommonUtil.doubleFormat(notCheckCount) + "条";
-
+                                    notice = notice + "未校验站位" + CommonUtil.doubleFormat(notCheckCount) + "条";
                                     JSONArray notFeedArray = dataObject.optJSONArray("NotCheckLocation");
                                     if (notFeedArray != null && notFeedArray.length() != 0) {
-                                        notice = notice + "\n站位:\n";
+                                        //notice = notice + "\n站位:\n";
                                         for (int i = 0; i < notFeedArray.length(); i++) {
                                             JSONObject notCheckObject = notFeedArray.optJSONObject(i);
                                             if (notCheckObject != null) {
                                                 String psl_location = JsonUtils.optStringNotNull(notCheckObject, "PSL_LOCATION");
+                                                String psl_prodcode = JsonUtils.optStringNotNull(notCheckObject, "PSL_PRODCODE");
                                                 if (i == 0 && mOrderSwitch) {
                                                     mCollectEditText.setText(psl_location);
                                                     confirmEvent(psl_location);
                                                 }
-                                                notice = notice + psl_location + ",";
+                                                //notice = notice + psl_location + ",";
+                                                notice += "\n站位:"  + psl_location + " 料号:" + psl_prodcode;
                                             }
                                         }
-                                        notice = notice.substring(0, notice.length() - 1);
+                                        //notice = notice.substring(0, notice.length() - 1);
                                     }
                                     mNoticeStr = notice;
                                     tvMsgNotice.setTextColor(getResources().getColor(R.color.green));
@@ -893,27 +893,29 @@ public class SCSMTInspectionFragment extends BaseFragment implements View.OnClic
                                     tvMsgNotice.setText(notice);
                                 } else {
                                     String buffer = notice;
-                                    notice = notice + "\n未校验站位"
-                                            + CommonUtil.doubleFormat(notCheckCount) + "条";
+                                    notice = notice + "\n未校验站位" + CommonUtil.doubleFormat(notCheckCount) + "条";
                                     String noticeStr = "未校验站位" + CommonUtil.doubleFormat(notCheckCount) + "条";
                                     JSONArray notCheckArray = dataObject.optJSONArray("NotCheckLocation");
                                     if (notCheckArray != null && notCheckArray.length() != 0) {
-                                        notice = notice + "\n站位:";
-                                        noticeStr = noticeStr + "\n站位:";
+                                        //notice = notice + "\n站位:";
+                                        //noticeStr = noticeStr + "\n站位:";
                                         for (int i = 0; i < notCheckArray.length(); i++) {
                                             JSONObject notCheckObject = notCheckArray.optJSONObject(i);
                                             if (notCheckObject != null) {
                                                 String psl_location = JsonUtils.optStringNotNull(notCheckObject, "PSL_LOCATION");
+                                                String psl_prodcode = JsonUtils.optStringNotNull(notCheckObject, "PSL_PRODCODE");
                                                 if (i == 0 && mOrderSwitch) {
                                                     mCollectEditText.setText(psl_location);
                                                     confirmEvent(psl_location);
                                                 }
-                                                notice = notice + psl_location + ",";
-                                                noticeStr = noticeStr + psl_location + ",";
+                                                //notice = notice + psl_location + ",";
+                                                //noticeStr = noticeStr + psl_location + ",";
+                                                notice += "\n站位:"  + psl_location + " 料号:" + psl_prodcode;
+                                                noticeStr += "\n站位:"  + psl_location + " 料号:" + psl_prodcode;
                                             }
                                         }
-                                        notice = notice.substring(0, notice.length() - 1);
-                                        noticeStr = noticeStr.substring(0, noticeStr.length() - 1);
+                                        //notice = notice.substring(0, notice.length() - 1);
+                                        //noticeStr = noticeStr.substring(0, noticeStr.length() - 1);
                                     }
                                     mNoticeStr = noticeStr;
                                     tvMsgNotice.setTextColor(getResources().getColor(R.color.green));
@@ -1087,24 +1089,24 @@ public class SCSMTInspectionFragment extends BaseFragment implements View.OnClic
                                     tvMsgNotice.setTextColor(getResources().getColor(R.color.green));
                                     tvMsgNotice.setText(notice);
                                 } else {
-                                    notice = notice + "未校验站位"
-                                            + CommonUtil.doubleFormat(notCheckCount) + "条";
-
+                                    notice = notice + "未校验站位" + CommonUtil.doubleFormat(notCheckCount) + "条";
                                     JSONArray notFeedArray = dataObject.optJSONArray("NotCheckLocation");
                                     if (notFeedArray != null && notFeedArray.length() != 0) {
-                                        notice = notice + "\n站位:";
+                                        //notice = notice + "\n站位:";
                                         for (int i = 0; i < notFeedArray.length(); i++) {
                                             JSONObject notCheckObject = notFeedArray.optJSONObject(i);
                                             if (notCheckObject != null) {
                                                 String psl_location = JsonUtils.optStringNotNull(notCheckObject, "PSL_LOCATION");
+                                                String psl_prodcode = JsonUtils.optStringNotNull(notCheckObject, "PSL_PRODCODE");
                                                 if (i == 0 && mOrderSwitch) {
                                                     mCollectEditText.setText(psl_location);
                                                     confirmEvent(psl_location);
                                                 }
-                                                notice = notice + psl_location + ",";
+                                                //notice = notice + psl_location + ",";
+                                                notice += "\n站位:"  + psl_location + " 料号:" + psl_prodcode;
                                             }
                                         }
-                                        notice = notice.substring(0, notice.length() - 1);
+                                        //notice = notice.substring(0, notice.length() - 1);
                                     }
                                     mNoticeStr = notice;
                                     tvMsgNotice.setTextColor(getResources().getColor(R.color.green));

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

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

app/src/main/java/com/uas/pda_wps/global/GloableParams.java

@@ -780,19 +780,22 @@ public class GloableParams {
     public static final String MENU_STORAGE_RANDOM_CHECK = "抽查校验";
     public static final String MENU_STORAGE_BARCODE_IN = "条码入库";
     public static final String MENU_STORAGE_BARCODE_INFO_COLLECT = "条码信息采集";
-    public static final String MENU_STORAGE_BARCODECJI_IN = "入库采集";
+//    public static final String MENU_STORAGE_BARCODECJI_IN = "入库采集";
 
     public static final String[] storageInMenuNames = {
             MENU_STORAGE_RECHARGE, MENU_STORAGE_INSPECTION, MENU_STORAGE_IQC_STORAGE_IN,
             MENU_STORAGE_MATERIAL_STORAGE_IN, MENU_STORAGE_PRODUCT_STORAGE_IN,
-            MENU_STORAGE_RANDOM_CHECK, MENU_STORAGE_BARCODE_IN, MENU_STORAGE_BARCODE_INFO_COLLECT,
-            MENU_STORAGE_BARCODECJI_IN};
+            MENU_STORAGE_RANDOM_CHECK, MENU_STORAGE_BARCODE_IN,
+            MENU_STORAGE_BARCODE_INFO_COLLECT
+//            MENU_STORAGE_BARCODECJI_IN
+    };
     public static final int[] storageInMenuImgs = {
             R.drawable.ic_storage_recharge, R.drawable.ic_storage_inspection, R.drawable.ic_storage_iqc,
             R.drawable.ic_storage_material_in, R.drawable.ic_storage_finish_in,
             R.drawable.ic_storage_random_check, R.drawable.ic_storage_barcode_in,
-            R.drawable.ic_barcode_info_collect,
-            R.drawable.ic_storage_barcode_in};
+            R.drawable.ic_barcode_info_collect
+//            R.drawable.ic_storage_barcode_in
+    };
 
     //-->SMT校验
     public static final String LISTNAME_SCMAKE_SMTCHECK_FELOA = "飞达+站位";

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

@@ -3,7 +3,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="@color/background_color_first"
-                tools:context="com.uas.pda_wps.MenuActivity">
+                >
 
     <include
         android:id="@+id/include_menuactionbar"

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

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical" android:layout_width="match_parent"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <!--服务器提示信息-->
@@ -52,4 +53,5 @@
             style="@style/CardContentTextStyle"
             tools:text="5名称规格"/>
     </RelativeLayout>
+
 </RelativeLayout>

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

@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--一级griditem布局-->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="100dp"
-    android:layout_height="100dp"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
     android:gravity="center"
     android:focusable="false"
     android:layout_centerInParent="true"
     android:background="@drawable/bg_griditem"
     android:backgroundTint="@color/button_normal"
     android:translationZ="120dp"
+    android:layout_marginTop="10dp"
     android:orientation="vertical">
 
     <ImageView

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">万利达</string>
     <string name="hello_world">Hello world!</string>
     <string name="action_settings">Settings</string>

build.gradle

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