chore(winboll): 改造winboll模块适配API 26-30并兼容Java 7
- 调整minSdkVersion从23到26,符合API 26-30适配范围要求 - 修复PatternLockActivity.java中3处lambda表达式, 改为Java 7兼容的匿名内部类形式 - 保持Gradle插件7.2.1、compileSdkVersion 30、 targetSdkVersion 30及Java 11编译配置不变 Modified files: - winboll/build.gradle - winboll/build.properties - winboll/src/main/java/cc/winboll/studio/winboll/activities/PatternLockActivity.java
This commit is contained in:
@@ -65,7 +65,12 @@ public class PatternLockActivity extends BaseWinBoLLActivity {
|
||||
setSupportActionBar(toolbar);
|
||||
getSupportActionBar().setSubtitle(TAG);
|
||||
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
|
||||
toolbar.setNavigationOnClickListener(v -> finish());
|
||||
toolbar.setNavigationOnClickListener(new android.view.View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(android.view.View v) {
|
||||
finish();
|
||||
}
|
||||
});
|
||||
|
||||
mContainer = findViewById(R.id.container);
|
||||
mPatternView = new PatternView(this);
|
||||
@@ -111,12 +116,15 @@ public class PatternLockActivity extends BaseWinBoLLActivity {
|
||||
private void showErrorState() {
|
||||
mIsInErrorState = true;
|
||||
invalidatePattern();
|
||||
mHandler.postDelayed(() -> {
|
||||
mIsInErrorState = false;
|
||||
SharedPreferences prefs = getSharedPreferences(PREFS_NAME, MODE_PRIVATE);
|
||||
prefs.edit().putBoolean(KEY_ERROR_STATE, false).apply();
|
||||
invalidatePattern();
|
||||
if (mPatternView != null) mPatternView.invalidate();
|
||||
mHandler.postDelayed(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
mIsInErrorState = false;
|
||||
SharedPreferences prefs = getSharedPreferences(PREFS_NAME, MODE_PRIVATE);
|
||||
prefs.edit().putBoolean(KEY_ERROR_STATE, false).apply();
|
||||
invalidatePattern();
|
||||
if (mPatternView != null) mPatternView.invalidate();
|
||||
}
|
||||
}, PATTERN_ERROR_DURATION);
|
||||
}
|
||||
|
||||
@@ -138,7 +146,12 @@ public class PatternLockActivity extends BaseWinBoLLActivity {
|
||||
android.app.AlertDialog alertDialog = new android.app.AlertDialog.Builder(this)
|
||||
.setTitle("设置成功")
|
||||
.setMessage("图案密码已设置成功")
|
||||
.setPositiveButton("确定", (dialog, which) -> finish())
|
||||
.setPositiveButton("确定", new android.content.DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(android.content.DialogInterface dialog, int which) {
|
||||
finish();
|
||||
}
|
||||
})
|
||||
.setCancelable(false)
|
||||
.create();
|
||||
alertDialog.show();
|
||||
|
||||
Reference in New Issue
Block a user