From 6da8d873d3086f74c9dd7754d57dd1aea715db67 Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Tue, 30 Oct 2018 19:38:10 +0800 Subject: [PATCH] =?UTF-8?q?UI=20=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gh/gamecenter/gamedetail/desc/DescAdapter.kt | 12 ++++++++---- .../gh/gamecenter/kaifu/KaiFuTimeViewHolder.java | 3 +++ .../com/gh/gamecenter/kaifu/KaiFuVpAdapter.java | 2 ++ app/src/main/res/drawable-xhdpi/ic_kaifu_hot.png | Bin 0 -> 506 bytes .../layout/activity_community_article_edit.xml | 2 +- app/src/main/res/layout/comment_head_item.xml | 1 + .../main/res/layout/fragment_comment_detail.xml | 2 +- .../main/res/layout/gamedetail_item_answer.xml | 1 + .../main/res/layout/gamedetail_item_comments.xml | 1 + app/src/main/res/layout/gamedetail_item_fuli.xml | 1 + app/src/main/res/layout/gamedetail_item_game.xml | 1 + .../main/res/layout/gamedetail_item_gametag.xml | 1 + app/src/main/res/layout/gamedetail_item_intro.xml | 1 + app/src/main/res/layout/gamedetail_item_kaifu.xml | 1 + .../main/res/layout/gamedetail_item_libao_rv.xml | 1 + .../main/res/layout/gamedetail_item_plugin.xml | 1 + .../res/layout/gamedetail_item_update_content.xml | 3 ++- app/src/main/res/layout/kaifu_item_time.xml | 1 + app/src/main/res/layout/news_detail_comment.xml | 1 + app/src/main/res/values/strings.xml | 4 ++-- 20 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 app/src/main/res/drawable-xhdpi/ic_kaifu_hot.png diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt index 7bfcf98a10..7b777de4ae 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt @@ -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) } } diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuTimeViewHolder.java b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuTimeViewHolder.java index 55f6c11a2b..3cccb8a782 100644 --- a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuTimeViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuTimeViewHolder.java @@ -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; diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpAdapter.java b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpAdapter.java index 85f46f7b27..1614b92195 100644 --- a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpAdapter.java @@ -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) { diff --git a/app/src/main/res/drawable-xhdpi/ic_kaifu_hot.png b/app/src/main/res/drawable-xhdpi/ic_kaifu_hot.png new file mode 100644 index 0000000000000000000000000000000000000000..2de1bef5c49b798512c86b04a8a6c98058403372 GIT binary patch literal 506 zcmVfKg zh;eaoR?tNU2e+b&e?X-UNii=?`qF3KZ@D?=+ zLO&{g;wm0sq{05i;Pv@>4%gZQZ!LV^z`?e_`%3%oVNDz0<0X3+F71hvAoqT7kph& zys-$rgJ=~{_%1uJ@+FEoxpBCZwW;>vXoY{eBP+q(0ibZK#y=JE;LZWTb=nbdvSlc2 z30A&cgKAySJ8xT4ld(C7egu3T0{C6P>mh*CfVm-n9|kZ-|AhX+32E}F2!{KzA^mLt=mKV>$%`dNxsM-V3iAzti?YMtBTZfw1D%S^ wA7yWeNt{Mk_As2t<6rR>&oL)WK2&A=3p1NXe*!A2!~g&Q07*qoM6N<$f^ggD$p8QV literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/activity_community_article_edit.xml b/app/src/main/res/layout/activity_community_article_edit.xml index b1983111e5..618c7f8052 100644 --- a/app/src/main/res/layout/activity_community_article_edit.xml +++ b/app/src/main/res/layout/activity_community_article_edit.xml @@ -57,7 +57,7 @@ android:layout_height = "wrap_content" android:background = "@null" android:drawablePadding = "6dp" - android:hint = "请输入文章标题" + android:hint = "请输入标题" android:paddingBottom = "17dp" android:paddingLeft = "18dp" android:paddingRight = "10dp" diff --git a/app/src/main/res/layout/comment_head_item.xml b/app/src/main/res/layout/comment_head_item.xml index 6b2c39a5ce..a5a1088244 100644 --- a/app/src/main/res/layout/comment_head_item.xml +++ b/app/src/main/res/layout/comment_head_item.xml @@ -19,6 +19,7 @@ android:layout_width = "0dp" android:layout_height = "match_parent" android:layout_weight = "1" + android:textStyle = "bold" android:gravity = "center_vertical" android:textColor = "@color/title" android:textSize = "16sp" /> diff --git a/app/src/main/res/layout/fragment_comment_detail.xml b/app/src/main/res/layout/fragment_comment_detail.xml index 92e2033aaf..39c5e1912a 100644 --- a/app/src/main/res/layout/fragment_comment_detail.xml +++ b/app/src/main/res/layout/fragment_comment_detail.xml @@ -77,7 +77,7 @@ android:layout_toLeftOf = "@+id/comment_send_btn" android:background = "@android:color/transparent" android:drawablePadding = "4dp" - android:hint = "请输入评论" + android:hint = "写评论" android:textColor = "@color/black" android:textColorHint = "@color/theme" android:textCursorDrawable = "@drawable/cursor_color" diff --git a/app/src/main/res/layout/gamedetail_item_answer.xml b/app/src/main/res/layout/gamedetail_item_answer.xml index da459e4f82..d64d0b1086 100644 --- a/app/src/main/res/layout/gamedetail_item_answer.xml +++ b/app/src/main/res/layout/gamedetail_item_answer.xml @@ -20,6 +20,7 @@ android:layout_width = "wrap_content" android:layout_height = "wrap_content" android:text = "热门回答" + android:textStyle = "bold" android:textColor = "@color/text_3a3a3a" android:textSize = "15sp" /> diff --git a/app/src/main/res/layout/gamedetail_item_comments.xml b/app/src/main/res/layout/gamedetail_item_comments.xml index 3791a7d21a..edcdda2fdb 100644 --- a/app/src/main/res/layout/gamedetail_item_comments.xml +++ b/app/src/main/res/layout/gamedetail_item_comments.xml @@ -21,6 +21,7 @@ android:layout_alignParentLeft="true" android:layout_centerVertical="true" android:text="玩家评论" + android:textStyle="bold" android:textColor="@color/text_3a3a3a" android:textSize="15sp" /> diff --git a/app/src/main/res/layout/gamedetail_item_fuli.xml b/app/src/main/res/layout/gamedetail_item_fuli.xml index 3ea618c3a7..50ccf865fb 100644 --- a/app/src/main/res/layout/gamedetail_item_fuli.xml +++ b/app/src/main/res/layout/gamedetail_item_fuli.xml @@ -16,6 +16,7 @@ android:layout_marginBottom = "12dp" android:text = "@string/fuli_description" android:textColor = "@color/text_3a3a3a" + android:textStyle = "bold" android:textSize = "15sp" /> diff --git a/app/src/main/res/layout/gamedetail_item_gametag.xml b/app/src/main/res/layout/gamedetail_item_gametag.xml index 36ed122840..5dd8ad69f9 100644 --- a/app/src/main/res/layout/gamedetail_item_gametag.xml +++ b/app/src/main/res/layout/gamedetail_item_gametag.xml @@ -15,6 +15,7 @@ android:layout_centerVertical = "true" android:text = "@string/game_tag" android:textColor = "@color/text_3a3a3a" + android:textStyle = "bold" android:textSize = "15sp" /> diff --git a/app/src/main/res/layout/gamedetail_item_kaifu.xml b/app/src/main/res/layout/gamedetail_item_kaifu.xml index 52ed9edada..d00ad4a1ac 100644 --- a/app/src/main/res/layout/gamedetail_item_kaifu.xml +++ b/app/src/main/res/layout/gamedetail_item_kaifu.xml @@ -45,6 +45,7 @@ android:gravity = "center_vertical" android:text = "@string/kaifu_calender" android:textColor = "@color/title" + android:textStyle = "bold" android:textSize = "15sp" /> diff --git a/app/src/main/res/layout/gamedetail_item_update_content.xml b/app/src/main/res/layout/gamedetail_item_update_content.xml index a6f6cdd9c0..132bf39c39 100644 --- a/app/src/main/res/layout/gamedetail_item_update_content.xml +++ b/app/src/main/res/layout/gamedetail_item_update_content.xml @@ -27,7 +27,8 @@ android:layout_marginRight="6dp" android:text="更新内容" android:textColor="@color/text_3a3a3a" - android:textSize="15sp" /> + android:textSize="15sp" + android:textStyle="bold" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ef9dbd5689..a8dc4638b9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -116,7 +116,7 @@ 游戏 资讯 我的光环 - 请输入评论 + 写评论 发送 发表评论... 发表评论... @@ -581,7 +581,7 @@ 功能需求*]]> 联系方式*]]> - 写文章... + 请撰写文章... https://www.ghzs.com/communities/%1$s/articles/%2$s.html