From 75a99929b097cdb827a841b6b877adf7ce28a785 Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Thu, 17 Aug 2023 17:51:29 +0800 Subject: [PATCH 1/4] merge code --- app/src/main/assets/omdb_config.json | 3 +-- app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json index 5a0c499c..2448d824 100644 --- a/app/src/main/assets/omdb_config.json +++ b/app/src/main/assets/omdb_config.json @@ -404,8 +404,7 @@ "code": 2206, "name": "道路形态2", "zoomMin": 15, - "zoomMax": 17, - "transformer2Code": "" + "zoomMax": 17 } } diff --git a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt index 3460f39c..e54d170f 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt @@ -347,6 +347,7 @@ class ImportOMDBHelper @AssistedInject constructor( } } }else if(renderEntity.code == DataCodeEnum.OMDB_LINK_FORM2.code){ + Log.e("qj","道路形态2${renderEntity.properties["formOfWay"]}") /*道路形态2*/ var formWay = renderEntity.properties["formOfWay"] if(formWay!=null){ From 521324fd6e41555eed51a8a8a5e8f8f920f6feee Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Fri, 18 Aug 2023 16:17:11 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E9=9D=A2=E7=BA=B9=E7=90=86=E6=B8=B2?= =?UTF-8?q?=E6=9F=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- collect-library/resources/rendertheme.xsd | 2 ++ collect-library/src/main/assets/editormarker.xml | 4 +++- collect-library/src/main/assets/omdb/area_1.png | Bin 0 -> 9010 bytes .../src/main/assets/omdb/icon_fill_area_3012.svg | 1 + vtm | 2 +- 5 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 collect-library/src/main/assets/omdb/area_1.png create mode 100644 collect-library/src/main/assets/omdb/icon_fill_area_3012.svg diff --git a/collect-library/resources/rendertheme.xsd b/collect-library/resources/rendertheme.xsd index 6b2e9c6d..299bd87c 100644 --- a/collect-library/resources/rendertheme.xsd +++ b/collect-library/resources/rendertheme.xsd @@ -145,6 +145,8 @@ + + diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index d71cfdcb..3aaf3443 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -2277,8 +2277,10 @@ - + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/area_1.png b/collect-library/src/main/assets/omdb/area_1.png new file mode 100644 index 0000000000000000000000000000000000000000..db5e5a33660e2b32bbd8e1ae3065c30ad75d04e0 GIT binary patch literal 9010 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 literal 0 HcmV?d00001 diff --git a/collect-library/src/main/assets/omdb/icon_fill_area_3012.svg b/collect-library/src/main/assets/omdb/icon_fill_area_3012.svg new file mode 100644 index 00000000..bbe4ad98 --- /dev/null +++ b/collect-library/src/main/assets/omdb/icon_fill_area_3012.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vtm b/vtm index bb130bcd..33ba2c17 160000 --- a/vtm +++ b/vtm @@ -1 +1 @@ -Subproject commit bb130bcdbead90cf923d36c837af4afcdf846701 +Subproject commit 33ba2c17cea19d445f71d2e78fda6ad459aa4822 From 130b3ff7ad6fd6023c075bd9f169b74566be1054 Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Mon, 21 Aug 2023 10:04:43 +0800 Subject: [PATCH 3/4] merge code --- collect-library/src/main/assets/editormarker.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index e8a1c689..aafce0de 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -2068,10 +2068,12 @@ + + From 7abb32610afb23ceec95409dc6ef146e96e365c0 Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Tue, 22 Aug 2023 08:52:53 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/assets/omdb_config.json | 7 +++ .../com/navinfo/omqs/db/ImportPreProcess.kt | 1 + .../main/res/drawable-xxhdpi/hide_line.png | Bin 0 -> 867 bytes .../res/drawable-xxhdpi/icon_hide_line.png | Bin 2003 -> 1861 bytes .../res/drawable-xxhdpi/icon_high_line.png | Bin 2609 -> 1850 bytes .../drawable/selector_high_road_line_src.xml | 4 +- app/src/main/res/layout/activity_main.xml | 5 +- .../src/main/assets/editormarker.xml | 43 +++++++++++++++++- .../src/main/assets/omdb/icon_3016_0.svg | 1 + .../src/main/assets/omdb/icon_3016_1.svg | 1 + .../src/main/assets/omdb/icon_3016_3.svg | 8 ++++ .../library/map/handler/LineHandler.kt | 4 +- .../src/main/res/values/colors.xml | 1 + vtm | 2 +- 14 files changed, 68 insertions(+), 9 deletions(-) create mode 100644 app/src/main/res/drawable-xxhdpi/hide_line.png create mode 100644 collect-library/src/main/assets/omdb/icon_3016_0.svg create mode 100644 collect-library/src/main/assets/omdb/icon_3016_1.svg create mode 100644 collect-library/src/main/assets/omdb/icon_3016_3.svg diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json index 2448d824..09cfbb01 100644 --- a/app/src/main/assets/omdb_config.json +++ b/app/src/main/assets/omdb_config.json @@ -136,6 +136,13 @@ "zoomMin": 16, "zoomMax": 20 }, + "3016":{ + "table": "OMDB_OBJECT_STOPLOCATION", + "code": 3016, + "name": "停止位置", + "zoomMin": 18, + "zoomMax": 20 + }, "4001": { "table": "OMDB_INTERSECTION", "code": 4001, 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 2e9d198d..7bc86ec1 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt @@ -567,6 +567,7 @@ class ImportPreProcess { val intersectionReference = ReferenceEntity() intersectionReference.renderEntityId = renderEntity.id intersectionReference.name = "${renderEntity.name}参考点" + intersectionReference.code = renderEntity.code intersectionReference.table = renderEntity.table intersectionReference.zoomMin = renderEntity.zoomMin intersectionReference.zoomMax = renderEntity.zoomMax diff --git a/app/src/main/res/drawable-xxhdpi/hide_line.png b/app/src/main/res/drawable-xxhdpi/hide_line.png new file mode 100644 index 0000000000000000000000000000000000000000..ce3f6e02d8b320585c3d3b9ff7f31b319bac6ef1 GIT binary patch literal 867 zcmV-p1DyPcP)Px&9Z5t%R9HvtmQ83AK@`W|+f73YDjuvJES{`T1r@57U^g?{gd*63iV^W7hzC&- ztk#?L<_Eo46g=obyciV)1&tv)V_ItwK`3YiZ-RKJg6JWbboa@~rli}A-A!63vIBwa z&inYy|Gl>i!ZKaBOt~Ne3tO2;u}HD73WT+fdaPl^#>U20Rw|Wl&bbU5WHIc85Ue)$ zY$=5hhXLR&5e=HAd1Wz@1&twuxC#IRj^kYH?d=^>ezRbfWpyLsTQ^ug=lp5Vz|GhR zA+`g+J2%Dv=X`h$n0k;>-Xx-9>VHQ^M{8$i=kI2cF61kOSOEaP{(>OBV2t%uedbJM zu~^(}+jbTJwkQKl(>5iO$xjO7g8#5N*2LquC$^?oAaYealWMEU9I>B&qcQ&xM~Y&PEB z-mdI+0YDM}7yztxCvOrFhl!{Zs>h1OV!LhIqB@ldiZOOy1sxwBZ!4F}CyD430Ic_( z9ucQp=q?{+z98bYcsxFmNF+*X-)8{QhGBg5oytO?Fr;bP1^0BbP_>D2x!l@#Jbuqr zB2YDL+dh;^rM`QOYvF3Y`o7ICgg8w^Q>JO=>SdKuz9FKWM07{j^@p}?uK@t{Q|p_q z>)#y5=?8$Lh&ag@+g2}@5MmDitmB;Dn$yccj$CUagxClG)sOC8&iP}%7?x%AA>wm) zuZwg3F-)$|_c1Bu5hA(`0Jc(zbN<6G;l#wms#2+>$`=EG6P)wwOA020cmM$V0YGrh z&3`2mLMX+Qa*r5e`<5C^O)c{_t6$RUFcHy+X_{)91Fz7fbZ-PZf?g=S7r>xop}~R% tZq_aW3#(wHSfp531;W}#J@(%y_6Ji;P&TU8ZxH|h002ovPDHLkV1h(ti7x;E literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_hide_line.png b/app/src/main/res/drawable-xxhdpi/icon_hide_line.png index 70df09a42677fa954d383497fe833fa35746f017..b592a647aec070f29695d0ff1ed40604e44b5f7f 100644 GIT binary patch delta 1834 zcmV+_2i5q~55*3UFnL z_C0SUC-=U0)?Rz<|5bNeITe2^jX6H0|d7h$bU!Hw(sSZ;AQ})0V6CR zdNBxY8ZbAtfDbJodMOBQ3UE_y3wVL(g&?@ez^xu1PzXdX1HnxI?lhd>ERbvR_t!B9 zZUY4K7Sb<1i>8x91ZB_q1B#lGU`jCr|IoSM2WUW1cP(__H9z-(ipsUZ1dvQw7e zHUQM)DggR@eV{2I^I{e0rX{%TfO~);u@eHTfG={_?tegb?U8;jA+m|}5)faU&~8g` z`vAH}caG5ZX*0C*uV*>AvYz+#Y3$|_dp zPpoYyaANxD6Ez8BewBGDfZ(nMW(6i&QUgHroNoiUVZh^tpo>7PNYT`xBnUwO^ch-@av-*F1Le!#xK_w`HuY98w}$a>w7cL9he zR1OzYO8NvhGjJxK0P<9L@lF@5`+E?eekD&TLw(3{aQ)Np*(Y{9$fDw#3IGoQ3uF95 zgeAC1faP(w0MU3qKyEZ}7oZjpB9*tf!88s;kALO@>H=Wz^ycXxORWh5Ah4)d}sEvlU7;T;X~K!hBPG&P60*~2>zMC*@DQ~-jx4HkfC2`hpM zi=9Q|mVu0@-AF=Z_3Di@3gp3v2^(0P9-CTeDx%}_aZC{izHOlYA5tRre=;JmY5*Y9 zH?g31(!YY9y?C8&%M{EaXROva0O~PG4u1siHqh#hI>NW&o`~BN2$aNh3uG3Mm+I~S zUIxiqMcni?tI|MA$M0A$XbyhEy7C%043HLWObtepD!5* zvL+9LZyU@8(WI#aIXx16{l9Ji5FZNHmGxTp8jyjVv;?g#>)D*AZUVq&AaBG!4SzQh z@I{M7mXMgSFHJ7%6SU0sXMwVdKzv@?SX&kdi57Aq$?cb>-#ZlyXtM5gaXM&+SmT07 z>WTzE068OWklQG&WNEJ>PhHy}yV1!wK}+usdz3x^M61OCY6^vov^g)vX@zN`M|jsZ zFhDT3h2D&e7!x@^8rh)s4>UvdP=6BuZ`TsAsBG10$QC;J4(1MSFkn@fj0CJD8PXt4 zi?t!k84fJ>Ftu!hfF&ePF;q;o7Eu)bHtIGMvDkt)@nxLAqCO9iVtS6hU z*-ZtkhHKPu90@|AXiUGs_dxoCyk=OyCLnqOL{ifK)B=mu{EY&jge7FURRZGR`0O(V z19x0n`98$pE)i2iZ->U|N`C=iSU}8zo90yqsWE{19g9jQd?mI+lR}{*P?-%USOx&6 zulAgq0scm)vLnZW&q zSi>BXQ$QOzp8}r&U!|8;e;O~1He=}}Kzk7%#}3Hzl>{Le2ZR97a(`FW8LFytHcnsl z(=wcv%Kqq%uo57+ae$}ym#8q(UlTMNBUSWYSOdU*dp%ZgBna-pw2$bMYm~*?3V%3d#R-@%OZSJbm)PGM6pI3osO`@Y@)e|lUZZKv)A4KTWg%V!BbATEo`@z>`ix9Vp3ggg*efLK1F zXRW+J+tBHd0kPEggNYuy@^}!Gvr7N3XF(GYEcL7fRnfK&gd_MuYZZKZ&X_(+`1e`; Y17o$(QPC*5(EtDd07*qoM6N<$f^TC&DF6Tf delta 1977 zcmV;q2S)hC4$}{iFnM* z2(?mdF}4B5~8s1h5x?ZGQp$0>JM8EFk$%n{BYo z|y?E>IB06SIK;AE0(DvVoi$k0NNv}*t`p~l7< zffz~%l6DIKc1!@=2jEHoe*$m>fa5cOYJ(U$2$FUW0N#-S;0@m2yDsS*0B5%aF;oyF zy)yvVp$tF-Vt+1xFSh|PG!P{10bn(Nw^s!aftUwic2f{T0YTE90l@Zk0Yo4!1aM{( z5aSL((z^nHw>1S2fw&mJX>~!2D+EbC{rMd5*0um55Q_kuS_j0qL6Ed}0I*$G03s0I z0`QrtAjSoPq<04ZZ|QRoI)|i>%8fmNFB2$J>>0JcdC_^myFA$fXB5UYaM#cCD|6oRA! z0)VX(<9`!8;E%aYN%{hS3o^egBKi52Anbh((|fXZU=Sp|H{1iZN{qfIc!0y}83`6kIznu3t@X#mTk`Hu|*f~5Ba0B=Z)y?-lsz@MvZLXwZbJ_@I@l;mft=t##% zS_~kDcwgrbB)vZX*fKHT*TDlGsAIgO&jDDNnX{bai8XaOPw7ZCmKB{skaSQ0@cLw- zUj+|%u#VBav64;(up~40Qj&J>QjwGc;Ca(JgCObP0N{0rMZXLl@Rw3c3kFDXEZ~?R zm4C}geyT`!0f2Rn-cBG$IwSyiZDP#Ng9rSz4S>ia91A!mNM$9-T)xp~kA5DohU8=` zY7Ifs2g3hs^Te{B1rPXJ7XTs7 zpLq&+=yyq`N9SgqAZcP)WV6JG+XH}BwZW?JBpnCfs*2-By(Ar9+Y=-m9&UoKN|fCe z0Q|e6QJoBvWY@m7MA3BlAi<*c(|tRoeeL5a23g19^nORSMmf&uKStvD-z3p96aEW&URE&kt9Fr z93rQ3B}v~rOQjToqz?xGFHf}H5I6IE6I;KXNyu>=uX8$mFz~iNs4roBZqp>uOsO$-nCItX5 zO(xwOJm84|?XOg=Bp;34qmasFBy;KYQl0C0f~2DYfQ^#bKL{T1WU1Bx4UptJy)(zD zjF6n!blDd`ko3_2;3bK|8-oWt-E^V0^CUS+ydtBga!#S24Wkf3z~RSW>VF+K1P}Oc z+l@4xAKLeF0n>L#=1Og~mRh&rP#EzeFFguhA3WgMT3S0CEXfIzk&MdP>9xL|Ajumy z09S}&aU|xt!2dejQ!Q1J`sEImkvyrEvVy_v^I!X3@BnqSP+dKl)Ob(Dw@K#8?sbc z6AZx(5^*E-NhEUxjxt@ff0yJkd(P`x_af9W#t>X0k2^_cki4vpk|tv%x#40#X70r# z&uF5v=^R6Fku+|ln@%zpsy1C?y?K(n$%`@y{VGqcHMg_1bBYYXWwN-JXe!CF6n0~y zB)Rt}_w;Gqm(!-U`+u1vbD5l4221*CpEljr zjoY;hsW8|Od?tuHJX}{ejbygbvVu;h>)fWF3&+nTnR|P!irRsVF@%08thE510pR?i zzvEBQwJ8A7x7oY_r^*L@5^X}NmuPim+1+OwqKxz)xajJ?McR9`AwYQ!f<=@@G^VKepS~mX}TEedZfSOPti5^ExW5NeY<5?!H)bN;$g}O8iLDp00000 LNkvXXu0mjf?dO3F diff --git a/app/src/main/res/drawable-xxhdpi/icon_high_line.png b/app/src/main/res/drawable-xxhdpi/icon_high_line.png index eefea2d9dc8338e2120bf13bcce64e79627d5462..9a897be738b8afb7db321c675248d862845d8f38 100644 GIT binary patch delta 1823 zcmV+)2jKXz6uJ(OFn7#+vl9U&v$S6b0#_YZtgdGX7)NWvu9>sVjyt900Rhif`7pi1`wu_!Qcr42!khV zJQ#;?7{XzK;UMV{06zlo6o5-e{=aWgCTaH|YkL5vlYFVKtfqAn2?t4v6fPyXsITFY zehc96uznTE*?ncbpCG&pU^kL)*BUSBU;wM4b#IW|rdCcD|D-(OF95y}DL;nf-Cf3{ z|CeMBx+?m9HGj#2YUOnCPYQ%f0h|>nzlP)wx{S$ya2J4Mqwg;!c|on5F8)b@FdxAE zk@6==ey+=y3<$3R*e?2hHpw_VYDH%GCk4W`0A5Qp?o0BSQmZrhU>(U_OV`)%O#}oR zAnEr2=0?UWBDu8GI7tpCht-Idkz821zJ{+6gm6AD27mAtfCos%?%kFkW2caVHOx3~?2p91)Hv}ggz<)s!# zO7lYL(j4Cg14i=2QX!I@P@Pyu^fQtt*MhJXz^9T$MLIY-h+C8z-op1LfExk) zuEZlV0DoBYze#?g76hYqOJ-3c5W)Sv1K`VJ*m#qOdkhH4dvgp80GRa*lGj&(VCGC* zk7R5DM8)QPO39VfCw8hx_130 z^2YB2u!7{TNZZuS7do$3MYaqQ_G2I4ar$0vWh^Et z5`ho77$W(v5=GG)ybQpZEo&|(8Mon`;w611oD3-t>q&mFOF$7y0ReHET)kQ^2>8Mbef4)?_^5S$~oaoknT}LDFgfUrYfYIj6?J5CX37j;dJq zYm#n&sz}l!0KSwgT1m38mT7CCRsi^VBJ2^8E=sDXrINc9fRm};)HgFii+YuGouoSe z9G85*oaBO>;aLzQx#hh%S#S@@uT<@Rs`TC(fD>q1%*-L_yz(ANIuyWziF_x^S$`zc z0ZpeFlH7KmlrWx3a#}w$4FpL$gmO5JU5~WpkzC)YJzf#)8^BKzr3a97C0I?8jt6jiw6M`FgGZ#p)gP1e zMNTy}%rvH*J~Uw|G21&Ya+) z&k6a7RuID5@I}ehiIJ_b+!U~qTq1j>5R(TYi{s=NlHwJa()?pNz`7EIq<@wE}_FqoR$Xw)YS=5Qpr_}y<)VYWFD!nE}dHd z=vOgDK;(Ld8%TPjRYj6q47n)kqFyILa*aRIF|*zw0>UG2SAH?sjU8jt5?tF3!$9QP z7M}0d4rU~M62Q;HfHoGrfq&#yU5Iyfkr5ES#c}l)(_j575|U1I#UyDL0KQ`Pb07eR z-J^a;zECV^s@(RB!^e7D8Ct~iB%9`+o2V!TA;eo+&5eXP@tsf7H$|I;Bz*wD#mP?q zM!NqXHBe N002ovPDHLkV1h(PPtyPZ delta 2588 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 - - + + \ 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 dad709a6..039b77d6 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -82,14 +82,14 @@ android:id="@+id/main_activity_top_sign_recyclerview" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="220dp" + android:layout_marginLeft="300dp" android:layout_marginTop="2dp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> - + @@ -2188,6 +2188,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/icon_3016_0.svg b/collect-library/src/main/assets/omdb/icon_3016_0.svg new file mode 100644 index 00000000..2d7070c7 --- /dev/null +++ b/collect-library/src/main/assets/omdb/icon_3016_0.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/icon_3016_1.svg b/collect-library/src/main/assets/omdb/icon_3016_1.svg new file mode 100644 index 00000000..cc6af1aa --- /dev/null +++ b/collect-library/src/main/assets/omdb/icon_3016_1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/icon_3016_3.svg b/collect-library/src/main/assets/omdb/icon_3016_3.svg new file mode 100644 index 00000000..15f98594 --- /dev/null +++ b/collect-library/src/main/assets/omdb/icon_3016_3.svg @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LineHandler.kt b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LineHandler.kt index 8776d6e6..d4b830b8 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LineHandler.kt +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LineHandler.kt @@ -57,9 +57,9 @@ class LineHandler(context: AppCompatActivity, mapView: NIMapView) : BaseHandler( mMapView.vtmMap, Style.builder() // .stippleColor(context.resources.getColor(R.color.draw_line_red_color, null)) - .fillColor(context.resources.getColor(R.color.draw_line_red_color)) + .fillColor(context.resources.getColor(R.color.draw_line_pink_color)) .fillAlpha(0.5f) - .strokeColor(context.resources.getColor(R.color.draw_line_red_color)) + .strokeColor(context.resources.getColor(R.color.draw_line_pink_color)) .strokeWidth(3f) .fixed(true).build() ) diff --git a/collect-library/src/main/res/values/colors.xml b/collect-library/src/main/res/values/colors.xml index 66069c05..233b4d81 100644 --- a/collect-library/src/main/res/values/colors.xml +++ b/collect-library/src/main/res/values/colors.xml @@ -8,6 +8,7 @@ #028FFF #4E55AF #FFF6565D + #FFd4237a #F03736 #8DEF08EB diff --git a/vtm b/vtm index 33ba2c17..ebe23ed7 160000 --- a/vtm +++ b/vtm @@ -1 +1 @@ -Subproject commit 33ba2c17cea19d445f71d2e78fda6ad459aa4822 +Subproject commit ebe23ed7731e301669b2b4ea03918e313a63617e