Explorar el Código

准备开始做自动更新

zhangyang hace 5 años
padre
commit
97d97c8faf

+ 5 - 2
zhipuzi_pay_plugin/wnd/CShoukuanWnd.cpp

@@ -433,7 +433,10 @@ LRESULT CShoukuanWnd::OnShoukuanSuccess(UINT uMsg, WPARAM wParam, LPARAM lParam,
 	}
 
 	//播放收款成功的金额
-	std::thread(&CShoukuanWnd::ReadShoukuanValue, this).detach();
+	if (CSetting::GetParam("shoukuan_setting_yuyinbobao") == "1")
+	{
+		std::thread(&CShoukuanWnd::ReadShoukuanValue, this).detach();
+	}
 
 	CVerticalLayoutUI* paying_layout = static_cast<CVerticalLayoutUI*>(m_pm.FindControl(_T("shoukuan_paying_layout")));
 	paying_layout->SetVisible(false);
@@ -940,5 +943,5 @@ bool CShoukuanWnd::IsCanClose()
 
 void CShoukuanWnd::ReadShoukuanValue()
 {
-	CSpeech::SpeakNum(true, CLewaimaiString::UnicodeToUTF8(m_money));
+	CSpeech::SpeakNum(1, CLewaimaiString::UnicodeToUTF8(m_money));
 }

+ 7 - 4
zhipuzi_pay_plugin/wnd/CTuikuanWnd.cpp

@@ -387,11 +387,9 @@ LRESULT CTuikuanWnd::OnTuikuanSuccess(UINT uMsg, WPARAM wParam, LPARAM lParam, B
 		m_valueWnd->PrintTuikuan(m_out_trade_no);
 	}
 
-	wstring path = CSystem::GetProgramDir() + L"\\music\\refund_success.wav";
-
 	if (CSetting::GetParam("shoukuan_setting_yuyinbobao") == "1")
 	{
-		PlaySound(path.c_str(), NULL, SND_FILENAME | SND_ASYNC);
+		std::thread(&CTuikuanWnd::ReadTuikuanValue, this).detach();
 	}
 
 	CVerticalLayoutUI* paying_layout = static_cast<CVerticalLayoutUI*>(m_pm.FindControl(_T("tuikuan_paying_layout")));
@@ -749,10 +747,15 @@ void CTuikuanWnd::HandleTuikuanPassword()
 
 bool CTuikuanWnd::IsCanClose()
 {
-	if (m_tuikuan_status == 0)
+	if (m_tuikuan_status == 0 || m_tuikuan_status == 3 || m_tuikuan_status == 4)
 	{
 		return true;
 	}
 
 	return false;
 }
+
+void CTuikuanWnd::ReadTuikuanValue()
+{
+	CSpeech::SpeakNum(2, CLewaimaiString::UnicodeToUTF8(m_money));
+}

+ 2 - 0
zhipuzi_pay_plugin/wnd/CTuikuanWnd.h

@@ -82,6 +82,8 @@ public:
 
 	bool IsCanClose();
 
+	void ReadTuikuanValue();
+
 public:
 	CPaintManagerUI m_pm;