Merge branch 'dev_20221020'

main/build.gradle

@@ -72,7 +72,7 @@ dependencies {
     //短视频
     api project(':video')
     api project(':common')
-    //api project(':FaceUnity')//新娱美颜
+    api project(':FaceUnity')//新娱美颜
     implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'com.google.android.material:material:1.4.0'
     annotationProcessor rootProject.ext.dependencies["arouter-compiler"]

main/src/main/java/com/yunbao/main/activity/MainActivity.java

@@ -226,7 +226,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
         RongIMClient.init(this, RongcloudIMManager.RONG_IM_KEY, true);
         // RTCLib 初始化
         RCRTCConfig.Builder config = RCRTCConfig.Builder.create();
-        //config.enableEncoderTexture(false);//新娱美颜 需要关闭这个
+        config.enableEncoderTexture(false);//新娱美颜 需要关闭这个
         RCRTCEngine.getInstance().init(MainActivity.this, config.build());
         //推送跳直播间
         if (getIntent().getStringExtra("liveid") != null) {

main/src/main/java/com/yunbao/main/adapter/SettingAdapter.java

@@ -12,6 +12,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.yunbao.common.Constants;
 import com.yunbao.common.interfaces.OnItemClickListener;
+import com.yunbao.common.utils.DeviceUtils;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
 import com.yunbao.main.BuildConfig;
 import com.yunbao.main.R;
@@ -140,7 +141,7 @@ public class SettingAdapter extends RecyclerView.Adapter {
             if (bean.getId() == Constants.SETTING_CLEAR_CACHE) {
                 mText.setText(mCacheString);
             } else if (bean.getId() == 19) {
-                mText.setText(BuildConfig.VERSION_NAME);
+                mText.setText(DeviceUtils.getVersionName(itemView.getContext()));
                 mText.setTextColor(Color.parseColor("#969696"));
             } else {
                 mText.setText(mVersionString);