From 25c0061476143add9cd900003b2aa1dfe8035a84 Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 17 Nov 2020 10:44:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.[rm]=20=E5=88=A0=E9=99=A4=E9=87=8D?= =?UTF-8?q?=E5=A4=8D.9=E8=B5=84=E6=BA=90=202.[fix]=20D=E7=B3=BB=E5=88=97?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E9=9D=A2=E6=9D=BF=E6=8C=89=E9=92=AE=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F-=E5=9B=BE=E7=89=87=E8=B5=84=E6=BA=90=E6=9C=AA?= =?UTF-8?q?=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/drawable-xhdpi/v2x_cancel_help.9.png | Bin 3934 -> 0 bytes .../res/layout/module_ext_layout_entrance.xml | 4 ++-- .../drawable-ldpi/module_v2x_shadow_bkg.9.png} | Bin .../module_v2x_shadow_bkg.png} | Bin .../src/main/res/drawable/v2x_cancel_help.9.png | Bin 2460 -> 0 bytes .../drawable-mdpi/v2x_cancel_help_light.9.png | Bin 2802 -> 0 bytes .../drawable-xhdpi/v2x_cancel_help_light.9.png | Bin 4686 -> 0 bytes .../drawable/v2x_cancel_help_light.9.png | Bin 2806 -> 0 bytes 8 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 modules/mogo-module-extensions/src/main/res/drawable-xhdpi/v2x_cancel_help.9.png rename modules/{mogo-module-extensions/src/main/res/drawable-mdpi/v2x_cancel_help.9.png => mogo-module-v2x/src/main/res/drawable-ldpi/module_v2x_shadow_bkg.9.png} (100%) rename modules/mogo-module-v2x/src/main/res/{drawable-ldpi/v2x_cancel_help.9.png => drawable-mdpi/module_v2x_shadow_bkg.png} (100%) delete mode 100644 modules/mogo-module-v2x/src/main/res/drawable/v2x_cancel_help.9.png delete mode 100644 skin/mogo-skin-light/src/main/module-common-res/drawable-mdpi/v2x_cancel_help_light.9.png delete mode 100644 skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/v2x_cancel_help_light.9.png delete mode 100644 skin/mogo-skin-light/src/main/module-common-res/drawable/v2x_cancel_help_light.9.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/v2x_cancel_help.9.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/v2x_cancel_help.9.png deleted file mode 100644 index afdc5519bf8654f4eba16a599d4f7bbe67f3ff55..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3934 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 L=G^nM_=x`k3Wku5 diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml index c69b57da35..22d9faac57 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml @@ -40,7 +40,7 @@ android:id="@+id/module_entrance_id_button1" android:layout_width="@dimen/module_ext_operation_panel_width" android:layout_height="@dimen/module_ext_operation_panel_width" - android:background="@drawable/v2x_cancel_help" + android:background="@drawable/module_ext_shadow_bkg" android:gravity="center" android:padding="0dp" android:text="前方\n实况" @@ -55,7 +55,7 @@ android:layout_width="@dimen/module_ext_operation_panel_width" android:layout_height="@dimen/module_ext_operation_panel_width" android:layout_marginTop="@dimen/module_entrance_id_button_marginTop" - android:background="@drawable/v2x_cancel_help" + android:background="@drawable/module_ext_shadow_bkg" android:gravity="center" android:padding="0dp" android:text="取消\n求助" diff --git a/modules/mogo-module-extensions/src/main/res/drawable-mdpi/v2x_cancel_help.9.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/module_v2x_shadow_bkg.9.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-mdpi/v2x_cancel_help.9.png rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/module_v2x_shadow_bkg.9.png diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_cancel_help.9.png b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/module_v2x_shadow_bkg.png similarity index 100% rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_cancel_help.9.png rename to modules/mogo-module-v2x/src/main/res/drawable-mdpi/module_v2x_shadow_bkg.png diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_cancel_help.9.png b/modules/mogo-module-v2x/src/main/res/drawable/v2x_cancel_help.9.png deleted file mode 100644 index e73d76936fb2cbb1cac1aef6225df8a4dfad0202..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2460 zcmV;N31jw&P)^CUV0*?tQtvX)u~Q(s#Bex_be8R-)ptu zVXZ#A-mVY7iMSK-xKkglwq?|YtDX9L@qVvv6^#RNAE3L|I5c-HlJOynhJDv{#3ON! z@Ewoy_juK4%9yCg{+{GHdwMAUjXxdmQ8a!l z0KO4GKWx|bS6d=9;3{+i6ySO2L@40jBj64AI-)}Zz6RbVVq|Uwe4Hhrq26N)x&i+v zj|utPf*--RienWbAuExLhq!ZcGZ-x1zB=%u(ddl;@2dd$Nr7&F-?yOGF!Q$&@COEP z2>gy=K1{*~6bf*|_>pBi1U+XxW_}hCr~u7)2)YD2R>0H0buy+;&E(|kX!OsUS7W^Z z{nju(55)dDk(>sU9V|gC`=dhwI>-7^A^RKggaCiUu>QyaA2MG9ukQBLiDojpeer6j z)%M?Q)%WkW0q{m@pyaSgfRclmZ>0vy4oX5iGB*TW>phell!O>Ee*$F2Rza-UZkTS9 z5HU$;c22~7B4lZH-|j8`ctO42zu$5g?aRee%yGohFj-=r>u{#-s=QV z*@*!AA?rEzYw5`Vhrk~L;PKt;%zBR z2zVnq@{OmRO#89?G+@I;v%YS&K<^9W2acFfb}aLG=>eM0+_O9p^BeCQu3oZ`^bo+I z?5vZV9Zq(T-gAw2Osas_{0J;sKce}T{SauE{Wx;a6A1pPOu&QJjak|Yn)%$8tJ&{J zk6}D%xDif5o!AWSqBREdJ=t<&y>JybUNr4A`B~qNnMLC!Y`mED5_EIt?{+#r^p^nX z?SQFg2Qc4C4>ReQ5mP6F$PG8`z&Ss{jIUF%7l^mA&1aS3UGwl>HKhu25{ye&8 z*WMD48*8}f5((nB+XH^PZ7>s0JYpK}*t{EL+M$U+(t~6NCjx6fzhKc(6DMNEB*FsU zGzpl0^O=Ar}zAVH7%4J^)76-r+jqhGVZH*G8>au@qV+ucPgusoL^LV;MRd}$M{f!E zRsDQ4-?yo~FkP$pc-)+^jhB!4sx2!(-2N(HgZzBF-5!4j>v`GH%@;CX1Fw_dQ-U_p z&o5v+1s!a;tp3k4&4=vo%KOY`1#GULACnoMYJMxRBWIE1n8s_^f2RKS*aJ4(&xgJa z$9^;GlV%GgN3*_dZr>HK@qRu{gk`;*e889qZY?`F5gro|jGqrTT)_OoSszS18gv!u zSy??`^Zk5w;&GAyfw!!0!6bOCfROzBocS#9P-=4U74W(OQVsq>ychlx5RRYEvmUY^ z0uOaxMn{0}xd(*i=j%yl?oK>i%zhdQe3bx?6%eAI?=D)n;Ud=OjBf+*J820C2+Ge- zm=TjQKXuu!E1;8}`e_XLFM=Vy)9HeL%n9yclQN$;Yp9uStF54T%7a$4Ze zP1D6m@Ld4``uRrlxoHQo-n=vBtGj>UvjW2O^BvaHhO6}-Fkij<7b*#!DhrV!~BoVtwFaEbm3ouLiO{V1q*@>0Pg_Z@Am&Pw^s=Y(a(3bTdMV7 z?Cb*RN%ACkt$+~yd>9Fp9l&}Dykx)M3JBECFJgZNIM#e6Jthev0fS3_2?*8C*W+fw zO+0;9^C9~apA`_QpWk7&TO>I>EI$x@uN4rgpP%HmGTw6C3NWDOz<0}%pwRsMgs~S; z<2BObvcKE+oqz!S{0^9QI!+QS=v~Nu5MC1yqMuJUTW;A(pzNr)ETaO#^z+S4CZ2?{ zp0Gb1d@7>{gy-j@X$Mq61~_0mV7*PmC%+XCqMy%gw@$MK6`+|f@3f2rgy!dKxiOn= z0q~Of8hn+2-A`pyKzM#Wv=`P*JQ?^|NbtQ^K&XDcvuFvh;hayKt_D6!#Am+=2+_}1 z_kglr0)0sUzqITZz^A?w5UQWgHeAhqQUL~d@b;E~>{rCY^Yb0eCu3$xG+zNPqNncV zfBq8CI=&0h&$m9$CA(;u#yh~$qmr<9_1!<%^z4zppC6*1uYpg2^rR4U1Gr9ru7IVy z{rzNF)S6z0=;u?dw~ZE0J30})oc%KTyI1~xv`>CHB1AtQ>OP$HQ6d27ne-_3uXcw^ ze?MC(e}uHzK7I(z&v$10-F1z3Y2W+HhsEMwzn?l0?7s=k&*ziCOO8x{WWT)odrQAR zT`Z6ML28kJr;z-7y4iLC<7LC`A=$|)K!E==7=J0}I|A~XDIxj!DW~@XtovGebOrSH zugdxPdU@o>37VbhZ76;|nsyxd0l;hUcdu?s|EQ0YBKggf5d3^@%;a=G&2<01H0g1q zD4o9(dVas@em=M1Qs6V@FYkN9FE8^EA5;m+>Fp-_`9+e0G+)Thi!q<;3G$mM0@SBX z^z*T~W|u5AZi;C~Hr!YHkQ=QA0rrjja>OS2`Przs#Jaz?eCY4}ee-Ipe{N%zUyf*X zPp{?g=eN@NodEXnSM~GzyPqG^z2%)W)&$$HrM=*N!>vwrs#BfnRHr)CsZMpOQ=RI( a?D-!u4Uim8M1@TN0000fnl6c7#|(S2Mv!JUI@{|_%Ml2{1NoQNPJL~1TrA;@*mI#oFF97 zFX$vB8VwJ&v=K6C(>D%X_o}`W{Br_W}!d7d#=|?h7b5@ z1@eB00}=+s@9;pXmNtk|f{dX9O}rMD)689SD2`{=mY*!dD1D2K_%2D-sUyRR&)O zK;SJRH1J&nIN%)-ihzU(01^@aJ#oMb*p8G<_+A@$iGqBc3L;~fe(&|ij~}0w?9fE? zLqcm9@LBQmrBdlfqVg4b@D&5}l=3z34sb^RttsH?Vb@Xl8h8Nwg#sQ`k6(9ycZwI) zr_`^3rzp~&6^Vd?1V8Uj7z4?OK}cu~0)AWd_wL<0O&{PBrTCQko$3wHH38asQoy6~ zjYtCO?*iSa9oEeZ^%r5a;=!XwkIq0g^g}{xAn>0)efmuT^zRnv0DOuB$%v5USa!3a zNkGf-C_l+kK7tP!P%u>AMFJ_`0bg=KKfAcJwDhe3Na%@x6!>@U+&LrQqv{>lD~bTL zops29j_QR7XFKao`P%OTz`s!7C%WK*<)l=P>USBSi0CNY0WWJwt!0YE2M->+A0VMG z0xZuzaOu*eqsn$xe88jqcsd@h`kmrK9S_jwhql^x01*1CRg%cnyA{?B*qUKLQWx_gPO@ z79jAvN-zPXYPI@P#tI5^-vn6JbMW@<+wZ$>N2%ZJbfDGrs$M#t4Jf>r0jBj}*8_ci zm)|?!E!At^4;5U?^OgF`uyU;3y?ghovXRTOqE;{J=X5$mo2y@01sB10t*1}*ii8c_ z@u2dx>fJ`mRk&1N`6yOLsX2_ywQmXMxXIU|3EYbWpyF3hxmZGfx%-39!8X(6eXHzGwNq zug$bJTE-?zcRO8Oj~Xw8NMOK|&_+vxZ*)6d)`P{?6Z0xwZ*Hki-3;*Qyi7{Gq};hg6o-VYT#2FEz5d5vz;yr@^m|e zz?h+!)$PCrtE=cbpSP?BVx6(`)PbG|I3ON&bX@28)&@&Do}$n5^(IRxJ`41=`Z;!Y zcPm1`oY9W({W&(F^ZcT+oT4#W=<*W(4N z)%018*i8k2XZ7b!z@*RfeVz{;53XoA6#>1Y{@e+OXr5mV`Mp(eE#N6?QUh|epeW|~ zfsUtQ6y8+P)g>Ztxv z5fIHhU$>gtb}$1p@S`9g#(93%Y)5aj4DgYJ#z+W=X`XK=zM7?a2mUBCAewo;)oywS zs3Gtp$$%K=`B-o*;GyejN3+>%1J5f(?iLi?JRjOiQ}qOLO@WUVlpg`H&htGa)IHwc zaKY-&H3MRu=Vx>|sCs8R?!J+C4Ty4{4?EqC-=pmy_y|13R_+-P<2)Y+Yk`iZf#5s) z$-4+gInU4V{5k+$7Xr3m-O8PS*yi~G0vc#NTKNnRA z9i0Ihe5d}rGa$-&en98cMLEycR%6)?0*~q+1p(2`^L;%&b~={z zNEYO7LD9|gvEZt1r=dZ2w!^^7_jX2MK~c@~t?`0K^(pl;_<3hQl=FPwM$57s1fJJX zWI%NDeAnd|>Q8k%U_0BRA|T3nzA<9h_NgC%r~7u~ngKD+^8+1^2EJoI47?*D_Y8<_ zp09x44yb+`l`kah=0-rQ^L(v()oSio%9q$3MFvDS&xc~$ljl3-=T1PZ^ZYEoM*=hv z6uY?-5ZgSzSLMU~E=Jx2L^sdZz&r5q9>I6klRE*V`sEns`MzDQ<@o}>izY>37y?o+ z>)= z_MJa}{vAF!BDQ&cV3TEn&+3;9C@^NdzO-*D>$R0!%`274$Fa@xJ?h6+v#AJZtDm0z zx6%Ri^xDeI7q@aTxq0*E*T{laVw&d%fZtUFG$G2jZr%Do72ugc-kghdfK%y2k|aNi zX`Y|u_hL64@Hqpj)#}d~E5WSqR~P$isJ$P!aN)vxjYi{PEc1M8cN-w!75$!186(yI z_x18_@9XP@(YLN&zy1NAnG(Z1-(xwQRug@n*3WL-xbbzy2-H9D>+7v7n3J~Z#QppC zzfC0kd(!9m868g(*3T9e7QQ3a<9h#r4{-1vVdAWa;^dVpS3V^07bbb0@9Xi=cIf)_ z+O=yRGA3X>Lmgq_J;X=S>WCxZ+_`h7H#axAFt1PIJm2beq}OkEJJg#0f-wN_k0|RI z_z)lOF;9>kZ&Ebz0xE6;RFp3$j(UND#)@F>HfPEy@3 zmEL88BjPxaaZ;3WYE0v8c#aeDYz}y*`h!Cp<~cM8GjL$@AyLB-`G7|yjsY>_6z+4o z=a`pgn*-p7JP`14ZWbe@DWBMA$#ZV*mgE07*qoM6N<$ Eg29=KAOHXW diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/v2x_cancel_help_light.9.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/v2x_cancel_help_light.9.png deleted file mode 100644 index f68dcac5f89b08c08065931eff5ff07a6120928e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4686 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 diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable/v2x_cancel_help_light.9.png b/skin/mogo-skin-light/src/main/module-common-res/drawable/v2x_cancel_help_light.9.png deleted file mode 100644 index 9947fa9c1a6cfa2b3edb125a0f5da7d9600ef969..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2806 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 IM6N<$f^Z;viU0rr From f7b33e0538fa350a8a681cf587d5eadeb0f02af8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 17 Nov 2020 10:55:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86Host=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=20zhidaohulian.com=20=E4=B8=BA=E6=96=B0=E7=9A=84=20zh?= =?UTF-8?q?idaozhixing.com?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roadcondition/constant/HttpConstants.kt | 4 ++-- .../module/authorize/constant/HttpConstant.kt | 8 +++---- .../extensions/net/DztHttpConstant.java | 8 +++---- .../media/constants/BaseUrlConstants.java | 4 ++-- .../module/service/network/RefreshModel.java | 8 +++---- .../module/share/constant/HttpConstant.kt | 21 ++++--------------- .../module/share/net/TrafficModelData.java | 2 +- .../mogo/module/v2x/network/HttpConstant.kt | 8 +++---- 8 files changed, 25 insertions(+), 38 deletions(-) diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/constant/HttpConstants.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/constant/HttpConstants.kt index 4cbd8ca7e4..eac374183f 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/constant/HttpConstants.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/constant/HttpConstants.kt @@ -7,9 +7,9 @@ class HttpConstants { companion object { - const val DEV_BASE_URL_OWNER = "http://dzt-test.zhidaohulian.com/" + const val DEV_BASE_URL_OWNER = "http://dzt-test.zhidaozhixing.com/" const val RELEASE_BASE_URL_OWNER = "http://dzt.zhidaohulian.com/" - const val SHOW_BASE_URL_OWNER = "http://dzt-show.zhidaohulian.com/" + const val SHOW_BASE_URL_OWNER = "http://dzt-show.zhidaozhixing.com/" fun getBaseUrl(): String { return when (DebugConfig.getNetMode()) { diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/constant/HttpConstant.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/constant/HttpConstant.kt index cbd611b68e..9a61c94ec7 100644 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/constant/HttpConstant.kt +++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/constant/HttpConstant.kt @@ -5,10 +5,10 @@ import com.mogo.commons.debug.DebugConfig class HttpConstant { companion object { - const val HOST_DEV = "http://dzt-test.zhidaohulian.com" - const val HOST_TEST = "http://dzt-test.zhidaohulian.com" - const val HOST_DEMO = "http://dzt-show.zhidaohulian.com" - const val HOST_PRODUCT = "https://dzt.zhidaohulian.com" + const val HOST_DEV = "http://dzt-test.zhidaozhixing.com" + const val HOST_TEST = "http://dzt-test.zhidaozhixing.com" + const val HOST_DEMO = "http://dzt-show.zhidaozhixing.com" + const val HOST_PRODUCT = "http://dzt.zhidaozhixing.com" fun getNetHost(): String { return when (DebugConfig.getNetMode()) { diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/DztHttpConstant.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/DztHttpConstant.java index 8e67ea9450..b79998817e 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/DztHttpConstant.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/DztHttpConstant.java @@ -8,10 +8,10 @@ import com.mogo.commons.debug.DebugConfig; * @author tongchenfei */ public class DztHttpConstant { - public static final String HOST_DEV = "http://dzt-test.zhidaohulian.com"; - public static final String HOST_TEST = "http://dzt-test.zhidaohulian.com"; - public static final String HOST_DEMO = "http://dzt-show.zhidaohulian.com"; - public static final String HOST_PRODUCT = "https://dzt.zhidaohulian.com"; + public static final String HOST_DEV = "http://dzt-test.zhidaozhixing.com"; + public static final String HOST_TEST = "http://dzt-test.zhidaozhixing.com"; + public static final String HOST_DEMO = "http://dzt-show.zhidaozhixing.com"; + public static final String HOST_PRODUCT = "http://dzt.zhidaozhixing.com"; public static String getBaseUrl(){ switch ( DebugConfig.getNetMode() ) { diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/constants/BaseUrlConstants.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/constants/BaseUrlConstants.java index b93b485722..42f21c56a1 100644 --- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/constants/BaseUrlConstants.java +++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/constants/BaseUrlConstants.java @@ -2,8 +2,8 @@ package com.mogo.module.media.constants; public interface BaseUrlConstants { String DEV_BASE_URL = "http://dzt-dev.zhidaohulian.com"; - String QA_BASE_URL = "http://dzt-test.zhidaohulian.com"; - String SHOW_BASE_URL = "http://dzt-show.zhidaohulian.com"; + String QA_BASE_URL = "http://dzt-test.zhidaozhixing.com"; + String SHOW_BASE_URL = "http://dzt-show.zhidaozhixing.com"; String RELEASE_BASE_URL = "http://dzt.zhidaohulian.com"; diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java index a5e0c91888..0d5ef1a795 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java @@ -34,10 +34,10 @@ public class RefreshModel { private static final String TAG = "RefreshModel"; - public static final String HOST_DEV = "http://dzt-test.zhidaohulian.com"; - public static final String HOST_TEST = "http://dzt-test.zhidaohulian.com"; - public static final String HOST_DEMO = "http://dzt-show.zhidaohulian.com"; - public static final String HOST_PRODUCT = "https://dzt.zhidaohulian.com"; + public static final String HOST_DEV = "http://dzt-test.zhidaozhixing.com"; + public static final String HOST_TEST = "http://dzt-test.zhidaozhixing.com"; + public static final String HOST_DEMO = "http://dzt-show.zhidaozhixing.com"; + public static final String HOST_PRODUCT = "http://dzt.zhidaozhixing.com"; private final Context mContext; private RefreshApiService mRefreshApiService; diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/HttpConstant.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/HttpConstant.kt index 14604e5d95..497a1dd160 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/HttpConstant.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/HttpConstant.kt @@ -5,14 +5,11 @@ import com.mogo.commons.debug.DebugConfig class HttpConstant { companion object { - const val HOST_DEV = "http://dzt-test.zhidaohulian.com" - const val HOST_TEST = "http://dzt-test.zhidaohulian.com" - const val HOST_DEMO = "http://dzt-show.zhidaohulian.com" - const val HOST_PRODUCT = "https://dzt.zhidaohulian.com" + const val HOST_DEV = "http://dzt-test.zhidaozhixing.com" + const val HOST_TEST = "http://dzt-test.zhidaozhixing.com" + const val HOST_DEMO = "http://dzt-show.zhidaozhixing.com" + const val HOST_PRODUCT = "http://dzt.zhidaozhixing.com" - const val TMC_HOST_TEST="http://dzt-test.zhidaozhixing.com" - const val TMC_HOST_DEMO="http://dzt-show.zhidaozhixing.com" - const val TMC_HOST_PRODUCT="http://dzt.zhidaozhixing.com" @JvmStatic fun getNetHost(): String { @@ -23,16 +20,6 @@ class HttpConstant { else -> HOST_PRODUCT } } - - @JvmStatic - fun getTMCHost(): String { - return when (DebugConfig.getNetMode()) { - DebugConfig.NET_MODE_DEV -> TMC_HOST_TEST - DebugConfig.NET_MODE_QA -> TMC_HOST_TEST - DebugConfig.NET_MODE_DEMO -> TMC_HOST_DEMO - else -> TMC_HOST_PRODUCT - } - } } } \ No newline at end of file diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TrafficModelData.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TrafficModelData.java index 538648e22f..aab4efa8d0 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TrafficModelData.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TrafficModelData.java @@ -29,7 +29,7 @@ public class TrafficModelData { public TrafficModelData() { IMogoNetwork network = (IMogoNetwork) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICES_NETWORK).navigation(getApp().getApplicationContext()); - mTrafficApiService = network.create(TrafficApiService.class, HttpConstant.getTMCHost()); + mTrafficApiService = network.create(TrafficApiService.class, HttpConstant.getNetHost()); } /** diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/HttpConstant.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/HttpConstant.kt index dcc0b492d6..ae8d8350b1 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/HttpConstant.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/HttpConstant.kt @@ -5,10 +5,10 @@ import com.mogo.commons.debug.DebugConfig class HttpConstant { companion object { - const val HOST_DEV = "http://dzt-test.zhidaohulian.com" - const val HOST_TEST = "http://dzt-test.zhidaohulian.com" - const val HOST_DEMO = "http://dzt-show.zhidaohulian.com" - const val HOST_PRODUCT = "https://dzt.zhidaohulian.com" + const val HOST_DEV = "http://dzt-test.zhidaozhixing.com" + const val HOST_TEST = "http://dzt-test.zhidaozhixing.com" + const val HOST_DEMO = "http://dzt-show.zhidaozhixing.com" + const val HOST_PRODUCT = "http://dzt.zhidaozhixing.com" fun getNetHost(): String { return when (DebugConfig.getNetMode()) { From 4a46a497910d3251faddf4678631857bb125446c Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 17 Nov 2020 11:41:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[rm]=20=E5=88=A0=E9=99=A4=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/drawable-ldpi/v2x_shadow_bg.9.png | Bin 588 -> 0 bytes .../main/res/drawable-mdpi/v2x_shadow_bg.9.png | Bin 589 -> 0 bytes .../main/res/drawable-xhdpi/v2x_shadow_bg.9.png | Bin 1156 -> 0 bytes ...dule_v2x_event_panel_fragment_event_panel.xml | 2 +- .../drawable-ldpi/v2x_shadow_bg_light.9.png | Bin 2805 -> 0 bytes .../drawable-mdpi/v2x_shadow_bg_light.9.png | Bin 2803 -> 0 bytes .../drawable-xhdpi/v2x_shadow_bg_light.9.png | Bin 4690 -> 0 bytes 7 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_shadow_bg.9.png delete mode 100644 modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_shadow_bg.9.png delete mode 100644 modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_shadow_bg.9.png delete mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_shadow_bg_light.9.png delete mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_shadow_bg_light.9.png delete mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_shadow_bg_light.9.png diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_shadow_bg.9.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_shadow_bg.9.png deleted file mode 100644 index 11049bacf38b403c032aac4ad4953e4e1a675352..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 588 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>U=sFpaSW-r_4ck|(4hd4)3SLKF7~Pmwecz(0ivGs@kTTMHqv*~wxGf>6PL-)B7`^^(2YoA${)!FwcRXfQvta`}x zOT4{DiZQ_SZtH~d|JGd=U9XrU{+<`lvz;EP$|{gopI&&kl+$R5m%e)wv?j8mPAvFMp z2m^xz80}zXICk~O@4E+<1xwyYNr^nIe46KNc3H;!jZ=FWJS?_ddT`BSx!j$slENjy z{d#75tWTZgdB1Mf#*bfj&(1e~{JL4E;Ks`|af=#x*RUBmnS0nH5Px# diff --git a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_shadow_bg.9.png b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_shadow_bg.9.png deleted file mode 100644 index 3dab9ec629a4a98be2208d74086bff94a0c494c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 589 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>U=s0kaSW-r_4ck|(4hd4)F2N8 zobzEyEKgj&#hWxf)3B{=v#i+-qD7C9cQc+?mnXle`;qI9_~SuSUCYYr1sG1N$N#W*y7ACgWAXW#k zas2;iLZCLot7W?dK7Ffq7jzFSW;p%-=b_wZTC0~Z9D4gcK4z0p+%>6tGfuaq|1VIw zaU;%PjtWbFPpj13p5?xbIZFfTBZPBWoYPJ+T!}Yjm4067#qge~_y3f+LJbb(2EZ_+ z24G@kU;xGk5WQn)C^Y?8XS`vhKJ)Azo!1p9GZ)sr<$G(qZIdVi=kYM9J5n#NG)MR9 z^_9H3c(kqDedpYVcT0`U_SIE?&P}hWoxsW$efJ$x`}@TwxF*X>y=M%YQDdIsU1N60 z{)W)}t;^n6yh`f5n&rRY#M;HKdD8jKp>1~=Bla3bKf9^OpacT1rh4_2Dc3T+{P(9K Tbk_D|Apd!~`njxgN@xNA)lTYR diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_shadow_bg.9.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_shadow_bg.9.png deleted file mode 100644 index 1923804913093a36cb2a568b17887d92b0fe6632..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1156 zcmeAS@N?(olHy`uVBq!ia0vp^eIU%i1|*;VHQ-=iVDa{JaSW-r^>((c-)jev)<_1Y zlsWUyO=fX%bUrFH!Mr)b;hTV_^@FP~gO{J;yOhd&LA`3}{g~q({8~BZZ_Jzh-eY;& zoZp%6{=~$`es#87m(n8O#Gwc$YOiN}smMKJBCS%E==00Ypv>Ik(&4om<(VhT&HW#@ zqTiKGkNf136U$Cy%<@c=oxXNi10vjf)yp&$MGJdUh)}`!%9?x)*RqI##?|P+b z@zl$CVpUGRw*R|af9LA1r$?Tqo}XN8X}eLdFZ=MDhg+ta$7H_Cw6}WOytj3Je}Fz*z#w90ool z8S*$V8xjsMLhVX8pcsS1VU)qf`QX}6tdg+Rj*a>GwHy3Q*D_b;?hsY?%T5@ zvQ+Nq(rpJ1Xx_d$ZNb&8D|20WvKl{o-FS7Nl9%sXN|E`p*q2$sL6;vqnBvc$%@qE) zl$YgI<7Ac3=}gxXSEgn^n6mwZbW{JoZ56?r|9m|t*`MzJu75sWjmrftR_bqk%_DOWlmx%j1@&Zv&GKIvd3cjK`|~}Y&cxk# ze`MqOiBXjrJLL<`xqtc6d+5vG7jySjYHhbKI8`}Ul=aoyJ!elPul(Ee`Ti;A+phwv zKkc~G!u&k@{Nc8p^3sX^)w9YD{Itp~40-?U#M_5ouGm?`f46z6sw7a(@+_m>zsVZnS9}i gsmWLWZT-i1LF<6SjmhqMz|w`m)78&qol`;+0OdXySpWb4 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 03bb4325ce..a5723f4c4c 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 @@ -5,7 +5,7 @@ android:id="@+id/clPanelContainer" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/v2x_shadow_bg" + android:background="@drawable/module_services_online_car_panel_background" android:clickable="true" android:visibility="gone" tools:visibility="visible"> diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_shadow_bg_light.9.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_shadow_bg_light.9.png deleted file mode 100644 index 5ff5526ff8c0031b3dadc765cb194dda29c23b77..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2805 zcmVKMIgK_KxoMrs6u*K3A8-yIm%EFRY{1K8xgp@@>j07?S`Qty3NXQlj z31)$8OGu6qvG9b646-JgFN*2!?&+DPb6@Gc)~Va~y{hi6Htv2?($%XT%kHjo&OP_O zYpLGE#PF~77{t!CbM0I^*Uq(b{j9I&0*jw5=+BRNJaaPAK%eB;C1PsCLjHdHT+fsY z7x0q;gww0N~QAGTCMhXif<@>pjfTf z>npUHSmn=g(ES>&6l)^ZF&d3V9CZKK#OCH^XXX2d)`&kx^!W*`HX?i9Y&PSd`wa~G zn^_BHrSJJ4-G8^Wweo7BF*N8tC&&(Hsg05qWgmtvX20={Cv zX95s-jR*;R7XcP{ON1c603HDe5r7_9;2CU7$_D%`2A-q9pA$i3EYbH~x_9s1G0qN2 zL@y+?2LazGezsI9{hn36Ob@=SfSypk1l|H}37|CrJU#3hDqjK*fIk+%qw4W<2Y9P^ zR((SK5_pOt{j(wwP~b4n`$vNTXGA|FwEF=+R{hPJH;>T|_);i7p?<4+1$0S(w4Ma; zsC*?NkNUenw`zxVBSrm1Shcu)_wL=}kPW?%(C!QT2M->+MS%WO108@*kiZ$?vmDKC z)+GsOIS%DVY05|NAp;7E>bpoFQVhR0|XHrrCZ>6Es3>Ev2gqL?N>b{ z^hAK>`FqZuJv%3CXW0cj+K;2-ajM@c-q-P<-9QFB@%g>%c08VsibocwVf-gHB2noEoFFKT8k_0Hg+YE?Q$}VTcQE0sd7rLBvkL7sn#sT^hVK=URzo>v;fSl740b6t)RrtD0lT@Knk5jv_H{cc!25=4kEQ3kHdwB1Ck=Ry z?P%kLlI-zqDBX?S#2Q6t&1a$nLVvgHS??wv?u4A$(flq9-H0yE9cDgLc z(d`sGV}@c{w*wojuA*ywUb7yEHG`d_4rC%=4|~|$sLu1X4HkDiMVIHxO_or68tAe5 zO>A#(SD1hqr5){wfP>>S&(E^EO=&kR&>9gP@F}VWyFmyr#l!sHpMzsM&o2tgDJr9d zF5j2H8?YJp4gnlBCSX5f*%JX%K)|6fpXZlwqlJCGugw$$B)~W7=L|Rm1WXM?z&OwI z<#<7BHC>j&c2hy%jrwyZVBF{VF3*RK2UoP53WMHJf9?bXG|w;l{9Y@#8t@b~t^v7P zP!RKcPsdYH3U8w5N)mF-fPm)tWyNx|LTjz32L4}T0&2Mv5Yjx~qxwX_)e7%W2ncYV z-;?Ka7SuQc>chx@;O6<#?{P)-gW{_ec#eAR1cWrtPg6cxjZlAmSOf$$&zBo5>GcW` zbyWYb2nc4LFI!D%JD33y_+bzb;yk}=wj(!M3iwDuV<-fKG|yKQUrkfJ1%H?s5X?MZ zYd0MP)DZZgWI%}Xd@Q&c@X+ry9EU|&xiI>RXu@R6X2r-GXa~hZstxvX!Cpz0S&YsseA*zAt5&cLY?QkEXU>f7JM6d zW~u8i;Vj7Af`XgpW5E^OPD6rjZN~u5f7=>{1qC(F*TxGD)hE<%z|T7af}H2OHd>nH zAn;}#Mg{~o&$nHUqW(n31Gdu~76C!d^OX@p)1`g{p6=twH3LGN=X*LH34F(X4DgnO z+%q7wdA=SD!N^L(j#(Q0mK%IDY~Mg{~o&xc~0$@8u9b0;9wd48JT zBLR{KitXG92yLF9RrzqgjgdD2!Oim}@D_Z$NARunJtKgs&SrirvymMtzW{w~CMzRUL=mSdG4$D>D&KFIpY zvWc{p_MJL)>Lqh>L}>GT&n8O+->9E6pkOe|`qIAC*H)TpUa3?*4sD+AP(QYsEkQu6 zetPy#xdY1d+RD@yx0+&d<;s=ckOeJ=G|%?{zby!8L6omvz51Fcz&*XVRjUIgl@3Qy z^rw*K`DuR7cGCghWI(lA{jMlJUf%6|eLXY!!lg@>UNdK=gfP!{SWc(aMBk_N$IF*5ziu!B_4obydMyiPxUD*T z>(;Gzh=l))`#e9T<7vVAwc)`}>OoIij54FZ3Doagzj9v^Lo zu5T}1y!eK}1gvMEBTSr!_;6Ysuq2#3dGgrC#)c`(YvVZ2*Sa0<_2X`bTJygc3;_HC z!g~5X#K(Dzl_0^S+)DSK1GS*d;0Iq6X>5UEG&Fzp3yuj zKl2NW!TuER`ywEXglR4|vycr(SQWpZc$wlAh+mFa;BSAKpXn$+qgDMZV=&$4QHBGZ zq`I3cz0C$o#33N#2rK32h{lWX9EbVYEbvzKdj~kob6^st;K1g6tcC;p1Lrsn0x_c$ z_IKOonB`}i0pJHc&Nklzoq>#LAY_KsGKw(+fKLPHc^&AybENqw9ck_&;W=^8{Ui{A zF*RZ#fB&Qa{dor#Kk1c5#yG|^2fY_E#yNh{tGyF_Me6l`2`YCXsJPiw00000NkvXX Hu0mjfL6>Rh diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_shadow_bg_light.9.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_shadow_bg_light.9.png deleted file mode 100644 index 9954c018dba2b05ee33f333698cf3ab57fa3302c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2803 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