diff --git a/package/ntlf9t/luci-app-clash/Makefile b/package/ntlf9t/luci-app-clash/Makefile index 6544be9226..3c05c2f323 100644 --- a/package/ntlf9t/luci-app-clash/Makefile +++ b/package/ntlf9t/luci-app-clash/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-clash -PKG_VERSION:=v1.7.5.6 +PKG_VERSION:=v1.7.5.7 PKG_MAINTAINER:=frainzy1477 include $(INCLUDE_DIR)/package.mk @@ -147,6 +147,8 @@ define Package/$(PKG_NAME)/install $(INSTALL_BIN) ./root/usr/share/clash/clash_real.txt $(1)/usr/share/clash $(INSTALL_BIN) ./root/usr/share/clash/logstatus_check $(1)/usr/share/clash $(INSTALL_BIN) ./root/usr/share/clash/clash.txt $(1)/usr/share/clash + $(INSTALL_BIN) ./root/usr/share/clash/chinaipset.sh $(1)/usr/share/clash + $(INSTALL_BIN) ./root/usr/share/clash/china_ip.txt $(1)/usr/share/clash $(INSTALL_BIN) ./root/usr/share/clash/dashboard/index.html $(1)/etc/clash/dashboard $(INSTALL_BIN) ./root/usr/share/clash/dashboard/main.658aa6a6e3feec8f168b.css $(1)/etc/clash/dashboard diff --git a/package/ntlf9t/luci-app-clash/luasrc/controller/clash.lua b/package/ntlf9t/luci-app-clash/luasrc/controller/clash.lua index 5107ae4aa3..295bd4bd96 100644 --- a/package/ntlf9t/luci-app-clash/luasrc/controller/clash.lua +++ b/package/ntlf9t/luci-app-clash/luasrc/controller/clash.lua @@ -11,7 +11,7 @@ function index() return end - local page = entry({"admin", "services", "clash"},alias("admin", "services", "clash", "overview"), _("Clash"), 5) + local page = entry({"admin", "services", "clash"},alias("admin", "services", "clash", "overview"), _("Clash"), 1) page.dependent = true page.acl_depends = {"luci-app-clash"} diff --git a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/client/client.lua b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/client/client.lua index a703ee462e..85d0af5b8d 100644 --- a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/client/client.lua +++ b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/client/client.lua @@ -33,7 +33,7 @@ o:value("1", translate("Enable")) o.description = translate("Set rules under Setting=>Game Rules, will take effect when client start") -o = s:option(ListValue, "append_rules", translate("Customs Rules")) +o = s:option(ListValue, "append_rules", translate("Append Customs Rules")) o.default = "0" o:value("0", translate("Disable")) o:value("1", translate("Enable")) diff --git a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/dns/advance.lua b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/dns/advance.lua index 3b3537292b..87346d507c 100644 --- a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/dns/advance.lua +++ b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/dns/advance.lua @@ -25,11 +25,6 @@ y:value("0", translate("disabled")) y:value("1", translate("enabled")) y.description = translate("Set to enable or disable dns cache") -y = s:option(ListValue, "enable_udp", translate("Enable UDP")) -y:value("0", translate("disabled")) -y:value("1", translate("enabled")) -y.description = translate("Enable udp traffic ,make sure your server support udp") - y = s:option(ListValue, "access_control", translate("Access Control")) y:value("0", translate("disabled")) y:value("1", translate("Whitelist IPs")) diff --git a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/update/update.lua b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/update/update.lua index 594d28f53d..9490b57288 100644 --- a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/update/update.lua +++ b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/update/update.lua @@ -106,9 +106,9 @@ s = k:section(TypedSection, "clash",translate("Download Online")) s.anonymous = true o = s:option(ListValue, "dcore", translate("Core Type")) o.default = "clashcore" -o:value("1", translate("Clash")) -o:value("3", translate("Clash(ctun)")) -o:value("4", translate("Clash(premium)")) +o:value("1", translate("clash")) +o:value("3", translate("clash(ctun)")) +o:value("4", translate("clash(premium)")) diff --git a/package/ntlf9t/luci-app-clash/luasrc/view/clash/status.htm b/package/ntlf9t/luci-app-clash/luasrc/view/clash/status.htm index 8dae230427..6dae21622c 100644 --- a/package/ntlf9t/luci-app-clash/luasrc/view/clash/status.htm +++ b/package/ntlf9t/luci-app-clash/luasrc/view/clash/status.htm @@ -10,15 +10,254 @@ +
-

Clash for OpenWRT

<%:Rule-based Custom Proxy Client%>

+
+ +
+ +
+
+
+
+ +
+
+
+

<%:Baidu%>

<%:Collecting data...%>

+
+
+
+ + +
+
+
+
+ +
+
+
+

<%:Google%>

<%:Collecting data...%>

+
+
+
+ +
+
+
+
+ +
+
+
+

<%:Youtube%>

<%:Collecting data...%>

+
+
+
+ +
+
+
+
+ +
+
+
+

<%:GitHub%>

<%:Collecting data...%>

+
+
+
+ +
+
+ +<% if luci.i18n.context.lang == "zh-cn" then %> + +
+ +
+ +
+
+
+
+ +
+
+
+

<%:Global IP%>

<%:Checking...%>

+
+
+
+ + +
+
+
+
+ +
+
+
+

<%:Domestic IP%>

<%:Checking...%>

+
+
+
+ +
+
+ +<%end%> + +<% if luci.i18n.context.lang == "en" or luci.i18n.context.lang == "auto" then %> +
+ +
+ +
+
+
+
+ +
+
+
+

<%:Global IP%>

<%:Checking...%>

+
+
+
+ + +
+
+
+
+ +
+
+
+

<%:Domestic IP%>

<%:Checking...%>

+
+
+
+ +
+
+<%end%> + +
@@ -41,121 +280,163 @@ -
-
<%:Clash Client%><%:Collecting data...%>
- - -
<%:Global IP%>  : <%:Checking...%> <%:Google%> : <%:Collecting data...%><%:Youtube%>  : <%:Collecting data...%><%:Github%>  : <%:Collecting data...%>
<%:Domestic IP%>  : <%:Checking...%><%:Baidu%> : <%:Collecting data...%><%:Music.163%> : <%:Collecting data...%><%:iQiyi%> : <%:Collecting data...%>
-
-