1.修改Android Apex Drivers Home数据请求失败后指示器没有隐藏。

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

@@ -198,39 +198,36 @@ public class HomeFragment extends Fragment {
 
     private void handleJson(JSONObject json) {
 
-        if (json == null) {
-            return;
-        }
+        if (json != null) {
 
-        try {
-            JSONArray sectionArr = json.optJSONArray("sections");
-            if (sectionArr != null) {
-                mJson = json;
-                mSectionArray.clear();
+            try {
+                JSONArray sectionArr = json.optJSONArray("sections");
+                if (sectionArr != null) {
+                    mJson = json;
+                    mSectionArray.clear();
 
-                for (int i = 0; i < sectionArr.length(); i++) {
+                    for (int i = 0; i < sectionArr.length(); i++) {
 
-                    JSONObject section = sectionArr.getJSONObject(i);
-                    HomeSectionModel model = new HomeSectionModel();
-                    model.section = i;
+                        JSONObject section = sectionArr.getJSONObject(i);
+                        HomeSectionModel model = new HomeSectionModel();
+                        model.section = i;
 
-                    model.type = section.optInt("type");
-                    model.title = section.optString("title");
-                    model.setOrders(section.optJSONArray("orders"));
-                    model.totalCount = section.optInt("totalCount",0);
+                        model.type = section.optInt("type");
+                        model.title = section.optString("title");
+                        model.setOrders(section.optJSONArray("orders"));
+                        model.totalCount = section.optInt("totalCount",0);
 
-                    mSectionArray.add(model);
+                        mSectionArray.add(model);
+                    }
                 }
-
-                Message msg = new Message();
-                msg.what = HomeHandler.HomeActionReloadData;
-                mHandler.sendMessage(msg);
-
+            } catch (JSONException e) {
+                e.printStackTrace();
             }
-        } catch (JSONException e) {
-            e.printStackTrace();
         }
 
+        Message msg = new Message();
+        msg.what = HomeHandler.HomeActionReloadData;
+        mHandler.sendMessage(msg);
     }
 
     private void loadData() {

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

@@ -45,6 +45,7 @@ public class HomeMoreActivity extends AppCompatActivity implements AbsListView.O
 
     private final static String SavedJsonKey = "SavedJsonKey";
     private final static String SavedOrderTypeKey = "SavedOrderTypeKey";
+    private final static String SavedTitleKey = "SavedTitleKey";
 
     public static Intent build(Context context, int orderType, String title) {
 
@@ -71,6 +72,7 @@ public class HomeMoreActivity extends AppCompatActivity implements AbsListView.O
     private HomeMoreListAdapter mAdapter;
     private HomeMoreHandler mHandler;
     private int mType;
+    private String mTitle;
     private HomeOrderModel mSelectedModel;
 
 
@@ -104,14 +106,14 @@ public class HomeMoreActivity extends AppCompatActivity implements AbsListView.O
         Intent intent = getIntent();
         if (intent != null) {
             mType = intent.getIntExtra(OrderTypeKey,0);
-            String title = intent.getStringExtra(TitleKey);
-            if (!TextUtils.isEmpty(title)) {
-                setTitle(title);
-            }
+            mTitle = intent.getStringExtra(TitleKey);
+            setTitle(mTitle);
         }
 
         if (savedInstanceState != null) {
             mType = savedInstanceState.getInt(SavedOrderTypeKey);
+            mTitle = savedInstanceState.getString(SavedTitleKey);
+
             String jsonStr = savedInstanceState.getString(SavedJsonKey);
             if (jsonStr != null) {
                 try {
@@ -150,6 +152,10 @@ public class HomeMoreActivity extends AppCompatActivity implements AbsListView.O
         if (json != null) {
             outState.putString(SavedJsonKey,json);
         }
+        if (mTitle != null) {
+            outState.putString(SavedTitleKey,mTitle);
+        }
+
     }
 
     private String prepareOrderForSave() {
@@ -176,6 +182,9 @@ public class HomeMoreActivity extends AppCompatActivity implements AbsListView.O
                 if (model.date != null) {
                     json.put("date",model.date);
                 }
+                if (model.order_type2 != null) {
+                    json.put("order_type2",model.order_type2);
+                }
                 orders.put(json);
             }