diff --git a/app/src/main/java/com/pkusz/min_vpn_client/activity/login/LoginActivity.java b/app/src/main/java/com/pkusz/min_vpn_client/activity/login/LoginActivity.java index 1ee61de..542ff01 100644 --- a/app/src/main/java/com/pkusz/min_vpn_client/activity/login/LoginActivity.java +++ b/app/src/main/java/com/pkusz/min_vpn_client/activity/login/LoginActivity.java @@ -24,7 +24,6 @@ import com.pkusz.min_vpn_client.model.MINVpnSettingAPI; import com.pkusz.min_vpn_client.model.OriginalRequest.OriginalGetVpnInfoRequest; import com.pkusz.min_vpn_client.model.OriginalRequest.OriginalLoginRequest; import com.pkusz.min_vpn_client.utils.AccountValidatorRegexUtil; -import com.pkusz.min_vpn_client.utils.Base64Util; import com.pkusz.min_vpn_client.utils.DigestUtilKt; import org.jetbrains.annotations.NotNull; @@ -180,7 +179,7 @@ public class LoginActivity extends MINVpnBaseActivity // 监听键盘是否弹起 ActivityExtensionsKt.listenKeyboardVisible(this,(isOpen)->{ if(isOpen){ - ViewExtensionKt.animer(imageView_imgLogo, + ViewExtensionKt.animer200(imageView_imgLogo, ViewExtensionKt.scaleXAnimation(imageView_imgLogo,1f, 0.5f), ViewExtensionKt.scaleYAnimation(imageView_imgLogo,1f, 0.5f), ViewExtensionKt.transYAnimation(imageView_imgLogo, @@ -192,7 +191,7 @@ public class LoginActivity extends MINVpnBaseActivity ViewExtensionKt.transYAnimation(btnLogin, 0f, -DisplayUtils.dp2px(this, 90))); }else{ - ViewExtensionKt.animer(imageView_imgLogo, + ViewExtensionKt.animer200(imageView_imgLogo, ViewExtensionKt.scaleXAnimation(imageView_imgLogo,0.5f, 1f), ViewExtensionKt.scaleYAnimation(imageView_imgLogo,0.5f, 1f), ViewExtensionKt.transYAnimation(imageView_imgLogo, diff --git a/app/src/main/java/com/pkusz/min_vpn_client/activity/register/RegisterActivity.java b/app/src/main/java/com/pkusz/min_vpn_client/activity/register/RegisterActivity.java index b4dbb1a..8bcff5b 100644 --- a/app/src/main/java/com/pkusz/min_vpn_client/activity/register/RegisterActivity.java +++ b/app/src/main/java/com/pkusz/min_vpn_client/activity/register/RegisterActivity.java @@ -7,7 +7,6 @@ package com.pkusz.min_vpn_client.activity.register; * @Copyright: MIN-Group;国家重大科技基础设施——未来网络北大实验室;深圳市信息论与未来网络重点实验室 */ -import android.os.Build; import android.os.Bundle; import android.view.View; import android.widget.ImageView; @@ -18,7 +17,6 @@ import com.pkusz.min_vpn_client.activity.base.MINVpnBaseActivity; import com.pkusz.min_vpn_client.activity.login.LoginActivity; import com.pkusz.min_vpn_client.model.OriginalRequest.OriginalRegisterRequest; import com.pkusz.min_vpn_client.utils.AccountValidatorRegexUtil; -import com.pkusz.min_vpn_client.utils.Base64Util; import com.pkusz.min_vpn_client.utils.DigestUtilKt; import org.jetbrains.annotations.NotNull; @@ -173,7 +171,7 @@ public class RegisterActivity extends MINVpnBaseActivity{ if(isOpen){ - ViewExtensionKt.animer(imgLogo, + ViewExtensionKt.animer200(imgLogo, ViewExtensionKt.scaleXAnimation(imgLogo,1f, 0.5f), ViewExtensionKt.scaleYAnimation(imgLogo,1f, 0.5f), ViewExtensionKt.transYAnimation(imgLogo, @@ -194,7 +192,7 @@ public class RegisterActivity extends MINVpnBaseActivity index != 0 } - .forEach { builder.with(it) } - animatorSet.start() -} - -fun View.animer(vararg animations: ObjectAnimator) { +fun View.animer200(vararg animations: ObjectAnimator) { if (animations.isEmpty()) return val animatorSet = AnimatorSet() @@ -164,17 +153,6 @@ fun View.animer(vararg animations: ObjectAnimator) { animatorSet.start() } -fun View.animer2(vararg animations: ObjectAnimator) { - if (animations.isEmpty()) - return - val animatorSet = AnimatorSet() - val builder = animatorSet.setDuration(1000) - .play(animations[0]) - animations.filterIndexed { index, _ -> index != 0 } - .forEach { builder.with(it) } - animatorSet.start() -} - /** * 平移旋转渐变组合动画 */