|
|
@@ -17,9 +17,14 @@ import kr.co.zumo.app.lifeplus.model.LifeplusPreferences;
|
|
|
import kr.co.zumo.app.lifeplus.model.SuperModel;
|
|
|
import kr.co.zumo.app.lifeplus.model.SuperModelInit;
|
|
|
import kr.co.zumo.app.lifeplus.network.NetworkWatcher;
|
|
|
+import kr.co.zumo.app.lifeplus.supervisor.DialogHelper;
|
|
|
+import kr.co.zumo.app.lifeplus.supervisor.DialogManager;
|
|
|
import kr.co.zumo.app.lifeplus.util.AppUtil;
|
|
|
import kr.co.zumo.app.lifeplus.util.PermissionUtil;
|
|
|
import kr.co.zumo.app.lifeplus.util.StringUtil;
|
|
|
+import kr.co.zumo.app.lifeplus.view.dialog.AlertDialog;
|
|
|
+import kr.co.zumo.app.lifeplus.view.dialog.DialogID;
|
|
|
+import kr.co.zumo.app.lifeplus.view.dialog.DialogResult;
|
|
|
|
|
|
/**
|
|
|
* Splash 화면
|
|
|
@@ -39,6 +44,7 @@ public class SplashActivity extends AppCompatActivity {
|
|
|
protected void onCreate(Bundle savedInstanceState) {
|
|
|
super.onCreate(savedInstanceState);
|
|
|
|
|
|
+ DialogHelper.getInstance().setFragmentManager(getSupportFragmentManager());
|
|
|
Context context = App.getInstance().getContext();
|
|
|
SuperModelInit.init(context);
|
|
|
|
|
|
@@ -76,7 +82,7 @@ public class SplashActivity extends AppCompatActivity {
|
|
|
// 업데이트 사용자
|
|
|
if (StringUtil.isFull(preferences.getEncryptionUserNo())) {
|
|
|
// todo 앱 업데이트 한 사람일 경우
|
|
|
- intent = new Intent(this, SignUpActivity.class);
|
|
|
+ intent = new Intent(this, SignUpZumoUserActivity.class);
|
|
|
}
|
|
|
else { // 처음 사용자
|
|
|
intent = new Intent(this, SignUpActivity.class);
|
|
|
@@ -85,17 +91,38 @@ public class SplashActivity extends AppCompatActivity {
|
|
|
|
|
|
try {
|
|
|
verifyUuid();
|
|
|
- } catch (Exception e) {
|
|
|
+ } catch (Throwable e) {
|
|
|
e.printStackTrace();
|
|
|
- // todo uuid 가 변경됨, 다시 인증 필요?
|
|
|
- intent = new Intent(this, NetworkErrorActivity.class);
|
|
|
+ // todo uuid 가 변경됨, 다시 인증 필요
|
|
|
+ intent = null;
|
|
|
+ showUuidDialog();
|
|
|
} finally {
|
|
|
- startActivity(intent);
|
|
|
- overridePendingTransition(R.anim.none, R.anim.none);
|
|
|
+ if (null != intent) {
|
|
|
+ startActivity(intent);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public void startActivity(Intent intent) {
|
|
|
+ super.startActivity(intent);
|
|
|
+ overridePendingTransition(R.anim.none, R.anim.none);
|
|
|
+ }
|
|
|
+
|
|
|
+ private void showUuidDialog() {
|
|
|
+ DialogManager dialogManager = new DialogManager();
|
|
|
+ AlertDialog alertDialog = (AlertDialog) dialogManager.show(DialogHelper.getInstance().getFragmentManager(), DialogID.ALERT, (dialog, resultCode, resultString) -> {
|
|
|
+ if (DialogResult.CODE_CANCEL == resultCode) {
|
|
|
+ Intent intent = new Intent(SplashActivity.this, SignUpActivity.class);
|
|
|
+ startActivity(intent);
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+ alertDialog.setText("UUID 가 변경되어 본인 인증이 필요합니다.");
|
|
|
+ }
|
|
|
+
|
|
|
protected void verifyUuid() {
|
|
|
+
|
|
|
if (ActivityCompat.checkSelfPermission(this, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) {
|
|
|
// fixme Manifest.permission.READ_PHONE_STATE 필요
|
|
|
Log.e("APP# SplashActivity | verifyUuid", "| " + "Manifest.permission.READ_PHONE_STATE 필요");
|
|
|
@@ -113,7 +140,7 @@ public class SplashActivity extends AppCompatActivity {
|
|
|
}
|
|
|
else {
|
|
|
Log.e("APP# SplashActivity | verifyUuid", "| " + "uuid 가 변경됨");
|
|
|
- throw new Error("uuid changed.");
|
|
|
+ throw new RuntimeException("uuid changed.");
|
|
|
}
|
|
|
}
|
|
|
else {
|