feat: update NIM to 10.9.72-beta.0

nmgwddj · nmgwddj · commit 9cc929399918 · 2025-12-24T20:35:55.000+08:00
Signed-off-by: Dylan &lt;2894220@gmail.com&gt;
diff --git a/.cmake/export_recipes.cmake b/.cmake/export_recipes.cmake
@@ -128,7 +128,7 @@ function(export_recipes_dynamically)
         "libyuv/1892@yunxin/stable"
         "sqlite3/3.51.0@yunxin/stable"
         "tinyxml/2.6.2@yunxin/stable"
-        "nim/10.9.33@yunxin/stable"
+        "nim/10.9.72-beta.0@yunxin/stable"
         "nertc/4.1.1@yunxin/stable"
         "libcef/3.2623.1401@yunxin/stable"
         "ne_live_player/1.6.9@yunxin/stable"
diff --git a/app_sdk/base/http/sdk_http_manager.h b/app_sdk/base/http/sdk_http_manager.h
@@ -116,7 +116,6 @@ namespace app_sdk
 			
 #ifdef _DEBUG
 			QLOG_APP(L"#####response api:{0} rescode:{1}\r\n{2}") << request->GetAPIURL() << response_code << reply;
-			std::wstring test = nbase::UTF8ToUTF16(reply);
 #else
 			QLOG_APP(L"#####response api:{0} rescode:{1}") << request->GetAPIURL() << response_code ;
 #endif
diff --git a/app_sdk/protocol/sdk_pro.cpp b/app_sdk/protocol/sdk_pro.cpp
@@ -280,9 +280,9 @@ void SDK_PRO::SendSmsCodeResponse::OnParse(const std::string &response)
         }
         else
         {
-            if (json_reply.isMember("message"))
+            if (json_reply.isMember("msg"))
             {
-                err_msg_ = json_reply["message"].asString();
+                err_msg_ = json_reply["msg"].asString();
             }
             QLOG_ERR(L"Invoke send sms code error. Json rescode: {0}.") << res;
         }
diff --git a/bin/resources/lang/en_US/gdstrings.ini b/bin/resources/lang/en_US/gdstrings.ini
@@ -53,6 +53,13 @@ STRID_LOGIN_FORM_SMS_CODE		=	SMS Code
 STRID_LOGIN_FORM_GET_CODE		=	Get Code
 STRID_LOGIN_FORM_INPUT_MOBILE	=	Enter mobile number
 STRID_LOGIN_FORM_INPUT_SMS_CODE	=	Enter SMS code
+STRID_LOGIN_FORM_MOBILE_EMPTY	=	Please enter mobile number
+STRID_LOGIN_FORM_MOBILE_INVALID	=	Please enter a valid mobile number
+STRID_LOGIN_FORM_SMS_CODE_EMPTY	=	Please enter SMS code
+STRID_LOGIN_FORM_SENDING_CODE	=	Sending...
+STRID_LOGIN_FORM_CODE_SENT_SUCCESS	=	SMS code sent successfully
+STRID_LOGIN_FORM_CODE_SEND_FAILED	=	Failed to send SMS code
+STRID_LOGIN_FORM_ERROR_WITH_CODE	=	Error code: %d
 STRID_LOGIN_FORM_LOGINING		=	Logining...
 STRID_LOGIN_FORM_CHATROOMDEMO	=	Anonymous-Chatroom Demo
 STRID_LOGIN_FORM_LOGIN			=	Login
diff --git a/bin/resources/lang/zh_CN/gdstrings.ini b/bin/resources/lang/zh_CN/gdstrings.ini
@@ -53,6 +53,13 @@ STRID_LOGIN_FORM_SMS_CODE		=	验证码
 STRID_LOGIN_FORM_GET_CODE		=	获取验证码
 STRID_LOGIN_FORM_INPUT_MOBILE	=	请输入手机号
 STRID_LOGIN_FORM_INPUT_SMS_CODE	=	请输入验证码
+STRID_LOGIN_FORM_MOBILE_EMPTY	=	请输入手机号
+STRID_LOGIN_FORM_MOBILE_INVALID	=	请输入正确的手机号
+STRID_LOGIN_FORM_SMS_CODE_EMPTY	=	请输入验证码
+STRID_LOGIN_FORM_SENDING_CODE	=	发送中...
+STRID_LOGIN_FORM_CODE_SENT_SUCCESS	=	验证码发送成功
+STRID_LOGIN_FORM_CODE_SEND_FAILED	=	发送验证码失败
+STRID_LOGIN_FORM_ERROR_WITH_CODE	=	错误码: %d
 STRID_LOGIN_FORM_LOGINING		=	正在登录...
 STRID_LOGIN_FORM_CHATROOMDEMO	=	匿名聊天室Demo
 STRID_LOGIN_FORM_LOGIN			=	登录
diff --git a/bin/resources/themes/default/login/login.xml b/bin/resources/themes/default/login/login.xml
@@ -26,17 +26,17 @@
           <VBox name="enter_panel" width="240" height="auto" margin="20,10,20,0" bkimage="user_password.png">
             <HBox height="41" padding="14,1,10,0">
               <Control name="usericon" width="16" height="16" valign="center" normalimage="user_1.png" disabledimage="user_2.png"/>
-              <RichEdit class="simple prompt" name="username" width="stretch" height="auto" margin="10,0,10,0" valign="center" font="2" prompttext="请输入手机号"/>
+              <RichEdit class="simple prompt" name="username" width="stretch" height="auto" margin="10,0,10,0" valign="center" font="1" prompttextid="STRID_LOGIN_FORM_INPUT_MOBILE"/>
             </HBox>
             <HBox name="nick_name_panel" height="40" padding="14,1,0,0" visible="false" margin="0,0,0,0">
               <Control name="nick_name_icon" width="16" height="16" valign="center" normalimage="nickname.png" disabledimage="nickname.png"/>
               <RichEdit class="simple prompt" name="nickname" width="stretch" height="auto" margin="10,0,10,0" valign="center" font="2" prompttextid="STRID_LOGIN_FORM_NICKNAME"/>
             </HBox>
             <HBox height="41" padding="14,1,5,0">
               <Control name="passwordicon" width="16" height="16" valign="center" normalimage="password_1.png" disabledimage="password_2.png"/>
-              <RichEdit class="simple prompt" name="password" width="110" height="auto" margin="10,0,5,0" valign="center" font="2" prompttext="请输入验证码"/>
-              <Button name="btn_get_code" width="70" height="30" margin="5,5,5,0" font="0" normaltextcolor="white" text="获取验证码"
-                      normalimage="login0.png" hotimage="login1.png" pushedimage="login2.png"/>
+              <RichEdit class="simple prompt" name="password" width="110" height="auto" margin="10,0,5,0" valign="center" font="1" prompttextid="STRID_LOGIN_FORM_INPUT_SMS_CODE"/>
+              <Button name="btn_get_code" width="70" height="30" margin="5,5,5,0" font="0" normaltextcolor="white" textid="STRID_LOGIN_FORM_GET_CODE"
+                      normalimage="login0.png" hotimage="login1.png" pushedimage="login2.png" disabledimage="file='cancel0.png'"/>
             </HBox>
           </VBox>
         </VBox>
@@ -51,7 +51,6 @@
             <Event type="select" receiver="chkbox_remember_username" applyattribute="selected=&quot;true&quot;"/>
             <Event type="unselect" receiver="chkbox_remember_username" applyattribute="selected=&quot;false&quot;"/>
           </CheckBox>
-          <Control />
           <!--Button name="forget_password" cursortype="hand" font="1" normaltextcolor="link_gray" textid="STRID_LOGIN_FORGET_PASSWORD" /-->
         </HBox>
 
diff --git a/bin/resources/themes/default/login/login_en.xml b/bin/resources/themes/default/login/login_en.xml
@@ -36,7 +36,7 @@
               <Control name="passwordicon" width="16" height="16" valign="center" normalimage="password_1.png" disabledimage="password_2.png"/>
               <RichEdit class="simple prompt" name="password" width="110" height="auto" margin="10,0,5,0" valign="center" font="1" prompttextid="STRID_LOGIN_FORM_INPUT_SMS_CODE"/>
               <Button name="btn_get_code" width="70" height="30" margin="5,5,5,0" font="0" normaltextcolor="white" textid="STRID_LOGIN_FORM_GET_CODE"
-                      normalimage="login0.png" hotimage="login1.png" pushedimage="login2.png"/>
+                      normalimage="login0.png" hotimage="login1.png" pushedimage="login2.png" disabledimage="file='cancel0.png'"/>
             </HBox>
           </VBox>
         </VBox>
diff --git a/conanfile.py b/conanfile.py
@@ -31,7 +31,7 @@ def requirements(self):
         self.requires("libyuv/1892@yunxin/stable")
         self.requires("sqlite3/3.51.0@yunxin/stable")
         self.requires("tinyxml/2.6.2@yunxin/stable")
-        self.requires("nim/10.9.33@yunxin/stable")
+        self.requires("nim/10.9.72-beta.0@yunxin/stable")
         self.requires("nertc/4.1.1@yunxin/stable")
         self.requires("libcef/3.2623.1401@yunxin/stable")
         self.requires("ne_live_player/1.6.9@yunxin/stable")
diff --git a/nim_win_demo/gui/login/login_form.cpp b/nim_win_demo/gui/login/login_form.cpp
@@ -129,19 +129,19 @@ void LoginForm::OnGetSmsCode()
 
     if (mobile.empty())
     {
-        ShowLoginTip(L"请输入手机号");
+        ShowLoginTip(MutiLanSupport::GetInstance()->GetStringViaID(L"STRID_LOGIN_FORM_MOBILE_EMPTY"));
         return;
     }
 
     // 简单的手机号验证
     if (mobile.length() != 11)
     {
-        ShowLoginTip(L"请输入正确的手机号");
+        ShowLoginTip(MutiLanSupport::GetInstance()->GetStringViaID(L"STRID_LOGIN_FORM_MOBILE_INVALID"));
         return;
     }
 
     btn_get_code_->SetEnabled(false);
-    btn_get_code_->SetText(L"发送中...");
+    btn_get_code_->SetText(MutiLanSupport::GetInstance()->GetStringViaID(L"STRID_LOGIN_FORM_SENDING_CODE"));
 
     current_mobile_ = mobile;
 
@@ -161,23 +161,25 @@ void LoginForm::OnGetSmsCodeCallback(int code, bool is_first_register, const std
 {
     if (code == 200)
     {
-        ShowLoginTip(L"验证码发送成功");
+        ShowLoginTip(MutiLanSupport::GetInstance()->GetStringViaID(L"STRID_LOGIN_FORM_CODE_SENT_SUCCESS"));
         countdown_seconds_ = 60;
         StartCodeCountdown();
     }
     else
     {
         btn_get_code_->SetEnabled(true);
-        btn_get_code_->SetText(L"获取验证码");
+        btn_get_code_->SetText(MutiLanSupport::GetInstance()->GetStringViaID(L"STRID_LOGIN_FORM_GET_CODE"));
 
-        std::wstring error_msg = L"发送验证码失败";
+        std::wstring error_msg = MutiLanSupport::GetInstance()->GetStringViaID(L"STRID_LOGIN_FORM_CODE_SEND_FAILED");
         if (!err_msg.empty())
         {
             error_msg = nbase::UTF8ToUTF16(err_msg);
         }
         else
         {
-            error_msg += L" (错误码: " + std::to_wstring(code) + L")";
+            std::wstring error_code_format =
+                MutiLanSupport::GetInstance()->GetStringViaID(L"STRID_LOGIN_FORM_ERROR_WITH_CODE");
+            error_msg += L" (" + nbase::StringPrintf(error_code_format.c_str(), code) + L")";
         }
         ShowLoginTip(error_msg);
     }
diff --git a/recipes/nim/all/conandata.yml b/recipes/nim/all/conandata.yml

Original file line number	Diff line number	Diff line change
`@@ -280,9 +280,9 @@ void SDK_PRO::SendSmsCodeResponse::OnParse(const std::string &response)`
`280`	`280`	`}`
`281`	`281`	`else`
`282`	`282`	`{`
`283`		`- if (json_reply.isMember("message"))`
	`283`	`+ if (json_reply.isMember("msg"))`
`284`	`284`	`{`
`285`		`- err_msg_ = json_reply["message"].asString();`
	`285`	`+ err_msg_ = json_reply["msg"].asString();`
`286`	`286`	`}`
`287`	`287`	`QLOG_ERR(L"Invoke send sms code error. Json rescode: {0}.") << res;`
`288`	`288`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,19 +129,19 @@ void LoginForm::OnGetSmsCode()`
`129`	`129`
`130`	`130`	`if (mobile.empty())`
`131`	`131`	`{`
`132`		`- ShowLoginTip(L"请输入手机号");`
	`132`	`+ ShowLoginTip(MutiLanSupport::GetInstance()->GetStringViaID(L"STRID_LOGIN_FORM_MOBILE_EMPTY"));`
`133`	`133`	`return;`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`// 简单的手机号验证`
`137`	`137`	`if (mobile.length() != 11)`
`138`	`138`	`{`
`139`		`- ShowLoginTip(L"请输入正确的手机号");`
	`139`	`+ ShowLoginTip(MutiLanSupport::GetInstance()->GetStringViaID(L"STRID_LOGIN_FORM_MOBILE_INVALID"));`
`140`	`140`	`return;`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`btn_get_code_->SetEnabled(false);`
`144`		`- btn_get_code_->SetText(L"发送中...");`
	`144`	`+ btn_get_code_->SetText(MutiLanSupport::GetInstance()->GetStringViaID(L"STRID_LOGIN_FORM_SENDING_CODE"));`
`145`	`145`
`146`	`146`	`current_mobile_ = mobile;`
`147`	`147`
`@@ -161,23 +161,25 @@ void LoginForm::OnGetSmsCodeCallback(int code, bool is_first_register, const std`
`161`	`161`	`{`
`162`	`162`	`if (code == 200)`
`163`	`163`	`{`
`164`		`- ShowLoginTip(L"验证码发送成功");`
	`164`	`+ ShowLoginTip(MutiLanSupport::GetInstance()->GetStringViaID(L"STRID_LOGIN_FORM_CODE_SENT_SUCCESS"));`
`165`	`165`	`countdown_seconds_ = 60;`
`166`	`166`	`StartCodeCountdown();`
`167`	`167`	`}`
`168`	`168`	`else`
`169`	`169`	`{`
`170`	`170`	`btn_get_code_->SetEnabled(true);`
`171`		`- btn_get_code_->SetText(L"获取验证码");`
	`171`	`+ btn_get_code_->SetText(MutiLanSupport::GetInstance()->GetStringViaID(L"STRID_LOGIN_FORM_GET_CODE"));`
`172`	`172`
`173`		`- std::wstring error_msg = L"发送验证码失败";`
	`173`	`+ std::wstring error_msg = MutiLanSupport::GetInstance()->GetStringViaID(L"STRID_LOGIN_FORM_CODE_SEND_FAILED");`
`174`	`174`	`if (!err_msg.empty())`
`175`	`175`	`{`
`176`	`176`	`error_msg = nbase::UTF8ToUTF16(err_msg);`
`177`	`177`	`}`
`178`	`178`	`else`
`179`	`179`	`{`
`180`		`- error_msg += L" (错误码: " + std::to_wstring(code) + L")";`
	`180`	`+ std::wstring error_code_format =`
	`181`	`+ MutiLanSupport::GetInstance()->GetStringViaID(L"STRID_LOGIN_FORM_ERROR_WITH_CODE");`
	`182`	`+ error_msg += L" (" + nbase::StringPrintf(error_code_format.c_str(), code) + L")";`
`181`	`183`	`}`
`182`	`184`	`ShowLoginTip(error_msg);`
`183`	`185`	`}`