1.修改Android Apex Drivers Setting Option增加Header。

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

@@ -457,6 +457,7 @@ public class HomeMoreActivity extends BasicActivity implements AbsListView.OnScr
                         model.orderID = order.optString("orderID");
                         model.order_type2 = order.optString("order_type2");
                         model.setIconURL(order.optString("iconURL"));
+                        model.setBackendFlag(order.optBoolean("backendFlag"));
                         model.status_no = order.optString("status_no");
 
                         mOrders.add(model);

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

@@ -185,7 +185,7 @@ public class SettingActivity extends BasicActivity implements SettingAdapter.Set
         }
 
         mClickedOptionModel = model;
-        OptionActivity.startOptionActivity(this,model.optionsJsonString(),model.selectedOption(), REQUEST_CODE_OPTION);
+        OptionActivity.startOptionActivity(this,model.title, model.optionsJsonString(), model.selectedOption(), REQUEST_CODE_OPTION);
 
     }
 

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

@@ -12,6 +12,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
+import android.widget.BaseExpandableListAdapter;
+import android.widget.ExpandableListView;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -28,16 +30,20 @@ import java.util.ArrayList;
 
 public class OptionActivity extends BasicActivity {
 
+    private static final String OptionTitleKey = "OptionTitle";
     private static final String OptionsKey = "OptionsKey";
     public static final String SelectedKey = "SelectedKey";
     private static final String SelectedIndexKey = "SelectedIndexKey";
 
-    public static void startOptionActivity(Activity activity, String optionsJson, int selectedOption, int requestCode) {
+    public static void startOptionActivity(Activity activity, String optionTitle, String optionsJson, int selectedOption, int requestCode) {
         if (activity == null) {
             return;
         }
 
         Intent intent = new Intent(activity,OptionActivity.class);
+        if (optionTitle != null) {
+            intent.putExtra(OptionTitleKey,optionTitle);
+        }
         if (optionsJson != null) {
             intent.putExtra(OptionsKey,optionsJson);
         }
@@ -49,11 +55,12 @@ public class OptionActivity extends BasicActivity {
     private Context mCtx = this;
     private String optionsJson;
     private int selectedOption;
+    private String title;
 
     private ArrayList<SettingOption> options = new ArrayList<>();
     private int selectedIndex = -1;
 
-    private ListView mListView;
+    private ExpandableListView mListView;
     private OptionAdapter mAdapter;
 
     @Override
@@ -71,12 +78,14 @@ public class OptionActivity extends BasicActivity {
 
             optionsJson = savedInstanceState.getString(OptionsKey);
             selectedIndex = savedInstanceState.getInt(SelectedIndexKey);
+            title = savedInstanceState.getString(OptionTitleKey);
 
         } else {
             if (getIntent() != null) {
 
                 optionsJson = getIntent().getStringExtra(OptionsKey);
                 selectedOption = getIntent().getIntExtra(SelectedKey,-1);
+                title = getIntent().getStringExtra(OptionTitleKey);
             }
         }
 
@@ -109,17 +118,30 @@ public class OptionActivity extends BasicActivity {
         mAdapter = new OptionAdapter();
         mListView = findViewById(R.id.option_list_view);
         mListView.setAdapter(mAdapter);
-        mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+        mListView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() {
             @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+            public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) {
 
-                if (position != selectedIndex) {
-                    selectedIndex = position;
+                if (childPosition != selectedIndex) {
+                    selectedIndex = childPosition;
                     mAdapter.notifyDataSetChanged();
                 }
 
+                return false;
+            }
+        });
+        mListView.setOnGroupClickListener(new ExpandableListView.OnGroupClickListener() {
+            @Override
+            public boolean onGroupClick(ExpandableListView parent, View v, int groupPosition, long id) {
+                return true;
             }
         });
+        mListView.setGroupIndicator(null);
+
+        int groupCount = mAdapter.getGroupCount();
+        for (int i = 0; i < groupCount; i++) {
+            mListView.expandGroup(i);
+        }
 
     }
 
@@ -131,6 +153,9 @@ public class OptionActivity extends BasicActivity {
         if (optionsJson != null) {
             outState.putString(OptionsKey,optionsJson);
         }
+        if (title != null) {
+            outState.putString(OptionTitleKey,title);
+        }
     }
 
     @Override
@@ -162,25 +187,64 @@ public class OptionActivity extends BasicActivity {
         super.finish();
     }
 
-    private class OptionAdapter extends BaseAdapter {
+    private class OptionAdapter extends BaseExpandableListAdapter {
+
+        @Override
+        public int getGroupCount() {
+            return 1;
+        }
 
         @Override
-        public int getCount() {
+        public int getChildrenCount(int groupPosition) {
             return options.size();
         }
 
         @Override
-        public Object getItem(int position) {
-            return options.get(position);
+        public Object getGroup(int groupPosition) {
+            return options;
         }
 
         @Override
-        public long getItemId(int position) {
-            return position;
+        public Object getChild(int groupPosition, int childPosition) {
+            return options.get(childPosition);
         }
 
         @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
+        public long getGroupId(int groupPosition) {
+            return groupPosition;
+        }
+
+        @Override
+        public long getChildId(int groupPosition, int childPosition) {
+            return childPosition;
+        }
+
+        @Override
+        public boolean hasStableIds() {
+            return false;
+        }
+
+        @Override
+        public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) {
+
+            HeaderHolder holder;
+            if (convertView == null) {
+
+                convertView = LayoutInflater.from(mCtx).inflate(R.layout.option_group_header,null);
+                holder = new HeaderHolder(convertView);
+
+            } else {
+
+                holder = (HeaderHolder)convertView.getTag();
+            }
+
+            holder.titleTv.setText(title);
+
+            return convertView;
+        }
+
+        @Override
+        public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) {
 
             Holder holder;
             if (convertView == null) {
@@ -193,11 +257,26 @@ public class OptionActivity extends BasicActivity {
                 holder = (Holder)convertView.getTag();
             }
 
-            SettingOption option = options.get(position);
-            holder.setModel(option,position);
+            SettingOption option = options.get(childPosition);
+            holder.setModel(option,childPosition);
 
             return convertView;
         }
+
+        @Override
+        public boolean isChildSelectable(int groupPosition, int childPosition) {
+            return true;
+        }
+    }
+
+    private class HeaderHolder {
+        TextView titleTv;
+
+        HeaderHolder(View view) {
+            view.setTag(this);
+
+            titleTv = view.findViewById(R.id.option_group_header_title_tv);
+        }
     }
 
     private class Holder {

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

@@ -7,10 +7,11 @@
     android:layout_height="match_parent"
     tools:context=".setting.option.OptionActivity">
 
-    <ListView
+    <ExpandableListView
         android:id="@+id/option_list_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="#e6e6e6"
         />
 
 </RelativeLayout>

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

@@ -22,6 +22,7 @@
             android:textStyle="bold"
             android:textAlignment="center"
             android:text="Change Password"
+            android:textColor="#000000"
             />
 
         <EditText

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="30dp">
+
+    <TextView
+        android:id="@+id/option_group_header_title_tv"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="5dp"
+        android:textSize="15sp"
+        />
+
+</RelativeLayout>

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

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+    android:background="#ffffff"
+    >
 
     <RelativeLayout
         android:layout_width="match_parent"