1.修改Android Apex Mobile Result Container和BL Info增加Consignee。

2.修改Android Apex Mobile Result Cell重用后TextView布局没刷新。

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

@@ -135,7 +135,7 @@ public class ApexResultAdapter extends BaseAdapter {
                 ApexResultBLInfoModel shipModel = (ApexResultBLInfoModel)model;
                 ApexResultBLInfoCell cell = dequeueBLInfoCell(context, convertView);
                 cell.prepareReuse();
-                cell.setTitle(shipModel.title).setDetail(shipModel.detail).setIcon(shipModel.icon).setPort(shipModel.port).setTime(shipModel.date).setDescription(shipModel.desc);
+                cell.setTitle(shipModel.title).setDetail(shipModel.detail).setIcon(shipModel.icon).setPort(shipModel.port).setTime(shipModel.date).setDescription(shipModel.desc).setConsignee(shipModel.consignee);
                 cell.setTransportStage(shipModel.transport_stage);
 
                 ArrayList<ApexResultAddition> additions = shipModel.getAddition();
@@ -152,7 +152,7 @@ public class ApexResultAdapter extends BaseAdapter {
                 ApexResultContainerModel shipModel = (ApexResultContainerModel)model;
                 ApexResultContainerCell cell = dequeueContainerCell(context, convertView);
                 cell.prepareReuse();
-                cell.setTitle(shipModel.title).setDetail(shipModel.detail).setIcon(shipModel.icon).setPort(shipModel.port).setTime(shipModel.date).setDescription(shipModel.desc);
+                cell.setTitle(shipModel.title).setDetail(shipModel.detail).setIcon(shipModel.icon).setPort(shipModel.port).setTime(shipModel.date).setDescription(shipModel.desc).setConsignee(shipModel.consignee);
                 cell.setTransportStage(shipModel.transport_stage);
 
                 ArrayList<ApexResultAddition> additions = shipModel.getAddition();

ApexDrivers/apexmobile/src/main/java/com/usai/apex/apexresult/cell/ApexResultBLInfoCell.java

@@ -25,7 +25,7 @@ public class ApexResultBLInfoCell extends LinearLayout {
         return cell;
     }
 
-    private TextView titleTv, dateTv, descTv, detailTv, portTv;
+    private TextView titleTv, dateTv, descTv, detailTv, portTv, consigneeTv;
     private TrackingImageView statusIv;
     private View stageView;
     private LinearLayout additionLayout;
@@ -55,6 +55,7 @@ public class ApexResultBLInfoCell extends LinearLayout {
         statusIv = findViewById(R.id.iv_status);
         stageView = findViewById(R.id.v_transport_stage);
         additionLayout = findViewById(R.id.apex_result_ship_addition_view);
+        consigneeTv = findViewById(R.id.tv_consignee);
 
         prepareReuse();
     }
@@ -68,7 +69,9 @@ public class ApexResultBLInfoCell extends LinearLayout {
         portTv.setText("");
         statusIv.setImageDrawable(null);
         setTransportStage(0);
+        consigneeTv.setText("");
         clearAdditionView();
+        forceLayout();
     }
 
     public void setTransportStage(int stage) {
@@ -99,11 +102,13 @@ public class ApexResultBLInfoCell extends LinearLayout {
 
     public ApexResultBLInfoCell setTitle(String title) {
         titleTv.setText(title);
+        titleTv.forceLayout();
         return this;
     }
 
     public ApexResultBLInfoCell setDetail(String detail) {
         detailTv.setText(detail);
+        detailTv.forceLayout();
         return this;
     }
 
@@ -114,21 +119,31 @@ public class ApexResultBLInfoCell extends LinearLayout {
         } else {
             statusIv.setImageDrawable(null);
         }
+        statusIv.forceLayout();
         return this;
     }
 
     public ApexResultBLInfoCell setPort(String port) {
         portTv.setText(port);
+        portTv.forceLayout();
         return this;
     }
 
     public ApexResultBLInfoCell setTime(String time) {
         dateTv.setText(time);
+        dateTv.forceLayout();
         return this;
     }
 
     public ApexResultBLInfoCell setDescription(String description) {
         descTv.setText(description);
+        descTv.forceLayout();
+        return this;
+    }
+
+    public ApexResultBLInfoCell setConsignee(String consignee) {
+        consigneeTv.setText(consignee);
+        consigneeTv.forceLayout();
         return this;
     }
 
@@ -159,6 +174,7 @@ public class ApexResultBLInfoCell extends LinearLayout {
     private void clearAdditionView() {
         additionLayout.removeAllViews();
         additionCount = 0;
+        additionLayout.forceLayout();
     }
 
     // endregion

ApexDrivers/apexmobile/src/main/java/com/usai/apex/apexresult/cell/ApexResultBookingCell.java

@@ -66,6 +66,7 @@ public class ApexResultBookingCell extends LinearLayout {
         statusIv.setImageDrawable(null);
         consigneeTv.setText("");
         clearAdditionView();
+        forceLayout();
     }
 
 
@@ -75,11 +76,13 @@ public class ApexResultBookingCell extends LinearLayout {
 
     public ApexResultBookingCell setTitle(String title) {
         titleTv.setText(title);
+        titleTv.forceLayout();
         return this;
     }
 
     public ApexResultBookingCell setDetail(String detail) {
         detailTv.setText(detail);
+        detailTv.forceLayout();
         return this;
     }
 
@@ -90,26 +93,31 @@ public class ApexResultBookingCell extends LinearLayout {
         } else {
             statusIv.setImageDrawable(null);
         }
+        statusIv.forceLayout();
         return this;
     }
 
     public ApexResultBookingCell setPort(String port) {
         portTv.setText(port);
+        portTv.forceLayout();
         return this;
     }
 
     public ApexResultBookingCell setTime(String time) {
         dateTv.setText(time);
+        dateTv.forceLayout();
         return this;
     }
 
     public ApexResultBookingCell setDescription(String description) {
         descTv.setText(description);
+        descTv.forceLayout();
         return this;
     }
 
     public ApexResultBookingCell setConsignee(String consignee) {
         consigneeTv.setText(consignee);
+        consigneeTv.forceLayout();
         return this;
     }
 
@@ -140,6 +148,7 @@ public class ApexResultBookingCell extends LinearLayout {
     private void clearAdditionView() {
         additionLayout.removeAllViews();
         additionCount = 0;
+        additionLayout.forceLayout();
     }
 
     // endregion

ApexDrivers/apexmobile/src/main/java/com/usai/apex/apexresult/cell/ApexResultContainerCell.java

@@ -25,7 +25,7 @@ public class ApexResultContainerCell extends LinearLayout {
         return cell;
     }
 
-    private TextView titleTv, dateTv, descTv, detailTv, portTv;
+    private TextView titleTv, dateTv, descTv, detailTv, portTv, consigneeTv;
     private TrackingImageView statusIv;
     private View stageView;
     private LinearLayout additionLayout;
@@ -55,6 +55,7 @@ public class ApexResultContainerCell extends LinearLayout {
         statusIv = findViewById(R.id.iv_status);
         stageView = findViewById(R.id.v_transport_stage);
         additionLayout = findViewById(R.id.apex_result_ship_addition_view);
+        consigneeTv = findViewById(R.id.tv_consignee);
 
         prepareReuse();
     }
@@ -68,7 +69,9 @@ public class ApexResultContainerCell extends LinearLayout {
         portTv.setText("");
         statusIv.setImageDrawable(null);
         setTransportStage(0);
+        consigneeTv.setText("");
         clearAdditionView();
+        forceLayout();
     }
 
     public void setTransportStage(int stage) {
@@ -99,11 +102,13 @@ public class ApexResultContainerCell extends LinearLayout {
 
     public ApexResultContainerCell setTitle(String title) {
         titleTv.setText(title);
+        titleTv.forceLayout();
         return this;
     }
 
     public ApexResultContainerCell setDetail(String detail) {
         detailTv.setText(detail);
+        detailTv.forceLayout();
         return this;
     }
 
@@ -114,21 +119,31 @@ public class ApexResultContainerCell extends LinearLayout {
         } else {
             statusIv.setImageDrawable(null);
         }
+        statusIv.forceLayout();
         return this;
     }
 
     public ApexResultContainerCell setPort(String port) {
         portTv.setText(port);
+        portTv.forceLayout();
         return this;
     }
 
     public ApexResultContainerCell setTime(String time) {
         dateTv.setText(time);
+        dateTv.forceLayout();
         return this;
     }
 
     public ApexResultContainerCell setDescription(String description) {
         descTv.setText(description);
+        descTv.forceLayout();
+        return this;
+    }
+
+    public ApexResultContainerCell setConsignee(String consignee) {
+        consigneeTv.setText(consignee);
+        consigneeTv.forceLayout();
         return this;
     }
 
@@ -159,6 +174,7 @@ public class ApexResultContainerCell extends LinearLayout {
     private void clearAdditionView() {
         additionLayout.removeAllViews();
         additionCount = 0;
+        additionLayout.forceLayout();
     }
 
     // endregion

ApexDrivers/apexmobile/src/main/java/com/usai/apex/apexresult/cell/ApexResultDocumentCell.java

@@ -52,25 +52,30 @@ public class ApexResultDocumentCell extends RelativeLayout {
         fileTypeTv.setText("");
         filePoTv.setText("");
         fileBOLTv.setText("");
+        forceLayout();
     }
 
     public ApexResultDocumentCell setFileName(String name) {
         fileNameTv.setText(name);
+        fileNameTv.forceLayout();
         return this;
     }
 
     public ApexResultDocumentCell setFileType(String type) {
         fileTypeTv.setText(type);
+        fileTypeTv.forceLayout();
         return this;
     }
 
     public ApexResultDocumentCell setPo(String po) {
         filePoTv.setText(po);
+        filePoTv.forceLayout();
         return this;
     }
 
     public ApexResultDocumentCell setBOL(String bol) {
         fileBOLTv.setText(bol);
+        fileBOLTv.forceLayout();
         return this;
     }
 

ApexDrivers/apexmobile/src/main/java/com/usai/apex/apexresult/model/ApexResultBLInfoModel.java

@@ -15,7 +15,7 @@ public class ApexResultBLInfoModel extends ApexResultBaseModel {
     public String date;
     public String port;
     public int transport_stage;
-
+    public String consignee;
 
 
     public ApexResultBLInfoModel() {
@@ -50,6 +50,9 @@ public class ApexResultBLInfoModel extends ApexResultBaseModel {
             if (port != null) {
                 json.put("port", port);
             }
+            if (consignee != null) {
+                json.put("consignee", consignee);
+            }
 
             json.put("transport_stage", transport_stage);
 

ApexDrivers/apexmobile/src/main/java/com/usai/apex/apexresult/model/ApexResultContainerModel.java

@@ -15,7 +15,7 @@ public class ApexResultContainerModel extends ApexResultBaseModel {
     public String date;
     public String port;
     public int transport_stage;
-
+    public String consignee;
 
 
     public ApexResultContainerModel() {
@@ -50,6 +50,9 @@ public class ApexResultContainerModel extends ApexResultBaseModel {
             if (port != null) {
                 json.put("port", port);
             }
+            if (consignee != null) {
+                json.put("consignee", consignee);
+            }
 
             json.put("transport_stage", transport_stage);
 

ApexDrivers/apexmobile/src/main/java/com/usai/util/Network.java

@@ -90,46 +90,49 @@ public class Network
 
 
 	//release
-	public static String		URL_HOME						= "https://ra.apexshipping.com/main_new.php";
-	public static String		URL_HISTORY						= "https://ra.apexshipping.com/main_new.php";
-	public static String		URL_KPI							= "https://ra.apexshipping.com/main_new.php";
-	public static String		URL_UPDATE_AUTH					= "https://ra.apexshipping.com/main_new.php";
-	public static String		URL_REQUEST_COUNT				= "https://ra.apexshipping.com/main_new.php";
-	public static String		URL_REQUEST_RECORDS				= "https://ra.apexshipping.com/main_new.php";
-	public static String		URL_RETRIEVE_PASS				= "https://ra.apexshipping.com/main_new.php";
-	public static String		URL_ANNOUNCEMENTS				= "https://ra.apexshipping.com/mobile_news.php";
-	public static String		URL_NEWS						= "https://ra.apexshipping.com/mobile_news.php";
-	public static String		URL_LOCATIONS					= "https://ra.apexshipping.com/mobile_news.php";
-	public static String		URL_PUSH						= "https://ra.apexshipping.com/main_new.php";
-	public static String		URL_LOG							= "https://ra.apexshipping.com/mobile_news.php";
-	public static String		URL_SEND_COMM_EMAIL				= "https://ra.apexshipping.com/main_new.php";
-	public static String		URL_CHECK_UPDATE				= "https://ra.apexshipping.com/main_new.php";
+//	public static String		URL_HOME						= "https://ra.apexshipping.com/main_new.php";
+//	public static String		URL_HISTORY						= "https://ra.apexshipping.com/main_new.php";
+//	public static String		URL_KPI							= "https://ra.apexshipping.com/main_new.php";
+//	public static String		URL_UPDATE_AUTH					= "https://ra.apexshipping.com/main_new.php";
+//	public static String		URL_REQUEST_COUNT				= "https://ra.apexshipping.com/main_new.php";
+//	public static String		URL_REQUEST_RECORDS				= "https://ra.apexshipping.com/main_new.php";
+//	public static String		URL_RETRIEVE_PASS				= "https://ra.apexshipping.com/main_new.php";
+//	public static String		URL_ANNOUNCEMENTS				= "https://ra.apexshipping.com/mobile_news.php";
+//	public static String		URL_NEWS						= "https://ra.apexshipping.com/mobile_news.php";
+//	public static String		URL_LOCATIONS					= "https://ra.apexshipping.com/mobile_news.php";
+//	public static String		URL_PUSH						= "https://ra.apexshipping.com/main_new.php";
+//	public static String		URL_LOG							= "https://ra.apexshipping.com/mobile_news.php";
+//	public static String		URL_SEND_COMM_EMAIL				= "https://ra.apexshipping.com/main_new.php";
+//	public static String		URL_CHECK_UPDATE				= "https://ra.apexshipping.com/main_new.php";
 
 	// 2019.1.5
-	public static String		URL_UPLOAD_SQL					= "https://ra.apexshipping.com/main_new.php";
-	public static String		URL_FETCH_RESULT				= "https://ra.apexshipping.com/main_new.php";
-	public static String		URL_SAVE_RESULT					= "https://ra.apexshipping.com/main_new.php";
+//	public static String		URL_UPLOAD_SQL					= "https://ra.apexshipping.com/main_new.php";
+//	public static String		URL_FETCH_RESULT				= "https://ra.apexshipping.com/main_new.php";
+//	public static String		URL_SAVE_RESULT					= "https://ra.apexshipping.com/main_new.php";
 
 
 
 //
 ////debug
-//	public static String		URL_HOME				= "http://192.168.0.155/Online/Online/main_new.php";
-//	public static String		URL_HISTORY				= "http://192.168.0.155/Online/Online/main_new.php";
-//
-//	public static String		URL_UPDATE_AUTH					= "http://192.168.0.155/Online/Online/login.php";
-//	public static String		URL_REQUEST_COUNT				= "http://192.168.0.155/Online/Online/main_new.php";
-//	public static String		URL_REQUEST_RECORDS				= "http://192.168.0.155/Online/Online/main_new.php";
-//	public static String		URL_RETRIEVE_PASS				= "http://192.168.0.155/Online/Online/main_new.php";
-//	public static String		URL_ANNOUNCEMENTS				= "http://192.168.0.155/Online/Online/mobile_news.php";
-//	public static String		URL_NEWS						= "http://192.168.0.155/Online/Online/mobile_news.php";
-//	public static String		URL_LOCATIONS					= "http://192.168.0.155/Online/Online/mobile_news.php";
-//	public static String		URL_PUSH						= "http://192.168.0.155/Online/Online/main_new.php";
-//	public static String		URL_LOG						= "http://192.168.0.155/Online/Online/mobile_news.php";
-//
+	public static String		URL_HOME						= "http://192.168.0.138:8899/main_new_26.php";
+	public static String		URL_HISTORY						= "http://192.168.0.138:8899/main_new_26.php";
+	public static String		URL_KPI							= "http://192.168.0.138:8899/main_new_26.php";
+	public static String		URL_UPDATE_AUTH					= "http://192.168.0.138:8899/main_new_26.php";
+	public static String		URL_REQUEST_COUNT				= "http://192.168.0.138:8899/main_new_26.php";
+	public static String		URL_REQUEST_RECORDS				= "http://192.168.0.138:8899/main_new_26.php";
+	public static String		URL_RETRIEVE_PASS				= "http://192.168.0.138:8899/main_new_26.php";
+	public static String		URL_ANNOUNCEMENTS				= "https://ra.apexshipping.com/mobile_news.php";
+	public static String		URL_NEWS						= "https://ra.apexshipping.com/mobile_news.php";
+	public static String		URL_LOCATIONS					= "https://ra.apexshipping.com/mobile_news.php";
+	public static String		URL_PUSH						= "http://192.168.0.138:8899/main_new_26.php";
+	public static String		URL_LOG							= "https://ra.apexshipping.com/mobile_news.php";
+	public static String		URL_SEND_COMM_EMAIL				= "http://192.168.0.138:8899/main_new_26.php";
+	public static String		URL_CHECK_UPDATE				= "http://192.168.0.138:8899/main_new_26.php";
 
 
-	
+	public static String		URL_UPLOAD_SQL					= "http://192.168.0.138:8899/main_new_26.php";
+	public static String		URL_FETCH_RESULT				= "http://192.168.0.138:8899/main_new_26.php";
+	public static String		URL_SAVE_RESULT					= "http://192.168.0.138:8899/main_new_26.php";
 
 
 
@@ -1543,28 +1546,31 @@ public class Network
 
 		params.putString("action","handset_search");
 
-		String url = "http://192.168.1.151:8080/MyWeb/SearchBooking";
-
 		String module_name = params.getString("module_name");
-		if (module_name.equals("Ocean Booking")) {
-
-		} else if (module_name.equals("Ocean B/L info.")) {
-
-			url = "http://192.168.1.151:8080/MyWeb/SearchBL";
-		} else if (module_name.equals("Container detail")) {
 
-			url = "http://192.168.1.151:8080/MyWeb/SearchContainer";
-		} else if (module_name.equals("Download Document")) {
 
-			url = "http://192.168.1.151:8080/MyWeb/SearchDoc";
-		}
-
-		try {
-			Thread.sleep(2000);
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
+//		String url = "http://192.168.1.151:8080/MyWeb/SearchBooking";
+//
+//		if (module_name.equals("Ocean Booking")) {
+//
+//		} else if (module_name.equals("Ocean B/L info.")) {
+//
+//			url = "http://192.168.1.151:8080/MyWeb/SearchBL";
+//		} else if (module_name.equals("Container detail")) {
+//
+//			url = "http://192.168.1.151:8080/MyWeb/SearchContainer";
+//		} else if (module_name.equals("Download Document")) {
+//
+//			url = "http://192.168.1.151:8080/MyWeb/SearchDoc";
+//		}
+//
+//		try {
+//			Thread.sleep(2000);
+//		} catch (InterruptedException e) {
+//			e.printStackTrace();
+//		}
 
+		String url = URL_FETCH_RESULT;
 		// URL_FETCH_RESULT
 		String jstr = getJson(url, params);
 

ApexDrivers/apexmobile/src/main/res/layout/apex_result_blinfo_cell.xml

@@ -50,6 +50,20 @@
                     app:layout_constraintTop_toBottomOf="@+id/tv_time"
                     app:srcCompat="@drawable/ic_launcher" />
 
+                <TextView
+                    android:id="@+id/tv_consignee"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:ellipsize="end"
+                    android:singleLine="true"
+                    android:text="Consignee"
+                    android:textColor="@color/icon_gray"
+                    android:textSize="12.7sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    />
+
                 <TextView
                     android:id="@+id/tv_title"
                     android:layout_width="0dp"
@@ -64,7 +78,7 @@
                     android:text="TextView"
                     android:textColor="@color/icon_gray"
                     android:textSize="12.7sp"
-                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintEnd_toStartOf="@id/tv_consignee"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
@@ -91,7 +105,7 @@
                     android:text="CNTAO - USLAX"
                     android:textColor="@color/icon_red"
                     android:textSize="9.7sp"
-                    app:layout_constraintEnd_toEndOf="@+id/tv_title"
+                    app:layout_constraintEnd_toEndOf="@+id/tv_consignee"
                     app:layout_constraintTop_toBottomOf="@+id/tv_title" />
 
                 <TextView
@@ -105,7 +119,7 @@
                     android:text="TextView"
                     android:textColor="@color/icon_gray"
                     android:textSize="12.7sp"
-                    app:layout_constraintEnd_toEndOf="@+id/tv_title"
+                    app:layout_constraintEnd_toEndOf="@+id/tv_consignee"
                     app:layout_constraintStart_toEndOf="@+id/iv_status"
                     app:layout_constraintTop_toTopOf="@+id/iv_status" />
 
@@ -123,7 +137,7 @@
                     android:textColor="@android:color/darker_gray"
                     android:textSize="9.7sp"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="@+id/tv_title"
+                    app:layout_constraintEnd_toEndOf="@+id/tv_consignee"
                     app:layout_constraintStart_toEndOf="@+id/iv_status"
                     app:layout_constraintTop_toBottomOf="@+id/tv_description" />
 

ApexDrivers/apexmobile/src/main/res/layout/apex_result_container_cell.xml

@@ -50,6 +50,20 @@
                     app:layout_constraintTop_toBottomOf="@+id/tv_time"
                     app:srcCompat="@drawable/ic_launcher" />
 
+                <TextView
+                    android:id="@+id/tv_consignee"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:ellipsize="end"
+                    android:singleLine="true"
+                    android:text="Consignee"
+                    android:textColor="@color/icon_gray"
+                    android:textSize="12.7sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    />
+
                 <TextView
                     android:id="@+id/tv_title"
                     android:layout_width="0dp"
@@ -64,7 +78,7 @@
                     android:text="TextView"
                     android:textColor="@color/icon_gray"
                     android:textSize="12.7sp"
-                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintEnd_toStartOf="@id/tv_consignee"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
@@ -91,7 +105,7 @@
                     android:text="CNTAO - USLAX"
                     android:textColor="@color/icon_red"
                     android:textSize="9.7sp"
-                    app:layout_constraintEnd_toEndOf="@+id/tv_title"
+                    app:layout_constraintEnd_toEndOf="@+id/tv_consignee"
                     app:layout_constraintTop_toBottomOf="@+id/tv_title" />
 
                 <TextView
@@ -105,7 +119,7 @@
                     android:text="TextView"
                     android:textColor="@color/icon_gray"
                     android:textSize="12.7sp"
-                    app:layout_constraintEnd_toEndOf="@+id/tv_title"
+                    app:layout_constraintEnd_toEndOf="@+id/tv_consignee"
                     app:layout_constraintStart_toEndOf="@+id/iv_status"
                     app:layout_constraintTop_toTopOf="@+id/iv_status" />
 
@@ -123,7 +137,7 @@
                     android:textColor="@android:color/darker_gray"
                     android:textSize="9.7sp"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="@+id/tv_title"
+                    app:layout_constraintEnd_toEndOf="@+id/tv_consignee"
                     app:layout_constraintStart_toEndOf="@+id/iv_status"
                     app:layout_constraintTop_toBottomOf="@+id/tv_description" />