1.修改Apex Drivers返回首页刷新。

2.修改Apex Drivers上传成功后删除图片。

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

@@ -122,6 +122,13 @@ public class DetailActivity extends AppCompatActivity implements DetailAdapter.D
         return super.onOptionsItemSelected(item);
     }
 
+    private void goHome() {
+        Intent intent = new Intent(self, MainActivity.class);
+        self.startActivity(intent);
+
+        sendBroadcast(new Intent(HomeFragment.HomeReloadBroadcastAction));
+    }
+
     /**
      * Data
      * */
@@ -333,8 +340,7 @@ public class DetailActivity extends AppCompatActivity implements DetailAdapter.D
                         int result = json.optInt("result");
                         if (result == RESULT_TRUE) {
 
-                            Intent intent = new Intent(activity, MainActivity.class);
-                            activity.startActivity(intent);
+                            activity.goHome();
                         } else {
                             // error;
                             String errMsg = json.optString("err_msg");

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

@@ -1,8 +1,10 @@
 package com.usai.redant.apexdrivers.Home;
 
 import android.app.ProgressDialog;
+import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -34,6 +36,7 @@ import java.util.ArrayList;
 
 public class HomeFragment extends Fragment {
 
+    public final static String HomeReloadBroadcastAction = "com.usai.redant.apexdriver.home_refresh";
 
     private Context mCtx;
     private HomeFragment self = this;
@@ -42,6 +45,7 @@ public class HomeFragment extends Fragment {
     private HomeListAdapter mAdapter;
     private ArrayList<HomeSectionModel> mSectionArray = new ArrayList<>();
     private HomeHandler mHandler = new HomeHandler(this);
+    private HomeBroadCastReceiver mReceiver;
 
     @Nullable
     @Override
@@ -100,6 +104,8 @@ public class HomeFragment extends Fragment {
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mCtx = getActivity();
+
+        registBroadcastReceiver();
     }
 
     @Override
@@ -112,6 +118,20 @@ public class HomeFragment extends Fragment {
         super.onSaveInstanceState(outState);
     }
 
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        mCtx.unregisterReceiver(mReceiver);
+    }
+
+    private void registBroadcastReceiver() {
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(HomeReloadBroadcastAction);
+        mReceiver = new HomeBroadCastReceiver();
+        mCtx.registerReceiver(mReceiver,intentFilter);
+    }
+
     private ProgressDialog mProgressDialog;
     private void showProgressDialog() {
         if (mProgressDialog == null) {
@@ -553,4 +573,21 @@ public class HomeFragment extends Fragment {
         }
 
     }
+
+
+    /**
+     * Receiver
+     * */
+
+    private class HomeBroadCastReceiver extends BroadcastReceiver {
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+
+            if (intent.getAction() == HomeReloadBroadcastAction) {
+                loadData();
+            }
+
+        }
+    }
 }

ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/MainActivity.java

@@ -1,6 +1,10 @@
 package com.usai.redant.apexdrivers;
 
 import android.app.ProgressDialog;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.os.Bundle;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
@@ -16,7 +20,6 @@ import com.usai.redant.apexdrivers.Network.Network;
 
 public class MainActivity extends AppCompatActivity implements LoginFragment.LoginCallBack {
 
-
     private RelativeLayout mRootContainer;
 
     @Override

ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/Update/UpdateActivity.java

@@ -25,6 +25,7 @@ import android.widget.ExpandableListView;
 
 import com.usai.redant.apexdrivers.ApexDriverApplication;
 import com.usai.redant.apexdrivers.CodeScanner.CaptureActivity;
+import com.usai.redant.apexdrivers.Home.HomeFragment;
 import com.usai.redant.apexdrivers.MainActivity;
 import com.usai.redant.apexdrivers.R;
 import com.usai.redant.apexdrivers.Update.Model.UpdateBaseModel;
@@ -339,6 +340,11 @@ public class UpdateActivity extends AppCompatActivity implements UpdateAdapter.U
                                 }
                             } else {
                                 retryCount = 0;
+                                File photoFile = new File(model.photoPath);
+                                if (photoFile.exists()) {
+                                    photoFile.delete();
+                                    ImageUtil.updateGallery(mCtx,model.photoPath);
+                                }
                             }
                         } else {
                             // error
@@ -393,6 +399,8 @@ public class UpdateActivity extends AppCompatActivity implements UpdateAdapter.U
     private void goHome() {
         Intent intent = new Intent(self, MainActivity.class);
         self.startActivity(intent);
+
+        sendBroadcast(new Intent(HomeFragment.HomeReloadBroadcastAction));
     }
 
     private void backgroundUpload(ArrayList<UpdatePhotoModel> photos, final JSONObject json) {
@@ -532,13 +540,13 @@ public class UpdateActivity extends AppCompatActivity implements UpdateAdapter.U
     private File createImageFile() throws IOException
     {
         // Create an image file name
-        String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmSS").format(new Date());
-        String imageFileName = "JPEG_" + timeStamp + "_";
-        File storageDir = new File(Environment.getExternalStorageDirectory().getPath() + "/redant/drivers/temp/");
+//        String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmSS").format(new Date());
+//        String imageFileName = "JPEG_" + timeStamp + "_";
+        File storageDir = new File(Environment.getExternalStorageDirectory().getPath() + "/Apex Driver/photo/temp/");
 
-        File dir1 = new File(Environment.getExternalStorageDirectory().getPath() + "/redant");
-        File dir2 = new File(Environment.getExternalStorageDirectory().getPath() + "/redant/drivers");
-        File dir3 = new File(Environment.getExternalStorageDirectory().getPath() + "/redant/drivers/temp");
+        File dir1 = new File(Environment.getExternalStorageDirectory().getPath() + "/Apex Driver");
+        File dir2 = new File(Environment.getExternalStorageDirectory().getPath() + "/Apex Driver/photo");
+        File dir3 = new File(Environment.getExternalStorageDirectory().getPath() + "/Apex Driver/photo/temp/");
 
 
         if (!dir1.exists())
@@ -554,10 +562,10 @@ public class UpdateActivity extends AppCompatActivity implements UpdateAdapter.U
             boolean b = dir3.mkdir();
         }
 
-        LastFileName = storageDir + imageFileName + ".jpg";
+        LastFileName = storageDir + mPhotoModel.getPhotoName();
 
-        File image = File.createTempFile(imageFileName, /* prefix */
-                ".jpg", /* suffix */
+        File image = File.createTempFile(mPhotoModel.getPhotoName(), /* prefix */
+                "", /* suffix */
                 storageDir /* directory */
         );