From 4fce69b4befa8b60a35d0dc346279cafa7316507 Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 8 Sep 2020 15:51:56 +0800 Subject: [PATCH 1/3] [add] m4 .9 --- .../res/drawable-ldpi/v2x_shadow_bg.9.png | Bin 2460 -> 2454 bytes .../res/drawable-mdpi/v2x_shadow_bg.9.png | Bin 2460 -> 2459 bytes .../res/drawable-xhdpi/v2x_shadow_bg.9.png | Bin 3936 -> 3927 bytes .../layout/view_event_panel_history_count.xml | 4 ++-- .../src/main/res/values-mdpi/dimens.xml | 3 +-- .../res/values-xhdpi-1920x1000/dimens.xml | 1 - .../src/main/res/values-xhdpi/dimens.xml | 2 +- .../src/main/res/values/dimens.xml | 3 +-- .../drawable-ldpi/v2x_shadow_bg_light.9.png | Bin 0 -> 2778 bytes .../drawable-xhdpi/v2x_shadow_bg_light.9.png | Bin 4657 -> 4650 bytes 10 files changed, 5 insertions(+), 8 deletions(-) create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/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 index a4c313e3539f580612c42321cdfe7a77c7a37284..6ab0b1547c1a7560b9949023f478fe852b89f1bd 100644 GIT binary patch delta 2411 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 z zr=h@C1@QO+LiF?9MGH4v#QL1^F#x}lmQaA8{QQI&F)8y?m;L&ad<7(bzpLn-`+Wf+ z`uTB@>_E-$+Obo!US<_Np9Kii&!^)hm7SPqzA1qB7Z9kQ-|o)Y8NZWjy`FY-*1%^) z_~coF0`&9IxJhIOG9QHiUgpGW0Rr{&(Wr^!1~%SYdU~`7B@`euKfmp4y6Yq-W4#1l zXRiea(a*P=?HL9hG~5_}$c|>e_X33K=Vy)9HeL%n9yclQN$;Yp9uStF54T%7a$4Ze zP1D6i@cjY;^z)78bJGrFy}4)1SGj-T^96+I=R2&Y4OiDd4)Z@bS%YpR=)%7Qh3e-!3l;<&0Nw$*-|hc@X|h)d3enGZwp*(8 zVC?Jy=}Gb;czppO`uQ*tDm#Gn6nM#gzb_zAKfj3m8Q@s+mGqb*hyn~Q{S_coKVOfV z2{-ZdUCoE=Pkg?BQ2qQ4v)v-e>0$YS;Cp=mq5AnrZY$$0*L?v7^c?tZSrQbQpPw-H z0&2WQdR+E*`@Rc*5TKvm0n<*$DS`#P3)v6CYXL&^^XX>GEn5kc9Tk^lynrzMe3Qw< zlTg+Z_NRl-W%PjX{CqU+fLD+K4j2zuZwv9+?+Xag&*!#Vr`duRpqVdoT1Ejv^YgXb zm`%3;c*%SXzAC`(=Q3VEcz!;#7uHQY8TeU9@V&o)Q2l&=XVDU1!#STeT@8Fzh%bH% z5Tc*2@_@2m0)0sUzqITZz^6|vz?-K?P)L40+i*4e$qO*RgS)o^WWORFo}ce%J{dDp zqWKDV5j~Zc|N1LH`}j6QKi~R1m+Yct8t(v0k1E36SARd)B!53YL_c2xp91MgA?OBh zT>$+8mNNT)`^mDXJ-rIi&!<{%8!eu8bRl{<`(^ZZzg~Il0n@_}{d}nVaMnkK0H9~m zqu9UN9WMR-Y^D4W(pG$YADW-<%=o+O8t>BH_m}sJ#Xo*Obt2e*9h#rd7lD@?Spdm? znfrT7zdv0pkNiPuQGmyg{Cv9Eb^+sM!|fs2$zFhe0RM3?{#MR+1mrhULh|!dPVWa; z_qFus7tr7TTF%ec%OgKd(CSQYLhwmT}%P&W?yQf$3_w(E7{8j+_@LK)+{_dBDbZ>bpjWxmcD`_uy-*Br_o$6GlI@PI8 kb*fXH>QtvX&wKs@bRL5#S^fVh00000NkvWtM6N<$g2vwHod5s; 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 index a4c313e3539f580612c42321cdfe7a77c7a37284..2466405ac2034f8577d12c040566da0888b2fc2e 100644 GIT binary patch delta 2380 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 S|0w_f002ovP6b4+LSTZ1<=!j+ 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 index 1de561aa65d4ba931973e4ebc98e31b8b6614d24..b8c97e4a3a1a279798d8bed6929141ec190d3bff 100644 GIT binary patch delta 3724 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 ukWfnhMC diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml index 28ecec3d52..f533855896 100644 --- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml @@ -57,7 +57,7 @@ 16px 17px 15.4px - 80px + 82px 16px 117px 200px @@ -73,7 +73,6 @@ 15px 29px -8px - 65px diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml index 9c31211f00..a32a64e53a 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -56,6 +56,5 @@ 42px 16px 120px - 114px diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml index 30bd6a2d2c..76dee8d2a8 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml @@ -56,7 +56,7 @@ 31.9px 26px 30px - 136px + 140px 219px 400px 281px diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml index 41926f091f..577e034f68 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -57,7 +57,7 @@ 16px 16px 20px - 74px + 82px 16px 117px 200px @@ -73,7 +73,6 @@ 15px 29px -8px - 38px 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 new file mode 100644 index 0000000000000000000000000000000000000000..36ea7d6655132047f87041b3dc3c33b9cf0d8da9 GIT binary patch literal 2778 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 literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_shadow_bg_light.9.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_shadow_bg_light.9.png index e69d3fbacb536b0a648c9df7bb377e52efa1ba65..c351b202508de067d7514f8491c5961addc6263d 100644 GIT binary patch literal 4650 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 bjqMD9=hD@s!A0O75XjZZ!|~?+z@+~H;DD2k literal 4657 zcmXX~c|6nqA0M0L*qlpQ%26#OEtXczEoE)CF>>W5qlK>DmZJ@kyHGJ}iI^itIXdMg zH;rhbxl;NTIf}mI_fg+JKA+Fy^LfAC@7MG7e4UR^9NFeLTpB420)gPxCoFA&XY$4+ z2?g%cYiLOjNMYI9(u~Rwe!Y7-5#hAC_2vj$#Sh9JyU^F=mp0G@m-F*>z*rr!I<(EZ zGrsQ>LnBA-3%EUA(JK+va--SO0*1su(Wc|jMKfi?cwH2#4ss)?;ReWP#6Tbz5f~ZW z6V==e?Xcr_*IX**7yoMD+Sn95zXLO{H~Bq%)n?5}S(h>ImU1s=d`sB;?>CIr>_h4`FKTu#(YE>U-UTMU$7uD`gK+k5wSlo11p;_n;T+$ z_^|eelmhQyy?`d$W5JjKEqgmVyT_BWS4pa6*C$LY*KAgCL0hD+9ZFU`{5Xw#^yMI5shi6+a&j=(SxCt~*=)j?b&kG&su5LXMh}1#CKMVak?Z7VY&72$UuFuX-DUG-AzyYaIb=hwb^9Dl#$CrfB z-W&qYZ>yMr<%$YK_Oq{PU;|wWjFEPxLbkT|u&Ob5ZJ8s7%r1U^TjH|crGJk-gA@62 ztTEQz!Hyzp9wlQQIRMpx={JQ~F<#gAY#o4#M}-k{q@=Y8efma8USL%L4~=`O^GnNl zaLrZkr`1tW$bou!PN~aW)rQxoeox=s9DbXx zt78x^RFt@(fCP~Wol9Qro=u9HrAc8!1WM6XiX--g)QI~UVmnaB3t?v|)opEJwUMxP$O<{0uy99}UjQR25k+}O5 ze3}J5t%69F%rK=k-&_)s&GYub_;`81lBP@x<}F@BsUvRcK5G zs30+)uPB!2kRfTRsLF)2ry+51*%Th?4UaYB2rqAgG*XVn@y)(!-{fm3hxJ43FP@%j zu0&yt#?}a4q$o4WL8$TGj;;$zbCn2A4FB`&>{X}t{aMismd*%d?Lw0kR$Lwey(_1p z9InACSc8oUM9RmQ$bk6NjzbU89@|uD6jPd}i)SOk7XmFHWTVsHd`blsE^NA^cUtK2 z9Y<`mV1v7YL0zxH|8+>%wj5NR+xAX5^fhFnFzyOh^m54JD02Rtl8!XOE>M33Ic)gU zpTpD2Gb^&YJZGpu2I1J_rv4srJ->d=eyD}kM|GXo40i3eGI{2v**Vvv?ctFij`w!` zrh?KMo`}}?Cs1B%asqkf+6^BiPU2fx4jcYd^m z;22jYMYKKozi+NP^_IiC1wN_#1IGBe2}9ehFnOp%gu~s;Oj>2}$cz7#C1sXB6lDn0 zcRiZ!zI)Vt3`e}oM7H;A?e~LadG_;K3Y7D*X$9R;o8(><2?rEoFZ)6^WqDb9mCYS8 z0WA8+P%H`0D+at*@uCQQnJ(<`d!*)>#V}w@I3&z%Ehfe?k+#bMz4Yx3RS9 zmU|Nro0MN(9fwI1Bwou~9z@c+X)@YH$$`sx**fF)6C=~Dsf6Y7zoSUrO9o_5kE|TT zan;s+B3-<+jem|}RpbIDVv43pctoU|m*CkI4Iz*5P}ynPYKNeSNT!C0zw&dvo6@n+ zUpIzJy2?bZ?O5h;d{5;Ds+xjb>`&HzJ{I4|MApt@(x23~Jdqw&f}Gf!tP8RU>Zt#_ zA&p;OXL^YpZ&9hUCwRw;NI=?T0pmz7xH&A|!>EW)gQ#{3mNWSW^j1XumLR2qq=G9* z(d#5HH2_4HKm-(Q7^dlgP^eV!-GkWk+tN`~Cl-KHZUKXGj~akh^3OVN2Gn*7$Y0w;XM{O_l}0_O5AnmE3&x8>?uNH$|oRO=owv-+$5;EW0NwNO+GbM2QqsT$$-t0>bIiKl*BJ!cpquwgmN(+VFT-qY1(zeYc+%> z`7`f|001;zOAbZ}q5J$;8-Dx7X<7WfSqaGr)GbPRG^_0o$65RXNkSAUcZ?z;mQg%5FUd36j)wsU1J}@YnjCn zx$Wu(IH}~c!fKsA(Cddi3Jix}dmYU|d8Hc!7?3Qg_LzG{UMRsh=>R^%bqdHzh=W%G z$?B$s8y^5Rf#z2Tqiz?^)^?&r0eq7dFxH7^ds--90E4qZhr$j}A5~ct{2x@;IWrHR zKywixPx@~dh|Z8+4_Z1a#q9ax1`02R@f*UvFJc2CBY$~8wRAwrL3vWy%*9U>zl~t+ znaB9QH>}oz5tKJxQx-5W5^C=_>gbv9nU5KNh%V4>7oE{!r-U1CfG=Qmgm*8K&QhK~w%x#f8z_i0t*Xqo__Vlj0Q?7B68%~1u%biO zAC7l?q$x5uP_4SHB!1BbSw~4=w#G{s6$vBfrbbq%Yy1r`?`_ZOL!8w#uw9i!5>kAC zX@HfuZBMirmBI)AZS+Pr33_1`9wJIVp=g7s4PEbBln{U}qYd8MH}cq@6Hq|7{U3DK zq;kEv2-KyGzzyQHi0Jv+taM?g>6A5?+hX#u9Z2UtlpHo=bNb}-e#|Bp*G2>32)Kt# zyCICu-_!7+v*43|fav`ME~%D@#2I-ymcPkHS}Sqa&;LQ-87VCWsR5=Da0!%uJj$+Y zaJ`L*yt;rvprhMw#P4)l7ZWX3BDl^aKSKWmt42OwMFyu4+;qt#1BuPE{d^pt<fSO6pHIit_03%b-4npoj>6#Za3Ds2vVuk{GyLj992kSMxvlV#x(^pY{y={fPW|() zV%odtG>{qlODPNLQKajH?UZ;hKtClk3oj}fkN2=0b=P2`o_YPn9xF97=->f>UiN@Sca6YYf=L1l0OqfXV^y~b--A7u=ri>~R$52-% zAju)mQx%{1cHG|5>>qLSZx6CdkCp)M9POA$q7PTsND9+w96U^Rpw!&Or{qX$^7c^s z_tF0XO)r$!GD$0cqGA-Wy3A(_Mf4EYEd5AtPN~+w&9xBX)vN1SIww1UW;;cDtt^pl zRn)WCm38P)TWJ2b?Rka?-u)+8+s+F*aqti6u9e!L^w$J8-X0`Uvyl*Ot zhQz`o8LZ3`UI#`)U6O(J%-Q>7Mkp|0ZbP7*eLVsjc=;+okPCEiy$f|l zDGq9qWN;2K%dqC+@70x{8sS3eIFpQ_zmroxgC&$Wksqm}cmHzV)d_MOKechpSR&w$08H)$v?DUj6;_AiiV znGtRbqPp%Ed9b2VSBWS+mMd`IJMO$W2s=2SkNP#ZMszxt{80%KB)HPFr@8B z@LhG?y<)(I=Y6l~ww&8VU9MyGGZhG}8&aC^H%Lf-*gnQS2Nw?~DC_fXXSSbVJQWZ9YbYrkYN_w5Of_2aCRD1?r}!2B!FYs?WSf3)jk@lL=+|Xu zD(Zs&*|`itg;cg4NIv>RR3$>}*uZ1{!?PxPU!rOxZ=ZXBHoO&=#j}lS*}P+$De5}< z#M3L&PL#pyZQ3#tCson(D3mPk0m$q+=EP~qf)%$p&P7c}XEB0b?=E{aX?3^)M5-a0 z&FQJiVEHIKjp%6sRrK!h;84^g0b`_5rJt7WdsvGThVPFJ;= Date: Tue, 8 Sep 2020 16:46:20 +0800 Subject: [PATCH 2/3] add indicator --- config.gradle | 1 + modules/mogo-module-guide/build.gradle | 1 + .../com/mogo/module/guide/fragment/GuideFragment.kt | 10 ++++++++++ .../mogo/module/guide/guide/GuideStageFiveFragment.kt | 4 ++++ .../mogo/module/guide/guide/GuideStageFourFragment.kt | 4 ++++ .../mogo/module/guide/guide/GuideStageOneFragment.kt | 4 ++++ .../mogo/module/guide/guide/GuideStageThreeFragment.kt | 4 ++++ .../mogo/module/guide/guide/GuideStageTwoFragment.kt | 4 ++++ .../src/main/res/layout/module_guide_fragment.xml | 9 +++++++++ .../mogo-module-guide/src/main/res/values/color.xml | 2 ++ 10 files changed, 43 insertions(+) diff --git a/config.gradle b/config.gradle index 0a9540a611..f69f3e2397 100644 --- a/config.gradle +++ b/config.gradle @@ -84,6 +84,7 @@ targetSdkVersion : 22, // material material : 'com.google.android.material:material:1.1.0', + indicator : 'com.github.zhpanvip:viewpagerindicator:1.0.4', // modules moduletanlu : "com.mogo.module:module-tanlu:${MOGO_MODULE_TANLU_VERSION}", diff --git a/modules/mogo-module-guide/build.gradle b/modules/mogo-module-guide/build.gradle index bc18471261..44fa50b8ed 100644 --- a/modules/mogo-module-guide/build.gradle +++ b/modules/mogo-module-guide/build.gradle @@ -52,6 +52,7 @@ dependencies { implementation rootProject.ext.dependencies.arouter kapt rootProject.ext.dependencies.aroutercompiler implementation rootProject.ext.dependencies.aspectj + implementation rootProject.ext.dependencies.indicator if (Boolean.valueOf(RELEASE)) { implementation rootProject.ext.dependencies.mogoutils diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/fragment/GuideFragment.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/fragment/GuideFragment.kt index b9fbdb5303..bf596646f4 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/fragment/GuideFragment.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/fragment/GuideFragment.kt @@ -1,13 +1,17 @@ package com.mogo.module.guide.fragment +import androidx.recyclerview.widget.RecyclerView import com.mogo.commons.mvp.MvpFragment import com.mogo.commons.voice.IMogoVoiceCmdCallBack import com.mogo.module.guide.GuideBizManager import com.mogo.module.guide.R import com.mogo.module.guide.util.speak import com.mogo.utils.logger.Logger +import com.zhpan.indicator.enums.IndicatorSlideMode +import com.zhpan.indicator.enums.IndicatorStyle import kotlinx.android.synthetic.main.module_guide_fragment.* + class GuideFragment : MvpFragment(), GuideConstract.View { companion object { @@ -28,6 +32,12 @@ class GuideFragment : MvpFragment(), GuideC Logger.d(TAG, "init Views") adapter = GuideAdapter(this) moduleGuideViewPager.adapter = adapter + (moduleGuideViewPager.getChildAt(0) as RecyclerView).layoutManager!!.isItemPrefetchEnabled = false + moduleGuideIndicator.setSliderColor(context!!.resources.getColor(R.color.module_guide_indicator_dark),context!!.resources.getColor(R.color.module_guide_indicator_white)) + .setSliderWidth(context!!.resources.getDimension(R.dimen.dp_11)) + .setSlideMode(IndicatorSlideMode.NORMAL) + .setIndicatorStyle(IndicatorStyle.CIRCLE) + .setupWithViewPager(moduleGuideViewPager) } fun moveToNext() { diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFiveFragment.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFiveFragment.kt index 9b2313a63f..50da098a41 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFiveFragment.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFiveFragment.kt @@ -29,6 +29,10 @@ class GuideStageFiveFragment : MvpFragment>, View.OnClic override fun initViews() { module_guide_page_left.setOnClickListener(this) module_guide_tv_jump.setOnClickListener(this) + } + + override fun onResume() { + super.onResume() speak(context!!,context!!.resources.getString(R.string.module_guide_voice_page_five),object : IMogoVoiceCmdCallBack { override fun onTTSEnd(ttsId: String?, tts: String?) { containerFragment?.closeGuideFragment() diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFourFragment.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFourFragment.kt index 23730d54d6..3af2541b61 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFourFragment.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFourFragment.kt @@ -30,6 +30,10 @@ class GuideStageFourFragment : MvpFragment>, View.OnClic module_guide_page_left.setOnClickListener(this) module_guide_page_right.setOnClickListener(this) module_guide_tv_jump.setOnClickListener(this) + } + + override fun onResume() { + super.onResume() speak(context!!,context!!.resources.getString(R.string.module_guide_voice_page_four),object : IMogoVoiceCmdCallBack { override fun onTTSEnd(ttsId: String?, tts: String?) { containerFragment?.moveToNext() diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageOneFragment.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageOneFragment.kt index 1f92a4ad19..4a288fbb1c 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageOneFragment.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageOneFragment.kt @@ -33,6 +33,10 @@ class GuideStageOneFragment : MvpFragment>, View.OnClick AnalyticsUtil.track(INVOKE_TRACK_SHOW, hashMapOf("pages_num" to 1)) module_guide_page_right.setOnClickListener(this) module_guide_tv_jump.setOnClickListener(this) + } + + override fun onResume() { + super.onResume() speak(context!!,context!!.resources.getString(R.string.module_guide_voice_page_one),object : IMogoVoiceCmdCallBack { override fun onTTSEnd(ttsId: String?, tts: String?) { containerFragment?.moveToNext() diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageThreeFragment.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageThreeFragment.kt index 47c22aa36b..6dc6a4ac4a 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageThreeFragment.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageThreeFragment.kt @@ -30,6 +30,10 @@ class GuideStageThreeFragment : MvpFragment>, View.OnCli module_guide_page_left.setOnClickListener(this) module_guide_page_right.setOnClickListener(this) module_guide_tv_jump.setOnClickListener(this) + } + + override fun onResume() { + super.onResume() speak(context!!,context!!.resources.getString(R.string.module_guide_voice_page_three),object : IMogoVoiceCmdCallBack { override fun onTTSEnd(ttsId: String?, tts: String?) { containerFragment?.moveToNext() diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageTwoFragment.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageTwoFragment.kt index d103ac8ed9..23a59b8afc 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageTwoFragment.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageTwoFragment.kt @@ -30,6 +30,10 @@ class GuideStageTwoFragment : MvpFragment>, View.OnClick module_guide_page_left.setOnClickListener(this) module_guide_page_right.setOnClickListener(this) module_guide_tv_jump.setOnClickListener(this) + } + + override fun onResume() { + super.onResume() speak(context!!,context!!.resources.getString(R.string.module_guide_voice_page_two),object : IMogoVoiceCmdCallBack { override fun onTTSEnd(ttsId: String?, tts: String?) { containerFragment?.moveToNext() diff --git a/modules/mogo-module-guide/src/main/res/layout/module_guide_fragment.xml b/modules/mogo-module-guide/src/main/res/layout/module_guide_fragment.xml index d8c3c419fb..40809dd6ff 100644 --- a/modules/mogo-module-guide/src/main/res/layout/module_guide_fragment.xml +++ b/modules/mogo-module-guide/src/main/res/layout/module_guide_fragment.xml @@ -12,4 +12,13 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + \ No newline at end of file diff --git a/modules/mogo-module-guide/src/main/res/values/color.xml b/modules/mogo-module-guide/src/main/res/values/color.xml index 7ee5cd71b6..1620e6c437 100644 --- a/modules/mogo-module-guide/src/main/res/values/color.xml +++ b/modules/mogo-module-guide/src/main/res/values/color.xml @@ -1,4 +1,6 @@ #3B91FF + #ccffffff + #ffffff \ No newline at end of file From a4b6783fc0988dea0c532db1acdaf5b70084e649 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Tue, 8 Sep 2020 17:23:33 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E4=BA=AB?= =?UTF-8?q?=E6=A1=86=E8=AE=BE=E7=BD=AE=E6=9C=8D=E5=8A=A1=E7=AB=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=94=AF=E6=8C=81=EF=BC=8C=E5=BE=85=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/share/ShareControl.java | 171 ++++++++++-------- .../module/share/adapter/ShareBtnAdapter.kt | 2 +- .../mogo/module/share/bean/FixableButton.kt | 9 +- .../module/share/bean/ShareConfigRequest.kt | 9 + .../module/share/constant/ShareConstants.java | 5 + .../module/share/dialog/FixableShareDialog.kt | 140 -------------- .../share/dialog/GridFixableShareDialog.kt | 8 +- .../module/share/manager/GridBtnManager.kt | 44 +++-- .../mogo/module/share/net/ShareApiService.kt | 9 + .../launcher_dialog_share_with_gride.xml | 37 ---- .../mogo/service/share/IMogoShareManager.java | 3 +- 11 files changed, 169 insertions(+), 268 deletions(-) create mode 100644 modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/ShareConfigRequest.kt delete mode 100644 modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/FixableShareDialog.kt delete mode 100644 modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_with_gride.xml diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java index f9e0479657..b5e29e66bc 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java @@ -3,56 +3,60 @@ package com.mogo.module.share; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; -import android.os.Bundle; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.fragment.app.Fragment; +import android.os.Handler; +import android.os.Message; +import android.util.ArrayMap; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.debug.DebugConfig; +import com.mogo.commons.network.SubscribeImpl; +import com.mogo.commons.network.Utils; import com.mogo.commons.voice.AIAssist; import com.mogo.commons.voice.IMogoVoiceCmdCallBack; -import com.mogo.map.listener.IMogoMapListener; -import com.mogo.map.location.IMogoLocationListener; -import com.mogo.map.marker.IMogoMarkerClickListener; -import com.mogo.map.navi.IMogoNaviListener; +import com.mogo.map.location.MogoLocation; import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant; import com.mogo.module.authorize.authprovider.invoke.AuthorizeInvokerConstant; import com.mogo.module.authorize.authprovider.module.IMogoAcquireAuthorizeListener; import com.mogo.module.authorize.authprovider.module.IMogoAuthorizeModuleManager; import com.mogo.module.common.dialog.BaseFloatDialog; +import com.mogo.module.share.bean.FixableButton; +import com.mogo.module.share.bean.ShareButtonConfigResponse; +import com.mogo.module.share.bean.ShareConfigRequest; import com.mogo.module.share.bean.StepAfterAuth; +import com.mogo.module.share.constant.HttpConstant; import com.mogo.module.share.constant.ShareConstants; -import com.mogo.module.share.dialog.FixableShareDialog; import com.mogo.module.share.dialog.GridFixableShareDialog; -import com.mogo.module.share.dialog.LaucherShareDialog; import com.mogo.module.share.manager.ServiceApisManager; import com.mogo.module.share.manager.UploadHelper; +import com.mogo.module.share.net.ShareApiService; import com.mogo.service.MogoServicePaths; import com.mogo.service.intent.IMogoIntentListener; import com.mogo.service.intent.IMogoIntentManager; -import com.mogo.service.module.IMogoModuleLifecycle; import com.mogo.service.share.IMogoShareManager; import com.mogo.service.statusmanager.IMogoStatusChangedListener; import com.mogo.service.statusmanager.StatusDescriptor; import com.mogo.service.tanlu.IMogoTanluProvider; import com.mogo.service.tanlu.TanluUploadParams; +import com.mogo.utils.NetworkUtils; import com.mogo.utils.TipToast; import com.mogo.utils.logger.Logger; +import com.mogo.utils.network.RequestOptions; +import com.mogo.utils.network.utils.GsonUtil; +import com.mogo.utils.storage.SharedPrefsMgr; import org.jetbrains.annotations.NotNull; import org.json.JSONObject; +import java.util.List; +import java.util.Map; + +import io.reactivex.schedulers.Schedulers; + import static com.mogo.module.share.bean.StepAfterAuthKt.STEP_AFTER_AUTH_TYPE_SEEK_HELP; import static com.mogo.module.share.bean.StepAfterAuthKt.STEP_AFTER_AUTH_TYPE_SHOW_DIALOG; import static com.mogo.module.share.bean.StepAfterAuthKt.STEP_AFTER_AUTH_TYPE_UPLOAD; -import static com.mogo.module.share.constant.ShareConstants.CMD_CANCEL_SHARE; -import static com.mogo.module.share.constant.ShareConstants.CMD_ROAD_CLOSURE; -import static com.mogo.module.share.constant.ShareConstants.CMD_TRAFFIC_CHECK; -import static com.mogo.module.share.constant.ShareConstants.CMD_UPLOAD_ACCIDENT; -import static com.mogo.module.share.constant.ShareConstants.CMD_UPLOAD_BLOCK; +import static com.mogo.module.share.constant.ShareConstants.KEY_SHARE_CONFIG; import static com.mogo.module.share.constant.ShareConstants.UNWAKE_CANCEL_SHARE; import static com.mogo.module.share.constant.ShareConstants.UNWAKE_UPLOAD_ACCIDENT; import static com.mogo.module.share.constant.ShareConstants.UNWAKE_UPLOAD_DENSE_FOG; @@ -65,12 +69,7 @@ import static com.mogo.module.share.constant.ShareConstants.UNWAKE_UPLOAD_ROAD_I import static com.mogo.module.share.constant.ShareConstants.UNWAKE_UPLOAD_SEEK_HELP; import static com.mogo.module.share.constant.ShareConstants.UNWAKE_UPLOAD_STAGNANT_WATER; import static com.mogo.module.share.constant.ShareConstants.UNWAKE_UPLOAD_TRAFFIC_CHECK; -import static com.mogo.module.share.constant.ShareConstants.UPLOAD_DENSE_FOG; import static com.mogo.module.share.constant.ShareConstants.UPLOAD_REAL_TIME_TRAFFIC; -import static com.mogo.module.share.constant.ShareConstants.UPLOAD_ROAD_CONSTRUCTION; -import static com.mogo.module.share.constant.ShareConstants.UPLOAD_ROAD_ICY; -import static com.mogo.module.share.constant.ShareConstants.UPLOAD_SEEK_HELP; -import static com.mogo.module.share.constant.ShareConstants.UPLOAD_STAGNANT_WATER; import static com.mogo.module.share.constant.ShareConstants.VOICE_CMD_GO_TO_SHARE; import static com.mogo.module.share.constant.ShareConstants.VOICE_CMD_NO_REPLY_SHARE_DIALOG_CLOSE; import static com.mogo.module.share.constant.ShareConstants.VOICE_CMD_PUB_ROAD_CONDITION; @@ -94,7 +93,7 @@ import static com.mogo.service.tanlu.IMogoTanluProvider.TYPE_TRAFFIC_CHECK; * @since 2020-01-10 */ @Route(path = MogoServicePaths.PATH_SHARE) -public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMogoVoiceCmdCallBack { +public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMogoVoiceCmdCallBack, Handler.Callback { private static final String TAG = "ShareControl"; private Context mContext; @@ -204,6 +203,20 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo } }); } + + ServiceApisManager.serviceApis.getStatusManagerApi().registerStatusChangedListener(TAG, StatusDescriptor.ACC_STATUS, new IMogoStatusChangedListener() { + @Override + public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) { + if (isTrue) { + queryShareConfigRetryTime = 0; + queryShareButtonConfig(); + } + } + }); + + // 获取分享框配置信息 + queryShareConfigRetryTime = 0; + queryShareButtonConfig(); Logger.d(TAG,"init over===="); } @@ -438,59 +451,73 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo authorizeModuleManager.invokeAuthorization(AuthorizeInvokerConstant.AUTHORIZE_TYPE_LAUNCHER_SHARE); } - @Override - public Fragment createFragment(Context context, Bundle data) { - return null; + private void queryShareButtonConfig(){ + if (NetworkUtils.isConnected(mContext)) { + // 有网，直接请求 + MogoLocation location = ServiceApisManager.serviceApis.getMapServiceApi().getSingletonLocationClient(mContext).getLastKnowLocation(); + Map params = new ArrayMap<>(); + ShareConfigRequest request = new ShareConfigRequest(Utils.getSn(), location.getAdCode()); + params.put("data", request.toJson()); + ServiceApisManager.serviceApis.getNetworkApi().create(ShareApiService.class, + HttpConstant.Companion.getNetHost()).queryShareButtonConfig(params).subscribeOn(Schedulers.io()).observeOn(Schedulers.io()).subscribe(new SubscribeImpl(RequestOptions.create(mContext)) { + @Override + public void onSuccess(ShareButtonConfigResponse o) { + super.onSuccess(o); + String config = ""; + if (o.getDetailMsg() != null) { + List btnList = o.getDetailMsg().getData(); + if(btnList != null&&!btnList.isEmpty()) { + config = GsonUtil.jsonFromObject(o.getDetailMsg().getData()); + Logger.d(TAG, "获取分享框成功：" + config); + }else { + Logger.d(TAG, "获取分享框成功，但是data没有内容"); + } + }else{ + Logger.d(TAG,"获取分享框成功，但是detailMsg没有内容"); + } + Logger.d(TAG, "获取分享框配置成功: " + config); + SharedPrefsMgr.getInstance(mContext).putString(KEY_SHARE_CONFIG, config); + } + + @Override + public void onError(Throwable e) { + super.onError(e); + Logger.d(TAG, "获取分享框配置失败： " + e.getMessage()); + retryQueryShareConfig(); + } + + @Override + public void onError(String message, int code) { + super.onError(message, code); + Logger.d(TAG, "获取分享框配置失败: " + code + ", " + message); + retryQueryShareConfig(); + } + }); + }else{ + // 重试 + retryQueryShareConfig(); + } + queryShareConfigRetryTime++; } - @Override - public View createView(Context context) { - return null; - } - - @NonNull - @Override - public String getModuleName() { - return "ShareControl"; + private static final int MSG_QUERY_SHARE_CONFIG_RETRY = 1001; + private int queryShareConfigRetryTime = 0; + private static final int QUERY_SHARE_CONFIG_RETRY_TIME_THRESHOLD = 10; + private void retryQueryShareConfig(){ + if(queryShareConfigRetryTime > QUERY_SHARE_CONFIG_RETRY_TIME_THRESHOLD){ + // 重试次数超过QUERY_SHARE_CONFIG_RETRY_TIME_THRESHOLD，不再重试 + return; + } + handler.sendEmptyMessageDelayed(MSG_QUERY_SHARE_CONFIG_RETRY, 3000); } + private Handler handler = new Handler(this); @Override - public IMogoModuleLifecycle getCardLifecycle() { - return null; - } - - @Override - public IMogoMapListener getMapListener() { - return null; - } - - @Override - public int getType() { - return 0; - } - - @Override - public IMogoNaviListener getNaviListener() { - return null; - } - - @Override - public IMogoLocationListener getLocationListener() { - return null; - } - - @Override - public IMogoMarkerClickListener getMarkerClickListener() { - return null; - } - - @Override - public String getAppPackage() { - return ""; - } - - @Override - public String getAppName() { - return ""; + public boolean handleMessage(Message msg) { + if (msg.what == MSG_QUERY_SHARE_CONFIG_RETRY) { + queryShareButtonConfig(); + return true; + } + return false; } } diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/adapter/ShareBtnAdapter.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/adapter/ShareBtnAdapter.kt index bb720041a5..a0fa5d68ab 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/adapter/ShareBtnAdapter.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/adapter/ShareBtnAdapter.kt @@ -38,7 +38,7 @@ class ShareBtnAdapter(val context:Context): RecyclerView.Adapter) \ No newline at end of file diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/ShareConfigRequest.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/ShareConfigRequest.kt new file mode 100644 index 0000000000..7eb289d236 --- /dev/null +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/ShareConfigRequest.kt @@ -0,0 +1,9 @@ +package com.mogo.module.share.bean + +import com.mogo.utils.network.utils.GsonUtil + +class ShareConfigRequest(val sn:String,val adCode:String) { + fun toJson():String{ + return GsonUtil.jsonFromObject(this) + } +} \ No newline at end of file diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/ShareConstants.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/ShareConstants.java index 580a25a8f4..e55fcb61c9 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/ShareConstants.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/ShareConstants.java @@ -81,4 +81,9 @@ public class ShareConstants { * 这个是实时路况，不是拥堵，拥堵放在了extention模块里面处理 */ public static final String VOICE_CMD_PUB_ROAD_CONDITION = "com.zhidao.pathfinder.report.roadCondition"; + + /** + * 分享框配置本地缓存的key + */ + public static final String KEY_SHARE_CONFIG = "SHARE_BUTTON_CONFIG"; } diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/FixableShareDialog.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/FixableShareDialog.kt deleted file mode 100644 index 0148f6fe3a..0000000000 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/FixableShareDialog.kt +++ /dev/null @@ -1,140 +0,0 @@ -package com.mogo.module.share.dialog - -import android.content.Context -import androidx.recyclerview.widget.GridLayoutManager -import androidx.recyclerview.widget.RecyclerView -import com.alibaba.android.arouter.launcher.ARouter -import com.mogo.commons.debug.DebugConfig -import com.mogo.module.common.dialog.BaseFloatDialog -import com.mogo.module.common.utils.CarSeries -import com.mogo.module.share.R -import com.mogo.module.share.adapter.ShareBtnAdapter -import com.mogo.module.share.bean.FixableButton -import com.mogo.module.share.manager.ISeekHelpListener -import com.mogo.module.share.manager.SeekHelpManager.removeSeekHelpListener -import com.mogo.module.share.manager.UploadHelper.upload -import com.mogo.service.IMogoServiceApis -import com.mogo.service.MogoServicePaths -import com.mogo.service.analytics.IMogoAnalytics -import com.mogo.service.statusmanager.IMogoStatusManager -import com.mogo.service.tanlu.IMogoTanluProvider -import com.mogo.service.tanlu.TanluUploadParams -import com.mogo.utils.logger.Logger -import kotlin.random.Random - - -/** - * 可动态设置内容的Dialog - * 由于和左侧Adas冲突，改成了windowManager方式实现，这种实现方式的问题是，无法监测back键的事件 - * @since 2020-01-10 - * @author tongchenfei - */ -class FixableShareDialog(private val mContext: Context) : BaseFloatDialog(mContext) { - private val isShown = false - private val mAnalytics: IMogoAnalytics - private val mStatusManager: IMogoStatusManager - private val mApis: IMogoServiceApis - private lateinit var btnRecycler: RecyclerView - private lateinit var btnAdapter:ShareBtnAdapter - - private fun setWrapContent() { - val window = window - if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD) { - if (window != null) { - val lp = window.attributes - lp.width = 1024 - lp.height = 600 - window.attributes = lp - } - } else if (CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X) { - if (window != null) { - val lp = window.attributes - lp.width = 1920 - lp.height = 1080 - window.attributes = lp - } - } else { - if (window != null) { - val lp = window.attributes - lp.width = 1024 - lp.height = 600 - window.attributes = lp - } - } - } - - private fun initView() { - Logger.d(TAG, "test-------3") - setContentView(R.layout.launcher_dialog_share_with_gride) - setWrapContent() - - btnRecycler = findViewById(R.id.moduleShareBtnRecyclerView) - val manager = GridLayoutManager(mContext, 5, GridLayoutManager.VERTICAL, false) - manager.isAutoMeasureEnabled = true - btnAdapter = ShareBtnAdapter(mContext) - btnRecycler.adapter = btnAdapter - btnAdapter.btnClickListener = { - Logger.d(TAG, "btn click: $it") - randomGenerateBtn() - } - randomGenerateBtn() - } - - private fun randomGenerateBtn(){ - val random = Random.nextInt(1, 10) - val list = ArrayList() - for (i in 0 until random) { - list.add(FixableButton()) - } - btnAdapter.setFixableButtonList(list) - } - - private val seekListener: ISeekHelpListener = object : ISeekHelpListener { - override fun onSeekHelpSuccess() { - Logger.d(TAG, "上报求助完成，成功") - removeSeekHelpListener(this) - dismiss() - } - - override fun onSeekHelpFail() { - Logger.d(TAG, "上报求助完成，失败") - removeSeekHelpListener(this) - dismiss() - } - } - - /** - * 发送广播 1拥堵，2交通检查，3封路 - */ - private fun sendShareReceiver(type: String) { - val params = TanluUploadParams(type, IMogoTanluProvider.UPLOAD_FROM_USER) - upload(mContext, params, true) - } - - override fun show() { - Logger.d(TAG, "onShow====") - if (!DebugConfig.isLauncher()) { - mApis.adasControllerApi.closeADAS() - } - super.show() - } - - override fun dismiss() { - Logger.d(TAG, "onDismiss=====") - if (!DebugConfig.isLauncher() && mApis.statusManagerApi.isMainPageOnResume) { - mApis.adasControllerApi.showADAS() - } - super.dismiss() - } - - companion object { - private const val TAG = "FixableShareDialog" - } - - init { - mApis = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(mContext) as IMogoServiceApis - mAnalytics = mApis.analyticsApi - mStatusManager = mApis.statusManagerApi - initView() - } -} \ No newline at end of file diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt index fbbef80697..fa3b868954 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt @@ -22,6 +22,11 @@ import com.mogo.service.tanlu.TanluUploadParams import com.mogo.utils.logger.Logger import kotlin.random.Random +/** + * 可动态配置的分享对话框 + * + * @author tongchenfei + */ class GridFixableShareDialog(context:Context):BaseFloatDialog(context) { private val isShown = false private val mAnalytics: IMogoAnalytics @@ -73,8 +78,6 @@ class GridFixableShareDialog(context:Context):BaseFloatDialog(context) { dismiss() } findViewById(R.id.flShareDialogContainer).setOnClickListener { dismiss() } - - gridBtnManager.showDefaultBtns() } private fun randomGenerateBtn(){ @@ -112,6 +115,7 @@ class GridFixableShareDialog(context:Context):BaseFloatDialog(context) { if (!DebugConfig.isLauncher()) { mApis.adasControllerApi.closeADAS() } + gridBtnManager.showShareButton() super.show() } diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/GridBtnManager.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/GridBtnManager.kt index 65dd00d2da..f3c21f45b0 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/GridBtnManager.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/GridBtnManager.kt @@ -3,19 +3,25 @@ package com.mogo.module.share.manager import android.content.Context import android.view.LayoutInflater import android.view.View -import android.view.ViewGroup import android.widget.GridLayout import android.widget.ImageView import android.widget.TextView import com.mogo.module.share.R import com.mogo.module.share.bean.FixableButton +import com.mogo.module.share.constant.ShareConstants import com.mogo.service.tanlu.IMogoTanluProvider import com.mogo.utils.glide.GlideApp +import com.mogo.utils.logger.Logger +import com.mogo.utils.network.utils.GsonUtil +import com.mogo.utils.storage.SharedPrefsMgr /** * 用来管理生成对应的分享按钮 */ -class GridBtnManager(val context: Context, val container: GridLayout) { +class GridBtnManager(val context: Context,private val container: GridLayout) { + companion object{ + const val TAG = "GridBtnManager" + } private val inflater = LayoutInflater.from(context) fun resetContainer() { @@ -32,7 +38,7 @@ class GridBtnManager(val context: Context, val container: GridLayout) { } else { GlideApp.with(context).load(button.iconRes).centerInside().into(img) } - content.text = button.content + content.text = button.title view.setOnClickListener { btnClickListener?.invoke(button) } @@ -40,18 +46,28 @@ class GridBtnManager(val context: Context, val container: GridLayout) { return view } - fun showDefaultBtns() { + fun showShareButton() { resetContainer() - generateShareButton(FixableButton(poiType = IMogoTanluProvider.TYPE_BLOCK, iconRes = R.drawable.share_block_up, content = "拥堵")) - generateShareButton(FixableButton(poiType = IMogoTanluProvider.TYPE_TRAFFIC_CHECK, iconRes = R.drawable.share_traffic_check, content = "交通检查")) - generateShareButton(FixableButton(poiType = IMogoTanluProvider.TYPE_CLOSURE, iconRes = R.drawable.share_road_closure, content = "封路")) - generateShareButton(FixableButton(poiType = IMogoTanluProvider.TYPE_ACCIDENT, iconRes = R.drawable.share_accident, content = "事故")) - generateShareButton(FixableButton(poiType = IMogoTanluProvider.TYPE_ROAD_CONSTRUCTION, iconRes = R.drawable.share_road_construction, content = "道路施工")) - generateShareButton(FixableButton(poiType = IMogoTanluProvider.TYPE_REAL_TIME_TRAFFIC, iconRes = R.drawable.share_real_time_traffic, content = "实时路况")) - generateShareButton(FixableButton(poiType = IMogoTanluProvider.TYPE_SEEK_HELP, iconRes = R.drawable.share_seek_help, content = "故障求助")) - generateShareButton(FixableButton(poiType = IMogoTanluProvider.TYPE_STAGNANT_WATER, iconRes = R.drawable.share_stagnant_water, content = "道路积水")) - generateShareButton(FixableButton(poiType = IMogoTanluProvider.TYPE_ROAD_ICY, iconRes = R.drawable.share_road_icy, content = "道路结冰")) - generateShareButton(FixableButton(poiType = IMogoTanluProvider.TYPE_DENSE_FOG, iconRes = R.drawable.share_dense_fog, content = "浓雾")) + val config = SharedPrefsMgr.getInstance(context).getString(ShareConstants.KEY_SHARE_CONFIG) + Logger.d(TAG, "showDefaultBtns: $config") + if(config.isEmpty()) { + // 默认的全部十个按钮 + generateShareButton(FixableButton(poiType = IMogoTanluProvider.TYPE_BLOCK, iconRes = R.drawable.share_block_up, title = "拥堵")) + generateShareButton(FixableButton(poiType = IMogoTanluProvider.TYPE_TRAFFIC_CHECK, iconRes = R.drawable.share_traffic_check, title = "交通检查")) + generateShareButton(FixableButton(poiType = IMogoTanluProvider.TYPE_CLOSURE, iconRes = R.drawable.share_road_closure, title = "封路")) + generateShareButton(FixableButton(poiType = IMogoTanluProvider.TYPE_ACCIDENT, iconRes = R.drawable.share_accident, title = "事故")) + generateShareButton(FixableButton(poiType = IMogoTanluProvider.TYPE_ROAD_CONSTRUCTION, iconRes = R.drawable.share_road_construction, title = "道路施工")) + generateShareButton(FixableButton(poiType = IMogoTanluProvider.TYPE_REAL_TIME_TRAFFIC, iconRes = R.drawable.share_real_time_traffic, title = "实时路况")) + generateShareButton(FixableButton(poiType = IMogoTanluProvider.TYPE_SEEK_HELP, iconRes = R.drawable.share_seek_help, title = "故障求助")) + generateShareButton(FixableButton(poiType = IMogoTanluProvider.TYPE_STAGNANT_WATER, iconRes = R.drawable.share_stagnant_water, title = "道路积水")) + generateShareButton(FixableButton(poiType = IMogoTanluProvider.TYPE_ROAD_ICY, iconRes = R.drawable.share_road_icy, title = "道路结冰")) + generateShareButton(FixableButton(poiType = IMogoTanluProvider.TYPE_DENSE_FOG, iconRes = R.drawable.share_dense_fog, title = "浓雾")) + }else{ + val btnList = GsonUtil.arrayFromJson(config, FixableButton::class.java) + btnList.forEach {btn-> + generateShareButton(btn) + } + } } private var btnClickListener: ((fixableButton: FixableButton) -> Unit)? = null diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/ShareApiService.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/ShareApiService.kt index a0cf947886..0919a94738 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/ShareApiService.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/ShareApiService.kt @@ -2,7 +2,9 @@ package com.mogo.module.share.net import com.mogo.commons.data.BaseData import com.mogo.module.share.bean.AverateSpeedResponse +import com.mogo.module.share.bean.ShareButtonConfigResponse import io.reactivex.Observable +import io.reactivex.Single import okhttp3.RequestBody import retrofit2.http.* @@ -23,4 +25,11 @@ interface ShareApiService { @Headers("Content-type:application/json;charset=UTF-8") @POST("/deva/car/path/no/poiStrategyCheck/v1") fun sendAverageSpeedForBlockStrategy(@Body request:RequestBody,@Query("sn") sn:String):Observable + + /** + * 获取分享框服务端配置 + */ + @FormUrlEncoded + @POST("/yycp-geoIndex-preSearch-service/car/search/no/searchNearbyInformation/v1") + fun queryShareButtonConfig(@FieldMap param: Map):Observable } \ No newline at end of file diff --git a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_with_gride.xml b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_with_gride.xml deleted file mode 100644 index e98f899a4a..0000000000 --- a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_with_gride.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/share/IMogoShareManager.java b/services/mogo-service-api/src/main/java/com/mogo/service/share/IMogoShareManager.java index f74b14b110..17a29d3455 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/share/IMogoShareManager.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/share/IMogoShareManager.java @@ -2,13 +2,14 @@ package com.mogo.service.share; import android.content.Context; +import com.alibaba.android.arouter.facade.template.IProvider; import com.mogo.service.module.IMogoModuleProvider; /** * 分享框管理接口 * @author tongchenfei */ -public interface IMogoShareManager extends IMogoModuleProvider { +public interface IMogoShareManager extends IProvider { /** * 显示分享框 */