Apex & drivers

修复重复弹order detail 的问题。

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

@@ -13,8 +13,6 @@ import android.content.Intent;
 import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.location.Location;
-import android.media.AudioAttributes;
-import android.media.RingtoneManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -28,7 +26,6 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import com.usai.redant.apexdrivers.detail.DetailActivity;
-import com.usai.redant.apexdrivers.home.HomeFragment;
 import com.usai.redant.apexdrivers.network.Network;
 import com.usai.redant.apexdrivers.receiver.ApexDriverAlarmReceiver;
 import com.usai.redant.apexdrivers.utils.OperationQueue;
@@ -679,6 +676,7 @@ public class ApexDriverApplication extends Application {
         Intent intent = new Intent(getApplicationContext(),MainActivity.class);
         intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         intent.putExtra("aps",aps.toString()); // 程序在后台的情况下，点击通知将程序唤醒到前台时，并不能取得extra
+        intent.putExtra("is_notification",true);
         MainActivity mainActivity = MainActivity.currentMainActivity();
         if (mainActivity != null) {
             mainActivity.setAPS(aps);

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

@@ -143,6 +143,8 @@ public class MainActivity extends BasicActivity implements LoginFragment.LoginCa
 //        }
         weakSelf = new WeakReference<>(this);
 
+
+
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
@@ -176,6 +178,13 @@ public class MainActivity extends BasicActivity implements LoginFragment.LoginCa
 
             Intent intent = getIntent();
             if (intent != null) {
+
+//                boolean is_notification=intent.getBooleanExtra("is_notification",false);
+//                if(!is_notification)
+//                {
+//                    mAps=null;
+//                    return;
+//                }
                 String apsStr = intent.getStringExtra("aps");
 
                 try {
@@ -192,6 +201,7 @@ public class MainActivity extends BasicActivity implements LoginFragment.LoginCa
                         final String statusNo = aps.optString("status-no");
 
                         Intent detailIntent = DetailActivity.build(getApplicationContext(),orderID,orderType,orderType2,statusNo);
+                        this.setIntent(null);
                         startActivity(detailIntent);
                     }