diff --git a/app/src/main/java/com/gh/base/BaseActivity.java b/app/src/main/java/com/gh/base/BaseActivity.java index 033fca4849..a547621f74 100644 --- a/app/src/main/java/com/gh/base/BaseActivity.java +++ b/app/src/main/java/com/gh/base/BaseActivity.java @@ -15,6 +15,7 @@ import com.gh.common.util.ShareUtils; import com.gh.common.util.StringUtils; import com.gh.gamecenter.LoginActivity; import com.gh.gamecenter.R; +import com.gh.gamecenter.SuggestionActivity; import com.gh.gamecenter.eventbus.EBShowDialog; import com.lightgame.download.FileUtils; import com.lightgame.utils.Utils; @@ -149,6 +150,13 @@ public abstract class BaseActivity extends BaseToolBarActivity implements EasyPe } + } else if ("notfound".equals(showDialog.getType())) { + DialogUtils.showAlertDialog(this, "下载失败", "下载链接已失效，建议提交反馈" + , "立即反馈", "取消" + , () -> { + SuggestionActivity.startSuggestionActivity(this, 4, + null, showDialog.getPath() + "，问题反馈：下载链接失效"); + }, null); } } } diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index b26ae962e8..6b639451b1 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -178,6 +178,8 @@ public class MainActivity extends BaseActivity { downloadEntity.setStatus(DownloadStatus.cancel); DownloadManager.getInstance(getApplicationContext()).cancel(downloadEntity.getUrl()); toast("该链接已失效！请联系管理员。"); + + EventBus.getDefault().post(new EBShowDialog("notfound", downloadEntity.getName())); return; } else if (DownloadStatus.neterror.equals(downloadEntity.getStatus()) || DownloadStatus.timeout.equals(downloadEntity.getStatus())) { diff --git a/app/src/main/java/com/gh/gamecenter/ask/QuestionsEditFragment.java b/app/src/main/java/com/gh/gamecenter/ask/QuestionsEditFragment.java index 5f6fea4a4c..f750950358 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/QuestionsEditFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/QuestionsEditFragment.java @@ -530,6 +530,9 @@ public class QuestionsEditFragment extends NormalFragment { } } else { List tags = mQuestionsEntity.getTags(); + for (String s : mAllTagList) { + addTag(s, false); + } for (int i = tags.size() - 1; i >= 0; i--) { addTag(tags.get(i), true); } diff --git a/app/src/main/java/com/gh/gamecenter/entity/MessageUnreadEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/MessageUnreadEntity.kt index 88d825cb2b..135292c607 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/MessageUnreadEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/MessageUnreadEntity.kt @@ -35,4 +35,7 @@ class MessageUnreadEntity { @SerializedName("answer_comment") var answerComment: Int = 0 + + @SerializedName("system_invited") + var systemInvited: Int = 0 } diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java index 7011892b74..5e4b64cdba 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java @@ -3,7 +3,6 @@ package com.gh.gamecenter.libao; import android.content.Intent; import android.os.Bundle; import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; @@ -129,6 +128,8 @@ public class Libao2Fragment extends BaseFragment implements SwipeRefreshLayout.O mRefreshLayout.setRefreshing(false); mLoadingLayout.setVisibility(View.GONE); mEmptyLayout.setVisibility(View.VISIBLE); + mNoDataTv.setText(R.string.game_empty); + mNoDataTv.setTextColor(getResources().getColor(R.color.c7c7c7)); } @Override @@ -138,7 +139,7 @@ public class Libao2Fragment extends BaseFragment implements SwipeRefreshLayout.O mLoadingLayout.setVisibility(View.GONE); mEmptyLayout.setVisibility(View.VISIBLE); mNoDataTv.setText(R.string.login_hint); - mNoDataTv.setTextColor(ContextCompat.getColor(getContext(), R.color.theme)); + mNoDataTv.setTextColor(getResources().getColor(R.color.theme)); } @Override diff --git a/app/src/main/java/com/gh/gamecenter/login/UserRepository.java b/app/src/main/java/com/gh/gamecenter/login/UserRepository.java index 0e9044fd51..3a7e23a7d9 100644 --- a/app/src/main/java/com/gh/gamecenter/login/UserRepository.java +++ b/app/src/main/java/com/gh/gamecenter/login/UserRepository.java @@ -88,13 +88,11 @@ class UserRepository { mApiService = RetrofitManager.getInstance(context).getApi(); mAppDatabase = database; mCachedId = PreferenceManager.getDefaultSharedPreferences(context).getString(Constants.LOGIN_TOKEN_ID, null); - Utils.log("===========::" + mCachedId); if (!TextUtils.isEmpty(mCachedId)) checkLogin(); } protected void checkLogin() { LoginTokenEntity tokenEntity = mAppDatabase.loginTokenDao().getTokenById(mCachedId); - Utils.log("===========checkLogin::" + tokenEntity); if (tokenEntity == null) return; TokenEntity accessToken = tokenEntity.getAccessToken(); diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageUnreadViewModel.java b/app/src/main/java/com/gh/gamecenter/message/MessageUnreadViewModel.java index fb8aa28499..96479bbf88 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageUnreadViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageUnreadViewModel.java @@ -63,8 +63,9 @@ public class MessageUnreadViewModel extends AndroidViewModel { } break; case INVITE: - if (cacheUnreadData.getInvited() != 0) { + if (cacheUnreadData.getInvited() + cacheUnreadData.getSystemInvited() != 0) { cacheUnreadData.setInvited(0); + cacheUnreadData.setSystemInvited(0); isChange = true; } break; diff --git a/app/src/main/res/layout/area_title_item.xml b/app/src/main/res/layout/area_title_item.xml index c31254f8b6..a140d70d58 100644 --- a/app/src/main/res/layout/area_title_item.xml +++ b/app/src/main/res/layout/area_title_item.xml @@ -1,11 +1,10 @@ - - + android:layout_height = "37dp" + android:background = "@color/background" + android:gravity = "center_vertical" + android:paddingLeft = "20dp" + android:textColor = "@color/black" + android:textSize = "11sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_region.xml b/app/src/main/res/layout/fragment_region.xml index afe31a0202..a0a168676e 100644 --- a/app/src/main/res/layout/fragment_region.xml +++ b/app/src/main/res/layout/fragment_region.xml @@ -11,11 +11,11 @@ + android:textColor = "@color/black" + android:textSize = "11sp" + android:visibility = "gone" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_userinfo_edit.xml b/app/src/main/res/layout/fragment_userinfo_edit.xml index fdfde84912..1662ee6f79 100644 --- a/app/src/main/res/layout/fragment_userinfo_edit.xml +++ b/app/src/main/res/layout/fragment_userinfo_edit.xml @@ -143,7 +143,7 @@ android:paddingRight = "18dp" android:text = "@string/userinfo_edit_contact_explain" android:textColor = "@color/hint" - android:textSize = "14sp" /> + android:textSize = "13sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/gamedetail_item_news.xml b/app/src/main/res/layout/gamedetail_item_news.xml index 354358faef..17cd9cf45c 100644 --- a/app/src/main/res/layout/gamedetail_item_news.xml +++ b/app/src/main/res/layout/gamedetail_item_news.xml @@ -55,7 +55,7 @@ android:layout_width = "match_parent" android:layout_height = "1dp" android:background = "@color/cutting_line" - android:visibility = "gone" /> + android:visibility = "visible" /> + android:visibility = "visible" > + android:textSize = "9sp" /> + android:layout_marginLeft = "8dp" + android:ellipsize = "end" + android:singleLine = "true" + android:textColor = "@color/title" + android:textSize = "14sp" /> + android:textSize = "9sp" /> + android:layout_marginLeft = "8dp" + android:ellipsize = "end" + android:singleLine = "true" + android:textColor = "@color/title" + android:textSize = "14sp" /> + android:textSize = "9sp" /> + android:layout_marginLeft = "8dp" + android:ellipsize = "end" + android:singleLine = "true" + android:textColor = "@color/title" + android:textSize = "14sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/layout_search_bar.xml b/app/src/main/res/layout/layout_search_bar.xml index 78b754f58d..cdf6463691 100644 --- a/app/src/main/res/layout/layout_search_bar.xml +++ b/app/src/main/res/layout/layout_search_bar.xml @@ -3,10 +3,10 @@ xmlns:app = "http://schemas.android.com/apk/res-auto" android:layout_width = "wrap_content" android:layout_height = "35dp" - android:layout_marginBottom = "15dp" + android:layout_marginBottom = "20dp" android:layout_marginLeft = "20dp" android:layout_marginRight = "20dp" - android:layout_marginTop = "15dp" + android:layout_marginTop = "20dp" android:gravity = "center_vertical" android:descendantFocusability="beforeDescendants" android:focusableInTouchMode="true" diff --git a/app/src/main/res/layout/message_item_top.xml b/app/src/main/res/layout/message_item_top.xml index 5d2f43237c..2eedba1903 100644 --- a/app/src/main/res/layout/message_item_top.xml +++ b/app/src/main/res/layout/message_item_top.xml @@ -96,8 +96,8 @@ app:layout_constraintVertical_chainStyle = "packed" />