Merge branch 'dev_FaceUnity'

# Conflicts:
#	live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
#	live/src/main/res/layout/view_live_room.xml

app/src/main/AndroidManifest.xml

@@ -112,7 +112,8 @@
         <activity
             android:name="com.shayu.phonelive.activity.LauncherActivity"
             android:screenOrientation="portrait"
-            tools:ignore="LockedOrientationActivity">
+            tools:ignore="LockedOrientationActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/java/com/shayu/phonelive/AppContext.java

@@ -38,6 +38,7 @@ import com.yunbao.common.manager.imrongcloud.MessageIMManager;
 import com.yunbao.common.manager.imrongcloud.RecommendLiveRoom;
 import com.yunbao.common.utils.FileUtil;
 import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.faceunity.FaceManager;
 import com.yunbao.live.views.RecommendLiveRoomProvider;
 import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
 import com.yunbao.common.utils.L;
@@ -119,7 +120,7 @@ public class AppContext extends CommonAppContext {
     public void onCreate() {
         super.onCreate();
         //注册全局异常捕获
-        //registerError();
+        registerError();
         sInstance = this;
         L.setDeBug(BuildConfig.DEBUG);
         AppEventsLogger.activateApp(this);
@@ -210,12 +211,12 @@ public class AppContext extends CommonAppContext {
                             if (TextUtils.isEmpty(PortraitLiveManager.liveID) && SocketRyClient.mSocketHandler != null) {
                                 SocketRyClient.mSocketHandler.sendMessage(msg);
                             }
-                        }else if(message.getConversationType()== Conversation.ConversationType.PRIVATE){//私聊信息
+                        } else if (message.getConversationType() == Conversation.ConversationType.PRIVATE) {//私聊信息
                             EventBus.getDefault().post(message);
                         }
                     }
                 } catch (Exception e) {
-                        e.printStackTrace();
+                    e.printStackTrace();
                 }
                 return false;
             }
@@ -249,14 +250,16 @@ public class AppContext extends CommonAppContext {
             }
         });
         configSPApp();
+        //初始化美颜SDK
+        FaceManager.initFaceUnity(this);
     }
 
     /**
      * 配置SharedPreferences默认值
      */
-    private void configSPApp(){
-        if(!SpUtil.getInstance().isExists(MsgSettActivity.SWITCH_PRIVATE_CHAT_MSG)){
-            SpUtil.getInstance().setBooleanValue(MsgSettActivity.SWITCH_PRIVATE_CHAT_MSG,true);
+    private void configSPApp() {
+        if (!SpUtil.getInstance().isExists(MsgSettActivity.SWITCH_PRIVATE_CHAT_MSG)) {
+            SpUtil.getInstance().setBooleanValue(MsgSettActivity.SWITCH_PRIVATE_CHAT_MSG, true);
         }
     }
 

app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java

@@ -1,5 +1,8 @@
 package com.shayu.phonelive.activity;
 
+import static com.yunbao.common.CommonAppContext.logger;
+import static com.yunbao.common.CommonAppContext.mFirebaseAnalytics;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
@@ -32,17 +35,14 @@ import com.tencent.rtmp.ui.TXCloudVideoView;
 import com.tencent.ugc.TXUGCBase;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.Constants;
-import com.yunbao.common.activity.WebViewActivity;
 import com.yunbao.common.bean.AdBean;
 import com.yunbao.common.bean.ConfigBean;
 import com.yunbao.common.bean.IMLoginModel;
-import com.yunbao.common.bean.UserBean;
 import com.yunbao.common.custom.CircleProgress;
 import com.yunbao.common.event.DataUserInfoEvent;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.http.CommonHttpConsts;
 import com.yunbao.common.http.CommonHttpUtil;
-import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.interfaces.CommonCallback;
 import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
@@ -53,17 +53,11 @@ import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.SpUtil;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.utils.WordUtil;
-import com.yunbao.live.activity.LiveAudienceActivity;
-import com.yunbao.live.bean.LiveBean;
-import com.yunbao.live.http.LiveHttpUtil;
-import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
 import com.yunbao.live.views.LauncherAdViewHolder;
 import com.yunbao.main.activity.EntryActivity;
 import com.yunbao.main.activity.MainActivity;
-import com.yunbao.main.activity.PDLiveConversationListActivity;
 import com.yunbao.main.http.MainHttpConsts;
 import com.yunbao.main.http.MainHttpUtil;
-import com.yunbao.main.manager.imrongcloud.ConversationIMListManager;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -75,9 +69,6 @@ import java.util.List;
 
 import myname.pdlive.shayu.R;
 
-import static com.yunbao.common.CommonAppContext.logger;
-import static com.yunbao.common.CommonAppContext.mFirebaseAnalytics;
-
 /**
  * Created by cxf on 2018/9/17.
  */