Skip to content

Commit c7b92f3

Browse files
getActivitygetActivity
committed
适配 Android 11
1 parent eefd143 commit c7b92f3

File tree

9 files changed

+62
-49
lines changed

9 files changed

+62
-49
lines changed

‎README.md‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88

99
#### 集成步骤
1010

11-
dependencies {
12-
debugImplementation 'com.hjq:logcat:8.2'
13-
}
11+
```groovy
12+
dependencies {
13+
debugImplementation 'com.hjq:logcat:8.6'
14+
}
15+
```
1416

1517
#### 使用方式
1618

@@ -40,12 +42,14 @@
4042

4143
> 在项目的 `values/color.xml` 中加入你喜欢的配色，例如
4244
43-
<color name="logcat_level_verbose_color">#FFBBBBBB</color>
44-
<color name="logcat_level_debug_color">#FF33B5E5</color>
45-
<color name="logcat_level_info_color">#FF99CC00</color>
46-
<color name="logcat_level_warn_color">#FFFFBB33</color>
47-
<color name="logcat_level_error_color">#FFFF4444</color>
48-
<color name="logcat_level_other_color">#FFFFFFFF</color>
45+
```xml
46+
<color name="logcat_level_verbose_color">#FFBBBBBB</color>
47+
<color name="logcat_level_debug_color">#FF33B5E5</color>
48+
<color name="logcat_level_info_color">#FF99CC00</color>
49+
<color name="logcat_level_warn_color">#FFFFBB33</color>
50+
<color name="logcat_level_error_color">#FFFF4444</color>
51+
<color name="logcat_level_other_color">#FFFFFFFF</color>
52+
```
4953

5054
#### 框架亮点
5155

@@ -67,7 +71,7 @@
6771

6872
#### 作者的其他开源项目
6973

70-
* 架构工程：[AndroidProject](https://github.com/getActivity/AndroidProject)
74+
* 安卓架构：[AndroidProject](https://github.com/getActivity/AndroidProject)
7175

7276
* 网络框架：[EasyHttp](https://github.com/getActivity/EasyHttp)
7377

‎app/build.gradle‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 28
4+
compileSdkVersion 30
55

66
defaultConfig {
77
applicationId "com.hjq.logcat.demo"
88
minSdkVersion 14
9-
targetSdkVersion 28
10-
versionCode 82
11-
versionName "8.2"
9+
targetSdkVersion 30
10+
versionCode 86
11+
versionName "8.6"
1212
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1313
}
1414
buildTypes {
@@ -23,11 +23,12 @@ dependencies {
2323
implementation fileTree(include: ['*.jar'], dir: 'libs')
2424
debugImplementation project(':library')
2525

26-
implementation 'com.android.support:appcompat-v7:28.0.0'
27-
implementation 'com.android.support:design:28.0.0'
26+
// 谷歌兼容库：https://developer.android.google.cn/jetpack/androidx/releases/appcompat?hl=zh-cn
27+
implementation 'androidx.appcompat:appcompat:1.3.0-alpha02'
28+
implementation 'com.google.android.material:material:1.3.0-alpha02'
2829

2930
// 标题栏：https://github.com/getActivity/TitleBar
30-
implementation 'com.hjq:titlebar:6.5'
31+
implementation 'com.hjq:titlebar:8.0'
3132
// 内存泄漏捕捉：https://github.com/square/leakcanary
32-
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.4'
33+
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.5'
3334
}

‎app/src/main/java/com/hjq/logcat/demo/MainActivity.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
import android.content.Intent;
44
import android.net.Uri;
55
import android.os.Bundle;
6-
import android.support.v7.app.AppCompatActivity;
76
import android.view.View;
87
import android.view.ViewGroup;
98
import android.webkit.WebChromeClient;
109
import android.webkit.WebView;
1110
import android.webkit.WebViewClient;
1211

12+
import androidx.appcompat.app.AppCompatActivity;
13+
1314
import com.hjq.bar.OnTitleBarListener;
1415
import com.hjq.bar.TitleBar;
1516

@@ -62,21 +63,21 @@ public void onRightClick(View v) {
6263

6364
@Override
6465
public void onResume() {
66+
super.onResume();
6567
mWebView.onResume();
6668
mWebView.resumeTimers();
67-
super.onResume();
6869
}
6970

7071
@Override
7172
public void onPause() {
73+
super.onPause();
7274
mWebView.onPause();
7375
mWebView.pauseTimers();
74-
super.onPause();
7576
}
7677

7778
@Override
7879
protected void onDestroy() {
79-
((ViewGroup) mWebView.getParent()).removeView(mWebView);
80+
super.onDestroy();
8081
//清除历史记录
8182
mWebView.clearHistory();
8283
//停止加载
@@ -89,6 +90,6 @@ protected void onDestroy() {
8990
mWebView.removeAllViews();
9091
//销毁此的WebView的内部状态
9192
mWebView.destroy();
92-
super.onDestroy();
93+
((ViewGroup) mWebView.getParent()).removeView(mWebView);
9394
}
9495
}

‎library/build.gradle‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,28 @@ android {
55

66
resourcePrefix "logcat_"
77

8-
compileSdkVersion 26
8+
compileSdkVersion 30
99

1010
defaultConfig {
1111
minSdkVersion 14
12-
targetSdkVersion 26
13-
versionCode 82
14-
versionName "8.2"
12+
targetSdkVersion 30
13+
versionCode 86
14+
versionName "8.6"
1515
}
1616
}
1717

1818
dependencies {
1919
// 权限请求框架：https://github.com/getActivity/XXPermissions
20-
implementation 'com.hjq:xxpermissions:6.5'
20+
implementation 'com.hjq:xxpermissions:8.8'
2121
// 悬浮窗框架：https://github.com/getActivity/XToast
22-
implementation 'com.hjq:xtoast:5.5'
22+
implementation 'com.hjq:xtoast:6.0'
2323
}
2424

2525
publish {
2626
userOrg = 'getactivity'
2727
groupId = 'com.hjq'
2828
artifactId = 'logcat'
29-
version = '8.2'
29+
version = '8.6'
3030
description = 'This is to help developers quickly see the logging framework they want'
3131
website = "https://github.com/getActivity/Logcat"
3232
}

‎library/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
package="com.hjq.logcat">
33

44
<!-- 外部存储读写权限 -->
5+
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
56
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
67
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
78

‎library/src/main/java/com/hjq/logcat/ChooseWindow.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ final class ChooseWindow extends XToast implements AdapterView.OnItemClickListen
2828
super(activity);
2929
setView(R.layout.logcat_window_choose);
3030
setGravity(Gravity.CENTER);
31-
removeWindowFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE);
31+
clearWindowFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE);
3232

3333
ListView listView = (ListView) findViewById(R.id.lv_choose_list);
3434
mAdapter = new ChooseAdapter();

‎library/src/main/java/com/hjq/logcat/FloatingLifecycle.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
2121
if (activity instanceof LogcatActivity) {
2222
return;
2323
}
24-
new FloatingWindow(activity).show();
24+
new FloatingWindow(activity)
25+
.show();
2526
}
2627

2728
@Override

‎library/src/main/java/com/hjq/logcat/LogcatActivity.java‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -179,17 +179,19 @@ public void onSelected(final int location) {
179179
break;
180180
case 3:
181181
XXPermissions.with(LogcatActivity.this)
182-
.permission(Permission.Group.STORAGE)
182+
.permission(Permission.MANAGE_EXTERNAL_STORAGE)
183183
.request(new OnPermission() {
184184
@Override
185-
public void hasPermission(List<String> granted, boolean isAll) {
186-
addFilter(mAdapter.getItem(position).getTag());
185+
public void hasPermission(List<String> granted, boolean all) {
186+
if (all) {
187+
addFilter(mAdapter.getItem(position).getTag());
188+
}
187189
}
188190

189191
@Override
190-
public void noPermission(List<String> denied, boolean quick) {
191-
if (quick) {
192-
XXPermissions.startPermissionActivity(LogcatActivity.this);
192+
public void noPermission(List<String> denied, boolean never) {
193+
if (never) {
194+
XXPermissions.startPermissionActivity(LogcatActivity.this, denied);
193195
toast("请授予存储权限之后再操作");
194196
}
195197
}
@@ -224,17 +226,19 @@ public boolean onLongClick(View v) {
224226
public void onClick(View v) {
225227
if (v == mSaveView) {
226228
XXPermissions.with(this)
227-
.permission(Permission.Group.STORAGE)
229+
.permission(Permission.MANAGE_EXTERNAL_STORAGE)
228230
.request(new OnPermission() {
229231
@Override
230-
public void hasPermission(List<String> granted, boolean isAll) {
231-
saveLogToFile();
232+
public void hasPermission(List<String> granted, boolean all) {
233+
if (all) {
234+
saveLogToFile();
235+
}
232236
}
233237

234238
@Override
235-
public void noPermission(List<String> denied, boolean quick) {
236-
if (quick) {
237-
XXPermissions.startPermissionActivity(LogcatActivity.this);
239+
public void noPermission(List<String> denied, boolean never) {
240+
if (never) {
241+
XXPermissions.startPermissionActivity(LogcatActivity.this, denied);
238242
toast("请授予存储权限之后再操作");
239243
}
240244
}
@@ -385,7 +389,7 @@ public void run() {
385389
*/
386390
private void initFilter() {
387391
File file = new File(LOG_DIRECTORY, LOGCAT_TAG_FILTER_FILE);
388-
if (file.exists() && file.isFile() && XXPermissions.hasPermission(this, Permission.Group.STORAGE)) {
392+
if (file.exists() && file.isFile() && XXPermissions.hasPermission(this, Permission.MANAGE_EXTERNAL_STORAGE)) {
389393
BufferedReader reader = null;
390394
try {
391395
reader = new BufferedReader(new InputStreamReader(new FileInputStream(file),
@@ -514,19 +518,19 @@ public void onBackPressed() {
514518

515519
@Override
516520
protected void onResume() {
517-
LogcatManager.resume();
518521
super.onResume();
522+
LogcatManager.resume();
519523
}
520524

521525
@Override
522526
protected void onPause() {
523-
LogcatManager.pause();
524527
super.onPause();
528+
LogcatManager.pause();
525529
}
526530

527531
@Override
528532
protected void onDestroy() {
529-
LogcatManager.destroy();
530533
super.onDestroy();
534+
LogcatManager.destroy();
531535
}
532536
}

‎library/src/main/res/layout/logcat_window_logcat.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,8 @@
138138
android:layout_gravity="end|bottom"
139139
android:layout_margin="20dp"
140140
android:background="@drawable/logcat_bg_log_roll"
141-
android:src="@drawable/logcat_ic_down" />
141+
android:src="@drawable/logcat_ic_down"
142+
android:translationZ="10dp" />
142143
</FrameLayout>
143144

144145
</LinearLayout>

0 commit comments

Comments
 (0)