From 2eb8528f98dee1586255481de20848064a9fbf08 Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Wed, 20 Sep 2023 15:32:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=BB=E5=8A=A1=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E6=95=B0=E6=8D=AE=E5=AE=B9=E9=94=992.=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BA=A4=E9=80=9A=E6=A0=87=E7=89=8C=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/assets/omdb_config.json | 2 + .../com/navinfo/omqs/db/ImportPreProcess.kt | 4 +- .../omqs/ui/activity/login/LoginViewModel.kt | 13 +++- .../EvaluationResultViewModel.kt | 5 +- .../java/com/navinfo/omqs/util/SignUtil.kt | 44 +++++++++++++ .../main/res/drawable-xxhdpi/icon_3005_1.png | Bin 0 -> 1056 bytes .../main/res/drawable-xxhdpi/icon_3005_2.png | Bin 0 -> 355 bytes .../main/res/drawable-xxhdpi/icon_3005_3.png | Bin 0 -> 1132 bytes .../main/res/drawable-xxhdpi/icon_3005_4.png | Bin 0 -> 1379 bytes .../main/res/drawable-xxhdpi/icon_3005_6.png | Bin 0 -> 1233 bytes .../main/res/drawable-xxhdpi/icon_3005_7.png | Bin 0 -> 356 bytes .../main/res/drawable-xxhdpi/icon_3005_8.png | Bin 0 -> 1608 bytes .../assets/omdb/appendix/1105_00101_0.svg | 52 ++++++++------- .../assets/omdb/appendix/1105_00101_01.svg | 30 +++++++++ .../assets/omdb/appendix/1105_00101_0_s.svg | 59 ++++++++++++++++++ vtm | 2 +- 16 files changed, 181 insertions(+), 30 deletions(-) create mode 100644 app/src/main/res/drawable-xxhdpi/icon_3005_1.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_3005_2.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_3005_3.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_3005_4.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_3005_6.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_3005_7.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_3005_8.png create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00101_01.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00101_0_s.svg diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json index 04357aa9..c4b09ded 100644 --- a/app/src/main/assets/omdb_config.json +++ b/app/src/main/assets/omdb_config.json @@ -7,6 +7,7 @@ "code": 1007, "name": "点形态", "existSubCode": true, + "checkLinkId": false, "zoomMin": 15, "zoomMax": 20 }, @@ -15,6 +16,7 @@ "code": 1007, "name": "点形态PA", "existSubCode": true, + "checkLinkId": false, "zoomMin": 15, "zoomMax": 20 }, diff --git a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt index 9dc13333..4281b648 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt @@ -845,9 +845,7 @@ class ImportPreProcess { val listResult = mutableListOf() val coorEnd = Coordinate(pointStart.getX() + dx, pointStart.getY() + dy, pointStart.z) - renderEntity.geometry = - WKTWriter(3).write(GeometryTools.createLineString(arrayOf(pointStart, coorEnd))) - + renderEntity.geometry = WKTWriter(3).write(GeometryTools.createLineString(arrayOf(pointStart, coorEnd))) val code = renderEntity.properties["signType"] renderEntity.properties["src"] = "assets:omdb/appendix/1105_${code}_0.svg" } 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 a6fff588..d0f840ca 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 @@ -271,6 +271,7 @@ class LoginViewModel @Inject constructor( realm.executeTransaction { result.data.obj?.let { list -> for (index in list.indices) { + var inSertData = true val task = list[index] val item = realm.where(TaskBean::class.java).equalTo( "id", task.id @@ -287,12 +288,20 @@ class LoginViewModel @Inject constructor( } } else { for (hadLink in task.hadLinkDvoList) { - hadLink.taskId = task.id + if(hadLink.geometry==null||hadLink.mesh==null){ + inSertData = false + }else{ + hadLink.taskId = task.id + } + Log.e("qj","mesh==${hadLink.mesh}") } //赋值时间，用于查询过滤 task.operationTime = DateTimeUtil.getNowDate().time } - realm.copyToRealmOrUpdate(task) + Log.e("qj","task==${task.id}") + if(inSertData){ + realm.copyToRealmOrUpdate(task) + } } } 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 16168314..258ec4ec 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 @@ -475,7 +475,10 @@ class EvaluationResultViewModel @Inject constructor( p.latitude, p.longitude ), TAG, "", null ) - + //定位 + val mapPosition = mapController.mMapView.vtmMap.mapPosition + mapPosition.setPosition(p.latitude, p.longitude) + mapController.mMapView.vtmMap.animator().animateTo(300, mapPosition) //获取linkid if (it.linkId.isNotEmpty()) { val link = realmOperateHelper.queryLink(it.linkId) diff --git a/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt b/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt index cbda1321..47bf4c38 100644 --- a/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt +++ b/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt @@ -805,6 +805,42 @@ class SignUtil { return "" } } + DataCodeEnum.OMDB_TRAFFIC_SIGN.code -> { + var color = data.properties["color"] + if (color != null) { + when(color){ + "0"->{ + return "颜色：未验证" + } + "1"->{ + return "颜色：白色" + } + "2"->{ + return "颜色：黄色" + } + "3"->{ + return "颜色：红色" + } + "5"->{ + return "颜色：棕色" + } + "6"->{ + return "颜色：蓝色" + } + "7"->{ + return "颜色：绿色" + } + "8"->{ + return "颜色：黑色" + } + "9"->{ + return "颜色：其他" + } + } + + } + return "颜色：未验证" + } else -> "" } } @@ -1026,6 +1062,14 @@ class SignUtil { } return 0 } + DataCodeEnum.OMDB_TRAFFIC_SIGN.code -> { + var trafsignShape = data.properties["trafsignShape"] + if (trafsignShape != null) { + trafsignShape = "icon_${DataCodeEnum.OMDB_TRAFFIC_SIGN.code}_${trafsignShape.lowercase()}" + return getResId(trafsignShape, R.drawable::class.java) + } + return 0 + } else -> 0 } diff --git a/app/src/main/res/drawable-xxhdpi/icon_3005_1.png b/app/src/main/res/drawable-xxhdpi/icon_3005_1.png new file mode 100644 index 0000000000000000000000000000000000000000..4c76e44204fdda393a74752fc50d8549edd54ff7 GIT binary patch literal 1056 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_3005_6.png b/app/src/main/res/drawable-xxhdpi/icon_3005_6.png new file mode 100644 index 0000000000000000000000000000000000000000..7de74751959f563ac2b03cd1b427e39b3934eb0f GIT binary patch literal 1233 zcmV;?1TOoDP)Px(i%CR5RA@u(nOCS>RTPH5A4F6TK_m}Rd=SBcsEDy6F}4^BCPFN+1~f+W#TpSc zXoz0hiyEvL6$?fzSP)C>F-m-}1S66M3pPYS3=%&Yped&V;)jXU^Vh zeP`{n+7_F*XcOmS5^&Hx{Er81Ujf`W=rE(~UnFU$1-Lcv0R6~Qnf$k=`en40MS7$ivBTL8ZU%O#!DvVAn*{^_VL zm2}&H0X_*F0vs#p!!ZFkC3+S1x^Ewkn~80HV2N8^g|Y4@?u2NTT{S!wI3jDp8`Av%$M{)JDV!COSU7DZj>~;PXK=c zR!W-N$)2i!5lN#MUm)q8PMbFQzwMz2e86-`Z+6mE2{0YiWx&B{;}OZUlaf;Z+nxf% z_ckPHQI&n`0PY05o^sBWRW>jEjO|EU5j|%}`nt;gl>w6%<7h-kj=b}J6$Pc9v3+zZ zAe_uos3{;_9bI|~2xl8&pRGzTyuX>`qJN_x1CvfO8F$M<#vaFnFT z%ax@zVDjRF!0x~SlK!l$E#pDko25qf_MBoP7jQS=Enu0XYcuSwyu@}S@|n@hN{Y6q zmSh1YFD?cyN{Sn4jBQT?J_tRz1%Eeyu{M;ilXOO{*IMym+iwGZrQ92BQEkZvOkQl& zgeOXRwzl>*3v8bUL^_BWOLo)U6<~sl@!V8NQRNg9+us4tNea+xDFL`Q@Gh`e(#_eH z3|nYB_E`w*D=CK2+0r#&@?zwuvw;01eUoj?zt;#m1784_Ns5NMD=7sSL)Vx^u99?a zHx}8Bsrrt4OM$b2JtY0y$r$5i$-s^>~dUi$=6tWvR~x0D^?ArC$oMq`S3oL6+XLqYT&xh*AG|R)m&3H t$LQa}|FK6!4wn@_(ta@Ka`d77{9G2ZJpQ>9O$7!UgQu&X%Q~loCIIINl-vLS literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_3005_8.png b/app/src/main/res/drawable-xxhdpi/icon_3005_8.png new file mode 100644 index 0000000000000000000000000000000000000000..b9c2f9cf782b571529989951c4cf5b01ae710e54 GIT binary patch literal 1608 zcmeAS@N?(olHy`uVBq!ia0vp^79h;Q1|(OsS<3+_$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%$k`Y5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^Yauy zCMG83mzLNn0bL96Ms5Mz*t}wBPyqu?zap_f-%!s0gi&u1T;i1Gc(1?z`)7W($d`0#Ldys(9qS@$<)Ht z(#*iz$j!{q(9ysJrq?AuximL5uLPzy1)Sh&RAk4tP zwAItaF{I+wn_2!IqJbjq?^lZ~@e%iTj7^y(z44lp2e;_tjL8p`&R#P3AFzXKdtSG~ zMu8=jXFI za*7}BM1x~4h#vhD(so6E}exP~d$Mem~ z50qZ8l$PkuRQVxyhb=ha_VJI$9oTm;X)WctRGAj>ruXI70<+tW+8PrSc5td4kTuBv z`0RNj_nezm1sC3In|)kMg7Ildzf3R}+d=)i-6kg=Sf#(Vi{PrfGXKG)(x^q}9iv@7 zm+4kKuafg|-C-~@c@AeC^Jc;I``+yosd-c!S1dWXX7O6?Wy*Tz?Uye#6mLEgUEp@Y z*=f?|8R^E&kDKN-O{+MVr`x>clRoEb&I9Qo&HcZ1Fa1sX&}v}W#rok?SZAO1Ov9YT zF5-@&{fmUGh2jr%DoFZpP7StE?`JuwF!#ZZb4R2c1JWN@YXBX$reNn?!G9AoJC}u| z9oe=rLG6og@xjpG#(O*hHvC<_tp3fxhgjFM>mIZ_SoCy(;tGYWA3n8m#oa!CuwUV< z@pRTxvO#g-cTQ<&ZuB|dWE9cbD94U2e}voyR;;qB)GNPAt2B*k^B8?_HFZimR{pzudy3YN z-|-A_#bKHEd2*kxVlb~rExGcvU)|}RfVb`m{{@ - - - qita_icon - Created with Sketch. + - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00101_01.svg b/collect-library/src/main/assets/omdb/appendix/1105_00101_01.svg new file mode 100644 index 00000000..7e87f75d --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00101_01.svg @@ -0,0 +1,30 @@ + + + + qita_icon + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00101_0_s.svg b/collect-library/src/main/assets/omdb/appendix/1105_00101_0_s.svg new file mode 100644 index 00000000..172175ad --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00101_0_s.svg @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vtm b/vtm index f2af87c6..3d9400fb 160000 --- a/vtm +++ b/vtm @@ -1 +1 @@ -Subproject commit f2af87c6a012ac41d6f22a77d6b45853b250ed3e +Subproject commit 3d9400fb6aa671ff05dceb616e412f024b2e4440