|
|
@@ -96,18 +96,28 @@ public class SplashActivity extends ActivityBaseSetup implements ISplashContract
|
|
|
|
|
|
@Override
|
|
|
public void linkActivity(int screenId) {
|
|
|
-// Intent intent = new Intent(this, MainActivity.class);
|
|
|
-// intent.putExtra(ScreenStarter.SCREEN_ID, screenId);
|
|
|
-// intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
|
|
-//
|
|
|
-// if (false == APIModuleHelper.isDispatched()) {
|
|
|
-// this.finish();
|
|
|
-// startActivity(intent, SLIDE_TYPE_HOME);
|
|
|
-//
|
|
|
-// doOnLink();
|
|
|
-// }
|
|
|
- Intent intent = new Intent(this, SignInActivity.class);
|
|
|
- startActivity(intent);
|
|
|
+ Intent intent;
|
|
|
+
|
|
|
+ if (screenId == ScreenStarter.SCREEN_LOGIN) {
|
|
|
+ intent = new Intent(this, SignInActivity.class);
|
|
|
+
|
|
|
+ if (false == APIModuleHelper.isDispatched()) {
|
|
|
+ startActivity(intent);
|
|
|
+ this.finish();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ intent = new Intent(this, MainActivity.class);
|
|
|
+ intent.putExtra(ScreenStarter.SCREEN_ID, screenId);
|
|
|
+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
|
|
+
|
|
|
+ if (false == APIModuleHelper.isDispatched()) {
|
|
|
+ this.finish();
|
|
|
+ startActivity(intent, SLIDE_TYPE_HOME);
|
|
|
+
|
|
|
+ doOnLink();
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
|