xiaoyan159/NavinfoOutDoor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改POI录像的崩溃问题

Browse Source
This commit is contained in:
md
2021-08-04 14:42:13 +08:00
parent 30ad378cde
commit 771fce9b79
13 changed files with 247 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/res/layout/activity_user.xml
View File

@@ -72,8 +72,8 @@
<Button
android:id="@+id/btn_attestation"
style="@style/user_style"
android:layout_width="70dp"
android:layout_height="30dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="10dp"
android:text="去认证"
@@ -102,8 +102,8 @@
/>
<Button
android:id="@+id/btn_gathering"
android:layout_width="70dp"
android:layout_height="30dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="10dp"
android:text="去绑定"
@@ -258,8 +258,8 @@
style="@style/user_text_style"
/>
<Button
android:layout_width="70dp"
android:layout_height="30dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="10dp"
android:text="去绑定"

78
app/src/main/res/layout/fragment_road.xml
View File

@@ -36,11 +36,11 @@
android:id="@+id/ll_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
android:background="@drawable/road_shape"
android:orientation="horizontal"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
app:layout_constraintStart_toStartOf="@+id/tv_message"
app:layout_constraintTop_toBottomOf="@+id/tv_message">
@@ -56,12 +56,12 @@
<EditText
android:id="@+id/et_road_name"
android:layout_width="match_parent"
android:gravity="center_vertical"
android:layout_height="match_parent"
android:textSize="14sp"
android:background="@null"
android:gravity="center_vertical"
android:inputType="text"
android:maxLines="1"
android:background="@null" />
android:textSize="14sp" />
</LinearLayout>
<TextView
@@ -79,8 +79,8 @@
android:id="@+id/ll_mode"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:layout_marginLeft="2dp"
android:layout_marginTop="15dp"
android:orientation="horizontal"
app:layout_constraintTop_toBottomOf="@id/tv_mode">
@@ -96,32 +96,32 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="@color/test_color_selector"
android:text="车行" />
android:text="车行"
android:textColor="@color/test_color_selector" />
<RadioButton
android:id="@+id/rb_bicycle"
android:layout_width="0dp"
android:textColor="@color/test_color_selector"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="自行车" />
android:text="自行车"
android:textColor="@color/test_color_selector" />
<RadioButton
android:id="@+id/rb_walking"
android:layout_width="0dp"
android:textColor="@color/test_color_selector"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="步行" />
android:text="步行"
android:textColor="@color/test_color_selector" />
<RadioButton
android:id="@+id/rb_manual"
android:layout_width="0dp"
android:textColor="@color/test_color_selector"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="手动" />
android:text="手动"
android:textColor="@color/test_color_selector" />
</RadioGroup>
</LinearLayout>
@@ -146,8 +146,8 @@
<TextView
android:id="@+id/tv_pictures"
style="@style/user_style"
android:layout_width="40dp"
android:layout_height="25dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:gravity="center"
android:text="拍照"
@@ -155,21 +155,35 @@
android:textSize="15sp" />
</LinearLayout>
<ImageView
android:id="@+id/iv_road_picture"
android:layout_width="200dp"
android:layout_height="100dp"
<FrameLayout
android:id="@+id/fm_road_picture"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
app:layout_constraintLeft_toLeftOf="@id/ll_pictures"
app:layout_constraintTop_toBottomOf="@id/ll_pictures" />
app:layout_constraintTop_toBottomOf="@id/ll_pictures">
<ImageView
android:id="@+id/iv_road_picture"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="140dp"
android:minHeight="70dp"
android:maxHeight="100dp"
android:maxWidth="200dp"
android:scaleType="fitXY"
/>
</FrameLayout>
<LinearLayout
android:id="@+id/ll_desc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintLeft_toLeftOf="@id/iv_road_picture"
app:layout_constraintTop_toBottomOf="@id/iv_road_picture">
app:layout_constraintLeft_toLeftOf="@id/fm_road_picture"
app:layout_constraintTop_toBottomOf="@id/fm_road_picture">
<TextView
android:layout_width="wrap_content"
@@ -179,6 +193,7 @@
android:text="03.描述"
android:textColor="@color/black"
android:textSize="16sp" />
<LinearLayout
android:id="@+id/linear_describe"
android:layout_width="match_parent"
@@ -187,24 +202,25 @@
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:background="@drawable/underline"
app:layout_constraintTop_toBottomOf="@id/tv_03"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_03">
<EditText
android:id="@+id/et_desc"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="30dp"
android:layout_margin="2dp"
android:gravity="top"
android:paddingLeft="10dp"
android:paddingTop="10dp"
android:background="@color/white"
android:focusable="true"
android:focusableInTouchMode="true"
android:background="@color/white"
android:gravity="top"
android:hint="任务描述"
android:textSize="15sp"
android:paddingLeft="10dp"
android:paddingTop="10dp"
android:paddingBottom="30dp"
android:textColor="@color/test_color_selector"
android:textSize="15sp"
/>

30
app/src/main/res/layout/poi_video_fragment.xml
View File

@@ -134,8 +134,8 @@
<TextView
android:id="@+id/tv_pictures"
style="@style/user_style"
android:layout_width="40dp"
android:layout_height="25dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:gravity="center"
android:text="拍照"
@@ -144,21 +144,31 @@
</LinearLayout>
<ImageView
android:id="@+id/iv_poi_video_picture"
android:layout_width="100dp"
android:layout_height="100dp"
<FrameLayout
android:id="@+id/fm_poi_video_picture"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
app:layout_constraintLeft_toLeftOf="@id/ll_pictures"
app:layout_constraintTop_toBottomOf="@id/ll_pictures" />
app:layout_constraintTop_toBottomOf="@id/ll_pictures">
<ImageView
android:id="@+id/iv_poi_video_picture"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="140dp"
android:minHeight="70dp"
android:maxHeight="100dp"
android:maxWidth="200dp"
android:scaleType="fitXY"/>
</FrameLayout>
<LinearLayout
android:id="@+id/ll_desc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintLeft_toLeftOf="@id/iv_poi_video_picture"
app:layout_constraintTop_toBottomOf="@id/iv_poi_video_picture">
app:layout_constraintLeft_toLeftOf="@id/fm_poi_video_picture"
app:layout_constraintTop_toBottomOf="@id/fm_poi_video_picture">
<RelativeLayout
android:id="@+id/linear_exist"
android:layout_width="match_parent"

1
app/src/main/res/values/dimens.xml
View File

@@ -2,4 +2,5 @@
<!--状态栏-->
<dimen name="top_pind_sp">20dp</dimen>
<dimen name="fab_margin">16dp</dimen>
<dimen name="default_widget_padding">6dp</dimen>
</resources>

1
app/src/main/res/values/styles.xml
View File

@@ -82,6 +82,7 @@
<!-- ‘我的-用户资料’方框设置-->
<style name="user_style">
<item name="android:background">@drawable/selector_red_bg</item>
<item name="android:padding">@dimen/default_widget_padding</item>
</style>
<!-- ‘我的-用户资料’字体设置-->
<style name="user_text_style">