From bfd9df9d8a31b248f3d0a2f8b8768e286a3ffb3a Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Sat, 6 May 2023 14:57:04 +0800 Subject: [PATCH 1/5] merge code --- .../omqs/ui/activity/login/LoginViewModel.kt | 2 +- .../EvaluationResultViewModel.kt | 1 + .../qsrecordlist/QsRecordListAdapter.kt | 10 +- .../qsrecordlist/QsRecordListFragment.kt | 3 +- .../ui/fragment/tasklist/TaskListViewModel.kt | 3 +- .../main/res/drawable-xhdpi/icon_filter.png | Bin 0 -> 643 bytes .../main/res/drawable-xhdpi/icon_order.png | Bin 0 -> 235 bytes .../main/res/drawable-xhdpi/icon_refrush.png | Bin 0 -> 697 bytes .../main/res/drawable-xxhdpi/icon_filter.png | Bin 0 -> 913 bytes .../main/res/drawable-xxhdpi/icon_order.png | Bin 0 -> 423 bytes .../main/res/drawable-xxhdpi/icon_refrush.png | Bin 0 -> 1092 bytes app/src/main/res/drawable/separator.xml | 6 +- .../res/layout/adapter_qs_record_list.xml | 58 +++++----- .../res/layout/fragment_qs_record_list.xml | 99 ++++++++++++++---- .../res/menu/evaluation_list_bar_mean.xml | 25 +++++ .../main/res/menu/personal_center_menu.xml | 2 +- app/src/main/res/mipmap-xhdpi/icon_back_n.png | Bin 1141 -> 355 bytes app/src/main/res/mipmap-xhdpi/icon_back_p.png | Bin 15582 -> 332 bytes app/src/main/res/values/styles.xml | 9 ++ .../src/main/res/mipmap-hdpi/marker.png | Bin 1598 -> 1300 bytes 20 files changed, 162 insertions(+), 56 deletions(-) create mode 100644 app/src/main/res/drawable-xhdpi/icon_filter.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_order.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_refrush.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_filter.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_order.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_refrush.png create mode 100644 app/src/main/res/menu/evaluation_list_bar_mean.xml diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt index 1b054ca1..947032d7 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt @@ -116,7 +116,7 @@ class LoginViewModel @Inject constructor( //文件夹初始化 try { loginStatus.postValue(LoginStatus.LOGIN_STATUS_FOLDER_INIT) - createUserFolder(context, "1") + createUserFolder(context, "02911") } catch (e: IOException) { loginStatus.postValue(LoginStatus.LOGIN_STATUS_FOLDER_FAILURE) } diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt index 764030cf..5803c3a2 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt @@ -313,6 +313,7 @@ class EvaluationResultViewModel @Inject constructor( fun saveData() { viewModelScope.launch(Dispatchers.IO) { val realm = Realm.getDefaultInstance() + liveDataQsRecordBean.value!!.checkTime = DateTimeUtil.getDataTime() realm.executeTransaction { it.copyToRealmOrUpdate(liveDataQsRecordBean.value) } diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListAdapter.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListAdapter.kt index 17d56a3c..434d1196 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListAdapter.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListAdapter.kt @@ -51,14 +51,18 @@ class QsRecordListAdapter( holder.itemView.setOnClickListener { itemClickListener!!.onItemClickListener(position) } - changeViews(binding, qsRecordBean) + changeViews(position, binding, qsRecordBean) } - private fun changeViews(binding: AdapterQsRecordListBinding, qsRecordBean: QsRecordBean) { + private fun changeViews(position: Int,binding: AdapterQsRecordListBinding, qsRecordBean: QsRecordBean) { + if(position<99) + binding.qsRecordIndex.text = (position+1).toString() + else + binding.qsRecordIndex.text = "99." binding.qsRecordClassType.text = qsRecordBean.classType binding.qsRecordProblemType.text = qsRecordBean.problemType binding.qsRecordPhenomenon.text = qsRecordBean.phenomenon - binding.qsRecordProblemLink.text = qsRecordBean.problemLink + binding.qsRecordTime.text = qsRecordBean.checkTime } override fun getItemViewRes(position: Int): Int { diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListFragment.kt index 60076cbb..e4fb1819 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListFragment.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListFragment.kt @@ -44,6 +44,7 @@ class QsRecordListFragment : BaseFragment(){ binding.qsRecyclerview.adapter = adapter viewModel.liveDataQSList.observe(viewLifecycleOwner) { adapter.refreshData(it) + binding.tvTitleCount.text = "共"+adapter.data.size+"条" } val itemDecoration = DividerItemDecoration(context, DividerItemDecoration.VERTICAL) itemDecoration.setDrawable(resources.getDrawable(R.drawable.separator)) @@ -57,7 +58,7 @@ class QsRecordListFragment : BaseFragment(){ } }) - binding.recordBack.setOnClickListener{ + binding.imgBack.setOnClickListener{ findNavController().navigateUp() } } diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListViewModel.kt index 6bb8bebe..af3a65af 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListViewModel.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListViewModel.kt @@ -8,6 +8,7 @@ import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.navinfo.collect.library.map.NIMapController +import com.navinfo.omqs.Constant import com.navinfo.omqs.bean.TaskBean import com.navinfo.omqs.http.NetResult import com.navinfo.omqs.http.NetworkService @@ -35,7 +36,7 @@ class TaskListViewModel @Inject constructor( viewModelScope.launch(Dispatchers.IO) { var taskList: List = mutableListOf() - when (val result = networkService.getTaskList("02911")) { + when (val result = networkService.getTaskList(Constant.USER_ID)) { is NetResult.Success -> { if (result.data != null) { val realm = Realm.getDefaultInstance() diff --git a/app/src/main/res/drawable-xhdpi/icon_filter.png b/app/src/main/res/drawable-xhdpi/icon_filter.png new file mode 100644 index 0000000000000000000000000000000000000000..453920cf5be7ff91dde6449433d543bba4f5e457 GIT binary patch literal 643 zcmV-}0(||6P)^a@-e%jmp_e8koLHFz*3jptWabJMm0Pt;rF)#&VL>cdg zf4ouI?i?U^GTwo}CtHqnb_inQOY(AZ_1PR?;Kav7^i;R#wovNjnE88@dVMWG&>K$y zJer-g9}lM+^1rn)aDHwP@c|e=!qnZWiolR4KmXC}ti5du;(hPei;S}aBCKcNw_g)) zs0HYEes@}H7b60mgE5(%w>NJKkvm6rL_kLuehIQr1vVi}oG$^$2^$a#&Vl_Xad)Z` zN-IPX;=#j=AYe3K4!XI`lTI>Lby=ZVRTV?koOT*Ku(O`U6xployw0ZawN zW);LuoErhiMRgE?6YqiO1AtRz>PP9TLsJnkZbnrQYF;`g2*2)_8s$KFao~&(i^SxQ zVe0M4=Rt4GMJShb-Xsdf5y+jXP-_6f#BF3t!8O`s3J`Q-pU}!9qa7`rs-vGVxlU=I)F*yX}h7xM$;THv2~|Ocy|EZ*hhL2UzM4 zm%U(R5vT(wav-bwz?p=JyW2PibcrQDXykm9dh7DnqzYu~4imRy1wcx#G<4G|e4{F8 dA~2?F{{yVNfiUWey!8M8002ovPDHLkV1j``9bo_f literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/icon_order.png b/app/src/main/res/drawable-xhdpi/icon_order.png new file mode 100644 index 0000000000000000000000000000000000000000..ccf3811f495e96b0ce9c608504612a6536dd3545 GIT binary patch literal 235 zcmV8Ky5*K14;T(PNfB(mFf?#~mSRWj~K7n^J z(wTG6Oy$N@?4Q=7CYl4B>3*-*VFC`|33vkL379V;a{%)zxFtYc3;_vW?Oayb{{!h` z#NrRY4<}CqohpD7{{c|12Cx8C(Rmba=Vwp@ki*W-S)6O?08)Gf&{{+?cA176KCUg`h< literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/icon_refrush.png b/app/src/main/res/drawable-xhdpi/icon_refrush.png new file mode 100644 index 0000000000000000000000000000000000000000..446107d4db1872067809aa8d7b41891488a1f16c GIT binary patch literal 697 zcmV;q0!ICbP)HMIuZeY?lrc+K3asxRyb+|#q4cr?C`2@iyh^XYG3Auq9Fr^zg zv8~nQtw21G1(LviSgq#IZ)RtAza?z>qb=u0Zh&UxX9M65M9{z}gHW3mVKc)8kuAJe zm)6bOo224SDvpT&c4u6-<^N0oM)`NSSi1kh#4Td<1LB?{;6_1YAZb%5-RmIM2{4%P zT?E{=#&vfdBsV}x2bh455!S!MBRKUE!r7$!mKc1G{o(f?ck(wK=FLU1EqNtW4} zbneaq;kECnA0>QdfM)gTlo*0c{#2Ez7%TEbKHO_N7ZvLG<_ z3H)azfU)Oj#R3g{Pt~3(`E32Gj?GN_6!7uVUC^vJ78C4m!@8Aao#Qrg-FJ2$4w8I> z0&4`eAozVEz~}0(TEL=rKB{Z$BoDWv?4SZ;mA@ariiUdO90&(5fZMq~I$akauiqj- z#c@RdeVr|rH*sVi@4(=EcoZG2>&DFGHv>4?b95A7c7}C5SA-3X7XcJ%bw)>x4P)kV ze_;UITmsp*X7y@&Ll^?QfNi+lgXk%a;|5dH5oyrZ6 fcMj6*w+`?hjQegd#OKHC00000NkvXXu0mjf5-&O( literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_filter.png b/app/src/main/res/drawable-xxhdpi/icon_filter.png new file mode 100644 index 0000000000000000000000000000000000000000..0f6d03c74b7de0d4c658b8c1ba5ac8c6aa6732c9 GIT binary patch literal 913 zcmV;C18)3@P)g)&IBebDu$2@CO%MKRir;*1BFJ1$Pi(EiVfZ!N9a= zzk8t$!ZgfTpjqm55TTKmaQ?jnFj7F-`eMB72kG$uG)rf7MEZUo#5)>nOI$5)c1N2d zKV2SxR;hOg2yg6#MEmWbx|at`V_n}U6z~uMUQDInwl;iq7!6SFk+Z06RC5h*k2i!I zrr<*Q01=-th>1zhqXH;P>$FPx9w2^<@&*y0i->QhUxNPRYI!Tj_p%hvP9Kmu2-7Tx zplk*OvIn5C_H%7%b zr54sIX9mDFjss!W6|y><+gzq0K2{9)orVZO7VK(&st5eqSv@&+`WgU8P5i9^{44<` zZSmQuS?>LH#1p`|X;MASE;msOh}LM9dwr+ai2$wH9fOE|n^!B9w7c7M0QjI5EZ_hD z&}rLHYchcuXH6;qp3BGo1i;2OpeV0nojBqVpL%n%0K2#^74TOa@oX(??KPwNG*KlE zdRY<|n!Ei;lCWf;4b_bt006{EhiwG_SBwn9u7EkaPHYlE7z_V88;FK z38?_^Q#Em_ebbHJ<1942*qqfB#DRFnT^NACJ}KiLO;T~8FyDR97MT5vv?CL|&Ke>- z;O9uWSs-a0U?6-~n>m0xdLcM!536l}yAuHE!%eVo;Q{^u)P-J86L6cy00000NkvXXu0mjfV3eAB literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_order.png b/app/src/main/res/drawable-xxhdpi/icon_order.png new file mode 100644 index 0000000000000000000000000000000000000000..44e138d841f8af83341ff922c0ad65f2fa356856 GIT binary patch literal 423 zcmV;Y0a*TtP)7xV5WWjkmC6!USa^g^ly2}Q40(^1=O7Q!H|W@Qf>&T5a~T*ANJd5&S;2|yST1LJ zS-HD>KX=YygvcL^96vCDTRX@Oumhe7VAlJ2^Q_S*JuhBnrbHc2Rg9j8S^rx!Lg1N{ zuSdrD)A3Zr+!=x1*Sn{fjnebt)%ad#2O7OSU=kAuD6Um$cEC!efI;j)Kyj@~vjbK# z1q@;b0*Y%@+Svhe>$J8V|C4Pr`u_vGPFu~Ub&&HATUY+0z`G|fO&94yXFr&)hfAp` zxr?nj2PF9R)9zCs3=&8tl0-BF6nH>*mdXo&Ur8bg0%h=O9EA`o@&u~D1Hc9$8IvY( z*gke;&#Si44#E?7@-qMemUZCCpF)OD&qaCl8|fA*5x4?>a)9zWZR+{5E2M9y&tQ$p zUs{Or^}0GL)!JZM$1tO|PHT7&TOW1cNuENkOE0-ohzYnVaO-$(A$Gu1fg|+^>PfdJ R#{B>Q002ovPDHLkV1iPXw5R|8 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_refrush.png b/app/src/main/res/drawable-xxhdpi/icon_refrush.png new file mode 100644 index 0000000000000000000000000000000000000000..a77e808d863cb826c8896407363cd4a301edb045 GIT binary patch literal 1092 zcmV-K1iSl*P)2iPwPypCIG};1xNGTh}83;pWT*z<3Fizk1pPz-PfNI9#dO!b5(C?jr@=iCqk)Q(x%C5850H2AY z1YArz$UqiE0`<3I5*tEmZ1ZvRs_={LESNjbd1L@GV8WocL?{8cW}rznx9V4gj!sl7 z=`SU~DG`ypzs-!M?eNhekm^pihy=AG0jQ?G9D>+n=1V4+ANqx+j?;cN`(8=i3*e{oz@>eYEKWy8*Re2mYCg7GAlkNV z-W7dW4)6_MKE^bs`;SO@=6Dc&min+Z=)`KFY4VU$YH<#E9q{Nh+fNo+5pvz z)n?{rjX@#1%%nQ+yxIBsQpb)BCj~-F8^DXc1ODeehg6Vra<>Vxnf+fY1ClZT#W8k5+ zyIIR!zBE!!;fdFn}K_JdW;(I8FiR^yc zW&+)%#|8ojvM2F96vU)e<$Mfs-uEuFXlt9&DZd+J?8hZFs?H7ZN0IS$^jNJ7cu=lV z-BLX+CbK?xaTI1RzspvY%+~E8fSTx_<59A#Q?8)^JO`>1<>F9v9Er?E|Ha9&Ad_1E z?|_MGB;V)`OuyY`(fCUN$Y7HuA50Nl85ojk@)@n!lXB6-)wH$8KnaABbT^s##2#(d zbfT_x66;3PEh~v$S-Oqxd!p%I5NM{&%2@((s>i0I)bP`CMMX?bqT|&AUirelHAnphUjsHKDvo%j%x5Y330000< KMNUMnLSTYDtPy+w literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/separator.xml b/app/src/main/res/drawable/separator.xml index 161848ea..459b9d40 100644 --- a/app/src/main/res/drawable/separator.xml +++ b/app/src/main/res/drawable/separator.xml @@ -2,8 +2,8 @@ android:shape="line"> \ No newline at end of file diff --git a/app/src/main/res/layout/adapter_qs_record_list.xml b/app/src/main/res/layout/adapter_qs_record_list.xml index 8ed12efd..7d3a48dc 100644 --- a/app/src/main/res/layout/adapter_qs_record_list.xml +++ b/app/src/main/res/layout/adapter_qs_record_list.xml @@ -1,53 +1,63 @@ + + - - - - + + + + diff --git a/app/src/main/res/layout/fragment_qs_record_list.xml b/app/src/main/res/layout/fragment_qs_record_list.xml index 35742580..00ed3cf2 100644 --- a/app/src/main/res/layout/fragment_qs_record_list.xml +++ b/app/src/main/res/layout/fragment_qs_record_list.xml @@ -13,30 +13,85 @@ android:layout_height="wrap_content" app:layout_constraintTop_toTopOf="parent" style="@style/left_pannel_title_layout"> - - + app:layout_constraintTop_toTopOf="parent"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/personal_center_menu.xml b/app/src/main/res/menu/personal_center_menu.xml index 3bd6f840..bbf5b357 100644 --- a/app/src/main/res/menu/personal_center_menu.xml +++ b/app/src/main/res/menu/personal_center_menu.xml @@ -39,7 +39,7 @@ + android:title="测评结果" /> Up02<)qaC7Y+r2&M) z5#XX*y>`}cdXLG#d$@m72YK`}0f-1s4KQn-2B?rdojD@zbi1$R(H_2=ID%>Gq*Z`y z=_TIbi3UW6#{$R*{|O)~{3`%094O?#t7Or_RXS^{YsQwaZ~#gd9RV1+-J6Io!canS z5V3neh6%<+#NR|B0G-q0?T3IqxphP^d{^~auDTjuFPCIdXTVhKv4 zq}24xJX@vryZ0+8WTx0Eg`4^s_!c;)W@LI)6{QAO`Gq7`WhYyvDB0U7*i={n4aiL` zNmQuF&B-gas<2f8n`;GRgM{^!6u?SKvTcwn`Gu2HtFf>sxx70H< zH8im>)KM@pFf`UTFxEFT)-^P;GO)BVG*y5CC7^9ZDQQ+gE^bh}fIM5JjFOT9D}DX) z@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7^KE~&-IMVSR9nfZANAQKal z@=Hr>m4GgVcp0+w{G(ayiGsViq)y3S^(b&k?*~Q$@(ACV*)x^=s*ww_y z+1$v|!oVD+*Cju>G&eP`1g19yq1PCvUQkNNEdbi=l3J8mmYU*Ll%J~r_OVqaZnqfV zG!Lpb1-Dxaaq86vIz}H9uSoF>69Oh45EGtifgE_cPt5}+_99@ap3@bO4a^a*JY5_^ zDsFAL?#nrdBQR8X0<(KO;XQerg1&D<1y5$Y<1c3-}1pkP=vGzN2u=^>W%3sIa8yFeZzux^Rbgozxs37ok^>bP0l+XkK DYEXrT diff --git a/app/src/main/res/mipmap-xhdpi/icon_back_p.png b/app/src/main/res/mipmap-xhdpi/icon_back_p.png index ca2d8dda835e3e551a8da11dfc5e2e81c572336b..190179711440182f2eda401dc98c4424cfa5474c 100644 GIT binary patch literal 332 zcmV-S0ki&zP)W9BdI5_~*Rj&X5E?VnD2p!HP3<=S?2V$7$wTMEP=mdCoA|;{% z5f=<0giu3&LZ41K0W?6ALWs>65Y7OhAbJ6WfancShlu_p`;>7gUmqP>td%LrH+q+$^N7`PGmT*wpBCSU0c6YAb^zQc9 z-Es$iQ3y{HHAbTnV`4-kpoRn!{?I65Kx2$TAR$3WO4J1K4<#Cj_`unFckVh8!ym@X zC3kzj`Ofb@O z9z$>TZj@qtEZqi&jgD;=?Af-iSKBtC$+~w{xIUCskUf_JC6ipOOxx*( z0#3`?O}70CQEV-Vy%W9BR&a0SD7>oW{pYGTqU2Dn^XCr4k0M9 zn6ln7(DYXm5mOs=@2fKsMuJZ_bOp2uQAq@{*cJ%_(B9MEf(HMIy4&?@=m5I3ns zc}5kQsbS9x0YL(-?ULZm+s>5js3{E=dTpRyLtSgq zWj??HH7K)j-7m4SECH5>K?(2yP1S{9(YhkN$~poqV++)ymYK{gmb7Zw(4Dx=-r~$H zt*!#m+|*Z$>ON_b7;NG-jpfz2pN;$7KDiwe;z3oH0;&qtc!;Y?FZT&G5X#H?zZs{h z)UtCCMaAt_Pm&J9c1&w)h2VC`-9mcc=82_6Az|DlwGunD+7(rEH>a?zBJwVfin4N- z^BHbK`3g0F4+=n4WuUP^Q5yK!-9f!a!UTivAVpledu>hN&>xtphAC zut4esk^*Ff7nk!vh3AV_xmuH(*k;_xs1|G)LJKXNe>`**cMDHjn`hZZBc+=e`_ZD| z#Ei+EwP7_i1obdiOe_}QDIv}swS@6s9JISzxm9D1-(q=UOc*o)^a4?lfFd;gKL#y7 zloJIVcKeK_F$7E&u^Jhh*kS}EhH z<;)E!!wI7;GS^Y8xFX9vS>$2#pwl!AH%XExg*dzz&*(C;Fwqw=(1F8t_j>`gl*_?| znu-18L=l}5%83<1Au+#3D$c#ReJ@{%PSxl@&y`N}Ra;`|Idd=nl<(+Xx?*0m5ex`9 zq`1g@FqPuMfRICqi_8a8DJ~2MIi$GAd@z;b!hn!Nii^w#QzCY_|^FBs4;77X;(d$=1N#rJ3zDp|b93jwzEf{C9G$VL&JlKIuEq!7es;a3 zC5FG>IDV+%!>9h3vUcpq(O)(!8*BLK*wH(4m^F_jFR-_K^W8U)JKNVq-fJD$@i#dE B0JZ=C diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 3299be77..3beb0530 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -63,6 +63,15 @@ wrap_content + + + - From dd5435f24e13d303e70d500e4126a2546a34e7af Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Sat, 6 May 2023 15:01:46 +0800 Subject: [PATCH 3/5] merge code --- app/src/main/res/drawable-v24/baseline_person_24.xml | 2 +- app/src/main/res/values/colors.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/drawable-v24/baseline_person_24.xml b/app/src/main/res/drawable-v24/baseline_person_24.xml index f96a32ae..6975120d 100644 --- a/app/src/main/res/drawable-v24/baseline_person_24.xml +++ b/app/src/main/res/drawable-v24/baseline_person_24.xml @@ -1,4 +1,4 @@ - diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index db336623..daafde21 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -166,6 +166,7 @@ #2631DD #FFF5F7FE #000000 + #FF4263EB #d1d1d1 From 451fe92e378767914fa7a4a680b74de36c50915a Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Sat, 6 May 2023 15:25:16 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/library/map/handler/MarkHandler.kt | 2 +- .../main/res/mipmap-xxhdpi/map_icon_report.png | Bin 0 -> 1374 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 collect-library/src/main/res/mipmap-xxhdpi/map_icon_report.png diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/MarkHandler.kt b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/MarkHandler.kt index ca1e6a63..bc2f46e2 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/MarkHandler.kt +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/MarkHandler.kt @@ -57,7 +57,7 @@ class MarkHandler(context: AppCompatActivity, mapView: NIMapView) : private lateinit var canvas: org.oscim.backend.canvas.Canvas private lateinit var itemizedLayer: MyItemizedLayer private lateinit var markerRendererFactory: MarkerRendererFactory - private var resId = R.mipmap.map_icon_point_add + private var resId = R.mipmap.map_icon_report private var itemListener: OnQsRecordItemClickListener? = null /** diff --git a/collect-library/src/main/res/mipmap-xxhdpi/map_icon_report.png b/collect-library/src/main/res/mipmap-xxhdpi/map_icon_report.png new file mode 100644 index 0000000000000000000000000000000000000000..556d762280fb4eb8120dfbac570f6e5c85961594 GIT binary patch literal 1374 zcmV-k1)=(hP)7|+UPHhApG zd)Wm{7Ku7m<#kJHTC${W{qPbtJdo5?U)5J%Rd*vi)6eWX*hAZX%a#|2KXU{C$rA-Ge22 zR~3j#0L)%}b&M7c0q`(%jELR=V}0?rZTAuJ?8#}Gl1IJvmwzT@fs_K^^V}H%!l~l; z4G{I?&T)`{$btMUohG;<=Jv|eM5=kAX4h5-BsbFu(@7LKpjI4i2NhTTCFG*f7W zBWLYi7O9Wi0DPV!cYIHAe(+-Lj!Yfk0r+dj=_0^|0(OBw{k-*I3_$Q4k*mwGLV;^y zZnr1}0t$`*;g_d1X+lH;)B4Z?5OjHI4+*iO82Lyq!fcado9JhGlH ztC;|9o6ZFRbyZm;g07C|I)~Gq&zm;y9sPKH94y^I+Bb;+ZX2~z!rD;fIe2tg|C9A~ z5h?0?_?>8kU)z1K@J*yXXwy4bZLZ?$M*w{K-ahm!7^*xcq8nhWQF%p1-Xm$djxMF6PTtgqc~%hpb~9v@NKD<%~& znt`U%=gp;R0Ij8~m1|v)=1uzppS1{J&|bQ70!ReF7b|O2%|O|;xIZB!GXeNI%%{r# zF8~1QwU%s@tU_Wew%+rH)`pH$xzeRL{=CWz2zjsJ2cbeSMT<~KG?5+Wk3g=@%XHi- z0r(RvitTBfj$6g0$W^4;|H}-_8ls_{L4v$*0gx{POF(V*(%w;p6+DF>FPTGxSW`IAOHJwGUk;t8eU?Xx2M2jLFT}B_^ zb9?E^Bb<1qGsoPrS;$K}g}!ohAWinQb9$L96a`=!eJzCqjg&zuK8t5LDD@j?N-leC zdMFUqj&Lr6`W#V9-1pqe^W`lrs gO=ck-RnngS3lno#UXW4)F8}}l07*qoM6N<$g32z1#{d8T literal 0 HcmV?d00001 From be9e5820487aea74e60bcf57d3d0d0c7371a9153 Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Sat, 6 May 2023 15:28:39 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/menu/personal_center_menu.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/res/menu/personal_center_menu.xml b/app/src/main/res/menu/personal_center_menu.xml index 54fa580b..84572d55 100644 --- a/app/src/main/res/menu/personal_center_menu.xml +++ b/app/src/main/res/menu/personal_center_menu.xml @@ -41,7 +41,6 @@