improve ui and add historymessagewidget model

CMakeLists.txt

@@ -18,33 +18,6 @@ else()
     set(QT_VERSION_MAJOR 6)
 endif()
 
-#set(PROJECT_SOURCES
-#    main.cpp
-#    mainwidget.cpp
-#    mainwidget.h
-#    mainwidget.ui
-#    model/data.h
-#    resource.qrc
-#    sessionfriendarea.h
-#    sessionfriendarea.cpp
-#    debug.h
-#    messageshowarea.h
-#    messageshowarea.cpp
-#    messageeditarea.h
-#    messageeditarea.cpp
-#    SelfInfoWidget.h
-#    SelfInfoWidget.cpp
-#    userinfowidget.h
-#    userinfowidget.cpp
-#    sessiondetailwidget.h
-#    sessiondetailwidget.cpp
-#    choosefrienddialog.h
-#    choosefrienddialog.cpp
-#    groupsessiondetailwidget.h
-#    groupsessiondetailwidget.cpp
-#)
-
-
 file(GLOB PROJECT_SOURCES
     model/*.h
     *.cpp
@@ -53,14 +26,20 @@ file(GLOB PROJECT_SOURCES
     *.qrc
 )
 
-if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
+if(ANDROID)
+    # Android 平台：附加 Android 可部署资源
     qt_add_executable(ClientChat
         MANUAL_FINALIZATION
         ${PROJECT_SOURCES}
     )
+    # 指定自定义的 Android 部署目录
+    set_property(TARGET ClientChat APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android")
 else()
-    if(ANDROID)
-        add_library(ClientChat SHARED ${PROJECT_SOURCES})
+    if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
+        qt_add_executable(ClientChat
+            MANUAL_FINALIZATION
+            ${PROJECT_SOURCES}
+        )
     else()
         add_executable(ClientChat ${PROJECT_SOURCES})
     endif()
@@ -68,13 +47,12 @@ endif()
 
 target_link_libraries(ClientChat PRIVATE Qt${QT_VERSION_MAJOR}::Widgets)
 
-include(GNUInstallDirs)
-install(TARGETS ClientChat
-    BUNDLE DESTINATION .
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-)
-
-if(QT_VERSION_MAJOR EQUAL 6)
+if(${QT_VERSION_MAJOR} EQUAL 6)
     qt_finalize_executable(ClientChat)
 endif()
+
+include(GNUInstallDirs)
+install(TARGETS ClientChat
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)