From 92089e60ced3596863c9de44b7d6d2f2a4273e8f Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Fri, 10 Jan 2020 17:03:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E6=88=90=2020200108-2100=20?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=B1=87=E6=80=BB=E7=9A=84=20(3,4,6,11)=20ht?= =?UTF-8?q?tps://gitlab.ghzs.com/pm/halo-app-issues/issues/753?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gamecenter/gamedetail/desc/DescAdapter.kt | 2 - .../desc/GameDetailCustomColumnAdapter.kt | 5 +- .../assistant/fragment/SettingsFragment.java | 27 +++++---- .../gamedetail_item_custom_column_item.xml | 58 ++++++++++--------- .../java/com/m7/imkfsdk/KfStartHelper.java | 6 +- 5 files changed, 55 insertions(+), 43 deletions(-) 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 a60a5d81c1..a40c32c3ed 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 @@ -180,8 +180,6 @@ class DescAdapter(context: Context, override fun getSpanSize(position: Int): Int { return if (tips?.title != null) { if (position == 0) 3 else 1 - } else if (tips?.title == null && customColumn.title == null) { - if (position == 0) 3 else 1 } else { 1 } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailCustomColumnAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailCustomColumnAdapter.kt index d899555462..da911a0d33 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailCustomColumnAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailCustomColumnAdapter.kt @@ -64,8 +64,9 @@ class GameDetailCustomColumnAdapter(private val tags: ArrayList, viewHolder.hintContentTv.setTextWithHighlightedTextWrappedInsideWrapper(text = tips?.content ?: "") - if (title == null || - (TextUtils.isEmpty(title.value) && TextUtils.isEmpty(title.color))) { + if (title == null + || title.value == "" + || (TextUtils.isEmpty(title.value) && TextUtils.isEmpty(title.color))) { viewHolder.hintLl.visibility = View.GONE viewHolder.hintTv.visibility = View.GONE } else { diff --git a/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java b/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java index bf0b8de1a3..9a6092f581 100644 --- a/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java @@ -179,6 +179,8 @@ public class SettingsFragment extends NormalFragment { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) { return; } + + mSettingUsageStatsSb.setClickable(false); if (UsageStatsHelper.checkForPermission() && sp.getBoolean(UsageStatsHelper.USAGE_STATUS_SP_KEY, true)) { mSettingUsageStatsSb.setCheckedImmediately(true); @@ -196,15 +198,6 @@ public class SettingsFragment extends NormalFragment { }, () -> mSettingUsageStatsSb.setCheckedNoEvent(false)); } - } else { - DialogUtils.showAlertDialog(getContext(), - "提示", - "关闭后将无法统计游戏时长，确定要关闭吗？", - "确定关闭", - "暂不关闭", - () -> sp.edit().putBoolean(UsageStatsHelper.USAGE_STATUS_SP_KEY, false).apply(), - () -> mSettingUsageStatsSb.setCheckedNoEvent(true) - ); } }); } @@ -393,7 +386,21 @@ public class SettingsFragment extends NormalFragment { startActivity(WebActivity.getWebIntent(getContext())); break; case R.id.setting_usage_stats: - mSettingUsageStatsSb.performClick(); + if (mSettingUsageStatsSb.isChecked()) { + DialogUtils.showAlertDialog(getContext(), + "提示", + "关闭后将无法统计游戏时长，确定要关闭吗？", + "确定关闭", + "暂不关闭", + () -> { + mSettingUsageStatsSb.setChecked(false); + sp.edit().putBoolean(UsageStatsHelper.USAGE_STATUS_SP_KEY, false).apply(); + }, + () -> mSettingUsageStatsSb.setCheckedNoEvent(true) + ); + } else { + mSettingUsageStatsSb.performClick(); + } break; case R.id.setting_clean_package: // MtaHelper.onEvent("发现", "安装包清理"); diff --git a/app/src/main/res/layout/gamedetail_item_custom_column_item.xml b/app/src/main/res/layout/gamedetail_item_custom_column_item.xml index b513ee0e2c..eaa23747a9 100644 --- a/app/src/main/res/layout/gamedetail_item_custom_column_item.xml +++ b/app/src/main/res/layout/gamedetail_item_custom_column_item.xml @@ -1,37 +1,39 @@ - + + android:id="@+id/gamedetail_ll_hint" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:paddingTop="13dp"> + android:id="@+id/gamedetail_iv_hint" + android:layout_width="16dp" + android:layout_height="16dp" + android:layout_marginRight="5dp" /> - + android:id="@+id/gamedetail_tv_hint" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/plugin_tip" + android:textColor="@color/btn_plugin" + android:textSize="14sp" /> + - \ No newline at end of file + android:id="@+id/gamedetail_tv_content" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/gamedetail_ll_hint" + android:layout_marginTop="8dp" + android:maxLines="4" + android:textColor="@color/text_5d5d5d" + android:textSize="13sp" + tools:text="pm sucks" /> + \ No newline at end of file diff --git a/libraries/im/src/main/java/com/m7/imkfsdk/KfStartHelper.java b/libraries/im/src/main/java/com/m7/imkfsdk/KfStartHelper.java index a0f3737b74..dc512e8430 100644 --- a/libraries/im/src/main/java/com/m7/imkfsdk/KfStartHelper.java +++ b/libraries/im/src/main/java/com/m7/imkfsdk/KfStartHelper.java @@ -168,6 +168,10 @@ public class KfStartHelper { chatIntent.putExtra("type", "peedId"); chatIntent.putExtra("icon", icon); chatIntent.putExtra("inputContent", defaultInputContent); - if (requestCode != null) mActivity.startActivityForResult(chatIntent, requestCode); + if (requestCode != null) { + mActivity.startActivityForResult(chatIntent, requestCode); + } else { + mActivity.startActivity(chatIntent); + } } } From 12c35cebc4d384b455041359176d05acf39aca67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= <1484288157@qq.com> Date: Fri, 10 Jan 2020 17:13:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=85=89=E7=8E=AF?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/gamecenter/personal/PersonalFragment.java | 5 +---- .../java/com/gh/gamecenter/personalhome/UserHomeFragment.kt | 4 ++-- .../java/com/gh/gamecenter/personalhome/UserHomeViewModel.kt | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java index 5a7e4f58e8..36a4db5e6e 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java @@ -178,7 +178,6 @@ public class PersonalFragment extends BaseFragment implements Observer>() var availableBadgeCount = MutableLiveData() - fun getUserInfos() { + fun getUserInfo() { RetrofitManager.getInstance(getApplication()) .api.getPersonalData(userId, HaloApp.getInstance().channel, Utils.getTime(getApplication())) .subscribeOn(Schedulers.io())