diff --git a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java index e4edcb9a79..76547556d7 100644 --- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java +++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java @@ -357,7 +357,8 @@ public class DownloadItemUtils { textView.setVisibility(View.VISIBLE); game_progressbar.setVisibility(View.GONE); game_ll_info.setVisibility(View.GONE); - downloadBtn.setVisibility(View.GONE); + downloadBtn.setBackgroundResource(R.drawable.game_item_btn_pause_style); + downloadBtn.setText("暂无"); } else if (entity.getApk().size() == 1) { updateNormalItem(context, textView, game_progressbar, game_ll_info, download_speed, download_percentage, downloadBtn, entity, isShowPlatform); diff --git a/app/src/main/java/com/gh/common/util/PostCommentUtils.java b/app/src/main/java/com/gh/common/util/PostCommentUtils.java index 4210070e05..d8a200fe84 100644 --- a/app/src/main/java/com/gh/common/util/PostCommentUtils.java +++ b/app/src/main/java/com/gh/common/util/PostCommentUtils.java @@ -1,7 +1,6 @@ package com.gh.common.util; import android.content.Context; -import android.util.Log; import com.android.volley.Request; import com.android.volley.Response; @@ -18,7 +17,7 @@ public class PostCommentUtils { new Thread(new Runnable() { @Override public void run() { - Utils.log("url::" + url, "/ content::" + content); + Utils.log("addCommentData--url::" + url, "/ content::" + content); StringExtendedRequest request = new StringExtendedRequest( Request.Method.POST, url, content, new Response.Listener() { @@ -55,7 +54,6 @@ public class PostCommentUtils { new Response.Listener() { @Override public void onResponse(String response) { - Log.e("======onResponse", "onResponse"); if (listener != null){ listener.postSucced(response.toString()); } @@ -64,7 +62,6 @@ public class PostCommentUtils { new Response.ErrorListener() { @Override public void onErrorResponse(VolleyError error) { - Log.e("======onErrorResponse", new String(error.networkResponse.data)); if (listener != null){ listener.postFailed(error); } diff --git a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java index 8aac8cc571..912835a90f 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java @@ -225,6 +225,8 @@ public class MessageDetailActivity extends BaseActivity{ } modifyNewsCommentVolleyCache(0, cacheObject, newsId); mMessageDetailAdapter.notifyItemInserted(mMessageDetailAdapter.getHotCommentListSize() + 2); + + //TODO 完成评论操作 } @Override diff --git a/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java b/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java index 263ba8999e..fe40990b03 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java @@ -24,7 +24,11 @@ import com.gh.common.util.MessageShareUtils; import com.gh.gamecenter.manager.SystemBarTintManager; import java.io.File; +import java.io.IOException; +import java.net.HttpURLConnection; +import java.net.URL; import java.util.ArrayList; +import java.util.List; import butterknife.BindView; import butterknife.ButterKnife; @@ -65,7 +69,7 @@ public class ShareCardPicActivity extends BaseActivity { gameName = extras.getString("gameName"); gameIconUrl = extras.getString("gameIconUrl"); shareContent = extras.getString("shareContent"); - shareArrImg = extras.getStringArrayList("shareArrImg"); + List arrImg = extras.getStringArrayList("shareArrImg"); picName = "shareImgPic.jpg"; currentImgPosition = 0; @@ -75,18 +79,24 @@ public class ShareCardPicActivity extends BaseActivity { ButterKnife.bind(this); + shareArrImg = new ArrayList<>(); + mActionbar.setBackgroundColor(getResources().getColor(R.color.back)); SystemBarTintManager tintManager = getTintManager(); if (tintManager != null) { tintManager.setStatusBarTintResource(R.color.back); } + for (int i = 0; i < arrImg.size(); i++) { + checkUrl(arrImg.get(i), arrImg.size()); + } + mShareGameNameTv.setText(gameName); mShareContentTv.setText(Html.fromHtml(shareContent)); mShareGameIconDv.setImageURI(gameIconUrl); mShareQrCodeDv.setImageURI("res:///" + R.drawable.test_qrcode); - if (shareArrImg.size() > 1) { + if (arrImg.size() > 1) { mShareChangImageIcon.setImageResource(R.drawable.sharecard_chang_img); mShareChangImageTv.setTextColor(Color.WHITE); } else { @@ -94,8 +104,6 @@ public class ShareCardPicActivity extends BaseActivity { mShareChangImageTv.setTextColor(getResources().getColor(R.color.hint)); } - setContentImage(shareArrImg.get(currentImgPosition)); - currentImgPosition++; } private void setContentImage(String url){ @@ -171,6 +179,58 @@ public class ShareCardPicActivity extends BaseActivity { currentImgPosition ++; } + private void checkUrl(final String url, final int size) { + new Thread() { + @Override + public void run() { + try { + String newUrl = "http://image.ghzhushou.com/pic/hq" + url.substring(url.lastIndexOf("/")); + HttpURLConnection connection = (HttpURLConnection) new URL(newUrl).openConnection(); + connection.setRequestMethod("GET"); + connection.setConnectTimeout(5 * 1000); + connection.setReadTimeout(5 * 1000); + connection.connect(); + int code = connection.getResponseCode(); + if (code == 200) { + addCount(); + shareArrImg.add(newUrl); + if (count == size) { + ShareCardPicActivity.this.runOnUiThread(new Runnable() { + @Override + public void run() { + setContentImage(shareArrImg.get(currentImgPosition)); + currentImgPosition++; + } + }); + } + } else { + addCount(); + shareArrImg.add(url); + if (count == size) { + ShareCardPicActivity.this.runOnUiThread(new Runnable() { + @Override + public void run() { + setContentImage(shareArrImg.get(currentImgPosition)); + currentImgPosition++; + } + }); + } + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }.start(); + } + + private int count; + + private void addCount() { + synchronized (ShareCardPicActivity.class) { + count++; + } + } + public static Bitmap getBitmapByView(ScrollView scrollView) { int h = 0; Bitmap bitmap = null; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java index 8a80329084..11b290fa5b 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java @@ -430,7 +430,7 @@ public class MessageDetailAdapter extends RecyclerView.Adapter= 1) { holder.commentLikeCountTv.setTextColor(mContext.getResources().getColor(R.color.theme)); holder.commentLikeIv.setImageResource(R.drawable.comment_like_select); } else { @@ -483,6 +483,7 @@ public class MessageDetailAdapter extends RecyclerView.Adapter + android:text="发表评论..." + android:paddingTop="12dp" + android:paddingBottom="12dp"/> + android:paddingRight="5dp"> diff --git a/app/src/main/res/layout/news_digest_item.xml b/app/src/main/res/layout/news_digest_item.xml index 1e8d54ab5c..e46e03192f 100644 --- a/app/src/main/res/layout/news_digest_item.xml +++ b/app/src/main/res/layout/news_digest_item.xml @@ -70,14 +70,17 @@ - + android:layout_marginBottom="4dp" + android:orientation="horizontal" + android:gravity="center"> @@ -110,22 +112,29 @@ - + - + + + + + \ No newline at end of file