1.修改Android Apex Drivers 导入图标。

2.修改Android Apex Drivers Detail地图。

ApexDrivers/app/src/main/AndroidManifest.xml

@@ -32,12 +32,12 @@
     <application
         android:name=".ApexDriverApplication"
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/launch_icon"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/ApexDriverTheme"
-        tools:replace="android:theme"
+        tools:replace="android:theme,android:icon"
         >
         <provider
             android:name="android.support.v4.content.FileProvider"

ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/detail/DetailActivity.java

@@ -16,6 +16,7 @@ import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -241,10 +242,10 @@ public class DetailActivity extends AppCompatActivity implements DetailAdapter.D
 
     private void sendLifeCircleBroadCast(int life) {
 
-        Intent intent = new Intent(MapLifCircleAction);
-        intent.putExtra("Life",life);
-
-        LocalBroadcastManager.getInstance(mCtx).sendBroadcast(intent);
+//        Intent intent = new Intent(MapLifCircleAction);
+//        intent.putExtra("Life",life);
+//
+//        LocalBroadcastManager.getInstance(mCtx).sendBroadcast(intent);
     }
 
     private void goHome() {
@@ -414,13 +415,16 @@ public class DetailActivity extends AppCompatActivity implements DetailAdapter.D
     @Override
     public void navigationTo(DetailLocationModel locationModel) {
 
-        Uri gmmIntentUri = Uri.parse("google.navigation:q=" + locationModel.location + "&mode=d");
-        Intent mapIntent = new Intent(Intent.ACTION_VIEW, gmmIntentUri);
-        mapIntent.setPackage("com.google.android.apps.maps");
-        if (mapIntent.resolveActivity(getPackageManager()) != null) {
-            startActivity(mapIntent);
-        } else {
-            Toast.makeText(mCtx,"There is no google map",Toast.LENGTH_LONG).show();
+        if (locationModel != null && TextUtils.isEmpty(locationModel.street)) {
+
+            Uri gmmIntentUri = Uri.parse("google.navigation:q=" + locationModel.street + "&mode=d");
+            Intent mapIntent = new Intent(Intent.ACTION_VIEW, gmmIntentUri);
+            mapIntent.setPackage("com.google.android.apps.maps");
+            if (mapIntent.resolveActivity(getPackageManager()) != null) {
+                startActivity(mapIntent);
+            } else {
+                Toast.makeText(mCtx,"There is no google map",Toast.LENGTH_LONG).show();
+            }
         }
 
     }

ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/detail/DetailAdapter.java

@@ -438,103 +438,114 @@ public class DetailAdapter extends BaseExpandableListAdapter {
 
     public final static String MapLifCircleAction = "com.apex.driver.map_life_circle.action";
 
-    private class MapHolder implements OnMapReadyCallback,DetailBaseModel.OrderDetailModelDelegate {
+    private class MapHolder implements DetailBaseModel.OrderDetailModelDelegate {
         TextView titleTv;
         TextView valueTv;
-        com.google.android.gms.maps.MapView mapView;
-        GoogleMap googleMap;
+//        com.google.android.gms.maps.MapView mapView;
+//        GoogleMap googleMap;
+//        MapBroadcastReceiver receiver;
+        ImageButton mapBtn;
+
         WeakReference<DetailMapModel> weakMap;
-        MapBroadcastReceiver receiver;
 
-        private class MapBroadcastReceiver extends BroadcastReceiver {
 
-            @Override
-            public void onReceive(Context context, Intent intent) {
-
-                int life = intent.getIntExtra("life",0);
-                switch (life) {
-                    case 0:{
-                        onActivitySaveInstanceState();
-                    }
-                    break;
-                    case 1:{
-                        onActivityResume();
-                    }
-                    break;
-                    case 2:{
-                        onActivityStart();
-                    }
-                    break;
-                    case 3:{
-                        onActivityStop();
-                    }
-                    break;
-                    case 4:{
-                        onActivityPause();
-                    }
-                    break;
-                    case 5:{
-                        onActivityLowMemory();
-                    }
-                    break;
-                    case 6:{
-                        onActivityDestroy();
-                    }
-                    break;
-                }
-            }
-        }
+//        private class MapBroadcastReceiver extends BroadcastReceiver {
+//
+//            @Override
+//            public void onReceive(Context context, Intent intent) {
+//
+//                int life = intent.getIntExtra("life",0);
+//                switch (life) {
+//                    case 0:{
+//                        onActivitySaveInstanceState();
+//                    }
+//                    break;
+//                    case 1:{
+//                        onActivityResume();
+//                    }
+//                    break;
+//                    case 2:{
+//                        onActivityStart();
+//                    }
+//                    break;
+//                    case 3:{
+//                        onActivityStop();
+//                    }
+//                    break;
+//                    case 4:{
+//                        onActivityPause();
+//                    }
+//                    break;
+//                    case 5:{
+//                        onActivityLowMemory();
+//                    }
+//                    break;
+//                    case 6:{
+//                        onActivityDestroy();
+//                    }
+//                    break;
+//                }
+//            }
+//        }
 
         MapHolder(View view) {
 
             titleTv = view.findViewById(R.id.detail_map_title_tv);
             valueTv = view.findViewById(R.id.detail_map_value_tv);
-            mapView = view.findViewById(R.id.detail_map_view);
-            mapView.getMapAsync(this);
-
-            view.setTag(this);
-
-            receiver = new MapBroadcastReceiver();
-
-            IntentFilter  intentFilter = new IntentFilter();
-            intentFilter.addAction(MapLifCircleAction);
-
-            LocalBroadcastManager.getInstance(mCtx).registerReceiver(receiver,intentFilter);
-        }
-
-        private void onActivitySaveInstanceState() {
-
-            onActivityDestroy();
-        }
-
-
-        private void onActivityResume() {
-            mapView.onResume();
-        }
-
+//            mapView = view.findViewById(R.id.detail_map_view);
+//            mapView.getMapAsync(this);
 
-        private void onActivityStart() {
-            mapView.onStart();
-        }
-
-
-        private void onActivityStop() {
-            mapView.onStop();
-        }
-
-        private void onActivityPause() {
-            mapView.onPause();
-        }
+            mapBtn = view.findViewById(R.id.detail_map_view);
+            mapBtn.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
 
-        private void onActivityDestroy() {
+                }
+            });
 
-            mapView.onDestroy();
-            LocalBroadcastManager.getInstance(mCtx).unregisterReceiver(receiver);
-        }
+            view.setTag(this);
 
-        private void onActivityLowMemory() {
-            mapView.onLowMemory();
-        }
+//            receiver = new MapBroadcastReceiver();
+//
+//            IntentFilter  intentFilter = new IntentFilter();
+//            intentFilter.addAction(MapLifCircleAction);
+//
+//            LocalBroadcastManager.getInstance(mCtx).registerReceiver(receiver,intentFilter);
+        }
+
+//        private void onActivitySaveInstanceState() {
+//
+//            onActivityDestroy();
+//        }
+//
+//
+//        private void onActivityResume() {
+//            mapView.onResume();
+//        }
+//
+//
+//        private void onActivityStart() {
+//            mapView.onStart();
+//        }
+//
+//
+//        private void onActivityStop() {
+//            mapView.onStop();
+//        }
+//
+//        private void onActivityPause() {
+//            mapView.onPause();
+//        }
+//
+//        private void onActivityDestroy() {
+//
+//            mapView.onDestroy();
+//            LocalBroadcastManager.getInstance(mCtx).unregisterReceiver(receiver);
+//        }
+//
+//        private void onActivityLowMemory() {
+//            mapView.onLowMemory();
+//        }
 
         public void bindModel(DetailMapModel model) {
             if (weakMap != null && weakMap.get() != null) {
@@ -547,22 +558,42 @@ public class DetailAdapter extends BaseExpandableListAdapter {
                 weakMap = null;
             }
 
-        }
-
-        @Override
-        public void onMapReady(GoogleMap googleMap) {
-            this.googleMap = googleMap;
-
             refreshUI();
         }
 
+//        @Override
+//        public void onMapReady(GoogleMap googleMap) {
+//            this.googleMap = googleMap;
+//
+//            refreshUI();
+//        }
+
         @Override
         public void refreshUI() {
+
+
             if (weakMap != null) {
                 DetailMapModel model = weakMap.get();
                 if (model != null) {
 
+                    titleTv.setText(model.title);
+                    valueTv.setText(model.location);
+
+                    String lat = model.getLat();
+                    String lon = model.getLon();
+                    boolean showMap = lat != null && lat.length() > 0 && lon != null && lon.length() > 0;
+                    mapBtn.setVisibility(showMap ? View.VISIBLE : View.GONE);
+
+                } else {
+
+                    titleTv.setText(null);
+                    valueTv.setText(null);
+                    mapBtn.setVisibility(View.GONE);
                 }
+            } else {
+                titleTv.setText(null);
+                valueTv.setText(null);
+                mapBtn.setVisibility(View.GONE);
             }
         }
     }

ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/detail/DetailSectionModel.java

@@ -87,6 +87,7 @@ public class DetailSectionModel {
 
                             model.title = value.optString("title");
                             model.location = value.optString("location");
+                            model.street = value.optString("street");
                             model.type = type;
 
                             this.values.add(model);
@@ -96,6 +97,9 @@ public class DetailSectionModel {
 
                             DetailMapModel model = new DetailMapModel(mCtx);
                             model.type = type;
+                            model.title = value.optString("title");
+                            model.location = value.optString("location");
+                            model.setLatlon(value.optString("latlon"));
 
                             this.values.add(model);
                         }

ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/detail/model/DetailLocationModel.java

@@ -6,6 +6,7 @@ public class DetailLocationModel extends DetailBaseModel {
 
     public String title;
     public String location;
+    public String street;
 
     public DetailLocationModel(Context context) {
         super(context);

ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/detail/model/DetailMapModel.java

@@ -4,7 +4,30 @@ import android.content.Context;
 
 public class DetailMapModel extends DetailBaseModel {
 
+    public String title;
+    public String location;
+    private String latlon;
+    private String lat;
+    private String lon;
+
     public DetailMapModel(Context context) {
         super(context);
     }
+
+    public void setLatlon(String latlon) {
+        this.latlon = latlon;
+        if (latlon != null && latlon.contains(",")) {
+            String[] arr = latlon.split(",");
+            lat = arr[0];
+            lon = arr[1];
+        }
+    }
+
+    public String getLat() {
+        return lat;
+    }
+
+    public String getLon() {
+        return lon;
+    }
 }

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

@@ -30,7 +30,6 @@ import com.usai.redant.apexdrivers.detail.DetailActivity;
 import com.usai.redant.apexdrivers.MainActivity;
 import com.usai.redant.apexdrivers.message.MessageActivity;
 import com.usai.redant.apexdrivers.R;
-import com.usai.redant.apexdrivers.Setting.SettingActivity;
 import com.usai.redant.apexdrivers.utils.OperationQueue;
 import com.usai.redant.rautils.utils.Network;
 
@@ -397,7 +396,7 @@ public class HomeFragment extends Fragment implements HomeHeaderView.HomeHeaderD
 
     @Override
     public void settingClick() {
-        SettingActivity.startSettingActivity(mCtx);
+        com.usai.redant.apexdrivers.setting.SettingActivity.startSettingActivity(mCtx);
     }
 
     @Override

ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/home/HomeHeaderView.java

@@ -152,12 +152,12 @@ public class HomeHeaderView extends RelativeLayout {
 
         if (available) {
 
-            availableBtn.setImageResource(R.drawable.available);
+            availableBtn.setImageResource(R.drawable.action_available);
             availableTv.setText("Available");
 
         } else {
 
-            availableBtn.setImageResource(R.drawable.unavailable);
+            availableBtn.setImageResource(R.drawable.action_unavailable);
             availableTv.setText("Unavailable");
         }
     }
@@ -170,9 +170,9 @@ public class HomeHeaderView extends RelativeLayout {
         this.existNewMessage = existNewMessage;
 
         if (existNewMessage) {
-            messageBtn.setImageResource(R.drawable.new_message);
+            messageBtn.setImageResource(R.drawable.action_message_new);
         } else {
-            messageBtn.setImageResource(R.drawable.message);
+            messageBtn.setImageResource(R.drawable.action_message);
         }
     }
 

ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/scaleimageview/ScaleImageView.java

@@ -0,0 +1,33 @@
+package com.usai.redant.apexdrivers.scaleimageview;
+
+import android.content.Context;
+import android.support.annotation.Nullable;
+import android.util.AttributeSet;
+
+public class ScaleImageView extends android.support.v7.widget.AppCompatImageView {
+
+    public ScaleImageView(Context context) {
+        super(context);
+    }
+
+    public ScaleImageView(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public ScaleImageView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+
+
+
+        int width = MeasureSpec.getSize(widthMeasureSpec);
+        int height = width * 109 / 253;
+        heightMeasureSpec = MeasureSpec.makeMeasureSpec(height,MeasureSpec.EXACTLY);
+
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    }
+}

ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/setting/SettingActivity.java

@@ -1,4 +1,4 @@
-package com.usai.redant.apexdrivers.Setting;
+package com.usai.redant.apexdrivers.setting;
 
 import android.content.Context;
 import android.content.Intent;

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

@@ -5,6 +5,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".Setting.SettingActivity">
+    tools:context=".setting.SettingActivity">
 
 </android.support.constraint.ConstraintLayout>

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

@@ -22,7 +22,17 @@
         android:layout_alignRight="@id/detail_map_title_tv"
         >
 
-        <com.google.android.gms.maps.MapView
+        <!--<com.google.android.gms.maps.MapView-->
+            <!--android:id="@+id/detail_map_view"-->
+            <!--android:layout_width="60dp"-->
+            <!--android:layout_height="60dp"-->
+            <!--android:layout_centerVertical="true"-->
+            <!--android:layout_alignParentRight="true"-->
+            <!--android:layout_marginRight="5dp"-->
+            <!--android:layout_marginLeft="5dp"-->
+            <!--/>-->
+
+        <ImageButton
             android:id="@+id/detail_map_view"
             android:layout_width="60dp"
             android:layout_height="60dp"

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

@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="#cccccc"
+                android:background="@color/ApexDriverGray"
     >
 
     <TextView
@@ -11,7 +11,7 @@
         android:layout_height="match_parent"
         android:layout_margin="5dp"
         android:textSize="25sp"
-        android:textColor="#000000"
+        android:textColor="#ffffff"
         />
 
 </RelativeLayout>

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

@@ -17,6 +17,7 @@
             android:layout_height="match_parent"
             android:groupIndicator="@null"
             android:divider="@null"
+            android:background="#e6e6e6"
             android:listSelector="@drawable/home_list_selector"
             >
 

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

@@ -32,14 +32,39 @@
             android:textAppearance="?android:attr/textAppearanceMedium" />
     </LinearLayout>
 
-    <!-- Login form -->
+    <!--ver-->
+    <TextView
+        android:id="@+id/tv_ver"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:layout_margin="10dp"
+        android:text="TextView" />
+
+
+    <!--Logo-->
+    <com.usai.redant.apexdrivers.scaleimageview.ScaleImageView
+        android:id="@+id/login_logo"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/tv_ver"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="5dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginTop="15dp"
+        android:scaleType="fitXY"
+        android:src="@drawable/driver_logo_0"
+        />
 
+    <!-- Login form -->
     <LinearLayout
         android:id="@+id/login_form"
         style="@style/LoginFormContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
+        android:layout_below="@id/login_logo"
         android:orientation="vertical" >
 
         <EditText
@@ -50,6 +75,7 @@
             android:inputType="textAutoComplete"
             android:maxLines="1"
             android:singleLine="true"
+            android:textColor="#000000"
             android:text="" />
 
         <EditText
@@ -63,6 +89,7 @@
             android:inputType="textPassword"
             android:maxLines="1"
             android:singleLine="true"
+            android:textColor="#000000"
             android:text="" />
 
         <RelativeLayout
@@ -87,6 +114,8 @@
                 android:background="@drawable/btn_bg"
                 android:paddingLeft="32dp"
                 android:paddingRight="32dp"
+                android:textColor="@android:color/holo_blue_dark"
+                android:textAllCaps="false"
                 android:text="@string/action_sign_in_register" />
 
         </RelativeLayout>
@@ -105,23 +134,4 @@
 
     </LinearLayout>
 
-    
-
-    <TextView
-        android:id="@+id/tv_ver"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:layout_margin="10dp"
-        android:text="TextView" />
-
-    <ImageView
-        android:layout_width="276dp"
-        android:layout_height="120dp"
-        android:layout_centerHorizontal="true"
-        android:layout_below="@id/tv_ver"
-        android:layout_above="@id/login_form"
-        />
-
 </RelativeLayout>

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

@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="40dp"
         android:layout_alignParentBottom="true"
-        android:background="@color/ApexDriverWhite"
+        android:background="#e6e6e6"
         >
 
 
@@ -121,7 +121,10 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:layout_margin="5dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginLeft="5dp"
+            android:layout_marginRight="5dp"
+            android:layout_marginBottom="10dp"
             android:background="@drawable/home_header_round_corner"
             >
 
@@ -139,7 +142,7 @@
                     android:layout_height="40dp"
                     android:layout_marginTop="2dp"
                     android:scaleType="centerInside"
-                    android:src="@drawable/signout"
+                    android:src="@drawable/action_signout"
                     />
 
                 <TextView
@@ -150,6 +153,7 @@
                     android:textAlignment="center"
                     android:textSize="15sp"
                     android:text="Sign Out"
+                    android:textColor="#000000"
                     />
 
             </LinearLayout>
@@ -170,7 +174,7 @@
                     android:layout_height="40dp"
                     android:layout_marginTop="2dp"
                     android:scaleType="centerInside"
-                    android:src="@drawable/setting"
+                    android:src="@drawable/action_setting"
                     />
 
                 <TextView
@@ -181,6 +185,7 @@
                     android:textAlignment="center"
                     android:textSize="15sp"
                     android:text="Setting"
+                    android:textColor="#000000"
                     />
 
             </LinearLayout>
@@ -200,7 +205,7 @@
                     android:layout_height="40dp"
                     android:layout_marginTop="2dp"
                     android:scaleType="centerInside"
-                    android:src="@drawable/available"
+                    android:src="@drawable/action_available"
                     />
 
                 <TextView
@@ -212,6 +217,7 @@
                     android:textAlignment="center"
                     android:textSize="15sp"
                     android:text="Available"
+                    android:textColor="#000000"
                     />
 
             </LinearLayout>
@@ -231,7 +237,7 @@
                     android:layout_height="40dp"
                     android:layout_marginTop="2dp"
                     android:scaleType="centerInside"
-                    android:src="@drawable/message"
+                    android:src="@drawable/action_message"
                     />
 
                 <TextView
@@ -242,6 +248,7 @@
                     android:textAlignment="center"
                     android:textSize="15sp"
                     android:text="Message"
+                    android:textColor="#000000"
                     />
 
             </LinearLayout>

ApexDrivers/app/src/main/res/values/styles.xml

@@ -29,7 +29,7 @@
 
         <item name="colorPrimaryDark">@color/ApexDriverOrange</item> <!--Status Bar-->
 
-        <item name="android:textColorPrimary">@color/ApexDriverWhite</item> <!--Title Color-->
+        <!--<item name="android:textColorPrimary">@color/ApexDriverWhite</item> &lt;!&ndash;Title Color&ndash;&gt;-->
 
         <!--Action Bar Bottom黑色分割线，android5.0使用代码actionBar.setElevation(0)去除-->
         <item name="android:windowContentOverlay">@null</item>