Update version 13

README.md

@@ -45,14 +45,16 @@ emitter.on('evaluate', function(s){
 </br>Auto.js`4.1.1 Alpha2 (461)`版本下载: [`Ericwyn/Auto.js/releases@V4.1.1.Alpha2`](https://github.com/Ericwyn/Auto.js/releases/tag/V4.1.1.Alpha2)
 </br>手机请下载`autoJs-V4.1.1.Alpha2-common-armeabi-v7a-debug.apk`
 
-### 清除数据
+## 清除数据
 SkyAutoPlayer在使用过程中会产生本地数据存储，若想全部删除，请使用Auto.js执行以下代码
 ```
 storages.remove("StageGuard:SkyAutoPlayer:Config");
 files.removeDir("/storage/emulated/0/Documents/SkyAutoPlayer/");
 ```
 
-## 上传乐谱
+<br>
+
+# 上传乐谱
 
 你可以fork本仓库，将你要上传的乐谱添加至`shared_sheets`文件夹，并按照以下要求在`shared_sheets.json`添加项目
 ```javascript
@@ -77,8 +79,9 @@ files.removeDir("/storage/emulated/0/Documents/SkyAutoPlayer/");
 修改完成后，申请`Pull Request`，等待merge即可。
 > 请注意：在申请`Pull Request`之前请确保你的SkyAutoPlayerScript仓库已同步至最新，以免出现意外问题！
 
+<br>
 
-## 注意
+# 注意
 ### 请仔细阅读以下使用须知！
 
 1. 未充分测试，若遇到BUG，请酷安私信@StageGuard或新建Issue来反馈BUG！
@@ -87,16 +90,36 @@ files.removeDir("/storage/emulated/0/Documents/SkyAutoPlayer/");
 4. 脚本只能给你一时满足感而不能使你进步，请适当使用，只有真正的技术才是王道，才能使你感到快乐。
 5. 本脚本只是一个"弹奏机"，并不内置曲谱，请在GooglePlay下载[SkyStudio](https://play.google.com/store/apps/details?id=com.Maple.SkyStudio)编谱。
 
-## 贡献
+# 贡献
 欢迎任何人贡献本项目，包括但不限于Pull Request，Issue，New feature request
 
-## 图标来源
+## 贡献者名单(按照首次贡献时间排序)
+
+### SkyAutoPlayerScript
+无
+
+### 共享乐谱
+酷安[@Aex技术总监](http://www.coolapk.com/u/1286879)<br>
+酷安[@夏卡卡卡](http://www.coolapk.com/u/2313452)<br>
+酷安[@深空失忆か](http://www.coolapk.com/u/3005974)<br>
+抖音@子哲啊🌈(zizhe1880689503)<br>
+酷安[@你们很有趣呢](http://www.coolapk.com/u/2416229)<br>
+酷安[@情如风雪无常](http://www.coolapk.com/u/643670)<br>
+酷安[@慕疵](http://www.coolapk.com/u/3286967)<br>
+酷安[@九方辰](http://www.coolapk.com/u/)<br>
+酷安[@社区最弱萌新](http://www.coolapk.com/u/3291313)<br>
+酷安[@九方辰](http://www.coolapk.com/u/634078)<br>
+<br>
+
+# 图标来源
 [Iconfont-阿里巴巴矢量图标库](https://www.iconfont.cn/)
+<br>
 
-## 鸣谢
+# 鸣谢
 [projectXero](https://gitee.com/projectXero) (提供适用于Rhino的`ListAdapter`)
+<br>
 
-## 许可证协议
+# 许可证协议
 ```
 	SkyAutoPlayer (Auto.js script)
 	Copyright © 2020 StageGuard

gitVersion

@@ -1 +1 @@
-c45c75bad3b4ddc25595429bcfc38101865f78e3
+adca548b639a893c4679a68346a8cb1dbdd330e5

shared_sheets.json

@@ -4,9 +4,9 @@
     "file": "不染_enhanced.txt",
     "author": "酷安@九方辰",
     "desc": "酷安酷友<a href=http://www.coolapk.com/u/634078>酷安@九方辰<a/>分享乐谱 不染\n原作者为 抖音用户@子哲啊🌈(zizhe1880689503) \n 完善后续，修改了杂音",
-    "bpm" : 720,
+    "bpm" : 150,
     "suggested_instrument": 1,
-    "pitchLevel": 7
+    "pitchLevel": 0
   }, {
     "name": "Souvevirs d'Enfance\n童年的回忆",
     "file": "Souvevirs_d'Enfance.txt",

source/SkyAutoplayer.js

@@ -244,17 +244,11 @@ sheetplayer = {
 	play: function(listener) {
 		if(this.playing == true) return;
 		this.playing = true;
-		this.thread = threads.start(function() {
-			while(
-				sheetplayer.playing && sheetplayer.currentNote < sheetplayer.noteCount
-			) {
 		
-				if((sheetplayer.currentNote + 1) == sheetplayer.noteCount) {
-					sheetplayer.nextInterval = sheetplayer.notes[sheetplayer.currentNote].time - sheetplayer.notes[sheetplayer.currentNote - 1].time;
-				} else {
-					sheetplayer.nextInterval = sheetplayer.notes[sheetplayer.currentNote + 1].time - sheetplayer.notes[sheetplayer.currentNote].time;
-				}
-				threads.start(function() {
+		this.thread = threads.start(function() {
+			var executor = java.util.concurrent.Executors.newCachedThreadPool();
+			var tragetRunnable = new java.lang.Runnable({
+				run: function() {
 					var gestureMap = [];
 					sheetplayer.notes[sheetplayer.currentNote].keys.map(function(e, i) {
 						gestureMap.push([
@@ -265,7 +259,15 @@ sheetplayer = {
 					});
 					gestureMap = sheetplayer.toSource(gestureMap);
 					eval("gestures(" + gestureMap.slice(1, gestureMap.length - 1) + ");");
+				}
 			});
+			while(sheetplayer.playing && sheetplayer.currentNote < sheetplayer.noteCount) {
+				if((sheetplayer.currentNote + 1) == sheetplayer.noteCount) {
+					sheetplayer.nextInterval = sheetplayer.notes[sheetplayer.currentNote].time - sheetplayer.notes[sheetplayer.currentNote - 1].time;
+				} else {
+					sheetplayer.nextInterval = sheetplayer.notes[sheetplayer.currentNote + 1].time - sheetplayer.notes[sheetplayer.currentNote].time;
+				}
+				executor.execute(tragetRunnable);
 				if(listener != null) listener();
 				java.lang.Thread.sleep(sheetplayer.nextInterval = Math.round(sheetplayer.nextInterval *  sheetplayer.speed));
 				sheetplayer.currentNote ++;
@@ -341,7 +343,7 @@ config = {
 		skipImportLocalSheetTip: false,
 		showFailedSheets: true,
 		tipOnAndroidR: true,
-		currentVersion: 12,
+		currentVersion: 13,
 		gitVersion: "",
 	},
 	
@@ -1918,7 +1920,7 @@ gui = {
 			}
 		});},
 		refreshStatus: function() { gui.run(function(){
-			gui.player_panel._global_status.setText(String(sheetplayer.playing ? (sheetplayer.speed_list[sheetplayer.current_speed_index] + "x: " + Number(sheetplayer.currentNote + 1) + "/" + sheetplayer.noteCount + " -> " + sheetplayer.nextInterval + "ms") : (sheetplayer.thread == null ? "Idle" : "Paused")));
+			gui.player_panel._global_status.setText(String(sheetplayer.speed_list[sheetplayer.current_speed_index] + "x: " + (sheetplayer.playing ? (Number(sheetplayer.currentNote + 1) + "/" + sheetplayer.noteCount + " -> " + sheetplayer.nextInterval + "ms") : (sheetplayer.thread == null ? "Idle" : "Paused"))));
 			gui.player_panel._global_cnote.setText(String(sheetplayer.playing ? (sheetplayer.notes[sheetplayer.currentNote < sheetplayer.noteCount ? sheetplayer.currentNote : sheetplayer.noteCount - 1].keys) : "-"));
 			gui.player_panel._global_seek.setProgress(sheetplayer.currentNote);
 			gui.utils.value_animation("Float", 0, 1, 80 , new android.view.animation.LinearInterpolator(), function(anim) {

update_log.txt

@@ -1,3 +1,9 @@
+版本: 13
+更新时间: 2020.09.05 10:46
+更新内容:
+ * 改善：使用ThreadPool实现线程循环而不是持续创建新的线程
+ * 改善：在Idle和Paused状态时也能显示当前倍速
+
 版本: 12
 更新时间: 2020.09.01 23:12
 更新内容: