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 0000000000..380abcd0a6 Binary files /dev/null and b/app/libs/ShareSDK-ShortMessage-2.7.7.jar differ 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 0000000000..8df0927a83 Binary files /dev/null and b/app/libs/ShareSDK-Wechat-2.7.7.jar differ 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" /> tag, String entrance, String type) { ShareSDK.initSDK(this); - 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; + //判断是否是官方版 + boolean isPlugin = false; + if (tag != null){ + for (String s : tag) { + if (!"官方版".equals(s)){ + isPlugin = true; + } } - }); + } - // 启动分享GUI - oks.show(this); - DataUtils.onEvent(this, "内容分享", title); - isShowShare = 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 c15d2ce99a..b35a6b3508 100644 --- a/app/src/main/java/com/gh/base/BaseFragmentActivity.java +++ b/app/src/main/java/com/gh/base/BaseFragmentActivity.java @@ -21,6 +21,7 @@ import com.gh.common.util.DialogUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.PackageUtils; import com.gh.common.util.RunningUtils; +import com.gh.common.util.ShareUtils; import com.gh.common.util.Utils; import com.gh.download.DownloadManager; import com.gh.gamecenter.MainActivity; @@ -30,11 +31,10 @@ 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; -import onekeyshare.OnekeyShare; -import onekeyshare.themes.classic.PlatformPage; public class BaseFragmentActivity extends FragmentActivity { @@ -131,54 +131,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); - 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; + //判断是否是官方版 + boolean isPlugin = false; + if (tag != null){ + for (String s : tag) { + if (!"官方版".equals(s)){ + isPlugin = true; + } } - }); + } - // 启动分享GUI - oks.show(this); - DataUtils.onEvent(this, "内容分享", title); - isShowShare = 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 new file mode 100644 index 0000000000..1f533d6878 --- /dev/null +++ b/app/src/main/java/com/gh/common/util/ShareUtils.java @@ -0,0 +1,357 @@ +package com.gh.common.util; + +import android.content.ClipboardManager; +import android.content.Context; +import android.graphics.Color; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.view.Gravity; +import android.view.KeyEvent; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.PopupWindow; +import android.widget.RelativeLayout; +import android.widget.TextView; + +import com.gh.gamecenter.R; + +import java.util.HashMap; + +import cn.sharesdk.framework.Platform; +import cn.sharesdk.framework.PlatformActionListener; +import cn.sharesdk.framework.ShareSDK; +import cn.sharesdk.sina.weibo.SinaWeibo; +import cn.sharesdk.system.text.ShortMessage; +import cn.sharesdk.tencent.qq.QQ; +import cn.sharesdk.tencent.qzone.QZone; +import cn.sharesdk.wechat.friends.Wechat; +import cn.sharesdk.wechat.moments.WechatMoments; + +/** + * Created by khy on 2016/9/4. + */ +public class ShareUtils { + private static ShareUtils instance; + + private String shareUrl; + 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 + , R.drawable.share_qzone_logo, R.drawable.share_sinaweibo_logo, R.drawable.share_shortmessage_logo + , R.drawable.share_copyfont_logo, R.drawable.share_cancel_logo}; + private String[] arrLabel = {"微信好友", "朋友圈", "QQ好友", "QQ空间", "新浪微博", "短信", "复制链接", "取消"}; + + private PopupWindow popupWindow; + + private Context context; + + public static ShareUtils getInstance(Context context) { + if (instance == null) { + instance = new ShareUtils(); + } + instance.context = context; + return instance; + } + + public void showShareWindows(View view, String url, String gameName, String icon ,String newsTitle, boolean isPlugin){ + this.shareIcon = icon; + this.shareGameName = gameName; + this.shareUrl = url; + this.shareNewsTitle = newsTitle; + this.isPlugin = isPlugin; + + maxHeight = context.getResources().getDisplayMetrics().heightPixels; + + RelativeLayout contentView = new RelativeLayout(context); + contentView.setBackgroundColor(0x4c000000); + contentView.setFocusable(true); + contentView.setFocusableInTouchMode(true); + + RecyclerView shareRecyclerView = new RecyclerView(context); + shareRecyclerView.setPadding(DisplayUtils.dip2px(context, 4), 0, DisplayUtils.dip2px(context, 4), 0); + shareRecyclerView.setBackgroundColor(Color.WHITE); + + //RecyclerView禁止滑动 + GridLayoutManager gridLayoutManager = new GridLayoutManager(context, 4){ + @Override + public boolean canScrollVertically() { + return false; + } + }; + + shareRecyclerView.setLayoutManager(gridLayoutManager); + shareRecyclerView.setAdapter(new ShareRecyclerViewAdapter()); + + RelativeLayout.LayoutParams rlParams = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT + , maxHeight/3 - DisplayUtils.dip2px(context, 10)); + rlParams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM); + contentView.addView(shareRecyclerView,rlParams); + + popupWindow = new PopupWindow(contentView, LinearLayout.LayoutParams.MATCH_PARENT + , LinearLayout.LayoutParams.MATCH_PARENT, true); + popupWindow.setAnimationStyle(R.style.mypopwindow_anim_style); + popupWindow.showAtLocation(view, Gravity.BOTTOM, 0, 0); + + contentView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + popupWindow.dismiss(); + } + }); + + contentView.setOnKeyListener(new View.OnKeyListener() { + @Override + public boolean onKey(View v, int keyCode, KeyEvent event) { + + if (keyCode == KeyEvent.KEYCODE_BACK + && event.getRepeatCount() == 0 && popupWindow != null + && popupWindow.isShowing()) { + popupWindow.dismiss(); + } + return false; + } + }); + } + + private class ShareRecyclerViewAdapter extends RecyclerView.Adapter{ + + @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(); + break; + case 1: + wechatMomentsSahre(); + break; + case 2: + qqSahre(); + break; + case 3: + qZoneSahre(); + break; + case 4: + sinaWeiboSahre(); + break; + case 5: + shortMessageSahre(); + break; + case 6: + copyLink(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(){ + QQ.ShareParams qqParams = new QQ.ShareParams(); + + 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(){ + Wechat.ShareParams wechatParams = new Wechat.ShareParams(); + + 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(){ + QZone.ShareParams qZoneParams = new QZone.ShareParams(); + + 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(){ + WechatMoments.ShareParams wechatMomentsParams = new WechatMoments.ShareParams(); + + 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(){ + SinaWeibo.ShareParams sinaWeiboParams = new SinaWeibo.ShareParams(); + + if (shareNewsTitle != null){ + sinaWeiboParams.setText(shareNewsTitle); + }else { + if (isPlugin){ + sinaWeiboParams.setText("向你推荐：" + shareGameName + "（光环加速版）"); + }else { + sinaWeiboParams.setText("向你推荐：" + shareGameName); + } + } + + sharePlatform(sinaWeiboParams, SinaWeibo.NAME); + } + + //短信分享 + private void shortMessageSahre(){ + ShortMessage.ShareParams shortMessageParams = new ShortMessage.ShareParams(); + + 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 + 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); + popupWindow.dismiss(); + } + + //复制文字链接 + 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/common/view/DownloadDialog.java b/app/src/main/java/com/gh/common/view/DownloadDialog.java index 9f9661c3e0..2664e5572c 100644 --- a/app/src/main/java/com/gh/common/view/DownloadDialog.java +++ b/app/src/main/java/com/gh/common/view/DownloadDialog.java @@ -112,7 +112,10 @@ public class DownloadDialog { if (position - 1 < adapterMap.size()) { adapterMap.get(position - 1).notifyItemChanged(location % (row * column)); - 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 17d9967fff..4a4f1dadd9 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java @@ -1,15 +1,21 @@ 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.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; +import android.text.Html; +import android.text.Spanned; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.Window; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.ProgressBar; @@ -24,6 +30,7 @@ import com.android.volley.VolleyError; import com.gh.base.AppController; import com.gh.base.BaseActivity; import com.gh.common.constant.Config; +import com.gh.common.constant.Constants; import com.gh.common.util.ConcernUtils; import com.gh.common.util.DataUtils; import com.gh.common.util.DialogUtils; @@ -144,8 +151,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; } } @@ -182,7 +189,7 @@ public class GameDetailsActivity extends BaseActivity implements View.OnClickLis if (NetworkUtils.isWifiConnected(this)) { download(v); } else { - DialogUtils.showDownloadDialog(this, new DialogUtils.ConfiremListener() { + DialogUtils.showWarningDialog(this, new DialogUtils.ConfiremListener() { @Override public void onConfirem() { download(v); @@ -240,7 +247,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() { @@ -683,11 +690,28 @@ public class GameDetailsActivity extends BaseActivity implements View.OnClickLis if ( childCount == 0){ for (int i =0;i 0) { return true; } @@ -137,6 +137,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/NewGameDetailsActivity.java b/app/src/main/java/com/gh/gamecenter/NewGameDetailsActivity.java index 789779f7af..c0ecb9fd53 100644 --- a/app/src/main/java/com/gh/gamecenter/NewGameDetailsActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewGameDetailsActivity.java @@ -260,7 +260,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 b5002d70f4..659039ed66 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsActivity.java @@ -415,11 +415,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, entity.getTitle(), "http://image.ghzhushou.com/pic/56976f928ab49edc6e8b45f1.png",entity.getTitle() + , null, 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(); @@ -953,8 +953,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/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 0000000000..42bffd8c64 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/share_cancel_logo.png differ 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 0000000000..3c98d52cc2 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/share_copyfont_logo.png differ diff --git a/app/src/main/res/drawable-hdpi/share_qq_logo.png b/app/src/main/res/drawable-hdpi/share_qq_logo.png new file mode 100644 index 0000000000..f8c2a46f28 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/share_qq_logo.png differ diff --git a/app/src/main/res/drawable-hdpi/share_qzone_logo.png b/app/src/main/res/drawable-hdpi/share_qzone_logo.png new file mode 100644 index 0000000000..a7693a053b Binary files /dev/null and b/app/src/main/res/drawable-hdpi/share_qzone_logo.png differ 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 0000000000..8cf9c55ff2 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/share_shortmessage_logo.png differ diff --git a/app/src/main/res/drawable-hdpi/share_sinaweibo_logo.png b/app/src/main/res/drawable-hdpi/share_sinaweibo_logo.png new file mode 100644 index 0000000000..689d65e878 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/share_sinaweibo_logo.png differ 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 0000000000..f23f117e97 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/share_wechat_logo.png differ 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 0000000000..a7be6424ff Binary files /dev/null and b/app/src/main/res/drawable-hdpi/share_wechatmoments_logo.png differ 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"> + android:text="《刀塔传奇》剧毒皇后-蜘蛛女郎" + android:singleLine="true"/> \ No newline at end of file