update swap

softcenter/app.json.js

@@ -11,10 +11,10 @@
             "version": "0.2.3"
         }, 
         {
-            "build_date": "2019-01-12_19:22:11", 
+            "build_date": "2019-01-13_21:09:08", 
             "description": "老板，来一斤虚拟内存~", 
             "home_url": "Module_swap.asp", 
-            "md5": "4ea389360d37f7ff9d2d4046b43be59b", 
+            "md5": "3cd29e9307ca957e78c258ad693ae640", 
             "name": "swap", 
             "tar_url": "swap/swap.tar.gz", 
             "title": "虚拟内存", 
@@ -72,7 +72,7 @@
         }
     ], 
     "home_url": "https://raw.githubusercontent.com/paldier/softcenter/master", 
-    "md5": "ad50bc75f8a05449e8d65d03216be3db", 
+    "md5": "55442664d9e425f5ce6a2a0375200c4d", 
     "tar_url": "softcenter/softcenter.tar.gz", 
     "version": "1.1.6"
 }

softcenter/config.json.js

@@ -1,4 +1,4 @@
 {
 "version":"1.1.6",
-"md5":"ad50bc75f8a05449e8d65d03216be3db"
+"md5":"55442664d9e425f5ce6a2a0375200c4d"
 }

softcenter/version

@@ -1,2 +1,2 @@
 1.1.6
-ad50bc75f8a05449e8d65d03216be3db
+55442664d9e425f5ce6a2a0375200c4d

swap/config.json.js

@@ -1,8 +1,8 @@
 {
 "version":"2.2",
-"md5":"4ea389360d37f7ff9d2d4046b43be59b",
+"md5":"3cd29e9307ca957e78c258ad693ae640",
 "home_url":"Module_swap.asp",
 "title":"虚拟内存",
 "description":"老板，来一斤虚拟内存~",
-"build_date":"2019-01-12_19:22:11"
+"build_date":"2019-01-13_21:09:08"
 }

swap/swap/scripts/swap_startup.sh

@@ -11,4 +11,4 @@ then
   swapon $usb_disk/swapswapfile
 else
   echo -e "Swap file not found or $usb_disk is not mounted..."
-fi
+fi

swap/swap/swap/swap.sh

@@ -1,11 +1,10 @@
 #! /bin/sh
 # ====================================变量定义====================================
 # 版本号定义
-version="1.8"
+version="2.2"
 dbus set swap_version="$version"
 # 导入skipd数据
 eval `dbus export swap`
-
 # 引用环境变量等
 source /jffs/softcenter/scripts/base.sh
 
@@ -30,7 +29,7 @@ if [ "$swapon" == "0" ];then
 			swapon "$usb_disk"/swapfile
 			dbus set swap_warnning="4"
 		else
-			if [ "$ext_type" == "ext2" ] || [ "$ext_type" == "ext3" ] || [ "$ext_type" == "ext4" ];then
+			if [ "$ext_type" == "ext2" ] || [ "$ext_type" == "ext3" ] || [ "$ext_type" == "ext4" ] || [ "$ext_type" == "tfat" ] || [ "$ext_type" == "tntfs" ] || [ "$ext_type" == "vfat" ];then
 				dbus set swap_warnning="3"
 			else
 				dbus set swap_warnning="2"

swap/swap/webs/Module_swap.asp

@@ -218,8 +218,8 @@ function reload_Soft_Center(){
 location.href = "/Main_Soft_center.asp";
 }
 function menu_hook(title, tab) {
-	tabtitle[tabtitle.length -1] = new Array("", "speedtest");
-	tablink[tablink.length -1] = new Array("", "Module_speedtest.asp");
+	tabtitle[tabtitle.length -1] = new Array("", "虚拟内存");
+	tablink[tablink.length -1] = new Array("", "Module_swap.asp");
 }
 </script>
 </head>
@@ -275,7 +275,7 @@ function menu_hook(title, tab) {
 										<div class="formfontdesc" style="padding-top:5px;margin-top:0px;float: left;" id="cmdDesc">创建虚拟内存，让路由运行更顺畅</div>
 										<div id="swap_version_status" style="padding-top:5px;margin-left:30px;margin-right:0px;margin-top:0px;float: left;"><i>当前版本：<% dbus_get_def("swap_version", "0"); %></i></div>
 										<div style="padding-top:5px;margin-top:25px;margin-left:-300px;float: left;" id="NoteBox" >
-											<li style="margin-top:5px;">创建虚拟内存，你需要一个空的、已经格式化成ext2|3|4格式的U盘； </li>
+											<li style="margin-top:5px;">创建虚拟内存，你需要一个空的、已经格式化成ext2|3|4|fat|ntfs格式的U盘； </li>
 											<li style="margin-top:5px;">如果你通过其它方式创建了虚拟内存，可以不用使用该工具，或者删除后再使用本工具。</li>
 											<li style="margin-top:5px;">建议使用游戏模式V2，aria2等应用的用户开启虚拟内存！</li>					
 										</div>
@@ -286,7 +286,8 @@ function menu_hook(title, tab) {
 											<tr>
 												<td colspan="2">创建虚拟内存</td>
 											</tr>
-											</thead>											
+											</thead>
+											
 											<tr id="swap_status">
 												<th>
 													<label>状态</label>
@@ -311,8 +312,8 @@ function menu_hook(title, tab) {
 											</tr>
                                     	</table>
 										<div class="apply_gen">
-											<input class="button_gen" onclick="applyRule()" type="button" value="创建swap"/>
-											<input class="button_gen" onclick="unload_swap()" type="button" value="删除swap"/>
+											<button id="cmdBtn" class="button_gen" onclick="applyRule()">创建swap</button>
+											<button id="cmdBtn1" class="button_gen" onclick="unload_swap()">删除swap</button>
 										</div>
 										<div style="margin-left:5px;margin-top:10px;margin-bottom:10px"><img src="/images/New_ui/export/line_export.png"></div>
 										<div class="KoolshareBottom">

swap/version

@@ -1,2 +1,2 @@
 2.2
-4ea389360d37f7ff9d2d4046b43be59b
+3cd29e9307ca957e78c258ad693ae640