Merge branch 'dev' into test

app/src/main/java/com/dayu/bigfish/ui/MainActivity.java

@@ -36,7 +36,6 @@ import com.dayu.order.ui.fragment.HomeOrderFragment;
 import com.dayu.provider.event.RefreshReceivingNum;
 import com.dayu.provider.event.RefreshReceivingNum;
 import com.dayu.provider.event.SwtichFragment;
 import com.dayu.provider.event.SwtichFragment;
 import com.dayu.provider.router.RouterPath;
 import com.dayu.provider.router.RouterPath;
-import com.dayu.usercenter.ui.activity.IdentityCertificationActivity;
 import com.dayu.usercenter.ui.fragment.HomePersonFragment;
 import com.dayu.usercenter.ui.fragment.HomePersonFragment;
 import com.dayu.utils.badgeNumberManger.BadgeNumberManager;
 import com.dayu.utils.badgeNumberManger.BadgeNumberManager;
 import com.dayu.widgets.CustomDialog;
 import com.dayu.widgets.CustomDialog;
@@ -260,7 +259,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
 
 
     @Override
     @Override
     public void dumpReceActivity() {
     public void dumpReceActivity() {
-        Intent intent = new Intent(mActivity, IdentityCertificationActivity.class);
+        Intent intent = new Intent(mActivity, ReceivingActivity.class);
         startActivity(intent);
         startActivity(intent);
         overridePendingTransition(R.anim.slide_bottom_in, 0);
         overridePendingTransition(R.anim.slide_bottom_in, 0);
     }
     }

userCenter/src/main/java/com/dayu/usercenter/ui/activity/CertificationResultActivity.java

@@ -38,6 +38,8 @@ public class CertificationResultActivity extends DataBindingActivity<ActivityCer
                 } else {
                 } else {
 //                    AppManager.getInstance().finishActivity(FaceCertificationActivity.class);
 //                    AppManager.getInstance().finishActivity(FaceCertificationActivity.class);
                     Intent intent = new Intent(mActivity, IdentityCertificationActivity.class);
                     Intent intent = new Intent(mActivity, IdentityCertificationActivity.class);
+                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK |
+                            Intent.FLAG_ACTIVITY_CLEAR_TASK);
                     startActivity(intent);
                     startActivity(intent);
                     finish();
                     finish();
                 }
                 }