1.完成Android Apex Drivers Order列表显示，增加Order Type。

ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/Home/HomeCellLayout.java

@@ -14,7 +14,7 @@ import java.lang.ref.WeakReference;
 
 public class HomeCellLayout extends RelativeLayout implements HomeOrderModel.OrderModelDelegate {
 
-    TextView titleTv, orderNoTv, containerNoTv, dateTv;
+    TextView titleTv, orderNoTv, containerNoTv, dateTv,orderType2Tv;
     ImageView statusView, markView;
     RelativeLayout contentContainer;
 
@@ -50,6 +50,7 @@ public class HomeCellLayout extends RelativeLayout implements HomeOrderModel.Ord
         dateTv = findViewById(R.id.date_tv);
         statusView = findViewById(R.id.status_view);
         markView = findViewById(R.id.order_mark_view);
+        orderType2Tv = findViewById(R.id.type2_tv);
 
         initialed = true;
     }
@@ -91,6 +92,8 @@ public class HomeCellLayout extends RelativeLayout implements HomeOrderModel.Ord
         orderNoTv.setText(model.orderNo);
         containerNoTv.setText(model.containerNo);
         dateTv.setText(model.date);
+        orderType2Tv.setText(model.order_type2);
+        statusView.setImageBitmap(model.getIcon());
 
         if (model.status == HomeOrderModel.OrderStatusNew) {
             markView.setVisibility(View.VISIBLE);

ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/Home/HomeFragment.java

@@ -551,7 +551,7 @@ public class HomeFragment extends Fragment {
             for (int i = 0; i < orders.length(); i++) {
                 JSONObject order = orders.optJSONObject(i);
                 if (order != null) {
-                    HomeOrderModel model = new HomeOrderModel();
+                    HomeOrderModel model = new HomeOrderModel(mCtx);
                     model.status = order.optInt("status",0);
                     model.title = order.optString("title");
                     model.orderNo = order.optString("orderNo");
@@ -559,6 +559,7 @@ public class HomeFragment extends Fragment {
                     model.date = order.optString("date");
                     model.orderID = order.optString("orderID");
                     model.order_type2 = order.optString("order_type2");
+                    model.iconURL = order.optString("iconURL");
 
                     orderArr.add(model);
                 }

ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/Home/HomeMoreActivity.java

@@ -191,7 +191,7 @@ public class HomeMoreActivity extends AppCompatActivity implements AbsListView.O
 
     private void showFilter() {
 
-        mFilter = com.usai.redant.apexdrivers.Network.Network.loadFakeData(this,R.raw.fake_order_filter);
+//        mFilter = com.usai.redant.apexdrivers.Network.Network.loadFakeData(this,R.raw.fake_order_filter);
         Intent intent = OrderFilterActivity.filterActivityIntent(mContext,mFilter);
 
         startActivityForResult(intent,REQUEST_ORDER_FILTER_CODE);
@@ -224,6 +224,9 @@ public class HomeMoreActivity extends AppCompatActivity implements AbsListView.O
                 if (model.order_type2 != null) {
                     json.put("order_type2",model.order_type2);
                 }
+                if (model.iconURL != null) {
+                    json.put("iconURL",model.iconURL);
+                }
                 orders.put(json);
             }
 
@@ -411,7 +414,7 @@ public class HomeMoreActivity extends AppCompatActivity implements AbsListView.O
                 for (int i = 0; i < orders.length(); i++) {
                     JSONObject order = orders.optJSONObject(i);
                     if (order != null) {
-                        HomeOrderModel model = new HomeOrderModel();
+                        HomeOrderModel model = new HomeOrderModel(mContext);
                         model.status = order.optInt("status", 0);
                         model.title = order.optString("title");
                         model.orderNo = order.optString("orderNo");
@@ -419,6 +422,7 @@ public class HomeMoreActivity extends AppCompatActivity implements AbsListView.O
                         model.date = order.optString("date");
                         model.orderID = order.optString("orderID");
                         model.order_type2 = order.optString("order_type2");
+                        model.iconURL = order.optString("iconURL");
 
                         mOrders.add(model);
                     }

ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/Home/HomeOrderModel.java

@@ -1,4 +1,9 @@
 package com.usai.redant.apexdrivers.Home;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+
+import com.usai.redant.apexdrivers.R;
 
 public class HomeOrderModel {
 
@@ -14,9 +19,16 @@ public class HomeOrderModel {
     String orderID;
     boolean selected;
     String order_type2;
+    String iconURL;
 
     OrderModelDelegate delegate;
 
+
+    private Context mCtx;
+    HomeOrderModel(Context context) {
+        mCtx = context;
+    }
+
     public void setSelection(boolean selection) {
         selected = selection;
 
@@ -25,6 +37,21 @@ public class HomeOrderModel {
         }
     }
 
+    public void setIconURL(String url) {
+        iconURL = url;
+    }
+
+    public Bitmap getIcon() {
+
+        if (mCtx == null) {
+            return null;
+        }
+
+        Bitmap bitmap = BitmapFactory.decodeResource(mCtx.getResources(), R.drawable.status_delivered);
+
+        return bitmap;
+    }
+
     public interface OrderModelDelegate {
         void refresh();
     }

ApexDrivers/app/src/main/res/layout/home_order_cell.xml

@@ -31,94 +31,131 @@
             android:text="Pickup Order New"
             />
 
-        <ImageView
-            android:id="@+id/status_view"
-            android:layout_width="70dp"
-            android:layout_height="70dp"
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:layout_below="@id/title_tv"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp"
-            />
+            >
 
-        <TextView
-            android:id="@+id/order_no_key_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="20dp"
-            android:layout_alignTop="@id/status_view"
-            android:layout_toRightOf="@id/status_view"
-            android:layout_marginRight="2dp"
-            android:textSize="17sp"
-            android:textColor="#000000"
-            android:text="Order No.:"
-            />
+            <ImageView
+                android:id="@+id/status_view"
+                android:layout_width="70dp"
+                android:layout_height="70dp"
+                android:layout_marginLeft="5dp"
+                android:layout_marginRight="5dp"
+                android:layout_centerVertical="true"
+                android:scaleType="centerInside"
+                />
 
-        <TextView
-            android:id="@+id/order_no_tv"
-            android:layout_width="match_parent"
-            android:layout_height="20dp"
-            android:layout_alignTop="@id/status_view"
-            android:layout_toRightOf="@id/order_no_key_tv"
-            android:layout_alignParentRight="true"
-            android:layout_marginRight="5dp"
-            android:textSize="17sp"
-            android:textColor="#000000"
-            android:text="AFS180530001200"
-            />
+            <TextView
+                android:id="@+id/order_no_key_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="20dp"
+                android:layout_alignTop="@id/status_view"
+                android:layout_toRightOf="@id/status_view"
+                android:layout_marginRight="2dp"
+                android:textSize="17sp"
+                android:textColor="#000000"
+                android:text="Order No.:"
+                />
 
-        <TextView
-            android:id="@+id/container_no_key_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="20dp"
-            android:layout_below="@id/order_no_tv"
-            android:layout_toRightOf="@id/status_view"
-            android:layout_marginRight="2dp"
-            android:layout_marginTop="5dp"
-            android:textSize="17sp"
-            android:textColor="#000000"
-            android:text="Container No.:"
-            />
+            <TextView
+                android:id="@+id/order_no_tv"
+                android:layout_width="match_parent"
+                android:layout_height="20dp"
+                android:layout_alignTop="@id/status_view"
+                android:layout_toRightOf="@id/order_no_key_tv"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="5dp"
+                android:textSize="17sp"
+                android:textColor="#000000"
+                android:text="AFS180530001200"
+                />
 
-        <TextView
-            android:id="@+id/container_no_tv"
-            android:layout_width="match_parent"
-            android:layout_height="20dp"
-            android:layout_below="@id/order_no_tv"
-            android:layout_toRightOf="@id/container_no_key_tv"
-            android:layout_alignParentRight="true"
-            android:layout_marginRight="5dp"
-            android:layout_marginTop="5dp"
-            android:textSize="17sp"
-            android:textColor="#000000"
-            android:text="TCNU6432476"
-            />
+            <TextView
+                android:id="@+id/container_no_key_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="20dp"
+                android:layout_below="@id/order_no_tv"
+                android:layout_toRightOf="@id/status_view"
+                android:layout_marginRight="2dp"
+                android:layout_marginTop="5dp"
+                android:textSize="17sp"
+                android:textColor="#000000"
+                android:text="Container No.:"
+                />
 
-        <TextView
-            android:id="@+id/date_key_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="20dp"
-            android:layout_below="@id/container_no_tv"
-            android:layout_toRightOf="@id/status_view"
-            android:layout_marginRight="2dp"
-            android:layout_marginTop="5dp"
-            android:textSize="17sp"
-            android:textColor="#000000"
-            android:text="Date:"
-            />
+            <TextView
+                android:id="@+id/container_no_tv"
+                android:layout_width="match_parent"
+                android:layout_height="20dp"
+                android:layout_below="@id/order_no_tv"
+                android:layout_toRightOf="@id/container_no_key_tv"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="5dp"
+                android:layout_marginTop="5dp"
+                android:textSize="17sp"
+                android:textColor="#000000"
+                android:text="TCNU6432476"
+                />
 
-        <TextView
-            android:id="@+id/date_tv"
-            android:layout_width="match_parent"
-            android:layout_height="20dp"
-            android:layout_below="@id/container_no_tv"
-            android:layout_toRightOf="@id/date_key_tv"
-            android:layout_alignParentRight="true"
-            android:layout_marginRight="5dp"
-            android:layout_marginTop="5dp"
-            android:layout_marginBottom="5dp"
-            android:textSize="17sp"
-            android:textColor="#000000"
-            android:text="5/30/2018"
-            />
+            <TextView
+                android:id="@+id/type2_key_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="20dp"
+                android:layout_below="@id/container_no_tv"
+                android:layout_toRightOf="@id/status_view"
+                android:layout_marginRight="2dp"
+                android:layout_marginTop="5dp"
+                android:textSize="17sp"
+                android:textColor="#000000"
+                android:text="Order Type:"
+                />
+
+            <TextView
+                android:id="@+id/type2_tv"
+                android:layout_width="match_parent"
+                android:layout_height="20dp"
+                android:layout_below="@id/container_no_tv"
+                android:layout_toRightOf="@id/type2_key_tv"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="5dp"
+                android:layout_marginTop="5dp"
+                android:textSize="17sp"
+                android:textColor="#000000"
+                android:text="Pick Up"
+                />
+
+            <TextView
+                android:id="@+id/date_key_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="20dp"
+                android:layout_below="@id/type2_key_tv"
+                android:layout_toRightOf="@id/status_view"
+                android:layout_marginRight="2dp"
+                android:layout_marginTop="5dp"
+                android:textSize="17sp"
+                android:textColor="#000000"
+                android:text="Date:"
+                />
+
+            <TextView
+                android:id="@+id/date_tv"
+                android:layout_width="match_parent"
+                android:layout_height="20dp"
+                android:layout_below="@id/type2_tv"
+                android:layout_toRightOf="@id/date_key_tv"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="5dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginBottom="5dp"
+                android:textSize="17sp"
+                android:textColor="#000000"
+                android:text="5/30/2018"
+                />
+
+        </RelativeLayout>
 
     </RelativeLayout>