Merge pull request #21 from 3598906645/release-10.4.11163

release-10.4.11163

Author: masonqiaoA

Android/.gitignore

@@ -9,3 +9,4 @@ build/
 .cxx
 *.codecc/
 /build.yml
+tuicore

Android/debug/build.gradle

@@ -7,7 +7,6 @@ android {
  defaultConfig {
  minSdkVersion 17
  targetSdkVersion 26
- buildConfigField("boolean", "RTCube_APPSTORE", "${RTCube_AppStore}")
  }
 
  buildTypes {

Android/gradle.properties

@@ -12,5 +12,4 @@ org.gradle.jvmargs=-Xmx1536m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 android.useAndroidX=true
-android.enableJetifier=true
-RTCube_AppStore=false
+android.enableJetifier=true

Android/tuichatsalon/src/main/java/com/tencent/liteav/basic/RTCubeUtils.java

@@ -5,7 +5,10 @@
 import android.content.pm.PackageManager;
 import android.text.TextUtils;
 
+
 public class RTCubeUtils {
+ private static final String RTCUBE_PACKAGE_NAME = "com.tencent.trtc";
+
  public static String getApplicationName(Context context) {
  PackageManager packageManager = null;
  ApplicationInfo applicationInfo;
@@ -18,4 +21,8 @@ public static String getApplicationName(Context context) {
  String applicationName = (String) packageManager.getApplicationLabel(applicationInfo);
  return TextUtils.isEmpty(applicationName) ? "" : applicationName;
  }
+
+ public static boolean isRTCubeApp(Context context) {
+ return RTCUBE_PACKAGE_NAME.equals(context.getPackageName());
+ }
 }

Android/tuichatsalon/src/main/java/com/tencent/liteav/trtcchatsalon/model/impl/trtc/ChatSalonTRTCService.java

@@ -1,5 +1,7 @@
 package com.tencent.liteav.trtcchatsalon.model.impl.trtc;
 
+import static com.tencent.liteav.TXLiteAVCode.ERR_TRTC_USER_SIG_CHECK_FAILED;
+
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
@@ -59,18 +61,18 @@ public void setDelegate(ChatSalonTRTCServiceDelegate delegate) {
  public void enterRoom(int sdkAppId, int roomId, String userId, String userSign, int role, TXCallback callback) {
  if (sdkAppId == 0 || roomId == 0 || TextUtils.isEmpty(userId) || TextUtils.isEmpty(userSign)) {
  // 参数非法，可能执行了退房，或者登出
- TRTCLogger.e(TAG, "enter trtc room fail. params invalid. room id:" + roomId +
- " user id:" + userId + " sign is empty:" + TextUtils.isEmpty(userSign));
+ TRTCLogger.e(TAG, "enter trtc room fail. params invalid. room id:" + roomId
+ + " user id:" + userId + " sign is empty:" + TextUtils.isEmpty(userSign));
  if (callback != null) {
- callback.onCallback(-1, "enter trtc room fail. params invalid. room id:" +
- roomId + " user id:" + userId + " sign is empty:" + TextUtils.isEmpty(userSign));
+ callback.onCallback(-1, "enter trtc room fail. params invalid. room id:"
+ + roomId + " user id:" + userId + " sign is empty:" + TextUtils.isEmpty(userSign));
  }
  return;
  }
  mUserId = userId;
  mEnterRoomCallback = callback;
- TRTCLogger.i(TAG, "enter room, app id:" + sdkAppId + " room id:" + roomId + " user id:" +
- userId + " sign:" + TextUtils.isEmpty(userId));
+ TRTCLogger.i(TAG, "enter room, app id:" + sdkAppId + " room id:" + roomId + " user id:"
+ + userId + " sign:" + TextUtils.isEmpty(userId));
  mTRTCParams = new TRTCCloudDef.TRTCParams();
  mTRTCParams.sdkAppId = sdkAppId;
  mTRTCParams.userId = userId;
@@ -144,7 +146,8 @@ public void onEnterRoom(long l) {
  mEnterRoomCallback.onCallback(0, "enter room success.");
  } else {
  mIsInRoom = false;
- mEnterRoomCallback.onCallback((int) l, "enter room fail");
+ mEnterRoomCallback.onCallback((int) l, l == ERR_TRTC_USER_SIG_CHECK_FAILED
+ ? "userSig invalid, please login again" : "enter room fail");
  }
  }
  }
@@ -193,7 +196,8 @@ public void onError(int errorCode, String errorMsg, Bundle bundle) {
 
 
  @Override
- public void onNetworkQuality(final TRTCCloudDef.TRTCQuality trtcQuality, final ArrayList<TRTCCloudDef.TRTCQuality> arrayList) {
+ public void onNetworkQuality(final TRTCCloudDef.TRTCQuality trtcQuality,
+ final ArrayList<TRTCCloudDef.TRTCQuality> arrayList) {
  if (mDelegate != null) {
  mDelegate.onNetworkQuality(trtcQuality, arrayList);
  }
@@ -241,7 +245,8 @@ public void stopMicrophone() {
  }
 
  public void setSpeaker(boolean useSpeaker) {
- mTRTCCloud.setAudioRoute(useSpeaker ? TRTCCloudDef.TRTC_AUDIO_ROUTE_SPEAKER : TRTCCloudDef.TRTC_AUDIO_ROUTE_EARPIECE);
+ mTRTCCloud.setAudioRoute(useSpeaker
+ ? TRTCCloudDef.TRTC_AUDIO_ROUTE_SPEAKER : TRTCCloudDef.TRTC_AUDIO_ROUTE_EARPIECE);
  }
 
  public void setAudioCaptureVolume(int volume) {

Android/tuichatsalon/src/main/java/com/tencent/liteav/trtcchatsalon/ui/list/ChatSalonCreateActivity.java

@@ -1,8 +1,10 @@
 package com.tencent.liteav.trtcchatsalon.ui.list;
 
 import android.os.Bundle;
+
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
+
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -11,8 +13,8 @@
 import android.widget.TextView;
 
 import com.blankj.utilcode.util.ToastUtils;
+import com.tencent.liteav.basic.RTCubeUtils;
 import com.tencent.liteav.basic.UserModelManager;
-import com.tencent.liteav.debug.BuildConfig;
 import com.tencent.liteav.trtcchatsalon.R;
 import com.tencent.liteav.trtcchatsalon.ui.utils.StatusBarUtils;
 import com.tencent.liteav.trtcchatsalon.ui.room.ChatSalonAnchorActivity;
@@ -22,10 +24,11 @@
  * 创建语聊房页面
  */
 public class ChatSalonCreateActivity extends AppCompatActivity {
- private Toolbar mToolbar;
- private EditText mRoomNameEt;
- private TextView mEnterTv;
- private int MAX_LEN = 30;
+ private static final int MAX_LEN = 30;
+
+ private Toolbar mToolbar;
+ private EditText mRoomNameEt;
+ private TextView mEnterTv;
 
  private TextWatcher mEditTextWatcher = new TextWatcher() {
  @Override
@@ -75,30 +78,31 @@ public void onClick(View v) {
  }
 
  private void initThemeAndNickname() {
- String userId  = UserModelManager.getInstance().getUserModel().userId;
+ String userId = UserModelManager.getInstance().getUserModel().userId;
  String userName = UserModelManager.getInstance().getUserModel().userName;
  String showUserName = !TextUtils.isEmpty(userName) ? userName : userId;
  mRoomNameEt.setText(getString(R.string.trtcchatsalon_create_theme, showUserName));
  }
 
  private void createRoom() {
- String roomName  = mRoomNameEt.getText().toString();
- String userId  = UserModelManager.getInstance().getUserModel().userId;
- String userAvatar  = UserModelManager.getInstance().getUserModel().userAvatar;
+ String roomName = mRoomNameEt.getText().toString();
+ String userId = UserModelManager.getInstance().getUserModel().userId;
+ String userAvatar = UserModelManager.getInstance().getUserModel().userAvatar;
  String coverAvatar = UserModelManager.getInstance().getUserModel().userAvatar;
  String userName = UserModelManager.getInstance().getUserModel().userName;
  if (roomName.getBytes().length > MAX_LEN) {
  ToastUtils.showLong(getText(R.string.trtcchatsalon_warning_room_name_too_long));
  return;
  }
- ChatSalonAnchorActivity.createRoom(this, roomName, userId, userName, userAvatar, coverAvatar, TRTCCloudDef.TRTC_AUDIO_QUALITY_DEFAULT, true);
+ ChatSalonAnchorActivity.createRoom(this, roomName, userId, userName,
+ userAvatar, coverAvatar, TRTCCloudDef.TRTC_AUDIO_QUALITY_DEFAULT, true);
  finish();
  }
 
  private void initView() {
  mToolbar = (Toolbar) findViewById(R.id.toolbar);
  mRoomNameEt = (EditText) findViewById(R.id.et_room_name);
  mEnterTv = (TextView) findViewById(R.id.tv_enter);
- mRoomNameEt.setFocusableInTouchMode(!BuildConfig.RTCube_APPSTORE);
+ mRoomNameEt.setFocusableInTouchMode(!RTCubeUtils.isRTCubeApp(this));
  }
 }

Android/tuichatsalon/src/main/java/com/tencent/liteav/trtcchatsalon/ui/room/ChatSalonAudienceActivity.java

@@ -8,7 +8,7 @@
 import android.view.View;
 
 import com.blankj.utilcode.util.ToastUtils;
-import com.tencent.liteav.debug.BuildConfig;
+import com.tencent.liteav.basic.RTCubeUtils;
 import com.tencent.liteav.trtcchatsalon.R;
 import com.tencent.liteav.trtcchatsalon.model.TRTCChatSalonCallback;
 import com.tencent.liteav.trtcchatsalon.model.TRTCChatSalonDef;
@@ -102,7 +102,7 @@ public void onClick(View v) {
  }
  });
  TUILogin.addLoginListener(mTUILoginListener);
- mBtnReport.setVisibility(BuildConfig.RTCube_APPSTORE ? View.VISIBLE : View.GONE);
+ mBtnReport.setVisibility(RTCubeUtils.isRTCubeApp(this) ? View.VISIBLE : View.GONE);
  mBtnReport.setOnClickListener(new View.OnClickListener() {
  @Override
  public void onClick(View v) {