diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a2844e0..b0c289b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -31,18 +31,19 @@ android:name="com.echo.colorizeit.ui.a_open_screen_activity.OpenScreenActivity" android:exported="true" android:label="@string/app_name" + android:screenOrientation="portrait" android:theme="@style/Theme.MyApplication.NoActionBar"> - - - - - + + + + @@ -54,11 +55,13 @@ android:name="com.echo.colorizeit.ui.a_image_upload_activity.ImageUploadViewActivity" android:exported="true" android:label="@string/app_name" + android:screenOrientation="portrait" android:theme="@style/Theme.MyApplication.NoActionBar"> > - - + + - - + + diff --git a/app/src/main/java/com/echo/colorizeit/ui/a_open_screen_activity/OpenScreenActivity.java b/app/src/main/java/com/echo/colorizeit/ui/a_open_screen_activity/OpenScreenActivity.java index d7c09ee..c20a854 100644 --- a/app/src/main/java/com/echo/colorizeit/ui/a_open_screen_activity/OpenScreenActivity.java +++ b/app/src/main/java/com/echo/colorizeit/ui/a_open_screen_activity/OpenScreenActivity.java @@ -20,6 +20,7 @@ import androidx.lifecycle.ViewModelProvider; import com.daimajia.androidanimations.library.Techniques; import com.daimajia.androidanimations.library.YoYo; import com.echo.colorizeit.MainActivity; +import com.echo.colorizeit.myganme.GameActivity; import com.echo.colorizeit.ui.BaseActivity; import com.example.myapplication.R; import com.example.myapplication.databinding.OpenScreenBinding; @@ -40,6 +41,7 @@ public class OpenScreenActivity extends BaseActivity { openScreen_element_fade_in = AnimationUtils.loadAnimation(this, R.anim.anim_open_screen); makeFullScreen(); + anim_play_view_fade_out.setAnimationListener(new Animation.AnimationListener() { @Override public void onAnimationStart(Animation animation) { @@ -79,6 +81,7 @@ public class OpenScreenActivity extends BaseActivity { }); binding = OpenScreenBinding.inflate(getLayoutInflater()); setContentView(binding.getRoot()); + binding.animationView.enableMergePathsForKitKatAndAbove(true); if (model.check_if_user_first_enter(this)) {//第一次 model.mark_user_entered_this_app(); @@ -152,13 +155,25 @@ public class OpenScreenActivity extends BaseActivity { }); } - + @Override + protected void onStart() { + super.onStart(); + if(model.getShowAlterDialog().getValue()) + showAlterDialog(); + } private void showAlterDialog() { final AlertDialog.Builder alterDiaglog = new AlertDialog.Builder(this); alterDiaglog.setTitle("No Internet");//文字 alterDiaglog.setMessage("Please connect to Internet to continue.");//提示消息 + alterDiaglog.setPositiveButton("Play a Game", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + Intent intent = new Intent(_this, GameActivity.class); + startActivity(intent); + } + }); alterDiaglog.setNegativeButton("Exit", new DialogInterface.OnClickListener() { @Override diff --git a/app/src/main/java/com/echo/colorizeit/ui/a_open_screen_activity/OpenScreenViewModel.java b/app/src/main/java/com/echo/colorizeit/ui/a_open_screen_activity/OpenScreenViewModel.java index d4660ad..9da37c5 100644 --- a/app/src/main/java/com/echo/colorizeit/ui/a_open_screen_activity/OpenScreenViewModel.java +++ b/app/src/main/java/com/echo/colorizeit/ui/a_open_screen_activity/OpenScreenViewModel.java @@ -23,6 +23,7 @@ public class OpenScreenViewModel extends ViewModel { Is_user_first_enter_this_app = new MutableLiveData<>(); gotoMainActivity = new MutableLiveData<>(); showAlterDialog = new MutableLiveData<>(); + showAlterDialog.setValue(false); }