Skip to content

Commit 48b0153

Browse files
prenenerliMinTate
prenenerli
authored and
MinTate
committed
【Windows】Update Version to 1.4.3
1 parent efc6e92 commit 48b0153

64 files changed

Lines changed: 998 additions & 429 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Windows-Mac/RoomKit/App/Common/DataStore.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ void DataStore::ParseLaunchParam(QStringList params) {
199199
#else
200200
user_login_info_.sdk_app_id = SDKAPPID;
201201

202-
NSString* ns_user_id = [[NSString alloc]initWithUTF8String:info.user_id.c_str()];
202+
NSString* ns_user_id = [[NSString alloc]initWithUTF8String:user_id.c_str()];
203203
NSString* ns_user_sig = [GenerateTestUserSig genTestUserSig : ns_user_id];
204204
const char* c_string = [ns_user_sig cString];
205205
user_login_info_.user_sig = std::string(c_string);

‎Windows-Mac/RoomKit/Module/ScreenShareManager.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#define MODULE_SCREENSHAREMANAGER_H_
44

55
#include "include/IScreenShareManager.h"
6-
#include "TUIRoomEngine.h"
6+
#include "ITUIRoomEngine.h"
77
#include "ITRTCCloud.h"
88

99
#include "TUIRoomCoreCallback.h"

‎Windows-Mac/RoomKit/Module/TUIRoomCoreImpl.cpp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
#include "ScreenShareManager.h"
1313
#include "log.h"
1414

15-
#include "json.h"
16-
1715
#define TIMEOUT 15
1816
#define MAX_SEAT_COUNT 0
1917

@@ -135,8 +133,12 @@ int TUIRoomCoreImpl::Logout() {
135133
return 0;
136134
}
137135
const char* TUIRoomCoreImpl::GetSDKVersion() {
136+
#ifdef _WIN32
138137
sdk_version_ = TOSTRING(getLiteAvSDKVersion());
139138
return sdk_version_.c_str();
139+
#else
140+
return "";
141+
#endif
140142
}
141143
int TUIRoomCoreImpl::CreateRoom(const std::string& room_id, tuikit::TUISpeechMode speech_mode) {
142144
// 创建房间者为房主角色
@@ -1201,7 +1203,7 @@ void TUIRoomCoreImpl::OnFirstVideoFrame(const char* user_id, const TUIStreamType
12011203

12021204
// TUIRoomEngine callback
12031205
void TUIRoomCoreImpl::onError(tuikit::TUIError error_code, const char* message){}
1204-
void TUIRoomCoreImpl::onKickedOutOfRoom(const char* room_id,const char* message) {
1206+
void TUIRoomCoreImpl::onKickedOutOfRoom(const char* room_id,tuikit::TUIKickedOutOfRoomReason reason, const char* message) {
12051207
LINFO("onKickedOutOfRoom [room_id:%s] [message:%s]", room_id, message);
12061208
if (room_core_callback_ != nullptr) {
12071209
room_core_callback_->OnExitRoom(TUIExitRoomType::kKickOff, "room engine kicked out of room.");

‎Windows-Mac/RoomKit/Module/TUIRoomCoreImpl.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
#include "ITRTCCloud.h"
88

9-
#include "TUIRoomEngine.h"
10-
#include "TUIRoomDefine.h"
11-
#include "TUIRoomObserver.h"
9+
#include "ITUIRoomEngine.h"
10+
#include "ITUIRoomDefine.h"
11+
#include "ITUIRoomObserver.h"
1212

1313
#include "CommonDef.h"
1414
#include <unordered_map>
@@ -173,7 +173,7 @@ class TUIRoomCoreImpl : public TUIRoomCore,
173173
void onAllUserCameraDisableChanged(const char* room_id, bool is_disable) override;
174174
void onSendMessageForAllUserDisableChanged(const char* room_id, bool is_disable) override;
175175
void onRoomDismissed(const char* room_id) override;
176-
void onKickedOutOfRoom(const char* room_id, const char* message) override;
176+
void onKickedOutOfRoom(const char* room_id, tuikit::TUIKickedOutOfRoomReason reason, const char* message) override;
177177
void onRoomSpeechModeChanged(const char* room_id, tuikit::TUISpeechMode speech_mode) override;
178178
void onRemoteUserEnterRoom(const char* room_id, const tuikit::TUIUserInfo& user_info) override;
179179
void onRemoteUserLeaveRoom(const char* room_id, const tuikit::TUIUserInfo& user_info) override;

‎Windows-Mac/RoomKit/Module/include/TUIRoomDef.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <functional>
66
#include "TRTCTypeDef.h"
77

8-
#include "TUIRoomDefine.h"
8+
#include "ITUIRoomDefine.h"
99

1010
/**
1111
* Error codes

‎Windows-Mac/RoomKit/Resource/Language/translatebat/lrelease.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
%QTDIR%\bin\lrelease.exe ../RoomApp_en.ts -qm ../RoomApp_en.qm
2-
%QTDIR%\bin\lrelease.exe ../RoomApp_zh.ts -qm ../RoomApp_zh.qm
1+
%QTDIR%\bin\lrelease.exe ../RoomKit.ts -qm ../RoomKit_en.qm
2+
%QTDIR%\bin\lrelease.exe ../RoomKit_zh.ts -qm ../RoomKit_zh.qm

‎Windows-Mac/RoomKit/Resource/Language/translatebat/lupdate.bat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
%QTDIR%\bin\lupdate.exe ../../../RoomApp.pro -ts ../RoomApp_en.ts
2-
%QTDIR%\bin\lupdate.exe ../../../RoomApp.pro -ts ../RoomApp_zh.ts
3-
%QTDIR%\bin\linguist.exe ../RoomApp_zh.ts
4-
%QTDIR%\bin\linguist.exe ../RoomApp_en.ts
1+
%QTDIR%\bin\lupdate.exe ../../../RoomKit.pro -ts ../RoomKit_en.ts
2+
%QTDIR%\bin\lupdate.exe ../../../RoomKit.pro -ts ../RoomKit_zh.ts
3+
%QTDIR%\bin\linguist.exe ../RoomKit_zh.ts
4+
%QTDIR%\bin\linguist.exe ../RoomKit_en.ts

‎Windows-Mac/RoomKit/Resource/MacOSX/Info.plist‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,33 @@
55
<key>CFBundleDevelopmentRegion</key>
66
<string>China</string>
77
<key>CFBundleExecutable</key>
8-
<string>RoomApp</string>
8+
<string>RoomKit</string>
99
<key>CFBundleGetInfoString</key>
10-
<string>RoomApp 1.0.1</string>
10+
<string>RoomKit 1.0.1</string>
1111
<key>CFBundleIconFile</key>
12-
<string>RoomApp.icns</string>
12+
<string>RoomKit.icns</string>
1313
<key>CFBundleIdentifier</key>
1414
<string>com.tencent.trtcAppMac</string>
1515
<key>CFBundleInfoDictionaryVersion</key>
1616
<string>6.0</string>
1717
<key>CFBundleLongVersionString</key>
18-
<string>RoomApp 1.0.1</string>
18+
<string>RoomKit 1.0.1</string>
1919
<key>CFBundleName</key>
20-
<string>RoomApp</string>
20+
<string>RoomKit</string>
2121
<key>CFBundlePackageType</key>
2222
<string>APPL</string>
2323
<key>CFBundleShortVersionString</key>
2424
<string>1.0.1</string>
2525
<key>CFBundleSignature</key>
2626
<string>????</string>
2727
<key>CFBundleVersion</key>
28-
<string>RoomApp 1.0.1</string>
28+
<string>RoomKit 1.0.1</string>
2929
<key>CSResourcesFileMapped</key>
3030
<true/>
3131
<key>LSRequiresCarbon</key>
3232
<true/>
3333
<key>NSHumanReadableCopyright</key>
34-
<string>2021 RoomApp</string>
34+
<string>2021 RoomKit</string>
3535
<key>NSPrincipalClass</key>
3636
<string>NSApplication</string>
3737
<key>NSHighResolutionCapable</key>

‎Windows-Mac/RoomKit/RoomKit.pri‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
HEADERS += ../utils/json.h \
2-
../utils/log.h \
1+
HEADERS += ../utils/log.h \
32
../utils/UserDirectory.h \
4-
../Common/MessageDispatcher/MessageDispatcher.h \
53
../Common/ViewDragger.h \
64
../Common/ScreenCenter.h \
75
../Common/TXMessageBox.h \
86
../Common/TXImageButton.h \
97
../Common/StatusUpdateCenter.h \
108
../Common/DataReport.h \
9+
./App/Common/MessageDispatcher/MessageDispatcher.h \
1110
./App/Common/DataStore.h \
1211
./App/CommonDef.h \
1312
./App/BottomBarController.h \
@@ -39,16 +38,15 @@ macx{
3938
HEADERS +=../utils/usersig/mac/GenerateTestUserSig.h
4039
}
4140

42-
SOURCES += ../utils/jsoncpp.cpp \
43-
../utils/log.cpp \
41+
SOURCES += ../utils/log.cpp \
4442
../utils/UserDirectory.cpp \
45-
../Common/MessageDispatcher/MessageDispatcher.cpp \
4643
../Common/ScreenCenter.cpp \
4744
../Common/TXMessageBox.cpp \
4845
../Common/TXImageButton.cpp \
4946
../Common/ViewDragger.cpp \
5047
../Common/StatusUpdateCenter.cpp \
5148
../Common/DataReport.cpp \
49+
./App/Common/MessageDispatcher/MessageDispatcher.cpp \
5250
./App/Common/DataStore.cpp \
5351
./App/BottomBarController.cpp \
5452
./App/ChatMessageView.cpp \
@@ -103,4 +101,4 @@ FORMS += ../Common/Form/TXMessageBox.ui \
103101
./App/Form/TransferRoomController.ui \
104102
./App/Form/TransferUserItem.ui
105103

106-
RESOURCES += Resource/RoomApp.qrc
104+
RESOURCES += Resource/RoomKit.qrc

‎Windows-Mac/RoomKit/RoomKit.pro‎

Lines changed: 57 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1-
QT += core gui webenginewidgets network
1+
QT += core gui network
22

33
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
44

5-
TARGET = RoomApp
5+
QMAKE_MACOSX_DEPLOYMENT_TARGET= 11.0
6+
7+
TARGET = RoomKit
68
TEMPLATE = app
79

810
CONFIG += c++11
911
CONFIG += debug_and_release warn_on
10-
CONFIG += thread exceptions rtti stl
12+
CONFIG += thread exceptions stl
13+
CONFIG += rtti_off
1114

1215
# set path for auto-generated ui header files
1316
UI_DIR = ./auto-generated/ui_auto_gen
@@ -20,16 +23,18 @@ OBJECTS_DIR += ./auto-generated/release
2023

2124
DESTDIR = ../bin
2225

23-
include(RoomApp.pri)
26+
include(RoomKit.pri)
2427
include(RoomModule.pri)
25-
RESOURCES += $$PWD/Resource/RoomApp.qrc
28+
RESOURCES += $$PWD/Resource/RoomKit.qrc
2629

27-
INCLUDEPATH += $$PWD/../Module/include
28-
DEPENDPATH += $$PWD/../Module/include
30+
INCLUDEPATH += $$PWD/Module/include
31+
DEPENDPATH += $$PWD/Module/include
2932
INCLUDEPATH += $$PWD/../utils
3033
INCLUDEPATH += $$PWD/../utils/jsoncpp
34+
INCLUDEPATH += $$PWD/../utils/BugReport
35+
INCLUDEPATH += $$PWD/3rdParty/zlib/include
3136
INCLUDEPATH += $$PWD/../Common
32-
INCLUDEPATH += $$PWD/../Common/MessageDispatcher
37+
INCLUDEPATH += $$PWD/App/Common/MessageDispatcher
3338

3439
INCLUDEPATH += $${SOURCE_PATHS}
3540
DEPENDPATH += $${SOURCE_PATHS}
@@ -43,45 +48,43 @@ QMAKE_LFLAGS_RELEASE = $$QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO
4348

4449
win32 {
4550
contains(QT_ARCH,i386) {
46-
INCLUDEPATH += $$PWD/../SDK/LiteAVSDK/CPlusPlus/Win32/include/
47-
INCLUDEPATH += $$PWD/../SDK/LiteAVSDK/CPlusPlus/Win32/include/TRTC
48-
49-
LIBS += -L"$(ProjectDir)../SDK/LiteAVSDK/CPlusPlus/Win32/lib" \
50-
-L"$(ProjectDir)../SDK/ImSDK/Win/lib/Win32" \
51-
-L"$(ProjectDir)3rdParty/zlib/x86" \
52-
-L"$(ProjectDir)bin" \
51+
INCLUDEPATH += $$PWD/../utils/usersig/win/include
52+
DEPENDPATH += $$PWD/../utils/usersig/win/include
53+
INCLUDEPATH += $$PWD/../SDK/RoomEngineSDK/include/
54+
INCLUDEPATH += $$PWD/../SDK/RoomEngineSDK/include/room/
55+
INCLUDEPATH += $$PWD/../SDK/RoomEngineSDK/include/liteav/
56+
INCLUDEPATH += $$PWD/../SDK/RoomEngineSDK/include/liteav/TRTC
57+
58+
LIBS += -L"$$PWD/../SDK/RoomEngineSDK/lib/Win32" \
59+
-L"$$PWD/3rdParty/zlib/x86" \
60+
-L"$$PWD/bin" \
61+
-lTUIRoomEngine \
5362
-lliteav \
54-
-lImSDK \
55-
-lzlibstatic
63+
-lzlibstatic \
64+
-lUser32 \
65+
-lgdi32
5666
} else {
57-
INCLUDEPATH += $$PWD/../SDK/LiteAVSDK/CPlusPlus/Win64/include/
58-
INCLUDEPATH += $$PWD/../SDK/LiteAVSDK/CPlusPlus/Win64/include/TRTC
67+
INCLUDEPATH += $$PWD/../SDK/RoomEngineSDK/include/
68+
INCLUDEPATH += $$PWD/../SDK/RoomEngineSDK/include/room/
69+
INCLUDEPATH += $$PWD/../SDK/RoomEngineSDK/include/liteav/
70+
INCLUDEPATH += $$PWD/../SDK/RoomEngineSDK/include/liteav/TRTC
5971

60-
LIBS += -L"$(ProjectDir)../SDK/LiteAVSDK/CPlusPlus/Win64/lib" \
61-
-L"$(ProjectDir)../SDK/ImSDK/Win/lib/Win64" \
72+
LIBS += -L"$(ProjectDir)../SDK/RoomEngineSDK/lib/Win64" \
6273
-L"$(ProjectDir)3rdParty/zlib/x86_64" \
6374
-L"$(ProjectDir)bin" \
75+
-lTUIRoomEngine \
6476
-lliteav \
65-
-lImSDK \
66-
-lzlibstatic
77+
-lzlibstatic \
78+
-lUser32 \
79+
-lgdi32
6780
}
68-
69-
INCLUDEPATH += $$PWD/../SDK/ImSDK/Win/include/
70-
INCLUDEPATH += $$PWD/../utils/BugReport/
71-
INCLUDEPATH += $$PWD/3rdParty/zlib/include/
72-
INCLUDEPATH += $$PWD/../utils/usersig/win/include
73-
DEPENDPATH += $$PWD/../utils/usersig/win/include
7481
}
7582

7683
macx {
7784
QMAKE_INFO_PLIST += Info.plist
7885

79-
# 添加库依赖
80-
LIBS += "-F$$PWD/../utils/usersig/mac"
81-
LIBS += "-F$$PWD/../SDK/LiteAVSDK/CPlusPlus/Mac"
82-
LIBS += "-F$$PWD/../SDK/ImSDK/Mac"
83-
LIBS += -framework TXLiteAVSDK_TRTC_Mac
84-
LIBS += -framework ImSDKForMac_CPP
86+
INCLUDEPATH += $$PWD/../utils/usersig/mac
87+
8588
LIBS += -framework Accelerate
8689
LIBS += -framework AudioUnit
8790
LIBS += -lbz2
@@ -113,36 +116,32 @@ LIBS += -lz
113116
LIBS += -ObjC
114117
LIBS += -framework Metal
115118
LIBS += -framework QuartzCore
119+
LIBS += -framework ScreenCaptureKit
120+
LIBS += -framework IOSurface
121+
122+
INCLUDEPATH += $$PWD/../SDK/RoomEngineSDK/mac
123+
DEPENDPATH += $$PWD/../SDK/RoomEngineSDK/mac
124+
125+
LIBS += -F$$PWD/../SDK/RoomEngineSDK/mac/ -framework ImSDKForMac_Plus
126+
INCLUDEPATH += $$PWD/../SDK/RoomEngineSDK/mac/ImSDKForMac_Plus.framework/cpluscplus/include
116127

117-
LIBS += -F$$PWD/../SDK/LiteAVSDK/CPlusPlus/Mac/TXFFmpeg.xcframework/macos-arm64_x86_64
118-
LIBS += -F$$PWD/../SDK/LiteAVSDK/CPlusPlus/Mac/TXSoundTouch.xcframework/macos-arm64_x86_64
119-
LIBS += -framework TXFFmpeg
120-
LIBS += -framework TXSoundTouch
128+
LIBS += -F$$PWD/../SDK/RoomEngineSDK/mac/ -framework TXLiteAVSDK_TRTC_Mac
129+
INCLUDEPATH += $$PWD/../SDK/RoomEngineSDK/mac/TXLiteAVSDK_TRTC_Mac.framework/Headers/cpp_interface
121130

122-
ImSDK_FRAMEWORK.files = $$PWD/../SDK/ImSDK/Mac/ImSDKForMac_CPP.framework
123-
ImSDK_FRAMEWORK.path = /Contents/Frameworks
124-
QMAKE_BUNDLE_DATA += ImSDK_FRAMEWORK
131+
LIBS += -F$$PWD/../SDK/RoomEngineSDK/mac/ -framework TUIRoomEngine_Mac
132+
INCLUDEPATH += $$PWD/../SDK/RoomEngineSDK/mac/TUIRoomEngine_Mac.framework/Headers/cpp_interface
133+
DEPENDPATH += $$PWD/../SDK/RoomEngineSDK/mac/TUIRoomEngine_Mac.framework/Headers/cpp_interface
125134

126-
TXFFmpeg_FRAMEWORK.files = $$PWD/../SDK/LiteAVSDK/CPlusPlus/Mac/TXFFmpeg.xcframework/macos-arm64_x86_64/TXFFmpeg.framework
127-
TXFFmpeg_FRAMEWORK.path = /Contents/Frameworks
128-
QMAKE_BUNDLE_DATA += TXFFmpeg_FRAMEWORK
135+
LIBS += -F$$PWD/../SDK/RoomEngineSDK/mac/TXFFmpeg.xcframework/macos-arm64_x86_64/ -framework TXFFmpeg
129136

130-
TXSoundTouch_FRAMEWORK.files = $$PWD/../SDK/LiteAVSDK/CPlusPlus/Mac/TXSoundTouch.xcframework/macos-arm64_x86_64/TXSoundTouch.framework
131-
TXSoundTouch_FRAMEWORK.path = /Contents/Frameworks
132-
QMAKE_BUNDLE_DATA += TXSoundTouch_FRAMEWORK
137+
INCLUDEPATH += $$PWD/../SDK/RoomEngineSDK/mac/TXFFmpeg.xcframework/macos-arm64_x86_64
138+
DEPENDPATH += $$PWD/../SDK/RoomEngineSDK/mac/TXFFmpeg.xcframework/macos-arm64_x86_64
133139

134-
# 添加TXLiteAVSDK_TRTC_Mac.framework头文件
135-
INCLUDEPATH += $$PWD/../SDK/LiteAVSDK/CPlusPlus/Mac/TXLiteAVSDK_TRTC_Mac.framework/Headers/cpp_interface
136-
INCLUDEPATH += $$PWD/../SDK/LiteAVSDK/CPlusPlus/Mac/TXLiteAVSDK_TRTC_Mac.framework/Headers
140+
LIBS += -F$$PWD/../SDK/RoomEngineSDK/mac/TXSoundTouch.xcframework/macos-arm64_x86_64/ -framework TXSoundTouch
137141

138-
# 添加ImSDKForMac.framework头文件
139-
INCLUDEPATH += $$PWD/../SDK/ImSDK/Mac/ImSDKForMac_CPP.framework/Headers
140-
QMAKE_LFLAGS += -Wl,-rpath,@executable_path/../Frameworks/
142+
INCLUDEPATH += $$PWD/../SDK/RoomEngineSDK/mac/TXSoundTouch.xcframework/macos-arm64_x86_64
143+
DEPENDPATH += $$PWD/../SDK/RoomEngineSDK/mac/TXSoundTouch.xcframework/macos-arm64_x86_64
141144

142145
QMAKE_CXXFLAGS += -std=gnu++11
143146
#CONFIG += console
144-
145-
INCLUDEPATH += $$PWD/../utils/usersig/mac
146147
}
147-
148-

0 commit comments

Comments
 (0)