diff --git a/app/src/main/java/com/gh/common/constant/Constants.java b/app/src/main/java/com/gh/common/constant/Constants.java index e67204b880..02af4e5a5e 100644 --- a/app/src/main/java/com/gh/common/constant/Constants.java +++ b/app/src/main/java/com/gh/common/constant/Constants.java @@ -30,6 +30,8 @@ public class Constants { public static final String EB_QUIT_LOGIN = "quit_login"; public static final String GAME_ID_DIVIDER = ":"; // 用于避免历史下载掺和到普通下载状态的 ID 修饰符 + + public static final String GAME_NAME_DECORATOR = " "; // 用于避免历史下载影响到部分依赖名字作为数据更新条件的修饰符 // 最近显示的弹窗信息 public static final String SP_LAST_OPENING_ID = "last_opening_dialog_id"; diff --git a/app/src/main/java/com/gh/common/exposure/ExposureEvent.kt b/app/src/main/java/com/gh/common/exposure/ExposureEvent.kt index 2640e6490f..9949ef8129 100644 --- a/app/src/main/java/com/gh/common/exposure/ExposureEvent.kt +++ b/app/src/main/java/com/gh/common/exposure/ExposureEvent.kt @@ -4,6 +4,7 @@ import android.os.Parcelable import androidx.annotation.Keep import androidx.room.Entity import androidx.room.PrimaryKey +import com.gh.common.constant.Constants import com.gh.common.exposure.meta.Meta import com.gh.common.exposure.meta.MetaUtil import com.gh.common.exposure.time.TimeUtil @@ -28,7 +29,7 @@ data class ExposureEvent( fun createEvent(gameEntity: GameEntity?, source: List, eTrace: List? = null, event: ExposureType = ExposureType.EXPOSURE): ExposureEvent { return ExposureEvent( payload = ExposureEntity(gameId = gameEntity?.id, - gameName = gameEntity?.name, + gameName = gameEntity?.name?.removeSuffix(Constants.GAME_NAME_DECORATOR), sequence = gameEntity?.sequence, platform = gameEntity?.platform, downloadType = gameEntity?.downloadType, diff --git a/app/src/main/java/com/gh/common/util/DataCollectionUtils.java b/app/src/main/java/com/gh/common/util/DataCollectionUtils.java index c802bf3eef..3ff2c16269 100644 --- a/app/src/main/java/com/gh/common/util/DataCollectionUtils.java +++ b/app/src/main/java/com/gh/common/util/DataCollectionUtils.java @@ -13,6 +13,8 @@ import com.lightgame.download.DownloadEntity; import java.util.HashMap; import java.util.Map; +import kotlin.text.StringsKt; + /** * Created by LGT on 2016/12/9. * 数据收集 工具类（data.ghzs666.com） @@ -32,7 +34,7 @@ public class DataCollectionUtils { // 上传下载数据（开始、完成） public static void uploadDownload(Context context, DownloadEntity downloadEntity, String status) { Map map = new HashMap<>(); - map.put("game", downloadEntity.getName()); + map.put("game", StringsKt.removeSuffix(downloadEntity.getName(), Constants.GAME_NAME_DECORATOR)); map.put("game_id", downloadEntity.getRealGameId(Constants.GAME_ID_DIVIDER)); if (downloadEntity.isPluggable()) { map.put("method", "插件化"); diff --git a/app/src/main/java/com/gh/common/util/DownloadObserver.kt b/app/src/main/java/com/gh/common/util/DownloadObserver.kt index b8fd4377bf..967561fca3 100644 --- a/app/src/main/java/com/gh/common/util/DownloadObserver.kt +++ b/app/src/main/java/com/gh/common/util/DownloadObserver.kt @@ -19,7 +19,10 @@ import com.gh.gamecenter.retrofit.RetrofitManager import com.gh.gamecenter.suggest.SuggestType import com.halo.assistant.HaloApp import com.halo.assistant.fragment.SettingsFragment -import com.lightgame.download.* +import com.lightgame.download.DataWatcher +import com.lightgame.download.DownloadEntity +import com.lightgame.download.DownloadStatus +import com.lightgame.download.FileUtils import com.lightgame.utils.AppManager import com.lightgame.utils.Util_System_Phone_State import com.lightgame.utils.Utils @@ -221,7 +224,7 @@ object DownloadObserver { } ExposureUtils.logADownloadCompleteExposureEvent( - GameEntity(id = downloadEntity.getRealGameId(Constants.GAME_ID_DIVIDER), mName = downloadEntity.name), + GameEntity(id = downloadEntity.getRealGameId(Constants.GAME_ID_DIVIDER), mName = downloadEntity.name.removeSuffix(Constants.GAME_NAME_DECORATOR)), downloadEntity.platform, downloadEntity.exposureTrace, type) diff --git a/app/src/main/java/com/gh/common/util/Extensions.kt b/app/src/main/java/com/gh/common/util/Extensions.kt index 83b245c5f5..ab12f08da6 100644 --- a/app/src/main/java/com/gh/common/util/Extensions.kt +++ b/app/src/main/java/com/gh/common/util/Extensions.kt @@ -468,7 +468,7 @@ fun Context.doOnMainProcessOnly(callback: EmptyCallback) { doOnMainProcessOnly { callback.onCallback() } } -fun Context.doOnMainProcessOnly(f: () -> Unit) { +inline fun Context.doOnMainProcessOnly(f: () -> Unit) { val processName = PackageUtils.obtainProcessName(this) if (processName == null || BuildConfig.APPLICATION_ID == processName) { f.invoke() diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListViewModel.kt index 1b62a51180..c2cac5e270 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListViewModel.kt @@ -33,7 +33,7 @@ class HistoryApkListViewModel(application: Application, var game: GameEntity) // 改变 id 避免其它地方根据原有 game id 变更状态 this.isReservable = false this.id = game.id + Constants.GAME_ID_DIVIDER + apk.version - this.name = game.name + " " // 历史版本加个空格避免其他用游戏名来判定是否待安装的地方错误判断 + this.name = game.name + Constants.GAME_NAME_DECORATOR // 历史版本加个空格避免其他用游戏名来判定是否待安装的地方错误判断 this.setApk(arrayListOf(apk)) }) } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt index d11a7b001c..4c482d762d 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt @@ -242,8 +242,8 @@ class RatingCommentItemViewHolder(val binding: RatingCommentItemBinding) : BaseR private fun getSpan(context: Context, name: String, commentData: RatingComment): SpannableStringBuilder { val spanned = SpanBuilder(name) - .color(context, 0, commentData.replyData?.user?.name!!.length, R.color.text_666666) - .size(0, commentData.replyData?.user?.name!!.length, 12) + .color(context, 0, commentData.replyData?.user?.name!!.length, R.color.text_333333) + .size(0, commentData.replyData?.user?.name!!.length, 13) .build() val contentSpan = TextHelper.getHighlightedSpannableStringThatIsWrappedInsideWrapper(context, spanned) diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentFragment.kt index 9ee096ca47..b672969fca 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentFragment.kt @@ -61,6 +61,7 @@ open class NewCommentFragment : ListFragment @BindView(R.id.scrollView) lateinit var mScrollView: ScrollView + @Nullable @BindView(R.id.shadowView) lateinit var mShadowView: View diff --git a/app/src/main/java/com/halo/assistant/fragment/WebFragment.java b/app/src/main/java/com/halo/assistant/fragment/WebFragment.java index 549e274bfa..450646808f 100644 --- a/app/src/main/java/com/halo/assistant/fragment/WebFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/WebFragment.java @@ -25,7 +25,6 @@ import com.gh.common.TimeElapsedHelper; import com.gh.common.constant.Constants; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.CollectionUtils; -import com.gh.common.util.DialogHelper; import com.gh.common.util.DisplayUtils; import com.gh.common.util.EntranceUtils; import com.gh.common.util.GsonUtils; @@ -141,7 +140,7 @@ public class WebFragment extends NormalFragment { RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) closeBtn.getLayoutParams(); params.topMargin = params.topMargin + DisplayUtils.getStatusBarHeight(getResources()); closeBtn.setLayoutParams(params); - closeBtn.setOnClickListener(v -> onBackPressed()); + closeBtn.setOnClickListener(v -> requireActivity().finish()); } } else { initMenu(); @@ -419,7 +418,8 @@ public class WebFragment extends NormalFragment { @Override public boolean onBackPressed() { if (mIsBackpressRequireConfirmation) { - DialogHelper.showDialog( + //v4.0.1统一去掉这个弹窗 + /*DialogHelper.showDialog( requireContext(), "注意", mBackConfirmationContent, @@ -427,8 +427,10 @@ public class WebFragment extends NormalFragment { "暂不", () -> requireActivity().finish(), () -> { - }, true, "H5页面", "退出弹窗"); - return true; + }, true, "H5页面", "退出弹窗");*/ + return false; + } else if (!TextUtils.isEmpty(mGameName)) { + return false; } else if (mWebView.canGoBack()) { mWebView.goBack(); return true; diff --git a/app/src/main/res/layout/gamedetail_item_custom_column.xml b/app/src/main/res/layout/gamedetail_item_custom_column.xml index 9d23b88311..76bfea1f4b 100644 --- a/app/src/main/res/layout/gamedetail_item_custom_column.xml +++ b/app/src/main/res/layout/gamedetail_item_custom_column.xml @@ -65,14 +65,14 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" + app:fadeDuration="500" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" - app:roundedCornerRadius="5dp" - app:viewAspectRatio="2" - app:fadeDuration="500" app:placeholderImage="@drawable/occupy" app:placeholderImageScaleType="fitXY" + app:roundedCornerRadius="5dp" + app:viewAspectRatio="2" tools:layout_width="match_parent" tools:visibility="visible" /> @@ -181,7 +181,7 @@ goneIf="@{customColumn.title == null || TextUtils.isEmpty(customColumn.title.value)}" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="14dp" + android:layout_marginTop="10dp" android:gravity="center_vertical" android:orientation="horizontal" android:visibility="gone" @@ -217,24 +217,37 @@ android:includeFontPadding="false" android:lineSpacingExtra="4dp" android:textColor="@color/text_666666" - android:textSize="12sp" + android:textSize="13sp" android:visibility="gone" app:endText="... " app:expandText="全部" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/contentHintContainer" + app:layout_goneMarginTop="10dp" app:useGradientAlphaEndText="true" tools:text="公告文章、权重大于0的自定义栏目和介绍文案，这三类版块内容可组合拼接为一个整体部分，即拼接内容可为其中两种（如公告文章+介绍文案），也可为全部三种（包括多个自定义栏目内容），其中公告文章和自定义栏目之间、公告文章和介绍文案之间、自定义栏目和介绍文案之间加上分割线隔开" tools:visibility="visible" /> + + + app:layout_constraintTop_toBottomOf="@id/marginSpacer" + app:layout_goneMarginTop="0dp" /> \ No newline at end of file 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 1570e6bc5b..d8850ec614 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 @@ -17,7 +17,7 @@ android:lineSpacingExtra="4dp" android:maxLines="4" android:textColor="@color/text_666666" - android:textSize="12sp" + android:textSize="13sp" tools:text="sample" /> diff --git a/app/src/main/res/layout/gamedetail_item_desc_notice.xml b/app/src/main/res/layout/gamedetail_item_desc_notice.xml index bbaefe0846..386d19b18a 100644 --- a/app/src/main/res/layout/gamedetail_item_desc_notice.xml +++ b/app/src/main/res/layout/gamedetail_item_desc_notice.xml @@ -74,14 +74,14 @@ android:layout_alignParentRight="true" android:layout_centerVertical="true" android:layout_marginLeft="4dp" - android:layout_marginRight="16dp" + android:layout_marginRight="20dp" android:layout_toLeftOf="@id/arrowIv" android:layout_toRightOf="@id/iconIv" app:mvAnimDuration="1000" app:mvInterval="3000" app:mvSingleLine="true" app:mvTextColor="@color/fuli_detail" - app:mvTextSize="12sp" /> + app:mvTextSize="13sp" /> diff --git a/app/src/main/res/layout/item_game_detail_rating_comment.xml b/app/src/main/res/layout/item_game_detail_rating_comment.xml index 9da2f12ac5..294ac752b9 100644 --- a/app/src/main/res/layout/item_game_detail_rating_comment.xml +++ b/app/src/main/res/layout/item_game_detail_rating_comment.xml @@ -76,8 +76,9 @@ android:maxLength="12" android:ellipsize="end" android:text="@{data.user.name}" - android:textColor="@color/text_666666" - android:textSize="12sp" + android:textColor="@color/text_333333" + android:textSize="13sp" + android:textStyle="bold" app:layout_constrainedWidth="true" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="packed" @@ -144,8 +145,8 @@ android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:gravity="center" - android:textColor="@color/hint" - android:textSize="12sp" + android:textColor="@color/text_999999" + android:textSize="10sp" app:layout_constraintBottom_toBottomOf="@+id/rating_start" app:layout_constraintLeft_toRightOf="@id/rating_start" app:layout_constraintTop_toTopOf="@+id/rating_start" /> @@ -173,7 +174,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="4dp" android:maxLines="4" - android:textColor="@color/text_333333" + android:textColor="@color/text_666666" android:textSize="13sp" app:useGradientAlphaEndText="true" app:endText="... " diff --git a/app/src/main/res/layout/rating_comment_item.xml b/app/src/main/res/layout/rating_comment_item.xml index 2c1429927e..fc1fc6c139 100644 --- a/app/src/main/res/layout/rating_comment_item.xml +++ b/app/src/main/res/layout/rating_comment_item.xml @@ -72,10 +72,11 @@ android:layout_centerVertical="true" android:singleLine="true" android:text="@{data.user.name}" - android:textColor="@color/text_666666" - android:textSize="12sp" + android:textColor="@color/text_333333" + android:textSize="13sp" android:maxLines="1" android:ellipsize="end" + android:textStyle="bold" app:layout_constrainedWidth="true" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="packed" @@ -165,7 +166,7 @@ android:layout_marginLeft="8dp" android:gravity="center" android:textColor="@color/text_999999" - android:textSize="11sp" + android:textSize="10sp" app:layout_constraintBottom_toBottomOf="@+id/rating_start" app:layout_constraintLeft_toRightOf="@id/rating_start" app:layout_constraintTop_toTopOf="@+id/rating_start" /> @@ -190,7 +191,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="7dp" android:maxLines="4" - android:textColor="@color/text_333333" + android:textColor="@color/text_666666" android:textSize="13sp" app:useGradientAlphaEndText="true" app:endText="... " @@ -312,7 +313,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="4dp" android:maxLines="2" - android:textColor="@color/text_333333" + android:textColor="@color/text_666666" android:textSize="13sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -338,7 +339,7 @@ android:layout_marginTop="8dp" android:text="查看更多回复>" android:textColor="@color/theme_font" - android:textSize="11sp" + android:textSize="13sp" android:includeFontPadding="false" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@id/reply_content" />