Skip to content

Commit 5d94969

Browse files
youlookwhatyoulookwhat
committed
build jdk17 / targetSdkVersion: 34 / gradle-8.0-bin
1 parent bf00685 commit 5d94969

14 files changed

Lines changed: 44 additions & 35 deletions

File tree

‎README.md‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ If you have any questions, please write to [the issue][21] of making you don't u
5353
5454

5555
> 运行环境：
56-
> - targetSdkVersion：31
57-
> - gradle：7.1.0-alpha11；
58-
> - JDK11；
59-
> - Android Studio Bumblebee | 2021.1.1 Canary 11
60-
> - Runtime version: 11.0.11+0-b60-7590822 aarch64
56+
> - targetSdkVersion: 34
57+
> - gradle: gradle-8.0-bin
58+
> - JDK17
59+
> - Android Studio Ladybug | 2024.2.1
60+
> - Runtime version: 21.0.3+-79915917-b509.11 aarch64
6161
> - VM: OpenJDK 64-Bit Server VM by JetBrains s.r.o.
62-
> - macOS 13.0.1
62+
> - macOS 15.3.1
6363
6464

6565
<!--
@@ -80,6 +80,11 @@ If you have any questions, please write to [the issue][21] of making you don't u
8080

8181

8282
### Version
83+
#### V3.8.3（2025-03-31）
84+
- 1、[新增] 新增了桌面快捷方式
85+
- 2、[升级] 升级了gradle、jdk、targetSdkVersion版本
86+
- 3、[优化] 代码优化
87+
8388
#### V3.7.0（2021-11-09）
8489
- 1、[新增] 新增了玩安卓项目分类模块
8590
- 2、[移除] 移除了干货集中营模块
@@ -307,9 +312,9 @@ If you have any questions, please write to [the issue][21] of making you don't u
307312

308313
## About me
309314
- **QQ：** 770413277
310-
- **简书：**[Jinbeen](https://www.jianshu.com/u/e43c6e979831)
311-
- **Blog：**[https://youlookwhat.github.io](https://youlookwhat.github.io)
312315
- **Email：** jingbin127@163.com
316+
- **Blog：**[https://youlookwhat.github.io](https://youlookwhat.github.io)
317+
- **小红书：**[夜有所梦](https://www.xiaohongshu.com/user/profile/59ba28cf5e87e72d410d84c1?xhsshare=CopyLink&appuid=59ba28cf5e87e72d410d84c1&apptime=1733105575&share_id=78c3ca8970d24a3eb9db04b1e4fcc45b)
313318
- **QQ交流群：**[![](https://img.shields.io/badge/%E7%BE%A4%E5%8F%B7-727379132-orange.svg?style=flat-square)](https://shang.qq.com/wpa/qunwpa?idkey=5685061359b0a767674cd831d8261d36b347bde04cc23746cb6570e09ee5c8aa)
314319

315320
## License
@@ -333,7 +338,7 @@ limitations under the License.
333338
[2]:https://www.apache.org/licenses/LICENSE-2.0.html
334339
[3]:https://img.shields.io/badge/API-21%2B-red.svg?style=flat
335340
[4]:https://android-arsenal.com/api?level=21
336-
[30]:https://img.shields.io/badge/release-3.8.1-red.svg
341+
[30]:https://img.shields.io/badge/release-3.8.3-red.svg
337342
[31]:https://github.com/youlookwhat/CloudReader/releases
338343
[32]:https://img.shields.io/badge/PRs-welcome-brightgreen.svg
339344
[33]:https://github.com/youlookwhat/CloudReader/pulls

‎app/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ apply plugin: 'kotlin-android'
33
apply plugin: 'kotlin-android-extensions'
44

55
android {
6-
compileSdkVersion rootProject.ext.compileSdkVersion
7-
buildToolsVersion rootProject.ext.buildToolsVersion
6+
compileSdk rootProject.compileSdkVersion
7+
namespace 'com.example.jingbin.cloudreader'
88
defaultConfig {
99
applicationId "com.example.jingbin.cloudreader"
1010
minSdkVersion rootProject.ext.minSdkVersion
1111
targetSdkVersion rootProject.ext.targetSdkVersion
12-
versionCode 52
13-
versionName "3.8.2"
12+
versionCode 53
13+
versionName "3.8.3"
1414
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1515
renderscriptTargetApi 19
1616
renderscriptSupportModeEnabled true
@@ -65,8 +65,8 @@ android {
6565
// ------------------------↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑-----------------------------
6666

6767
compileOptions {
68-
sourceCompatibility JavaVersion.VERSION_11
69-
targetCompatibility JavaVersion.VERSION_11
68+
sourceCompatibility JavaVersion.VERSION_17
69+
targetCompatibility JavaVersion.VERSION_17
7070
}
7171

7272
// dataBinding 加入

‎app/src/main/java/com/example/jingbin/cloudreader/base/BaseHeaderActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public void setContentView(@LayoutRes int layoutResID) {
123123
// 设置toolbar
124124
setToolBar();
125125

126-
ImageView img = loadingView.findViewById(R.id.img_progress);
126+
ImageView img = loadingView.findViewById(me.jingbin.bymvvm.R.id.img_progress);
127127
// 加载动画
128128
mAnimationDrawable = (AnimationDrawable) img.getDrawable();
129129
// 默认进入页面就开启动画
@@ -219,7 +219,7 @@ protected void setToolBar() {
219219
//去除默认Title显示
220220
actionBar.setDisplayShowTitleEnabled(false);
221221
actionBar.setDisplayHomeAsUpEnabled(true);
222-
actionBar.setHomeAsUpIndicator(R.drawable.icon_back);
222+
actionBar.setHomeAsUpIndicator(me.jingbin.bymvvm.R.drawable.icon_back);
223223
}
224224
bindingTitleView.tbBaseTitle.setOverflowIcon(ContextCompat.getDrawable(this, R.drawable.actionbar_more));
225225
bindingTitleView.tbBaseTitle.setNavigationOnClickListener(v -> {

‎app/src/main/java/com/example/jingbin/cloudreader/ui/gank/child/CustomFragment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public void onChanged(@Nullable GankIoDataBean bean) {
104104
} else {
105105
if (viewModel.getPage() == 1) {
106106
showContentView();
107-
bindingView.xrvAndroid.setStateView(R.layout.layout_loading_empty);
107+
bindingView.xrvAndroid.setStateView(me.jingbin.bymvvm.R.layout.layout_loading_empty);
108108
bindingView.xrvAndroid.setLoadMoreEnabled(false);
109109
adapter.setNewData(null);
110110
} else {

‎app/src/main/java/com/example/jingbin/cloudreader/ui/wan/child/CategoryArticleFragment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ private void initRefreshView() {
9797
bindingView.recyclerView.setRefreshHeaderView(new NeteaseRefreshHeaderView(activity));
9898
bindingView.recyclerView.setLoadingMoreView(new NeteaseLoadMoreView(activity));
9999
bindingView.recyclerView.setAdapter(mAdapter);
100-
LayoutLoadingEmptyBinding emptyBinding = DataBindingUtil.inflate(getLayoutInflater(), R.layout.layout_loading_empty, (ViewGroup) bindingView.recyclerView.getParent(), false);
100+
LayoutLoadingEmptyBinding emptyBinding = DataBindingUtil.inflate(getLayoutInflater(), me.jingbin.bymvvm.R.layout.layout_loading_empty, (ViewGroup) bindingView.recyclerView.getParent(), false);
101101
emptyBinding.tvTipEmpty.setText(String.format("未找到与\"%s\"相关的内容", categoryName));
102102
mAdapter.setPageEmptyView(emptyBinding.getRoot());
103103

‎app/src/main/java/com/example/jingbin/cloudreader/ui/wan/child/MyCoinActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ private void handleShortcuts() {
9797
finish();
9898
return;
9999
}
100-
Toolbar toolbar = findViewById(R.id.tool_bar);
100+
Toolbar toolbar = findViewById(me.jingbin.bymvvm.R.id.tool_bar);
101101
toolbar.setNavigationOnClickListener(v -> BaseTools.handleFinish(this));
102102
}
103103
}

‎app/src/main/java/com/example/jingbin/cloudreader/ui/wan/child/MyShareActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ open class MyShareActivity : BaseActivity<WanCenterViewModel, FragmentWanAndroid
126126
} else {
127127
if (viewModel.mPage == 1) {
128128
if (it != null) {
129-
val bindingEmpty = DataBindingUtil.inflate<LayoutLoadingEmptyBinding>(layoutInflater, R.layout.layout_loading_empty, bindingView.xrvWan.parent as ViewGroup?, false)
129+
val bindingEmpty = DataBindingUtil.inflate<LayoutLoadingEmptyBinding>(layoutInflater, me.jingbin.bymvvm.R.layout.layout_loading_empty, bindingView.xrvWan.parent as ViewGroup?, false)
130130
if (userId != 0) {
131131
bindingEmpty.tvTipEmpty.text = "未找到相关内容"
132132
} else {

‎app/src/main/java/com/example/jingbin/cloudreader/ui/wan/child/PublishActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ class PublishActivity : BaseActivity<PublishViewModel, ActivityPublishBinding>()
152152
private fun handleShortcuts() {
153153
if (!MainActivity.isLaunch) {
154154
App.isShortcuts = true
155-
findViewById<Toolbar>(R.id.tool_bar).setNavigationOnClickListener {
155+
findViewById<Toolbar>(me.jingbin.bymvvm.R.id.tool_bar).setNavigationOnClickListener {
156156
BaseTools.handleFinish(this)
157157
}
158158
}

‎app/src/main/java/com/example/jingbin/cloudreader/ui/wan/child/WanFindFragment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ public void onChanged(@Nullable List<ArticlesBean> list) {
162162
bindingView.recyclerView.setLoadMoreEnabled(false);
163163
bindingView.recyclerView.setRefreshEnabled(false);
164164
if (!isAddFooter) {
165-
bindingView.recyclerView.addFooterView(LayoutInflater.from(activity).inflate(R.layout.layout_loading_empty, (ViewGroup) bindingView.recyclerView, false));
165+
bindingView.recyclerView.addFooterView(LayoutInflater.from(activity).inflate(me.jingbin.bymvvm.R.layout.layout_loading_empty, (ViewGroup) bindingView.recyclerView, false));
166166
isAddFooter = true;
167167
} else {
168168
bindingView.recyclerView.setFootViewEnabled(true);

‎build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
buildscript {
44

55
// kotlin 版本
6-
ext.kotlin_version = '1.3.50'
6+
ext.kotlin_version = '1.6.20'
77

88
repositories {
99
google()
1010
mavenCentral()
1111
}
1212
dependencies {
13-
classpath 'com.android.tools.build:gradle:7.1.0-alpha11'
13+
classpath 'com.android.tools.build:gradle:8.0.2'
1414
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1515
// NOTE: Do not place your application dependencies here; they belong
1616
// in the individual module build.gradle files
@@ -36,9 +36,9 @@ task clean(type: Delete) {
3636
ext {
3737
// Support library and architecture components support minSdk 21 and above.
3838
minSdkVersion = 21
39-
targetSdkVersion = 31
40-
compileSdkVersion = 31
41-
buildToolsVersion = '31.0.0'
39+
targetSdkVersion = 34
40+
compileSdkVersion = 34
41+
buildToolsVersion = '34.0.0'
4242

4343
// App dependencies
4444
supportLibraryVersion = '28.0.0'

0 commit comments

Comments
 (0)