From dfbdc1500fef5b7c31ed13bf7cc5d584dfc66de6 Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Thu, 4 May 2023 18:03:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=B5=84=E6=BA=90=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/drawable-xhdpi/icon_add_data.png | Bin 0 -> 3730 bytes .../res/drawable-xhdpi/icon_add_voice.png | Bin 0 -> 3928 bytes .../main/res/drawable-xhdpi/icon_delete.png | Bin 0 -> 504 bytes .../main/res/drawable-xhdpi/icon_delete_p.png | Bin 0 -> 511 bytes .../main/res/drawable-xhdpi/icon_location.png | Bin 0 -> 5174 bytes .../res/drawable-xxhdpi/icon_add_data.png | Bin 0 -> 4994 bytes .../res/drawable-xxhdpi/icon_add_voice.png | Bin 0 -> 5227 bytes .../main/res/drawable-xxhdpi/icon_delete.png | Bin 0 -> 504 bytes .../res/drawable-xxhdpi/icon_delete_p.png | Bin 0 -> 511 bytes .../res/drawable-xxhdpi/icon_location.png | Bin 0 -> 5894 bytes app/src/main/res/drawable/btn_delete_xml.xml | 6 ++ app/src/main/res/layout/activity_main.xml | 60 ++++++++++-------- .../res/layout/fragment_evaluation_result.xml | 8 +-- app/src/main/res/menu/evaluation_bar_mean.xml | 2 +- app/src/main/res/values/colors.xml | 1 + app/src/main/res/values/dimens.xml | 1 + app/src/main/res/values/styles.xml | 9 +++ .../collect/library/map/NIMapView.java | 2 +- .../src/main/res/drawable/map_zoom_bg_xml.xml | 10 +++ .../src/main/res/layout/base_map_layout.xml | 7 +- .../src/main/res/mipmap-hdpi/icon_zoom_in.png | Bin 232 -> 195 bytes .../main/res/mipmap-hdpi/icon_zoom_in_p.png | Bin 274 -> 191 bytes .../main/res/mipmap-hdpi/icon_zoom_out.png | Bin 246 -> 156 bytes .../main/res/mipmap-hdpi/icon_zoom_out_p.png | Bin 289 -> 155 bytes .../src/main/res/values/dimens.xml | 2 +- 25 files changed, 72 insertions(+), 36 deletions(-) create mode 100644 app/src/main/res/drawable-xhdpi/icon_add_data.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_add_voice.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_delete.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_delete_p.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_location.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_add_data.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_add_voice.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_delete.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_delete_p.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_location.png create mode 100644 app/src/main/res/drawable/btn_delete_xml.xml create mode 100644 collect-library/src/main/res/drawable/map_zoom_bg_xml.xml diff --git a/app/src/main/res/drawable-xhdpi/icon_add_data.png b/app/src/main/res/drawable-xhdpi/icon_add_data.png new file mode 100644 index 0000000000000000000000000000000000000000..5461259d08f7a59adbf058b43481e18a81d9db0d GIT binary patch literal 3730 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/icon_add_voice.png b/app/src/main/res/drawable-xhdpi/icon_add_voice.png new file mode 100644 index 0000000000000000000000000000000000000000..82f24c24fa1d21fa17863dda2180b2456e953e6d GIT binary patch literal 3928 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 B-fsW^ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/icon_location.png b/app/src/main/res/drawable-xhdpi/icon_location.png new file mode 100644 index 0000000000000000000000000000000000000000..d8eaac08500400ed827df80969751979ad9b40d8 GIT binary patch literal 5174 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 krgk%{8>}$$Kp2_&|DcOkz>% literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_add_data.png b/app/src/main/res/drawable-xxhdpi/icon_add_data.png new file mode 100644 index 0000000000000000000000000000000000000000..bf9a8e896e7caf859781ead93df51251584a92d7 GIT binary patch literal 4994 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 M07*qoM6N<$f}s_r^8f$< literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_add_voice.png b/app/src/main/res/drawable-xxhdpi/icon_add_voice.png new file mode 100644 index 0000000000000000000000000000000000000000..8aa8f5a665ef99548061f70df053d37f04d89018 GIT binary patch literal 5227 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 lA+G}qtb literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_delete.png b/app/src/main/res/drawable-xxhdpi/icon_delete.png new file mode 100644 index 0000000000000000000000000000000000000000..53f101e5af964389652c879124a1052354cecc57 GIT binary patch literal 504 zcmV|xL1rK@u++K)pd#6@Lt~0aogd=88TizC>Vd};M+9(tX3SHH z?nb9KfJITvgb>%kp!fcT;!IP1RF)Hp&TleV0St{H*;{JuH-H&HANqoBGliIeglKl= z>`JMLlkz#iZZ;L^+|9t+SyB-nJ%EK$R}i8)r-cw>0OxfiKD_tyY+>%Q@BMUS?Q0SP zO{JyQ_W&r2RNcDmU7rADWnj}` zgG1Xrq3az3pj0BI$e4kIQ;ut3t5;NGG8ZvGZj_utoI-U3D93c$anC8lDa0v68HCpB z!=2v)JPYwG)R9jAB87-dz!>Z8AEa{^18Yh4$pBhbAJpK+%0;mo1t545{)st23E(o;vo3iLyh*^u u{xgdPkkjcLwirN;DE6_z4D^X!4&5)D{TEM1QUbyN0000(&_oaiP+c-axzw-T+S^oIr0NHxX~3D^M3=!5PocB5__@W(rek-jCxj zrrRc&eEIUe^rZ+}{@|A94+7w?859N-1J8Buju1OKY#`C#WEx-U_!QY%Gcay=T>!i> zON6dkVSH=mn|fIT7}dQYBA%;YMD)N(CT|~1<2J`O6A@lt}_=}EG~lCd}wrtw;sUDzIXOjfmEjvn+R}_s0YA15KWww zxg`G10=mZ^@uLv~d8bjs?;*f-2B05=QO_j+)A%giPSoZ<08lN5NV^K~(QLjlm0xSs zWLg)!vnh~M29^_6CA2;h%H9b8&SB)70b#&E<>Ul-No95&p>X?NE$uL1-Q~eKdck; zG5G-YpozZ!mN`#;V>1T;O%)0pOsBRw0A|tMWN;{sw=tOi#>MU_bx>002ovPDHLkV1f-a B-fsW^ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_location.png b/app/src/main/res/drawable-xxhdpi/icon_location.png new file mode 100644 index 0000000000000000000000000000000000000000..0105061ff0b1b5704cdeaeea580c5baaafef683b GIT binary patch literal 5894 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 + + + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index a57f6be5..159693fb 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -56,36 +56,42 @@ app:layout_constraintLeft_toLeftOf="@id/main_activity_person_center" app:layout_constraintTop_toBottomOf="@id/main_activity_person_center" /> - + app:layout_constraintRight_toRightOf="parent" + tools:ignore="MissingConstraints"> - - + + + + + + + + + app:title="Mark" /> @@ -128,6 +127,7 @@ #999999 #FF3B30 #108ee9 + #2631DD #d1d1d1 diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 7785420d..3e1d59f9 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -7,6 +7,7 @@ 176dp 10dp 15sp + 24sp 13sp 10sp 1dp diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index d74b2586..b9c7b87f 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -23,6 +23,15 @@ wrap_content + + +