diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9a717a0f51..47719f2371 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -304,7 +304,8 @@
+ android:screenOrientation = "portrait"
+ android:windowSoftInputMode = "stateHidden"/>
()
var gameUpdateEntity: GameUpdateEntity
var i = 0
diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuAdapter.java
index c478c8e7f5..85a4f86e88 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuAdapter.java
@@ -376,8 +376,10 @@ public class GameDetailKaiFuAdapter extends BaseRecyclerAdapter {
} else {
if (day < curDay && !isNextMonth) {
viewHolder.itemView.setBackgroundColor(Color.parseColor("#30000000"));
+ viewHolder.calendarHint.setBackgroundResource(R.drawable.kaifu_item_hint_gray);
} else {
viewHolder.itemView.setBackgroundDrawable(new ColorDrawable(0));
+ viewHolder.calendarHint.setBackgroundResource(R.drawable.kaifu_item_hint);
}
viewHolder.calendarDay.setText(String.valueOf(day));
viewHolder.calendarDay.setTextColor(ContextCompat.getColor(mContext, R.color.text_3a3a3a));
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 3f590b5e72..50fe5c75c3 100644
--- a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpAdapter.java
@@ -249,20 +249,6 @@ public class KaiFuVpAdapter extends BaseRecyclerAdapter {
viewHolder.gameName.setText(gameEntity.getName());
viewHolder.gameThumb.setImageURI(gameEntity.getIcon());
- String type = gameEntity.getServerEntity().getType();
- if ("不删档内测".equals(type) || "删档内测".equals(type)) {
- KaiFuUtils.setKaiFuType(viewHolder.gameTestType, gameEntity.getServerEntity().getType());
- } else if ("公测".equals(type)) {
- String note = gameEntity.getServerEntity().getNote();
- if (TextUtils.isEmpty(note)) {
- KaiFuUtils.setKaiFuType(viewHolder.gameTestType, gameEntity.getServerEntity().getType());
- } else {
- KaiFuUtils.setKaiFuType(viewHolder.gameTestType, gameEntity.getServerEntity().getType() + "：" + note);
- }
- } else {
- KaiFuUtils.setKaiFuType(viewHolder.gameTestType, gameEntity.getServerEntity().getNote());
- }
-
if (TextUtils.isEmpty(gameEntity.getServerEntity().getRemark())) {
viewHolder.gameTestTime.setVisibility(View.GONE);
} else {
@@ -271,6 +257,24 @@ public class KaiFuVpAdapter extends BaseRecyclerAdapter {
viewHolder.gameTestTime.setBackgroundColor(ContextCompat.getColor(mContext, R.color.tag_orange));
}
+ String type = gameEntity.getServerEntity().getType();
+ if ("不删档内测".equals(type) || "删档内测".equals(type)) {
+ if (viewHolder.gameTestTime.getVerticalFadingEdgeLength() == View.GONE) {
+ KaiFuUtils.setKaiFuType(viewHolder.gameTestType, gameEntity.getServerEntity().getType());
+ }
+ } else if ("公测".equals(type)) {
+ if (viewHolder.gameTestTime.getVerticalFadingEdgeLength() == View.GONE) {
+ String note = gameEntity.getServerEntity().getNote();
+ if (TextUtils.isEmpty(note)) {
+ KaiFuUtils.setKaiFuType(viewHolder.gameTestType, gameEntity.getServerEntity().getType());
+ } else {
+ KaiFuUtils.setKaiFuType(viewHolder.gameTestType, gameEntity.getServerEntity().getType() + "：" + note);
+ }
+ }
+ } else {
+ KaiFuUtils.setKaiFuType(viewHolder.gameTestType, gameEntity.getServerEntity().getNote());
+ }
+
if (gameEntity.getApk() == null || gameEntity.getApk().isEmpty()) {
viewHolder.gameDes.setText(gameEntity.getBrief());
} else {
diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpFragment.java b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpFragment.java
index cd80657dcd..824b828a8d 100644
--- a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpFragment.java
@@ -161,16 +161,13 @@ public class KaiFuVpFragment extends BaseFragment {
int buttom = mLayoutManager.findViewByPosition(position).getBottom();
if (buttom <= mKaiFuTimeLl.getHeight()) {
mLlparams.topMargin = buttom - mKaiFuTimeLl.getHeight();
- mKaiFuTimeLl.setLayoutParams(mLlparams);
} else {
mLlparams.topMargin = 0;
- mKaiFuTimeLl.setLayoutParams(mLlparams);
}
} else {
mLlparams.topMargin = 0;
- mKaiFuTimeLl.setLayoutParams(mLlparams);
}
-
+ mKaiFuTimeLl.setLayoutParams(mLlparams);
if (getParentFragment() instanceof KaiFuFragment) {
int lastVisibleItemPosition = mLayoutManager.findLastVisibleItemPosition();
if (lastVisibleItemPosition == mAdapter.getItemCount() - 1 && mAdapter.isRemove()) {
@@ -330,6 +327,11 @@ public class KaiFuVpFragment extends BaseFragment {
}
} else if (KaiFuWrapperFragment.SKIP_LIST_TOP.equals(type)) {
mLayoutManager.scrollToPosition(0);
+ mBaseHandler.postDelayed(() -> {
+ mLlparams.topMargin = 0;
+ mKaiFuTimeLl.setLayoutParams(mLlparams);
+ }, 10);
+
}
}
diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/patch/PatchKaifuViewModel.kt b/app/src/main/java/com/gh/gamecenter/kaifu/patch/PatchKaifuViewModel.kt
index 8c953c7c3f..b0ac94097e 100644
--- a/app/src/main/java/com/gh/gamecenter/kaifu/patch/PatchKaifuViewModel.kt
+++ b/app/src/main/java/com/gh/gamecenter/kaifu/patch/PatchKaifuViewModel.kt
@@ -60,6 +60,14 @@ class PatchKaifuViewModel(application: Application) : AndroidViewModel(applicati
override fun onFailure(e: HttpException?) {
super.onFailure(e)
+ if (e != null) {
+ val string = e.response().errorBody().string()
+ val objects = JSONObject(string)
+ if (objects.getInt("code") == 403043) {
+ Utils.toast(getApplication(), "提交失败，可能由于数据没有刷新，请5-10分钟后再试")
+ return
+ }
+ }
Utils.toast(getApplication(), R.string.post_failure_hint)
}
})
diff --git a/app/src/main/java/com/gh/gamecenter/manager/PackageManager.kt b/app/src/main/java/com/gh/gamecenter/manager/PackageManager.kt
index f59cfaa66d..cc375ec810 100644
--- a/app/src/main/java/com/gh/gamecenter/manager/PackageManager.kt
+++ b/app/src/main/java/com/gh/gamecenter/manager/PackageManager.kt
@@ -180,9 +180,10 @@ object PackageManager {
fun removeUpdate(packageName: String) {
var i = 0
while (i < updateAndPluginList.size) {
- if (packageName == updateAndPluginList[i].packageName) {
- postEventBusMessage(updateAndPluginList[i].isPluggable)
+ val entity = updateAndPluginList[i]
+ if (packageName == entity.packageName) {
updateAndPluginList.removeAt(i)
+ postEventBusMessage(entity.isPluggable)
i--
}
i++
diff --git a/app/src/main/res/drawable/kaifu_item_hint_gray.xml b/app/src/main/res/drawable/kaifu_item_hint_gray.xml
new file mode 100644
index 0000000000..f08dcdbe02
--- /dev/null
+++ b/app/src/main/res/drawable/kaifu_item_hint_gray.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_ask_column_detail.xml b/app/src/main/res/layout/activity_ask_column_detail.xml
index 6f323f6f4e..7d22797def 100644
--- a/app/src/main/res/layout/activity_ask_column_detail.xml
+++ b/app/src/main/res/layout/activity_ask_column_detail.xml
@@ -101,11 +101,15 @@
android:background = "@drawable/tabbar_left_selector"
android:gravity = "center"
android:onClick = "@{(v)-> clickListener.onClick(v, 0)}"
- android:text = "@string/ask_hot"
+ android:text = "热门"
android:textAlignment = "center"
android:textColor = "@color/tabbar_textcolor_selector"
android:textSize = "12sp" />
+
+
+
diff --git a/app/src/main/res/layout/gamedetail_calendar_item.xml b/app/src/main/res/layout/gamedetail_calendar_item.xml
index 2c9964c948..8f0c60b819 100644
--- a/app/src/main/res/layout/gamedetail_calendar_item.xml
+++ b/app/src/main/res/layout/gamedetail_calendar_item.xml
@@ -29,7 +29,7 @@
+ android:paddingTop = "1dp"
+ android:focusable="true"
+ android:focusableInTouchMode="true">