Merge remote-tracking branch 'origin/sheep_develop' into sheep_develop

app/src/main/java/com/sheep/gamegroup/util/CertificationUtil.java

@@ -43,6 +43,7 @@ public class CertificationUtil {
             public void run() {
                 SheepApp.getInstance().setGamePackgeName("");
                 SheepApp.getInstance().setGameCode("");
+                SheepApp.getInstance().setGameFlag(false);
                 G.showToast(errorMsg);
                 SheepApp.getInstance().quit();
 //                android.os.Process.killProcess(android.os.Process.myPid());

app/src/main/java/com/sheep/gamegroup/view/activity/GameCertificationActivity.java

@@ -149,4 +149,10 @@ public class GameCertificationActivity extends BaseActivity {
             }
         },3000);
     }
+
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        SheepApp.getInstance().setGameFlag(true);
+    }
 }

app/src/main/java/com/sheep/gamegroup/view/activity/LoginAct.java

@@ -467,4 +467,10 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
         }
     }
 
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+
+        SheepApp.getInstance().setGameFlag(true);
+    }
 }

app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -70,6 +70,15 @@ public class SheepApp extends MultiDexApplication {
     private int midongTimeCount = 1;
     private String gameCode;//游戏code
     private String gamePackgeName;
+    private boolean gameFlag;
+
+    public boolean isGameFlag() {
+        return gameFlag;
+    }
+
+    public void setGameFlag(boolean gameFlag) {
+        this.gameFlag = gameFlag;
+    }
 
     public String getGamePackgeName() {
         return gamePackgeName;
@@ -392,7 +401,7 @@ public class SheepApp extends MultiDexApplication {
         @Override
         public void onActivityDestroyed(Activity activity) {
             Log.e("act_destroy_----", "in");
-            if(!TextUtils.isEmpty(gamePackgeName) && (activity instanceof GameCertificationActivity ||activity instanceof LoginAct ||activity instanceof ActBindMobileRegister)){
+            if(!TextUtils.isEmpty(gamePackgeName) && isGameFlag() && (activity instanceof GameCertificationActivity ||activity instanceof LoginAct)){
                 CertificationUtil.newInstance().doCertification(activity, gamePackgeName, "cancel");
             }
             if(mActivityCount == 0) {