Browse Source

增加用户刷新

alroyso 2 years ago
parent
commit
33b50ebc2f

+ 20 - 0
SProxy/CApp.cpp

@@ -181,6 +181,26 @@ bool CApp::GetClashRuning()
 	return m_clashRuning;
 }
 
+void CApp::SetUsername(SStringW m)
+{
+	username = m;
+}
+
+void CApp::SetPassword(SStringW m)
+{
+	password = m;
+}
+
+SOUI::SStringW CApp::GetUserName()
+{
+	return username;
+}
+
+SOUI::SStringW CApp::GetPassWord()
+{
+	return password;
+}
+
 std::string CApp::GetSelect_node() const { return select_node; }
 
 void CApp::SetSelect_node(std::string val) {

+ 8 - 1
SProxy/CApp.h

@@ -78,7 +78,11 @@ public:
 
 	bool GetClashRuning();
 
- 
+	void SetUsername(SStringW m);
+	void SetPassword(SStringW m);
+
+	SStringW GetUserName();
+	SStringW GetPassWord();
 
 	std::string GetToken() const { return m_token; }
 	void SetToken(std::string val) { m_token = val; }
@@ -101,5 +105,8 @@ private:
 	std::string m_token;
 	/**/
 	std::string select_node;
+
+	SStringW username;
+	SStringW password;
 };
 

+ 4 - 4
SProxy/CConnectMage.cpp

@@ -66,7 +66,7 @@ void CConnectMage::ThreadFun_ChangeClash_Config(LPARAM lParam)
 	if (!CApp::getSingletonPtr()->GetClashRuning())
 	{
 		m_connect_status = ConnectState::Stop;
-		m_error = L"内核没有启动,重启电脑或者软件";
+		m_error = L"内核没有启动,重启电脑或者备用软件";
 		EventConnect* pEvt = new EventConnect(nullptr);
 		pEvt->status = m_connect_status;
 		pEvt->msg = m_error;
@@ -78,7 +78,7 @@ void CConnectMage::ThreadFun_ChangeClash_Config(LPARAM lParam)
 	if (m_clash_config == nullptr || m_clash_Api == nullptr)
 	{
 		m_connect_status = ConnectState::Stop;
-		m_error = L"错误,重启电脑";
+		m_error = L"连失败缺少相关组件,重启电脑或者备用软件";
 		EventConnect* pEvt = new EventConnect(nullptr);
 		pEvt->status = m_connect_status;
 		pEvt->msg = m_error;
@@ -200,7 +200,7 @@ void CConnectMage::ThreadFun_ChangeClash_Stop(LPARAM lParam)
 	if (!CApp::getSingletonPtr()->GetClashRuning())
 	{
 		m_connect_status = ConnectState::Stop;
-		m_error = L"内核没有启动,重启电脑或者软件";
+		m_error = L"连失败缺少相关组件,重启电脑或者备用软件";
 		EventConnect* pEvt = new EventConnect(nullptr);
 		pEvt->status = m_connect_status;
 		pEvt->msg = m_error;
@@ -212,7 +212,7 @@ void CConnectMage::ThreadFun_ChangeClash_Stop(LPARAM lParam)
 	if (m_clash_config == nullptr || m_clash_Api == nullptr)
 	{
 		m_connect_status = ConnectState::Stop;
-		m_error = L"错误,重启电脑";
+		m_error = L"连失败缺少相关组件,重启电脑或者备用软件";
 		EventConnect* pEvt = new EventConnect(nullptr);
 		pEvt->status = m_connect_status;
 		pEvt->msg = m_error;

+ 1 - 1
SProxy/CServerList.cpp

@@ -85,7 +85,7 @@ bool CServerList::Init(std::string data)
 	}
 	catch (...)
 	{
-		this->m_error_msg = L"解析数据错误,点击右上角刷新";
+		this->m_error_msg = L"解析数据错误,网络问题,点击右上角刷新或者使用备用软件";
 		return false;
 	}
 }

+ 1 - 1
SProxy/CSysConfig.cpp

@@ -48,7 +48,7 @@ bool CSysConfig::Inti(std::string data)
 	}
 	catch (...)
 	{
-		this->m_error_msg = L"解析数据错误";
+		this->m_error_msg = L"解析数据错误,网络问题重启软件或者使用备用软件";
 		return false;
 	}
 	return false;

+ 1 - 1
SProxy/CUserInfo.cpp

@@ -55,7 +55,7 @@ bool CUserInfo::Init(std::string data)
 	}
 	catch (...)
 	{
-		this->m_error_msg = L"解析数据错误";
+		this->m_error_msg = L"解析数据错误,网络问题,重新登录或者使用备用软件";
 		return false;
 	}
     return false;

BIN
SProxy/LoginDlg.cpp


BIN
SProxy/MainDlg.cpp


BIN
SProxy/MainDlg.h


BIN
SProxy/res/resource.h


+ 5 - 1
SProxy/uires/xml/page_home.xml

@@ -11,8 +11,12 @@
                 <window size="-2,-1" layout="vbox"   gravity="left"  extend="0,30,0,0">
                     <text name="username" extend="35,0,0,0" colorText="#ffffff">用户名</text>
                     <img skin="skin_line" extend="35,10,0,0"/>
-                    <text name="username_time" extend="35,10,0,0" colorText="#ffffff">到期时间</text>
+                    <window size="-2,-1" layout="hbox"   gravity="center"  extend="0,10,0,0">
+                        <text name="username_time" extend="35,10,0,0" colorText="#ffffff">到期时间</text>
+                         <imgbtn name="OnRefreshUser" skin="skin_imgress" pos="29,0" tip="刷新用户信息" animate="1"/>
+                    </window>
                     <img skin="skin_line" extend="35,10,0,0"/>
+                    
                     <text name="username_liulaing" extend="35,10,0,0" colorText="#ffffff">用户流量</text>
                     <img skin="skin_line" extend="35,10,0,0"/>
                     <window size="-2,-1" layout="hbox"   gravity="center"  extend="0,10,0,0">

BIN
打包/SVProxy/x64/SProxy.exe


BIN
打包/SVProxy/x86/SProxy.exe