1.添加推送逻辑,修改删除照片,修改友盟上的bug.

This commit is contained in:
wangdongsheng
2021-12-03 11:05:37 +08:00
parent bfe2f6b985
commit 8ff0e92c8a
59 changed files with 859 additions and 972 deletions

View File

@@ -38,7 +38,7 @@
app:layout_constraintTop_toTopOf="parent" />
<com.tencent.tencentmap.mapsdk.maps.TextureMapView
android:id="@+id/iv_map"
android:id="@+id/text_map_view"
android:layout_width="200dp"
android:layout_height="157dp"
app:layout_constraintHeight_default="percent"

View File

@@ -3,16 +3,16 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:background="?android:attr/selectableItemBackground"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground">
<ImageView
android:id="@+id/iv_tas_capacity"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginStart="10dp"
android:layout_marginTop="30dp"
android:layout_marginBottom="30dp"
android:layout_marginLeft="10dp"
android:layout_marginTop="20dp"
android:layout_marginBottom="20dp"
android:scaleType="fitCenter"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
@@ -28,16 +28,16 @@
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/iv_tas_capacity"
app:layout_constraintLeft_toRightOf="@id/iv_tas_capacity"
app:layout_constraintTop_toTopOf="@id/iv_tas_capacity"
/>
app:layout_constraintTop_toTopOf="@id/iv_tas_capacity" />
<LinearLayout
android:id="@+id/ll_results"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="@+id/iv_tas_capacity"
android:layout_marginRight="20dp"
app:layout_constraintBottom_toTopOf="@+id/textView"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@+id/iv_tas_capacity">
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/tv_results"
@@ -53,20 +53,24 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:text="通过"
android:text=""
app:layout_constraintBottom_toBottomOf="@id/tv_results"
app:layout_constraintLeft_toRightOf="@id/tv_results"
app:layout_constraintTop_toTopOf="@id/tv_results" />
</LinearLayout>
<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="5dp"
android:text="去测评>"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_results" />
app:layout_constraintBottom_toTopOf="@+id/view"
app:layout_constraintEnd_toEndOf="@+id/ll_results"
app:layout_constraintStart_toStartOf="@+id/ll_results"
app:layout_constraintTop_toBottomOf="@+id/ll_results" />
<View
android:id="@+id/view"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/colormap"

View File

@@ -20,15 +20,15 @@
android:id="@+id/iv_measurement_finish"
android:layout_width="wrap_content"
android:layout_height="45dp"
android:layout_alignParentLeft="true"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:src="@drawable/ic_baseline_arrow" />
<TextView
android:id="@+id/tv_event"
android:layout_width="wrap_content"
style="@style/text_style_toolbar_title"
android:layout_toRightOf="@id/iv_find_task"
android:text="试题测试" />
</LinearLayout>
<androidx.core.widget.NestedScrollView
@@ -38,16 +38,16 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/rl_capacity_measurement">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
>
android:layout_height="match_parent">
<TextView
android:id="@+id/tv_capacity_measurement"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="任务测试"
android:text=""
android:textColor="@color/colorGray"
android:textSize="30sp"
app:layout_constraintEnd_toEndOf="parent"
@@ -60,6 +60,7 @@
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:background="@drawable/shape_login"
android:visibility="gone"
android:text="提交"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
@@ -78,6 +79,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_capacity_measurement" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>

View File

@@ -12,7 +12,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="20dp"
app:layout_constraintTop_toTopOf="parent">
<ImageView
@@ -20,12 +19,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:layout_marginBottom="20dp"
android:background="@drawable/marker_poi"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/tv_poi"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/tv_poi"
@@ -35,7 +34,8 @@
android:text="POI任务列表"
android:textColor="@color/black"
app:layout_constraintLeft_toRightOf="@id/iv_poi"
app:layout_constraintTop_toTopOf="@id/iv_poi" />
app:layout_constraintTop_toTopOf="@id/iv_poi"
tools:ignore="HardcodedText" />
<LinearLayout
android:layout_width="wrap_content"
@@ -50,13 +50,15 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="审核中:"
android:textColor="#333"
android:textSize="12sp" />
<TextView
android:id="@+id/audit_process"
android:id="@+id/poi_audit_process"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -64,13 +66,15 @@
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:text="审核通过:"
android:textColor="#333"
android:textSize="12sp" />
<TextView
android:id="@+id/audit_through"
android:id="@+id/poi_audit_through"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -78,13 +82,15 @@
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:text="审核未通过:"
android:textColor="#333"
android:textSize="12sp" />
<TextView
android:id="@+id/audit_not_through"
android:id="@+id/poi_audit_not_through"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#333"
android:textSize="12sp" />
</LinearLayout>
@@ -95,7 +101,8 @@
android:src="@drawable/icon_arrow_right"
app:layout_constraintBottom_toBottomOf="@id/iv_poi"
app:layout_constraintRight_toRightOf="@id/has_submit_view"
app:layout_constraintTop_toTopOf="@id/iv_poi" />
app:layout_constraintTop_toTopOf="@id/iv_poi"
tools:ignore="ContentDescription" />
<View
android:id="@+id/has_submit_view"
@@ -109,12 +116,12 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/iv_poi" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_poiVideo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="20dp"
app:layout_constraintTop_toTopOf="parent">
<ImageView
@@ -122,11 +129,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:layout_marginBottom="20dp"
android:background="@drawable/marker_poi_video"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/tv_poiVideo"
@@ -136,7 +143,8 @@
android:text="POI录像任务列表"
android:textColor="@color/black"
app:layout_constraintLeft_toRightOf="@id/iv_poiVideo"
app:layout_constraintTop_toTopOf="@id/iv_poiVideo" />
app:layout_constraintTop_toTopOf="@id/iv_poiVideo"
tools:ignore="HardcodedText" />
<LinearLayout
android:layout_width="wrap_content"
@@ -151,6 +159,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="审核中:"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -158,6 +167,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -165,6 +175,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:text="审核通过:"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -172,6 +183,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -179,6 +191,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:text="审核未通过:"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -186,6 +199,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#333"
android:textSize="12sp" />
</LinearLayout>
@@ -196,7 +210,8 @@
android:src="@drawable/icon_arrow_right"
app:layout_constraintBottom_toBottomOf="@id/iv_poiVideo"
app:layout_constraintRight_toRightOf="@id/poiVideo_has_submit_view"
app:layout_constraintTop_toTopOf="@id/iv_poiVideo" />
app:layout_constraintTop_toTopOf="@id/iv_poiVideo"
tools:ignore="ContentDescription" />
<View
android:id="@+id/poiVideo_has_submit_view"
@@ -223,10 +238,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/marker_road"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="@id/view4"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
/>
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/tv_road"
@@ -236,7 +251,8 @@
android:text="道路任务列表"
android:textColor="@color/black"
app:layout_constraintLeft_toRightOf="@id/iv_road"
app:layout_constraintTop_toTopOf="@id/iv_road" />
app:layout_constraintTop_toTopOf="@id/iv_road"
tools:ignore="HardcodedText" />
<LinearLayout
android:layout_width="wrap_content"
@@ -250,6 +266,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="审核中:"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -258,6 +275,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -265,6 +283,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:text="审核通过:"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -272,6 +291,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -279,6 +299,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:text="审核未通过:"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -286,6 +307,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#333"
android:textSize="12sp" />
</LinearLayout>
@@ -296,7 +318,8 @@
android:src="@drawable/icon_arrow_right"
app:layout_constraintBottom_toBottomOf="@id/iv_road"
app:layout_constraintRight_toRightOf="@id/view4"
app:layout_constraintTop_toTopOf="@id/iv_road" />
app:layout_constraintTop_toTopOf="@id/iv_road"
tools:ignore="ContentDescription" />
<View
android:id="@+id/view4"
@@ -312,8 +335,7 @@
android:id="@+id/cl_charging"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
>
android:layout_marginStart="20dp">
<ImageView
android:id="@+id/iv_charging"
@@ -322,7 +344,8 @@
android:background="@drawable/marker_charge"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="@id/view5"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/tv_charging"
@@ -332,7 +355,8 @@
android:text="充电站任务列表"
android:textColor="@color/black"
app:layout_constraintLeft_toRightOf="@id/iv_charging"
app:layout_constraintTop_toTopOf="@id/iv_charging" />
app:layout_constraintTop_toTopOf="@id/iv_charging"
tools:ignore="HardcodedText" />
<LinearLayout
android:layout_width="wrap_content"
@@ -346,6 +370,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="审核中:"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -353,6 +378,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -360,6 +386,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:text="审核通过:"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -367,6 +394,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -374,6 +402,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:text="审核未通过:"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -381,6 +410,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#333"
android:textSize="12sp" />
</LinearLayout>
@@ -391,7 +421,8 @@
android:src="@drawable/icon_arrow_right"
app:layout_constraintBottom_toBottomOf="@id/iv_charging"
app:layout_constraintRight_toRightOf="@id/view5"
app:layout_constraintTop_toTopOf="@id/iv_charging" />
app:layout_constraintTop_toTopOf="@id/iv_charging"
tools:ignore="ContentDescription" />
<View
android:id="@+id/view5"
@@ -417,8 +448,8 @@
android:background="@drawable/marker_other"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="@id/other_audit_view"
app:layout_constraintTop_toTopOf="parent"
/>
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/tv_other"
@@ -428,8 +459,9 @@
android:layout_marginEnd="245dp"
android:text="其他任务列表"
android:textColor="@color/black"
app:layout_constraintLeft_toRightOf="@+id/iv_other"
app:layout_constraintTop_toTopOf="@id/iv_other" />
app:layout_constraintLeft_toRightOf="@+id/iv_other"
app:layout_constraintTop_toTopOf="@id/iv_other"
tools:ignore="HardcodedText" />
<LinearLayout
android:layout_width="wrap_content"
@@ -443,6 +475,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="审核中:"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -450,6 +483,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -457,6 +491,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:text="审核通过:"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -464,6 +499,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -471,6 +507,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:text="审核未通过:"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -478,6 +515,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#333"
android:textSize="12sp" />
</LinearLayout>
@@ -488,7 +526,8 @@
android:src="@drawable/icon_arrow_right"
app:layout_constraintBottom_toBottomOf="@id/iv_other"
app:layout_constraintRight_toRightOf="@id/other_audit_view"
app:layout_constraintTop_toTopOf="@id/iv_other" />
app:layout_constraintTop_toTopOf="@id/iv_other"
tools:ignore="ContentDescription" />
<View
android:id="@+id/other_audit_view"

View File

@@ -44,6 +44,4 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/rl_poiTask" />
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -26,9 +26,10 @@
android:layout_marginTop="18dp"
android:layout_marginBottom="5dp"
android:text="类型"
android:textColor="#333"
app:layout_constraintBottom_toTopOf="@+id/tv_stay_type"
app:layout_constraintStart_toStartOf="@+id/tv_stay_type"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_stay_type"
@@ -39,11 +40,12 @@
android:layout_marginBottom="20dp"
android:text="全部"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintStart_toStartOf="parent" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:background="@drawable/ic_baseline_arrow_forward"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -64,28 +66,35 @@
android:id="@+id/tv_result"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_margin="20dp"
android:layout_marginStart="10dp"
android:layout_marginTop="20dp"
android:layout_marginBottom="20dp"
android:text="筛选结果"
android:textColor="#333"
android:textSize="20sp" />
<TextView
android:id="@+id/tv_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_margin="10dp"
android:text="全选"
android:textSize="17sp"
/>
android:textColor="#333"
android:textSize="17sp" />
</RelativeLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/stay_xrv"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_constraintTop_toBottomOf="@+id/ll_results"
/>
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ll_results" />
<LinearLayout
android:id="@+id/ll_del"
android:layout_width="match_parent"

View File

@@ -29,6 +29,7 @@
android:ellipsize="end"
android:singleLine="true"
android:text="测试1"
android:textColor="#333"
android:textSize="15sp" />
<TextView
@@ -37,6 +38,7 @@
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:text="2021-05-08 13:24:36"
android:textColor="#333"
app:layout_constraintTop_toBottomOf="@id/tv_road_name" />
</LinearLayout>
@@ -46,6 +48,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="20dp"
android:visibility="visible"
android:textColor="#333"
app:layout_constraintBottom_toBottomOf="@+id/cb_unSubmit"
app:layout_constraintEnd_toStartOf="@+id/cb_unSubmit"
app:layout_constraintTop_toTopOf="@+id/cb_unSubmit" />

View File

@@ -23,7 +23,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="111111111"
android:text=""
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/iv_tas_explain"

View File

@@ -10,7 +10,7 @@
style="@style/text_style_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="标题"
android:text=""
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -19,7 +19,7 @@
style="@style/text_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="标题"
android:text=""
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@+id/tv_title"
app:layout_constraintTop_toBottomOf="@+id/tv_title" />
@@ -29,8 +29,8 @@
style="@style/text_style_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="15dp"
android:text="少时诵诗书所所"
android:layout_marginEnd="15dp"
android:text=""
app:layout_constraintBottom_toBottomOf="@+id/tv_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/tv_title" />
@@ -43,5 +43,5 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_createTime" />
/>
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -14,9 +14,8 @@
<FrameLayout
android:layout_width="match_parent"
android:background="@color/white"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="@color/white">
<com.tencent.tencentmap.mapsdk.maps.TextureMapView
android:id="@+id/treasure_map"
android:layout_width="match_parent"
@@ -31,16 +30,16 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center">
<ImageView
android:id="@+id/iv_message"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:layout_marginTop="80dp"
android:background="@drawable/iv_message"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent">
</ImageView>
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_mas_notification"
@@ -48,17 +47,16 @@
android:layout_height="10dp"
android:src="@drawable/ic_red_point"
android:visibility="gone"
app:layout_constraintTop_toTopOf="@+id/iv_message"
app:layout_constraintRight_toRightOf="@+id/iv_message"
/>
app:layout_constraintTop_toTopOf="@+id/iv_message" />
<TextView
android:id="@+id/tv_GPS"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="15dp"
android:visibility="gone"
android:textColor="#F44336"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/iv_message"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/iv_message" />
@@ -89,7 +87,7 @@
android:id="@+id/cb_map_type"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginRight="15dp"
android:layout_marginEnd="15dp"
android:background="@drawable/atlas_selector"
android:button="@null"
android:checked="false"
@@ -121,7 +119,7 @@
android:id="@+id/iv_zoom_add"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:layout_marginTop="15dp"
android:src="@mipmap/zoom_add"
app:layout_constraintBottom_toBottomOf="parent"
@@ -179,6 +177,7 @@
android:id="@+id/scroll_view"
android:layout_width="match_parent"
android:layout_height="wrap_content">
</FrameLayout>
</LinearLayout>
</LinearLayout>