From 404f72ea3f9cadad9540c0a00f920d52a190fbe6 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 2 Feb 2023 17:33:44 +0800 Subject: [PATCH] =?UTF-8?q?[m1=201.0.0]=20[=E7=A9=BA=E8=B0=83=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E9=99=A4=E4=BA=86=E6=B8=A9=E5=BA=A6=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E6=90=9E=E5=AE=9A]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...function_aircondition_pattern_selected.png | Bin 0 -> 3056 bytes ..._function_aircondition_switch_selected.png | Bin 0 -> 12818 bytes .../bus_p_function_aircondition_common_bg.xml | 6 + ...function_aircondition_pattern_selecotr.xml | 6 + ...p_function_aircondition_pattern_select.xml | 5 + ..._p_function_aircondition_switch_select.xml | 6 + ..._function_aircondition_switch_selector.xml | 6 + ...irconditon_pattern_text_color_selector.xml | 6 + ...nction_airconditon_text_color_selector.xml | 4 +- .../bus_p_function_setting_soft_fragment.xml | 174 +++++++++++++++++- .../src/m1/res/values/color.xml | 4 +- .../src/m1/res/values/strings.xml | 15 ++ 12 files changed, 226 insertions(+), 6 deletions(-) create mode 100644 OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_pattern_selected.png create mode 100644 OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_switch_selected.png create mode 100644 OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_common_bg.xml create mode 100644 OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_pattern_selecotr.xml create mode 100644 OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_pattern_select.xml create mode 100644 OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_switch_select.xml create mode 100644 OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_switch_selector.xml create mode 100644 OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_airconditon_pattern_text_color_selector.xml create mode 100644 OCH/mogo-och-bus-passenger/src/m1/res/values/strings.xml diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_pattern_selected.png b/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_pattern_selected.png new file mode 100644 index 0000000000000000000000000000000000000000..fdf60135c9598d4ca33437aeb53ff98bbf67077e GIT binary patch literal 3056 zcmV(P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91JD>vq1ONa40RR91JOBUy0IN-v7XSbYT1iAfRA>e5o4t=5#}UP6W|wlp zgfJ8_CX^X+q{yTJIajE}i338gL;oj=41s||gQ0Q>FzLvV9XV0VNHCZvBDp(yzt{D8 zdzX7Bk|qotkBytDuUFMoUERHV{FtXR0IcY4^`}s?c)_o@nZN=Sk zed1>>qiLPKLH|yVdHUVbZryjfOczI;+QxjmT!*pVRk8E!>rg6nE?40T!`o;Eb^11b z8^NwZjQ7P}g)Y5Gj_*7BCaZQ8e6CezxBp8=^sC_ib@X4+-f-6Uon_(Pde^Eg=}wQ| znV)Xgt3VU~T(s-g*_9=`Y)P_A!dwbFUHVJF-P9RP@*4hzp5o7hAm&_iT(8c0amLlH zE@m~-)JtjnLoWqiV!X)zOa~1;gZC~Srw}IYulLb&CioclmH5p3Ic6xi9wa{^_(>%=6(s)TB^?35* z-_RHPjP{FsGS^_Yir1i{hA!?aaC}3h-kJv)WoY?y{Uw+=HhfS0dlm_J0UZ}C5PbEl z=VGGEyx=p>3AX1ZNZZB(z$~xmik@x{;`g!XT=UDssLvHKz&ktoFy~OnoNfg?Epk(af{uM@k)ioB+>XUpON!DnU*1GBzw`&vuOAg#uR>tJuZkWZP8@+bb~L8 zdDzCb0@pa&J))}9gI`O>;86XYU>7! zP2if3wyYY17J3aOM+Es3iM>s0qAG0)C};RILaoYvbt=J4WHta00rjgK-Zn@1jbdte&bUfkE&EzLO z;SB;S#e$8+sa(K#QH0-e(*c6;GDy^036%}a<{~7gbCwmTXLF^ZtuY;=J;j9G39>v=mAiV^lb*HCPU965V$W68Pv#x>GolP z#A2Nl4@;OIzltmW9S zm6&*V+0Ai^YY$xK3F)}uqN z7<3u9)y893ee<%78NQ*}4FZZZFqA<-!fmrn{lTpmmSyzLk-X8$X+8Vdb@I$bfLegw zVRRaOTMOq5t!*z z{jrRa?j5LvH&B7tvPsxm*fZ!=KDJS`MlUivl$`2uF%mOuBMXujL3W|UD;?Omx|i?2 z6hlm7mFKK#7OLb2EJd>@V8|1l`1Yj&2b7{t2rv_>Wv*2~UlxUNl9-KYe(0P7vB2wL z0+T_O_Ap4U9xKJWYIF+5CxGpWNpRo1$x$*z*hR0!38=#a!uCOwxOng0WMRu~{M7_1H7WRKr_TycZfBJVc3NV|!vFC4cP@hqWUIbCg>ddN}cA-<^$Mx31(g8K3*8-5{BsEaSxkyU6c66>Lzx>NElTQW-v^}hN@yXLjsCg$GTn5C5>SDB zIY?e~&{4Zs>0LxQ}7E`i6Ja;hiscxC*#Yd$(F5X?oz#Pb$U|!ZI ze5rV>BtP;}P!PqE>~Pb%f#}3|2f&ZTi>FYhp$UA>nM-_%_QW;6NW+GaqdNx0Mtj64 zq__A6SxNInffJnV&duvf3VkgIK48;fc4(`6eyqHfha}_+NR*_!qVN<&5GYSAgtI7n zx-C?W*Ujc3?$ezwU;JGG?*ZO$ zMr$&ty9CuGWW6v8U6;-mgo<)9 zW`g8VaTElfg)oM$#}9tMyTJ1Gjfy=OVucsR#{-?7bdUJVMNH2<;yGIQVJ<(heU~lE z{B*n7+_#Pw<5v&#UtQMy*ZL#4TMnLyKVVh`lFTTojekO0>ybJIJyPKb`>+;!u{xtko z7pXly{_A>Yx7j^ViuV?MTj3TntpeDlSz&iTdaowMR?!Z`Y9s5R-fZnQ%keu~*2OAm z7miXRMRMDq%66t;iuE?9Fy!a>>f4v8oS#jPHrvhpfB)gke`0d!EG^_HP{6__rg^R}jPevqMh7!ZFPSvtHZiQBZ5MzR3)BOP?_3Y(10-K5JY yFa?Y5^f{_C{baveAJ6;c;lF-Ae|wmzaX$i)ebGBCLQqZs0000L5yp}4oWySr0Liv_JA#VKxq;1HxmLeb#X z;t(Lf-}m18uJ2#Znlp3G%$}L`%$~i@nY~ZEj+QDp$z2iv06?zxROvYY0IdC6)+8eQ zdqpBJHh(jq=W|sBK;mS{YYRdDmI0doG&Iiq(gpws2B|5@>-zzJ2g{T@&3G^7N}Wfi*h=E5rPC}& ze0?aEKsxAV%Ne%SEeDWF{&_#+MO>$@rMk}ZS`EC1d^Tz{FP>(ow-Pb4g)xy3tqr}^ z7k7C4%Fa@bLz5~>O)wz9_s`&EM|+3J?q1#I$b9GdpTK!0>AIP*#*X?kN!hE>c}y^J z2a-x}#*o@^@@uEYUHW2qTU@&O75TZbnry$dxJ(Oj{q&?A^j~Zt{Jb2h_TO6vUA<;l zVvbqem$@3)nffcf+-hyzw2%!AwhM9+c7aJ&8fd4iVlkEs`PCO4bEc|eGg9OKf!iSj zEsXmrgEX(XkZLGuYh#^W!eSDU-{|dOxtIngn^c%=$ZJoJBWVBB!M<}>D%8wO^$c?I zAIv+mRBQgeLOS4%PY(|Zt`A6&zEv$ZJaYs2*fqZ;V_BJNtb_D*RQuKCzzhD*$LIf( zGwFn&xsHENxt)ACzfJs9)p2xz*?6Jvx6L%mS-`r~c(M7@eh)OIo&4<(^itPrbB|@~ zKWJ)|6ey2@qJ7z5jW-vc=*_S84pxWDZ+?ghT@ASTVYgBHsmPs9IPSofZnil9{9pV@ zhM@aXswh@>gsVdRuf5ZMgIW_))n^A-{T*;qsGYS$g9%r&w$G#gWn^5+t;!c6THspw zvVW}o?8iYPz3Far=i<%yPq?h4k#onCSWRMn0_)O$_&ZqK2Aq-Yv7i^z{C9QRLFo`OlwRe`R&%VuMWx zzP0M_5cLWDm!2=ahz`I}I@GnJCDqrR6M0)QeJfiN%)58982(>;+X-tIzFG*r{dqFF zl!h78!rZnr$le65mXYkW{X0xM=t@dpUec^0)On_$&Y^=72?g{mY3;$$H)lRd{|@%T z*P^YfbJHc3pla;pC}_b*L-oQ3aOXXXi$R^YdXFo7 zyp8|uByR_BL!5Pbz1zPVI_7kiLU#MWZmH+bzVe;|$y_E{5*IvtIq&{Fi~< zY2cnN`kRModa{#9eh7zD>-_)r@n5a|EvfVSMNOK_B@WAeWiX&xY1-9Z_^;$*_#|-e z1-i~AA$f0YTJ6{|8SkvwxA1>hZt-Hydih{2p!s)x6y{GV7aF_GeWoOK*VZM4##UEr4^YI|2H8W@b|w9$<#lkN|CVh|IOsD)Nj*{ zv}9-pm-ngAzZ3+3AvTByY_t)lmI|gh+jY%|kS~u!d{MkSMa-0bCCHf9Aoy@E5{As-RLuRvw)z18k z;ZNtL!8HBk|Cl&n-A1_G*0eM3GR?|(weX+l{Q>R^@typ1;rkP2vI*mj^?)Ww`Lbs+ z_(?gSHaC;LsQR<(<7WrbeTMlR8K1d<_gJq}`d|ZTW zv94&!K&_s2{M3{2X5Auf>33&K51#pnkcds^+=-N|`wS#d?3UkgmR z%iN)zI|6MAHbckn_*c1V!6*lKSc}ICmg=+4K&Q2RlNS-AfheiM)`nBcfriKCXYceC z6U8=B9?7Ohz}EMlHr{ol>WPoocWpEcze~Fq4xfj|z8!c#^E8EF}8NQBa5j($_L&?Fz)-Z{Z=t1U~SQCe^w-&?*%Pzf7`IrX5dC7+&()74f$5_Jql8|=n%zLm=nOA*txg@hW*P`>B z`M#4HKTX@0Y_(T5E3x8Srf-eP$wb2NH+pjY@T;l{7;Wt02HNq|<%3MAIc$eM+N}kH%ukr0<=LDz%@U#aH!xKWWqb zBL2g6l$o?OC}%x3-_K?`Xk5EYq&Om&>zY*qk}Yo^ljJgx@z$Ha{2NvMToi6uQk5n9 zL}T58oCtQ$K03Rk^&MW+r*--+zJgigeb&hYs+5m>9gnnGGJhXUiPpucNgxHr9u17F z3QAoMr3R7Wgcr}Nfr045y3}&B>vSlY*wxZ2la4!d{B6?&_6->lwQ+7#YgV5c9U_2ws}3^#2DJ}{WLfnkzC>utO=SeX_0&oSV^~y81#>);oLV>P zEPUPPi36vqdTsU5v&|y1OK)sVGLA3b62VZjnYNqrMlXjkZJ6iemIK7^$^-6b6)9!s zRmM-OV#GCT6QdGloLj%5qk0NuE!` z^36{P=$gEAMc!1@CDOx*=;iz75BfDDdanE^`NE$MWrJJYigOc=>YT^#c z{uW+r?1ReSjvtaNFlMVmjXV_+mdx8L9aXy?dX#$-kRf~cguQ!el;sj{Atf$w8n*y# z_gXbyHBLNZW9YEnA6Wd!G|O1UX+|prEo4L1c-7k$3>IxD?D!f1tuF6?;8yqSnQdmN zxL7=7UWwTAE%$zzb(SXu%A%~MiHgZY?PVw1V(>{#`s^jFecf#|)D3cjL_#a1AR7k5 zN}dx&^WOg8<3A;V_HB3k=O3GdP(Ga|gX1}kc8W!kVrQ>E8urNdox0SGeEop&Ihq;G zFk2GSLON>rO_eccVf1*jSg6?((tv{1+Y4|nI58D;kJNgzeqXSH{7L5cM}tz{rFI+S zV)Q9irQtG0WLI`xowTjNan?6_9Zrc>bcq?sUiGAAMh@;r)bw>5t(tJt+Vniq>Iiz7 zEj=*C7D%PlV%L~HZDv=U-32oCnPh9VTd$GG%o>dgNv}Cep4iShRg|O zD>heOGaj zcp{9ToqFf&);v0IbS`jd?A_W~Zx-$06O!jz=1ra+_N=tJ4m)J7to@?=lgOESt{C6u z5HpuOZS_`Y%Iy7O>{h5IkxYg9HTRe51JX^==8tmjQJ-j(VZC%eZFE15UMLYTO-m8? z+ue@@@3NQ%kwIh$7ri+a?SE;cnjv`0$4=x$U9^sb(dHiE8>%6F{xXbrYx|X85_du? z)m>0g_sd6(M5%UT?(?~u75f_|hgJqyaY}W#<4%nmwf@8>Yb3Ug=km9iDz$J#q3FNN ziHq2n9WHxAy$`Zs7YiTe?6AzFv$AJYd0qz-UtdvYK*SejaKyS%IV@7GTPWF@`-{)R z)~W1X@|I}&n~dsYaUpB`+|~siQ6uj;6bq52S=JC0Q`42%prnLb6mdD{n042~MyGCm z)Ic(FMPB}e38^fho4~pt_EMG&^3-?8*`PI%FffZn&JbSf$9`Q)?B5f4Psr%ZHGgVjXJN8Tt-6gX zG=ILU#1JFU#_;A~$R!3_g3r*XxF!d1`ok$N&JsE3j2M&&L`%H{P;SadT3H&iTG@cK zKED-tI}E{%Mw~Y1HAEG~VMoB9#Dh~hgxJ~#_@zxmUPh#gS=UwF=Xb9^sQ+EwoN;uY z5B53D5eyrx!sWbxHrX6!a}DIjO6=vVM?N=9<-Rv}H>h}2_(D?3N;-DFaPs2IoEaAm zLdJxTR5JbAN~|Bf#AW6iavh%O-67O zj`;d;EiOL@@L=`nPEGe$EZzGV<6-v702paQN_76N!$lpcy3RA>p%DGfP>bJ)-FfR9 z!g16W5u2cQnWF7s(K;oZVtYrWT-q#5%4NJto#4-oc7rRP*6n0#q;dEK-rCN<=zD%I zK4rfV&O4`B`OQki+}*<~xP3GcMSozG_1Jj+TQ7Ana!Rzb>8aJz%@-7}YRc|c10KTg z9(7$;>{ck4H9MT2QY?lpU1pkH;N0{EC$+Y}#peGCaxlpY5ha_E8z=a#KlHgv@?qT+ zW8`c%vqDXztj01??;38|2MR@p0lC`-aZf4z21IS4|vuO8hX8U1F4 zTd>t{A8$r)-$NF#mPf%;=>=#~W$zHWzZF!c(`spc;s#unyqDYy#AEUfyJyiSkI>II zQHlZLM;4uNblSPUgWLdw%Ng8+Cu)*6xg6G3;(e_Um@wCF+q(rqXP(pn3fusgM!zNp z>{WOdUQi4_uG-PB6S%4~Ruom!#KpClXK~l>LPnEv{Z6+bX<27OfvW6V9)8Q(9)qq~ zLW$GLY%M>^&DgJZEKT3KTi8h3NE^-fQKtKAd55zTBKLw`{}K@%e;L7%yyI1=#`_29 z{T0m5FN0g=Zu3C5sqk&dcO-uTg_u)thq0r(#Cxq`x@HD)Yb_h(rLEkxXQQCcxS0>S z!Wb2IHH4;>4W%ECyb%lu)Vx4^!C%3rk2%TJMn^O`n*HWEud3RY4XEKWRL@0+VoK9f z^D6tQG?RSgjCQ=Gx6Y<)d6JZ$A)MCqZK)~v9+2JlZJ&>_123j9Gtt*}dMY##x{&p8 z03;Z<4((Qutj!j_<|6{lGORZb&0vuq0)%7xGh*>+iqEm*EcSYgE6bNuHWUnDQ}l|; zym7A&230a~r*|hvdlgG?hHzG`uwDVFRg1S_*{3efUba#P{%eMHdKKbAK^#0jR&C@7 zJ98hNg?!VtBC;%rsG&QKHjbE!_hI6`phm5kbfqdDatY&0s+_fIbp}D=BjzQVH^SBl zEw!9O9zy3CT0)){-6JZZ2Jrk`iHdACDzKV|)+4lpR5H*Bk+%goKYtLk%{Yay(>8;?IFds<8P!Ie-GStXZDF|9w|CkF3!Qff+fb4}m zR6|nN@k9EzILLDQXP7cWT56y6;ZZywTsoA1`mvX#ENe;tbsiToghyJT%hOYP9#yUt zvhWk=*u{nsDppc5%hvGpCATq}Kun6}^5Ld8@4e_831^=qiZZ*5`xot4XqC~XJPtI` zsKduJ%iuXUCY#g^1IfEC-`o7qZ_yupE^S`I?nFwQ9<>wxNH~CLhAl~aTo3H_j^$() z!UAfbQCx7M>SJIaiF*V>;oqM!kS+8N2&d|_j`x(hxU(@SNEV(KCKO2AYX@*~N+9T| zIb;rV3HtaJz+6*CT9-T_yVz4D%<PQoJnzNk26_r|Yo7VPg;>FH!(hZM^ zE}`9k0+5hK7K}}+({umLdkYeNN17W1_>?i*=rBO3qh*#Sf}Z~C;P^JT8YUiRK#yy? z0SH0(?oWL)?06W}ja*c>6lE@Cm|W*3cCri8RIJ4fj*^?Xog*tK6->L7bhX5mg_80I z`{gFB6jq{}Z8=S9a^5I~u`HJmqRxcE8>^`i@1yFQ9#+mgT>DWU={fCKIo;RrOP$=h zD<$u-sT}GRqZdePdZ`w;U*kSn)JpDYQ1qaa4gVfz=oy;X#_OaB`e#0h}%ML!|h+gS>4AqJm zeBLF7i2`xo5w3cDd{xf2LRH+B^#$N4)cFy@1X<|kYra89l&XDwCPc&u#@E=KQwPy7rN|bru71H*~YzM5nOEva0R>M znD}Cu6@MkD`m=OXqT@aYt`pw?-cz=baH)fyn|PCxyhcf>y;_c`;41?by(#*d^U>&C zBzE~ZAgq>CEhF2@@e@gBFXe_|FaG?V`=4m}BpU!bkFPDoRJ31{A_e!;AdB>xG*b!s zRc4W*L2NB*t-Q=2|AF4tPtaU=+brAMEJo!c+Xx~@o1z!d9aFcx z|Ga0c3dK2U9TuDF9z(%cR0@d{h;je&Y=+7SwiXe`FiFe=Aw#oEsfbW>%i5)WQEOgE zjSpH;g3K~AwJ37RdaV-z3c zn*>$Tu|0}CrZP^y%Tw8U)DWt;?k*br#A~hZA+FgQUW;{EF-?DkHvMNnqih@|9EmTDT|PR57C%kXUR}> zdoQ3Tl`rw36_w(vJ-;(^c6Ik^TJQXCO%3ph9ZxCl@rX|=F|720HmUa^;fP}SDS?)> zbVnv0PAp~N;s|NYdvh-m z+A=&NqJN=NlcG(gWPeiU>*N(MJ2q6LK97&saxk=2%;UP+o?Ee`Q^Aar7yQ1Da6&7+ z0#RK3;)@)s0WzjgIHA2uVB4eXMRUG75}gwM+F^vX{cd?WUgBat4`M*OFbxLW7Jn6E zZD(r&>KEek^T*TWfit@tRfm=pWt!efT2mm_HTlO)?8q3*v4%Em1A?MxaO zqU2}oZGFw;8f1xW4L$^K`u*cdj74qOUS%C_o~5zwq!KY8Ah%i(4Yy zLhs9u;>#xaCr>t2ZMwl}vkbTJ*>Cv4l;2tyxuB2kM4sR~jBoiRGgG!e2{l6~gRm9(M7-^Qo<`t3$ADLQHstV+tL1xRCNHN5K;oFF zN?92+*Dg+$*iOh;^{ut3UE#`OG7ukxUZHC5`5^B)Viu+qWN%VcfSaI??UcB;rXj%^ zbUE!h%XcBmZ!HYxT`ZeYmU?JH`|EL9$V+iGIyvDmu3erJfuFYgIASW;-I4G_<`zwc z0G*#~xj4Tju)yF-buanh#m6+D_K%06;`9B)h#q8)MIDIxijXlOxrDlw1@{0CkI!Jl zhmw>L6p)s{CX+-kCS4+RD8MXk`7?F4jQc1Y;odgb;DF{1>K1kfrtA5HiR8Yt9e>=r zffM**1OwdX(XJhw>JfW#FN9_L;C04?jint#VVMoB9m_V!(MK283ld8QC6NJtLQy&6x{ofk3Ob z!RJ;Mw;shd9Nb(!e*WqL6`J(nntdoFTR&|Lz6ie%w?ptn#D z&nG}f1`&lkf~9UnWIxQb#i)Iz?LA^f$mrcp#p-o9cT2o6zR<67Pf9LJ2fR+m8x>}J ziX2l4c?0YPrHaM|9iepfH__M$3!a+Aft(VWOW1E$6G2 z#?lbZ2|q_pBS>pjPEKPXnL%7LpVmS9KM?)#tB03Mte09ECRcvZ@DXg@tY7T~k8!Ux zbwBW#pBNbJ@2 z6H_>?Ue|uZNUVsSYPncg%PM1}_&ag1jdYad32B;;TlGcw8!m1pt7v}1!1bk_B05;~ zL7(>*Hj>bI5ytCCC^8BykoZh^&xDH})=M9Tl%uivQ+i5+@V+P0ud*Owi{h540_D~w zE;(jO!X0sBZi9rPUSRug(^17G0qJ>8YT8yN#Ug|OyFg{;Ja*cyr}lo@J;eM5OvB%P ze?7kOeAWVtViE1oSocG;%6cHvI&Fy{J*%w9BoN4_z`oWkht~1jkVVl2<7B|{i=oK# zVN;{C+~(iYP#-Lc5WwZ4L7aG%YI2DcIIIb=pt4tlN_oUgP-x*%ZKIvk(QIBMF*fDm zcSZB<&&Rl~toq&BZhk9yJYC~#{FsF~5rDctO@@(4SsTI55vBOI9oZ<#Cxa*DD>1P-nG z()P+og)>XMBl?|!!0`;wm12@4Ofv+uYiex4{@HN7Z$y(;7&k<`5cwwJ9r-{k=4|OC}VlR3)!JA7}qtY8^DAJl|cM)}J#IykMjUJ8qppIWw;bETL^8TEx zo@fZxm>?1+;HCIxtq&<2HdqCV9fOvy;qj&K7LjuAh43nJk=0qf79g|ofYou=4A`(_z4~1j3U?Ts~@$WWGlj} z(5rLtx7dCpoc9(s$F~^lj^Y0sIf6BJegVEFpycEGs98;7r`!~tF1v-tDbEnfP56Pr zlO+137$Fqb$4Mp&6R>p#L*Kfsfge@lTT=sHe?yX$Zz#Mv5+t-r0O!&~+ciumNgqiO z&P&_WN$`?Y%9EGu1oJNbUMxuhtDFh|xV9-0njr6AxE)4F=Up*w6isr@@Eow0> z6!oRr_^mP_UrHn~`bj8C%r6o(pWNjzRE+1y9&cpa6Vi0Y^xr;X6?f4LJW9v;IYh>Y z7*f0dw#Z@2cQRv(!mu^n*dR*w)=;bddYg_WzOXt@QMRong9Vr8hwxFb7)JCkP0JbTFjoR2egodlId7+|kD(sG#Z*sZr7CxVZ2~94I?( z{kn(UxkBUK>-h1*Zmzkp%~ZQLTd^z4KY>Z)&TnfVgi>HYS-eG?6SycP^F^_Fi}zZF zv(>HbcBs#ym9M(z;sQF4^~%$rv&AScXu@IfqLK02>D$CXPXfN!LHK*ZkuwsmonHVv9Nh&WiqVk*I2hYQ=lgOYO~$Op0OFk6>lX zafRKg9xe(Sh)|#92>2wvEPYFI_|gsBRZCzYfG7DU1Of*F_Fn7wI6W#<`@-HUrdhlo<8W1aQ&o6QpD)y!x`X! zEdHpU!_=r}sz?G6jFPxN2EQOSLa^8RjFHn40a-sAF1E5AcOA!w5IG7#8xG*fb{F5W zmb)Wg91;mLov<+=j@kr zkH#7u|A?QcZWX>eb?8~u{siajk*996u$fREvB%km!PtvI>o%^%((P~YM=ElWS>lA3;3lR5uTv%xl`d}qQv(I#)EU+bm0JDtvfYYmerY@{m(_xtxm(hl@>oo zI5hZazNn;Uo54mzR}#6f5kz=yRQScNAMXjZCNB#}Y<}5uv~9DdijseZXn z`a?%lHV|mq93B2gX#Q}NIDvd^qSx&4!$vZM{OJ55g+dv#<)`HuK5GRD!Kc#wG@TNw zuHo4PhNn_Q^ZBR817`jH3UI-6Wl^fD|*sNX~!_lvN0~G_u6=lYyadi_?k@*wz<*1FOkh-jes!Yyd)|1M3rb6#y**p5g#Hv z!oaz?*Pqk|7F|Q!k%%($=3d~|8Vhw(TSxB8W`7n=BDkrVCWZ!H8XmS9ewRHGYWNda z6mCde1FNf}drV|u;jBVDZW)nsS7M&aC~KVbk<}Ngzkx|BzqA?&>VSCuni$n^3vj!88EUnfK+Ho)3<%JV5R7hq#>0H)-FU;v>k1E{)cY53VGwB-s5t+;dE= zOz9MNnqHk33dFueThv8vvI z_xZc4$}J*9|Cad%H9P~8!ihKYKRz-s$@(IH(8Jw-wRpL`-CrSGP^}z>pP+sWMR<-6p~u;wWdU5*R0eqkWJ&mH?3LG zmd9OHOYo8T<%m4~6h*6EIO(I#&k@T0Fogedue0sM*H3gk7G+izHpAF=)nCEWBMc^_ z2lqT=S-fI9UvFfxB{2?Qd`y;m#0&7AF`EIajq0u;TS>2b&*9wIG zl}>lw3*#810L}Aw<<%A9725Muep*0@9wWUqW;ME8iZV&UmgiDJHMx7TL6;F_owEQafL`vmNB(ja9N zZzJN#gTH$S7~01&gJfYDN+IZN#d5}#qJ5Zneb<3$ZkNEM*fJ-p5N#q5YIBa%D%i%} zXI#UYG6sFme4AwJa>1+L`IED=SPpWg(mXOcPuE{>)rUb=FEzxjzFZ6qI+=P2lbwHm zEo49KnH|MjsagP)_1c{t{2Qoy5I8;2UxPNXLR*Z$GEdz(f)Rk2OB1X`*8xPw2EAb)4iU=BO0=B1Sqzs`E_r;_?C}GMlUC1@q}sT5_GkTMegZBED|)u9acX* z>BWSDpAg9|C9{(;=v5bmXWq&(daRU)DmcF`AvL@Xd0X$_CfZ!>~~n112Snbioq? zHTHtWYgBJ0td>!uC~(NY#;(G@%o5W7I))s~$K@hAWF4^a7{GuU37~!NeE+i{ zfULAU?PdAggz&|#M6@9PF)e3dy14rz74$Di=jMbWdv-(aimoPa{$0*?k;LNlR_cZ? zrzQFKlcx17{gPh=Ws&#q66ad#2~g z*}ofc?Dn%PXx)ps!`ktxFQ6{uB9J{)vGF4nflWy@>$6# z(A2jffm=(isGy~Z%kQ|WjDV7VT!4f>53Z zDJ0HRHvs z>uHA`X`;>}`&m{2c{ar`3P{$52z&QmRz2i1>dvNvYWY literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_common_bg.xml b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_common_bg.xml new file mode 100644 index 0000000000..a723ad1663 --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_common_bg.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_pattern_selecotr.xml b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_pattern_selecotr.xml new file mode 100644 index 0000000000..242dbc5f6f --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_pattern_selecotr.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_pattern_select.xml b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_pattern_select.xml new file mode 100644 index 0000000000..47ccfaaa27 --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_pattern_select.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_switch_select.xml b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_switch_select.xml new file mode 100644 index 0000000000..ad8a4c7b2a --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_switch_select.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_switch_selector.xml b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_switch_selector.xml new file mode 100644 index 0000000000..9f2ff384bf --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_switch_selector.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_airconditon_pattern_text_color_selector.xml b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_airconditon_pattern_text_color_selector.xml new file mode 100644 index 0000000000..6b00e3a3d1 --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_airconditon_pattern_text_color_selector.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_airconditon_text_color_selector.xml b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_airconditon_text_color_selector.xml index 8969eb4381..b76eea00b2 100644 --- a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_airconditon_text_color_selector.xml +++ b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_airconditon_text_color_selector.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_setting_soft_fragment.xml b/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_setting_soft_fragment.xml index edd5905c29..cdfba148c1 100644 --- a/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_setting_soft_fragment.xml +++ b/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_setting_soft_fragment.xml @@ -81,12 +81,180 @@ app:layout_constraintStart_toStartOf="@+id/gl_left" app:layout_constraintTop_toTopOf="parent" /> + + + + + + + + + + + + + + + + + + + + + + + + + android:visibility="visible" + app:constraint_referenced_ids="tv_aircondition_switch,tv_temperature_title,v_temp,tv_aircondition_pattern_title,rg_setting_pattern,tv_aircondition_wind_speed_title,rg_setting_windspeed" /> @@ -252,7 +420,7 @@ android:layout_marginTop="@dimen/dp_24" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:visibility="visible" + android:visibility="gone" app:constraint_referenced_ids="iv_voice,sb_voice_bar,tv_voice_title,iv_end_voice,iv_start_voice,tv_current_voice_value" /> diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/values/color.xml b/OCH/mogo-och-bus-passenger/src/m1/res/values/color.xml index 655e342837..1436db6b27 100644 --- a/OCH/mogo-och-bus-passenger/src/m1/res/values/color.xml +++ b/OCH/mogo-och-bus-passenger/src/m1/res/values/color.xml @@ -3,6 +3,8 @@ #212831 #203555 + #47576E + #374968 - + #CCFFFFFF \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/values/strings.xml b/OCH/mogo-och-bus-passenger/src/m1/res/values/strings.xml new file mode 100644 index 0000000000..516efa7bd3 --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m1/res/values/strings.xml @@ -0,0 +1,15 @@ + + + 制冷 + 制热 + 通风 + 自动 + + 温度 + + 风速 + 低 + 中 + 高 + + \ No newline at end of file