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

增加设置家和公司的功能

Browse Source
This commit is contained in:
zhangyuanzhen
2020-01-15 17:26:27 +08:00
parent 147bc5dc7d
commit 89645ecde6
16 changed files with 274 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/mogo-module-search/src/main/res/drawable/shape_round_gray_margin.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<corners android:radius="@dimen/dp_16"/>
<stroke android:width="@dimen/dp_2"
android:color="#979797"/>
</shape>

180
modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml
View File

@@ -6,10 +6,52 @@
android:clickable="true"
android:background="#2D2E3D"
android:orientation="vertical"
android:paddingLeft="@dimen/fragment_left_margin"
android:paddingRight="@dimen/dp_160"
android:paddingLeft="@dimen/dp_160"
>
<RelativeLayout
android:id="@+id/rl_navi_setting_title"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_80"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_30"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
>
<ImageView
android:id="@+id/iv_back"
android:layout_width="@dimen/dp_80"
android:layout_height="@dimen/dp_80"
android:layout_centerVertical="true"
android:src="@mipmap/icon_back"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp_20"
android:layout_toRightOf="@id/iv_back"
android:text="@string/navi_setting"
android:textColor="@color/white"
android:textSize="@dimen/txt_title"
/>
</RelativeLayout>
<ScrollView
android:layout_width="match_parent"
app:layout_constraintTop_toBottomOf="@+id/rl_navi_setting_title"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_height="0dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="180dp"
android:layout_height="@dimen/dp_120"
@@ -139,38 +181,6 @@
</LinearLayout>
<RelativeLayout
android:id="@+id/rl_navi_setting_title"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_80"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_30"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
>
<ImageView
android:id="@+id/iv_back"
android:layout_width="@dimen/dp_80"
android:layout_height="@dimen/dp_80"
android:layout_centerVertical="true"
android:src="@mipmap/icon_back"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp_20"
android:layout_toRightOf="@id/iv_back"
android:text="@string/navi_setting"
android:textColor="@color/white"
android:textSize="@dimen/txt_title"
/>
</RelativeLayout>
<TextView
@@ -195,7 +205,7 @@
android:textColor="@color/white"
android:textSize="@dimen/txt_normal"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/rl_navi_setting_title"
app:layout_constraintTop_toTopOf="parent"
/>
@@ -296,8 +306,108 @@
style="@style/rb_setting"
/>
</RadioGroup>
<TextView
android:id="@+id/tv_navi_address"
android:layout_width="400px"
android:layout_height="45px"
android:layout_marginTop="@dimen/dp_40"
android:text="@string/preference_navi_address"
android:textColor="@color/white"
android:textSize="@dimen/txt_normal"
app:layout_constraintTop_toBottomOf="@id/rg_navi_day_night"
app:layout_constraintLeft_toLeftOf="parent"
/>
<LinearLayout
android:layout_width="match_parent"
android:orientation="horizontal"
android:id="@+id/ll_navi_set_home"
android:gravity="center_vertical"
android:layout_marginTop="@dimen/dp_24"
android:background="@drawable/shape_round_gray_margin"
app:layout_constraintTop_toBottomOf="@id/tv_navi_address"
android:layout_height="@dimen/dp_120">
<ImageView
android:layout_marginLeft="@dimen/dp_40"
android:src="@mipmap/icon_navi_go_home"
android:layout_width="@dimen/dp_80"
android:layout_height="@dimen/dp_80"/>
<TextView
android:id="@+id/tv_navi_home_address"
android:layout_width="0dp"
android:layout_weight="1"
android:text="@string/navi_set_home"
android:textSize="@dimen/dp_40"
android:textColor="@color/white_80"
android:layout_marginLeft="@dimen/dp_32"
android:layout_height="wrap_content"/>
<TextView
android:id="@+id/tv_navi_clear_home_address"
android:layout_width="wrap_content"
android:text="@string/navi_clear"
android:textSize="@dimen/dp_40"
android:textColor="@color/txt_blue"
android:layout_marginRight="@dimen/dp_88"
android:layout_marginLeft="@dimen/dp_32"
android:layout_height="wrap_content"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:orientation="horizontal"
android:gravity="center_vertical"
android:layout_marginTop="@dimen/dp_40"
app:layout_constraintTop_toBottomOf="@id/ll_navi_set_home"
android:background="@drawable/shape_round_gray_margin"
android:layout_height="@dimen/dp_120">
<ImageView
android:layout_marginLeft="@dimen/dp_40"
android:src="@mipmap/icon_navi_go_company"
android:layout_width="@dimen/dp_80"
android:layout_height="@dimen/dp_80"/>
<TextView
android:id="@+id/tv_navi_company_address"
android:layout_width="0dp"
android:layout_weight="1"
android:text="@string/navi_set_company"
android:textSize="@dimen/dp_40"
android:textColor="@color/white_80"
android:layout_marginLeft="@dimen/dp_32"
android:layout_height="wrap_content"/>
<TextView
android:id="@+id/tv_navi_clear_company_address"
android:layout_width="wrap_content"
android:text="@string/navi_clear"
android:textSize="@dimen/dp_40"
android:textColor="@color/txt_blue"
android:layout_marginRight="@dimen/dp_88"
android:layout_marginLeft="@dimen/dp_32"
android:layout_height="wrap_content"/>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
</androidx.constraintlayout.widget.ConstraintLayout>

2
modules/mogo-module-search/src/main/res/layout/fragment_search_category.xml
View File

@@ -18,7 +18,7 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ll_navi_search"
app:cardBackgroundColor="#3F4057"
app:cardCornerRadius="@dimen/dp_16"
app:cardCornerRadius="@dimen/dp_8"
>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_search_result"

3
modules/mogo-module-search/src/main/res/layout/include_search_bar.xml
View File

@@ -22,7 +22,8 @@
/>
<EditText
android:layout_width="0dp"
android:maxLines="1"
android:singleLine="true"
android:layout_marginRight="@dimen/dp_50"
android:id="@+id/et_navi_search"
android:background="@null"
android:layout_height="wrap_content"

BIN
modules/mogo-module-search/src/main/res/mipmap-xhdpi/icon_navi_go_company.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 980 B

BIN
modules/mogo-module-search/src/main/res/mipmap-xhdpi/icon_navi_go_home.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

4
modules/mogo-module-search/src/main/res/values/strings.xml
View File

@@ -35,4 +35,8 @@
<string name="start_navi">开始导航</string>
<string name="choose_path">路线选择</string>
<string name="drag_map_to_choose">拖动地图选点</string>
<string name="preference_navi_address">常用地址设置</string>
<string name="navi_set_home">去设置家</string>
<string name="navi_clear">清除</string>
<string name="navi_set_company">去设置公司</string>
</resources>