Skip to content

Commit 55b78af

Browse files
committed
修复默认皮肤bug,更新README
1 parent a9b2851 commit 55b78af

File tree

5 files changed

+19
-3
lines changed

5 files changed

+19
-3
lines changed

README.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
# raspberry
23

34
[![Springboot](https://img.shields.io/badge/SpringBoot-2.4.1-success)](https://spring.io/projects/spring-boot) ![RaspberryPi](https://img.shields.io/badge/RaspberryPi-4B-important) ![JavaFx](https://img.shields.io/badge/JavaFx-11.0.2-blue) ![Java](https://img.shields.io/badge/OpenJdk-11-red)
@@ -7,3 +8,7 @@
78
> 目前处于开发阶段
89
910
将树莓派开发为小型日用服务器,部署Spring boot后端服务,并使用JavaFx开发控制界面以显示服务器和电脑等运行状态。
11+
12+
<img src="/image/screenshot1.png" alt="screenshot1" style="zoom:80%;" />
13+
14+
<img src="/image/screenshot2.png" alt="screenshot2" style="zoom:80%;" />

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ subprojects {
1919
apply plugin: 'io.spring.dependency-management' /* 依赖管理,用来传递spring的依赖 */
2020

2121
group = 'cn.novisfff'
22-
version = '0.1.1-SNAPSHOT'
22+
version = '0.1.2-SNAPSHOT'
2323
sourceCompatibility = '11'
2424

2525
/* java编译的时候缺省状态下会因为中文字符而失败 */

image/screenshot1.png

313 KB
Loading

image/screenshot2.png

75.1 KB
Loading

raspberry-view/src/main/java/cn/novisfff/raspberry/views/skin/SkinRegister.java

+13-2
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,21 @@ public class SkinRegister {
2323

2424
public SkinRegister(@Value("${javafx.ui.skin}") String skinName) {
2525
this.skinName = skinName.toUpperCase();
26-
SkinEnum skinEnum = SkinEnum.valueOf(skinName);
27-
if (skinEnum == null) {
26+
initSkin();
27+
}
28+
29+
/**
30+
* 初始化皮肤
31+
*/
32+
private void initSkin() {
33+
SkinEnum skinEnum;
34+
try {
35+
skinEnum = SkinEnum.valueOf(skinName);
36+
} catch (Exception e) {
2837
skinEnum = SkinEnum.valueOf(DEFAULT_SKIN);
38+
logger.warn("未找到指定皮肤或未指定皮肤,加载默认皮肤");
2939
}
40+
3041
skin = skinEnum.getSkin();
3142
logger.info("加载" + skinEnum.name() + "皮肤");
3243
}

0 commit comments

Comments
 (0)