diff --git a/app/src/main/java/com/nsgk/ruralWeb/FullscreenActivity.java b/app/src/main/java/com/nsgk/ruralWeb/FullscreenActivity.java
index a5f719b..f583fb5 100644
--- a/app/src/main/java/com/nsgk/ruralWeb/FullscreenActivity.java
+++ b/app/src/main/java/com/nsgk/ruralWeb/FullscreenActivity.java
@@ -47,8 +47,8 @@ public class FullscreenActivity extends AppCompatActivity {
.setPositiveButton("确定", (dialogInterface, i) -> mWebView.loadUrl("http://"+textView.getText().toString()))
.create();
-
mWebView.loadUrl("http://www.baidu.com");
+
sensorManagerHelper = new SensorManagerHelper(this);
sensorManagerHelper.setOnShakeListener(alertDialog::show);
}
diff --git a/app/src/main/java/com/nsgk/ruralWeb/WelcomeActivity.java b/app/src/main/java/com/nsgk/ruralWeb/WelcomeActivity.java
index f3c59ea..49ebc24 100644
--- a/app/src/main/java/com/nsgk/ruralWeb/WelcomeActivity.java
+++ b/app/src/main/java/com/nsgk/ruralWeb/WelcomeActivity.java
@@ -1,15 +1,22 @@
package com.nsgk.ruralWeb;
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
import android.annotation.SuppressLint;
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
+import android.view.animation.AnticipateInterpolator;
+import android.widget.ImageView;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
public class WelcomeActivity extends AppCompatActivity {
+ private ImageView imageView;
private Handler handler = new Handler() {
@SuppressLint("HandlerLeak")
@@ -22,7 +29,10 @@ public class WelcomeActivity extends AppCompatActivity {
Intent intent = new Intent(WelcomeActivity.this, FullscreenActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
startActivity(intent);
+ overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
break;
+ default:
+ throw new IllegalStateException("Unexpected value: " + msg.what);
}
}
};
@@ -31,13 +41,19 @@ public class WelcomeActivity extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
this.setContentView(R.layout.activity_welcome);
-
-
- handler.postDelayed(new Runnable() {
- @Override
- public void run() {
- handler.sendEmptyMessage(1);
- }
- }, 3000);
+ imageView = findViewById(R.id.imageView);
+ Animation animation = AnimationUtils.loadAnimation(this, R.anim.img_anim);
+ animation.start();
+ imageView.animate()
+ .scaleXBy(1.5f)
+ .scaleYBy(1.5f)
+ .setInterpolator(new AnticipateInterpolator())
+ .setDuration(2000)
+ .setListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ handler.sendEmptyMessage(1);
+ }
+ });
}
}
diff --git a/app/src/main/res/anim/activity_in.xml b/app/src/main/res/anim/activity_in.xml
new file mode 100644
index 0000000..2ba5cf1
--- /dev/null
+++ b/app/src/main/res/anim/activity_in.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/anim/activity_out.xml b/app/src/main/res/anim/activity_out.xml
new file mode 100644
index 0000000..35c6364
--- /dev/null
+++ b/app/src/main/res/anim/activity_out.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/anim/img_anim.xml b/app/src/main/res/anim/img_anim.xml
new file mode 100644
index 0000000..93e8152
--- /dev/null
+++ b/app/src/main/res/anim/img_anim.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/animator/img_aminator.xml b/app/src/main/res/animator/img_aminator.xml
new file mode 100644
index 0000000..c04f20d
--- /dev/null
+++ b/app/src/main/res/animator/img_aminator.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_fullscreen.xml b/app/src/main/res/layout/activity_fullscreen.xml
index 8c26275..e8aef8f 100644
--- a/app/src/main/res/layout/activity_fullscreen.xml
+++ b/app/src/main/res/layout/activity_fullscreen.xml
@@ -1,5 +1,5 @@
-
+ android:id="@+id/mWebView" />
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_welcome.xml b/app/src/main/res/layout/activity_welcome.xml
index b11d389..29f62b8 100644
--- a/app/src/main/res/layout/activity_welcome.xml
+++ b/app/src/main/res/layout/activity_welcome.xml
@@ -1,9 +1,15 @@
-
-
\ No newline at end of file
+
+
\ No newline at end of file