diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ec56035..c5fe1da 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -97,7 +97,7 @@ android:name=".activity.more.MoreAppActivity" android:launchMode="singleTask" /> diff --git a/app/src/main/java/com/uiui/zyos/activity/ScreenLockActivity.java b/app/src/main/java/com/uiui/zyos/activity/ExitActivity.java similarity index 93% rename from app/src/main/java/com/uiui/zyos/activity/ScreenLockActivity.java rename to app/src/main/java/com/uiui/zyos/activity/ExitActivity.java index 9465dfb..fcd655e 100644 --- a/app/src/main/java/com/uiui/zyos/activity/ScreenLockActivity.java +++ b/app/src/main/java/com/uiui/zyos/activity/ExitActivity.java @@ -27,9 +27,9 @@ import com.uiui.zyos.utils.ApkUtils; import butterknife.BindView; import butterknife.ButterKnife; -public class ScreenLockActivity extends BaseActivity { +public class ExitActivity extends BaseActivity { - private static final String TAG = ScreenLockActivity.class.getSimpleName(); + private static final String TAG = ExitActivity.class.getSimpleName(); @BindView(R.id.bt_0) TextView bt0; @@ -84,13 +84,13 @@ public class ScreenLockActivity extends BaseActivity { @Override public int getLayoutId() { - return R.layout.activity_screen_lock; + return R.layout.activity_exit; } @Override public void initView() { ButterKnife.bind(this); - InputMethodManager imm = (InputMethodManager) ScreenLockActivity.this.getSystemService(Context.INPUT_METHOD_SERVICE); + InputMethodManager imm = (InputMethodManager) ExitActivity.this.getSystemService(Context.INPUT_METHOD_SERVICE); imm.hideSoftInputFromWindow(codeView.getWindowToken(), 0); codeView.getEditText().setOnClickListener(new View.OnClickListener() { @Override @@ -173,6 +173,15 @@ public class ScreenLockActivity extends BaseActivity { } + @Override + protected void onDestroy() { + super.onDestroy(); + if (soundPool!=null) { + soundPool.release(); + soundPool = null; + } + } + private void add(VerificationCodeView codeView, String text) { Log.e(TAG, "add: text = " + text); String oldText = codeView.getEditText().getText().toString(); diff --git a/app/src/main/java/com/uiui/zyos/fragment/user/UserFragment.java b/app/src/main/java/com/uiui/zyos/fragment/user/UserFragment.java index cb2d168..010712b 100644 --- a/app/src/main/java/com/uiui/zyos/fragment/user/UserFragment.java +++ b/app/src/main/java/com/uiui/zyos/fragment/user/UserFragment.java @@ -28,7 +28,7 @@ import com.bumptech.glide.Glide; import com.shehuan.niv.NiceImageView; import com.tencent.mmkv.MMKV; import com.uiui.zyos.R; -import com.uiui.zyos.activity.ScreenLockActivity; +import com.uiui.zyos.activity.ExitActivity; import com.uiui.zyos.activity.more.MoreAppActivity; import com.uiui.zyos.adapter.AppAdapter; import com.uiui.zyos.base.BaseFragment; @@ -36,14 +36,12 @@ import com.uiui.zyos.bean.BaseResponse; import com.uiui.zyos.bean.DesktopIcon; import com.uiui.zyos.bean.SnInfo; import com.uiui.zyos.config.CommonConfig; -import com.uiui.zyos.dialog.PasswordDialog; import com.uiui.zyos.dialog.SingleDialog; import com.uiui.zyos.jxw.JxwPackageConfig; import com.uiui.zyos.manager.RemoteManager; import com.uiui.zyos.utils.ApkUtils; import com.uiui.zyos.utils.OpenApkUtils; import com.uiui.zyos.utils.TimeUtils; -import com.uiui.zyos.utils.ToastUtil; import com.uiui.zyos.view.RecyclerViewSpacesItemDecoration; import java.util.ArrayList; @@ -314,7 +312,7 @@ public class UserFragment extends BaseFragment implements UserContact.UserView { // passwordDialog.getWindow().setGravity(Gravity.CENTER); // passwordDialog.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM); // passwordDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE); - startActivity(new Intent(mContext, ScreenLockActivity.class)); + startActivity(new Intent(mContext, ExitActivity.class)); } private void exitDesktop() { diff --git a/app/src/main/res/layout-land/activity_screen_lock.xml b/app/src/main/res/layout-land/activity_exit.xml similarity index 100% rename from app/src/main/res/layout-land/activity_screen_lock.xml rename to app/src/main/res/layout-land/activity_exit.xml diff --git a/app/src/main/res/layout-port/activity_screen_lock.xml b/app/src/main/res/layout-port/activity_exit.xml similarity index 100% rename from app/src/main/res/layout-port/activity_screen_lock.xml rename to app/src/main/res/layout-port/activity_exit.xml