Skip to content

Commit

Permalink
V2.4.3 修复了右键添加代理服务器的BUG!
Browse files Browse the repository at this point in the history
  • Loading branch information
TheMRLL authored Jan 23, 2021
1 parent 5d5e241 commit 657ab00
Show file tree
Hide file tree
Showing 12 changed files with 508 additions and 24 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@



# winXray 2.4.2 (修复了分享生成二维码报错的BUG) winxray.com
# winXray 2.4.3 ( 修复了右键添加服务器的BUG!) winxray.com
导语:
首先我很尊重winxray的原作者,我只是做了一个CTRL+C CTRL+V 的操作。感谢原作者!(winxray的老人都会看到我,之前有一个winxray的项目,有了60星!但是我看到原作者更新了,我马上就删库了,因为我打心里高兴!而这个库是我第二次上传的加恢复的,所以代码是错乱的!)
远的说:没有Android的开源,也没有现在Android的系统的普及!
Expand Down
11 changes: 7 additions & 4 deletions default.aproj
Original file line number Diff line number Diff line change
@@ -1,25 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<project ver="10" name="winXray" libEmbed="true" icon="\app.ico" ui="win" output="winXray.exe" CompanyName="winXray" FileDescription="xray,xray,trojan,shadowsocks 通用客户端" LegalCopyright="Copyright (C) winXray 2020" ProductName="winXray" InternalName="winXray" FileVersion="2.3.0.11" ProductVersion="2.3.0.11" publishDir="\winXray" dstrip="false" local="false">
<project ver="10" name="winXray" libEmbed="true" icon="\app.ico" ui="win" output="winXray.exe" CompanyName="winXray" FileDescription="xray,xray,trojan,shadowsocks 通用客户端" LegalCopyright="Copyright (C) winXray 2020" ProductName="winXray" InternalName="winXray" FileVersion="2.3.0.16" ProductVersion="2.3.0.16" publishDir="\winXray" dstrip="false" local="false">
<file name="main" path="main.aardio"/>
<folder name="窗体" path="forms" comment="" embed="true" local="false">
<folder name="main" path="forms\main" comment="forms\main" local="false" embed="false">
<file name="json.aardio" path="forms\main\json.aardio" comment="forms\main\json.aardio"/>
<file name="outbound.aardio" path="forms\main\outbound.aardio" comment="forms\main\outbound.aardio"/>
<file name="pac.aardio" path="forms\main\pac.aardio" comment="forms\main\pac.aardio"/>
<file name="xray.aardio" path="forms\main\xray.aardio" comment="forms\main\xray.aardio"/>
<folder name="config" path="forms\main\config" comment="forms\main\config">
<file name="advancedConfig.aardio" path="forms\main\config\advancedConfig.aardio" comment="forms\main\config\advancedConfig.aardio"/>
<file name="jsonConfig.aardio" path="forms\main\config\jsonConfig.aardio" comment="forms\main\config\jsonConfig.aardio"/>
<file name="subscription.aardio" path="forms\main\config\subscription.aardio" comment="forms\main\config\subscription.aardio"/>
</folder>
<folder name="tools" path="forms\main\tools" comment="forms\main\tools" local="false" embed="false">
<folder name="tools" path="forms\main\tools" comment="forms\main\tools">
<file name="github.aardio" path="forms\main\tools\github.aardio" comment="forms\main\tools\github.aardio"/>
<file name="tools.aardio" path="forms\main\tools\tools.aardio" comment="forms\main\tools\tools.aardio"/>
<file name="youtube.aardio" path="forms\main\tools\youtube.aardio" comment="forms\main\tools\youtube.aardio"/>
<file name="qr.aardio" path="forms\main\tools\qr.aardio" comment="forms\main\tools\qr.aardio"/>
<file name="tools.aardio" path="forms\main\tools\tools.aardio" comment="forms\main\tools\tools.aardio"/>
<file name="uuid.aardio" path="forms\main\tools\uuid.aardio" comment="forms\main\tools\uuid.aardio"/>
<file name="youtube.aardio" path="forms\main\tools\youtube.aardio" comment="forms\main\tools\youtube.aardio"/>
</folder>
</folder>
</folder>
<folder name="xrayCore" path="xray-core" comment="" embed="false" local="false">
<file name="config.json" path="xray-core\config.json" comment="xray-core\config.json"/>
<file name="LICENSE" path="xray-core\LICENSE" comment="xray-core\LICENSE"/>
<file name="winXray-default-servers.json" path="xray-core\winXray-default-servers.json" comment="xray-core\winXray-default-servers.json"/>
<file name="xray.exe" path="xray-core\xray.exe" comment="xray-core\xray.exe"/>
Expand Down
16 changes: 8 additions & 8 deletions forms/main/json.aardio
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ winform.btnUpdate.oncommand = function(id,event){
config.proxy.outbounds = cfg : ..table.array();
}
else {
var outbounds = xray.outbounds.importFromString(winform.editOutbounds.text);
var outbounds = v2ray.outbounds.importFromString(winform.editOutbounds.text);
config.proxy.outbounds = outbounds : ..table.array();
winform.editOutbounds.text = web.json.stringify(outbounds,true);
}
Expand Down Expand Up @@ -100,7 +100,7 @@ winform.btnUpdate.oncommand = function(id,event){
}


import xray.outbounds;
import v2ray.outbounds;
winform.editOutbounds.enablePopMenu(function(){
if(tbs.selIndex==1){
var strEditBounds = string.trim(winform.editOutbounds.text);
Expand All @@ -109,7 +109,7 @@ winform.editOutbounds.enablePopMenu(function(){
{ "自剪贴板批量导入vmess、trojan、ss链接、或订阅源";
function(id){

var outbounds = xray.outbounds.importOutboundFromClip();
var outbounds = v2ray.outbounds.importOutboundFromClip();
if(#outbounds){
var json = strEditBounds;
if( (!#json) || ..string.match(json,"%\[\]")){
Expand All @@ -126,7 +126,7 @@ winform.editOutbounds.enablePopMenu(function(){
winform.editOutbounds.text = ..web.json.stringify(cfg,true);
}
else {
var str = xray.outbounds.exportSharedLinks(outbounds);
var str = v2ray.outbounds.exportSharedLinks(outbounds);
if(#strEditBounds){
winform.editOutbounds.text = strEditBounds+ '\r\n' + str;
}
Expand Down Expand Up @@ -182,7 +182,7 @@ winform.editOutbounds.enablePopMenu(function(){

var count = 0;
for(url,v in subscribeUrls){
var outbounds = xray.outbounds.importFromString(url);
var outbounds = v2ray.outbounds.importFromString(url);
if(#outbounds){
for(i=#cfg;1;-1){
var outbound = cfg[i]
Expand Down Expand Up @@ -216,7 +216,7 @@ winform.editOutbounds.enablePopMenu(function(){
return;
}

var str = xray.outbounds.exportSharedLinks(cfg);
var str = v2ray.outbounds.exportSharedLinks(cfg);
if(str){
winform.editOutbounds.text = str;
winform.editOutbounds.modified = true;
Expand All @@ -231,7 +231,7 @@ winform.editOutbounds.enablePopMenu(function(){
return;
}

var str = xray.outbounds.exportSharedLinks(cfg);
var str = v2ray.outbounds.exportSharedLinks(cfg);
if(str){
import crypt;
winform.editOutbounds.text = ..crypt.encodeBin(str);
Expand Down Expand Up @@ -283,7 +283,7 @@ winform.editOutbounds.enablePopMenu(function(){
menu[4] = { "转换为 JSON";
function(id){
import web.json;
var outbounds = xray.outbounds.importFromString(strEditBounds);
var outbounds = v2ray.outbounds.importFromString(strEditBounds);
if(outbounds){
winform.editOutbounds.text = web.json.stringify(outbounds,true);
winform.editOutbounds.modified = true;
Expand Down
Loading

0 comments on commit 657ab00

Please sign in to comment.