From e7af8840fdc2daed4dcac9d58c2eab6e8c49ab13 Mon Sep 17 00:00:00 2001 From: jack <1484288157@qq.com> Date: Wed, 15 Dec 2021 10:01:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=B8=80=E4=BA=9B=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/gh/base/BaseActivity.java | 2 +- app/src/main/java/com/gh/common/util/TimestampUtils.java | 2 +- .../main/java/com/gh/common/view/CircleProgressBar.java | 2 +- .../main/java/com/gh/gamecenter/LibaoDetailActivity.java | 8 ++++---- .../main/java/com/gh/gamecenter/NewsDetailActivity.java | 1 + .../forum/home/ForumArticleAskItemViewHolder.kt | 2 +- .../main/java/com/gh/gamecenter/manager/UserManager.java | 2 +- .../gh/gamecenter/qa/article/edit/ArticleEditActivity.kt | 1 - .../qa/recommends/AskQuestionsRecommendsViewModel.java | 4 ++-- .../assistant/fragment/user/SelectPortraitFragment.java | 1 - .../assistant/fragment/user/SelectRegionFragment.java | 8 +++++++- 11 files changed, 19 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/gh/base/BaseActivity.java b/app/src/main/java/com/gh/base/BaseActivity.java index d87c7fb9a1..6360c79126 100644 --- a/app/src/main/java/com/gh/base/BaseActivity.java +++ b/app/src/main/java/com/gh/base/BaseActivity.java @@ -146,7 +146,7 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy String xapkUnzipActivity = SPUtils.getString(Constants.SP_XAPK_UNZIP_ACTIVITY); String xapkUrl = SPUtils.getString(Constants.SP_XAPK_URL); Utils.log("页面重建了--" + xapkUnzipActivity + "--" + xapkUrl); - if (this.getClass().getName().equals(SplashScreenActivity.class.getName())) { + if (this.getClass().isAssignableFrom(SplashScreenActivity.class)) { SPUtils.setString(Constants.SP_XAPK_UNZIP_ACTIVITY, ""); SPUtils.setString(Constants.SP_XAPK_URL, ""); return; diff --git a/app/src/main/java/com/gh/common/util/TimestampUtils.java b/app/src/main/java/com/gh/common/util/TimestampUtils.java index 73cd4ddbb0..3481a3f8cd 100644 --- a/app/src/main/java/com/gh/common/util/TimestampUtils.java +++ b/app/src/main/java/com/gh/common/util/TimestampUtils.java @@ -124,7 +124,7 @@ public class TimestampUtils { } long now = System.currentTimeMillis(); // Utils.log("url now timestamp = " + now); - return (long) (Math.ceil((now - base) / cd) * cd + base); + return (long) (Math.ceil(((float)(now - base)) / cd) * cd + base); } private static ArrayMap getIntervalMap() { diff --git a/app/src/main/java/com/gh/common/view/CircleProgressBar.java b/app/src/main/java/com/gh/common/view/CircleProgressBar.java index 10b5ddbf8a..d889cc78f8 100644 --- a/app/src/main/java/com/gh/common/view/CircleProgressBar.java +++ b/app/src/main/java/com/gh/common/view/CircleProgressBar.java @@ -123,7 +123,7 @@ public class CircleProgressBar extends View { fontMetrics = fontPaint.getFontMetrics(); float textWidth = fontPaint.measureText(centerText); float textHeight = fontPaint.ascent() + fontPaint.descent(); - canvas.drawText(centerText, width / 2 - textWidth / 2, height / 2 - textHeight / 2, fontPaint); + canvas.drawText(centerText, (float) width / 2 - textWidth / 2, (float) height / 2 - textHeight / 2, fontPaint); } } diff --git a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java index 43492dd713..1a7f62a4f1 100644 --- a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java @@ -113,10 +113,10 @@ public class LibaoDetailActivity extends ToolBarActivity implements LibaoDetailA Calendar calendar = Calendar.getInstance(); Date date = new Date(time * 1000); calendar.setTime(date); - calendar.set(Calendar.HOUR_OF_DAY, 24); - calendar.set(Calendar.SECOND, 0); - calendar.set(Calendar.MINUTE, 0); - calendar.set(Calendar.MILLISECOND, 0); + calendar.set(Calendar.HOUR_OF_DAY, 23); + calendar.set(Calendar.SECOND, 59); + calendar.set(Calendar.MINUTE, 59); + calendar.add(Calendar.SECOND, 1); long targetTime = calendar.getTimeInMillis(); long delayedTime = targetTime - time * 1000; diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index 737e71994e..6110652d14 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -511,6 +511,7 @@ public class NewsDetailActivity extends ToolBarActivity implements OnClickListen if (mIsCollectionNews && mNewsEntity != null && response != null) { // 对比查看收藏文章是否修改 return; } + if (response == null) return; mNewsEntity = response; if (response.getType() != null) { diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleAskItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleAskItemViewHolder.kt index 98ff5b5c15..70cc3c52f6 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleAskItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleAskItemViewHolder.kt @@ -247,7 +247,7 @@ class ForumArticleAskItemViewHolder(val binding: CommunityAnswerItemBinding) : B } forumNameTv.setOnClickListener { - MtaHelper.onEvent(getEventId(entrance), getKey(entrance), if (entity.bbs.name.isEmpty()) entity.bbs.name else entity.bbs.name) + MtaHelper.onEvent(getEventId(entrance), getKey(entrance), entity.bbs.name) itemView.context.startActivity(ForumDetailActivity.getIntent(itemView.context, entity.bbs.id, entrance)) LogUtils.uploadAccessToBbs(entity.bbs.id, "文章外所属论坛") } diff --git a/app/src/main/java/com/gh/gamecenter/manager/UserManager.java b/app/src/main/java/com/gh/gamecenter/manager/UserManager.java index d679e9447d..3985ee7f95 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/UserManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/UserManager.java @@ -50,7 +50,7 @@ public class UserManager { private final String COMMUNITY_KEY = "CommunityKey"; - private volatile static UserManager singleton; + private static UserManager singleton; private SharedPreferences mSp; diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt index cccef86df9..783a62dc7f 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt @@ -331,7 +331,6 @@ class ArticleEditActivity : BaseRichEditorActivity(), Keyb mActivityTitle.setTextColor(R.color.text_FA8500.toColor()) } mViewModel.type = mViewModel.draftEntity?.type ?: "" - mViewModel.gameEntity = mViewModel.gameEntity mEditTitle.setText(mViewModel.draftEntity?.title) mGameName.isEnabled = true setGameName() diff --git a/app/src/main/java/com/gh/gamecenter/qa/recommends/AskQuestionsRecommendsViewModel.java b/app/src/main/java/com/gh/gamecenter/qa/recommends/AskQuestionsRecommendsViewModel.java index 2bcff3c13c..5c32c41f7d 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/recommends/AskQuestionsRecommendsViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/qa/recommends/AskQuestionsRecommendsViewModel.java @@ -115,9 +115,9 @@ public class AskQuestionsRecommendsViewModel extends BaseListViewModel response) { if (response != null && !response.isEmpty()) { mPreference.edit().putString(getFollowDayKey(), today).apply(); - String bindKey = null; + String bindKey = ""; if (!isNewData) { - bindKey = mPreference.getString(getFollowBindKey(), null); + bindKey = mPreference.getString(getFollowBindKey(), ""); } addSuggestedFollowToList(response, bindKey); mCacheFollowList.clear(); diff --git a/app/src/main/java/com/halo/assistant/fragment/user/SelectPortraitFragment.java b/app/src/main/java/com/halo/assistant/fragment/user/SelectPortraitFragment.java index 40978ff61b..1177a2d070 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/SelectPortraitFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/user/SelectPortraitFragment.java @@ -4,7 +4,6 @@ import android.app.Dialog; import android.content.ActivityNotFoundException; import android.content.Intent; import android.content.SharedPreferences; -import android.database.Cursor; import android.net.Uri; import android.os.Bundle; import android.preference.PreferenceManager; diff --git a/app/src/main/java/com/halo/assistant/fragment/user/SelectRegionFragment.java b/app/src/main/java/com/halo/assistant/fragment/user/SelectRegionFragment.java index 7c54b37020..53488337b5 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/SelectRegionFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/user/SelectRegionFragment.java @@ -1,12 +1,16 @@ package com.halo.assistant.fragment.user; import android.app.Dialog; + import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProviders; + import android.os.Bundle; + import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentTransaction; + import android.text.TextUtils; import com.gh.common.util.DialogUtils; @@ -73,7 +77,9 @@ public class SelectRegionFragment extends NormalFragment implements OnBackPresse mProvFragment = alterFragment(transaction, RegionProvFragment.class); Bundle args = new Bundle(); args.putStringArrayList(EntranceUtils.KEY_PROLIST, new ArrayList<>(provinceList)); - mProvFragment.setArguments(args); + if (mProvFragment != null) { + mProvFragment.setArguments(args); + } setNavigationTitle(provinceName); } transaction.commitAllowingStateLoss();