alroyso 2 rokov pred
rodič
commit
b6c79ca3e4

BIN
SProxy/MainDlg.cpp


BIN
SProxy/MainDlg.h


+ 5 - 7
SProxy/StabtypeControl.cpp

@@ -36,7 +36,7 @@ namespace SOUI
 	{
 
 	
-
+		//font = \"adding:12,bold:1\"\
 		
 		SOUI::SWindow * win = FindChildByName2<SOUI::SWindow>(L"con");
 		if (win)
@@ -49,9 +49,8 @@ namespace SOUI
 				strXmlName.Format(L"<radio2 id=\"%d\" \
 				size=\"0, -1\" \
 				cursor=\"hand\" \
-			    colorText=\"#D8D8D844\"\
-				colorTextPush=\"#D8D8D8\"\
-				font=\"adding:12,bold:1\"\
+			    colorText=\"#ffffff\"\
+				colorTextPush=\"#ffffff\"\
 				align=\"center\"\
 				cursor=\"hand\"\
 				extend=\"0,0,0,0\" \
@@ -68,9 +67,8 @@ namespace SOUI
 				strXmlName.Format(L"<radio2 id=\"%d\" \
 				size=\"0, -1\" \
 				cursor=\"hand\" \
-			    colorText=\"#D8D8D844\"\
-				colorTextPush=\"#D8D8D8\"\
-				font=\"adding:12,bold:1\"\
+			    colorText=\"#ffffff\"\
+				colorTextPush=\"#ffffff\"\
 				align=\"center\"\
 				cursor=\"hand\"\
 				extend=\"5,0,0,0\" \

BIN
SProxy/res/resource.h


BIN
SProxy/res/soui_res.rc2


BIN
SProxy/uires/image/bg-login.png


BIN
SProxy/uires/image/bg-user.png


+ 6 - 6
SProxy/uires/xml/dlg_login.xml

@@ -13,7 +13,7 @@ appWnd="1"
 
                 <img skin="skin_user"/>
 
-                <edit name="edit_username" size="247,35" extend="20,0,0,0" colorText="#ffffff"  cueText="邮箱"/>
+                <edit name="edit_username" size="247,35" extend="20,0,0,0" colorText="#000000"  cueText="邮箱"/>
 
             </window>
 
@@ -26,7 +26,7 @@ appWnd="1"
 
                 <img skin="skin_password"/>
 
-                <edit name="edit_password" size="247,35" extend="20,0,0,0" colorText="#ffffff"  cueText="密码"/>
+                <edit name="edit_password" size="247,35" extend="20,0,0,0" colorText="#000000"  cueText="密码"/>
 
             </window>
 
@@ -34,8 +34,8 @@ appWnd="1"
             <img skin="skin_line" extend="60,5,44,0"/>
 
             <window size="-2,-1" layout="hbox"   gravity="center"  extend="0,50,0,0">
-                <imgbtn name="onlogin" skin="skin_btnselection" size="100,31" colorText="#ffffff" font=""  extend="40,0,0,0">登录</imgbtn>
-                <imgbtn name="onReg" skin="skin_btnselection"  size="100,31" colorText="#ffffff" font=""  extend="140,0,0,0">注册</imgbtn>
+                <imgbtn name="onlogin" skin="png_button" size="100,31" colorText="#000000" font=""  extend="40,0,0,0">登录</imgbtn>
+                <imgbtn name="onReg" skin="png_button"  size="100,31" colorText="#000000" font=""  extend="140,0,0,0">注册</imgbtn>
             </window>
            
 
@@ -44,13 +44,13 @@ appWnd="1"
 
                   <!-- <link name="reglink"   colorText="#A79BB8" font="adding:12,bold:0"  extend="50,0,0,0">注册新用户</link> -->
 
-                  <link href="https:/user.viptwo.xyz" name="resetlink"  colorText="#A79BB8" font=""   extend="320,0,0,0">忘记密码</link>
+                  <link href="https:/user.viptwo.xyz" name="resetlink"  colorText="#000000" font=""   extend="320,0,0,0">忘记密码</link>
 
             </window>
           
 
           <window size="-2,35" layout="hbox"   gravity="left"  extend="10,100,0,0">
-            <text name="regstatus" colorText="#ffffff" font="adding:5,bold:1" extend="10,0,0,0" >登录状态</text>
+            <text name="regstatus" colorText="#000000" font="adding:5,bold:1" extend="10,0,0,0" >登录状态</text>
           </window>
             <!-- <text colorText="#ffffff88" font="adding:5,bold:1" extend="10,25,0,0" >登录服务器选择</text> -->
 

+ 2 - 2
SProxy/uires/xml/dlg_main.xml

@@ -1,7 +1,7 @@
-<SOUI name="loginwindow" title="@string/title" bigIcon="ICON_LOGO:32" smallIcon="ICON_LOGO:16"  width="414" height="736" margin="5,5,5,5"  resizable="0" wndType="appMain"
+<SOUI name="loginwindow" title="@string/title" bigIcon="ICON_LOGO:32" smallIcon="ICON_LOGO:16"  width="800" height="500" margin="5,5,5,5"  resizable="0" wndType="appMain"
 appWnd="1"
 >
-  <root skin="bg-login_png" cache="1">
+  <root skin="skin_bguser" cache="1">
 
     <tabctrl name="tabmain" size="-2,-2" extend="0,0,0,0" colorBkgnd="" interpolator="Decelerate" curSel="0" focusable="0" animateSteps="30" animateType="1" tabHeight="0" tabSkin="" text-y="" iconSkin="" icon-x="" colorTextHover="#ff0000" fontHover="italic:1">
       <page>

+ 101 - 6
SProxy/uires/xml/page_home.xml

@@ -2,17 +2,112 @@
     <include>
             <caption pos="0,0,-0,30" show="1" font="adding:0">
             <!-- <text pos="29,9">@string/title</text> -->
-            <imgbtn name="OnRefresh" skin="skin_imgress" pos="29,0" tip="刷新线路" animate="1"/>
+            <imgbtn name="OnRefresh" skin="skin_imgress" pos="-90,0" tip="刷新线路" animate="1"/>
             <imgbtn name="btn_close" skin="_skin.sys.btn.close"    pos="-45,0" tip="close" animate="1"/>
             </caption>
         
             <window pos="5,[2,-5,-5">
-                    <window size="-2,-2" layout="vbox" gravity="center">
-                        <!-- 头部信息模块 -->
-                        <window size="-2,150" layout="vbox" gravity="left"  skin="skin_crad"  colorBkgnd=""  extend="10,10,10,10" >
-                                <text name="username" extend="15,10,0,0" colorText="#00000">admin333@qq.com</text>
-                        </window>
+                    <window size="-2,-2" layout="hbox" >
 
+                   
+                              <window size="120,-2" layout="vbox"  colorBkgnd="" extend="0,25,0,0">
+
+                                <window size="120,-1" layout="vbox"  colorBkgnd="" extend="0,0,0,0" weight="1">
+                                    <text extend="45,43,0,0" colorText="#ffffff">加速</text>
+                                    <link name="username_jiaocheng" cursor="hand" extend="45,30,0,0" colorText="#ffffff">教程</link>
+                                    <link name="username_online_kf" cursor="hand" extend="45,25,0,0" colorText="#ffffff">客服</link>
+                                </window>
+                                <window size="120,-1" layout="vbox"  colorBkgnd="" extend="0,0,0,0" weight="1">
+                                        <text extend="45,43,0,0" colorText="#ffffff"></text>
+                                </window>
+                                <window size="120,-1" layout="vbox"  colorBkgnd="" extend="0,0,0,0" weight="1">
+                                        <window size="120,-1" layout="vbox"  colorBkgnd="" extend="0,0,0,0" weight="1">
+                                                <text extend="45,0,0,0" colorText="#ffffff"></text>
+                                        </window>
+                                         <window size="120,-1" layout="vbox"  colorBkgnd="" extend="0,0,0,0" weight="1">
+                                                <text extend="45,0,0,0" colorText="#ffffff"></text>
+                                        </window>
+                                        <window size="120,-1" layout="vbox"  colorBkgnd="" extend="0,0,0,0" weight="1">
+                                                <text extend="45,0,0,0" colorText="#ffffff"></text>
+                                        </window>
+                                        <window size="120,-1" layout="vbox"  colorBkgnd="" extend="0,0,0,0" weight="1">
+                                                <link name="username_home" extend="45,85,0,0" cursor="hand" colorText="#ffffff">官网</link>
+                                        </window>
+                                    
+                                </window>
+                            </window>
+
+                            <window size="400,465" layout="vbox" extend="0,0,0,0">
+                                <window size="300,25" layout="vbox" >
+                                </window>
+                                <window size="-2,-1" layout="vbox" >
+                                    <text name="refresh_status" colorText="#000000" font="" extend="15,10,0,0">更新状态</text>
+                                    <text size="100,15" colorText="#000000" font="" extend="15,10,0,0" ></text>  
+                                </window>
+                                 <window size="-2,30" layout="hbox" >
+                                        <switch2 name="switchSys" size="-1,-1" open="0"  extend="15,10,0,0" colorText="#000000" text="设置为系统代理"/> 
+                                         <text size="80,5" colorText="#000000" font="" extend="15,10,0,0" ></text>
+                                        <switch2 name="switchTun" size="-1,-1" open="0"  extend="35,10,0,0" colorText="#000000" text="设置为网卡代理"/>    
+                                </window>
+                                <window size="380,320" layout="hbox" extend="10,0,0,15">
+                                        <listview name="nodeList" size="-2,-2" colorBkgnd="" wantTab="1" marginSize="0" sbSkin="skin.common.vscroll" >
+                                                <template itemHeight="35" itemWidth="130" color="#D8D8D8" colorHover="#D8D8D844" colorSelected="#999999" trackMouseEvent="1">
+                                                        <window size="-2,-2" layout="hbox" colorBkgnd="">
+                                                                <window size="0,-2" weight="1.5" layout="hbox" gravity="center" extend="10,0,0,0">
+                                                                        <text name="servername" size="100,23" extend="10,0,0,0" colorText="#000000" dotted="1" >US 01</text>
+                                                                </window>
+                                                                <window size="0,-2" weight="1" layout="hbox" gravity="center" extend="10,0,0,0">
+                                                                        <text name="type_node" pos="5,5" colorText="#767676" > v2ray</text>
+                                                                </window>
+                                                                <window size="0,-2" weight="1" layout="hbox" gravity="center" extend="10,0,0,0">
+                                                                        <text name="node_tag" pos="5,5" colorText="#767676" > 视频解锁</text>
+                                                                </window>
+                                                                 <window size="0,-2" weight="1" layout="hbox" gravity="center" extend="10,0,0,0">
+                                                                        <text name="serverms" pos="5,5" colorText="#000000" > 0 ms</text>
+                                                                </window>
+                                                        </window>
+                                                </template>
+                                        </listview>
+                                </window>
+
+                                  <window size="-2,30" layout="vbox" >
+                                    <text name="text_touch" colorText="#000000" font="" extend="35,10,0,0" >链接消息</text>     
+                                </window>
+                                 
+                            </window>
+
+
+                             <window size="265,430" layout="vbox" extend="0,30,0,0" colorBkgnd="">
+                                  <window size="-2,-1" layout="vbox" gravity="center" colorBkgnd="" extend="0,55,0,0">
+                                    <text name="username" extend="15,10,0,0" colorText="#000000">admin333@qq.com</text>
+                                    <text name="username_time" extend="15,10,0,0" colorText="#000000">2028-12-31 20:38:53</text>
+                                  </window>
+                                  <window size="-2,30" layout="vbox" gravity="center" colorBkgnd="" extend="0,10,0,0">
+                                      <link extend="0,13,0,0" cursor="hand" colorText="#4876FF">续费</link>
+                                  </window>
+                                  <window size="-2,-1" layout="vbox" gravity="left" colorBkgnd="" extend="0,30,0,0">
+                                       <text  extend="15,10,0,0" colorText="#000000">用户流量</text>
+                                       <window size="-2,40" layout="hbox" gravity="center">
+                                                <text name="username_liulaing" extend="15,10,0,0" colorText="#000000">总流量:300G 使用流量:1.4k</text>
+                                       </window>
+                                   
+                                  </window>
+                                        <img skin="skin_line" size="-2,1" extend="15,10,15,0"/>
+                                   <window size="-2,-1" layout="vbox" gravity="left" colorBkgnd="" extend="0,10,0,0">
+                                        <text  extend="15,10,0,0" colorText="#000000">路由模式</text>
+                                       <window size="-2,40" layout="hbox" gravity="center" extend="0,20,0,0">
+                                        <tabtypecontrol name="routemode" size="200,45" gravity="center" extend="47,5,44,0"/>  
+                                                <!-- <switch2 name="modeSys" size="-1,-1" open="0"  extend="15,10,0,0" colorText="#000000" text="智能分流"/> 
+                                                <text size="20,5" colorText="#000000" font="" extend="15,10,0,0" ></text>
+                                                <switch2 name="modeGG" size="-1,-1" open="0"  extend="35,10,0,0" colorText="#000000" text="全局上网"/>     -->
+                                       </window>
+                                
+                                   </window>
+                                        <window size="-2,30" layout="vbox" gravity="right" colorBkgnd="" extend="0,80,0,0">
+                                        <link name="app_version" cursor="hand" colorText="#707070"  extend="0,0,0,0" >版本号:正在检测...</link>
+                                        </window>
+ 
+                             </window>
                     </window>
 
             </window>

+ 1 - 12
SProxy/uires/xml/page_node.xml

@@ -92,18 +92,7 @@
                                     <switch2 name="switchSys" size="-1,-1" open="0"  extend="15,10,0,0" colorText="#ffffff" text="设置为系统代理"/>
 
                                     <window size="-2,0" weight="1.5" layout="hbox"  gravity="center" extend="15,10,0,0">
-                                            <listview name="nodeList" size="-2,-2" colorBkgnd="" wantTab="1" marginSize="0" sbSkin="skin.common.vscroll" >
-                                                 <template itemHeight="66" itemWidth="130" color="#D8D8D8" colorHover="#D8D8D844" colorSelected="#D8D8D844" trackMouseEvent="1">
-                                                        <window size="-2,-2" layout="hbox" colorBkgnd="">
-								<window size="0,-2" weight="2.5" layout="hbox" gravity="center" extend="10,0,0,0">
-                                                                        <text name="servername" size="100,23" extend="10,0,0,0" colorText="#D8D8D8" dotted="1" >US 01</text>
-								</window>
-                                                                 <window size="0,-2" weight="2" layout="hbox" gravity="center" extend="10,0,0,0">
-									<text name="serverms" pos="5,5" colorText="#D8D8D8" > 0 ms</text>
-								</window>
-							</window>
-                                                 </template>
-                                            </listview>
+                       
                                     </window>
 
                             </window>