From 1d258c4b8e6503dee54a9ec262285c8e92fe7772 Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Thu, 27 Jul 2023 16:35:15 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=982.=E8=B0=83=E6=95=B4=E6=B8=B2=E6=9F=93?= =?UTF-8?q?=E5=9B=BE=E5=B1=82=E7=AD=96=E7=95=A5=E5=8F=8A=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../omqs/ui/activity/map/MainActivity.kt | 43 +++--- .../omqs/ui/fragment/tasklist/TaskAdapter.kt | 6 + .../res/drawable-xhdpi/icon_add_road_n.png | Bin 0 -> 539 bytes .../res/drawable-xhdpi/icon_add_road_p.png | Bin 0 -> 544 bytes .../res/drawable-xxhdpi/icon_add_road.png | Bin 0 -> 950 bytes .../res/drawable-xxhdpi/icon_add_road_n.png | Bin 0 -> 763 bytes .../res/drawable-xxhdpi/icon_add_road_p.png | Bin 0 -> 798 bytes .../res/drawable-xxhdpi/icon_add_task_n.png | Bin 0 -> 1090 bytes .../res/drawable-xxhdpi/icon_add_task_p.png | Bin 0 -> 1098 bytes .../res/drawable/selector_add_taskline.xml | 4 +- .../drawable/selector_task_head_add_link.xml | 5 + app/src/main/res/layout/activity_main.xml | 2 +- app/src/main/res/layout/fragment_task.xml | 3 +- .../src/main/assets/editormarker.xml | 75 ++++++----- .../src/main/assets/omdb/icon_4002_0.svg | 44 +++++- .../src/main/assets/omdb/icon_4022_0.svg | 127 +++++++++++++++++- vtm | 2 +- 17 files changed, 252 insertions(+), 59 deletions(-) create mode 100644 app/src/main/res/drawable-xhdpi/icon_add_road_n.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_add_road_p.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_add_road.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_add_road_n.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_add_road_p.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_add_task_n.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_add_task_p.png create mode 100644 app/src/main/res/drawable/selector_task_head_add_link.xml diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt index 5d08ab26..7457dbf9 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt @@ -465,7 +465,7 @@ class MainActivity : BaseActivity() { if (leftFragment != null) { supportFragmentManager.beginTransaction().remove(leftFragment!!).commit() leftFragment = null - binding.mainActivityBottomSheetGroup.visibility = View.GONE + hideMainActivityBottomSheetGroup() binding.mainActivityLeftFragment.visibility = View.GONE } // binding.mainActivityDrawer.open() @@ -767,19 +767,10 @@ class MainActivity : BaseActivity() { binding.mainActivityLeftFragment.visibility = View.GONE } - binding.mainActivityBottomSheetGroup.visibility = View.GONE - - mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 128, 5) + hideMainActivityBottomSheetGroup() } else { - binding.mainActivityBottomSheetGroup.visibility = View.VISIBLE - mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 128, 65) + showMainActivityBottomSheetGroup() } - mapController.mMapView.vtmMap.animator().animateTo( - GeoPoint( - mapController.mMapView.vtmMap.mapPosition.geoPoint.latitude, - mapController.mMapView.vtmMap.mapPosition.geoPoint.longitude - ) - ) } private fun voiceOnTouchStart() { @@ -800,7 +791,7 @@ class MainActivity : BaseActivity() { fun onClickTaskFragment() { if (leftFragment !is TaskManagerFragment) { if (leftFragment == null) { - binding.mainActivityBottomSheetGroup.visibility = View.VISIBLE + showMainActivityBottomSheetGroup() binding.mainActivityLeftFragment.visibility = View.VISIBLE } leftFragment = TaskManagerFragment { @@ -820,7 +811,7 @@ class MainActivity : BaseActivity() { fun onClickResFragment() { if (leftFragment !is QsRecordListFragment) { if (leftFragment == null) { - binding.mainActivityBottomSheetGroup.visibility = View.VISIBLE + showMainActivityBottomSheetGroup() binding.mainActivityLeftFragment.visibility = View.VISIBLE } leftFragment = QsRecordListFragment { @@ -834,6 +825,28 @@ class MainActivity : BaseActivity() { } } + private fun showMainActivityBottomSheetGroup(){ + binding.mainActivityBottomSheetGroup.visibility = View.VISIBLE + mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 128, 65) + mapController.mMapView.vtmMap.animator().animateTo( + GeoPoint( + mapController.mMapView.vtmMap.mapPosition.geoPoint.latitude, + mapController.mMapView.vtmMap.mapPosition.geoPoint.longitude + ) + ) + } + + private fun hideMainActivityBottomSheetGroup(){ + binding.mainActivityBottomSheetGroup.visibility = View.GONE + mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 128, 5) + mapController.mMapView.vtmMap.animator().animateTo( + GeoPoint( + mapController.mMapView.vtmMap.mapPosition.geoPoint.latitude, + mapController.mMapView.vtmMap.mapPosition.geoPoint.longitude + ) + ) + } + /** * 显示轨迹回放布局 */ @@ -868,7 +881,7 @@ class MainActivity : BaseActivity() { fun onClickOfflineMapFragment() { if (leftFragment !is OfflineMapFragment) { if (leftFragment == null) { - binding.mainActivityBottomSheetGroup.visibility = View.VISIBLE + showMainActivityBottomSheetGroup() binding.mainActivityLeftFragment.visibility = View.VISIBLE } leftFragment = OfflineMapFragment { diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskAdapter.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskAdapter.kt index 8c164c07..1c5d8efa 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskAdapter.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskAdapter.kt @@ -1,5 +1,6 @@ package com.navinfo.omqs.ui.fragment.tasklist +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import com.navinfo.collect.library.data.entity.HadLinkDvoBean @@ -37,6 +38,11 @@ class TaskAdapter( val binding: AdapterTaskBinding = holder.viewBinding as AdapterTaskBinding val bean = data[position] + if(bean.linkStatus==1){ + binding.taskHead.background = binding.root.context.getDrawable(R.drawable.selector_task_head) + }else{ + binding.taskHead.background = binding.root.context.getDrawable(R.drawable.selector_task_head_add_link) + } binding.taskLinkPid.text = "PID:${bean.linkPid}" binding.taskMesh.text = "mesh:${bean.mesh}" binding.root.isSelected = selectPosition == position diff --git a/app/src/main/res/drawable-xhdpi/icon_add_road_n.png b/app/src/main/res/drawable-xhdpi/icon_add_road_n.png new file mode 100644 index 0000000000000000000000000000000000000000..930c217ff415eb83bd79a020f92b791e5633ebe6 GIT binary patch literal 539 zcmV+$0_6RPP)K!U{}2h58Y(U zbX__Cs}C7?>ATLJ2EYNZfA2bjxIF^CQ15!|_W>xm%ij1^%J!%b1=1v4=@t|YP_yhm zo`hA)9{A*+KHOZr{wHA}3aBHOVa1_i>amqLq3I-f{g%25Rtk`2#W6s=Zf^x;95FDt zz!*a!e(brer&*B33S$ruWMypsiC44_+a zRE#`plVA2+r>Xi*wKKZCj#EzqT^OL&uq6mbMgZY49dD$mU<{yJan(8>5onFUp8!ql zIe=89oa!4T;}#J%^C~7|0A0RV=Ctx{9;aLwpxUs9@#+$A={b;7Ga3WvRy$FadFQZw$oflUif<(AdMldRQ;?d+!X-a`*02clB dAE0mrz5ucc<1j(&j79(e002ovPDHLkV1mp4@yGxG literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/icon_add_road_p.png b/app/src/main/res/drawable-xhdpi/icon_add_road_p.png new file mode 100644 index 0000000000000000000000000000000000000000..8f901b6c24ae4e250d9ace56d97315765576fbd9 GIT binary patch literal 544 zcmV+*0^j|KP)k6vn?d?LO@Z%H#y8)SB)>ZqP_I>WY zStSbONxIh~s2t!>gr08(475j~9v_OZ5(VUwE3o3kG40r1oX~ZVvb?SCg1rLdS#b*R z?xU&2FX{b5hvtb%k_plG739sifZ7|b7Wp1nWpoUH)rzPSS7(~4bA=MQ*Y z1mO%|Td^F;Glkpi;tYI=y81HhE7BMPov5oX@<2BR@R}wdpydJ}Ir9g+%u~S`z_wz~ zpUjBph?#!@l-M%^fwXdxD`NuJK=i7tV{!(t zP7TO0Md9&_ofe^(563V|lQM!B2o&L8=lr)e5@mJ@Ad|iI&4nU-EAs&cenee;Qk1h) z1M+Pr)k~OV8xMI_WW`?7yeH->yB?AS8DEE?ZaZH_t9-jGE+7Dsol=Y$JxAZ=pVE>7 i+W>6(?g5~31^xgb!3;mJvkA5U0000X!NV#@(49JoJCaLga%evvqlE+wO52ay0W^|X9 zaQ@?~7-UI_Oc^jqV5O>DSzbni5MHaVCHZ2;83@gOOMIDRyrJ!r0HET_1_OIUSTUH? z;3mM%q#sfX2cY81ebDX46q{eb*g0v70~=dqQz!uCn*2sU)i(Hhy8!QdhoWiYr!W92 zzHEZfunBsc4FhlbEzvRcmni_csc@+BgwwQOdo2;hmsB{#><5=uSU>BCi!{H{_Cf%t z`0^Np&9p!b0Z4t7GH$%71E6vR4j|Jeui8xk05IsagwXMw%Q2|41uENe7al(81Ze>P z0>=7DTb$|m&-@h70if*5E)ibq1ZV?5+T*PFxS4JNom9B&%TuENDXt2L8Q(z|c^Ni* zkrws)K){&mAX5u6t5pl!JIw-HF-e5 zI~}lWL=c8)@zep>@MYa2?B@jlc@QRd2AKk&a}0)c|1%!MbzmGIrVKC@z|2np9RSpz z<(k|h;6oY}#F!LVLUvaCE<6MN Y0Wg@DZq+$+*Z=?k07*qoM6N<$g4oHn5&!@I literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_add_road_n.png b/app/src/main/res/drawable-xxhdpi/icon_add_road_n.png new file mode 100644 index 0000000000000000000000000000000000000000..fd11684a74ed5de38522e8a733fbffec83f0975d GIT binary patch literal 763 zcmV4j|Z@kHyHW)*%5$J>e^a+Re=G(4iRsgpjzwse!u@l&!vk z@w@(fHk;iEAs+vy(0l+Z#@N@|N4AK#^Z+c4G35dg(W^JWK#J3A||y zoEu}Voe7cI9kr7-p%^=!03xK6>;n;Vvy;|<)|z~v+%FLEesn&dwVw8Y7&8owN%n!) zpn+*02$@Grf3gY1On%Z~bo2mP>oaTZM*>+a7TcD6;2?G8oZpV>JP@O$p<|MLASR3s zU0lrjZyI23jQQ?zp`#;bNP3h@2_gQ3#)bNmH4vJ(*J0YyK8!6@I5NXw)4Zxijbi-U?*R@8(o0!4L z0HH8SMXffosp>;YDca~h`4$>mL&^f+OoycJZ7~4W+K0A^UwzUn07@weuV01$(7T-T z5247E3!v3B+``HdW0wgz_!~rAclkmxK-Z+HX|z(RS(m*>L~qe7YZQ7708~ORQ*CP2 zTKfM~{jbXG!FhLa@ddy6Gg1y!TA7v(~Ppl$*YjzxX{d`9{O;ANxqW3Hagw teI*Wvi6#gFh*)}(5rWYuc8q;0L4X9L5cO@q%IYG$@nx3F6D;%lZAjz(VN`VthdV{Pf z@l-R!V2te<4>gSyTVi3)@ZS60&%B=@6#Sur%a1hxM@`TsHofN?QZqw0M_*&jAx5a6NQcJ<9a;dtTqEKndveS*#^% zEiS_UyZ3SY>w;aC074pgx)ylzfgk!l+EN+AKI_KDz+-kH6F+{`F;D_9(SX4o>mYuJ z0hKR?eRfv37%20AfqR&2v38-tTcFGXCjMct$J&JqXroMI23oSVK()aS_V(~n@))`7 zI*ymqi=UOJ_jf=>m{FF#+eQ7K&*(b;^@@9gV6e|4-9rH_-X?vcL0m&1z~M45CtiKZc=5Nq_A88Jh<6q zMB}N(6To2DXYWicoErdDE8XKJi|`Af1$v&#PE0^p1JE6#YN(aqHo<&ICORU#jT6*# zhLj5c<@bb}Bn_GXfWTGK#4k)Y7XY;;KL_E{MgRa%1x$A`4 zrNx3ZfHb1EW%Sxy7C1{9ng#qz0I_9si;oHOQd>SkK)&Av@4=W|#Y$)&2#0|B%^x49 z-UUG}t27fQR}kaZ6MKQ=mrg!t{bFP7FwAZ86fm&lxm z8-@9sSis~2k~DJzke1AXm=HiUuGA2~WY}lb|5{2&=IXwU@XbV!MZg1-=@j+xfGvVP zQxMA{Y&Kh-1Vp%t3nbap@9sirDec}%^#MZki0GLPh`f)R{z1c3_*fUxF|k>fVE6aY zAtBlzdLE@AT?X@BV33vm*6)dBYzVRJ$YwK)vuHdDaO(iFYFM|w1fbJU-s`0W^4749 ce&H?f7o|qOPtG(`y#N3J07*qoM6N<$g3GsS?*IS* literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_add_task_n.png b/app/src/main/res/drawable-xxhdpi/icon_add_task_n.png new file mode 100644 index 0000000000000000000000000000000000000000..77007856f8ca2fae0ec274a4a179c32e416b2ab0 GIT binary patch literal 1090 zcmV-I1ikx-P)$U=e>Ku!Qyq_T`TLCgs-Cy3c4 zg-xeMgMK4hGnSO9Xa}CpoBq6h-Gl;P*Y!3CyaP}J;5tBcfJXog03H%o`iHHpuLZ8~ zw^E)1j-Bg$CO!br(C_CFflih%KDDg9k$!!8#atj=_hRJ_7A^p6db>|7!h-5ms_cHW-VO|LC6*b1v|aB<+{Mg%vrLoSyfG%gGw?wqR}B+O zca9ch*Y%DF_!PN~Z#u2*JTVzsr|WpbAQTwt3#N zsqK0kJ{tJkv6@G@L3Z8VI|7|W2kKv~11Nqk6{PL-ERp8}1S?N(C| zc;T;PkWuUq$U3yPP6{I|)7@S7dz~=8iv{>*$7+Uztph7*hTRnT>o!KeU$(90p7?WS zc0ZTEUwJ{sE>nIOAPuTMnlGP~y| zaZ&Flc-mEACW-@a13(EQ9xh{Y8Srs7NTu2YFUxNmxpQ6*WrCE-=jmqvs;mqz6{P=a z#~Xm~S_0)^+uC0JuPiCR{EO09x+Q&}G1XFrHEpLi0?`Y}f%+n$RYB64id-|0S6Lwu z(vwj2wAkoaZ-!axjX(-w|IG`7s2$)@4U^R(l1)@J9k?iA4YNRvO|Y5Zc5laploHjHm0QV6oky$Eo1R}y~30AC3?IPu9d?82&)8NW}BLhI8-WB&HK#40avwoCy0mf>#TH5Y5XpZivU)t|xkTzg#k)RaY}XPO*Z2 zn6HkwIt(a8JbydZJQ=6OK5TI0XS1w5{ga+}W*aNic5Pt!8-Pb4x0$G1cwr z1Jxv(m(r$MGVYF9E>ZPjK+0Ke4qi0P8(EZ=0+~t<=BsvVJ0-WKyPft3d=^*ZvtsVp zy*`l2{aF=cw6-ab=~!A=okhB7xBFwi*eE8OOOxeRB+>M{5+L&swwmo>lrnB>G~URn zN>eB;>}%qQ6oO0*r3|MP>5?grHz9f{ULy5BEB-@}YQ~wUli;#rM;ZKA-@H0izE>4?vF@w*<@qESPXL z8>>IJ5Ro3GHW!2={R)g@BJ_Rd1vCh!ag2BK3w7(;U$ou`WPhk1KG?-M2nUUYF|MW) z^}O-9CYpR2>3%>s7n9n8nE4-o<{(^||4Gab?t|#ZY%lZ8bnJjc62rDWCg6$js|45G z5^sF>ctM6EeL}!*-!+Kq*+ez>NlSl&=iIcr$&kPJICCtak?T=a;(22_$IJ@4p1kKfPBOVf(_}YP*bzmSO$?k1*L>t`Bj0u zi}6V4t`cMz=_?{UTLpJ>5|?~WgrSSlP7VpbqkJ^D}hTQ+$M|{ZCZ%hAPXWrOIuZ@+ANxzCxpt}EsJ83B*C*d#s@L2 z3caH+3{ySzzq#re^BfJ{XSl83C_+1fNR;%r|#S>dRxp zkv=D^(q*0MsuZNF1#{V|z2$|W5P3kbgMBv$!bpF%Cmc2yn}V1zpH0+$Q%Qm!(yc~g-!swgc7vLHApn`NoT=6`?rns& zI?EW^8H%kuPws%Um4JIXWGIR3e&e2GwZ7IQ0$MpdpJqKr>nl4xXif3{2WAwkNR%U5 QK>z>%07*qoM6N<$f~39sl>h($ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/selector_add_taskline.xml b/app/src/main/res/drawable/selector_add_taskline.xml index 45941ce4..ec6d08b2 100644 --- a/app/src/main/res/drawable/selector_add_taskline.xml +++ b/app/src/main/res/drawable/selector_add_taskline.xml @@ -1,5 +1,5 @@ - - + + diff --git a/app/src/main/res/drawable/selector_task_head_add_link.xml b/app/src/main/res/drawable/selector_task_head_add_link.xml new file mode 100644 index 00000000..5a398fa3 --- /dev/null +++ b/app/src/main/res/drawable/selector_task_head_add_link.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 08648202..ecc86505 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -154,7 +154,7 @@ android:id="@+id/main_activity_task_line" style="@style/top_right_drawer_btns_style" android:onClick="@{()->mainActivity.onClickTaskLink()}" - android:src="@drawable/icon_calc_disance" /> + android:src="@drawable/icon_add_road" /> + app:layout_constraintTop_toBottomOf="@id/task_search" + tools:ignore="MissingClass" /> \ No newline at end of file diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index d4f29fa3..04107426 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -1490,12 +1490,6 @@ - - - - - @@ -1529,19 +1523,40 @@ + + + + + + + + + + + + + + + + + + - + - + @@ -1550,14 +1565,14 @@ - + - + @@ -1566,14 +1581,14 @@ - + - + @@ -1659,20 +1674,6 @@ - - - - - - - - - - - - @@ -1689,19 +1690,19 @@ + symbol-height="56" symbol-width="56"> + src="assets:omdb/icon_4006_0.svg" symbol-height="56" symbol-width="56"> + src="assets:omdb/icon_arrow_right.svg" symbol-height="64" + symbol-width="64"> @@ -1714,7 +1715,7 @@ stroke="#ffffff" stroke-width="1.0"> + src="assets:omdb/icon_4010.svg" symbol-height="24" symbol-width="18"> diff --git a/collect-library/src/main/assets/omdb/icon_4002_0.svg b/collect-library/src/main/assets/omdb/icon_4002_0.svg index a9418b73..4f4ac0a7 100644 --- a/collect-library/src/main/assets/omdb/icon_4002_0.svg +++ b/collect-library/src/main/assets/omdb/icon_4002_0.svg @@ -1 +1,43 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/icon_4022_0.svg b/collect-library/src/main/assets/omdb/icon_4022_0.svg index dc58b844..efaaed34 100644 --- a/collect-library/src/main/assets/omdb/icon_4022_0.svg +++ b/collect-library/src/main/assets/omdb/icon_4022_0.svg @@ -1 +1,126 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vtm b/vtm index c74bcd29..d7552c34 160000 --- a/vtm +++ b/vtm @@ -1 +1 @@ -Subproject commit c74bcd29c24cddf395fa9654ef0b69d0c88ac3ad +Subproject commit d7552c34ffdff6724b5e4ddcec461f81f1e0b669 From 0b7b262540e223d0b056f403b6ffb762e7dc0209 Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Fri, 28 Jul 2023 09:40:31 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/assets/omdb_config.json | 22 +- .../src/main/assets/editormarker.xml | 396 +++++++++--------- 2 files changed, 210 insertions(+), 208 deletions(-) diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json index 0d898a13..cada4484 100644 --- a/app/src/main/assets/omdb_config.json +++ b/app/src/main/assets/omdb_config.json @@ -5,42 +5,42 @@ "code": 1012, "name": "检查点", "zoomMin": 16, - "zoomMax": 19 + "zoomMax": 21 }, "2001": { "table": "OMDB_RD_LINK", "code": 2001, "name": "道路线", "zoomMin": 16, - "zoomMax": 17 + "zoomMax": 21 }, "2002": { "table": "OMDB_RD_LINK_FUNCTION_CLASS", "code": 2002, "name": "道路功能等级", "zoomMin": 16, - "zoomMax": 17 + "zoomMax": 21 }, "2008": { "table": "OMDB_RD_LINK_KIND", "code": 2008, "name": "道路种别", "zoomMin": 16, - "zoomMax": 17 + "zoomMax": 21 }, "2010": { "table": "OMDB_LINK_DIRECT", "code": 2010, "name": "道路方向", "zoomMin": 16, - "zoomMax": 17 + "zoomMax": 21 }, "2011": { "table": "OMDB_LINK_NAME", "code": 2011, "name": "道路名", "zoomMin": 16, - "zoomMax": 17, + "zoomMax": 21, "transformer": [ { "k": "geometry", @@ -70,21 +70,21 @@ "code": 2019, "name": "常规线限速", "zoomMin": 16, - "zoomMax": 17 + "zoomMax": 21 }, "2020": { "table": "OMDB_LINK_SPEEDLIMIT_COND", "code": 2020, "name": "条件线限速", "zoomMin": 16, - "zoomMax": 17 + "zoomMax": 21 }, "2021": { "table": "OMDB_LINK_SPEEDLIMIT_VAR", "code": 2021, "name": "可变线限速", "zoomMin": 16, - "zoomMax": 17 + "zoomMax": 21 }, "2022": { "table": "OMDB_CON_ACCESS", @@ -138,7 +138,7 @@ "code": 4001, "name": "路口", "zoomMin": 16, - "zoomMax": 17, + "zoomMax": 21, "transformer": [ { "k": "geometry", @@ -297,7 +297,7 @@ "code": 4601, "name": "车信", "zoomMin": 16, - "zoomMax": 17, + "zoomMax": 21, "transformer": [ { "k": "geometry", diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index 04107426..276a60d7 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -1523,158 +1523,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1687,51 +1535,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2138,5 +1941,204 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 3c8bf307a2de733d37c16fead8fe213b8af272fd Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Fri, 28 Jul 2023 11:04:42 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B8=B2=E6=9F=93?= =?UTF-8?q?=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/assets/omdb_config.json | 48 +++++++++---------- .../main/java/com/navinfo/omqs/Constant.kt | 2 +- .../src/main/assets/editormarker.xml | 6 +-- .../map/source/OMDBReferenceTileSource.java | 3 +- .../library/map/source/OMDBTileSource.java | 3 +- .../library/map/source/RealmDBTileSource.java | 3 +- .../collect/library/system/Constant.java | 4 +- 7 files changed, 36 insertions(+), 33 deletions(-) diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json index cada4484..5a4b1afa 100644 --- a/app/src/main/assets/omdb_config.json +++ b/app/src/main/assets/omdb_config.json @@ -5,42 +5,42 @@ "code": 1012, "name": "检查点", "zoomMin": 16, - "zoomMax": 21 + "zoomMax": 22 }, "2001": { "table": "OMDB_RD_LINK", "code": 2001, "name": "道路线", "zoomMin": 16, - "zoomMax": 21 + "zoomMax": 22 }, "2002": { "table": "OMDB_RD_LINK_FUNCTION_CLASS", "code": 2002, "name": "道路功能等级", "zoomMin": 16, - "zoomMax": 21 + "zoomMax": 22 }, "2008": { "table": "OMDB_RD_LINK_KIND", "code": 2008, "name": "道路种别", "zoomMin": 16, - "zoomMax": 21 + "zoomMax": 22 }, "2010": { "table": "OMDB_LINK_DIRECT", "code": 2010, "name": "道路方向", "zoomMin": 16, - "zoomMax": 21 + "zoomMax": 22 }, "2011": { "table": "OMDB_LINK_NAME", "code": 2011, "name": "道路名", "zoomMin": 16, - "zoomMax": 21, + "zoomMax": 22, "transformer": [ { "k": "geometry", @@ -54,8 +54,8 @@ "table": "OMDB_LANE_MARK_BOUNDARYTYPE", "code": 2013, "name": "车道边界类型", - "zoomMin": 18, - "zoomMax": 21, + "zoomMin": 19, + "zoomMax": 22, "transformer": [ { "k": "geometry", @@ -70,21 +70,21 @@ "code": 2019, "name": "常规线限速", "zoomMin": 16, - "zoomMax": 21 + "zoomMax": 22 }, "2020": { "table": "OMDB_LINK_SPEEDLIMIT_COND", "code": 2020, "name": "条件线限速", "zoomMin": 16, - "zoomMax": 21 + "zoomMax": 22 }, "2021": { "table": "OMDB_LINK_SPEEDLIMIT_VAR", "code": 2021, "name": "可变线限速", "zoomMin": 16, - "zoomMax": 21 + "zoomMax": 22 }, "2022": { "table": "OMDB_CON_ACCESS", @@ -110,8 +110,8 @@ "table": "OMDB_RDBOUND_BOUNDARYTYPE", "code": 2083, "name": "道路边界类型", - "zoomMin": 18, - "zoomMax": 21 + "zoomMin": 19, + "zoomMax": 22 }, "2201":{ "table": "OMDB_BRIDGE", @@ -123,7 +123,7 @@ "code": 2202, "name": "隧道", "zoomMin": 16, - "zoomMax": 21, + "zoomMax": 22, "transformer": [ { "k": "geometry", @@ -138,7 +138,7 @@ "code": 4001, "name": "路口", "zoomMin": 16, - "zoomMax": 21, + "zoomMax": 22, "transformer": [ { "k": "geometry", @@ -153,7 +153,7 @@ "code": 4002, "name": "常规点限速", "zoomMin": 16, - "zoomMax": 21, + "zoomMax": 22, "transformer": [ { "k": "maxSpeed", @@ -174,7 +174,7 @@ "code": 4003, "name": "条件点限速", "zoomMin": 16, - "zoomMax": 21, + "zoomMax": 22, "transformer": [ { "k": "maxSpeed", @@ -189,7 +189,7 @@ "code": 4004, "name": "可变点限速", "zoomMin": 16, - "zoomMax": 21, + "zoomMax": 22, "transformer": [ { "k": "location", @@ -216,7 +216,7 @@ "code": 4006, "name": "普通交限", "zoomMin": 16, - "zoomMax": 21, + "zoomMax": 22, "transformer": [ { "k": "geometry", @@ -255,7 +255,7 @@ "code": 4010, "name": "电子眼", "zoomMin": 16, - "zoomMax": 21, + "zoomMax": 22, "transformer": [ { "k": "geometry", @@ -288,7 +288,7 @@ "code": 4022, "name": "交通灯", "zoomMin": 16, - "zoomMax": 21, + "zoomMax": 22, "transformer": [ ] }, @@ -297,7 +297,7 @@ "code": 4601, "name": "车信", "zoomMin": 16, - "zoomMax": 21, + "zoomMax": 22, "transformer": [ { "k": "geometry", @@ -323,8 +323,8 @@ "table": "OMDB_LANE_LINK_LG", "code": 5001, "name": "车道中心线", - "zoomMin": 18, - "zoomMax": 21, + "zoomMin": 19, + "zoomMax": 22, "transformer": [ { "k": "geometry", diff --git a/app/src/main/java/com/navinfo/omqs/Constant.kt b/app/src/main/java/com/navinfo/omqs/Constant.kt index 30e53f7a..b4042a1f 100644 --- a/app/src/main/java/com/navinfo/omqs/Constant.kt +++ b/app/src/main/java/com/navinfo/omqs/Constant.kt @@ -67,7 +67,7 @@ class Constant { /** * 地图最多缩放级别23 */ - const val MAX_ZOOM = 23 + const val MAX_ZOOM = 22 /** * 是否自动定位 diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index 276a60d7..030d0b62 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -1537,7 +1537,7 @@ - + @@ -1962,7 +1962,7 @@ - + - Date: Tue, 1 Aug 2023 15:36:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=B8=8A=E4=BC=A0=E6=97=A0=E6=95=88=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/navinfo/omqs/http/taskupload/TaskUploadScope.kt | 4 ++-- .../com/navinfo/omqs/ui/activity/login/LoginViewModel.kt | 3 +++ app/src/main/res/menu/personal_center_menu.xml | 2 +- collect-library/src/main/assets/editormarker.xml | 6 +++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt b/app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt index 41b948ef..519430d6 100644 --- a/app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt +++ b/app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt @@ -164,7 +164,7 @@ class TaskUploadScope( val objects = realm.where(QsRecordBean::class.java) .equalTo("linkId", /*"84207223282277331"*/hadLinkDvoBean.linkPid).and() - .equalTo("taskId", hadLinkDvoBean.taskId).findAll() + .equalTo("taskId", taskBean.id).findAll() if (objects != null && objects.size > 0) { val copyList = realm.copyFromRealm(objects) @@ -241,7 +241,7 @@ class TaskUploadScope( change(FileUploadStatus.ERROR) } } else { - change(FileUploadStatus.NONE) + change(FileUploadStatus.NONE,"无可上传数据") } } catch (e: Throwable) { change(FileUploadStatus.ERROR) 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 f167d595..52582359 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 @@ -281,6 +281,9 @@ class LoginViewModel @Inject constructor( task.operationTime = DateTimeUtil.getNowDate().time } } else { + for (hadLink in task.hadLinkDvoList) { + hadLink.taskId = task.id + } //赋值时间，用于查询过滤 task.operationTime = DateTimeUtil.getNowDate().time } diff --git a/app/src/main/res/menu/personal_center_menu.xml b/app/src/main/res/menu/personal_center_menu.xml index 07e15bcc..80fd31f2 100644 --- a/app/src/main/res/menu/personal_center_menu.xml +++ b/app/src/main/res/menu/personal_center_menu.xml @@ -38,7 +38,7 @@ + android:title="版本：ONE_QE_V1.5.0_20230728_A" /> diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index 030d0b62..7a772d09 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -1486,9 +1486,9 @@ - + @@ -1955,7 +1955,7 @@ - +