소스 검색

1.修改Android Apex Mobile Result Document,移除Description,增加PO#和BOL。

Pen Li 7 년 전
부모
커밋
41efe59046

+ 1 - 1
ApexDrivers/apexmobile/src/main/java/com/usai/apex/apexresult/ApexResultAdapter.java

@@ -169,7 +169,7 @@ public class ApexResultAdapter extends BaseAdapter {
                 ApexResultDocumentModel documentModel = (ApexResultDocumentModel)model;
                 ApexResultDocumentCell cell = dequeueDocumentCell(context, convertView);
                 cell.prepareReuse();
-                cell.setFileName(documentModel.fileName).setFileType(documentModel.fileType).setFileDescription(documentModel.fileDesc);
+                cell.setFileName(documentModel.fileName).setFileType(documentModel.fileType).setPo(documentModel.po).setBOL(documentModel.bol);
 
                 return cell;
             }

+ 12 - 5
ApexDrivers/apexmobile/src/main/java/com/usai/apex/apexresult/cell/ApexResultDocumentCell.java

@@ -22,14 +22,15 @@ public class ApexResultDocumentCell extends RelativeLayout {
 
 
     private ImageView fileIconView;
-    private TextView fileNameTv, fileTypeTv, fileDescTv;
+    private TextView fileNameTv, fileTypeTv, filePoTv, fileBOLTv;
 
     private void init() {
 
         fileIconView = findViewById(R.id.apex_result_document_icon_view);
         fileNameTv = findViewById(R.id.apex_result_document_file_name_tv);
         fileTypeTv = findViewById(R.id.apex_result_document_file_type_tv);
-        fileDescTv = findViewById(R.id.apex_result_document_file_desc_tv);
+        filePoTv = findViewById(R.id.apex_result_document_file_po_tv);
+        fileBOLTv = findViewById(R.id.apex_result_document_file_bol_tv);
 
         prepareReuse();
     }
@@ -49,7 +50,8 @@ public class ApexResultDocumentCell extends RelativeLayout {
     public void prepareReuse() {
         fileNameTv.setText("");
         fileTypeTv.setText("");
-        fileDescTv.setText("");
+        filePoTv.setText("");
+        fileBOLTv.setText("");
     }
 
     public ApexResultDocumentCell setFileName(String name) {
@@ -62,8 +64,13 @@ public class ApexResultDocumentCell extends RelativeLayout {
         return this;
     }
 
-    public ApexResultDocumentCell setFileDescription(String description) {
-        fileDescTv.setText(description);
+    public ApexResultDocumentCell setPo(String po) {
+        filePoTv.setText(po);
+        return this;
+    }
+
+    public ApexResultDocumentCell setBOL(String bol) {
+        fileBOLTv.setText(bol);
         return this;
     }
 

+ 8 - 3
ApexDrivers/apexmobile/src/main/java/com/usai/apex/apexresult/model/ApexResultDocumentModel.java

@@ -7,7 +7,8 @@ public class ApexResultDocumentModel extends ApexResultBaseModel {
 
     public String fileName;
     public String fileType;
-    public String fileDesc;
+    public String po;
+    public String bol;
 
     public ApexResultDocumentModel() {
 
@@ -24,9 +25,13 @@ public class ApexResultDocumentModel extends ApexResultBaseModel {
             if (fileType != null) {
                 json.put("fileType", fileType);
             }
-            if (fileDesc != null) {
-                json.put("fileDesc", fileDesc);
+            if (po != null) {
+                json.put("po", po);
             }
+            if (bol != null) {
+                json.put("bol", bol);
+            }
+
         } catch (JSONException e) {
             e.printStackTrace();
         }

+ 23 - 10
ApexDrivers/apexmobile/src/main/res/layout/apex_result_document_cell.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.usai.apex.apexresult.cell.ApexResultDocumentCell xmlns:android="http://schemas.android.com/apk/res/android"
                                                       android:layout_width="match_parent"
-                                                      android:layout_height="90dp">
+                                                      android:layout_height="105dp">
 
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="75dp"
+        android:layout_height="90dp"
         android:layout_marginTop="15dp"
         android:layout_marginLeft="5dp"
         android:layout_marginRight="5dp"
@@ -27,10 +27,10 @@
             android:id="@+id/apex_result_document_file_type_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignTop="@id/apex_result_document_icon_view"
             android:layout_alignParentRight="true"
             android:layout_marginLeft="8dp"
             android:layout_marginRight="5dp"
+            android:layout_marginTop="10dp"
             android:textSize="17sp"
             android:textColor="#000000"
             android:text="HBL"
@@ -40,7 +40,7 @@
             android:id="@+id/apex_result_document_file_name_tv"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignTop="@id/apex_result_document_icon_view"
+            android:layout_alignTop="@id/apex_result_document_file_type_tv"
             android:layout_toRightOf="@id/apex_result_document_icon_view"
             android:layout_toLeftOf="@id/apex_result_document_file_type_tv"
             android:layout_marginLeft="5dp"
@@ -50,18 +50,31 @@
             />
 
         <TextView
-            android:id="@+id/apex_result_document_file_desc_tv"
+            android:id="@+id/apex_result_document_file_po_tv"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_toRightOf="@id/apex_result_document_icon_view"
             android:layout_below="@id/apex_result_document_file_name_tv"
+            android:layout_alignLeft="@id/apex_result_document_file_name_tv"
+            android:layout_alignRight="@id/apex_result_document_file_type_tv"
             android:layout_marginTop="5dp"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp"
-            android:layout_marginBottom="5dp"
             android:textSize="14sp"
             android:textColor="#aaaaaa"
-            android:text="A1811390637FR.pdf"
+            android:text="PO#:123456789"
+            />
+
+        <TextView
+            android:id="@+id/apex_result_document_file_bol_tv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@id/apex_result_document_icon_view"
+            android:layout_below="@id/apex_result_document_file_po_tv"
+            android:layout_alignLeft="@id/apex_result_document_file_po_tv"
+            android:layout_alignRight="@id/apex_result_document_file_po_tv"
+            android:layout_marginTop="5dp"
+            android:textSize="14sp"
+            android:textColor="#aaaaaa"
+            android:text="PO#:123456789"
             />
 
     </RelativeLayout>