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

Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0

Browse Source
This commit is contained in:
zhangyuanzhen
2020-01-07 17:41:21 +08:00
parent eb1053e4ba f5a0166701
commit 8209ca8f5e
37 changed files with 273 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerActivitiesScope.java
View File

@@ -9,7 +9,7 @@ public class MarkerActivitiesScope {
@SerializedName("content")
private String mContent;
@SerializedName("isCheck")
private Long mIsCheck;
private int mIsCheck;
public String getContent() {
return mContent;
@@ -19,11 +19,11 @@ public class MarkerActivitiesScope {
mContent = content;
}
public Long getIsCheck() {
public int getIsCheck() {
return mIsCheck;
}
public void setIsCheck(Long isCheck) {
public void setIsCheck(int isCheck) {
mIsCheck = isCheck;
}

6
modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerDynamicData.java
View File

@@ -11,7 +11,7 @@ public class MarkerDynamicData {
@SerializedName("name")
private String mName;
@SerializedName("type")
private Long mType;
private int mType;
public String getId() {
return mId;
@@ -29,11 +29,11 @@ public class MarkerDynamicData {
mName = name;
}
public Long getType() {
public int getType() {
return mType;
}
public void setType(Long type) {
public void setType(int type) {
mType = type;
}

6
modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerHobbyDatum.java
View File

@@ -9,7 +9,7 @@ public class MarkerHobbyDatum {
@SerializedName("content")
private String mContent;
@SerializedName("isCheck")
private Long mIsCheck;
private int mIsCheck;
public String getContent() {
return mContent;
@@ -19,11 +19,11 @@ public class MarkerHobbyDatum {
mContent = content;
}
public Long getIsCheck() {
public int getIsCheck() {
return mIsCheck;
}
public void setIsCheck(Long isCheck) {
public void setIsCheck(int isCheck) {
mIsCheck = isCheck;
}

12
modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerOnlineCar.java
View File

@@ -12,13 +12,13 @@ public class MarkerOnlineCar {
@SerializedName("carInfo")
private MarkerCarInfo mCarInfo;
@SerializedName("compatibility")
private Long mCompatibility;
private int mCompatibility;
@SerializedName("dynamicData")
private MarkerDynamicData mDynamicData;
@SerializedName("hobbyData")
private List<MarkerHobbyDatum> mHobbyData;
@SerializedName("isFocus")
private Long mIsFocus;
private int mIsFocus;
@SerializedName("location")
private MarkerLocation mLocation;
@SerializedName("type")
@@ -42,11 +42,11 @@ public class MarkerOnlineCar {
mCarInfo = carInfo;
}
public Long getCompatibility() {
public int getCompatibility() {
return mCompatibility;
}
public void setCompatibility(Long compatibility) {
public void setCompatibility(int compatibility) {
mCompatibility = compatibility;
}
@@ -66,11 +66,11 @@ public class MarkerOnlineCar {
mHobbyData = hobbyData;
}
public Long getIsFocus() {
public int getIsFocus() {
return mIsFocus;
}
public void setIsFocus(Long isFocus) {
public void setIsFocus(int isFocus) {
mIsFocus = isFocus;
}

6
modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerResponse.java
View File

@@ -7,7 +7,7 @@ import com.google.gson.annotations.SerializedName;
public class MarkerResponse {
@SerializedName("code")
private Long mCode;
private int mCode;
@SerializedName("msg")
private String mMsg;
@SerializedName("result")
@@ -15,11 +15,11 @@ public class MarkerResponse {
@SerializedName("sign")
private String mSign;
public Long getCode() {
public int getCode() {
return mCode;
}
public void setCode(Long code) {
public void setCode(int code) {
mCode = code;
}

6
modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerShareMusic.java
View File

@@ -9,7 +9,7 @@ public class MarkerShareMusic {
@SerializedName("id")
private String mId;
@SerializedName("likeNumber")
private Long mLikeNumber;
private int mLikeNumber;
@SerializedName("location")
private MarkerLocation mLocation;
@SerializedName("musicName")
@@ -29,11 +29,11 @@ public class MarkerShareMusic {
mId = id;
}
public Long getLikeNumber() {
public int getLikeNumber() {
return mLikeNumber;
}
public void setLikeNumber(Long likeNumber) {
public void setLikeNumber(int likeNumber) {
mLikeNumber = likeNumber;
}

18
modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerUserInfo.java
View File

@@ -7,31 +7,31 @@ import com.google.gson.annotations.SerializedName;
public class MarkerUserInfo {
@SerializedName("age")
private Long mAge;
private String mAge;
@SerializedName("gender")
private Long mGender;
private int mGender;
@SerializedName("sn")
private String mSn;
@SerializedName("userHead")
private String mUserHead;
@SerializedName("userId")
private Long mUserId;
private int mUserId;
@SerializedName("userName")
private String mUserName;
public Long getAge() {
public String getAge() {
return mAge;
}
public void setAge(Long age) {
public void setAge(String age) {
mAge = age;
}
public Long getGender() {
public int getGender() {
return mGender;
}
public void setGender(Long gender) {
public void setGender(int gender) {
mGender = gender;
}
@@ -51,11 +51,11 @@ public class MarkerUserInfo {
mUserHead = userHead;
}
public Long getUserId() {
public int getUserId() {
return mUserId;
}
public void setUserId(Long userId) {
public void setUserId(int userId) {
mUserId = userId;
}

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_blue.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.2 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_blue.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_blue_info.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.1 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_green.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.5 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_green.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_green_info.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.7 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_purple.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.6 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_purple.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_purple_info.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.6 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_listen.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_misic.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_news.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

15
modules/mogo-module-service/src/main/res/drawable/bg_map_marker_blue_info.xml Normal file
View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<gradient
android:angle="270"
android:endColor="#256BFF"
android:startColor="#5CC1FF" />
<corners android:radius="360dp" />
<padding
android:bottom="@dimen/dp_6"
android:left="@dimen/dp_6"
android:right="@dimen/dp_40"
android:top="@dimen/dp_6" />
</shape >

15
modules/mogo-module-service/src/main/res/drawable/bg_map_marker_green_info.xml Normal file
View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<gradient
android:angle="270"
android:endColor="#36B565"
android:startColor="#5ADFB2" />
<corners android:radius="360dp" />
<padding
android:bottom="@dimen/dp_6"
android:left="@dimen/dp_6"
android:right="@dimen/dp_40"
android:top="@dimen/dp_6" />
</shape >

15
modules/mogo-module-service/src/main/res/drawable/bg_map_marker_purple_info.xml Normal file
View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<gradient
android:angle="270"
android:endColor="#6828E8"
android:startColor="#C843FF" />
<corners android:radius="360dp" />
<padding
android:bottom="@dimen/dp_6"
android:left="@dimen/dp_6"
android:right="@dimen/dp_40"
android:top="@dimen/dp_6" />
</shape >

17
modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_blue.xml Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:id="@+id/shape_id" >
<!-- 倒三角 -->
<rotate
android:fromDegrees="45"
android:pivotX="135%"
android:pivotY="15%"
android:toDegrees="45" >
<shape android:shape="rectangle" >
<solid android:color="#256BFF" />
</shape >
</rotate >
</item >
</layer-list >

17
modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_green.xml Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:id="@+id/shape_id" >
<!-- 倒三角 -->
<rotate
android:fromDegrees="45"
android:pivotX="135%"
android:pivotY="15%"
android:toDegrees="45" >
<shape android:shape="rectangle" >
<solid android:color="#36B565" />
</shape >
</rotate >
</item >
</layer-list >

17
modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_purple.xml Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:id="@+id/shape_id" >
<!-- 倒三角 -->
<rotate
android:fromDegrees="45"
android:pivotX="135%"
android:pivotY="15%"
android:toDegrees="45" >
<shape android:shape="rectangle" >
<solid android:color="#C843FF" />
</shape >
</rotate >
</item >
</layer-list >

27
modules/mogo-module-service/src/main/res/layout/view_map_marker.xml
View File

@@ -1,15 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="@dimen/dp_140"
android:layout_height="@dimen/dp_155"
android:background="@drawable/bg_map_marker_green"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical" >
<ImageView
android:id="@+id/ivBg"
android:layout_width="@dimen/dp_88"
android:layout_height="@dimen/dp_105"
android:layout_gravity="center"
android:src="@drawable/bg_map_marker_blue"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/ivIcon"
android:layout_width="@dimen/dp_76"
android:layout_height="@dimen/dp_76"
android:layout_gravity="center"
android:src="@drawable/icon_default" />
android:layout_marginTop="@dimen/dp_6"
android:src="@drawable/icon_default"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</LinearLayout >
</androidx.constraintlayout.widget.ConstraintLayout >

29
modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml
View File

@@ -1,23 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/bg_map_marker_green_info"
android:gravity="center_vertical"
android:orientation="horizontal" >
<ImageView
android:id="@+id/ivIcon"
android:layout_width="@dimen/dp_80"
android:layout_height="@dimen/dp_80"
android:src="@drawable/icon_default" />
<TextView
android:id="@+id/tvMarkerContent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/bg_map_marker_blue_info"
android:drawableLeft="@drawable/icon_default"
android:drawablePadding="@dimen/dp_20"
android:gravity="center"
android:text="诗一样的女子"
android:textColor="#ffffff"
android:textSize="@dimen/sp_32" />
android:textSize="@dimen/sp_32"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</LinearLayout >
<ImageView
android:id="@+id/ivReverseTriangle"
android:layout_width="27dp"
android:layout_height="15dp"
android:src="@drawable/bg_shape_reverse_triangle_blue"
app:layout_constraintEnd_toEndOf="@+id/tvMarkerContent"
app:layout_constraintStart_toStartOf="@+id/tvMarkerContent"
app:layout_constraintTop_toBottomOf="@+id/tvMarkerContent" />
</androidx.constraintlayout.widget.ConstraintLayout >

2
modules/mogo-module-tanlu/build.gradle
View File

@@ -46,12 +46,14 @@ dependencies {
implementation rootProject.ext.dependencies.mogocommons
implementation rootProject.ext.dependencies.mogoserviceapi
implementation rootProject.ext.dependencies.modulecommon
implementation rootProject.ext.dependencies.moduleservice
} else {
implementation project(":libraries:mogo-map")
implementation project(":foudations:mogo-utils")
api project(":foudations:mogo-commons")
implementation project(':services:mogo-service-api')
implementation project(':modules:mogo-module-common')
implementation project(':modules:mogo-module-service')
}
implementation rootProject.ext.dependencies.androidxappcompat
implementation rootProject.ext.dependencies.androidxconstraintlayout

22
modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/fragment/TanluCardViewFragment.java
View File

@@ -25,6 +25,7 @@ import com.mogo.map.search.geo.MogoPoiItem;
import com.mogo.map.search.poisearch.IMogoPoiSearchListener;
import com.mogo.map.search.poisearch.MogoPoiResult;
import com.mogo.map.uicontroller.EnumMapUI;
import com.mogo.module.service.entity.MarkerExploreWay;
import com.mogo.service.MogoServicePaths;
import com.mogo.service.imageloader.IMogoImageLoaderListener;
import com.mogo.service.imageloader.IMogoImageloader;
@@ -60,13 +61,12 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
//map
private IMogoMarker mPoiMarker;
// private int position = -1;
// private int position = -1;
private IMogoMarkerManager mMarkerManager;
private IMogoMapService mMogoMapService;
//media
private GSYVideoOptionBuilder gsyVideoOptionBuilder = new GSYVideoOptionBuilder();
// private String videoUrl = "";
private String videoUrl = "http://ivi.bupt.edu.cn/hls/cctv1hd.m3u8";
private String imageUrl = "https://oimagec4.ydstatic.com/image?id=-5397300958976572132&product=adpublish&w=520&h=347";
SimpleCoverVideoPlayer simpleCoverVideoPlayer;
@@ -75,6 +75,7 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
private TextView mPreviousTv;
private TextView mNextTv;
private List<MarkerExploreWay> markerExploreWayList;
@Override
protected int getLayoutId() {
@@ -189,11 +190,26 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
*/
@Override
public boolean onMarkerClicked(IMogoMarker marker) {
marker.getObject();
//点击marker以后，确认他的位置？然后点击下一个操作
MarkerExploreWay exploreWay = (MarkerExploreWay) marker.getObject();
return true;
}
/**
* 刷新单个数据,更新位置positon TODO
*/
// private void refreshSingleData() {
// markerExploreWayList
// }
/**
*
* @return
*/
// private void
@NonNull
@Override

4
modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="6dp" />
<solid android:color="@color/color_A2A2A2"/>
<corners android:radius="5dp" />
<solid android:color="@color/color_DADAE2"/>
</shape>

5
modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533_10px.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="10dp" />
<solid android:color="@color/color_F8F8F8"/>
</shape>

8
modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533_6px_top.xml
View File

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:topLeftRadius="6dp"
android:topRightRadius="6dp"
android:bottomLeftRadius="0dp"
android:bottomRightRadius="0dp"/>
<solid android:color="@color/color_222533"/>
</shape>

5
modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533_9px.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="10dp" />
<solid android:color="@color/color_222533"/>
</shape>

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

@@ -15,21 +15,20 @@
android:clickable="true"
android:longClickable="true" />
<!--顶部区域-->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout_media"
android:layout_width="match_parent"
android:layout_height="84dp"
android:background="@color/color_323131"
android:layout_height="66dp"
android:background="@color/color_191C25"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/iv_media_back"
android:layout_width="45dp"
android:layout_height="45dp"
android:layout_marginLeft="16dp"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginLeft="22dp"
android:layout_marginTop="18dp"
android:clickable="true"
android:src="@drawable/public_arrow_back_iv"
@@ -40,13 +39,13 @@
android:id="@+id/tv_media_title_content"
android:layout_width="560dp"
android:layout_height="wrap_content"
android:layout_marginTop="28dp"
android:layout_marginTop="20dp"
android:ellipsize="end"
android:gravity="center"
android:maxWidth="560dp"
android:maxLines="1"
android:textColor="@color/white"
android:textSize="20dp"
android:textSize="19dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -54,12 +53,12 @@
<TextView
android:id="@+id/tv_media_title_time"
android:layout_width="wrap_content"
android:layout_height="21dp"
android:layout_marginTop="28dp"
android:layout_height="wrap_content"
android:layout_marginTop="21dp"
android:layout_marginRight="50dp"
android:gravity="center"
android:textColor="@color/white"
android:textSize="18dp"
android:textSize="13dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,46 +1,63 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="400dp"
android:layout_height="400dp"
android:layout_marginTop="30dp">
android:layout_width="330dp"
android:layout_height="330dp"
android:background="@drawable/shape_bg_222533_10px">
<!--顶部view-->
<RelativeLayout
android:id="@+id/layout_top_view"
android:layout_width="match_parent"
android:layout_height="94dp"
android:background="@drawable/shape_bg_222533_6px_top">
android:layout_height="wrap_content">
<TextView
android:id="@+id/tv_information_media_content"
android:layout_width="match_parent"
android:layout_height="28dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="22dp"
android:layout_marginRight="20dp"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginTop="25dp"
android:layout_marginRight="16dp"
android:ellipsize="end"
android:gravity="center_vertical"
android:maxLines="1"
android:text="@string/main_empty_location"
android:textColor="@color/white"
android:textSize="22dp" />
android:textColor="@color/color_3"
android:textStyle="bold"
android:textSize="18dp" />
<TextView
android:id="@+id/tv_distance_video"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_information_media_content"
android:layout_marginLeft="20dp"
android:layout_marginTop="3dp"
android:layout_marginBottom="18dp"
android:textSize="20dp" />
android:layout_marginLeft="16dp"
android:layout_marginTop="2dp"
android:layout_marginBottom="5dp"
android:text="666KM"
android:textColor="@color/color_666666"
android:textStyle="bold"
android:textSize="13dp" />
<TextView
android:id="@+id/tv_information_media_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="16dp"
android:layout_below="@+id/tv_information_media_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="2019-10-10"
android:textColor="@color/color_999999"
android:textSize="13dp" />
</RelativeLayout>
<!--视频播放器和图片播放器-->
<RelativeLayout
android:id="@+id/media_layout"
android:layout_width="400dp"
android:layout_height="225dp"
android:layout_width="298dp"
android:layout_height="177dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:background="@drawable/shape_bg_222533_9px"
android:layout_below="@+id/layout_top_view">
<com.mogo.tanlu.video.SimpleCoverVideoPlayer
@@ -53,77 +70,43 @@
android:id="@+id/tanlu_photo_imageView"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</RelativeLayout>
<!--底部view-->
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="80dp"
android:layout_below="@+id/media_layout"
android:background="@drawable/shape_bg_222533_6px_bottom">
<ImageView
android:id="@+id/username_image_video"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerVertical="true"
android:layout_marginLeft="20dp"
android:src="@mipmap/ic_launcher"
android:visibility="gone" />
<TextView
android:id="@+id/tv_username_video"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:layout_toRightOf="@+id/username_image_video"
android:text="你好小智"
android:textColor="@color/white"
android:textSize="18dp"
android:visibility="gone" />
<TextView
android:id="@+id/tv_information_media_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:paddingLeft="15dp"
android:paddingRight="17dp"
android:text="2019-10-10"
android:textColor="@color/color_9A9A9A"
android:textSize="16dp"
android:visibility="gone" />
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginBottom="21dp"
android:layout_below="@+id/media_layout">
<TextView
android:id="@+id/tv_previous_res"
android:layout_width="110dp"
android:layout_width="142dp"
android:layout_height="45dp"
android:layout_centerVertical="true"
android:layout_marginLeft="35dp"
android:layout_marginLeft="16dp"
android:background="@drawable/shape_bg_222533"
android:gravity="center_vertical|center_horizontal"
android:text="上一个"
android:textColor="@color/white"
android:textSize="18dp" />
android:drawableLeft="@drawable/default_image"
android:text="@string/tanlu_previous"
android:textColor="@color/color_545362"
android:textSize="13dp" />
<TextView
android:id="@+id/tv_next_res"
android:layout_width="110dp"
android:layout_width="142dp"
android:layout_height="45dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="35dp"
android:layout_marginRight="16dp"
android:background="@drawable/shape_bg_222533"
android:gravity="center_vertical|center_horizontal"
android:text="下一个"
android:textColor="@color/white"
android:textSize="18dp" />
android:drawableRight="@drawable/default_image"
android:text="@string/tanlu_next"
android:paddingRight="10dp"
android:textColor="@color/color_545362"
android:textSize="13dp" />
</RelativeLayout>
</RelativeLayout>

10
modules/mogo-module-tanlu/src/main/res/values/colors.xml
View File

@@ -25,8 +25,16 @@
<color name="color_213142">#213142</color>
<color name="white_alpha20">#33FFFFFF</color>
<color name="color_B3000000">#B3000000</color>
<color name="color_3">#333333</color>
<color name="color_0091FF">#0091FF</color>
<color name="color_d9000000">#d9000000</color>
<color name="red_tips">#FF1B1B</color>
<color name="color_F8F8F8">#F8F8F8</color>
<color name="color_3">#333333</color>
<color name="color_DADAE2">#DADAE2</color>
<color name="color_545362">#545362</color>
<color name="color_191C25">#99191C25</color>
<color name="color_666666">#666666</color>
<color name="color_999999">#999999</color>
</resources>

3
modules/mogo-module-tanlu/src/main/res/values/strings.xml
View File

@@ -15,6 +15,9 @@
<string name="voice_get_informations_tts">为您找到%s条路况信息</string>
<string name="start_mogo_car_connect">开启小智车联</string>
<string name="start_mogo_share">共享计划</string>
<string name="tanlu_previous">上一条</string>
<string name="tanlu_next">下一条</string>
<array name="searching_voice_string_array">
<item >正在为您搜索路况</item>