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

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

Browse Source 
# Conflicts:
#	app/src/main/res/layout/fragment_comment_detail.xml
This commit is contained in:
kehaoyuan
2018-10-30 19:46:47 +08:00
parent 5fb5f10d9a 6da8d873d3
commit 446ee1d145
19 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt
View File

@ -301,16 +301,20 @@ class DescAdapter(context: Context,
if (mIsPluginExpanded) {
viewHolder.gameDetailPluginRv.layoutManager = linearLayoutManager
viewHolder.gamedetailPluginOpen.setPadding(0, 0, 0, 0)
viewHolder.gamedetailPluginOpen.visibility = View.INVISIBLE
viewHolder.gamedetailPluginExpandIv.setImageResource(R.drawable.ic_category_arrow_up)
} else {
viewHolder.gameDetailPluginRv.layoutManager = layoutManager
viewHolder.gamedetailPluginExpandIv.setImageResource(R.drawable.ic_category_arrow_down)
}
viewHolder.gameDetailPluginRv.adapter = GameDetailPluginAdapter(tag, tips, mIsPluginExpanded, mContext)
viewHolder.gamedetailPluginOpen.setOnClickListener { _ ->
mIsPluginExpanded = true
mIsPluginExpanded = !mIsPluginExpanded
if (mIsPluginExpanded) {
DataUtils.onMtaEvent(mContext, "游戏详情", "展开插件介绍", gameName)
} else {
DataUtils.onMtaEvent(mContext, "游戏详情", "收起插件介绍", gameName)
}
notifyItemChanged(viewHolder.adapterPosition)
DataUtils.onMtaEvent(mContext, "游戏详情", "展开插件介绍", gameName)
}
}

3
app/src/main/java/com/gh/gamecenter/kaifu/KaiFuTimeViewHolder.java
View File

@ -1,6 +1,7 @@
package com.gh.gamecenter.kaifu;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import com.gh.base.BaseRecyclerViewHolder;
@ -14,6 +15,8 @@ import butterknife.BindView;
public class KaiFuTimeViewHolder extends BaseRecyclerViewHolder {
@BindView(R.id.kaifu_item_header)
ImageView header;
@BindView(R.id.kaifu_item_time_tv)
TextView time;

2
app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpAdapter.java
View File

@ -251,9 +251,11 @@ public class KaiFuVpAdapter extends BaseRecyclerAdapter {
} else if (holder instanceof KaiFuTimeViewHolder) {
GameEntity gameEntity = mEntityList.get(position);
if (gameEntity.getFixedTopHint()) {
((KaiFuTimeViewHolder) holder).header.setImageResource(R.drawable.ic_kaifu_hot);
((KaiFuTimeViewHolder) holder).time.setText("热门开服");
} else {
SimpleDateFormat dateFm = new SimpleDateFormat("yyyy-MM-dd (EEEE) HH:mm", Locale.CHINA);
((KaiFuTimeViewHolder) holder).header.setImageResource(R.drawable.kaifu_time_icon);
((KaiFuTimeViewHolder) holder).time.setText(dateFm.format(gameEntity.getKaifuTimeHint() * 1000));
}
} else if (holder instanceof FooterViewHolder) {