【TUILiveKit】【Android】Update to the latest source code

lanqiiliu · MinTate · commit a118eaa86821 · 2024-04-26T10:42:52.000+08:00
diff --git a/Android/app/src/main/java/com/trtc/uikit/livekit/example/BaseActivity.java b/Android/app/src/main/java/com/trtc/uikit/livekit/example/BaseActivity.java
@@ -1,27 +1,15 @@
 package com.trtc.uikit.livekit.example;
 
 import android.content.Context;
-import android.graphics.Color;
 import android.graphics.Rect;
-import android.os.Build;
-import android.os.Bundle;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
+import com.trtc.tuikit.common.FullScreenActivity;
 
-public class BaseActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        initStatusBar();
-    }
+public class BaseActivity extends FullScreenActivity {
 
     @Override
     public boolean onTouchEvent(MotionEvent event) {
@@ -39,17 +27,4 @@ public boolean onTouchEvent(MotionEvent event) {
         }
         return super.onTouchEvent(event);
     }
-
-    private void initStatusBar() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            Window window = getWindow();
-            window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-            window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                    | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-            window.setStatusBarColor(Color.TRANSPARENT);
-        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-        }
-    }
 }
diff --git a/Android/app/src/main/java/com/trtc/uikit/livekit/example/main/AnchorActivity.java b/Android/app/src/main/java/com/trtc/uikit/livekit/example/main/AnchorActivity.java
@@ -3,15 +3,15 @@
 import android.os.Bundle;
 
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 
 import com.tencent.qcloud.tuicore.TUILogin;
+import com.trtc.tuikit.common.FullScreenActivity;
 import com.trtc.uikit.livekit.TUILivePreviewFragment;
 import com.trtc.uikit.livekit.example.R;
 
-public class AnchorActivity extends AppCompatActivity {
+public class AnchorActivity extends FullScreenActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
diff --git a/Android/app/src/main/java/com/trtc/uikit/livekit/example/main/AudienceActivity.java b/Android/app/src/main/java/com/trtc/uikit/livekit/example/main/AudienceActivity.java
@@ -3,14 +3,14 @@
 import android.os.Bundle;
 
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 
+import com.trtc.tuikit.common.FullScreenActivity;
 import com.trtc.uikit.livekit.example.R;
 import com.trtc.uikit.livekit.liveroom.TUILiveRoomAudienceFragment;
 
-public class AudienceActivity extends AppCompatActivity {
+public class AudienceActivity extends FullScreenActivity {
     public String mRoomId = "";
 
     @Override
diff --git a/Android/app/src/main/java/com/trtc/uikit/livekit/example/main/LiveActivity.java b/Android/app/src/main/java/com/trtc/uikit/livekit/example/main/LiveActivity.java
@@ -3,15 +3,17 @@
 import android.os.Bundle;
 
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 
+import com.tencent.cloud.tuikit.engine.room.TUIRoomDefine;
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.trtc.tuikit.common.FullScreenActivity;
 import com.trtc.uikit.livekit.common.core.LiveDefine;
 import com.trtc.uikit.livekit.example.R;
 import com.trtc.uikit.livekit.voiceroom.TUIVoiceRoomFragment;
 
-public class LiveActivity extends AppCompatActivity {
+public class LiveActivity extends FullScreenActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
diff --git a/Android/app/src/main/java/com/trtc/uikit/livekit/example/main/MainActivity.java b/Android/app/src/main/java/com/trtc/uikit/livekit/example/main/MainActivity.java
@@ -10,6 +10,7 @@
 import android.widget.EditText;
 import android.widget.TextView;
 
+import com.trtc.tuikit.common.util.ActivityLauncher;
 import com.trtc.uikit.livekit.common.core.LiveDefine;
 import com.trtc.uikit.livekit.example.BaseActivity;
 import com.trtc.uikit.livekit.example.R;
@@ -81,8 +82,7 @@ private void initView() {
         findViewById(R.id.btn_trtclivekit_link).setOnClickListener(v -> {
             Intent intent = new Intent(Intent.ACTION_VIEW);
             intent.setData(Uri.parse(SettingsConfig.TRTC_LIVE_ROOM_DOCUMENT_URL));
-            startActivity(intent);
+            ActivityLauncher.startActivity(MainActivity.this, intent);
         });
     }
-
 }
diff --git a/Android/tuilivekit/build.gradle b/Android/tuilivekit/build.gradle
@@ -28,7 +28,6 @@ dependencies {
     api 'androidx.constraintlayout:constraintlayout:2.1.1'
     api 'androidx.gridlayout:gridlayout:1.0.0'
     api "com.google.code.gson:gson:2.8.6"
-    api "com.github.bumptech.glide:glide:4.12.0"
 
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'com.github.yyued:SVGAPlayer-Android:2.6.1'
diff --git a/Android/tuilivekit/src/main/java/com/trtc/uikit/livekit/liveroom/core/RoomEngineService.java b/Android/tuilivekit/src/main/java/com/trtc/uikit/livekit/liveroom/core/RoomEngineService.java
@@ -78,6 +78,7 @@ public void enterRoom(String streamId, TUIRoomDefine.GetRoomInfoCallback callbac
             @Override
             public void onSuccess(TUIRoomDefine.RoomInfo roomInfo) {
                 LiveKitLog.info("RoomEngineService[" + mLiveRoomInfo.roomId + "] enterRoom:[Success]");
+                mLiveRoomInfo.maxSeatCount = roomInfo.maxSeatCount;
                 getSeatList();
                 getAudienceList();
                 if (callback != null) {
diff --git a/Android/tuilivekit/src/main/java/com/trtc/uikit/livekit/liveroom/core/ServiceInitializer.java b/Android/tuilivekit/src/main/java/com/trtc/uikit/livekit/liveroom/core/ServiceInitializer.java
@@ -12,6 +12,7 @@
 import com.tencent.qcloud.tuicore.TUICore;
 import com.tencent.qcloud.tuicore.TUILogin;
 import com.tencent.qcloud.tuicore.interfaces.ITUINotification;
+import com.trtc.tuikit.common.system.ContextProvider;
 
 import java.util.Map;
 
@@ -33,6 +34,9 @@ public void onNotifyEvent(String key, String subKey, Map<String, Object> param)
     public boolean onCreate() {
         TUICore.registerEvent(TUIConstants.TUILogin.EVENT_LOGIN_STATE_CHANGED,
                 TUIConstants.TUILogin.EVENT_SUB_KEY_USER_LOGIN_SUCCESS, mNotification);
+        if (getContext() != null) {
+            ContextProvider.setApplicationContext(this.getContext().getApplicationContext());
+        }
         return false;
     }
 
diff --git a/Android/tuilivekit/src/main/java/com/trtc/uikit/livekit/liveroom/data/LiveRoomInfo.java b/Android/tuilivekit/src/main/java/com/trtc/uikit/livekit/liveroom/data/LiveRoomInfo.java
@@ -37,6 +37,7 @@ public RoomConfig getRoomConfig() {
     public RoomConfig                                   roomConfig          = new RoomConfig();
     public CopyOnWriteArraySet<String>                  hasVideoList        = new CopyOnWriteArraySet<>();
     public CopyOnWriteArraySet<String>                  hasAudioList        = new CopyOnWriteArraySet<>();
+    public int                                          maxSeatCount        = 1;
 
     public LiveRoomInfo(String roomId) {
         this.roomId = roomId;
diff --git a/Android/tuilivekit/src/main/java/com/trtc/uikit/livekit/liveroom/view/anchor/component/livestreaming/AnchorLinkMicPanelAdapter.java b/Android/tuilivekit/src/main/java/com/trtc/uikit/livekit/liveroom/view/anchor/component/livestreaming/AnchorLinkMicPanelAdapter.java
@@ -161,7 +161,7 @@ private void bindMicDownTitleViewHolder(TitleItemViewHolder holder) {
     private void bindMicUpTitleViewHolder(TitleItemViewHolder holder) {
         holder.viewSeparation.setVisibility(View.GONE);
         holder.tvTitle.setText(mContext.getString(R.string.livekit_link_mic_up_title,
-                mLiveRoomInfo.linkingAudienceList.get().size()));
+                mLiveRoomInfo.linkingAudienceList.get().size(), mLiveRoomInfo.maxSeatCount));
     }
 
     @Override
diff --git a/Android/tuilivekit/src/main/java/com/trtc/uikit/livekit/liveroom/view/anchor/component/preview/AnchorPreviewView.java b/Android/tuilivekit/src/main/java/com/trtc/uikit/livekit/liveroom/view/anchor/component/preview/AnchorPreviewView.java
@@ -94,7 +94,6 @@ private void createRoom() {
         roomInfo.roomType = TUIRoomDefine.RoomType.LIVE;
         roomInfo.seatMode = TUIRoomDefine.SeatMode.APPLY_TO_TAKE;
         roomInfo.isSeatEnabled = true;
-        roomInfo.maxSeatCount = 9;
         TUICore.notifyEvent(EVENT_KEY_LIVE_KIT, EVENT_SUB_KEY_START_LIVE_ROOM, null);
         mRoomEngineService.createRoom(roomInfo, new TUIRoomDefine.ActionCallback() {
             @Override
diff --git a/Android/tuilivekit/src/main/java/com/trtc/uikit/livekit/liveroom/view/anchor/component/preview/FunctionView.java b/Android/tuilivekit/src/main/java/com/trtc/uikit/livekit/liveroom/view/anchor/component/preview/FunctionView.java
@@ -44,7 +44,8 @@ private void init() {
     private void initBeautyButton() {
         findViewById(R.id.iv_beauty).setOnClickListener(view -> {
             if (mDialogBeautyList == null) {
-                mDialogBeautyList = new PopupDialog(mContext, com.trtc.tuikit.common.R.style.TUICommonBottomDialogTheme);
+                mDialogBeautyList = new PopupDialog(mContext,
+                        com.trtc.tuikit.common.R.style.TUICommonBottomDialogTheme);
                 mDialogBeautyList.setOnDismissListener((dialogInterface) -> {
                 });
             }
diff --git a/Android/tuilivekit/src/main/res/values-zh/strings.xml b/Android/tuilivekit/src/main/res/values-zh/strings.xml
@@ -29,7 +29,7 @@
     <string name="livekit_accept">同意</string>
     <string name="livekit_reject">拒绝</string>
     <string name="livekit_enable_audience_request_link">允许观众申请连麦</string>
-    <string name="livekit_link_mic_up_title">当前麦位(%d/8)</string>
+    <string name="livekit_link_mic_up_title">当前麦位(%d/%d)</string>
     <string name="livekit_link_mic_down_title">连麦申请(%d)</string>
 
     <string name="livekit_title_link_mic_selector">选择连麦方式</string>
diff --git a/Android/tuilivekit/src/main/res/values/styles.xml b/Android/tuilivekit/src/main/res/values/styles.xml
@@ -35,4 +35,5 @@
         <item name="cornerFamily">rounded</item>
         <item name="cornerSize">12dp</item>
     </style>
+
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ private void bindMicDownTitleViewHolder(TitleItemViewHolder holder) {`
`161`	`161`	`private void bindMicUpTitleViewHolder(TitleItemViewHolder holder) {`
`162`	`162`	`holder.viewSeparation.setVisibility(View.GONE);`
`163`	`163`	`holder.tvTitle.setText(mContext.getString(R.string.livekit_link_mic_up_title,`
`164`		`- mLiveRoomInfo.linkingAudienceList.get().size()));`
	`164`	`+ mLiveRoomInfo.linkingAudienceList.get().size(), mLiveRoomInfo.maxSeatCount));`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`@Override`