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

Merge branch 'dev' of gitlab.ghzs.com:halo/assistant-android into dev

Browse Source
This commit is contained in:
Jack
2020-03-15 19:16:05 +08:00
parent 9aeb1624a6 ec9c282618
commit f7fe7a5153
5 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,6 +182,8 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall
private int mFunctionType = -1;
private String mCollectCancelPkgName = "";
@NonNull
public static Intent getIntent(Context context, SuggestType suggestType) {
Intent intent = new Intent(context, SuggestionActivity.class);
@ -714,6 +716,10 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall
back.setOnClickListener(v -> {
MtaHelper.onEvent("意见反馈", "意见反馈-游戏收录弹窗", "点击返回");
dialog.dismiss();
if (mSelectGameEntity != null) {
mCollectCancelPkgName = mSelectGameEntity.getPackageName();
}
});
forcePost.setOnClickListener(v -> {
MtaHelper.onEvent("意见反馈", "意见反馈-游戏收录弹窗", "点击不是我要的游戏，继续提交");
@ -1023,6 +1029,10 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall
@Override
protected boolean handleBackPressed() {
if (mSelectGameEntity != null && mCollectCancelPkgName.equals(mSelectGameEntity.getPackageName())) {
return super.handleBackPressed();
}
if (!TextUtils.isEmpty(mSuggestContentEt.getText().toString()) ||
!TextUtils.isEmpty(mSuggestGameName.getText().toString()) ||
!TextUtils.isEmpty(mLinkEt.getText().toString()) ||

7
app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java
View File

@ -8,6 +8,7 @@ import android.widget.RelativeLayout;
import com.gh.base.BaseActivity;
import com.gh.base.BaseRecyclerViewHolder;
import com.gh.base.OnListClickListener;
import com.gh.common.util.ClickUtils;
import com.gh.common.util.DirectUtils;
import com.gh.common.util.DisplayUtils;
import com.gh.common.util.ImageUtils;
@ -123,7 +124,7 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder<MessageEntity>
mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle());
images = messageEntity.getAnswer().getImages();
if (images.size() > 0) {
targetUrl=images.get(0);
targetUrl = images.get(0);
mBinding.messageAskIcon.setVisibility(View.VISIBLE);
mBinding.messageArticleIcon.setVisibility(View.GONE);
}
@ -373,7 +374,9 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder<MessageEntity>
mBinding.messageUserMore.setOnClickListener(v -> {
MessageEntity.Fold fold = messageEntity.getFold();
if (fold != null) getFoldList(context, messageEntity.getFold().getResourceId());
if (fold != null && !ClickUtils.isFastDoubleClick(mBinding.messageUserMore.getId(), 1000)) {
getFoldList(context, messageEntity.getFold().getResourceId());
}
});
mBinding.messageUserIcon.setOnClickListener(v -> {
MtaHelper.onEvent("消息中心", mOuterInfo, "点击头像");

12
app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowAdapter.kt
View File

@ -68,12 +68,14 @@ class AskFollowAdapter(val context: Context, val viewModel: AskFollowViewModel)
userDesc.text = highlightedString
userDesc.visibility = View.VISIBLE
userDesc.setOnClickListener {
val dialog = AskFollowMoreDialog().apply {
userList = ArrayList(historyEntity.foldUsers)
this.type = "赞同$type"
this.path = "问答首页-关注折叠"
debounceActionWithInterval(userDesc.id, 1000) {
val dialog = AskFollowMoreDialog().apply {
userList = ArrayList(historyEntity.foldUsers)
this.type = "赞同$type"
this.path = "问答首页-关注折叠"
}
dialog.show((context as AppCompatActivity).supportFragmentManager, "more")
}
dialog.show((context as AppCompatActivity).supportFragmentManager, "more")
}
userCommand.text = "赞同了$type"
} else {

4
app/src/main/java/com/halo/assistant/fragment/game/GamePluginAdapter.java
View File

@ -6,7 +6,6 @@ import android.view.ViewGroup;
import androidx.recyclerview.widget.RecyclerView;
import com.gh.common.AppExecutor;
import com.gh.common.util.DataCollectionUtils;
import com.gh.common.util.DisplayUtils;
import com.gh.common.util.DownloadItemUtils;
@ -106,8 +105,7 @@ public class GamePluginAdapter extends BaseRecyclerAdapter {
for (int position = 0; position < mPluginList.size(); position++) {
GameEntity pluginEntity = mPluginList.get(position);
if (downloadEntity.getName().equals(pluginEntity.getName())) {
int finalPosition = position;
AppExecutor.getUiExecutor().execute(() -> notifyItemChanged(finalPosition));
notifyItemChanged(position);
}
}
}