From ac83f76e73e9dddfe34d63ecbb99d1855aea4036 Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 26 Nov 2020 17:36:03 +0800 Subject: [PATCH 1/8] =?UTF-8?q?[add]=20=E7=82=B9=E5=87=BB.9=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E6=B7=BB=E5=8A=A0F=E8=BD=A6=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module_ext_shadow_bkg_pressed_light.9.png | Bin 0 -> 4253 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_shadow_bkg_pressed_light.9.png diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_shadow_bkg_pressed_light.9.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_shadow_bkg_pressed_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..1cac08b97c5a7b00c4b65b0b5dc0fb4f56ede0c4 GIT binary patch literal 4253 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 literal 0 HcmV?d00001 From 0000714a7a6d86b31701c13fafdbb99b118922ec Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 26 Nov 2020 18:23:10 +0800 Subject: [PATCH 2/8] =?UTF-8?q?[add]=20=E8=BD=A6=E5=8F=8B=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=8F=B3=E4=BE=A7UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...selector_service_car_pannel_detials_light.xml | 6 ------ .../service_car_panel_call_normal_light.png} | Bin .../service_car_panel_details_normal_light.png} | Bin .../service_car_panel_details_pressed_light.png} | Bin .../service_car_pannel_call_pressed_light.png | Bin .../selector_service_car_panel_call_light.xml} | 4 ++-- .../selector_service_car_panel_details_light.xml | 6 ++++++ .../service_car_panel_call_normal_light.png | Bin 0 -> 3236 bytes .../service_car_panel_details_normal_light.png | Bin 0 -> 3056 bytes .../service_car_panel_details_pressed_light.png | Bin 0 -> 2986 bytes .../service_car_pannel_call_pressed_light.png | Bin 0 -> 3181 bytes 11 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 skin/mogo-skin-light/src/main/module-common-res/drawable/selector_service_car_pannel_detials_light.xml rename skin/mogo-skin-light/src/main/{module-common-res/drawable-xhdpi/service_car_pannel_call_nomal_light.png => module-services-res/drawable-xhdpi/service_car_panel_call_normal_light.png} (100%) rename skin/mogo-skin-light/src/main/{module-common-res/drawable-xhdpi/service_car_pannel_detials_nomal_light.png => module-services-res/drawable-xhdpi/service_car_panel_details_normal_light.png} (100%) rename skin/mogo-skin-light/src/main/{module-common-res/drawable-xhdpi/service_car_pannel_detials_pressed_light.png => module-services-res/drawable-xhdpi/service_car_panel_details_pressed_light.png} (100%) rename skin/mogo-skin-light/src/main/{module-common-res => module-services-res}/drawable-xhdpi/service_car_pannel_call_pressed_light.png (100%) rename skin/mogo-skin-light/src/main/{module-common-res/drawable/selector_service_car_pannel_call_light.xml => module-services-res/drawable/selector_service_car_panel_call_light.xml} (69%) create mode 100644 skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_details_light.xml create mode 100644 skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_normal_light.png create mode 100644 skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_details_normal_light.png create mode 100644 skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_details_pressed_light.png create mode 100644 skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_pannel_call_pressed_light.png diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable/selector_service_car_pannel_detials_light.xml b/skin/mogo-skin-light/src/main/module-common-res/drawable/selector_service_car_pannel_detials_light.xml deleted file mode 100644 index 70f871f8a9..0000000000 --- a/skin/mogo-skin-light/src/main/module-common-res/drawable/selector_service_car_pannel_detials_light.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/service_car_pannel_call_nomal_light.png b/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_normal_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/service_car_pannel_call_nomal_light.png rename to skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_normal_light.png diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/service_car_pannel_detials_nomal_light.png b/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_details_normal_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/service_car_pannel_detials_nomal_light.png rename to skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_details_normal_light.png diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/service_car_pannel_detials_pressed_light.png b/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_details_pressed_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/service_car_pannel_detials_pressed_light.png rename to skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_details_pressed_light.png diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/service_car_pannel_call_pressed_light.png b/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_pannel_call_pressed_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/service_car_pannel_call_pressed_light.png rename to skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_pannel_call_pressed_light.png diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable/selector_service_car_pannel_call_light.xml b/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml similarity index 69% rename from skin/mogo-skin-light/src/main/module-common-res/drawable/selector_service_car_pannel_call_light.xml rename to skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml index 2c36033d92..980f940645 100644 --- a/skin/mogo-skin-light/src/main/module-common-res/drawable/selector_service_car_pannel_call_light.xml +++ b/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_details_light.xml b/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_details_light.xml new file mode 100644 index 0000000000..3f12177da6 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_details_light.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_normal_light.png b/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_normal_light.png new file mode 100644 index 0000000000000000000000000000000000000000..a37dc6a948f5cece381ce060b9d640019a9857b2 GIT binary patch literal 3236 zcmV;V3|sSwP)Px>UP(kjRA>dAT3Luy$r-NO-3lr#t^pMxEsEp5Z}Z@^J|q|rWJux$aT#?46(3x{ zhq#~!6EV283uILCG>+nnpg3S`^WfU<5sWh^3WCIG5k*{D?R?+g=PUnPeQw)YaPGfv zRdwprsdGbc?ZSl%ckAlvmWfp$a`x=m#FaByo_G8j>=gvhdS&teus!&D&lZkP%S{oZ13l-Gl_44IQ z%To09>(}4IsHtaGuU;M2tXUIo-n^Tcc|p(|Ie6eXlGKGcHr z(Ur%M$P`v0kA$K*7)DS|LaU0z-ue1uo8UWK=B-$rE`vB}sV85kz(fK*}S%9R$GPHJjuq9IJGW3fm% z8mA6OE2G?AWppSMu3fwK-qL|V=A;@1XDC;T5yc?H&9WC@9*oXn2qptIdU=r%Zz6i< zOi&}ut8Lr1eTEGic8~lh^;4AsDGQ=w?q0rpc~>-&0TpDB2fGt;az82U-MiPu zY{7yBp+kobWUE6WWP1IS0u?Z0%;?y$Vh+5O< zPu5-UjgfVcHzfb~@#EqC{rh3SfB|9h6w_9^(25+p(I_qetJAZcDJmU|3nE!`LQHS`}$d2=P(T&scc-gKoY; zWEtcJ!>Uq+8P?)tp}hhLW22_u2=sRnJc$UASzp*hHs@_G($K)_g`-&7S% zR~k4Y`i-Rq!RuO}- zYChAvT#ji^Ts`A)h-`OO0pa}AAPual1ihTjOWBK0c;m*6A@-UpV+lzU=he4w-&h%g zEnd7>>IP*aC|fBx{t}ywj?v5kZcghORn@U$$EZU)T?!&!DIfN~kCk~PWu-1+AZ~aF z&zw0^)NRuBkiPubQHHg%Cud{S^8tNk^XAPnV+O3Ptu@@s=|Hw}mde3@-mEezrwMfL z-kmR}aj&s{{d%fd^Fcf=xgcaWi^fdZ$ViX|JZI3jar$rGyg9sh@xl&PHg4P)EAuwA zlTV;WxwHBoD(NnPhr(GYjUGLE6n5;`VL{1La6-~N){>1O_)&0dc*;0te{#{K6QKf; z(W6HX+YQsXCX9zCPMnC&sjonp|Hd-BPo1GdH7TUD_{cCUU%uR`@`0E@RaKSDVxWvM zgV4r|n-mgqC|tCM#C!Md9ky@Z9{Tj@W8KGOnE>B#WGhI0Bxo;)aV5nYHBarjN{Nt7 zftsi$nml!Ho?Nfjy^`qMv(g0c`a5T@?$U(c&fJX z0m$>T$0_qIm4U7qG-y!i*IXIni1Al+Q&)_oSVcj_WB?z;;gc{5 z!~P`)f|Tds8LtjO#>htsO9qo7o zC~K*;SQwHmM?u?>%n~Ios08VpxNnk)?`he4ed1on<9Yg!*WhewIbeK$Zssp#h}Jt= z>evUBu7{MTO*Z6vx%erMdTCtp*t{;tW=D*sL_Hyb+1o7-2)ZUtq*CPECzqFum&-w( zU$5u=c)sifGe7lsijC11i6|37$VGu`JaHdfcwWF%m-N%8Ps8))&qMq6?L)V2-OLwl zrR)8OXTqEx#ZE;jpPQQD!-vO3CXN^nI}q@P)F3Y~b$p`K!J!vBCT=FlqYkeL6DDxK z5j!i-p89N(dFXNaBb_$#aLqt*A9htZBKit@zgijiq~(Y*&-ac`o;+zMtCahTI-cg;+G zeX{Z+zk<>gY{`Z?%pZ9i1}v2EKo3mYEtGN~hk0_!cpv2zCLX`OO`kr!Xhgg(`cM;} zkcozqq`v|E3@+I2)5l=dTUdQu1 zKe4q#9iAu06IufB#sV3gmnJ)~#Cu5A&q!A#v|tw2v>GP`cuI zU*Z8)mVbi=VJ9-Be(}liwPS?jfwE{5bkB;Rb_A5viFISN19D? z;i6M0xre|XlrLPkkgwTAyL2g~PEuNWgla6Vva&MVzJ1%0WTL!SB)AC>5_{r%js{s;jGu3Z$;&dGS53O`A4N|5(C{;`cC`ZxP*(R~B0V2t6*jhm>=* zJaFKEO-B_#9Tg}jnIK1R-MV$5Q>RWb4(;eu&Et-@AFuJ>m=>JzE!h4skR~gdhTf5I zCL&xq;t7&}=gysQ@ZdpPA<1VeRTSmCIBNXoiEqj$FD9no&p2tZ?^>~ZIAU=ZVG!>( zIrL6i;!##gmx)rw|D5p=fLP{=#ZksasB7xfsezYow3i>xCk|O1&O*ilnzLA#6!9_D z{&d!YgObj(09JtP1?4|Yj*o#`w{C@J&z^;zJ$v#GeF67~)D6l;{v{M2BXt5r6@3hB zRv3-Yo7FJ-38)>&`Q$uK$84TwjO<5p&m->n#APq&^}SqtXWszc?>_1LjZX9_Tn;^y zbDxZopq}I&Z;h^E$QPk-`Jx|;QVm9___Lji0dq&p$qhw;{1+8Z=WUMoq@}Cit&vHW zwyC~kp6_@KC}>%F6ssIOY*k@0;6EsEv)7=Mf^YvUWI=feszBO%xyQY4@P7vVS4_1Zfj9M%S7-(P z*@fl#X0iBp@L-H;HF|jvAfG9}#Z?JeB_Pe71Ahkjec*g{-oj|qVl@8qxkb=v+Wrra Wi*tQt2}-H}0000(P)Px=s!2paRA>dAT3Luy*%dwSStW`TewYrZDCyR=6(<~jgmfulP{@Zx5(hBYjbJ%O z{D^|sit$TPw6$;`QH*|=bVM}JLVsAcACBc%1~d+ZV*6tk&Il>3%3Ax~b!ykC`^w?K zeS7b<_g;ISbLU$Xf*a@0pTF18(6CHUfy$XPXWELzVki^}ahotT)K2=iGej*TU);sZ3juJix)4(nsQowD}*1`AfVc#Mvby& z%@6vK7cN}*S;3U%J$v?S%u@EaapMXVbabeb&9$wqtx#m-fddDu_4Vu5hqY_hnttut zwblaa7^UbsNE#lH&2Fus%a<>AXh_p&p9@;YQhtv{rrR_!Ml#9f&M*T%rYJ$>C_zwK z`;0)z^o<=mwou@rwY0Qc_enm8xVO!~PZ2w^zFW6$#=d9Ip0IuUcH1o*H*O5yeDjUr zD^{!sixw@4i(&C(@XJR#t)7Eb$H}7Qxb|s#v^D44RV6cb@71eUTa&8QNcfR{jaX3t zB~F&z5MLqr40gd3$Tsiqki?USRdl>EkT$pO-MfD_di3ZfVx=<)ia%88P_X2iH*fA; zx^!tLeU_vI25^*6OJb(V&^ySN!hbK>-n9g|1P$e8<;q>X#<|ONh6DL?a5I=I{h~d@^_K7XC8QJoR zMACP|xC%P7rHPt@lB1srk3UL|lr_hmqB+%;t41PKq8u?|M14GraLKDiJN0?hGQ#GO zBS-$iNciIij`F`D=xbrnALA(hrEJPr$%E2Sxq$1+E!dro7{ySslWfeMIC0`XWTY}i zc?Syo4}~g;IieUs%;R2H4zOBW)Az(Aa(SbxA|jL&sn1V+w6RSdGiJ;wi|0?aT&)IV zOX3qfp6awYGUAev+0nq!hs$>9!p~Em4i%78u(!+U$}i^!zORCpJj_hIQI<=}BUO@e zBo&+azviXpD-SAg_wL={?c2Au_2|(fEL^zIX3qPK@Ls)oh1IK98_s)=@T#h+uzB<5 ztVT(Ymxp#elxh`GVP2{ZA3hxV_wOI3PoHjtjNxT#@7}#(z<>c^_Uze_@Y%CxVbi8f zVbGvKVZnk079X8ZtQZdtJmJ{Ep+XAs4any)>f8mwQkn2P=F>|XZnv`;=!1EI66R%E z)W?b3$0(OqlX#xt(dbh=Ox#m~3M3B9f$!I`?&|!!A9Y@sS`+u;}cEKJOP%8k6EahdNIBQT70>#56#7xg*mT zD3|N-CHB>UfTmA^SFc`$g9i`V`#?oSMX0TPl)g9i`7 zoH=u1Gc#w-H2m(}yK!lmH*elN!*AZa8CI=Y72~~vxW+>IT9yPv(>Ft%Gr-d1`UNsh zd63HyUwka5WD+DeCK6yFEm;i66rV32?%q4O&wiihR1gX2*T~cJFvbg~#MV~C`_zxV zLj|PdDW2!|FfW37`(393!)XnU6qgE%}nHAkcQVq zNX+X#CylSHto%$|R*VJ;+JmGVO!A5EvYDrN#p21UcIeQdP2!Bj2;i<-sRRXh+w1a6 zrastp!-o$q|C*~rd}90=%hZR5w?;}voS4U*J{kMzlyW88caD%u;)XXFm!y*-kfb|L z&#(p*nUGLLvurU%T)%$(OBDSM_9w)AA;n+?_Ti*m0AKrsR!%41S>BhIu9XH)8&dhuqWeYFv5c+7qJ?rOox2L zz2ED~Nn#sd|CyHo`QKM|?xIX)_PqQrxchMBeN$@YT^Ol9B-Y16Z^i@4@AR#RzOF`> z6T<|$VM5!{%o0sTQVo*aPe``nQrqM7X^4-~>v{3;*WugLpCIG=vv?%SPE7A;DX}jq z5-;gbhjNH}zwi`eTw0eHhmVEX=@X*`F;0qP_IAq;1bq?`g>)eI&E+-Y{UXTY^>LoZ zLlk|D$=OiY_4>mUJP{b#q zFEQ&=O7KlnC(g~|B9K(BY)a*%zSLGuIb2+d^U~)~$D-Mv=Ip&4llqRJZ(IqKsZYf6 zDOR|bsn6TeDW&J-dY|+(hc^4?lM7^lFG|axd`nPCBv+uv@`~ogdM@!OP8{O(v5FBU zshrd=Ts6cAe0c?uYn0GMpt+dHH+L*Xc=+(4tx&&y{lcV4lL9~Bs}Y_<()mVTUtb@Z znwkvb`|-4C(?ajwy(6dUQa*k9G#op2EZn(s$Kv_DzNV(e;?+2%bk^aJO&#@XxX0}A zngE9nC?V~8@8rpoRuH?}-kT{oD2EIg5@yVp5%XE_`0?Z6#*G^>mKZn2<7qj}npHa2 zS(EsoLx%!Bf}5^5Njz4?KS&VE>yy0@$JWeGAN-!&WuS;2J$htK(bka8J*c7h`}gn1 zCg~&2Nl|hSW=)t)oqI_`yp-H--LlVXF;;QR~X%LF zhj3y%GQ8jWJkD6}qs^fhyam)1aZ)yda9_#Q@wZ$uSC&IWd2y-V65LOkL)-I;TRh$; z8gV4C`-Tl0)@aLzB)$dn?6iLwA&G)1%aO8xkEN}6FNtg9;qQx)qpMi#pxgM;Vt?1N zXGH|J;dT5ADn^n%={%1#hza)?b&pF=Co7yi^D7eUcpu8$4LB^T5%dH2?Sq^r^ty;W zrUujI%HiZtzGNDk;;M_d7Hrc#==&SV^`~&^=@7XuswNpLzt`U+-*aeB+)&jZt#QmTqA7BcEawlX16TLd()mu|8k=dreHi z{0|B|snnr}{o|*K%CBbFgnXK;8Wye`N#)A+lIIZaO-uYoZ12z0KWJi}01X!~(LX@` z1$d|1gpVyZsdAG6ejE8~aj5+hdb}Wb&Ufh_J+VAuPPVbJaRl~iHCA~zB=0G|!d3-e y6(rMMKz|PZedxS*{s(*G6!ylAkDUZb)A4_c97h%Z%)l`K0000Px=WJyFpRA>dQT3KjSSr)zT8HcEGz_HsB#Ks6+`eB1ssVInww6sH|p!!3hJ_RK#CdSy`%p5-KQQ zk#gO-bq#5{qVV|fjOA6FWo@QKlh3d@KIcGDhrJC`sEzoY*u;HiIuU~&epgdU0!Jv-CF*2~AhK7d5 zzR&ce1A`}K`SRtd6g%zlDqi%*_B867)z%y~U@=upJ&qQm|B z_eXp7>~TD?{JB(Z_t6`{%7AqiE9=sw%T(W3J4+g&*VF>EO2s3BS{8q-K zKB5(F-n{vnSFc`8ZqugC+72}2%WeGNM25y zI1!=OT!6~T$_VK=@B8-ci?Ad(xtk#}Am!w}diAPLeT74VT7tKfuANKOLZQDkZCr@@ZeD?_7u3fum+O%obt;4jMFkwQ; z+qZ9f+b$sAr%#{g&Ye3^j~+du5hF%8L(2R0>lfX;c{A$WyLU8x{CJ<-fB^%d>({SG zef#$H3CJfY3;*(2a+AXeG79oxk#Q(j-8+r(!H1k{P6MWAY3NAxkjk;B)k_vqVz`<# zwhvmYRUcwAaalkDR4kt)OTuuC!?cfI?Rmw=(fLg9!whLg3YPb#;Hj?{`=?3(-B*cqD$nuVU`p zxn~VFkjrbC`J_Tby{mmy!V8Ro0R~v||fZFvcI@onNcErCBY*I{DR$7cUz3S!U{61M+H# zXs8#4XB4aREkoCRVguQ1t$_{D90n(+tQPuU=(?=wYMm;WWTg5@M=HH|)C({yKMCW4 zVN3qA08)h1Itq2R9^yEL(7WzruvBerZLvV2a=^M|mX}^M7iQzejkk$QZ`!me>rf%% zkjhyuIWckLh*y}~o^$WvH^QMK)^oK+cqJk#xhUm$vyAlndnrV1khp9uj(n~_)MKdr z;`WBD*n*vHbmq(%_nL3js#P>@+&HJ^L4%hMeEnm2il$DT>Vn{raYs{hSA?BZG=2K? ztl&%p6J?~I`U*zHg$ox{CCKxqPMz|+l^;2B#E%sdr4RLnT8w(PtYA`f?b_94F9SvB z)~%a!LOFlJ_v+QlI~SHZ=`*sIz8kG#(4avsSao%^-|Wy}=+L3g>AidReAiMwYSbtv zud1qwCQb5Z3#xp<0{x%ZW0^-7#wJ7Fwu~^VmzkB}&{3YoKtGW(j#`5xKC~mwVyVY| z|8MCI9Xfm-r<8-1wjc~bKN(p=8n5(k=`g9tSTw{*PAWdc6crVfQs!o3=gyr!4FT3T z&Pk|`OIVoMvuC>lq6>yYTP62*3TT~M-sB&DEnoP&Jy zvgPS>#*7*6E{AqL7%MnLv}rB?arqRS$G%4Qm0N7q9zhD+Qa;7{S7ZZQUbs-EI*+!q zX3cU(TVY9KgHf?-*RB%WPJKh3MUFz=DKmN=XBRA3Fi^6PCI%C5_wLTP2b-LUH|O)c z8it#r5}bzCbDyLD>|Hh}u9t-gX&hF5h~*S$-@g4aE(4)$bM?F%#{DvG897ag!Uiar zxJ1JQ;;?bD7`qxQs-NqwDAb4boDIYIv;cGZpV;MmrpAaW89HpPLBd+vB#{=3I7abn zTvSf8=jYI0*1BkwJfk6zS{~#nSMqo>co=1pdtnYnog#>ALn?h7C6+m1n%3^vv7;;w zLs^p%ISWgOY5lJkDNv>hP<QUCiX(Ypt%GSzTVo$p`AM%$=XEE5tP35OK zj#vt}5&M(`LFDB~RK}JH*Br*$SYCGWV|C=MKGcPEVmS!hxj0j-ers?zEz5Ugj$jl{9@} zX^yU3xf0#Kf8Xi5ckdnz9y~b0yU2yISPJ;5@#4jc(cQc5zZ9aLJ$pvOh7I$0XM{hp zW8+y=C(kyea3AQl*Ayfb8qon0((u&C&vExfnoUY z;SMkVyaKs#OcKr~d3KtLwV{k(XILmFRz&>>dbya-Zew~0=iIML}O7v=XWURJTF0ixDkGSKQKU+1W_U^xqA zE=tTF*-NEhs*}datUlyJyp0j+Xp85!GL7D=V1)pIL@8H^lSwBk45@xr7s{j)4fVE8 z-WIE~a`N~RS-}gPvuNS>p_27n#?p(1fhD(;d{Uu3X9Y_bH`FEhpqwXc+BA{%?L%FXKWigQoJ_iq3X5mGYT?3#?z@)uiVe6s`hX`^8WEUpiNi`J z8s{t2**f`rJB7Z9#Uu5L8bz5J=Jfb~sexF5&askIYywG`Tykqq-qvZSx@bPW@JyY{ z+#>m7gKe1efzQVu<9x#-fcv_u0Hplco|KG+mUoU4{#bk2S(;#$B{s3@a9vO`Z{EBn zUpRBlIUG9Or|>MVnF^h=go$RvuRa$6&q_4Crpy@KPa#X-h=x?_m7_;PD$F4 z(1I$@3a9fdiUCLuX?*zP!2DL`xfm?|@Y}daT39`~xxl zf)K>dS^YH)i*ua9-NSG+^pDt){~o{o`27a;_87Us%t*ZieSufY9W>xN_M!jAQhgMo g@#Fh8A}*2t0W8h7OqNb2UH||907*qoM6N<$f)k$HrT_o{ literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_pannel_call_pressed_light.png b/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_pannel_call_pressed_light.png new file mode 100644 index 0000000000000000000000000000000000000000..87bedfbda0eab27a43097bc2d317f4e1292e32df GIT binary patch literal 3181 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 TQ Date: Thu, 26 Nov 2020 18:25:01 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...png => service_car_panel_call_pressed_light.png} | Bin .../selector_service_car_panel_call_light.xml | 2 +- ...png => service_car_panel_call_pressed_light.png} | Bin 3 files changed, 1 insertion(+), 1 deletion(-) rename skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/{service_car_pannel_call_pressed_light.png => service_car_panel_call_pressed_light.png} (100%) rename skin/mogo-skin-light/src/main/module-services-res/drawable/{service_car_pannel_call_pressed_light.png => service_car_panel_call_pressed_light.png} (100%) diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_pannel_call_pressed_light.png b/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_pressed_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_pannel_call_pressed_light.png rename to skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_pressed_light.png diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml b/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml index 980f940645..a0367b590f 100644 --- a/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml +++ b/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_pannel_call_pressed_light.png b/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_pressed_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_pannel_call_pressed_light.png rename to skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_pressed_light.png From 63ddd76d691725e8f1107b589cf2ac4ff985e55d Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Thu, 26 Nov 2020 20:03:27 +0800 Subject: [PATCH 4/8] bugfix --- .../mogo/module/service/launchercard/LauncherCardRefresher.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java index d1a58c38c1..84d831d711 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java @@ -129,6 +129,7 @@ class LauncherCardRefresher { switch ( msg.what ) { case MSG_WAIT_NETWORK: trtRequestNetworkConfigStrategy(); + break; case MSG_LOAD_NET_CONFIG: loadNetworkConfigStrategy(); break; From c89896a9f6306ae2f581286870fd32fd50f2c396 Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 26 Nov 2020 20:47:23 +0800 Subject: [PATCH 5/8] =?UTF-8?q?[rm]=20=E5=85=B3=E9=97=AD=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawable-xhdpi/module_common_icon_close.png} | Bin .../module_common_icon_close_press.png} | Bin .../drawable/module_common_close_selector.xml | 6 ++++++ .../res/drawable-ldpi/module_services_close.png | Bin 434 -> 0 bytes .../res/drawable-mdpi/module_services_close.png | Bin 434 -> 0 bytes .../res/drawable-xhdpi/module_services_close.png | Bin 1188 -> 0 bytes .../main/res/drawable/module_services_close.png | Bin 434 -> 0 bytes ...module_services_fragment_online_car_panel.xml | 2 +- .../src/main/res/drawable/v2x_selector_close.xml | 6 ------ .../main/res/layout/item_v2x_push_live_video.xml | 2 +- ...dule_v2x_event_panel_fragment_event_panel.xml | 2 +- .../main/res/layout/window_road_event_detail.xml | 2 +- .../main/res/layout/window_road_video_layout.xml | 2 +- .../module_common_icon_close_light.png} | Bin .../module_common_icon_close_press_light.png} | Bin .../drawable/module_common_icon_close_light.png} | Bin .../module_common_icon_close_press_light.png} | Bin .../drawable-mdpi/v2x_panel_close_light.png | Bin 1581 -> 0 bytes .../v2x_panel_close_press_light.png | Bin 1628 -> 0 bytes .../drawable/v2x_selector_close_light.xml | 6 +++--- 20 files changed, 14 insertions(+), 14 deletions(-) rename modules/{mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png => mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close.png} (100%) rename modules/{mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close_press.png => mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close_press.png} (100%) create mode 100644 modules/mogo-module-common/src/main/res/drawable/module_common_close_selector.xml delete mode 100755 modules/mogo-module-service/src/main/res/drawable-ldpi/module_services_close.png delete mode 100755 modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_close.png delete mode 100755 modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_close.png delete mode 100755 modules/mogo-module-service/src/main/res/drawable/module_services_close.png delete mode 100644 modules/mogo-module-v2x/src/main/res/drawable/v2x_selector_close.xml rename skin/mogo-skin-light/src/main/{module-v2x-res/drawable-xhdpi/v2x_panel_close_light.png => module-common-res/drawable-xhdpi/module_common_icon_close_light.png} (100%) rename skin/mogo-skin-light/src/main/{module-v2x-res/drawable-xhdpi/v2x_panel_close_press_light.png => module-common-res/drawable-xhdpi/module_common_icon_close_press_light.png} (100%) rename skin/mogo-skin-light/src/main/{module-v2x-res/drawable-ldpi/v2x_panel_close_light.png => module-common-res/drawable/module_common_icon_close_light.png} (100%) rename skin/mogo-skin-light/src/main/{module-v2x-res/drawable-ldpi/v2x_panel_close_press_light.png => module-common-res/drawable/module_common_icon_close_press_light.png} (100%) delete mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_light.png delete mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_press_light.png diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close.png similarity index 100% rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close.png diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close_press.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close_press.png similarity index 100% rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close_press.png rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close_press.png diff --git a/modules/mogo-module-common/src/main/res/drawable/module_common_close_selector.xml b/modules/mogo-module-common/src/main/res/drawable/module_common_close_selector.xml new file mode 100644 index 0000000000..72ab058d93 --- /dev/null +++ b/modules/mogo-module-common/src/main/res/drawable/module_common_close_selector.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_services_close.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_services_close.png deleted file mode 100755 index c1381dc44c160b4fea26e24f9a9401e435a8ae61..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 434 zcmeAS@N?(olHy`uVBq!ia0vp^Iv~u!3?wz9Rv7~+zW|>QS0MfW|NogYXKvoSdDW^_ z>%d^^)~!2s?AW+*wya;je%rQfKoOv_GiT1+x^?UN_3Llmy!rR<-`~G~ zfg}(B&3W7Btq(L&vLwhan1PX%i$_>YLQ+ajUP)P5Mb*g8KIh@1N1u;dsjvVQ{ql5i z46!&pb?R-QW(6LXk9E^EqMrV*-y*g(*Ft1|IHUE;M9c^>6=Gyr(lh>De%F;@tWj0By**bag z*)2Nl&T@My?(VqQC%fBOvbc_m-8b#`hrKbODi?*kr>^o`q&h8YssHzz`%|WEVOYP= zRl8y;j@C}ATZqgPe^2a|) Y`#(zJziIr|3m6Ivp00i_>zopr07u@*r2qf` diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_close.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_close.png deleted file mode 100755 index c1381dc44c160b4fea26e24f9a9401e435a8ae61..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 434 zcmeAS@N?(olHy`uVBq!ia0vp^Iv~u!3?wz9Rv7~+zW|>QS0MfW|NogYXKvoSdDW^_ z>%d^^)~!2s?AW+*wya;je%rQfKoOv_GiT1+x^?UN_3Llmy!rR<-`~G~ zfg}(B&3W7Btq(L&vLwhan1PX%i$_>YLQ+ajUP)P5Mb*g8KIh@1N1u;dsjvVQ{ql5i z46!&pb?R-QW(6LXk9E^EqMrV*-y*g(*Ft1|IHUE;M9c^>6=Gyr(lh>De%F;@tWj0By**bag z*)2Nl&T@My?(VqQC%fBOvbc_m-8b#`hrKbODi?*kr>^o`q&h8YssHzz`%|WEVOYP= zRl8y;j@C}ATZqgPe^2a|) Y`#(zJziIr|3m6Ivp00i_>zopr07u@*r2qf` diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_close.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_close.png deleted file mode 100755 index bb3e2b1195d085154afcb2ea9a72cde9367202f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1188 zcmY+Ec`(~)7{`B!qZ-vHOB`{RtTV&1Nr6}pZwJI&VB30l=f z+;s&(h;=v4R@b(5WQA%s(b}?$RFX!JeY>66nSEy7@B4Yqci#7p_m01xml8q?0YQ+G z_bEak*!@2(1sR~dGjJ*d!Q}jXgFS!?Oe&RTW@Z9yYH9*dT3R|iJq@_KyPHa-4h;D}=-qFzk0HnYKz+eaf(Dk_n#Cv*rz_h`^L2w+4#hRO&o1dTOa5xJK3tTRDb#--Z zZEbyh{lmYuv$G=<3W4(Ze4qk>Kr9xEL?WOPiDZ9&|KR@yF8iPD{+&?n98p3dm5-^YsH%RUrlyY4(9qP>(njm(>gnkl7#bNJH#WhT znOk6;oKLz0goIqWmGx6jegWlPRV`zLy~5qt+7a&UFE>QnLJ<6;H^DVHghhK09=_Ui1S!))D=pl#os~{G%=-UBc(K*?_4y6zA2y87T-9( z_$SAGLNkQe6KZAQ@{=WX{hf|PuVN*FT1e1=Txtq=udz`Zsl0U3 zhbcA(i(vCIwvD6m=qTj&ed}?ys^$^|U45TC4Ie#xmrk9~mB=4w)&7`_f|%Gr=-c zcvybAm|F#_e)8HlhZF+)-m(l+V2mhWF6Up6F6S!xoq>OxuuD*XgQl@uDlqOXFB;L0 zi}de%SRTx4+qqrzPVi1l6=4%c;kI=ouGoS%P~{q0Ku#oRSGrJNfk-aN4fzeE7_DEC zxyxr6I~NWsLF~Gtn{e^hMj7aU&6X`I!-bK(a+MWiY77@Cp@@@V)_1gN@oe=PwV&-L$(x~$ zH!k7J7iAgT-ygl~YoeVvc$$<#p#+Uj^F`^us97KUc;)g{oX?=94esT+SR>rSr9k_L zk|*v#B`Y}WH3Wrdx=6$aEx$VxS$;8Zb>P*Jl=_$ESCoT#8Nv#T&0nv^eY6Tq8Ns$@ hbBk$=3udQ6gnBk}u(QOt&|9BA8*dLkLaSS3_CMJnYxw{G diff --git a/modules/mogo-module-service/src/main/res/drawable/module_services_close.png b/modules/mogo-module-service/src/main/res/drawable/module_services_close.png deleted file mode 100755 index c1381dc44c160b4fea26e24f9a9401e435a8ae61..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 434 zcmeAS@N?(olHy`uVBq!ia0vp^Iv~u!3?wz9Rv7~+zW|>QS0MfW|NogYXKvoSdDW^_ z>%d^^)~!2s?AW+*wya;je%rQfKoOv_GiT1+x^?UN_3Llmy!rR<-`~G~ zfg}(B&3W7Btq(L&vLwhan1PX%i$_>YLQ+ajUP)P5Mb*g8KIh@1N1u;dsjvVQ{ql5i z46!&pb?R-QW(6LXk9E^EqMrV*-y*g(*Ft1|IHUE;M9c^>6=Gyr(lh>De%F;@tWj0By**bag z*)2Nl&T@My?(VqQC%fBOvbc_m-8b#`hrKbODi?*kr>^o`q&h8YssHzz`%|WEVOYP= zRl8y;j@C}ATZqgPe^2a|) Y`#(zJziIr|3m6Ivp00i_>zopr07u@*r2qf` diff --git a/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml b/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml index 1a5729e252..d4db9fff7c 100644 --- a/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml +++ b/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml @@ -28,7 +28,7 @@ android:layout_height="wrap_content" android:layout_gravity="end" android:layout_marginTop="@dimen/module_services_online_car_panel_close_margin_top" - android:src="@drawable/module_services_close" /> + android:src="@drawable/module_common_close_selector" /> - - - - - \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video.xml index abf4977234..016747c2d4 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video.xml @@ -18,5 +18,5 @@ android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp_20" android:layout_marginTop="@dimen/dp_20" - android:src="@drawable/v2x_panel_close" /> + android:src="@drawable/module_common_close_selector" /> \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml index 9355cd3b51..2834ed9e76 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml @@ -87,7 +87,7 @@ android:layout_width="@dimen/dp_79" android:layout_height="@dimen/dp_79" android:layout_marginRight="@dimen/dp_50" - android:background="@drawable/v2x_selector_close" + android:background="@drawable/module_common_close_selector" app:layout_constraintBottom_toBottomOf="@+id/rgTabSelect" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@+id/rgTabSelect" /> diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml index 79f85e14d1..30bf5d605f 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml @@ -26,7 +26,7 @@ android:layout_height="@dimen/dp_88" android:layout_marginEnd="@dimen/dp_32" android:layout_marginBottom="@dimen/dp_40" - android:background="@drawable/v2x_selector_close" + android:background="@drawable/module_common_close_selector" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" /> diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_road_video_layout.xml b/modules/mogo-module-v2x/src/main/res/layout/window_road_video_layout.xml index 705e37e58a..e86b7068cd 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/window_road_video_layout.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/window_road_video_layout.xml @@ -46,7 +46,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp_20" android:layout_marginTop="@dimen/dp_20" - android:src="@drawable/v2x_panel_close" /> + android:src="@drawable/module_common_close_selector" /> diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_close_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/module_common_icon_close_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_close_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/module_common_icon_close_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_close_press_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/module_common_icon_close_press_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_close_press_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/module_common_icon_close_press_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_panel_close_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_icon_close_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_panel_close_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_icon_close_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_panel_close_press_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_icon_close_press_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_panel_close_press_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_icon_close_press_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_light.png deleted file mode 100644 index 0bbb52b4880f28af273db8c9b4ae4da1a141461e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1581 zcmV+|2GaS7P)Px)=Sf6CR9FeUSxrb?M-;yI`W7N_Q4wvkQJ+hfM%qFwT_jK_WRXx8g@T)=Ain-A z-mVmB7hSkWTSbUnNk|rkxF{3~DWuduTTGWOTJUcpQA8mYapBW`-{hX@%-p&6-Ftm@ zKxgL6`T6GDGiT1dF9_ncv9a;S`uh44nTH&#t*xC2f&Jj%U>K2;ld-X}U~g}aL&X@K zot=Hn$=uvrFflQ~p=w@LTu}=gn09D`G}VCUFQ`?75M0+leH^c;E;0#3#73fOBrGm2 zsxif_&5)XaM(f(V&!EzUe*!b1K^S~}#QnGn1S!a^HEx`sjnDL|EUv7q z1e24KYU;X<-p~O+j**cO&B)Mno5jq<-QC@wr>7^FnwoNX{|hay?C2KDGXTpaP4GawY?pd=)(E2e6+7@>E2=kj37bcZTWw5WWZ=H0_>@wkT z{|f((x^#CQMbVo+be3Wu`38cYxWakoW?*W?e3*F^G~ru1~W4=YR&ggJ-jR*`-F1PuIs1(@_itGC5KQZ ziyRWISh!)}1O`;%5n7&}#}k=N`zE2-R01ROF!G^ElQFXg);>VY{wy@J&r}RSW}Yu0 za24Y#P_~W!8IJLc?-(~#oHvcZ&@#6FmZ?z23B)BI;&s<0R{Cbxp_Pe@$B<&W!EFIo&E zPa|l5ZV;^D;o+gWg5-{)TSWQs@v+5gPLTP&;KNJ2LYPct#w=VSH!GD?v`TpJxv6R_Q9bEWmv9jYi`cJX)s25}hsU0s5e=t?h~#DjIO!sDOZqY2dAjK~-1;pJagSRF#>QV~HPuMar+S^?Cs_YX_VZG%v1m0=w*fldCuF2 zl^*5?ruWMz^8po)QlA^YvL-QJ!sdhAA3t5?d~ckdW_j_lrGfEnD(kgS^!a+`V|8)h z;N8W+OD*Yq!lW@h;RyvpLqkDFM@Jf)qVx4GD-b*S2_f>ol$2uE?SY{I4DYx_ zegd!v0{FSU&WoOs{kH)6sZTZ)urS9SU&L-NwB&?G4`5@=^{C*GzA0c~WFMEH%w_tw zD|5ZX_$g9VU0&kz$QJ_aDuhSE&CSi%(Z7qoD!giGwbWPM2$00000NkvXXu0mjf`w;*E diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_press_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_press_light.png deleted file mode 100644 index e5084551a3231f00a3b829f7bf15602d214a05db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1628 zcmV-i2BZ0jP)Px*7D+@wR9FekSW9RnMHKDsy!<~TM##b}ge=_5=u%vWvl@kLbb{hY2#JJDNF*VH zE76rA2x9&r2_XqFIHG38O~7$AuEd=>&PE8hh>L(BA^-1-=M?X@)z#Jgx?et6@LpBj zd+XG#TeoiAF2~80g@uJz$HvBfmA=cy;Naky5Lgck47eU8*%=ubakjU&*;Inw*4EZ% z>~wT=ICFDzY^q{~B1bXU(C6VCq^UAGI=YI6BDlbOb8~a^n;cJ7o=%`fES~zu9|?VZ zeX8pdg+OXZHO}r&Z<|nI;ZM{IA&7vj_Hye9@TjC{t}}@2!ZKMQ>Z_TYoOHUoyM<*p zrO(wGfdvYEVq)Uq(b3V%<>lpH-a!#MYu_6BCg}p6=k4_O_gDMEQG(i_EYv9S#>dAW zYs9Fg+BpyUT@#6wl@(`xeqMD=({XlxuPM>g)Z`1&HO&$bCKG<_)YQ~COG`_p?0>FB z&d$z`a`yK2_K;vvQPGCWqq4rf{zHgs5V$E`TU*;hgC6QuS66>RqQ5EFxkrbGhp(8D z_4W1F0r*Ei*c5{Oe}`GGn{=}eu-9zb`C4$m^z`&sySux$&B00ga-b;h11E5$MEIqp zr9bub^xROuaiH`paTq~{eVyauW2dUBN=Shkr{;mnBLu;l0gl$8yNYAAw6ypEk{*d& z)g*&WcW7v6@9gZXJV*}q7=|U{(sOMN864p_86Nh%y}d4z!9JHfH8rJJq9Iqn!mA|yyPxw0p{K4H6`4xNKn2Xe z4T3+3Fw@q0{-eNfbVIj6T2PUf3)-Wv3el{23o>4qg`qU6$Yt(D9RLoTot;%dNRmv_ z7=)IWmz_9px@)Xm8PQl6G6_yliOpv4SAw}etn@B3vOrF(3$U%nV)pZeOUh(2nZIK- zrVwulf=S^mlCPYeo<5ZqSYJK?#Vm2)(D=_-U>%g#k#2LFx5#A0#l^pP41Yo}>w|-X zfK6!@0p~3pRgl(pTR$P91|+4c#dn2#PzB1gehq7XlU@gEo%y6i!i{(Db^Z zqT+kF)f+lZZ$|>_LS~zj;(**nh`bRsu{lQiJU6(6A7Q2U3h~H93e)U}gku+Z(Z~W= zbDNN=yhrEM>9%&P!ZR~7A7lGIz(C(AZ6Fs&%fjJ5)iXd7+p2I*(GN}GtL*cn+7u5c z%&p(p*!cM(lJARH90OWiUENE%tN2^ZG=SmZ|Dr4xOkJoGbrS<9g?Z|eycEcwtFEaV zb>zGm{9MMxv`R2jTwGjq5Zcrg&I|^AXN6%J#RnMXWe90bYin!d2e=gg#GH=bW%xCO zOw$^~qXv_XWW*^eD^m(n5m+FkxUQ&RaSX?%EsXcn)#Xbpl9?CM0*Jg#DajqV5Gka^ z?Sja~)mZ3ne5KgOD@9qHU=p59agMtPMP+{1bq|-;Ye`qCgnh*4EaX#>Pe_Fi~QP&d;CK)m5jVp&@lhBLLqU@%DeqznYW2}@m24=F54o%eNK za0;o-hcz7|QehFI#SxZfFFT84Dv3z*u4z%xL+ZQ=iy&*Jc?eUV%X62`E2NFX#P9X@ z5dksIxJc>%0000cp+W@ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_selector_close_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_selector_close_light.xml index e2ee5fc07c..72ab058d93 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_selector_close_light.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_selector_close_light.xml @@ -1,6 +1,6 @@ - - - + + + \ No newline at end of file From 7d83dd58b9d0d8330ab4ae108f53cec4a2ba5960 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Fri, 27 Nov 2020 09:58:14 +0800 Subject: [PATCH 6/8] bugfix --- .../launchercard/LauncherCardRefresher.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java index 84d831d711..a6bd55cd38 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java @@ -527,9 +527,18 @@ class LauncherCardRefresher { } else if ( datum instanceof TtsConfigData.NearRoads ) { result = handleNearRoadsTtsConfig( ( ( TtsConfigData.NearRoads ) datum ) ); } else if ( datum instanceof TtsConfigData.OnlineCarVsExplorerWay ) { - result = handleExplorerWayTtsConfig( ( ( TtsConfigData.OnlineCarVsExplorerWay ) datum ) ); - if ( !result ) { + if ( node.type == LauncherCardRefreshType.ExplorerWay ) { + result = handleExplorerWayTtsConfig( ( ( TtsConfigData.OnlineCarVsExplorerWay ) datum ) ); + if ( !result ) { + node.type = LauncherCardRefreshType.OnlineCar; + result = handleOnlineCarTtsConfig( ( ( TtsConfigData.OnlineCarVsExplorerWay ) datum ) ); + } + } else if( node.type == LauncherCardRefreshType.OnlineCar ){ result = handleOnlineCarTtsConfig( ( ( TtsConfigData.OnlineCarVsExplorerWay ) datum ) ); + if ( !result ) { + node.type = LauncherCardRefreshType.ExplorerWay; + result = handleExplorerWayTtsConfig( ( ( TtsConfigData.OnlineCarVsExplorerWay ) datum ) ); + } } } if ( result ) { @@ -595,7 +604,7 @@ class LauncherCardRefresher { String tts = mContext.getString( R.string.module_service_launcher_card_tips ); String info = mContext.getString( R.string.module_service_launcher_card_info ); speakTTS( String.format( tts, explorerWay.poiTotal, LauncherCardRefreshType.ExplorerWay.getDesc() ), false ); - notifyRefreshChanged( String.format( info, explorerWay.poiTotal, LauncherCardRefreshType.ExplorerWay ), explorerWay.poiTotal, tts ); + notifyRefreshChanged( String.format( info, explorerWay.poiTotal, LauncherCardRefreshType.ExplorerWay.getDesc() ), explorerWay.poiTotal, tts ); return true; } @@ -612,7 +621,7 @@ class LauncherCardRefresher { String tts = mContext.getString( R.string.module_service_launcher_card_tips ); String info = mContext.getString( R.string.module_service_launcher_card_info ); speakTTS( String.format( tts, onlineCar.carTotal, LauncherCardRefreshType.OnlineCar.getDesc() ), false ); - notifyRefreshChanged( String.format( info, onlineCar.carTotal, LauncherCardRefreshType.OnlineCar ), onlineCar.carTotal, tts ); + notifyRefreshChanged( String.format( info, onlineCar.carTotal, LauncherCardRefreshType.OnlineCar.getDesc() ), onlineCar.carTotal, tts ); return true; } From c920477081eaf4bc20561aed8ec2f6d8a60babe9 Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 27 Nov 2020 10:02:10 +0800 Subject: [PATCH 7/8] =?UTF-8?q?[add]=20=E7=99=BD=E5=A4=A9=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F-=E5=87=BA=E8=A1=8C=E5=8A=A8=E6=80=81-=E5=8F=B3?= =?UTF-8?q?=E4=BE=A7=E8=B8=A9=E8=83=8C=E6=99=AF=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../icon_heart_unlike_bg_light.png | Bin 0 -> 6150 bytes .../drawable/icon_heart_unlike_bg_light.png | Bin 0 -> 2575 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_heart_unlike_bg_light.png create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable/icon_heart_unlike_bg_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_heart_unlike_bg_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_heart_unlike_bg_light.png new file mode 100644 index 0000000000000000000000000000000000000000..76868e80f52c47a1a1c048c55485f55d9b1b7426 GIT binary patch literal 6150 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 Y0Rm-ojmcJaf&c&j07*qoM6N<$f^g$f+yDRo literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/icon_heart_unlike_bg_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/icon_heart_unlike_bg_light.png new file mode 100644 index 0000000000000000000000000000000000000000..aee65ace998b9298f23df3276a3f7c5d196b64db GIT binary patch literal 2575 zcmV+q3h?!bP)Px;$w@>(RA>dAnmuftR~^Q4Z|rQDLK&E7rK*V%CrV;xq)rAvkX{SOQJ5F(*!(7!178Ha9o#C&^-yV%I!owzjse?A^O} z&$JE}@kp_f(QYampam$5illI{U#zCwlUoAJsJT_GF2LaK-Md>kEq4&%GuIh?M-sL= zS$-q)j>s$81!rWpvpz=hN#rg*To{i1*|%@sYsZcqd*pmy%|q1%z}P2Go;(<4d z1i=6ZEvwv8$&2tWfnTpdbg1)=ea^p52LLsJn9X0#5x`hL#I_#Jdn1*ri-R1kICK5h zLn({+wH-UZlV~7ofYjIR`1rH+V8;S%#AnL%1UPRHK>Um?==jKyBUkz@piADOrgNp$ ztrOXpo16PeA^R(bj`9x$dY7F1$2!WtN^IMA$|Sx|6BhNJr%wHW zpte0K3u^E`HJWuUgnEc`nNJ^%a_4nT|7}mQRtD3WAc#dY`E|{)KBtc#KYq2~{nc%* zt&-?ANfI+(`;I+2;Ze}VeW0UHm+jGo->1F{G{6GRc#;o)QeF8=Grr_$W$5;H5~(E$ z2@V!)SAW+RfOj%E0a)-^gX4*k$5Jb#?#s2Iz$54h}@S z$@DYM7;&(zl_dt8>|;NJZ0q)Xju}w&1&Ul+>dtv2t|Ypz;h?#P@}#JqD*`b!A@FKAA@tn}W5k&3eX{ z_m*D28CykiK8W=6^uFv_HJnp^zdoPqb6NX)d47I=9qcqawVAFgZ;SkU3)HJ}oJXQo z^gtKhHda&dKaw5uqqKB_9Qyy(hAt+R8u(Tjw(l z%%(Q&K5E#pX1c{()TS9dXLaY1ffmV4hA6fdt2ll~p;mMVw0{=mm!l}frwJB;u0i6$ z-&DhXh51l5cDR}lq%tRBY8hu^eAQ=l`g~l-`YO$|pH=}-s4c>~Wg#E{dImmiw;40V`)00EnX%%zVI);0S+kZND?=;_Rl1T~?cyD!(W zj!=!M^U1NVlm2LVfQDED$aC0doft$e1jYm_apqC1YU}+ztA*=0 zh3tDm+B69DO%qpX{8{+n}zP1W)9S_JV;V7DT%wq=79&RC$IAd4<3AkX5Y*S z-Bo8H0LVCf>e#xbc=_<*!;@cgA?hc_FSMBsa2`2di;>HG_@}j>t{Ri$+0MzVeBJO) z>*Dz-0$9UZewSNQlZ8sE4<|MQasU4PH`Vkb#jiM*jlgINT+&JVL)AuiP70OXwONJV z5o&Y${q7r@&=1t?JBnYak5rR9$yOf0?n?F-VScBF+`sKMad?yLOD#;#vZp2Zb4_9% zVJ2={4{FY5J$*P8c1`h5d>Nqrymsd-CNR6_z*{~i#bkENS^7n=iI=~jKYo0d z--=wDHl{923)rg#{Zf-zVlh}IXz^SSF}OO;ylV{fY}0SyRbSR`Q$LpN-=ERJPFxu8 zXti)QMI^23^?>7i*2&j7^d(JMT~C5x~MFwuMvI>KM+XJX+w=Cda-uTKUsld2iREK5{ZA4#BprAxsS{ z`LuN{V|-iu7B_47HOH~%?VMYn(f;YR9{{i};Ijb0 zT_P0e^1^aoU_1W$xwgua=lk~vC2UqL1@?CC?MVZq-1WR~ZzcVgq)t}JB7M})nOg=3btZVo_ zj~LF8&z$|tYNdB*pz}!}yupsq3&@6zH(xN6UM)?Qg z|5S(CALaKKgw)*4f9Zv_guU4H_4Om#tBcyohh=?F`MN&)RogFX+L!YGtNOp?``-Bv l?TxG28-IV Date: Fri, 27 Nov 2020 10:19:52 +0800 Subject: [PATCH 8/8] opt --- .../roadcondition/service/MainService.kt | 45 ++++--------------- 1 file changed, 9 insertions(+), 36 deletions(-) diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt index da2ff0c096..330de85af0 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt @@ -75,15 +75,8 @@ class MainService : Service() { private var mLatitude: Double = 0.0 lateinit var serviceApis: IMogoServiceApis - //发送主动上报结果广播给外部 -// fun sendCustomResult(result: Boolean) { -// var intent = Intent(customResultAction) -// intent.putExtra("isSuccess", result) -// sendBroadcast(intent) -// } override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { - Log.d(TAG, "onStartCommand -----------> ") //清理多媒体资源和sp策略数据 clearStrategyType(this) //初始化埋点 @@ -95,7 +88,7 @@ class MainService : Service() { VoiceController.initVoice() serviceApis = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(this) as IMogoServiceApis speed = serviceApis.getMapServiceApi().getSingletonLocationClient(this).getLastKnowLocation().getSpeed() - Log.d(TAG, "onStartCommand speed = $speed" ) + Log.d(TAG, "onStartCommand speed = $speed") if (intent != null) { params = intent.getParcelableExtra("params") params?.let { @@ -105,18 +98,12 @@ class MainService : Service() { mLongitude = it.lon mLatitude = it.lat Log.d(TAG, "onStartCommand shareType = $shareType --fromType = $fromType --mainInfoId = $mainInfoId -- mLongitude = $mLongitude --mLatitude = $mLatitude --it.duration = ${it.duration} ") -// if (shareType == TANLU_ROAD_CONGESTION || shareType == TANLU_TRAFFIC_CHECK || shareType == TANLU_ROAD_CLOSURE || shareType == TANLU_ROAD_CURRENT -// || shareType == TANLU_ROAD_PONDING || shareType == TANLU_ROAD_ICING || shareType == TANLU_ROAD_HEAVY_FOG -// || shareType == TANLU_ROAD_ACCIDENT || shareType == TANLU_ROAD_WORK -// ) { -// takePhoto(1, false, true) - if (fromType == UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO || fromType == UPLOAD_FROM_STRATEGY_BLOCK_AUTO) { - // 如果是策略上报，isCustom = false - takeVideo(it.duration) - } else { - takeVideo(it.duration, isCustom = true, id = id) - } -// } + if (fromType == UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO || fromType == UPLOAD_FROM_STRATEGY_BLOCK_AUTO) { + // 如果是策略上报，isCustom = false + takeVideo(it.duration) + } else { + takeVideo(it.duration, isCustom = true, id = id) + } } } else { Log.e(TAG, "intent == null ") @@ -210,20 +197,6 @@ class MainService : Service() { // ) } -// private fun sendMarkerInfoReceiver(lat: Double, lon: Double, imageUrl: String?, type: String?) { -// Log.e("MainService", "sendMarkerInfoReceiver ------> type = $type ") -// Log.e("MainService", "sendMarkerInfoReceiver ------> fromType = $fromType ") -// Log.e("MainService", "sendMarkerInfoReceiver ------> isCustom = $isCustom ") -// var intent = Intent() -// intent.action = "com.zhidao.roadcondition.marker.info" -// intent.putExtra("type", type) -// intent.putExtra("imageUrl", imageUrl) -// intent.putExtra("lat", lat) -// intent.putExtra("lon", lon) -// intent.putExtra("custom", isCustom) -// intent.putExtra("fromType", fromType) -// sendBroadcast(intent) -// } /** * 初始化定位监听 @@ -290,7 +263,7 @@ class MainService : Service() { } //获取图片 - private fun takePhoto( isInterval: Boolean = false, isCustom: Boolean = false) { + private fun takePhoto(isInterval: Boolean = false, isCustom: Boolean = false) { Log.d("MainService", "takePhoto -----1----->") //判断是否授权 // if (isAuthorization(BaseApplication.getAppContext())) { @@ -388,7 +361,7 @@ class MainService : Service() { override fun onDestroy() { super.onDestroy() unregisterReceiver(mAlarmBroadCast) - unregisterReceiver(mCustomSendBroadCast) +// unregisterReceiver(mCustomSendBroadCast) CarCorderController.release() CosCallbackMapController.release() LatLngStickyEventBus.getInstance().unregister(this)