yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
lixiaopeng
2020-01-09 10:16:01 +08:00
parent 742b72d9e4
commit b93a5f2bb6
41 changed files with 262 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mogo-module-tanlu/src/main/res/layout/tanlu_activity_media_full.xml
View File

@@ -8,7 +8,7 @@
tools:context=".video.FullMediaActivity">
<!--全屏播放器-->
<com.mogo.tanlu.video.MediaCoverVideoPlayer
<com.mogo.module.tanlu.video.MediaCoverVideoPlayer
android:id="@+id/video_view"
android:layout_width="match_parent"
android:layout_height="match_parent"

4
modules/mogo-module-tanlu/src/main/res/layout/tanlu_fullscreen_video_view_pager.xml
View File

@@ -4,14 +4,14 @@
android:layout_height="match_parent"
android:background="@android:color/transparent">
<com.zhidao.roadcondition.video.MediaCoverVideoPlayer
<com.mogo.module.tanlu.video.MediaCoverVideoPlayer
android:id="@+id/video_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true"
android:longClickable="true" />
<com.zhidao.roadcondition.view.AutoZoomInImageView
<com.mogo.module.tanlu.view.AutoZoomInImageView
android:id="@+id/iv_pager_view"
android:layout_width="match_parent"
android:layout_height="match_parent"

4
modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler.xml
View File

@@ -68,13 +68,13 @@
android:layout_marginRight="16dp"
android:background="@drawable/shape_bg_222533_9px">
<com.mogo.tanlu.video.SimpleCoverVideoPlayer
<com.mogo.module.tanlu.video.SimpleCoverVideoPlayer
android:id="@+id/video_player_main"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone" />
<com.mogo.tanlu.view.AutoZoomInImageView
<com.mogo.module.tanlu.view.AutoZoomInImageView
android:id="@+id/tanlu_photo_imageView"
android:layout_width="match_parent"
android:layout_height="match_parent" />

2
modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_photo_recycler.xml
View File

@@ -28,7 +28,7 @@
android:layout_marginBottom="14dp"
android:textSize="20dp" />
<com.zhidao.roadcondition.view.AutoZoomInImageView
<com.mogo.module.tanlu.view.AutoZoomInImageView
android:id="@+id/recycle_photo_imageView"
android:layout_width="400dp"
android:layout_height="225dp"