diff --git a/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java b/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java index 213215a040..d07b03db71 100644 --- a/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java +++ b/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java @@ -49,10 +49,10 @@ public class DetailDownloadUtils { if (viewHolder.gameEntity.getApk().isEmpty() || viewHolder.gameEntity.getDownloadOffStatus() != null) { LinkEntity h5LinkEntity = viewHolder.gameEntity.getH5Link(); - + if (h5LinkEntity != null) { if ("play".equals(h5LinkEntity.getType())) { - String defaultString = String.format("开始玩" + "《%s》", viewHolder.gameEntity.getName()); + String defaultString = String.format("开始玩" + "《%s》", viewHolder.gameEntity.getName()); viewHolder.mDownloadPb.setText(TextUtils.isEmpty(h5LinkEntity.getText()) ? defaultString : h5LinkEntity.getText()); } else { viewHolder.mDownloadPb.setText(TextUtils.isEmpty(h5LinkEntity.getText()) ? "查看" : h5LinkEntity.getText()); @@ -86,6 +86,11 @@ public class DetailDownloadUtils { viewHolder.mDownloadPb.setText(status); } else if (TextUtils.isEmpty(viewHolder.downloadAddWord)) { viewHolder.mDownloadPb.setText(String.format(status + "《%s》", viewHolder.gameEntity.getName())); + } else if (viewHolder.gameEntity.getVersionNumber().contains("无版号")) { + viewHolder.gameEntity.getApk(); + if (!viewHolder.gameEntity.getApk().isEmpty()) { + viewHolder.mDownloadPb.setText(String.format(status + "(%s)", viewHolder.gameEntity.getApk().get(0).getSize())); + } } else { viewHolder.mDownloadPb.setText(String.format(status + "《%s》%s", viewHolder.gameEntity.getName(), viewHolder.downloadAddWord)); } diff --git a/app/src/main/java/com/gh/common/util/GameUtils.java b/app/src/main/java/com/gh/common/util/GameUtils.java index acd647c89c..613596e68c 100644 --- a/app/src/main/java/com/gh/common/util/GameUtils.java +++ b/app/src/main/java/com/gh/common/util/GameUtils.java @@ -5,8 +5,6 @@ import android.graphics.Color; import android.text.TextUtils; import android.widget.TextView; -import androidx.core.content.ContextCompat; - import com.gh.common.constant.Config; import com.gh.download.DownloadManager; import com.gh.gamecenter.R; @@ -21,6 +19,8 @@ import com.lightgame.download.DownloadStatus; import java.util.List; +import androidx.core.content.ContextCompat; + public class GameUtils { @@ -123,6 +123,8 @@ public class GameUtils { } else { return context.getString(R.string.open); } + } else if (gameEntity.getVersionNumber().contains("无版号")) { + return context.getString(R.string.attempt); } else { return context.getString(R.string.download); } diff --git a/app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt index c7cab86187..d86537bcd3 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt @@ -163,7 +163,10 @@ data class GameEntity( @SerializedName("played_game_id") val playedGameId: String = "", @SerializedName("mutex_package") - val mutexPackage: List? = null) : Parcelable { + val mutexPackage: List? = null, + @SerializedName("version_number") + val versionNumber: String = ""//有版号、无版号-有内购、无版号-无内购 +) : Parcelable { @IgnoredOnParcel private var entryMap: androidx.collection.ArrayMap? = androidx.collection.ArrayMap() diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 400091d995..435b97b6cd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -341,6 +341,7 @@ 更新中 等待中 打开 + 试玩 已淘号:%1$s]]> 已领取:%1$s]]> diff --git a/gradle.properties b/gradle.properties index d41a2af5a2..9528441539 100644 --- a/gradle.properties +++ b/gradle.properties @@ -44,8 +44,8 @@ MEIZUPUSH_APPKEY=86792462189846c0b8b701e7bb4d11c1 BUGLY_APPID=d5de44c594 # hosts -DEV_API_HOST=https\://dev.api.ghzs666.com/v3d7d5/ -DEV_COMMENT_HOST=https\://dev.api.ghzs666.com/v3d7d5/ +DEV_API_HOST=https\://dev.api.ghzs666.com/v4d0d0/ +DEV_COMMENT_HOST=https\://dev.api.ghzs666.com/v4d0d0/ DEV_DATA_HOST=https\://data.ghzs.com/ API_HOST=https\://api.ghzs.com/v3d7d5/