Skip to content

Commit de43085

Browse files
cjyyxcjyyx
committed
进行一些优化
1 parent 9d3073a commit de43085

8 files changed

+38
-55
lines changed

‎.idea/deploymentTargetDropDown.xml

-17
This file was deleted.

‎app/release/app-release.apk

168 Bytes
Binary file not shown.

‎app/src/main/AndroidManifest.xml

+3-5
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,26 @@
99
<application
1010
android:allowBackup="true"
1111
android:dataExtractionRules="@xml/data_extraction_rules"
12+
android:excludeFromRecents="true"
1213
android:fullBackupContent="@xml/backup_rules"
1314
android:icon="@mipmap/ic_launcher"
1415
android:label="@string/app_name"
1516
android:roundIcon="@mipmap/ic_launcher"
1617
android:supportsRtl="true"
17-
android:excludeFromRecents="true"
1818
android:theme="@style/Theme.ScreenFilter">
1919

2020
<service
2121
android:name=".AppAccessibilityService"
2222
android:exported="true"
2323
android:label="@string/app_name"
24-
android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"
2524
android:launchMode="singleTask"
26-
tools:ignore="WrongManifestParent">
25+
android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
2726
<intent-filter>
2827
<category android:name="android.intent.category.LAUNCHER" />
2928

3029
<action android:name="android.intent.action.BOOT_COMPLETED" />
3130
<action android:name="android.accessibilityservice.AccessibilityService" />
3231
</intent-filter>
33-
3432
<meta-data
3533
android:name="android.accessibilityservice"
3634
android:resource="@xml/app_accessibility" />
@@ -39,7 +37,7 @@
3937
<activity
4038
android:name=".MainActivity"
4139
android:exported="true"
42-
android:launchMode="singleTask" >
40+
android:launchMode="singleTask">
4341
<intent-filter>
4442
<action android:name="android.intent.action.MAIN" />
4543

‎app/src/main/java/com/cjyyxn/screenfilter/AppConfig.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class AppConfig {
2020
public static final float BRIGHTNESS_ADJUSTMENT_TOLERANCE =0.1f;
2121

2222
/**
23-
* 用户调节系数，与亮度调节算法有关，取值 [0,1]
23+
* 亮度调节系数，与亮度调节算法有关，取值 [0,1]
2424
*/
25-
public static final float USER_ADJUSTMENT_FACTOR = 0.8f;
25+
public static final float BRIGHTNESS_ADJUSTMENT_FACTOR = 0.8f;
2626
}

‎app/src/main/java/com/cjyyxn/screenfilter/BrightnessManager.java

+9-5
Original file line numberDiff line numberDiff line change
@@ -200,19 +200,22 @@ private void brightnessManageLoop() {
200200
float userb = GlobalStatus.getSystemBrightness();
201201
if ((userb - bset) > AppConfig.BRIGHTNESS_ADJUSTMENT_TOLERANCE) {
202202
// 用户调节亮度过高
203-
keepenBrightness = bset + AppConfig.BRIGHTNESS_ADJUSTMENT_TOLERANCE * AppConfig.USER_ADJUSTMENT_FACTOR;
203+
keepenBrightness = bset + AppConfig.BRIGHTNESS_ADJUSTMENT_TOLERANCE * AppConfig.BRIGHTNESS_ADJUSTMENT_FACTOR;
204204
} else if ((bset - userb) > AppConfig.BRIGHTNESS_ADJUSTMENT_TOLERANCE) {
205205
// 用户调节亮度过低
206-
keepenBrightness = bset - AppConfig.BRIGHTNESS_ADJUSTMENT_TOLERANCE * AppConfig.USER_ADJUSTMENT_FACTOR;
206+
keepenBrightness = bset - AppConfig.BRIGHTNESS_ADJUSTMENT_TOLERANCE * AppConfig.BRIGHTNESS_ADJUSTMENT_FACTOR;
207207
} else {
208208
// 用户调节亮度处于容差之内
209209
keepenBrightness = userb;
210210
}
211211
} else {
212212
// 用来稳定亮度
213-
if (Math.abs(bset - keepenBrightness) > AppConfig.BRIGHTNESS_ADJUSTMENT_TOLERANCE) {
214-
// 环境光照变化超出容差
215-
keepenBrightness = bset;
213+
if ((bset - keepenBrightness) > AppConfig.BRIGHTNESS_ADJUSTMENT_TOLERANCE) {
214+
// 环境光照高于容差
215+
keepenBrightness = bset - AppConfig.BRIGHTNESS_ADJUSTMENT_TOLERANCE * AppConfig.BRIGHTNESS_ADJUSTMENT_FACTOR / 2f;
216+
} else if ((keepenBrightness - bset) > AppConfig.BRIGHTNESS_ADJUSTMENT_TOLERANCE) {
217+
// 环境光照低于于容差
218+
keepenBrightness = bset + AppConfig.BRIGHTNESS_ADJUSTMENT_TOLERANCE * AppConfig.BRIGHTNESS_ADJUSTMENT_FACTOR / 2f;
216219
}
217220
}
218221

@@ -285,6 +288,7 @@ private void closeSystemAutoBrightnessMode() {
285288
Log.d("ccjy", "关闭自动亮度失败");
286289
}
287290
GlobalStatus.openFilter();
291+
GlobalStatus.setBrightness(calculateBrightnessByLight(GlobalStatus.light));
288292
}
289293

290294
/**

‎app/src/main/java/com/cjyyxn/screenfilter/GlobalStatus.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -161,11 +161,12 @@ public static void loadDefaultConfig() {
161161
if (brightnessManager != null) {
162162
brightnessManager.clearBrightnessPointList();
163163
addBrightnessPoint(0, 0f);
164-
addBrightnessPoint(10, 0.1f);
165-
addBrightnessPoint(30, 0.28f);
166-
addBrightnessPoint(42, 0.34f);
167-
addBrightnessPoint(60, 0.4f);
168-
addBrightnessPoint(250, 0.6f);
164+
addBrightnessPoint(10, 0.05f);
165+
addBrightnessPoint(30, 0.16f);
166+
addBrightnessPoint(60, 0.25f);
167+
addBrightnessPoint(100, 0.36f);
168+
addBrightnessPoint(200, 0.5f);
169+
addBrightnessPoint(500, 0.8f);
169170
addBrightnessPoint(1000, 1f);
170171
addBrightnessPoint(GlobalStatus.getHighLightThreshold(), 1f);
171172
}

‎app/src/main/java/com/cjyyxn/screenfilter/MainActivity.java

-10
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,6 @@ protected void onCreate(Bundle savedInstanceState) {
2525
public void onResume() {
2626
super.onResume();
2727

28-
// Log.d("ccjy", "开始 isAccessibility 检查");
29-
30-
// // 可能GlobalStatus加载需要时间，只能这样判断 isAccessibility
31-
// for (int i = 0; i < 10000; i++) {
32-
// if (GlobalStatus.isAccessibility()) {
33-
// Log.d("ccjy", "isAccessibility = true, i = " + i);
34-
// break;
35-
// }
36-
// }
37-
3828
if (!GlobalStatus.isReady()){
3929
Toast.makeText(this, "未设置必须的权限", Toast.LENGTH_SHORT).show();
4030
startActivity(new Intent(this, PreparatoryActivity.class));

‎app/src/main/java/com/cjyyxn/screenfilter/ui/PreparatoryActivity.java

+18-11
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@ protected void onCreate(Bundle savedInstanceState) {
3131

3232
pbt0.setOnClickListener(view -> onButton0());
3333
pbt1.setOnClickListener(view -> onButton1());
34-
3534
pbt2.setOnClickListener(view -> onButton2());
36-
3735
pbt3.setOnClickListener(view -> onButton3());
3836

3937
// Timer timer = new Timer();
@@ -66,15 +64,24 @@ private void onButton0() {
6664
}
6765

6866
private void onButton1() {
69-
70-
if (GlobalStatus.isReady()) {
71-
Toast.makeText(this, "系统设置权限已开启", Toast.LENGTH_SHORT).show();
72-
} else {
73-
Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
74-
Uri uri = Uri.fromParts("package", "com.cjyyxn.screenfilter", null);
75-
intent.setData(uri);
67+
if (!Settings.System.canWrite(this)) {
68+
// 如果权限尚未授予，则请求权限
69+
Intent intent = new Intent(Settings.ACTION_MANAGE_WRITE_SETTINGS);
70+
intent.setData(Uri.parse("package:" + getPackageName()));
7671
startActivity(intent);
72+
} else {
73+
// 如果权限已经授予，则执行需要权限的操作
74+
Toast.makeText(this, "系统设置权限已开启", Toast.LENGTH_SHORT).show();
7775
}
76+
77+
// if (GlobalStatus.isReady()) {
78+
//
79+
// } else {
80+
// Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
81+
// Uri uri = Uri.fromParts("package", "com.cjyyxn.screenfilter", null);
82+
// intent.setData(uri);
83+
// startActivity(intent);
84+
// }
7885
}
7986

8087
private void onButton2() {
@@ -87,8 +94,8 @@ private void onButton2() {
8794

8895
private void onButton3() {
8996
Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
90-
Uri uri = Uri.fromParts("package", "com.cjyyxn.screenfilter", null);
91-
intent.setData(uri);
97+
// Uri uri = Uri.fromParts("package", "com.cjyyxn.screenfilter", null);
98+
intent.setData(Uri.parse("package:" + getPackageName()));
9299
startActivity(intent);
93100
}
94101
}

0 commit comments

Comments
 (0)