From 1757b848efa390d47edbdabc55cec45a2d195dd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Sat, 18 Sep 2021 19:15:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8E=A7?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8B=E6=B2=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 董宏宇 <martindhy@gmail.com>
---
 .../main/java/com/mogo/eagle/core}/view/LiveRoundLayout.java  | 4 ++--
 modules/mogo-module-extensions/build.gradle                   | 1 +
 .../mogo/module/extensions/live/CameraLiveGSYVideoView.java   | 4 ++--
 .../src/main/res/layout/camera_view_video_layout_normal.xml   | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)
 rename {modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions => core/mogo-core-res/src/main/java/com/mogo/eagle/core}/view/LiveRoundLayout.java (96%)

diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/view/LiveRoundLayout.java b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/view/LiveRoundLayout.java
similarity index 96%
rename from modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/view/LiveRoundLayout.java
rename to core/mogo-core-res/src/main/java/com/mogo/eagle/core/view/LiveRoundLayout.java
index 861275786f..dab80bf240 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/view/LiveRoundLayout.java
+++ b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/view/LiveRoundLayout.java
@@ -1,4 +1,4 @@
-package com.mogo.module.extensions.view;
+package com.mogo.eagle.core.view;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -8,7 +8,7 @@ import android.graphics.RectF;
 import android.util.AttributeSet;
 import android.widget.RelativeLayout;
 
-import com.mogo.module.extensions.R;
+import com.mogo.eagle.core.function.call.api.R;
 
 
 public class LiveRoundLayout extends RelativeLayout {
diff --git a/modules/mogo-module-extensions/build.gradle b/modules/mogo-module-extensions/build.gradle
index e8567b4506..29c1bede68 100644
--- a/modules/mogo-module-extensions/build.gradle
+++ b/modules/mogo-module-extensions/build.gradle
@@ -69,6 +69,7 @@ dependencies {
         implementation project(':modules:mogo-module-service')
 
         implementation project(':core:mogo-core-data')
+        implementation project(':core:mogo-core-res')
         implementation project(':core:mogo-core-function-call')
 
     }
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraLiveGSYVideoView.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraLiveGSYVideoView.java
index 9990494776..0e3b808d58 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraLiveGSYVideoView.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraLiveGSYVideoView.java
@@ -13,8 +13,8 @@ import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.ContextCompat;
 
+import com.mogo.eagle.core.view.LiveRoundLayout;
 import com.mogo.module.extensions.R;
-import com.mogo.module.extensions.view.LiveRoundLayout;
 import com.mogo.utils.logger.Logger;
 import com.tencent.rtmp.ITXLivePlayListener;
 import com.tencent.rtmp.TXLiveConstants;
@@ -25,7 +25,7 @@ import com.tencent.rtmp.ui.TXCloudVideoView;
 /**
  * V2XLiveGSYVideoView
  */
-public class CameraLiveGSYVideoView extends LiveRoundLayout  {
+public class CameraLiveGSYVideoView extends LiveRoundLayout {
     private static final String TAG = "CameraLiveGSYVideoView";
     private TXCloudVideoView mTxcVideoView;
     private ProgressBar mLoading;
diff --git a/modules/mogo-module-extensions/src/main/res/layout/camera_view_video_layout_normal.xml b/modules/mogo-module-extensions/src/main/res/layout/camera_view_video_layout_normal.xml
index a25796d122..9e213c7753 100644
--- a/modules/mogo-module-extensions/src/main/res/layout/camera_view_video_layout_normal.xml
+++ b/modules/mogo-module-extensions/src/main/res/layout/camera_view_video_layout_normal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.mogo.module.extensions.view.LiveRoundLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.mogo.eagle.core.view.LiveRoundLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -65,4 +65,4 @@
             app:layout_constraintTop_toBottomOf="@+id/ivErrorIcon" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</com.mogo.module.extensions.view.LiveRoundLayout>
+</com.mogo.eagle.core.view.LiveRoundLayout>