Merge branch 'refs/heads/v6.8.1'

IAP6Helper/src/main/java/com/samsung/utils/SamsungUtil.java

@@ -40,7 +40,7 @@ public class SamsungUtil {
     public void init() {
         iapHelper = IapHelper.getInstance(mContext);
         //设置支付模式 OPERATION_MODE_PRODUCTION 正式模式  OPERATION_MODE_TEST  测试模式
-        iapHelper.setOperationMode(HelperDefine.OperationMode.OPERATION_MODE_TEST);
+        iapHelper.setOperationMode(HelperDefine.OperationMode.OPERATION_MODE_PRODUCTION);
     }
 
     public void dispose() {

common/src/main/res/values-zh/strings.xml

@@ -830,10 +830,8 @@
     <string name="facebook_app_id">2011402032399020</string>
     <string name="facebook_client_token">959584e054a33614996361f0044e5253</string>
 
-    <string name="twitter_key">ui10vIggex2F043HnztYNuA3g</string>
+    <string name="twitter_key">JDd7XEXrOkLcx0KkkJGUbD4MQ</string>
-    <string name="twitter_secret">J8jvBBeJoZbVojbkWUrvsj0K0UUkuV69CqQ7CEobhJn6tvAKpQ</string>
+    <string name="twitter_secret">TSRRRFvK8bOTZ3hfRq2omp5dEXcrMUeJ0WVH0dJa5EJAGZLTrE</string>
-    <string name="twitter_key2">F8t7PgspJ8Xl2k09ccqmnmynf</string>
-    <string name="twitter_secret2">aq0eV4R1pqMK_AAeKRWnjPr7ErGMGgTPGgZJdm73WeRY-Kluws</string>
 
     <string name="access_token">1527128092082286592-NfYVOcHXy630vYUj4nMlDPh8PsVBHE</string>
     <string name="Aaccess_token_secret">U5avdnRMb7yON6sYp4SAb1I99mFD8ch9KHIuFbEbd0IDN</string>

common/src/main/res/values/strings.xml

@@ -790,10 +790,8 @@
     <string name="facebook_app_id">2011402032399020</string>
     <string name="facebook_client_token">959584e054a33614996361f0044e5253</string>
 
-    <string name="twitter_key">ui10vIggex2F043HnztYNuA3g</string>
+    <string name="twitter_key">JDd7XEXrOkLcx0KkkJGUbD4MQ</string>
-    <string name="twitter_secret">J8jvBBeJoZbVojbkWUrvsj0K0UUkuV69CqQ7CEobhJn6tvAKpQ</string>
+    <string name="twitter_secret">TSRRRFvK8bOTZ3hfRq2omp5dEXcrMUeJ0WVH0dJa5EJAGZLTrE</string>
-    <string name="twitter_key2">ZWRrZnRUNlBlcHVxMXpsMzVmb2k6MTpjaQ</string>
-    <string name="twitter_secret2">aq0eV4R1pqMK_AAeKRWnjPr7ErGMGgTPGgZJdm73WeRY-Kluws</string>
 
     <string name="access_token">1527128092082286592-NfYVOcHXy630vYUj4nMlDPh8PsVBHE</string>
     <string name="Aaccess_token_secret">U5avdnRMb7yON6sYp4SAb1I99mFD8ch9KHIuFbEbd0IDN</string>

config.gradle

@@ -4,7 +4,7 @@ ext {
             buildToolsVersion: "29.0.2",
             minSdkVersion    : 23,
             targetSdkVersion : 34,
-            versionCode      : 697,
+            versionCode      : 698,
             versionName      : "6.8.1"
     ]
     manifestPlaceholders = [

lib_faceunity/src/main/java/io/agora/beautyapi/faceunity/agora/SWManager.java

@@ -5,13 +5,16 @@ import android.content.ContentResolver;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
+import android.hardware.camera2.CameraManager;
 import android.net.Uri;
 import android.text.TextUtils;
 import android.view.SurfaceView;
 import android.widget.FrameLayout;
 
+import androidx.annotation.NonNull;
 import androidx.core.content.res.ResourcesCompat;
 
+import com.blankj.utilcode.util.LogUtils;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.CommonAppContext;
 import com.yunbao.common.bean.SwTokenModel;
@@ -69,6 +72,7 @@ public class SWManager extends BaseCacheManager {
     private ImageTrackOptions imageTrackOptions = null;
 
     private onDrPkJoinSuccessListener onDrPkJoinSuccessListener;
+    String openCameraId = "1";
 
     public void setOnDrPkJoinSuccessListener(SWManager.onDrPkJoinSuccessListener onDrPkJoinSuccessListener) {
         this.onDrPkJoinSuccessListener = onDrPkJoinSuccessListener;
@@ -253,7 +257,20 @@ public class SWManager extends BaseCacheManager {
      */
     public void switchCamera() {
         if (mRtcEngine != null) {
-            mRtcEngine.switchCamera();
+            if (openCameraId.equals("0")) {
+                mRtcEngine.switchCamera("1");
+                openCameraId = "1";
+            } else {
+                mRtcEngine.switchCamera("0");
+                openCameraId = "0";
+            }
+        }
+    }
+
+    public void resetCamera() {
+        LogUtils.e("重置摄像头", openCameraId);
+        if (mRtcEngine != null && !TextUtils.isEmpty(openCameraId)) {
+             mRtcEngine.switchCamera(openCameraId);
         }
     }
 
@@ -525,6 +542,9 @@ public class SWManager extends BaseCacheManager {
         });
     }
 
+    public void release() {
+    }
+
     public interface onRtcEngineListener {
         void onOpenSuccess(String channel, int uid);
 

live/src/main/java/com/yunbao/live/views/LivePushSwViewHolder.java

@@ -504,8 +504,9 @@ public class LivePushSwViewHolder extends AbsRyLivePushViewHolder implements ITX
     public void onResume() {
         mPaused = false;
         Log.i("摄像头", "onResume: " + isNeedOpenCamera);
+        swManager.resetCamera();
         if (isNeedOpenCamera) {
-            RCRTCEngine.getInstance().getDefaultVideoStream().startCamera(new IRCRTCResultDataCallback<Boolean>() {
+            /*RCRTCEngine.getInstance().getDefaultVideoStream().startCamera(new IRCRTCResultDataCallback<Boolean>() {
                 @Override
                 public void onSuccess(Boolean data) {
                     //设置摄像头最大缩放比例
@@ -519,7 +520,7 @@ public class LivePushSwViewHolder extends AbsRyLivePushViewHolder implements ITX
                 public void onFailed(RTCErrorCode errorCode) {
                     Log.i("摄像头", "onFailed: 打开摄像头失败 " + errorCode);
                 }
-            });
+            });*/
         }
     }
 
@@ -550,6 +551,7 @@ public class LivePushSwViewHolder extends AbsRyLivePushViewHolder implements ITX
         super.release();
         Bus.getOff(this);
         onDestroy();
+        SWManager.get().release();
         LiveHttpUtil.cancel(LiveHttpConsts.LINK_MIC_TX_MIX_STREAM);
         rtcRoom = null;
     }
@@ -676,8 +678,11 @@ public class LivePushSwViewHolder extends AbsRyLivePushViewHolder implements ITX
 
     public interface onDrPkJoinSuccessListener {
         void joinSuccess1();
+
         void joinSuccess2();
+
         void joinSuccess3();
+
         void joinSuccess4();
 
     }