fix: logout failed (#24)

* fix: logout failed * build: remove warning info
NJUPT-SAST-Cpp · Aug 1, 2024 · 353620c · 353620c
1 parent 1705c99
commit 353620c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,6 +19,9 @@ endif()
 
 find_package(Qt6 6.5 REQUIRED COMPONENTS Quick Multimedia)
 
+add_subdirectory(libs/FluentUI)
+add_subdirectory(libs/mbedtls)
+
 qt_standard_project_setup(REQUIRES 6.5)
 
 set(CMAKE_AUTORCC ON)
@@ -27,8 +30,6 @@ set(FLUENTUI_BUILD_EXAMPLES OFF)
 if (CMAKE_BUILD_TYPE STREQUAL "Debug" AND LINUX)
     set(FLUENTUI_QML_PLUGIN_DIRECTORY /usr/lib/qt6/qml/FluentUI)
 endif()
-add_subdirectory(libs/FluentUI)
-add_subdirectory(libs/mbedtls)
 
 file(GLOB_RECURSE SOURCE_FILES
     ${CMAKE_SOURCE_DIR}/src/*.cpp

diff --git a/src/ViewModel/LoginViewModel.cpp b/src/ViewModel/LoginViewModel.cpp
@@ -32,7 +32,6 @@ void LoginViewModel::logout() {
             emit logoutFailed(result.unwrapErr().message);
             return;
         }
-        auto entity = result.unwrap();
         emit logoutSuccess();
     });
 }

diff --git a/src/ViewModel/UserProfileViewModel.cpp b/src/ViewModel/UserProfileViewModel.cpp
@@ -16,6 +16,11 @@ UserProfileViewModel* UserProfileViewModel::create(QQmlEngine*, QJSEngine*) {
 }
 
 void UserProfileViewModel::loadUserProfile() {
+    if (!getIsLogin()) { // when logout
+        setUserProfileModel(UserProfile());
+        emit loadUserProfileSuccess();
+        return;
+    }
     CloudMusicClient::getInstance()->getLoginStatus([=](Result<LoginStatusEntity> result) {
         if (result.isErr()) {
             emit loadUserProfileFailed(result.unwrapErr().message);
@@ -59,7 +64,7 @@ bool UserProfileViewModel::getDefaultAvatar() const {
     return userProfileModel.defaultAvatar;
 }
 
-void UserProfileViewModel::setUserProfileModel(const UserProfile& model) {
+void UserProfileViewModel::setUserProfileModel(UserProfile model) {
     userProfileModel = std::move(model);
     emit userIdChanged();
     emit nicknameChanged();

diff --git a/src/ViewModel/UserProfileViewModel.h b/src/ViewModel/UserProfileViewModel.h
@@ -27,7 +27,7 @@ class UserProfileViewModel : public QObject {
 
     bool getDefaultAvatar() const;
 
-    void setUserProfileModel(const UserProfile& model);
+    void setUserProfileModel(UserProfile model);
 
 signals:
     void isLoginChanged();
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,7 +32,6 @@ void LoginViewModel::logout() { @@
                 emit logoutFailed(result.unwrapErr().message);
                 return;
             }
-            auto entity = result.unwrap();
             emit logoutSuccess();
         });
     }
@@ Expand Down @@