Merge branch 'master' into develop

netease-kit · Sep 29, 2024 · 3abe652 · 3abe652
2 parents 71015a9 + d0e39e7
commit 3abe652
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 27 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -27,14 +27,14 @@ jobs:
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-      run: cmake -B ${{env.GITHUB_WORKSPACE}}/build -T"v141_xp" -DCMAKE_BUILD_TYPE=${{env.BUILD_CONFIGURATION}}
+      run: cmake -B ${{env.GITHUB_WORKSPACE}}/build -AWin32 -T"v141_xp" -DCMAKE_BUILD_TYPE=${{env.BUILD_CONFIGURATION}}
 
     - name: Build nim demo
       # Build your program with the given configuration
       run: cmake --build ${{env.GITHUB_WORKSPACE}}/build --config ${{env.BUILD_CONFIGURATION}} --target install
 
     - name: Configure nim demo installer
-      run: cmake tool_kits -B ${{env.GITHUB_WORKSPACE}}/build_setup -T"v141_xp" -DCMAKE_BUILD_TYPE=${{env.BUILD_CONFIGURATION}}
+      run: cmake tool_kits -B ${{env.GITHUB_WORKSPACE}}/build_setup -AWin32 -T"v141_xp" -DCMAKE_BUILD_TYPE=${{env.BUILD_CONFIGURATION}}
 
     - name: Build nim demo installer
       run: cmake --build ${{env.GITHUB_WORKSPACE}}/build_setup --config ${{env.BUILD_CONFIGURATION}} --target installer

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,7 +33,7 @@ SET(GROUP_UI_COMPONENTS "ui_components")
 SET(RELEASE_OUTPUT_7Z_FILE "${CMAKE_BINARY_DIR}/release.7z")
 STRING(REPLACE "/" "\\\\" RELEASE_OUTPUT_7Z_FILE_WIN ${RELEASE_OUTPUT_7Z_FILE})
 
-SET(NIM_CROSS_PLATFORM_SDK_FILE_NAME "nim-win32-ia32-refs-tags-9.4.0.1554-build.166.tar.gz")
+SET(NIM_CROSS_PLATFORM_SDK_FILE_NAME "nim-win32-ia32-9-9-0-383-build-1750145.tar.gz")
 SET(DEBUG_THIRD_PARTY_LIBS "http://yx-web.nos.netease.com/package/1619605746/NIM_Windows_Demo_Build_Binaries_Debug.zip")
 SET(RELEASE_THIRD_PARTY_LIBS "http://yx-web.nos.netease.com/package/1619605768/NIM_Windows_Demo_Build_Binaries_Release.zip")
 SET(NIM_CROSS_PLATFORM_SDK_URL "https://yx-web-nosdn.netease.im/package/${NIM_CROSS_PLATFORM_SDK_FILE_NAME}")
@@ -84,13 +84,8 @@ IF (NOT EXISTS "${CMAKE_BINARY_DIR}/nertc-SDK.zip" AND NOT BUILD_WITH_CONAN)
 ENDIF ()
 EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E tar -xf "${CMAKE_BINARY_DIR}/nertc-SDK.zip" WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 FILE(GLOB_RECURSE NERTC_HEADER_FIELS ${CMAKE_BINARY_DIR}/nertc_sdk_windows*/*.h)
-IF  (CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE MATCHES "x64")
-    FILE(GLOB_RECURSE NERTC_LIB_FIELS ${CMAKE_BINARY_DIR}/nertc_sdk_windows*/lib/x64/*.lib)
-    FILE(GLOB_RECURSE NERTC_BINARY_FIELS ${CMAKE_BINARY_DIR}/nertc_sdk_windows*/dll/x64/*.dll)
-ELSE ()
-    FILE(GLOB_RECURSE NERTC_LIB_FIELS ${CMAKE_BINARY_DIR}/nertc_sdk_windows*/lib/x86/*.lib)
-    FILE(GLOB_RECURSE NERTC_BINARY_FIELS ${CMAKE_BINARY_DIR}/nertc_sdk_windows*/dll/x86/*.dll)
-ENDIF ()
+FILE(GLOB_RECURSE NERTC_LIB_FIELS ${CMAKE_BINARY_DIR}/nertc_sdk_windows*/lib/x86/*.lib)
+FILE(GLOB_RECURSE NERTC_BINARY_FIELS ${CMAKE_BINARY_DIR}/nertc_sdk_windows*/dll/x86/*.dll)
 
 FILE(COPY ${NERTC_HEADER_FIELS} DESTINATION ${CMAKE_CURRENT_LIST_DIR}/include)
 FILE(COPY ${NERTC_LIB_FIELS} DESTINATION ${CMAKE_CURRENT_LIST_DIR}/lib)

diff --git a/nim_win_demo/gui/login/login_form.cpp b/nim_win_demo/gui/login/login_form.cpp
@@ -34,7 +34,7 @@ void LoginForm::OnLogin()
 			chkbox_private_use_proxy_enable_->SetEnabled(true);
 			return;
 		}		
-		nim_http::SetGlobalProxy(NIMProxyType::kNIMProxyNone, "", 0, "", "");		
+		nim_http::SetGlobalProxy(nim::kNIMProxyNone, "", 0, "", "");		
 		nim_http::HttpRequest req(url, nullptr,0,
 		[this, url](bool ret, int code, const std::string& configs) {
 			Post2UI(this->ToWeakCallback([this,ret,code, configs, url]() {

diff --git a/nim_win_demo/gui/proxy/proxy_form.cpp b/nim_win_demo/gui/proxy/proxy_form.cpp
@@ -113,10 +113,10 @@ void ProxyForm::ConfirmSetting()
 	//httptool
 	auto httptool_proxy_setting = proxy_httptool_->GetProxySetting();
 	if (httptool_proxy_setting->IsUseGlobalSetting())
-		nim_http::SetGlobalProxy((NIMProxyType)(ProxyTip::ConvertBaseProxytypeToNimProxyType(global_proxy_setting->GetType())), \
+		nim_http::SetGlobalProxy((nim::NIMProxyType)(ProxyTip::ConvertBaseProxytypeToNimProxyType(global_proxy_setting->GetType())), \
 		global_proxy_setting->GetHost(), global_proxy_setting->GetPort(), global_proxy_setting->GetUserName(), global_proxy_setting->GetPassowrd());
 	else
-		nim_http::SetGlobalProxy((NIMProxyType)(ProxyTip::ConvertBaseProxytypeToNimProxyType(httptool_proxy_setting->GetType())), \
+		nim_http::SetGlobalProxy((nim::NIMProxyType)(ProxyTip::ConvertBaseProxytypeToNimProxyType(httptool_proxy_setting->GetType())), \
 		httptool_proxy_setting->GetHost(), httptool_proxy_setting->GetPort(), httptool_proxy_setting->GetUserName(), httptool_proxy_setting->GetPassowrd());	
 
 	//VChat

diff --git a/tool_kits/install/window/setup_wnd.cpp b/tool_kits/install/window/setup_wnd.cpp
@@ -97,7 +97,7 @@ void SetupForm::InitWindow()
 		Setup();
 	}
 }
-HRESULT SetupForm::OnClose(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
+LRESULT SetupForm::OnClose(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
 {
 	bHandled = FALSE;
 	if (start_setup_ && wParam == 1)

diff --git a/tool_kits/net/export/nim_tools_http_def.h b/tool_kits/net/export/nim_tools_http_def.h
@@ -11,16 +11,6 @@ extern"C"
 {
 #endif
 
-/** @enum NIMProxyType 代理类型 */
-	enum NIMProxyType
-	{
-	kNIMProxyNone		= 0,	/**< 不使用代理*/
-	kNIMProxyHttp11		= 1,	/**< HTTP 1.1 Proxy*/
-	kNIMProxySocks4		= 4,	/**< Socks4 Proxy*/
-	kNIMProxySocks4a	= 5,	/**< Socks4a Proxy*/
-	kNIMProxySocks5		= 6,	/**< Socks5 Proxy*/
-};
-
 /** @typedef void* HttpRequestHandle
   * http任务句柄
   */

diff --git a/tool_kits/ui_component/ui_kit/guiex/main/main_form_ex.cpp b/tool_kits/ui_component/ui_kit/guiex/main/main_form_ex.cpp
@@ -99,8 +99,8 @@ namespace nim_comp
 		btn_online_state_ = dynamic_cast<ui::Button*>(FindControl(L"btn_online_state"));
 		btn_online_state_->SetVisible(nim_comp::SubscribeEventManager::GetInstance()->IsEnabled());
 		btn_header_->AttachClick([this](ui::EventArgs* param) {
-			nim_comp::WindowsManager::GetInstance()->SingletonShow<nim_comp::ProfileMine>(nim_comp::ProfileMine::kClassName);
-			//nim_comp::ProfileForm::ShowProfileForm(nim_comp::LoginManager::GetInstance()->GetAccount());
+			//nim_comp::WindowsManager::GetInstance()->SingletonShow<nim_comp::ProfileMine>(nim_comp::ProfileMine::kClassName);
+			nim_comp::ProfileForm::ShowProfileForm(nim_comp::LoginManager::GetInstance()->GetAccount());
 			return true;
 			});
 		btn_online_state_->AttachClick(nbase::Bind(&MainFormEx::OnlineStateMenuButtonClick, this, std::placeholders::_1));

diff --git a/tool_kits/uninstall/window/setup_wnd.cpp b/tool_kits/uninstall/window/setup_wnd.cpp
@@ -85,7 +85,7 @@ void SetupForm::InitWindow()
 	progress_pos_ = (ui::Label*)FindControl(L"progress_pos");
 	check_userdata_ = (ui::CheckBox*)FindControl(L"chkbox_userdata");
 }
-HRESULT SetupForm::OnClose(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
+LRESULT SetupForm::OnClose(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
 {
 	bHandled = FALSE;
 	if (pre_progress_pos_ > 0 && pre_progress_pos_ < 100 && wParam == 0)