Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

消息中心优化, 求版本功能完善(敏感词toast还要确认), 修复搜索游戏失败时无法重试问题

Browse Source
This commit is contained in:
kehaoyuan
2017-11-13 17:44:10 +08:00
parent 2df42c772b
commit 22a1895050
14 changed files with 134 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/com/gh/gamecenter/VoteActivity.java
View File

@ -279,14 +279,18 @@ public class VoteActivity extends BaseActivity implements SwipeRefreshLayout.OnR
JSONObject responseObject = new JSONObject(string);
boolean cast = responseObject.getBoolean("cast");
String id = responseObject.getString("_id");
if (cast) {
Utils.toast(VoteActivity.this, "投票成功");
String illegal = responseObject.getString("illegal");
if (!TextUtils.isEmpty(illegal)) {
Utils.toast(VoteActivity.this, "包含非法内容，请修改后重试");
} else {
if (isNewVote) {
Utils.toast(VoteActivity.this, "已经存在相同的选项");
if (cast) {
Utils.toast(VoteActivity.this, "投票成功");
} else {
Utils.toast(VoteActivity.this, "你已经投过了");
if (isNewVote) {
Utils.toast(VoteActivity.this, "已经存在相同的选项");
} else {
Utils.toast(VoteActivity.this, "你已经投过了");
}
}
}

10
app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java
View File

@ -5,6 +5,8 @@ import android.graphics.drawable.ColorDrawable;
import android.support.v4.content.ContextCompat;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.RecyclerView.ViewHolder;
import android.text.Html;
import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
@ -157,8 +159,14 @@ public class VoteAdapter extends BaseRecyclerAdapter<ViewHolder> {
layoutParams.width = (int) mPbwidth;
}
if (!TextUtils.isEmpty(versionVoteEntity.getReply())) {
viewHolder.voteReply.setText(Html.fromHtml(mContext.getString(R.string.vote_reply, versionVoteEntity.getReply())));
viewHolder.voteReply.setVisibility(View.VISIBLE);
} else {
viewHolder.voteReply.setVisibility(View.GONE);
}
viewHolder.name.setText(versionVoteEntity.getName());
viewHolder.count.setText(versionVoteEntity.getNum() + "票");
viewHolder.count.setText(mContext.getString(R.string.vote_count, versionVoteEntity.getNum()));
progressbar.setLayoutParams(layoutParams);
viewHolder.voteBtn.setOnClickListener(new View.OnClickListener() {

2
app/src/main/java/com/gh/gamecenter/adapter/viewholder/VoteViewHolder.java
View File

@ -22,6 +22,8 @@ public class VoteViewHolder extends BaseRecyclerViewHolder {
public View progressbar;
@BindView(R.id.vote_item_count)
public TextView count;
@BindView(R.id.vote_item_reply)
public TextView voteReply;
public VoteViewHolder(View itemView) {
super(itemView);

7
app/src/main/java/com/gh/gamecenter/entity/MessageKeFuEntity.kt
View File

@ -24,4 +24,11 @@ class MessageKeFuEntity {
var link: MessageLinkEntity? = null
@SerializedName("service")
var serviceEntity: ServiceEntity? = null
class ServiceEntity {
var name: String? = null
var icon: String? = null
}
}

2
app/src/main/java/com/gh/gamecenter/entity/VersionVoteEntity.kt
View File

@ -17,4 +17,6 @@ class VersionVoteEntity {
@SerializedName("user_data")
var userData: UserDataEntity? = null
var reply: String? = null
}

10
app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java
View File

@ -12,6 +12,7 @@ import android.view.ViewGroup;
import com.gh.base.OnRequestCallBackListener;
import com.gh.common.util.CommentUtils;
import com.gh.common.util.EntranceUtils;
import com.gh.common.util.ImageUtils;
import com.gh.common.util.QQUtils;
import com.gh.gamecenter.GameDetailActivity;
import com.gh.gamecenter.NewsDetailActivity;
@ -245,6 +246,15 @@ public class KeFuFragmentAdapter extends BaseRecyclerAdapter<ViewHolder> {
viewHolder.skip.setVisibility(View.GONE);
}
MessageKeFuEntity.ServiceEntity serviceEntity = keFuEntity.getServiceEntity();
viewHolder.kefuName.setText(R.string.kefu_default_name);
if (serviceEntity != null) {
String name = serviceEntity.getName();
if (!TextUtils.isEmpty(name)) {
viewHolder.kefuName.setText(name);
}
ImageUtils.Companion.display(viewHolder.kefuIcon, serviceEntity.getIcon());
}
CommentUtils.setCommentTime(viewHolder.time, keFuEntity.getTime());

5
app/src/main/java/com/gh/gamecenter/message/KeFuViewHolder.java
View File

@ -3,6 +3,7 @@ package com.gh.gamecenter.message;
import android.view.View;
import android.widget.TextView;
import com.facebook.drawee.view.SimpleDraweeView;
import com.gh.base.BaseRecyclerViewHolder;
import com.gh.gamecenter.R;
@ -23,6 +24,10 @@ public class KeFuViewHolder extends BaseRecyclerViewHolder {
public TextView suggestion;
@BindView(R.id.message_kefu_skip)
public TextView skip;
@BindView(R.id.message_kefu_icon)
public SimpleDraweeView kefuIcon;
@BindView(R.id.message_kefu_name)
TextView kefuName;
public KeFuViewHolder(View itemView) {
super(itemView);

18
app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java
View File

@ -33,6 +33,7 @@ import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList;
import butterknife.BindView;
import butterknife.OnClick;
public class SearchGameDetailFragment extends BaseFragment implements OnRequestCallBackListener {
@ -50,6 +51,14 @@ public class SearchGameDetailFragment extends BaseFragment implements OnRequestC
private SearchGameDetailFragmentAdapter adapter;
Runnable runnable = new Runnable() {
@Override
public void run() {
adapter = new SearchGameDetailFragmentAdapter(SearchGameDetailFragment.this, key, type, mEntrance);
search_detail.setAdapter(adapter);
}
};
DataWatcher dataWatcher = new DataWatcher() {
@Override
public void onDataChanged(DownloadEntity downloadEntity) {
@ -127,6 +136,15 @@ public class SearchGameDetailFragment extends BaseFragment implements OnRequestC
});
}
@OnClick(R.id.reuse_no_connection)
public void onClick(View view) {
search_loading.setVisibility(View.VISIBLE);
search_detail.setVisibility(View.GONE);
reuse_none_date.setVisibility(View.GONE);
reuse_no_connection.setVisibility(View.GONE);
postDelayedRunnable(runnable, 1000);
}
@Override
public void onResume() {
if (isEverPause && adapter != null) {

19
app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java
View File

@ -33,6 +33,7 @@ import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList;
import butterknife.BindView;
import butterknife.OnClick;
public class SearchGameListFragment extends BaseFragment implements OnRequestCallBackListener {
@ -50,6 +51,14 @@ public class SearchGameListFragment extends BaseFragment implements OnRequestCal
private SearchGameListFragmentAdapter adapter;
Runnable runnable = new Runnable() {
@Override
public void run() {
adapter = new SearchGameListFragmentAdapter(SearchGameListFragment.this, key, type, mEntrance);
search_detail.setAdapter(adapter);
}
};
DataWatcher dataWatcher = new DataWatcher() {
@Override
public void onDataChanged(DownloadEntity downloadEntity) {
@ -124,6 +133,16 @@ public class SearchGameListFragment extends BaseFragment implements OnRequestCal
});
}
@OnClick(R.id.reuse_no_connection)
public void onClick(View view) {
search_loading.setVisibility(View.VISIBLE);
search_detail.setVisibility(View.GONE);
reuse_none_date.setVisibility(View.GONE);
reuse_no_connection.setVisibility(View.GONE);
postDelayedRunnable(runnable, 1000);
}
@Override
public void onResume() {
if (isEverPause && adapter != null) {