From bfd31516ba3ab4068a89a3f18182de13b03e9b36 Mon Sep 17 00:00:00 2001 From: khy <18814188563@163.com> Date: Mon, 5 Sep 2016 11:14:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=86=E4=BA=AB=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=EF=BC=8C=E4=B8=8B=E8=BD=BD=E5=90=88=E9=9B=86=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/libs/ShareSDK-ShortMessage-2.7.7.jar | Bin 0 -> 8529 bytes app/libs/ShareSDK-Wechat-2.7.7.jar | Bin 0 -> 5396 bytes app/src/main/assets/ShareSDK.xml | 2 +- .../main/java/com/gh/base/BaseActivity.java | 85 +++-- .../com/gh/base/BaseFragmentActivity.java | 80 ++--- .../java/com/gh/common/util/ShareUtils.java | 291 ++++++++++++++++++ .../com/gh/common/view/DownloadDialog.java | 3 + .../themes/classic/PlatformPageAdapter.java | 2 +- .../res/drawable-hdpi/share_cancel_logo.png | Bin 0 -> 4790 bytes .../res/drawable-hdpi/share_copyfont_logo.png | Bin 0 -> 5203 bytes .../main/res/drawable-hdpi/share_qq_logo.png | Bin 0 -> 4187 bytes .../res/drawable-hdpi/share_qzone_logo.png | Bin 0 -> 4857 bytes .../drawable-hdpi/share_shortmessage_logo.png | Bin 0 -> 4038 bytes .../drawable-hdpi/share_sinaweibo_logo.png | Bin 0 -> 5493 bytes .../res/drawable-hdpi/share_wechat_logo.png | Bin 0 -> 4844 bytes .../share_wechatmoments_logo.png | Bin 0 -> 5740 bytes .../main/res/layout/game_download_dialog.xml | 2 +- 17 files changed, 379 insertions(+), 86 deletions(-) create mode 100644 app/libs/ShareSDK-ShortMessage-2.7.7.jar create mode 100644 app/libs/ShareSDK-Wechat-2.7.7.jar create mode 100644 app/src/main/java/com/gh/common/util/ShareUtils.java create mode 100644 app/src/main/res/drawable-hdpi/share_cancel_logo.png create mode 100644 app/src/main/res/drawable-hdpi/share_copyfont_logo.png create mode 100644 app/src/main/res/drawable-hdpi/share_qq_logo.png create mode 100644 app/src/main/res/drawable-hdpi/share_qzone_logo.png create mode 100644 app/src/main/res/drawable-hdpi/share_shortmessage_logo.png create mode 100644 app/src/main/res/drawable-hdpi/share_sinaweibo_logo.png create mode 100644 app/src/main/res/drawable-hdpi/share_wechat_logo.png create mode 100644 app/src/main/res/drawable-hdpi/share_wechatmoments_logo.png diff --git a/app/libs/ShareSDK-ShortMessage-2.7.7.jar b/app/libs/ShareSDK-ShortMessage-2.7.7.jar new file mode 100644 index 0000000000000000000000000000000000000000..380abcd0a6c5fb17049479e5f5491357bed1c77a GIT binary patch literal 8529 zcma)B1yEesw#5ex?g4@{-Vof~f;S%AU7N-sI33(wg9V4+4uK}P6G$LHaCc7v}Fa6QhYC2nPuR@Gj!ci_NoQyLvR1%or#``2?HL zAdY}0!>;Rl)|UYP?k;%DDaClY79B52r4MdT3=>!`IxGT;EG?(g!g^=&7NV*yLL~(X z4S}-X!>6>A=^YFci~v+4jYEJJRiA}2fRBfAVs&Y8XfiT9V@ z_xF)%dvyRcc6_dnn%jq;u_|$jTS6eF)|PY{KUNWB>T2o;`6*5eXhZ=~0;iHA zZr0+3#fv~`us| z6!0Rz4}rhODYOc;3ROPz5JejlR~z{(-_=bRRGO!2{ly@EfrU#wye6CW^N2Dk0l`)E z@mSJSE7<&nJa#S=$|R)qj3_#})7_l(=(DI`6Ec>=8&3g4ew{i~eL-8h*ZAvY&K*qB zGV~+D$gLEZIghwlEHp&$(sC8WX73hHN-x4Bw~xhr%bGh$9@PYuO)9Zh&dBe6ku~Br z|6+M9R=c@HrazAMvUK$BcBPS4Jy65 zt_(6cURDam_dmDGPo=juqim%g_Ix7|931oiQ|X`THa?Fseyl@yZ$&kF#EI04x4@&U zY_CUzS64e{_e6aNWt2JYIV!Mh;ZZxHQhH84S3PyvEboHc-Zx!kO+RufE%~g(qN%Sc zjeB`TUgJ6QLkJ^v++t_~kYj=C?DL#~PETm_{kN~=a7VCim}*UBW#5S@>BPuQcJ#w7 zIGTOrNx}x;^qU~y zK7RHjQk0&`VtQf&H7N+G%o4BR=7kcag)2Wi@->&YGlH_0C&H)6Byp}IbJy^p-|%cC zc!TIDZKM%nIft0|BXH^Co_c4?8}(=~GVw>f%ur(SBGN$5g{21*KR;0(Wx1iGCuChq z4n8*5?3s94xk8gr1dJTe&p;ci#{na$VPNpAf31( zO-IL^QfI*OZ`0)36%a;et8Crbx$Itpeu4ECJq}o6v_hokdr(o4a7(QhEV$|@LdhrP zyRAOZ4kJ}0O~9)3sKJu>I=c2CT>(Mv#?McYOiNM2Fd*_?`FOQ7uUm%LUB`{R!9qvWrh@{pBt&H&7!E$Y1*$m&+d_1Pry4e?)_3&yOrwJimuI>@cvZ{y_ zEl~}G>>=n7TNf@=?;>6;sJ+{dC@+!l{W`U08A&lr-d5KB0*~y`myrJZ11~4HjoR9v z1X?^A-HKQ8HU;McV6B-PPz>G}psg}FTOL#g-Q&-srPf;CT4+vjN`4bik+rt`^(r)U z?y}K%4AZr#uz>cfqrM32C_Jyy2a%#9Oy6RpP2!ltjirVRzr5;vh-*A_xHHq+s*5!| z`T`pp6vk2qq!xWWkzTG}*E(umotZ}q*Ckn}@ELTfg;tk2p%0iT?pKrH*};+q5)6h4 z9@$UI+$8uB<3?ZLh_u`h{VUQ~o4Ub5;_INQOlW63y~VMiTWqXboD(e}Df+P0~o z$8$>sf&rRbTci!y*Srm(Hmz4*5)YsA64!3DXsgwKyR(WfB_zYpmeJM6(4I4P8*MUR zaVE8>GeNts$TtC|LyL)o^DKhWu@-CizZ_rb53uOwRGt zuZ-@U3qTfVtSR+Bj{6MY>Si@z!t~-Ng$rBnG-5524NSuwI7>jUM&rlmGat{DNpS0L zs#uyfJ#Ldsk}#F4ziV7hzLNE3d+So$x!FpiHFQ4nJeRUrz$Y^Xgzs&)nL0|?(OP;M z@6-mlH((zp&uq@+89>e@iE~TyWLeLCqFDe3tS?^=t0C(rIJ9#eXSl^ZOirWG^+bt0 zKO*gAylQc>L~-YxF*v1s`%-9L&lh!a2(HKF@J6pI67zF8<)U~F?q4t|&BRk%<^664mMOpFsx z9S$2fbsZpAFJN^Q5P8i0n`clrXAq8hdWbxgi3~@fNH0|&_p-eCS57*+Ne8hZ$qR>_ z1z+Uj7NmO%-$a}Cfp?!*;mo9|!s((`(9gP@O5P}u+0Pb2yNlZl)c(xCy-H(}2izR>nk5@;<$&%YEVO4tP;7xLMl*b&ZqrYn=N5o-#$2 zi;YCpkKd-8@(I%x_~EX1o!#BylEa-{c=%?EvxiPZ8l3O^<`N-$Vwiox`m8fqB+Mep zFb(`k>wvT?_O<-@btkQF8rWL3h=mZ1ecez*Ewih>Bxq-xGGm8AgrlI{XRYj`R?+yn zIJ3$G#xqagx)Y`61zmNaH)l#qu$!uRIhZtOJ7L9IN7cbt!5_bNZc;{C!?m26Q2AY3 z8hAoxQB+CXsXK_s->tFl+7Nb+`eKIbe%s|yRp@ss526r8;!_=AiHh9Ur zpGz@iWDWYSc)C}*3m937>gRjo;~k9irNcUk<1HGR)Mx_8xEBMB2Y9gq>R)!RlC{BF z=n@0)J@nz)vGQ<52H(Kq6D`iDyaxFMC%>2+$WpS(a`g z_#3rVv;hL*_u+BEyBUl0O0pFQswhNB@Fx~-AiLHg{T?_27u09ZRN zycL-{Ish)`JJ{T39e!E2VefW~pPzv5!e!O`IKy)+OAzNt6Ol_rfx*+yZt#Wo3VkDU z)qFe*J>uNXp*~oSX6MrC3FJ0=UC|U}gPd0)i=6~du6SMK0$X6tj+9GJl&FK` z(fCUuV9&^??|!=;3nr^xe>BJeaQV z)=1O0I!3Bo z+;RfY!Qj?Y)nqT>xG61nqSNp2|6TQcbTZaK!hnNIC5D5e`j=Y7^k)Gw_T1Y~^PvE7 zqUX9E8wm-ehDRYoO`bl`XcA`tA}50I5(DYtp?13?8-R?bT+V{$2+|d^Z8}woV6+sw z#z?)!u%@KRkIF2KTA$ixm)d3<^{Nz!nNG9$k}MKOO>V!$v3~A6&W22gY%fB_+np(e ze2?$o=E5mr5y%K{rF+;3ZY6s12yS(IAn5l6D>dl3IwyR{0Xm_e&;ryNnpCC&Y1|RQ zT1nh(7PBgvIi>>XV2Tn_(>vo)|%~%brJ(YgMj~eK=nrdu-Ygvq}eB zV&;A7iMagEB@JE7Nn35CLC=pD+wz7Rb}DQTT}b91sRn&XN@?nqyebcMw!h)=FI@G! zDTZ2ejJiawa>Fz*yJw$58Mxtn=)7d{1zJ?`AE`5Mt+8Yd4y19b1yb3WQBDZoq|$Gl zSH{ako@gnvJ}EY%?s^>|<7I#!1+Jk_U7=Ra9*8!JwlQOx&|dS+Y=IM->|+*w9f6@c z;mH zgY{($rZPWZg%N1qP%Cc&w$+8a#r)Q5l{UdS23jQM^nFn^X60NZ4$txJGNg^&=4%tO z6iNd6fIPLx^uB$)Sr4ir8ySNf<_MAFEKD|vva0cV-hN#)XmR>$olg*;IL30!r%1>O zrTqmwml-MU$Ojwj1``=u^BJTM(chY8gf05C=XUc!X_Wk+kxV-UYsS*`(>Gd*k7WE# zMMbRo+OcoeLck-a-_qA-ft zU?&Ox)`U{^hSE^i8d_+f?w3W1v9Im8E^XoY==l_Ul%(yB>8ECL#fjCPfF|(PmxGaV zXT`VZnF(7@)M)S(bs1ztmIr(n+Vm4!3nP#<;6*lw=UF6x!SRUS~bXv#7}v1dKV4NG5|pY6?7zX zzA=fE1sJGx()Q8u*Y4CJlzeMN<+eJoO@!r2ppnTOR;J#NfH7TNmH)tf|C~pVfFqHB zWNZ_JWT$lrm2^s!i}U#s5q-tRGIYr?Mo53iA}9Ca$Y~k6+{vU^9@3OB+xDVp))A}f zB377PsQv{*m74sv)P4 zYQtE6tL5A*5TQV(N ziKaa!7pE}`oUx|F=}X2iE=B5$q-g=)#;z+{0k+YvBL__yEG0(}i7*n}dC5)g(Po0v z&15jLMe>9Aag%e?NmZ(cj(IA9hF~sk6Vi6KR1bVh;mfV54z`Ta!w|I)yqM~4=?Xrd zi=cR!)~=}Oz^}NMY&0cHKFDX`lOz%Pf`-D02g$68@u$4hvYAOxf+P^>TU28cFB(rBgyZ;j%Wl#F%np>6XpX!+Rzhue{&BLa{_f1VU%6)zdAW zF5|@Ng;WB%KA~cwl#Z#hD+jczRTYW7{;W2XH+1yb>}8e7*KZ-2pXh9_#rx2qF;Eyh z?eLJ0jOZ8b0;2d$dfKOAuy&{l&CE6m;1tPw;>b#{GaUDslYn!-eS{q+si<5)@+2WA zO{Ygci09^oXk8-xw<;Gmv2N#bM`~MHGBb{Gq)atU^NljD@`08j3XfX~0tN-nUKFQH zIub?Mbc1LOy@dqle1g~b6(#o5PhJ{DXxxWh7zuLlh$gT!q*C%XTB*n+?{=k=^^+=qyF{)z@YXWbt}4{1480^EGZ(A z_BjNF?1--E?J*j~D`zW-itapv9DFItyReoqwe_>DT&Oicg-~ZJY)9qQHRD&=+MxGX zUa530Z-Va`Tx^gW{RJW|b0~LHU^W*lMqx_(&t4V7D!hnv0B=GVXo9w4&)TO}wD4Ml zoBQ1#V}Ai0uM1<1?OzOQco{y5UB8MDxvRs;>fj8zryY1xnLTT~nl_;J%(sY$>8b#K zlQ2bV^yq>`qq$|cW|C&Ww`Qp`or>s7Ji8 zyh)ZZsSGg8I^Oe?pGmal@YRraO4(3$`Fo38z7M$x*5BkNMUk8n>{0EX`x4rE=Jhr{ z4&RiiCYx0YSCmzol3(^sp-GvCwYVY~QZTIaNg_>##I&ICtrL+QzqJ)sSYP*gG%<4% zoX)Z}l`ecln+`$2c!yz=@^NQ~v@lzPZWv%UeV>9BG5h4B7s{7VcElX+=zM~s(cVP9 zH!`V`W6Ydvmo&oG;6~}ju`1wezZa>MDptp^!7$17c$@r_%g>AJMvXqA;`;*(Dt}QTG-X$U}1P@;k5S)I{F~r z04YHdyETYLZOtFe-XShm!TSP}Fe9s9!y|$b_VLKmC&$ABq|2XVDN(4GK~sd@zsscZ zsxgGCc;c9>$Fydjz$g!~PQT9F!tQ`XZ(f`wh+ijXAnPrU6i6h@fX+VRO(3cq$4e_2 zra3<=AdRF%nS9o{#~nFyH}S0-t52QLnm-_ousczJ(0z$ui{_g@B-xH-XtUq@qne5uGa!O{C;iMO6h>!^;P7y2;R42B zA}UnIcV{5VN0lAQHGp{fk4UojA?rqIPKzzz{@^&$G`3q2Hj05H5XpwE^^vE_k;wLi zkg?PFgqU$R;tni3R0!`#p@rR4y0+nzu;XZfL^_|3o zUS(4JowQR_3Qo#G{eFB#%ti%kpD<^au?=mNEO!iOiXtac$~ZEV7r>LSrQKvgt~=(@ z06tSzv!Pmjow54Wt_~8BFELNW$@KW;c4)wvp8S657VCMiOI<}~{ca0QP3u~5#i@l} z^SR#gxJ|WVR&3J|S!kgdZ1P>p(+|?r-svBvYcHYhAKp|oNC?dtmFpz&3ymcC0e3Go zN)9Rna&&Rq_VKH9V&zMh1KzZgQgX7wI$=2Tvq99{X4c4viX4MXQH;^)i{MZx1ghdk zu+!4MbWwReJiyY6+{4X$n} zuDv<+W#-oI(DWI_oHcLNC`+-%ivrTM-`E$$^o8uWG%2PtMSD7=7!n;5+K?6OT|!eR zMrvBKiq{HzH?o3Jp^KI<36?PoG)#C&uXVWafzF5(eKPc};?{=;R#$P)ihd?mGU2OP zjFfT%YUfv)6^e(<1$u{U1qO#q1(H=5glc8oZ!a;Bi%f{HRm zxK&T)y)W^Hn?YRiO$ELfm(Ka|`d?6_EY`#(k29RZ*%GT3WMRbFSSuoWJ8H2VQk`wj zRCY-3ZzgNR!zX#_^Uj@i%aV z4Vh2&PIdqHp2^{UxnK6MXAV*Reb1Qx-u2dU)WB0C@Mnu>c|&iOXqA{Uk1%(&M{Yr? ztIjVNGQYjw*1PvmEwN>YRb(6-N>P2AjI$H;freI0~f~Pblnr|)P%@GoDFKBQjNOTHO zS0e+#q@)H(952ZcoJP`#mxVP+byr0Q>KBt>7%_d?v|y0jj3U{gar zm#0ZLf@RJ&l#kllMxMH-?vc{BCncLUtV_fcNI6=XkT?{=zexMe3MbWJW52k#5=+fE zha5jA$9HYtjX0HRN7@T0bO6^Jfr@H2z>aC@*s7c=_DQMz@we@vn7cv~d5K;D?F(7Xi=T6Z~%J{=xE7vtLc!KX{6Q z?Ei)3?=0TGwEW5Zt2g==v;V_u>~H?y|IY8KEIOvdJOzUwoCTUWWOH@AVuVd(*q6; P^Wo$0AkYNGk6-@-P`|sB literal 0 HcmV?d00001 diff --git a/app/libs/ShareSDK-Wechat-2.7.7.jar b/app/libs/ShareSDK-Wechat-2.7.7.jar new file mode 100644 index 0000000000000000000000000000000000000000..8df0927a8393fc083e1233b2a3940818e25268d9 GIT binary patch literal 5396 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 literal 0 HcmV?d00001 diff --git a/app/src/main/assets/ShareSDK.xml b/app/src/main/assets/ShareSDK.xml index 838ae633fc..9a70009b13 100644 --- a/app/src/main/assets/ShareSDK.xml +++ b/app/src/main/assets/ShareSDK.xml @@ -99,7 +99,7 @@ SortId="4" AppId="wx4868b35061f87885" AppSecret="64020361b8ec4c99936c0e3999a9f249" - BypassApproval="true" + BypassApproval="false" Enable="true" /> { + + @Override + public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + LinearLayout linearLayout = new LinearLayout(context); + linearLayout.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, maxHeight/6 - DisplayUtils.dip2px(context, 5))); + linearLayout.setOrientation(LinearLayout.VERTICAL); + linearLayout.setGravity(Gravity.CENTER); + linearLayout.setBackgroundResource(R.drawable.cardview_item_style); + + ImageView shareLogo = new ImageView(context); + shareLogo.setLayoutParams(new ViewGroup.LayoutParams(DisplayUtils.dip2px(context,45), DisplayUtils.dip2px(context,45))); + + TextView shareLabel = new TextView(context); + LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); + layoutParams.setMargins(0, DisplayUtils.dip2px(context,10), 0, 0); + shareLabel.setLayoutParams(layoutParams); + shareLabel.setGravity(Gravity.CENTER); + shareLabel.setTextColor(Color.parseColor("#3a3a3a")); + shareLabel.setTextSize(13); + + linearLayout.addView(shareLogo); + linearLayout.addView(shareLabel); + + return new ViewHolder(linearLayout); + } + + @Override + public void onBindViewHolder(ViewHolder holder, final int position) { + holder.shareLogo.setImageResource(arrLogo[position]); + holder.shareLabel.setText(arrLabel[position]); + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + switch (position){ + case 0: + wechatSahre(shareUrl, shareTitle, shareIcon); + break; + case 1: + wechatMomentsSahre(shareUrl, shareTitle, shareIcon); + break; + case 2: + qqSahre(shareUrl, shareTitle, shareIcon); + break; + case 3: + qZoneSahre(shareUrl, shareTitle, shareIcon); + break; + case 4: + sinaWeiboSahre(shareUrl, shareTitle, shareIcon); + break; + case 5: + shortMessageSahre(shareUrl, shareTitle, shareIcon); + break; + case 6: + copyFont(shareUrl); + break; + case 7: + popupWindow.dismiss(); + break; + } + } + }); + } + + @Override + public int getItemCount() { + return 8; + } + + public class ViewHolder extends RecyclerView.ViewHolder{ + LinearLayout linearLayout; + TextView shareLabel; + ImageView shareLogo; + + public ViewHolder(View itemView) { + super(itemView); + linearLayout = (LinearLayout) itemView; + shareLogo = (ImageView) linearLayout.getChildAt(0); + shareLabel = (TextView) linearLayout.getChildAt(1); + } + } + } + + //QQ分享 + private void qqSahre(String url, String title, String icon){ + QQ.ShareParams qqParams = new QQ.ShareParams(); + qqParams.setTitle(title); + qqParams.setText(title + " " + url); + qqParams.setImageUrl(icon); + qqParams.setTitleUrl(url); + qqParams.setSite("光环助手"); + sharePlatform(qqParams,QQ.NAME); + } + + //微信好友分享 + private void wechatSahre(String url, String title, String icon){ + Wechat.ShareParams wechatParams = new Wechat.ShareParams(); + wechatParams.setText(title + " " + url); + wechatParams.setImageUrl(icon); + wechatParams.setTitle(title); + wechatParams.setUrl(url); + sharePlatform(wechatParams,Wechat.NAME); + } + + //QQ空间分享 + private void qZoneSahre(String url, String title, String icon){ + QZone.ShareParams qZoneParams = new QZone.ShareParams(); + qZoneParams.setTitle(title); + qZoneParams.setText(title + " " + url); + qZoneParams.setImageUrl(icon); + qZoneParams.setTitleUrl(url); + qZoneParams.setComment("精彩尽在" + url); + qZoneParams.setSite(context.getString(R.string.app_name)); + qZoneParams.setSiteUrl(url); + sharePlatform(qZoneParams,QZone.NAME); + } + + //微信朋友圈分享 + private void wechatMomentsSahre(String url, String title, String icon){ + WechatMoments.ShareParams wechatMomentsParams = new WechatMoments.ShareParams(); + wechatMomentsParams.setText(title + " " + url); + wechatMomentsParams.setTitle(title); + wechatMomentsParams.setImageUrl(icon); + wechatMomentsParams.setUrl(url); + sharePlatform(wechatMomentsParams, WechatMoments.NAME); + } + + //新浪微博分享 + private void sinaWeiboSahre(String url, String title, String icon){ + SinaWeibo.ShareParams sinaWeiboParams = new SinaWeibo.ShareParams(); + sinaWeiboParams.setTitle(title); + sinaWeiboParams.setImageUrl(icon); + sinaWeiboParams.setUrl(url); + sinaWeiboParams.setText(title + " " + url); + sharePlatform(sinaWeiboParams, SinaWeibo.NAME); + } + + //短信分享 + private void shortMessageSahre(String url, String title, String icon){ + ShortMessage.ShareParams shortMessageParams = new ShortMessage.ShareParams(); + shortMessageParams.setText(title + " " + url); + shortMessageParams.setUrl(url); + shortMessageParams.setImageUrl(icon); + sharePlatform(shortMessageParams, ShortMessage.NAME); + } + + //分享平台回调 + private void sharePlatform(Platform.ShareParams params, String name) { + Platform platform = ShareSDK.getPlatform(name); + platform.setPlatformActionListener(new PlatformActionListener() { + @Override + public void onComplete(Platform platform, int i, HashMap hashMap) { + Utils.log("分享成功"); + } + + @Override + public void onError(Platform platform, int i, Throwable throwable) { + Utils.log("分享失败"); + } + + @Override + public void onCancel(Platform platform, int i) { + Utils.log("取消分享"); + } + }); + platform.share(params); + } + + //复制文字链接 + private void copyFont(String copyContent) { + ClipboardManager cmb = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE); + cmb.setText(copyContent); + } +} diff --git a/app/src/main/java/com/gh/common/view/DownloadDialog.java b/app/src/main/java/com/gh/common/view/DownloadDialog.java index 35417b6dc4..80a1e77296 100644 --- a/app/src/main/java/com/gh/common/view/DownloadDialog.java +++ b/app/src/main/java/com/gh/common/view/DownloadDialog.java @@ -110,6 +110,9 @@ public class DownloadDialog { if (position - 1 < adapterMap.size()) { adapterMap.get(position - 1).notifyItemChanged(location % (row * column)); + } + + if (position - 1 < collectionAdapterMap.size()){ if (collectionAdapterMap != null && collectionAdapterMap.size() >= position - 1 && collectionAdapterMap.size() >= 1){ collectionAdapterMap.get(position - 1).notifyItemChanged(location % (row * column)); } diff --git a/app/src/main/java/onekeyshare/themes/classic/PlatformPageAdapter.java b/app/src/main/java/onekeyshare/themes/classic/PlatformPageAdapter.java index 4903f13098..ca3e3510ab 100644 --- a/app/src/main/java/onekeyshare/themes/classic/PlatformPageAdapter.java +++ b/app/src/main/java/onekeyshare/themes/classic/PlatformPageAdapter.java @@ -167,7 +167,7 @@ public abstract class PlatformPageAdapter extends ViewPagerAdapter implements On private void refreshPanel(LinearLayout[] llCells, Object[] logos) { int cellBack = com.mob.tools.utils.R.getBitmapRes(page.getContext(), "ssdk_oks_classic_platform_cell_back"); int disableBack = com.mob.tools.utils.R.getBitmapRes(page.getContext(), "ssdk_oks_classic_platfrom_cell_back_nor"); - for (int i = 0; i < logos.length; i++) { + for (int i = 0; i < 4; i++) { ImageView ivLogo = com.mob.tools.utils.R.forceCast(llCells[i].getChildAt(0)); // TextView tvName = R.forceCast(llCells[i].getChildAt(1)); if (logos[i] == null) { diff --git a/app/src/main/res/drawable-hdpi/share_cancel_logo.png b/app/src/main/res/drawable-hdpi/share_cancel_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..42bffd8c64eb8443b3ec2a00a450802a5a5119a3 GIT binary patch literal 4790 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 WAgej=*Aw*pPm-&X2mU%Xl>L7?8cE&& literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/share_copyfont_logo.png b/app/src/main/res/drawable-hdpi/share_copyfont_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..3c98d52cc2b98a67d0bc9de8288ddbc754460aa5 GIT binary patch literal 5203 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�WEHi* zA)fp4Yc7f>0A(>>f5JPSG~kvvC^;9AO5b2=yZ%D%JVsQxbOc=sP_TB(M!?u%CF%o?riQDdT!^wT;q+|ewmGFoNr!R)T5{y4f~g!{2rASPKzA z>yyJFX)N0CH|>0{(#_lY2UI_8=g!{n$?Il*(_vkObR5ua(X@j>gr{BCwxk^=QtNE1 z&gXyAX>nc!?2PB1DM|g5NW0q;E1&ER0mu;flA~4*s*5B!aAg|8Ncm>A_K8i;Xd z+O%-J?CTNToREbR=z&Kw^PQk$3ngR$V z|79g*C@oC;WwTDm^_4wz=k03r&@TCzNgqp2n+XK8F_W7eTPV3faZ$95;BIQ9O}Ap! zC(cswY3tOFH0(5j_Tsgs?iJ+^KD;7QSU$69Un$W0%~N(ybkBTt;W z9gX+18tt`%O|J+|xSzWbcX?ZpE@-B#@(3357MnY+39z~)UZ4VeWSuqc_WqODm2H)g zxf|SD-0)ZLG}30}@AC7#6^9_GC~Xekc`gu}sxksapRk zwR=s7`MrEx^8@I{ykMGDfdv?Qe#Ih}Pu>x|sA;QGQ6^oETX4(j`Vsod+`^g>B=9hF zK$sdob5YttlKjbhe~R&MOpK7vSm?;|h^@Be>0~|#Kv@`kaWBk~Gt+MyBP@(P|NWfK zSn)#UxC6G~;PKAZm9tH3@vorpB=I`kC*RQU?Ta4GvRB^t&SrqK9GLzH&MSbGx<)4Y zZ15uI8a~{k!4ofZ8rF5%2J@}4IEEora9vRtq9t-6vPTO9e$dkYqkCx#z+Whf#m-cS z75%V#_bxFpIOS;7cje6xK(Q)jOgX(4DEj=BVz0#OE)ad@w8v70`K@lm|=2telfMAgjJ!%S<(a_e&8ii)s|+k(D>N}%N8@6Uusc8(2n zjrPz4aR-hFC{?9ulv$@G0muBtcU{Ux_FtkA;CoL=_pou}lPxnYkPkW^E+2?YV`>q4 z4{zjg6c`sBGnX$vUHLpkl$owJE?J_Qw#XtBLt+p>5%9*&qFKF&t z)Wn{{+Gxe!NiwqM2kNy|n{u#iyFV#xeXiAvaJ^^f7^v7`+6^kotu}4SKW?4|z*!tn z#yzpuhpfpDlK5`LPF;EJK6z(9nuAAXs-|T2N=wJr=hb8mbNoLGdea&Xwdu@7cAD<# z3SFU4cPs$L`5X^>?Dbs^jD?`Qz0Rjs>8gn-S z0NP;O>zL6S_AgiTEx{Ek5Btw3q1OZzhc?eX78KC~*;a+OL#>;}L|@5&Dk0h9)q>tM zY!_2jw{TiRpn~qsR{eSQunyO2wnr|df}SPz-r1lFV@?5Nw3)(@V~-!G3b(r3G2idIRMe#6hhT--MpmV!(O3?2bK8oFZn$!F{^H zXJAU|`32=ShpV3?d=Tw~=@!-LCGa^~_GE(O6!lWeI?I0YtB>xp9pkD44>{fYgm3Y0# z)4KRf`JSw)Go*E)hf}geBrtJyXS?`f#&Mb!et}R_qk$kCSsq2(keGz)vev^SM)9@A%;8t zq1?Bl_Tg=|{^v)Zztm2sUeO&i;X5n8XbJ}`HV8>|c838?*Uu)nUOt=$eMuIy^}mK&pavSvbbK8&u{ z%oMQ`!WBz4=LJd09Rj=2;EtP6rEdc{{n3Mn->#H@#XU@()ETi7Gq^vl={ELKOdit^U%r0;0{UK|xP%O?fIYI&QhV!D znCg4&jJi@}F6%{v(jywp*_KvAV(VtGX5YJau;(W&%X*hKedRv(KBDGI7G54Pi*q9B x9O%lM)c7#a)YcFad0{68+N#BDl>H&)57=et-CmkMJo0lh%J!hWbtTR}?mwaULfilV literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/share_shortmessage_logo.png b/app/src/main/res/drawable-hdpi/share_shortmessage_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..8cf9c55ff2c30207ef3b4cfd4b00607ef54f0f4f GIT binary patch literal 4038 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/share_wechat_logo.png b/app/src/main/res/drawable-hdpi/share_wechat_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..f23f117e97e9f2dd8f8bce8d8eea2266f2c91027 GIT binary patch literal 4844 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/share_wechatmoments_logo.png b/app/src/main/res/drawable-hdpi/share_wechatmoments_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..a7be6424fff068ce986e407c6d675d90e3af2c67 GIT binary patch literal 5740 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 B4DkQ} literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/game_download_dialog.xml b/app/src/main/res/layout/game_download_dialog.xml index 44603ceb5d..c48aded0ff 100644 --- a/app/src/main/res/layout/game_download_dialog.xml +++ b/app/src/main/res/layout/game_download_dialog.xml @@ -48,7 +48,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:background="#F6F6F6" + android:background="#e9e9e9" android:visibility="gone"> Date: Tue, 6 Sep 2016 10:23:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=86=E4=BA=AB=E6=96=87=E6=A1=88?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/gh/base/BaseActivity.java | 64 +++----- .../com/gh/base/BaseFragmentActivity.java | 64 +++----- .../java/com/gh/common/util/ShareUtils.java | 152 +++++++++++++----- .../gh/gamecenter/GameDetailsActivity.java | 2 +- .../gh/gamecenter/NewGameDetailsActivity.java | 2 +- .../java/com/gh/gamecenter/NewsActivity.java | 8 +- 6 files changed, 156 insertions(+), 136 deletions(-) diff --git a/app/src/main/java/com/gh/base/BaseActivity.java b/app/src/main/java/com/gh/base/BaseActivity.java index cbeceb167e..f322f72611 100644 --- a/app/src/main/java/com/gh/base/BaseActivity.java +++ b/app/src/main/java/com/gh/base/BaseActivity.java @@ -31,6 +31,7 @@ import com.gh.gamecenter.manager.SystemBarTintManager; import com.gh.gamecenter.manager.SystemBarTintManager.SystemBarConfig; import java.lang.reflect.Field; +import java.util.ArrayList; import cn.sharesdk.framework.ShareSDK; import de.greenrobot.event.EventBus; @@ -146,53 +147,30 @@ public class BaseActivity extends Activity { window.setAttributes(winParams); } - public void showShare(String url, String title, String icon, String entrance, String type) { + //如果是游戏分享，newsTitle默认为空 + public void showShare(String url, String gameName, String icon, String newsTitle, ArrayList tag, String entrance, String type) { -// if (isShowShare){ -// return; -// } ShareSDK.initSDK(this); - ShareUtils.getInstance(this).showShareWindows(new View(this), url, title, icon); -// OnekeyShare oks = new OnekeyShare(); -// // 关闭sso授权 -// oks.disableSSOWhenAuthorize(); -// -// // 分享时Notification的图标和文字 2.5.9以后的版本不调用此方法 -// // oks.setNotification(R.drawable.ic_launcher, -// // getString(R.string.app_name)); -// // title标题，印象笔记、邮箱、信息、微信、人人网和QQ空间使用 -// oks.setTitle(title); -// // titleUrl是标题的网络链接，仅在人人网和QQ空间使用 -// oks.setTitleUrl(url); -// // text是分享文本，所有平台都需要这个字段 -// oks.setText(title + " " + url); -// // imagePath是图片的本地路径，Linked-In以外的平台都支持此参数 -// // oks.setImagePath(icon);//确保SDcard下面存在此张图片 -// oks.setImageUrl(icon); -// // url仅在微信（包括好友和朋友圈）中使用 -// oks.setUrl(url); -// // comment是我对这条分享的评论，仅在人人网和QQ空间使用 -// oks.setComment("精彩尽在" + url); -// // site是分享此内容的网站名称，仅在QQ空间使用 -// oks.setSite(this.getString(R.string.app_name)); -// // siteUrl是分享此内容的网站地址，仅在QQ空间使用 -// oks.setSiteUrl(url); -// -// oks.setOnFinishListener(new PlatformPage.OnFinishListener() { -// @Override -// public void onFinish() { -// Utils.log("onFinish"); -// isShowShare = false; -// } -// }); -// -// // 启动分享GUI -// oks.show(this); - DataUtils.onEvent(this, "内容分享", title); -// isShowShare = true; + + //判断是否是官方版 + boolean isPlugin = false; + if (tag != null){ + for (String s : tag) { + if (!"官方版".equals(s)){ + isPlugin = true; + } + } + } + + ShareUtils.getInstance(this).showShareWindows(new View(this), url, gameName, icon, newsTitle, isPlugin); + + if (newsTitle == null){ + DataUtils.onEvent(this, "内容分享", gameName); + }else { + DataUtils.onEvent(this, "内容分享", newsTitle); + } } -// private boolean isShowShare = false; public void onEventMainThread(final EBShowDialog showDialog) { if (!isPause && this.getClass().getName().equals(RunningUtils.getTopActivity(this))) { diff --git a/app/src/main/java/com/gh/base/BaseFragmentActivity.java b/app/src/main/java/com/gh/base/BaseFragmentActivity.java index 10e4059a35..0247ca6798 100644 --- a/app/src/main/java/com/gh/base/BaseFragmentActivity.java +++ b/app/src/main/java/com/gh/base/BaseFragmentActivity.java @@ -31,6 +31,7 @@ import com.gh.gamecenter.manager.SystemBarTintManager; import com.gh.gamecenter.manager.SystemBarTintManager.SystemBarConfig; import java.lang.reflect.Field; +import java.util.ArrayList; import cn.sharesdk.framework.ShareSDK; import de.greenrobot.event.EventBus; @@ -139,55 +140,30 @@ public class BaseFragmentActivity extends FragmentActivity { window.setAttributes(winParams); } - public void showShare(String url, String title, String icon, String entrance, String type) { - -// if (isShowShare){ -// return; -// } + //如果是游戏分享，newsTitle默认为空 + public void showShare(String url, String gameName, String icon, String newsTitle, ArrayList tag, String entrance, String type) { ShareSDK.initSDK(this); - ShareUtils.getInstance(this).showShareWindows(new View(this), url, title, icon); -// OnekeyShare oks = new OnekeyShare(); -// // 关闭sso授权 -// oks.disableSSOWhenAuthorize(); -// -// // 分享时Notification的图标和文字 2.5.9以后的版本不调用此方法 -// // oks.setNotification(R.drawable.ic_launcher, -// // getString(R.string.app_name)); -// // title标题，印象笔记、邮箱、信息、微信、人人网和QQ空间使用 -// oks.setTitle(title); -// // titleUrl是标题的网络链接，仅在人人网和QQ空间使用 -// oks.setTitleUrl(url); -// // text是分享文本，所有平台都需要这个字段 -// oks.setText(title + " " + url); -// // imagePath是图片的本地路径，Linked-In以外的平台都支持此参数 -// // oks.setImagePath(icon);//确保SDcard下面存在此张图片 -// oks.setImageUrl(icon); -// // url仅在微信（包括好友和朋友圈）中使用 -// oks.setUrl(url); -// // comment是我对这条分享的评论，仅在人人网和QQ空间使用 -// oks.setComment("精彩尽在" + url); -// // site是分享此内容的网站名称，仅在QQ空间使用 -// oks.setSite(this.getString(R.string.app_name)); -// // siteUrl是分享此内容的网站地址，仅在QQ空间使用 -// oks.setSiteUrl(url); -// -// oks.setOnFinishListener(new PlatformPage.OnFinishListener() { -// @Override -// public void onFinish() { -// Utils.log("onFinish"); -// isShowShare = false; -// } -// }); - // 启动分享GUI -// oks.show(this); - DataUtils.onEvent(this, "内容分享", title); -// isShowShare = true; + //判断是否是官方版 + boolean isPlugin = false; + if (tag != null){ + for (String s : tag) { + if (!"官方版".equals(s)){ + isPlugin = true; + } + } + } + + ShareUtils.getInstance(this).showShareWindows(new View(this), url, gameName, icon, newsTitle, isPlugin); + + if (newsTitle == null){ + DataUtils.onEvent(this, "内容分享", gameName); + }else { + DataUtils.onEvent(this, "内容分享", newsTitle); + } } -// private boolean isShowShare = false; - public void onEventMainThread(final EBShowDialog showDialog) { if (!isPause && this.getClass().getName().equals(RunningUtils.getTopActivity(this))) { if ("hijack".equals(showDialog.getType())) { diff --git a/app/src/main/java/com/gh/common/util/ShareUtils.java b/app/src/main/java/com/gh/common/util/ShareUtils.java index b47bb0b9e8..1f533d6878 100644 --- a/app/src/main/java/com/gh/common/util/ShareUtils.java +++ b/app/src/main/java/com/gh/common/util/ShareUtils.java @@ -36,8 +36,11 @@ public class ShareUtils { private static ShareUtils instance; private String shareUrl; - private String shareTitle; + private String shareGameName; private String shareIcon; + private String shareNewsTitle; // shareNewsTitle不为空就是新闻分享，否则是游戏分享 + + private boolean isPlugin = false; private int maxHeight; private int[] arrLogo = {R.drawable.share_wechat_logo, R.drawable.share_wechatmoments_logo, R.drawable.share_qq_logo @@ -57,10 +60,12 @@ public class ShareUtils { return instance; } - public void showShareWindows(View view, String url, String title, String icon){ + public void showShareWindows(View view, String url, String gameName, String icon ,String newsTitle, boolean isPlugin){ this.shareIcon = icon; - this.shareTitle = title; + this.shareGameName = gameName; this.shareUrl = url; + this.shareNewsTitle = newsTitle; + this.isPlugin = isPlugin; maxHeight = context.getResources().getDisplayMetrics().heightPixels; @@ -151,25 +156,25 @@ public class ShareUtils { public void onClick(View v) { switch (position){ case 0: - wechatSahre(shareUrl, shareTitle, shareIcon); + wechatSahre(); break; case 1: - wechatMomentsSahre(shareUrl, shareTitle, shareIcon); + wechatMomentsSahre(); break; case 2: - qqSahre(shareUrl, shareTitle, shareIcon); + qqSahre(); break; case 3: - qZoneSahre(shareUrl, shareTitle, shareIcon); + qZoneSahre(); break; case 4: - sinaWeiboSahre(shareUrl, shareTitle, shareIcon); + sinaWeiboSahre(); break; case 5: - shortMessageSahre(shareUrl, shareTitle, shareIcon); + shortMessageSahre(); break; case 6: - copyFont(shareUrl); + copyLink(shareUrl); break; case 7: popupWindow.dismiss(); @@ -199,70 +204,127 @@ public class ShareUtils { } //QQ分享 - private void qqSahre(String url, String title, String icon){ + private void qqSahre(){ QQ.ShareParams qqParams = new QQ.ShareParams(); - qqParams.setTitle(title); - qqParams.setText(title + " " + url); - qqParams.setImageUrl(icon); - qqParams.setTitleUrl(url); + + if (shareNewsTitle != null){ + qqParams.setTitle(shareGameName); + qqParams.setText(shareNewsTitle); + }else { + qqParams.setTitle("向你推荐："); + if (isPlugin){ + qqParams.setText(shareGameName + "（光环加速版）"); + }else { + qqParams.setText(shareGameName); + } + } + qqParams.setImageUrl(shareIcon); + qqParams.setTitleUrl(shareUrl); qqParams.setSite("光环助手"); + sharePlatform(qqParams,QQ.NAME); } //微信好友分享 - private void wechatSahre(String url, String title, String icon){ + private void wechatSahre(){ Wechat.ShareParams wechatParams = new Wechat.ShareParams(); - wechatParams.setText(title + " " + url); - wechatParams.setImageUrl(icon); - wechatParams.setTitle(title); - wechatParams.setUrl(url); + + if (shareNewsTitle != null){ + wechatParams.setText(shareNewsTitle); + }else { + if (isPlugin){ + wechatParams.setText("向你推荐：" + shareGameName + "（光环加速版）"); + }else { + wechatParams.setText("向你推荐：" + shareGameName); + } + } + wechatParams.setImageUrl(shareIcon); + wechatParams.setUrl(shareUrl); + sharePlatform(wechatParams,Wechat.NAME); } //QQ空间分享 - private void qZoneSahre(String url, String title, String icon){ + private void qZoneSahre(){ QZone.ShareParams qZoneParams = new QZone.ShareParams(); - qZoneParams.setTitle(title); - qZoneParams.setText(title + " " + url); - qZoneParams.setImageUrl(icon); - qZoneParams.setTitleUrl(url); - qZoneParams.setComment("精彩尽在" + url); - qZoneParams.setSite(context.getString(R.string.app_name)); - qZoneParams.setSiteUrl(url); + + if (shareNewsTitle != null){ + qZoneParams.setTitle(shareGameName); + qZoneParams.setText(shareNewsTitle); + }else { + qZoneParams.setTitle("向你推荐："); + if (isPlugin){ + qZoneParams.setText("向你推荐：" + shareGameName + "（光环加速版）"); + }else { + qZoneParams.setText("向你推荐：" + shareGameName); + } + } + qZoneParams.setImageUrl(shareIcon); + qZoneParams.setTitleUrl(shareUrl); + qZoneParams.setSite("光环助手"); + sharePlatform(qZoneParams,QZone.NAME); } //微信朋友圈分享 - private void wechatMomentsSahre(String url, String title, String icon){ + private void wechatMomentsSahre(){ WechatMoments.ShareParams wechatMomentsParams = new WechatMoments.ShareParams(); - wechatMomentsParams.setText(title + " " + url); - wechatMomentsParams.setTitle(title); - wechatMomentsParams.setImageUrl(icon); - wechatMomentsParams.setUrl(url); + + if (shareNewsTitle != null){ + wechatMomentsParams.setText(shareNewsTitle); + }else { + if (isPlugin){ + wechatMomentsParams.setText("向你推荐：" + shareGameName + "（光环加速版）"); + }else { + wechatMomentsParams.setText("向你推荐：" + shareGameName); + } + } + wechatMomentsParams.setImageUrl(shareIcon); + wechatMomentsParams.setUrl(shareUrl); + sharePlatform(wechatMomentsParams, WechatMoments.NAME); } //新浪微博分享 - private void sinaWeiboSahre(String url, String title, String icon){ + private void sinaWeiboSahre(){ SinaWeibo.ShareParams sinaWeiboParams = new SinaWeibo.ShareParams(); - sinaWeiboParams.setTitle(title); - sinaWeiboParams.setImageUrl(icon); - sinaWeiboParams.setUrl(url); - sinaWeiboParams.setText(title + " " + url); + + if (shareNewsTitle != null){ + sinaWeiboParams.setText(shareNewsTitle); + }else { + if (isPlugin){ + sinaWeiboParams.setText("向你推荐：" + shareGameName + "（光环加速版）"); + }else { + sinaWeiboParams.setText("向你推荐：" + shareGameName); + } + } + sharePlatform(sinaWeiboParams, SinaWeibo.NAME); } //短信分享 - private void shortMessageSahre(String url, String title, String icon){ + private void shortMessageSahre(){ ShortMessage.ShareParams shortMessageParams = new ShortMessage.ShareParams(); - shortMessageParams.setText(title + " " + url); - shortMessageParams.setUrl(url); - shortMessageParams.setImageUrl(icon); + + if (shareNewsTitle != null){ + shortMessageParams.setText(shareNewsTitle); + }else { + if (isPlugin){ + shortMessageParams.setText("向你推荐：" + shareGameName + "（光环加速版）"); + }else { + shortMessageParams.setText("向你推荐：" + shareGameName); + } + } + shortMessageParams.setUrl(shareUrl); + shortMessageParams.setTitleUrl(shareUrl); + sharePlatform(shortMessageParams, ShortMessage.NAME); } //分享平台回调 private void sharePlatform(Platform.ShareParams params, String name) { + Utils.toast(context,"分享跳转中..."); + Platform platform = ShareSDK.getPlatform(name); platform.setPlatformActionListener(new PlatformActionListener() { @Override @@ -281,11 +343,15 @@ public class ShareUtils { } }); platform.share(params); + popupWindow.dismiss(); } //复制文字链接 - private void copyFont(String copyContent) { + private void copyLink(String copyContent) { ClipboardManager cmb = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE); cmb.setText(copyContent); + popupWindow.dismiss(); + + Utils.toast(context,"复制成功"); } } diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java b/app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java index 04b632830b..a36b220cf4 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java @@ -265,7 +265,7 @@ public class GameDetailsActivity extends BaseActivity implements View.OnClickLis String url = "http://112.124.59.31/game_center/static/game_" + gameEntity.getId() + ".html"; - showShare(url, gameEntity.getName(), gameEntity.getIcon(), entrance, "游戏"); + showShare(url, gameEntity.getName(), gameEntity.getIcon(), null, gameEntity.getTag(), entrance, "游戏"); } } private void invalidate() { diff --git a/app/src/main/java/com/gh/gamecenter/NewGameDetailsActivity.java b/app/src/main/java/com/gh/gamecenter/NewGameDetailsActivity.java index 86185bfdb2..3d4c90b61a 100644 --- a/app/src/main/java/com/gh/gamecenter/NewGameDetailsActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewGameDetailsActivity.java @@ -265,7 +265,7 @@ public class NewGameDetailsActivity extends BaseActivity implements View.OnClick String url = "http://112.124.59.31/game_center/static/game_" + gameEntity.getId() + ".html"; - showShare(url, gameEntity.getName(), gameEntity.getIcon(), entrance, "游戏"); + showShare(url, gameEntity.getName(), gameEntity.getIcon(), null, gameEntity.getTag(), entrance, "游戏"); } } private void invalidate() { diff --git a/app/src/main/java/com/gh/gamecenter/NewsActivity.java b/app/src/main/java/com/gh/gamecenter/NewsActivity.java index aa406bdf9e..969f311401 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsActivity.java @@ -431,11 +431,11 @@ public class NewsActivity extends BaseActivity implements OnClickListener { String url = "http://news.ghzhushou.com/" + entity.getId() + ".html"; if (gameEntity == null){ - showShare(url, entity.getTitle(), "http://image.ghzhushou.com/pic/56976f928ab49edc6e8b45f1.png", entrance, - "新闻"); + showShare(url, gameEntity.getName(), "http://image.ghzhushou.com/pic/56976f928ab49edc6e8b45f1.png",entity.getTitle() + , gameEntity.getTag(), entrance, "新闻"); }else { - showShare(url, entity.getTitle(), gameEntity.getIcon(), entrance, - "新闻"); + showShare(url, gameEntity.getName(), gameEntity.getIcon(), entity.getTitle(), gameEntity.getTag(), entrance + , "新闻"); } } else if (v == essaydetails_progressbar || v == essaydetails_tv_per) { String str = essaydetails_tv_per.getText().toString(); From 4ce778f76f6c2e608064451048e5ea8711a3c9cf Mon Sep 17 00:00:00 2001 From: khy <18814188563@163.com> Date: Tue, 6 Sep 2016 17:49:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8B=E8=BD=BDBUG?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E8=B5=84=E8=AE=AF-=E5=85=B3?= =?UTF-8?q?=E6=B3=A8BUG=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E8=AF=A6=E6=83=85-=E8=B5=84=E8=AE=AF=E6=94=BB=E7=95=A5?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E8=83=8C=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/common/view/DownloadDialog.java | 4 +-- .../gh/gamecenter/GameDetailsActivity.java | 25 ++++++++++++++++--- .../com/gh/gamecenter/GameNewsActivity.java | 3 ++- .../java/com/gh/gamecenter/NewsActivity.java | 9 +++---- .../com/gh/gamecenter/news/News4Fragment.java | 3 ++- .../res/layout/gamedetails_zixun_item.xml | 3 ++- 6 files changed, 33 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/gh/common/view/DownloadDialog.java b/app/src/main/java/com/gh/common/view/DownloadDialog.java index 53b0ea2686..bfc520fb39 100644 --- a/app/src/main/java/com/gh/common/view/DownloadDialog.java +++ b/app/src/main/java/com/gh/common/view/DownloadDialog.java @@ -112,8 +112,8 @@ public class DownloadDialog { adapterMap.get(position - 1).notifyItemChanged(location % (row * column)); } - if (position - 1 < collectionAdapterMap.size()){ - if (collectionAdapterMap != null && collectionAdapterMap.size() >= position - 1 && collectionAdapterMap.size() >= 1){ + if (collectionAdapterMap != null && position - 1 < collectionAdapterMap.size()){ + if ( collectionAdapterMap.size() >= position - 1 && collectionAdapterMap.size() >= 1){ collectionAdapterMap.get(position - 1).notifyItemChanged(location % (row * column)); } } diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java b/app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java index 70ece56efa..93419faf62 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java @@ -3,10 +3,10 @@ package com.gh.gamecenter; import android.app.Dialog; import android.content.Context; import android.content.Intent; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.support.v4.util.ArrayMap; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.text.Html; @@ -156,8 +156,8 @@ public class GameDetailsActivity extends BaseActivity implements View.OnClickLis //初始化关注 concernManager = new ConcernManager(getApplicationContext()); - for (int i = 0; i < concernManager.getAllConcern().size(); i++) { - if (concernManager.getAllConcern().get(i).getId().equals(gameId)){ + for (int i = 0; i < concernManager.getConcernGame().size(); i++) { + if (concernManager.getConcernGame().get(i).getId().equals(gameId)){ isConcern = true; } } @@ -727,11 +727,28 @@ public class GameDetailsActivity extends BaseActivity implements View.OnClickLis if ( childCount == 0){ for (int i =0;i 0) { return true; } @@ -141,6 +141,7 @@ public class GameNewsActivity extends BaseActivity implements View.OnClickListen game_news_list.setAdapter(adapter); game_news_top_type_list.setVisibility(View.GONE); + ivSearch.setVisibility(View.GONE); typeListAdapter.setNewsType(change.getType(), change.getPosition()); } diff --git a/app/src/main/java/com/gh/gamecenter/NewsActivity.java b/app/src/main/java/com/gh/gamecenter/NewsActivity.java index 2a9020e5fe..83ac67a542 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsActivity.java @@ -9,7 +9,6 @@ import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.os.SystemClock; -import android.support.v4.util.ArrayMap; import android.support.v4.view.MotionEventCompat; import android.support.v7.widget.CardView; import android.support.v7.widget.LinearLayoutManager; @@ -426,8 +425,8 @@ public class NewsActivity extends BaseActivity implements OnClickListener { String url = "http://news.ghzhushou.com/" + entity.getId() + ".html"; if (gameEntity == null){ - showShare(url, gameEntity.getName(), "http://image.ghzhushou.com/pic/56976f928ab49edc6e8b45f1.png",entity.getTitle() - , gameEntity.getTag(), entrance, "新闻"); + showShare(url, entity.getTitle(), "http://image.ghzhushou.com/pic/56976f928ab49edc6e8b45f1.png",entity.getTitle() + , null, entrance, "新闻"); }else { showShare(url, gameEntity.getName(), gameEntity.getIcon(), entity.getTitle(), gameEntity.getTag(), entrance , "新闻"); @@ -1014,8 +1013,8 @@ public class NewsActivity extends BaseActivity implements OnClickListener { holder.cardView.setVisibility(View.VISIBLE); ImageUtils.getInstance(getApplicationContext()).displayFile(gameEntity.getIcon(), holder.essaydetails_icon); holder.essaydetails_name.setText(gameEntity.getName()); - for (int i = 0; i < concernManager.getAllConcern().size(); i++) { - if (concernManager.getAllConcern().get(i).getId().equals(gameEntity.getId())){ + for (int i = 0; i < concernManager.getConcernGame().size(); i++) { + if (concernManager.getConcernGame().get(i).getId().equals(gameEntity.getId())){ isConcern = true; } } diff --git a/app/src/main/java/com/gh/gamecenter/news/News4Fragment.java b/app/src/main/java/com/gh/gamecenter/news/News4Fragment.java index eecf875409..c6e8bd2697 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News4Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/news/News4Fragment.java @@ -106,7 +106,7 @@ public class News4Fragment extends Fragment implements News4FragmentAdapter.OnCa super.onScrollStateChanged(recyclerView, newState); if (mNews4FragmentAdapter != null &&newState == RecyclerView.SCROLL_STATE_IDLE &&mLayoutManager.findLastVisibleItemPosition() + 1 == mNews4FragmentAdapter.getItemCount() - &&isLoadOver &&!isRemove &&!isNetworkError){ + &&isLoadOver &&!isRemove &&!isNetworkError && reuse_none_data.getVisibility() == View.GONE){ isLoadOver = false; page++; mNews4FragmentAdapter.loadJosnData(page); @@ -218,6 +218,7 @@ public class News4Fragment extends Fragment implements News4FragmentAdapter.OnCa mSwipeRefreshLayout.setRefreshing(false); } reuse_none_data.setVisibility(View.VISIBLE); + mProgressBar.setVisibility(View.GONE); } } diff --git a/app/src/main/res/layout/gamedetails_zixun_item.xml b/app/src/main/res/layout/gamedetails_zixun_item.xml index 24a0cc22b1..f114b83432 100644 --- a/app/src/main/res/layout/gamedetails_zixun_item.xml +++ b/app/src/main/res/layout/gamedetails_zixun_item.xml @@ -32,6 +32,7 @@ android:id="@+id/gamedetails_rv_item_zixun_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="《刀塔传奇》剧毒皇后-蜘蛛女郎" /> + android:text="《刀塔传奇》剧毒皇后-蜘蛛女郎" + android:singleLine="true"/> \ No newline at end of file