From 21029dd35216dfe09bd489192e0ec534462f193e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 7 Jan 2020 11:40:11 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawable-xhdpi/bg_map_marker_blue.9.png | Bin 6389 -> 0 bytes .../res/drawable-xhdpi/bg_map_marker_blue.png | Bin 0 -> 2014 bytes .../bg_map_marker_blue_info.9.png | Bin 8251 -> 0 bytes .../drawable-xhdpi/bg_map_marker_green.9.png | Bin 7649 -> 0 bytes .../drawable-xhdpi/bg_map_marker_green.png | Bin 0 -> 2365 bytes .../bg_map_marker_green_info.9.png | Bin 8884 -> 0 bytes .../drawable-xhdpi/bg_map_marker_purple.9.png | Bin 6796 -> 0 bytes .../drawable-xhdpi/bg_map_marker_purple.png | Bin 0 -> 2064 bytes .../bg_map_marker_purple_info.9.png | Bin 7771 -> 0 bytes .../drawable-xhdpi/icon_map_marker_listen.png | Bin 0 -> 1998 bytes .../drawable-xhdpi/icon_map_marker_misic.png | Bin 0 -> 1480 bytes .../drawable-xhdpi/icon_map_marker_news.png | Bin 0 -> 1410 bytes .../res/drawable/bg_map_marker_blue.9.png | Bin 0 -> 5785 bytes .../drawable/bg_map_marker_blue2x_info.9.png | Bin 0 -> 4330 bytes .../drawable/bg_map_marker_blue_info.9.png | Bin 0 -> 3928 bytes .../res/drawable/bg_map_marker_green.9.png | Bin 0 -> 6760 bytes .../drawable/bg_map_marker_green2x_info.9.png | Bin 0 -> 5119 bytes .../drawable/bg_map_marker_green_info.9.png | Bin 0 -> 4698 bytes .../res/drawable/bg_map_marker_purple.9.png | Bin 0 -> 2807 bytes .../bg_map_marker_purple2x_info.9.png | Bin 0 -> 3914 bytes .../drawable/bg_map_marker_purple_info.9.png | Bin 0 -> 5600 bytes .../src/main/res/layout/view_map_marker.xml | 27 ++++++++++++++---- .../main/res/layout/view_map_marker_info.xml | 2 +- 23 files changed, 22 insertions(+), 7 deletions(-) delete mode 100644 modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_blue.9.png create mode 100644 modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_blue.png delete mode 100644 modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_blue_info.9.png delete mode 100644 modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_green.9.png create mode 100644 modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_green.png delete mode 100644 modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_green_info.9.png delete mode 100644 modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_purple.9.png create mode 100644 modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_purple.png delete mode 100644 modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_purple_info.9.png create mode 100644 modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_listen.png create mode 100644 modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_misic.png create mode 100644 modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_news.png create mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_map_marker_blue.9.png create mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_map_marker_blue2x_info.9.png create mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_map_marker_blue_info.9.png create mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_map_marker_green.9.png create mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_map_marker_green2x_info.9.png create mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_map_marker_green_info.9.png create mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_map_marker_purple.9.png create mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_map_marker_purple2x_info.9.png create mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_map_marker_purple_info.9.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_blue.9.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_blue.9.png deleted file mode 100644 index 7fe7c84231503089e5c6dfb0cd378f7caeede817..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6389 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 DpkWr9 diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_blue.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..d1e30fb103a2490471d2a6ca36a816352429eb21 GIT binary patch literal 2014 zcmV<42O;>0P)Px+m`OxIRA>dgS>20ORTN+QdbRfkYJBU#hfIP9HI*VqvoA{`N`wiDtcOz2fuzzt zs89+66|x?5q@V$_h%mGd)3Fbr@<&9boFO+wwvS>sp)@xH4ysEL75$SWi1YF_i2cE!>0R>7{Q8vq6?!AOyP+ zLw?X9?FzOW7k1iW9X7pyqp}B_CKzTX)8>yJ_Dfo0avEEMfh2B|8QSZJg_hljRf%7g z6l{&AEd6{<_TiFuc>F*61e2D&ba8<&rL8!0LC>~2GC!sHvyP}k{gDn|jFsanhT#J% z;N>#KP;Ok0_4AQW{YuUGj>c;tJMFl3_MR^ucgLF`rw#45&T-qz7}IA<)BtpWHpEk> zAGRq5x``Z!6IjLpi^4NIuBs#kX;VflslS!R8|{CTA&WJjzEHkF7ey~I&l{b zW%$aqsrLB*vkm|WddVmh)QZ@0zNQK(#G%vxs}llgrp)W+1|%e?PUbiDW#4O#bjb*& zjYT2=7N<<03)2*i-Od-B1SHdpiv9`K)Gp19yO#r?WI~Wd;G#Y$9*(M^So(P9nAA-& zC#nZiJPrC>5blLjzn$4CATfvy$q{$6E*>z%K)&grhT(-eWK|j;@+>~PX@{AphDgm8 zpj9dtpgzk56Xb@9IbPzo1x^zW1VMO2uX(5&YPLlnUtL(G8%By(*a5^?WVmUfkqrRU zO@B{$e|6wF4l#AF(R+7}?nV^x+#A7t6k^nbqJD81TY=Uq#V z0uU=>2dG2h!U`$lRky3hUA0Rab1xY}PFx~QRiyFfY+q>RDrV4)Zm z5M->=UyvcbssV^+9pX{~9~`w}ex~KlU4B?syqr6N)pMIHP#v^kP94$)5~1e+L8sq> zCT_&$5ts^3V^01w;QElA|4pZh*cxv+0I*`nSm$=tbp+tnc_=!7L0N_u+n^(t(zs>m zc|UBrbf-V8L>|T@?Ldgn1;7}S8>gWV3lby87y0t^7MK5OYJbyZAtJLyHjR2&rgQsk zf{Erwhq&!9sBRq$1uQ1IF_i8!Jqk4y1TiR)r|<16bM$9ebA%i5a@(?3O~H)XVNfTsA+$G@jbxPK?ChQ_ICkA(BxB^Hy^@}4I5}|PU3sSJ6Ktx~ z*f(v$00Ze;24ufBGbasTHd*xp7j{jbENaaNVE~b|el0c9B&=_P1AopC*%>8F(l>9? wPAh5agp&Ph&&+fd_*ZQ#81UEQx*7%k2iK8KUdo|^^8f$<07*qoM6N<$g2a2lq5uE@ literal 0 HcmV?d00001 diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_blue_info.9.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_blue_info.9.png deleted file mode 100644 index 5e0d729a313aa28c47a0bc802ea35f592c7ae79d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8251 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 diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_green.9.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_green.9.png deleted file mode 100644 index 29becca4531a00c41df2d8bf9041b6ec1bf351eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7649 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 literal 0 HcmV?d00001 diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_green_info.9.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_green_info.9.png deleted file mode 100644 index 8b919cc1fcd9d00915a4b5b5840642f047d3a9ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8884 zcmXwfcQo7I|39&*y+`a_YDH>`RWnGXt*X_cs8PEiR(RK}t+cjKLe;9#s!b`XW^1pi zU7Hw@_@{q*jkh#6q^ISfB_Sc9H#XA0OMLzyUd7au#Cu9x zq$vrBFw$6G2acHC%@3~SFi7tN0uQ@&0@%h#VGsspHuA+)j!dg$Dn^~YL+k8A0CWGN zSm0xJm`>Vbwmz~0eGN%#j7n;{lYUT&G{$AX`=y=|vz}MipvMNLom~NoXvvT4X2Qnd07krZoXF zN6*f5cD5vG{raf)(@blf)_^|pOc{turI{Grs2OCCRGQ2&z)^v;w^t|SmQ@{nE`wPa z(;A7pZibkQTI50A!J82AmfDIaXF4<`oyGl5OeY!;&%o9H%W90<SDp&My*FWK8$! zmW(h2ksO#81G=R&#{GrCS|c?;Xb@0DNtbj>Uf3E@gy|IWA6&f&H*?JB(npC#Nzy}3 zS@`E*ci6eOWrU63sPm*UkW|`cvK6~LvzZ#x7RjU_I%Qb0gzl9z@w@Ynh$s|Dw*Jj4 z7-c@KStZj9CFb|a04=vY+wz$j9v*eO`plg3Hl`zul$@+v^}J0!0p z(Uz%kMJmRE9UtVGXN02?qm0?o5F|hmqt$v!Oc$glQNFTv86zC6Pu@EKP<^MX?;K4n z&uv!kCYqp&riMRXQ9$*92H%kAbwvrSbm^$tD~Xoh$2h7xr@|nQQzhfZNixMRGnF+S z>WIwt#6>EgDD=9?(5gb^+=E+LUjz6up&Fg?L}cSh)NBBjZIS)rAT`(>3NBg>W=S?d zMc3`lJD=QI%o<8pG1{ zbje;aBaSd>o&uR-SiB-)A_YZrv}eUEuTp7QrH(nAmPmQ;-LZV)?c#%er~x7&U06 zsaeV6qvA}~oJr!*77EK!!3{9fovfU$wpWs}RupCI%rM(nm3JOrezfryXoYO4$GuOvPQvbgGhkCWg>?0zwJ=s3ieKEF@U*qUpm&1et%xa@8nK9RmmsN2-s zuYWE~KQzCgz}sPeq51Lc%#ZcRVTxQ<@NLiJXMiIDaacd|#L0U#9c|qm*geHvwl;3+Mf4TrTw)2K}?KmH8+Jz-roKu2JsN z-&Lcj(%7{3l0G}E?MPx)b&2GX9$x-?IxWWK(eA0i6h9d*|8vy`q%T?SBXGaIS~;zy zYL^uUj)xmGDHJI)hyhHLja+RhJ83^W8h0V$p!bJKqrWp*BrD#*kS8l~N^9Z#!`%LN z-{F2!`zQWC;&nA5oyQCV+ytW~67l9jJ8mLs)bc1wL+;jC8q`+v=AQBDS=;$oZ;b;L z9X#)91_*c87-?_E^FteL*SlIT- zzv!d57NmYt#B^bhf?vcZfr4I6IT|KzHZ*I&zu+;y_wKy}f2gcqW;8@VKah4xf-h8g z()(iBqgWiLr?}!+Dsg^BZnG6!l$@D~WuGAA*qJ`~sI0riD|gvB`62Uw3zY$$Jt$JW zPez;{3|4k}SdMR65ZmF@kUxCSt{p;mA^l>d&avN2&7@Qc<@M@PZ#C&BGhU)kZmZ_+ z-xt5!K7G9JIUE{^+0=XIt%yi|-RY#h%~qcb?kY}61u@{4RQp}w3uRr2{ z%+@LEBL!Ob6Z#2hSz7J-ULWwQG~i0&|*L2cQ8(berW78TX)yQvgzc?dXNCjmu1cW|l2VCBSmj^`5*Et1pzoMF*xBM&6 z{CtMAY29sPA}UhiJO;HF-VfTQ?i!Gu{f1Q*1wr#$U;JGZ`_jK3QMWu`3VBc6DiIv< z!QpAkujf|0O=7dxt6wdVYeu=REC``8^gZEC>(Ess|BV#Sj*P%bDYl!laaiR8Uec8` zC3W|TnbVUyn<_qa8o{KSoUIhpAQ`GDr!!Gb{#*Qk*NBeq0v5I`_-HN6;b5n`5%y!_ znZ?`z>~xEo|JlFM#sG$5vzRhB9|u-G%FgUuuUi+6E8}im>@M1)I9UEmT>pLwNX8>Y z>1Ks1R!M+lKR7D8^q`hx?*;sBQv)oP+)x=h5f5%$z z@bmMU91+-gg6OWx$T7!NaP4_*GRp#%ek6RIj=CT#k7%61GL}HZmW_~CPE1PSJ&Q4f zl+BL0)ibKe@QZoIMYQGv>IR7sGN_D<&H1^exkLEdt=Z*vIb}Wx1^&0a{fYh26j~z9 z+FU#S+VX{hSoPLSsMt22Se%;lmW|GBs41)0fs_p(XVpTzB5b&zeEXcP?#8AI#(b^C zJHmZVq@SeaS4Z=&?c<$tyfU(&+Nr$@75ic^>)xa>ee(9=oqz-m(=p19<55qruT#f? zGv8=+C{07uE4=V{?e{h+tyQ`R(heror-K^wu4SRH#!>D95y``wTn zwgLZL1i8J9DfLkB8Q0Gx;d|{y#z_98+)bnz@737-$ABlxt8pqz3?io!_*TUtx~cGj zdLvU-Mba`}t#Ut5A11-B;$8x!hMs0L+rn05BsrR>QDx*!6^HpEqfRj3Pl5K1^Sk%r6AhBCa5}4kX1iqJIfe%wrz!k)U zWR9zyF8DS_qH*MBs|2UBBCUI~s~eBU8s(Y`TYrS!VF|>rf^%cZ`<5-;a|V&Q&J8n! z=3%Ei8tzq#UtDP-q8xWa!@jqd>+KFGL6Bbky?nB_YU!1=<~yda?gT_yrznHqRpS=J|D9JKuia3DII1YX#%Rc{ivg*Q>BRqF&+hf1Dki+ z4{`J1r-uqlq_EgC``8yoso;OBfaZvYJf8@fF8eHpWIbe)#YHa0ZqFZ0q=~Od6|wKd z2AWKXt(s1YY!QK*313$apJZ;EGS02$CYBIrbSxnL3=DnLya{UA+mF2yfj#pP&yIsXC%c0)0OGvn1&_iN$1^*@ z`na)h)ew8Q>$pIBwTFdwLEAhJ{7L(d2j z6G8FEZ?_tgUs}N*kfXqunUXoJW{0QR$6~3~1LjlXd;V3CPAwg($lm1svzCn7sX`4y zVh&BAl>p^TJL53sTWU5c&2~jJU8|@-`1PT}(A);Lyg8y5dx6AjV?A0%25#_$$_rlJ zEq9ApEpso=i+GxyhAcRLY5%6EH6is?h(p{UM)=>h_9z>(&^C;UB#Q-q(j-qZI7oIo)PB5KW-=# z-ksmT@G-eXJNco-)wzuRKEIS{JI!({?)?p&?e-C_>jX=mrI3d>`z-P6AQuQQ;^l`M z{_Cpsb!KCek7+Zn${khWhwfA7qF!3MVSAcQk^T3=LkG$MfXaS%(DNF1XuTyRg7*;7 zD^J|^JSm)e-XFehwHcPYO^W*KJWS2^leJNt#pekXnI2g4lS%OJAh|e@jQ{>ak`n;j zwK&2U$4tz&%;C9^_et8#OU|Ks;Ngewd?Aq$4WoaIW_eVkC7#JpX(Fe8eg4uDzrgBV zbA=$%jy;Ovc5>O6gwp+M-=ekMjAXz`!TB3M-0qC_r6N*tr^``iey6L$wP{;JRrn4{Y9!^zHG4>&D}_}Fl_4jI$` zV3z7~7bka}a?&q8-8^gvGeyB7Qp@EB~*KN49^$i_|S?H7_OL)z`xvXnknElDlp;#dfU9 zhTdHVXihy>f3U2Q#?OCiQNtVg*NA3pPvBJ=%fPum(N_docGLC;g?>ASsK^Hl<>BY! z8)fuR{0ZBh4HmSvo=;X1W$3>Wonp;LC3Va9s+E`3WMzrEeAAL00F^0-l~*tW$1uW(WH^KQGg1P7a1K?zdR`DXmQzFm*X|~YZ##Q$XexhUQ77OZw zDD*R)@_#X3nR%V|LGn6qR`Ve;;@6^(delI0s=BWtD$Ei;P(5_XTMyhU8V*9@|CeP_ zS50&FeX6dfw$NABu}H|l`feiS^TJ(=&cAMoO~c6`nb-`9eHin@YlszK4%3jWsjWbm zCp2J{8~{{gE~iewUlIJ3JFPcs_*-{T-CvW*XK#)$G|uRL{kl6eMa-$v#5vaQ7#oHP zj(^7A|LfWguhwRC!Bf##Y$7g$^_nyfto(ipL!p1a&h1fMhQlQ~v=GSB$1@GrUEvP{ zTkEl(@gZ3CsqiQ5aC2>=H(M6V^?3oEE!@0vi`y3D6OZs;X#*a{eOC|zcttf);@7a{ z^%0#d+RrDam)O=Me3bBGfgCnpv{i$1Za==}HlH^Lf9u}dx=SF^1O#w15e5`<$7L)O zBKWuEq(0-_iCL`lAPJRzwHfj>Vtw_KlEs$BX35*w`GEz+p^T!cPfYPIe+HB$HvIsE za8!z1`uBJESDC zJ1A3Bfo;K;d#2QEU~kSX?SD|ux>@FKaM5$u0B02=(_7%bKRxTF;L1Ts`cJCR25>wn zro1rk*_Ye1j>kT7eQERV`pp@35>##4F`&83v!>eMg{1IJONqI5a!*Hj{oi|DyKR0d!(`4 zc&ap({I5eYVP|hqd9*MOwIV7;(NsLkcqK_BqhFT1sAl`OF$A%ZDgK&W0#78KQ>`6< zPWo%vc|V6J*zyB*otL;4g}P=oh6@5-H-Ec^QG=wq8huuDfS+#riB2v(ExL`H0w2%q zU^(BH>`{%tgTuWe#tFwyEm~;}cta(9q}ABup%V>Vb+4<5%zqv;ah5+fWqUq$<3-e) z7#D)>a9qGNLqiI&Oj;yMjMusP^GVETbIct3;fnF!4MoT91W7uIK$QT7S=B3YVZZeN z-jnVMO~?+E0O7(=rOv0$_Tpe9Ey%gZVO{oyXUVwzgIibf#I^B8bRRks1Ih4Ay}c_` zUuf1c7BFdQF#(cQRzb^!-Hj!OPsX=RRoDbATs>9 zk7FG~t|Vf2dKKs&cLqkg=>cgi9k$IVlHCeRGOD-kqjNe^H@xzaY}Yt{6z z`mZ|Xy6g)h{rNI~#P59?365XEesZJcyhU<1IBv-BwQJ8rl&*%oZ?sS|vHdeL^<|NX z7_Ob6QAT5!GjP3I2G+8ZRz>_D7nKOI96hZYDo3z#nmM-eL95PNs!MlkrdQpmiHTvE zk28ANH9^Y^-Rqc5z-biQBS(Rvw_dk9#D~x_ADfDTagANz3+u_D+!TwBsb@PQAOlNX4f}*{rS@nw)lAs zPuO1)vsNjR(%D^T4+Wmk;bH^DrzW%*6RWN-JtGR6%R3mc%0vx#nFYxjiy>-4JEeu4 zDyOt<;P5*P>^C{rg2L=8jA5RyuzkZ|4K zXL`B3>3GlKnORm`&N3T)ncF!;aCq^K7<7V?D594IWZ}j$x(M@KWKc@@{z6FSqftjx zu&}?VXsyLd0?v!ryvR*9oGn~G-;TzI6E z_i#Y$@Apfyj~Gwp0%EntUZjo-Y!WcZp8IF)vZYnm>O|UBwtI-s>~GUs{&YGQ-qc4h z{jnTIzc>|VJ_fe}O}L4WOAKN3-g!=j$7;wpUeli1Ylc~LBsJ%%oBPNSW4P@aYuQup zcWpg-%#waYFlj3M@Ik;G5lcGRen;8hBez#(R~>txez|9BPZXDi%>M2v7P^1TN$F;I z>HX^e>3DK4aAh;G8jSJ(t5-D_S0;6ZA1XS^yG9Qf$O6pAJPmoBeBfwvAInbD83Yc9 zu#Q~uJ<~`s_Y5^Zy*VYf(|iby(D5dti+F^Q+M;S0#Mhd?i@L zqI;!(u<9PYzXmOaXN$9Q&jmXvLEyU}S)cJcz}NU>X^ry+S%fhUAJ3W%%m-$p;V3c!dgXR=`QDSnpGf?PZqZ{^YqwBfVwGll@>lHf z1lEC;*iNfeK13DYReCh)oQCE`Io;eoz^Ydg+g97lyp*!AZAwN4+eo$VTo`*d zXD3E^er{_MbO>&4t4O#jiq&`h3)-mvh#1j-G;)D54r2Nf{NVVQl5a|8}na+Y%q@> zHg?!U&U6DOj{_)DM#6sBoNLfwYuYX(z~!FaGkpG$T}W=}!OqF5ykZyu6IJ4Gol41{ z*K&wvq)8P4n!EWQT>$rZgQ3kX*G-=;Kk#mc)Z}9mH*9aS3x{QFd}}9`qf?{zr<~6j zcQ6}b#2(RwMyTdY#~$Lj^vT29yV;e^)ipa!e=EOwGR)Z4tG*@?Nl;W#R(jd@M_$nC zpO3I35OT&Y6}i$7+qgHNte@C)k15w0>*>{>1N$eT$CsM--g}={hMZ{CcCLrde(4_yMp8is&`CG) z?soatQ$kuL{}Xz~$cHWw**G5`$o2dCG8&9HJQvEe~GF^u@^V=wc0ug`k7!Fo}yC|4>cnm&$K%3MfCQ`eC5aG9cwshEM9SP2s)z!88}mRFG;3HAS!ZcA#mFM=(vPCT%}FqMt$;)?Q7jPE2rkq zN4C$rPe^=9Y28e$=O9#Pfnn=MuGA1XI{uaQh~8`GYvpkcGDzN5%OZfR#O`_*1slVMMn7rAsssoP9dj(u|Galp81ed%jJB7 zxWA)GxWU0?=V&4hh~aeE27(lQ;LFAK>DzY%*dsBLsakGBFC@ zOARPtp)@A9x`F8f<^;Alt|@;(R<}2e_GA}8zWk2#U$n~Lza!Yh0l6zszg63l0l~>9O!e-}Dzi!c&4&UMA z)e+4Pnp8~eM)f2wsZ4Dg$MxSPpvt%oEQyGg0+^Ha6;t&q@{L2N9-|}u)_U8$)PlnH zj$(=bp2iXZc?RA1n!OluLSxu0yxf@@hc@OYvP?6e;JESXgQS)3D5l$qRdA6%4nVCd znsA4yl$A|q+;|_679V9IT5c*#6C+AziNTC>4Xd)-IWvpjbR6W!sajDWrPd9Qp%S*& zzf2+#T?k{LV5Owh`S@4c4^Qh#r;tCT&8b4CFhHc49;YS`Q;V{{G3SW;(kVFcG94#n|?k~E1y15Bcb zqK*=cHs&M_C2v_d4kwA<;x`aGRm)L|ZK-vpFl!^?NK&Co+?9_uW*1$+O#bH+#BAFd z1Z5Mfqc;(uunceTX>FiV}s!lugx-Xqo?orVuB%LFR?+pv7Xp|AF_A#&jH)cn+Ox?G%2IlN3V?3%3r9B z8wr9Ts;%FO{?ukF=(`uy(~PIF^gnnlLJvM}5>EJ_{7w6myvzZZwY#;D#%+`(Vc#(* zG=P$3H~GVzJ`a@LprP&yneR84=P91%7E)84-SwevU^L40jn!2tryf hZFx%JR~y%)1}=M^>OqJ95l^F#7#o=DSL-@P{U4EVIe`EG diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_purple.9.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_purple.9.png deleted file mode 100644 index 96eb49645b9cf92483d0e9825f9b9b5ce5dd139d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6796 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 ZF);O!h~)LSc>ZY&Fg3I=sMEs`{|7+$v6cV; diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_listen.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_listen.png new file mode 100644 index 0000000000000000000000000000000000000000..a2b097eb26bf329f729578422d8c9469e667d4c5 GIT binary patch literal 1998 zcmai#`9Bj51IHO=lVx&^DaIT*R*0b`vAMrw-pjHdB5I&!8`Y~t35Z7FN?1D#pWoSfmso}#y3Ng20g!N9yXDX#X-6Y zD%5@!-{kE2?1?KPvCxgSld>UuOf@{n%T5Ici-M+GA20~tAj{Hf6v9=?+F9%`{346m zC5wbb{-$L@@*+Q>Ip(hBDvy!OU$@-lc}@EA|5R&j zV3>BJ87!))77%eTOf-x|J4?h!T7-U*FZ_vrg-}fwi!wn>sb{OdC^oox=`o>;jz;D? zq**RVICu>Ql}}9E%cz-wVm01^i)+>Qto_ZlD`&uaXEiAPG7BCK`tYAW9+&jA8fZ8~ z8&S7KT9CFErOXHje{(j8i1^4fh99u*i+&lr230JV3snwO8b8I4?(Zs2S;3&b+`vfF z@7#iIez#nSJl8B6mqfky*(n>jXze;SkO&&To9!}K0$Yha`Q0t1hf(r!mED3{V-){- z{I7~V@$UPR#L&#olG#0WySyw>R=B^ZK?3Pb8#kL6^<;(>1%q{MN- z`wgw_Hgj|Tv3F*WH~S?)J5L*Jisa!_*Sm})_N3j8&K>F2B$#+oU<;(a(c+n z=2jyX%Wo$>sZeBm+%9$q{lw&S&;_U5(DdW;{Wot^Byhl_n2j)PEphYJI7KYVq_zPsLRtz#5+hj+i{d0=uLa9Yv#u zO$8nVs9pE;tD~Vluc?N?@F>AIr3sZueqNo3z(9K0Vk(rC;ArTd<&Tvx=4oa5be|fCAJ;x zP7aBZgE%m-hVE~07+5YY2HksFXWGR!9m~QB9D_dKq_9yo)6p|H4Qmt;VJ(B)c)nxGfW)$ z&P7X}$xyt5{EkmNWj=Zcrr)9Ht<|h~)jH$clk>lBn*fxZ9CIq`8ffk|Fg*9Qr)r~y zieHUN@L5CbQ;FImEt&kRttJ__vPJDP&YgL^=G@a}$%RzZPrAs~|nK+%X9L19F;lP2&5?zZv0p4|deoeGx7Kx^oiuZP^L{7X7l z9olhC=GB&~_l$XADU=<^+iR>FJ#;+YdkNuHrQoGoA^~>$@#;obuW0xQ9^}H5=(%&f zJ!2ug`AWMnT4M>mKNp|GfXUKKRhNm}1r*lyb`NeS`)gHU^2DRy3bj-$pZ})qz3Jt3 zI#Oq|6!0^};!U|e25o%#n9uYmhuDYW{(^klUmK@Z>B!=Kt)#Isx@z34NV&U)B<_7T zD{3%)Ri-K}wFUG&t~7txN^C*u;~(j1IA4h(r}{R|9_CVOoRyjz?F1Y>IBB?p`hW+} z`y01?(9{m4q7KGEo3wSdfB8l`rREQGvG$Lg(8h;-M~0d63zyo3f7dWlB>!*T{yTni ZCn1u*1oquCcYX(2#1ZF;W!VH>{WlR{r8)or literal 0 HcmV?d00001 diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_misic.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_misic.png new file mode 100644 index 0000000000000000000000000000000000000000..eac62954aaaddabe0961dedbc31d4dffd3f78179 GIT binary patch literal 1480 zcmV;(1vmPMP)Px)f=NU{RCodHn@xxuMHI(hbtakB;O-g_Lck=(97LBOCZL$T2#SITiZLi2ym$&2 zJxUZo6eK8k(xV3viAWB56T}b%A%rN1qJm&h{76V*VzSx!=&I-cRZq=M&rCMkyR%)* z&MT;S_1&+2^IlbT_Y9E+C7=Y9fD%vwNQ+N7Kzf9o`wFs=5gYil z)zGv;S^&`=#4ix94&WLra1~NLt}0-20M_;=q#NXP&64@JS`*b`D*!YJF&~E>vt&#$ zb(qf=>oEG($>@hHIHGm$!{%lS_R5+Y^YOC!t(8tVj=bR7mVLBEJlDH)3!fX;3X5gU zgHw093s6A1B}0^kPc7@BBkmN}g_)YU`8dvHhh~_h(W}OoPlwizQz2aVV9o-?3Kw%_ z$A7@`mbYH6MX-Rej@$0U0L0+RxYIzJzX19J$h+1egB8ySVD7|P*yx3b{I4j#WyOP! z%K)&jmwN$98f6E@W&SIkC#+3e`D8CdSm9ZePp)|IaTx%xW&o|3gV?rjjm!K;GEcbe zD>;Cvn+MpfBN==g1_7)ZT=`TUqWx$b=037H0^%;Xaw|YYTJAdbjO+sAFc4h%wE$2g ztWuuVXjm!%SloI*`z{AD<;R!WU)zBIAl{vG<+l4pz$%;q1h{Qq&siZJe--GiO}#6( z-1i=0%dds!P&Tb(3J~BH-y?gnYvM@_A~*T%0^PN#5U@@Ark%Ge5sw`jJkQ&eOaTIL z+YPuU`N3XwoX!bIK2o6jcs2#Jnyhy`$6N4PeFxqWKV#<{+baMFiTu4)AXD%?;_9j_ zuIU^-%S;bKvHQjHaG=3OMa|CR{%+QMQ=3fouC7McAH5O)0ct9}><$?+FX8}L4~#PP z1H3_1*Cl43xyc;8{xnyw#h_NJcdel#^CjMiz4c2}Zj%OpiTCTqOUZ|{NC~-mV}7np znHkhY`;AQ0w{m=$XRPI~+0izmiBJVbcel2&v~+uKB8G5 z|I5>5e~$F2dk2AF<9836w8$Q%tB2k zEm9&m+G@|!V?r`Uhysu=@QkzkynvC-HAuhFiizbS@cO(+SsSH3lRk|xz;=HOcyi4s zzs^cidfG#S0^a&MQWWYB!Yj0qx{wy>1AHHr_&~^(Eu#Q*DeW7&tIF*A2muca5IeK4 zfbk9N(x_!~bJ^g+^`Za-qs@M&^;(EK20KGRNPCH__umC6U9$GRvu}>^WHE>mq5x!^ z+60*dW5j|oDfy7@@bkNKRwlI)@+O*DB%R3W%KwZ45Ys$^jbN%f-9S?cLb@Y^buL(4 zUjqPjhCb_#RdOQAE(}PYdr)A37f2qONS~JDij>J=S|WDbu9S3N#0K&o?)^S2nOpaA zQ2;ti?*WC)APN-d(+4Kx!(B-@2g+*a%VgD)G|?O8R&${{qmmO*0N!w$ISq(MdabW( zk>2VuNWJie0%iJSV!L^#WM;X`;p>kR_#fWbyh6v}u)7yF2GK=S5|dn9HPn7vuhT57 zFX~?%qFA8EwAswn6M7WqyHj}=7Jk6v-C8U$<0&$Ws9-u)zmXn}4Nv9~4WL{cj{wfp zZ>RebM~48Vk*#wA3U=86CLjYubh((2d1+!NJ!H0+b23Kku(+R;s2%^t(~UMgfwl3; zB%xhkIEf?TC49wygW*s3rjJcb(NP1-Em1AKloC(^NWq9{|1E| ze2LO#^8ujL0E{cpGJ13w0HmC-?x%zBp!Ex9k`G(L(r?pXUN9X=iFOerF>J69d7aYa zZ`1VTbW;kngzFG0f_kA1$nCl$tIEocs0XhCEm8N`8Pq#LN8sh_DMa@De|&GlICc^x zBz+O|e{hnDj+lIgcNU2Yh8~XD5Z4g!H~}SCAZ`{i$<*!Cs1QHo&Z&F{>=?Sa68D>)lMr{JLc92<|@Ncle3oZj-ydJMs^D}b#J`wlmXw$q7(U~^bm#dV==@hRTGP>pp=5{9j~6U zJQ=W`w8-spn0h;rILK9&sb&i|7XxO7VprGA80GvseVX2|t~L;g&;3D=nogZFBRpaSx48fh)zoj*W@%r>Ml)>EXEd+`om~X z*M|B*pW={bNJGoK{?g2gZq>ZQV&smYWCQr6U#5{f%c?oh_M)1YyjQ=j=kS!;lEg?D zflYXu>O(WAi6zdJ_Kz(Tjv(Og5YNbJU1xz}b1Gy&HrJfC>TwF5&9)VdRHej%3>=lg zl*srI@9x}sMGpc*ACO`tZqeR2s85g$g@=})q`Flsx?4nNDZ}4|ott0i| zvoJa%&%_($S8Is}pD`a0F!dV4TyoB5=rb)~GVldO>=)rU=PPE^D;GC)%K9}V>vhW< zCK(Aje`~=&P1y%{VJL=Td#@Dl6&+Ra$*Fv0GHkR#8EnMmXxcf=D=)R4#_>EIHX7U@ ztJftv>v)pftrKgCE1zZQo5)>{jB{K?cCb=sV}85AR2nY>5r~ofP$ehqNd0TE2Gi-l z!p+M5xKtNpW_h>0e2uUdu<@R~tq{dQ_c6=|B+7tNP=&QHlk>vH#Gk$O9kwp9GKAiZ tQz_a_$=v!?!00001b5ch_0Itp) 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 M&c@*k=`=F&e|oy!`v3p{ literal 0 HcmV?d00001 diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_blue_info.9.png b/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_blue_info.9.png new file mode 100644 index 0000000000000000000000000000000000000000..d2a1b94a661260ebb41a4c60f6ce5cf2a48add2c GIT binary patch literal 3928 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 KMNUMnLSTXyuS5j^ literal 0 HcmV?d00001 diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_green2x_info.9.png b/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_green2x_info.9.png new file mode 100644 index 0000000000000000000000000000000000000000..becd87531970230a23e1be35d0dffb29888b6a93 GIT binary patch literal 5119 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 literal 0 HcmV?d00001 diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_purple.9.png b/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_purple.9.png new file mode 100644 index 0000000000000000000000000000000000000000..2510a29f129b153133edb912cbb3841569a92e1c GIT binary patch literal 2807 zcmV!000WUNklb*oBY) zgTZ2l=RDvl%6Y+6As6JU%}D6NqwmcV~z>V89a`@D2@qn+8sZ!LU1wH|t^4!+$|f@NRg=lr;BtM9hZ4 zp5idKroWa$so*$>QWoGB^Hy;&hXx*2&ByU8wilg0P_z?@4OJ%r_goPETfTr?LCy@pX{Ur=*)O%0^i*PPyz(!=Z{ z`Xs{vwb%4TAigcrxyN8PzAbYup5l7+U_{KlR{nbVRlEpY=qg=G25`Ejd6fgWG|;0L z!)or;^7uzrdWq6orXzq?LLJ$Q6^Fn}E>Rm_qFN(y1~V>G^yt;V%q@%0MsWjd)=;W8Zzxd*Xs&?{<@G== zL-gobfB(n!ZbNC$(~GddMcV8l9e%N-+v4m9u4Rh8p|txcde^7H^<}T-ND*vO4;$9g z2K8*SdOE1yIi#M|GExuT_4%*AAbN6vHoj0y8P*0C86f6st0wEjxjBRNpm`W*ZbPZ~<2h>VSCsUV z%RoJP>3@2Qd#cVBcZoC8y2M#%I;*n|AJ2MCgnH!AOP|4Krgc9)15IbJNoI;^UBTJq z3?J$tKeo*+>CQe)4VbNPxu713Q18{yQ)4g?m8XE@aoSl2#pyxTGC>dDN-B-Pr;5AJ z>B7G-K6q(mA0H5*-tI$Bjlp%(UPkMHtfLL;KJbK+XV~IR|4R|-9er_Elo{M5PRa(A zIo36cV?1)9K3H!I{)R}MPg0}1KFRvNNq|GW*KZ6yG1Y6-_{7v-R3`3(Q`a>g7wV1P zGZ={DKW#rzJO*(b3dgBgV$87CHI;v%9<~nkfqG-`G1;sHN2wXt z93S&xmkaf--WYte2nt22coa9*nB}is&Z&obzup*(;;*NwO)Ttk7T?)>Z>aYSJ_5uM z5F9DenXtvXm~o*#P;U%A48&m~50mh)j7|#8bsFB^6Y5>PG59MIel?|2MUj^!Uu5%~ z!;M3Iu-+K_B`m(Ag3b~b`FWEaF4X(=mcd_4>5wAKUrh0`&FQtnh5A6fG5AoSA`dZ< zT6g+*-D~xQ`ar#BFcc2ah6kY;138JQc5sU3Ireg>_v?+p2Y}FV&}^(WI#B2xbim;c zFh11#^`5~_(?0{U%UPOGAE-A5>kal7w42R(3*MIqhk9o4{=)X>`>}zVFn>-NYKqfq z!*}$`WxO6dH3ok^rSm*)D5Fqkb%=#cW_+RB8|q~SPnp3TmHU8{QAoL$zzq}DL%r$& zPx<%YNqd2mF}Y3VeJ*xlUjiKJl?FYve!6FGLE8_yX%95*aWe@Gm!KZ%G1`9c{cPHv z!uGYhp=mdXcs4i@FR`D?SUq^@Gk9-d*ZWwkWq}*kI-FHEx!qc4x*oj@{2Afeg0@F| zgIyGST^qo;eHpC>4-@``d+p@*zwXR$mCZWqaQU72K|TJyOw*%>2@O6qQ@jn0Kkme4 z66}CYcGAY0b89lY^$gVSDro!hR9~-b+)>az7X{lPcF1Tmcss4_I_sJ2_GXrT7kJm_ z@5$|$Dt^B`zwM{(BywY09$&WwaCR+o^ld+(cm4Wp&uw`fA8!NU*1VV$Bi=?EnVjcv z`Tkl)=?gkO9?*QF?7TOT=7M*irwC1?gV6Wd@r=K34;+jFf@#H|h z_)T?g>!WJeP)450xUq*@O>GOWvz)&A)<@{kklx#~d2;Lz)%mg3&2#`}9eU0A{&Fd= z&x^J00B?rn%~P=PEZlTc?$0t{bI9J>!|HI(ZFX|H=+Tp5eRtZX+}73l;Ln__1J|GB zcpPH8H$C*|#fZH9Z&P0D-i>r9hQ^pZK4$TDJtk6J52o)O$=8VgdP8pP^hP*zLyn4# z>;fAo8!nge4o*cq7T zAFkp(yq*O5s$?>ko4h8crRh_+tPHrQ#%mbkl{5`jj-6n+$_Ulb7R=+1{{noka#@tGdUjyqtPRO20Cd z&E+O91Cw!}WfLLfaBARXS$eH%%c*8KcRieXxKqlT>zb?$(SruX(uu*?ilOSW(#Txb z3??szp%=sOCQsn&sKZlmJWzc)Ke@pszi9dg3@&4W%4mq;G(W*vQ?`2h&}Wpn z++-NOX%QH)hz!EKXu|)jZ1F+8edsgNT+3uI;O}6Dil~f56l%@*iBW@fO>qhJnQJaL z8I7nUgD~@u+<0e=IDoVDp}CgHXvjikj5bItB(oM8Gou#Py_)m%p}7f7{shdzSV&po z3EmpHpC@y}%N8boMre@sTB(6IUAo{@3S44yw; zb8bYN7KG*w%w#lmzBE-CtMj~Z%5aV47bG-y;3m(9rxFdEJ5CunZ#-czdY(2qd~%0o z@?3a2=aR{D$zX3CKDonU@|^L{n&yC^bN=*SAu~p3Zur5^{{el=NpY%E?YRH|002ov JPDHLkV1ld4nK}Rf literal 0 HcmV?d00001 diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_purple2x_info.9.png b/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_purple2x_info.9.png new file mode 100644 index 0000000000000000000000000000000000000000..18a7d218c0fb9ee519e3165dbcab581e89a6f04f GIT binary patch literal 3914 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 literal 0 HcmV?d00001 diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_purple_info.9.png b/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_purple_info.9.png new file mode 100644 index 0000000000000000000000000000000000000000..870bd3e867826a4c407d4bed801ae914e10ca188 GIT binary patch literal 5600 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 - + + + android:layout_marginTop="@dimen/dp_6" + android:src="@drawable/icon_default" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - \ No newline at end of file + \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml b/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml index 4904aab108..bd13383fef 100644 --- a/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml +++ b/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml @@ -2,7 +2,7 @@ From 6188c209c7d5a002c50bafa8a6509abe5c542710 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Tue, 7 Jan 2020 12:07:06 +0800 Subject: [PATCH 2/6] modify ui --- modules/mogo-module-tanlu/build.gradle | 2 + .../tanlu/fragment/TanluCardViewFragment.java | 22 +++- .../src/main/res/drawable/shape_bg_222533.xml | 4 +- .../res/drawable/shape_bg_222533_10px.xml | 5 + .../res/drawable/shape_bg_222533_6px_top.xml | 8 -- .../main/res/drawable/shape_bg_222533_9px.xml | 5 + .../res/layout/tanlu_activity_media_full.xml | 21 ++- .../layout/tanlu_item_main_media_recycler.xml | 121 ++++++++---------- .../src/main/res/values/colors.xml | 10 +- .../src/main/res/values/strings.xml | 3 + 10 files changed, 107 insertions(+), 94 deletions(-) create mode 100644 modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533_10px.xml delete mode 100644 modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533_6px_top.xml create mode 100644 modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533_9px.xml diff --git a/modules/mogo-module-tanlu/build.gradle b/modules/mogo-module-tanlu/build.gradle index 4110051bd6..6bb1edb229 100644 --- a/modules/mogo-module-tanlu/build.gradle +++ b/modules/mogo-module-tanlu/build.gradle @@ -46,12 +46,14 @@ dependencies { implementation rootProject.ext.dependencies.mogocommons implementation rootProject.ext.dependencies.mogoserviceapi implementation rootProject.ext.dependencies.modulecommon + implementation rootProject.ext.dependencies.moduleservice } else { implementation project(":libraries:mogo-map") implementation project(":foudations:mogo-utils") api project(":foudations:mogo-commons") implementation project(':services:mogo-service-api') implementation project(':modules:mogo-module-common') + implementation project(':modules:mogo-module-service') } implementation rootProject.ext.dependencies.androidxappcompat implementation rootProject.ext.dependencies.androidxconstraintlayout diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/fragment/TanluCardViewFragment.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/fragment/TanluCardViewFragment.java index df85830cf9..3abfaf7578 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/fragment/TanluCardViewFragment.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/fragment/TanluCardViewFragment.java @@ -25,6 +25,7 @@ import com.mogo.map.search.geo.MogoPoiItem; import com.mogo.map.search.poisearch.IMogoPoiSearchListener; import com.mogo.map.search.poisearch.MogoPoiResult; import com.mogo.map.uicontroller.EnumMapUI; +import com.mogo.module.service.entity.MarkerExploreWay; import com.mogo.service.MogoServicePaths; import com.mogo.service.imageloader.IMogoImageLoaderListener; import com.mogo.service.imageloader.IMogoImageloader; @@ -60,13 +61,12 @@ public class TanluCardViewFragment extends MvpFragment> //map private IMogoMarker mPoiMarker; -// private int position = -1; + // private int position = -1; private IMogoMarkerManager mMarkerManager; private IMogoMapService mMogoMapService; //media private GSYVideoOptionBuilder gsyVideoOptionBuilder = new GSYVideoOptionBuilder(); - // private String videoUrl = ""; private String videoUrl = "http://ivi.bupt.edu.cn/hls/cctv1hd.m3u8"; private String imageUrl = "https://oimagec4.ydstatic.com/image?id=-5397300958976572132&product=adpublish&w=520&h=347"; SimpleCoverVideoPlayer simpleCoverVideoPlayer; @@ -75,6 +75,7 @@ public class TanluCardViewFragment extends MvpFragment> private TextView mPreviousTv; private TextView mNextTv; + private List markerExploreWayList; @Override protected int getLayoutId() { @@ -189,11 +190,26 @@ public class TanluCardViewFragment extends MvpFragment> */ @Override public boolean onMarkerClicked(IMogoMarker marker) { - marker.getObject(); + //点击marker以后,确认他的位置?然后点击下一个操作 + MarkerExploreWay exploreWay = (MarkerExploreWay) marker.getObject(); + return true; } + /** + * 刷新单个数据,更新位置positon TODO + */ +// private void refreshSingleData() { +// markerExploreWayList +// } + + /** + * + * @return + */ +// private void + @NonNull @Override diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533.xml b/modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533.xml index 18f8f6ba5b..12b869a5ff 100644 --- a/modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533.xml +++ b/modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533_10px.xml b/modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533_10px.xml new file mode 100644 index 0000000000..793a82f62b --- /dev/null +++ b/modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533_10px.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533_6px_top.xml b/modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533_6px_top.xml deleted file mode 100644 index 2835c0389f..0000000000 --- a/modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533_6px_top.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533_9px.xml b/modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533_9px.xml new file mode 100644 index 0000000000..3ac5215724 --- /dev/null +++ b/modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533_9px.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_activity_media_full.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_activity_media_full.xml index aada8efa34..a90d871523 100644 --- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_activity_media_full.xml +++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_activity_media_full.xml @@ -15,21 +15,20 @@ android:clickable="true" android:longClickable="true" /> - @@ -54,12 +53,12 @@ diff --git a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler.xml index 49a58a51d0..a04b8566c3 100644 --- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler.xml +++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler.xml @@ -1,46 +1,63 @@ + android:layout_width="330dp" + android:layout_height="330dp" + android:background="@drawable/shape_bg_222533_10px"> - + android:layout_height="wrap_content"> + android:textColor="@color/color_3" + android:textStyle="bold" + android:textSize="18dp" /> + android:layout_marginLeft="16dp" + android:layout_marginTop="2dp" + android:layout_marginBottom="5dp" + android:text="666KM" + android:textColor="@color/color_666666" + android:textStyle="bold" + android:textSize="13dp" /> + + - - - - - - - - + android:layout_height="wrap_content" + android:layout_marginTop="10dp" + android:layout_marginBottom="21dp" + android:layout_below="@+id/media_layout"> - + android:drawableLeft="@drawable/default_image" + android:text="@string/tanlu_previous" + android:textColor="@color/color_545362" + android:textSize="13dp" /> - + android:drawableRight="@drawable/default_image" + android:text="@string/tanlu_next" + android:paddingRight="10dp" + android:textColor="@color/color_545362" + android:textSize="13dp" /> \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/values/colors.xml b/modules/mogo-module-tanlu/src/main/res/values/colors.xml index 0ed1b64aeb..6c0dd2590f 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/colors.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/colors.xml @@ -25,8 +25,16 @@ #213142 #33FFFFFF #B3000000 - #333333 #0091FF #d9000000 #FF1B1B + + #F8F8F8 + #333333 + #DADAE2 + #545362 + #99191C25 + #666666 + #999999 + diff --git a/modules/mogo-module-tanlu/src/main/res/values/strings.xml b/modules/mogo-module-tanlu/src/main/res/values/strings.xml index 624c47aa7f..b6fc8a1bd9 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/strings.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/strings.xml @@ -15,6 +15,9 @@ 为您找到%s条路况信息 开启小智车联 共享计划 + 上一条 + 下一条 + 正在为您搜索路况 From 7126c09ac0aad3e2e3252c490e6c9da2e3ece05b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 7 Jan 2020 12:26:10 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/module/map/MapFragment.java | 1 + .../res/drawable/bg_map_marker_blue.9.png | Bin 5785 -> 0 bytes .../drawable/bg_map_marker_blue2x_info.9.png | Bin 4330 -> 0 bytes .../drawable/bg_map_marker_blue_info.9.png | Bin 3928 -> 0 bytes .../res/drawable/bg_map_marker_blue_info.xml | 15 +++++++++ .../res/drawable/bg_map_marker_green.9.png | Bin 6760 -> 0 bytes .../drawable/bg_map_marker_green2x_info.9.png | Bin 5119 -> 0 bytes .../drawable/bg_map_marker_green_info.9.png | Bin 4698 -> 0 bytes .../res/drawable/bg_map_marker_green_info.xml | 15 +++++++++ .../res/drawable/bg_map_marker_purple.9.png | Bin 2807 -> 0 bytes .../bg_map_marker_purple2x_info.9.png | Bin 3914 -> 0 bytes .../drawable/bg_map_marker_purple_info.9.png | Bin 5600 -> 0 bytes .../drawable/bg_map_marker_purple_info.xml | 15 +++++++++ .../bg_shape_reverse_triangle_blue.xml | 17 ++++++++++ .../bg_shape_reverse_triangle_green.xml | 17 ++++++++++ .../bg_shape_reverse_triangle_purple.xml | 17 ++++++++++ .../main/res/layout/view_map_marker_info.xml | 29 ++++++++++++------ 17 files changed, 116 insertions(+), 10 deletions(-) delete mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_map_marker_blue.9.png delete mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_map_marker_blue2x_info.9.png delete mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_map_marker_blue_info.9.png create mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_map_marker_blue_info.xml delete mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_map_marker_green.9.png delete mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_map_marker_green2x_info.9.png delete mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_map_marker_green_info.9.png create mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_map_marker_green_info.xml delete mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_map_marker_purple.9.png delete mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_map_marker_purple2x_info.9.png delete mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_map_marker_purple_info.9.png create mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_map_marker_purple_info.xml create mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_blue.xml create mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_green.xml create mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_purple.xml diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java index 853f3ed188..5f06df9e89 100644 --- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java +++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java @@ -15,6 +15,7 @@ import com.mogo.map.MogoMapView; import com.mogo.map.location.IMogoLocationClient; import com.mogo.map.location.MogoLocation; import com.mogo.map.uicontroller.IMogoMapUIController; +import com.mogo.module.common.MogoModulePaths; import com.mogo.service.MogoServicePaths; import com.mogo.service.map.IMogoMapService; diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_blue.9.png b/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_blue.9.png deleted file mode 100644 index 891e8b3483e3b7d4b814d40c710e5bf4e8191450..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5785 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 M&c@*k=`=F&e|oy!`v3p{ diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_blue_info.9.png b/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_blue_info.9.png deleted file mode 100644 index d2a1b94a661260ebb41a4c60f6ce5cf2a48add2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3928 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 + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_green.9.png b/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_green.9.png deleted file mode 100644 index 154cc5b30b0d2f874d69d56eac22753b9c48568c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6760 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 KMNUMnLSTXyuS5j^ diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_green2x_info.9.png b/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_green2x_info.9.png deleted file mode 100644 index becd87531970230a23e1be35d0dffb29888b6a93..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5119 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 diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_green_info.xml b/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_green_info.xml new file mode 100644 index 0000000000..0d30f36cf0 --- /dev/null +++ b/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_green_info.xml @@ -0,0 +1,15 @@ + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_purple.9.png b/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_purple.9.png deleted file mode 100644 index 2510a29f129b153133edb912cbb3841569a92e1c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2807 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 JPDHLkV1ld4nK}Rf diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_purple2x_info.9.png b/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_purple2x_info.9.png deleted file mode 100644 index 18a7d218c0fb9ee519e3165dbcab581e89a6f04f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3914 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 diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_purple_info.9.png b/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_purple_info.9.png deleted file mode 100644 index 870bd3e867826a4c407d4bed801ae914e10ca188..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5600 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 + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_blue.xml b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_blue.xml new file mode 100644 index 0000000000..8926a9e9c0 --- /dev/null +++ b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_blue.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_green.xml b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_green.xml new file mode 100644 index 0000000000..052144cb95 --- /dev/null +++ b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_green.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_purple.xml b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_purple.xml new file mode 100644 index 0000000000..125579bde5 --- /dev/null +++ b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_purple.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml b/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml index bd13383fef..c4e0a7e62c 100644 --- a/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml +++ b/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml @@ -1,23 +1,32 @@ - - - + android:textSize="@dimen/sp_32" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - \ No newline at end of file + + \ No newline at end of file From c4253eac08d4c77ad3dbfa4bd87408eb3b0db5b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 7 Jan 2020 16:08:53 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86MapMarker=20?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=95=B0=E6=8D=AE=E5=AE=9E=E4=BD=93=E7=9A=84?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- .../service/entity/MarkerActivitiesScope.java | 6 +++--- .../service/entity/MarkerDynamicData.java | 6 +++--- .../service/entity/MarkerHobbyDatum.java | 6 +++--- .../module/service/entity/MarkerOnlineCar.java | 12 ++++++------ .../module/service/entity/MarkerResponse.java | 6 +++--- .../service/entity/MarkerShareMusic.java | 6 +++--- .../module/service/entity/MarkerUserInfo.java | 18 +++++++++--------- 8 files changed, 31 insertions(+), 31 deletions(-) diff --git a/gradle.properties b/gradle.properties index 832da15ccb..9db77184f3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,7 +24,7 @@ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ USERNAME=xintai PASSWORD=xintai2018 # 编译模式: false - 依赖本地版本, true - 依赖 maven 版本 -RELEASE=false +RELEASE=true # 模块版本 DEMO_MODULE_MAP_VERSION=1.0.0-SNAPSHOT DEMO_MODULE_MAP2_VERSION=1.0.0-SNAPSHOT diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerActivitiesScope.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerActivitiesScope.java index 85567b97a5..293a299196 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerActivitiesScope.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerActivitiesScope.java @@ -9,7 +9,7 @@ public class MarkerActivitiesScope { @SerializedName("content") private String mContent; @SerializedName("isCheck") - private Long mIsCheck; + private int mIsCheck; public String getContent() { return mContent; @@ -19,11 +19,11 @@ public class MarkerActivitiesScope { mContent = content; } - public Long getIsCheck() { + public int getIsCheck() { return mIsCheck; } - public void setIsCheck(Long isCheck) { + public void setIsCheck(int isCheck) { mIsCheck = isCheck; } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerDynamicData.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerDynamicData.java index 0e9080d565..7fb1ad72dc 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerDynamicData.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerDynamicData.java @@ -11,7 +11,7 @@ public class MarkerDynamicData { @SerializedName("name") private String mName; @SerializedName("type") - private Long mType; + private int mType; public String getId() { return mId; @@ -29,11 +29,11 @@ public class MarkerDynamicData { mName = name; } - public Long getType() { + public int getType() { return mType; } - public void setType(Long type) { + public void setType(int type) { mType = type; } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerHobbyDatum.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerHobbyDatum.java index 73af126e75..fbb50bde19 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerHobbyDatum.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerHobbyDatum.java @@ -9,7 +9,7 @@ public class MarkerHobbyDatum { @SerializedName("content") private String mContent; @SerializedName("isCheck") - private Long mIsCheck; + private int mIsCheck; public String getContent() { return mContent; @@ -19,11 +19,11 @@ public class MarkerHobbyDatum { mContent = content; } - public Long getIsCheck() { + public int getIsCheck() { return mIsCheck; } - public void setIsCheck(Long isCheck) { + public void setIsCheck(int isCheck) { mIsCheck = isCheck; } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerOnlineCar.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerOnlineCar.java index 46e1c4b9fb..caf5579119 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerOnlineCar.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerOnlineCar.java @@ -12,13 +12,13 @@ public class MarkerOnlineCar { @SerializedName("carInfo") private MarkerCarInfo mCarInfo; @SerializedName("compatibility") - private Long mCompatibility; + private int mCompatibility; @SerializedName("dynamicData") private MarkerDynamicData mDynamicData; @SerializedName("hobbyData") private List mHobbyData; @SerializedName("isFocus") - private Long mIsFocus; + private int mIsFocus; @SerializedName("location") private MarkerLocation mLocation; @SerializedName("type") @@ -42,11 +42,11 @@ public class MarkerOnlineCar { mCarInfo = carInfo; } - public Long getCompatibility() { + public int getCompatibility() { return mCompatibility; } - public void setCompatibility(Long compatibility) { + public void setCompatibility(int compatibility) { mCompatibility = compatibility; } @@ -66,11 +66,11 @@ public class MarkerOnlineCar { mHobbyData = hobbyData; } - public Long getIsFocus() { + public int getIsFocus() { return mIsFocus; } - public void setIsFocus(Long isFocus) { + public void setIsFocus(int isFocus) { mIsFocus = isFocus; } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerResponse.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerResponse.java index 67af7725bd..0591349344 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerResponse.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerResponse.java @@ -7,7 +7,7 @@ import com.google.gson.annotations.SerializedName; public class MarkerResponse { @SerializedName("code") - private Long mCode; + private int mCode; @SerializedName("msg") private String mMsg; @SerializedName("result") @@ -15,11 +15,11 @@ public class MarkerResponse { @SerializedName("sign") private String mSign; - public Long getCode() { + public int getCode() { return mCode; } - public void setCode(Long code) { + public void setCode(int code) { mCode = code; } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerShareMusic.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerShareMusic.java index 4bf58b6150..06295dcbfa 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerShareMusic.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerShareMusic.java @@ -9,7 +9,7 @@ public class MarkerShareMusic { @SerializedName("id") private String mId; @SerializedName("likeNumber") - private Long mLikeNumber; + private int mLikeNumber; @SerializedName("location") private MarkerLocation mLocation; @SerializedName("musicName") @@ -29,11 +29,11 @@ public class MarkerShareMusic { mId = id; } - public Long getLikeNumber() { + public int getLikeNumber() { return mLikeNumber; } - public void setLikeNumber(Long likeNumber) { + public void setLikeNumber(int likeNumber) { mLikeNumber = likeNumber; } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerUserInfo.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerUserInfo.java index ca83979c02..37d097d738 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerUserInfo.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerUserInfo.java @@ -7,31 +7,31 @@ import com.google.gson.annotations.SerializedName; public class MarkerUserInfo { @SerializedName("age") - private Long mAge; + private int mAge; @SerializedName("gender") - private Long mGender; + private int mGender; @SerializedName("sn") private String mSn; @SerializedName("userHead") private String mUserHead; @SerializedName("userId") - private Long mUserId; + private int mUserId; @SerializedName("userName") private String mUserName; - public Long getAge() { + public int getAge() { return mAge; } - public void setAge(Long age) { + public void setAge(int age) { mAge = age; } - public Long getGender() { + public int getGender() { return mGender; } - public void setGender(Long gender) { + public void setGender(int gender) { mGender = gender; } @@ -51,11 +51,11 @@ public class MarkerUserInfo { mUserHead = userHead; } - public Long getUserId() { + public int getUserId() { return mUserId; } - public void setUserId(Long userId) { + public void setUserId(int userId) { mUserId = userId; } From c7e8e5e9c6201de4050bf9352f8396f90256891b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 7 Jan 2020 16:10:29 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=BC=80=E5=90=AF=E4=BA=86=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 9db77184f3..832da15ccb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,7 +24,7 @@ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ USERNAME=xintai PASSWORD=xintai2018 # 编译模式: false - 依赖本地版本, true - 依赖 maven 版本 -RELEASE=true +RELEASE=false # 模块版本 DEMO_MODULE_MAP_VERSION=1.0.0-SNAPSHOT DEMO_MODULE_MAP2_VERSION=1.0.0-SNAPSHOT From f5a0166701633a9ab77b8f67831b75161ca39226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 7 Jan 2020 16:35:13 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=9A=84=E5=B9=B4=E9=BE=84=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=BAString?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/module/service/entity/MarkerUserInfo.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerUserInfo.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerUserInfo.java index 37d097d738..c0d7c20577 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerUserInfo.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerUserInfo.java @@ -7,7 +7,7 @@ import com.google.gson.annotations.SerializedName; public class MarkerUserInfo { @SerializedName("age") - private int mAge; + private String mAge; @SerializedName("gender") private int mGender; @SerializedName("sn") @@ -19,11 +19,11 @@ public class MarkerUserInfo { @SerializedName("userName") private String mUserName; - public int getAge() { + public String getAge() { return mAge; } - public void setAge(int age) { + public void setAge(String age) { mAge = age; }