From cf2de0449ebf654b357dc88397ab229d820918ff Mon Sep 17 00:00:00 2001 From: juntao Date: Mon, 23 May 2022 11:38:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=83=A8=E5=88=86=20SonarQub?= =?UTF-8?q?e=20=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/GlobalActivityLifecycleObserver.kt | 4 +-- .../gh/common/util/ConcernContentUtils.java | 13 +++++--- .../com/gh/common/util/DownloadItemUtils.kt | 1 - .../java/com/gh/common/util/LogUtils.java | 31 ------------------- .../java/com/gh/common/util/NewLogUtils.kt | 1 - .../com/gh/gamecenter/NewsDetailActivity.java | 17 ++-------- .../home/HomeRecommendItemViewHolder.kt | 1 - .../gh/gamecenter/manager/UserManager.java | 6 +--- .../message/MessageItemViewHolder.java | 2 -- .../personal/PersonalFunctionAdapter.kt | 24 +++++++------- .../qa/answer/detail/AnswerDetailFragment.kt | 8 ++--- .../qa/answer/detail/AnswerDetailViewModel.kt | 16 +++++----- .../qa/article/MyArticleFragment.kt | 4 +-- .../gh/gamecenter/user/UserRepository.java | 9 ------ .../main/java/com/halo/assistant/HaloApp.java | 9 ++---- 15 files changed, 39 insertions(+), 107 deletions(-) diff --git a/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt b/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt index 8514ce8de7..c2629d2d1f 100644 --- a/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt +++ b/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt @@ -77,11 +77,11 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks { } override fun onActivityStopped(activity: Activity) { - + // do nothing } override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) { - + // do nothing } override fun onActivityDestroyed(activity: Activity) { diff --git a/app/src/main/java/com/gh/common/util/ConcernContentUtils.java b/app/src/main/java/com/gh/common/util/ConcernContentUtils.java index 6050b27560..50dd34da9a 100644 --- a/app/src/main/java/com/gh/common/util/ConcernContentUtils.java +++ b/app/src/main/java/com/gh/common/util/ConcernContentUtils.java @@ -33,7 +33,7 @@ public class ConcernContentUtils { ll = new LinearLayout(context); ll.setOrientation(LinearLayout.HORIZONTAL); for (int j = 0; j < 3; j++) { - SimpleDraweeView draweeView = getImageView(context, list, entrance, index, width, 0); + SimpleDraweeView draweeView = getImageView(context, list, index, width, 0); imageViewList.add(draweeView); int position = index; draweeView.setOnClickListener(v -> { @@ -47,7 +47,7 @@ public class ConcernContentUtils { count -= 3; break; case 1: - SimpleDraweeView draweeView = getImageView(context, list, entrance, index, width, 1); + SimpleDraweeView draweeView = getImageView(context, list, index, width, 1); imageViewList.add(draweeView); int position1 = index; draweeView.setOnClickListener(v -> { @@ -62,7 +62,7 @@ public class ConcernContentUtils { ll = new LinearLayout(context); ll.setOrientation(LinearLayout.HORIZONTAL); for (int j = 0; j < 2; j++) { - SimpleDraweeView imageView = getImageView(context, list, entrance, index, width, 2); + SimpleDraweeView imageView = getImageView(context, list, index, width, 2); imageViewList.add(imageView); int position2 = index; imageView.setOnClickListener(v -> { @@ -79,8 +79,11 @@ public class ConcernContentUtils { } } - private static SimpleDraweeView getImageView(final Context context, final List list, final String entrance, - final int position, int width, int type) { + private static SimpleDraweeView getImageView(final Context context, + final List list, + final int position, + int width, + int type) { SimpleDraweeView imageView; LinearLayout.LayoutParams lparams; switch (type) { diff --git a/app/src/main/java/com/gh/common/util/DownloadItemUtils.kt b/app/src/main/java/com/gh/common/util/DownloadItemUtils.kt index 64e2c3ce45..338c41317e 100644 --- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.kt +++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.kt @@ -890,7 +890,6 @@ object DownloadItemUtils { isSubscribe: Boolean, traceEvent: ExposureEvent? ) { - val apkEntity = gameEntity.getApk()[0] DownloadManager.createDownload(context, gameEntity, "更新", entrance, location, isSubscribe, traceEvent) } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/util/LogUtils.java b/app/src/main/java/com/gh/common/util/LogUtils.java index e4e3709c61..85772e4f8a 100644 --- a/app/src/main/java/com/gh/common/util/LogUtils.java +++ b/app/src/main/java/com/gh/common/util/LogUtils.java @@ -486,37 +486,6 @@ public class LogUtils { LoghubUtils.log(GsonUtils.toJsonIgnoreNull(entity), "event", false); } - private static void uploadShare(JSONObject object) { - Meta meta = MetaUtil.INSTANCE.getMeta(); - JSONObject metaObject = new JSONObject(); - try { - metaObject.put("dia", MetaUtil.getBase64EncodedAndroidId()); - metaObject.put("android_sdk", meta.getAndroid_sdk()); - metaObject.put("android_version", meta.getAndroid_version()); - metaObject.put("appVersion", meta.getAppVersion()); - metaObject.put("channel", meta.getChannel()); - metaObject.put("gid", meta.getGid()); - metaObject.put("jnfj", MetaUtil.getBase64EncodedIMEI()); - metaObject.put("mac", meta.getMac()); - metaObject.put("manufacturer", meta.getManufacturer()); - metaObject.put("model", meta.getModel()); - metaObject.put("network", meta.getNetwork()); - metaObject.put("os", meta.getOs()); - metaObject.put("userId", meta.getUserId()); - - object.put("event", "SHARE"); - object.put("meta", metaObject); - object.put("timestamp", System.currentTimeMillis() / 1000); - } catch (JSONException e) { - e.printStackTrace(); - } - if (BuildConfig.DEBUG) { - Utils.log("LogUtils->" + object.toString()); - } - - LoghubUtils.log(object, "event", false); - } - public static JSONObject getMetaObject() { Meta meta = MetaUtil.INSTANCE.getMeta(); JSONObject metaObject = new JSONObject(); diff --git a/app/src/main/java/com/gh/common/util/NewLogUtils.kt b/app/src/main/java/com/gh/common/util/NewLogUtils.kt index 12b4f2e320..359e5b35f8 100644 --- a/app/src/main/java/com/gh/common/util/NewLogUtils.kt +++ b/app/src/main/java/com/gh/common/util/NewLogUtils.kt @@ -6,7 +6,6 @@ import com.gh.gamecenter.common.json.json import com.gh.gamecenter.common.loghub.LoghubUtils import com.gh.gamecenter.common.tracker.Tracker import com.gh.gamecenter.common.utils.toRequestBody -import com.gh.gamecenter.entity.LinkEntity import com.gh.gamecenter.entity.QuoteCountEntity import com.gh.gamecenter.entity.WechatConfigEntity import com.gh.gamecenter.common.retrofit.EmptyResponse diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index 64461f2772..e26b1a58fb 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -412,21 +412,8 @@ public class NewsDetailActivity extends DownloadToolbarActivity implements OnCli int seconds = (int) ((end - start) / 1000); - String cost; - if (seconds < 5) { - cost = "小于5秒"; - } else if (seconds < 30) { - cost = "5秒－30秒"; - } else if (seconds < 60) { - cost = "30秒－60秒"; - } else { - cost = "大于60秒"; - } - - if (adapter.getNewsDetailEntity() != null) { - if (seconds > 0) { - DataCollectionUtils.uploadNews(this, adapter.getNewsDetailEntity(), gameEntity, seconds, mEntrance); - } + if (adapter.getNewsDetailEntity() != null && seconds > 0) { + DataCollectionUtils.uploadNews(this, adapter.getNewsDetailEntity(), gameEntity, seconds, mEntrance); } isSentReport = true; diff --git a/app/src/main/java/com/gh/gamecenter/home/HomeRecommendItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/home/HomeRecommendItemViewHolder.kt index 057e41aaf2..9db2338a9c 100644 --- a/app/src/main/java/com/gh/gamecenter/home/HomeRecommendItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/home/HomeRecommendItemViewHolder.kt @@ -13,7 +13,6 @@ import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.core.utils.PageSwitchDataHelper import com.gh.gamecenter.databinding.HomeRecommendItemBinding import com.gh.gamecenter.entity.GameEntity -import com.gh.gamecenter.entity.HomeRecommend class HomeRecommendItemViewHolder(val binding: HomeRecommendItemBinding) : BaseRecyclerViewHolder(binding.root) { 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 1fba64987b..efd0232e4b 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/UserManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/UserManager.java @@ -197,9 +197,7 @@ public class UserManager { EventBus.getDefault().post(new EBShowDialog(BaseActivity.LOGIN_EXCEPTION, errorMessage)); // 打开提示框 } - if (code == 400401) { // 自动注销 - UserRepository.getInstance().logout(); - } else if (code == 400802) { + if (code == 400401 || code == 400802) { // 自动注销 UserRepository.getInstance().logout(); } } catch (Exception e1) { @@ -207,10 +205,8 @@ public class UserManager { } } else { try { - String errCode = "null"; if (e != null) { errorMessage = e.response().errorBody().string(); - errCode = "" + e.code(); } } catch (Exception ex) { ex.printStackTrace(); diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java b/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java index ce1318933e..214c7704a6 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java @@ -105,7 +105,6 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder mBinding.messageTime.setText(NewsUtils.getFormattedTime(messageEntity.getTime())); List images; String targetUrl = null; // 防止串行 - RelativeLayout.LayoutParams params; switch (messageEntity.getType()) { case "answer": mBinding.messageCommand.setText("回答了你的问题"); @@ -618,7 +617,6 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder if (view == null || entity == null) return; Context context = view.getContext(); CommunityEntity community; - LinkEntity linkEntity; if (view.getId() == R.id.message_original) { MtaHelper.onEvent("消息中心", outerInfo, "点击链接"); diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionAdapter.kt b/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionAdapter.kt index 593bd0a49b..e48ed57cab 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionAdapter.kt @@ -313,22 +313,20 @@ class PersonalFunctionAdapter(val context: Context, val groupName: String, var m } } else -> { - if (PackageFlavorHelper.IS_TEST_FLAVOR) { - if (linkEntity.type == "night_mode") { - val isNightMode = NightModeUtils.getNightMode() + if (PackageFlavorHelper.IS_TEST_FLAVOR && linkEntity.type == "night_mode") { + val isNightMode = NightModeUtils.getNightMode() - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { - NightModeUtils.setNightMode(!isNightMode) - if (isNightMode) { - (context as AppCompatActivity).delegate.localNightMode = - AppCompatDelegate.MODE_NIGHT_NO - } else { - (context as AppCompatActivity).delegate.localNightMode = - AppCompatDelegate.MODE_NIGHT_YES - } + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { + NightModeUtils.setNightMode(!isNightMode) + if (isNightMode) { + (context as AppCompatActivity).delegate.localNightMode = + AppCompatDelegate.MODE_NIGHT_NO + } else { + (context as AppCompatActivity).delegate.localNightMode = + AppCompatDelegate.MODE_NIGHT_YES } - return } + return } DirectUtils.directToLinkPage(context, linkEntity, "", "我的光环") } diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt index 1cf2c01eb4..e148aa5271 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt @@ -104,7 +104,7 @@ open class AnswerDetailFragment : ToolbarFragment() { mIsRecommendsAnswer = it.getBoolean(EntranceConsts.KEY_RECOMMENDS_CONTENTS, false) mPath = it.getString(EntranceConsts.KEY_PATH) mSpecialColumn = it.getParcelable(EntranceConsts.KEY_DATA) - mViewModel.getAnswerDetail(mAnswerId, mEntrance) + mViewModel.getAnswerDetail(mAnswerId) } mBinding.richEditor.enableForceDark(NightModeUtils.isNightMode(requireContext())) mBinding.richEditor.setInputEnabled(false) @@ -398,7 +398,7 @@ open class AnswerDetailFragment : ToolbarFragment() { toast("提交成功") } else { toast("操作成功") - mViewModel.getAnswerDetail(mAnswerId, mEntrance) + mViewModel.getAnswerDetail(mAnswerId) requireActivity().setResult(BaseFragment.RESULT_REFRESH, null) } requireActivity().finish() @@ -762,7 +762,7 @@ open class AnswerDetailFragment : ToolbarFragment() { mBinding.reuseNoConnection.root.setOnClickListener { mBinding.reuseNoConnection.root.visibility = View.GONE mSkeletonScreen?.show() - mViewModel.getAnswerDetail(mAnswerId, mEntrance) + mViewModel.getAnswerDetail(mAnswerId) } mBinding.bottomController.bottomStarIv.setOnClickListener { ifLogin("回答详情-收藏") { @@ -1225,7 +1225,7 @@ open class AnswerDetailFragment : ToolbarFragment() { @Subscribe(threadMode = ThreadMode.MAIN) fun onEventMainThread(reuse: EBReuse) { if (reuse.type == PersonalFragment.LOGIN_TAG && !TextUtils.isEmpty(mAnswerId)) { // 登入 - mViewModel.getAnswerDetail(mAnswerId, mEntrance) + mViewModel.getAnswerDetail(mAnswerId) } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailViewModel.kt index e0a4ac93f6..2aa7b0eb46 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailViewModel.kt @@ -1,25 +1,27 @@ package com.gh.gamecenter.qa.answer.detail import android.app.Application -import android.text.Html import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import com.gh.common.history.HistoryHelper +import com.gh.common.util.CollectionUtils +import com.gh.common.util.EnergyTaskHelper +import com.gh.common.util.ErrorHelper +import com.gh.common.util.LogUtils +import com.gh.gamecenter.R +import com.gh.gamecenter.common.retrofit.ApiResponse +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.common.syncpage.SyncDataEntity import com.gh.gamecenter.common.syncpage.SyncFieldConstants import com.gh.gamecenter.common.syncpage.SyncPageRepository -import com.gh.common.util.* -import com.gh.gamecenter.R import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.core.utils.StringUtils import com.gh.gamecenter.entity.SpecialColumn import com.gh.gamecenter.entity.VoteEntity import com.gh.gamecenter.eventbus.EBUserFollow import com.gh.gamecenter.qa.entity.AnswerDetailEntity -import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager -import com.gh.gamecenter.common.retrofit.ApiResponse import com.lightgame.utils.Utils import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers @@ -54,7 +56,7 @@ class AnswerDetailViewModel(application: Application) : AndroidViewModel(applica val followLiveData: LiveData get() = mFollowLiveData - fun getAnswerDetail(answerId: String, entrance: String) { + fun getAnswerDetail(answerId: String) { RetrofitManager.getInstance().api .getAnswerDetail(answerId, Utils.getTime(getApplication())) .subscribeOn(Schedulers.io()) @@ -64,8 +66,6 @@ class AnswerDetailViewModel(application: Application) : AndroidViewModel(applica answerDetail = response apiResponse.data = response mAnswerLiveData.postValue(apiResponse) - - val content = Html.fromHtml(response!!.content).toString() } override fun onFailure(e: HttpException?) { diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleFragment.kt index afdb776163..1a7e820916 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleFragment.kt @@ -7,7 +7,6 @@ import android.view.MenuItem import android.view.View import androidx.lifecycle.ViewModelProviders import androidx.recyclerview.widget.RecyclerView -import com.gh.gamecenter.common.view.CustomDividerItemDecoration import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListFragment import com.gh.gamecenter.baselist.LoadType @@ -17,14 +16,13 @@ import com.gh.gamecenter.common.utils.checkStoragePermissionBeforeAction import com.gh.gamecenter.common.utils.ifLogin import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.common.utils.toDrawable +import com.gh.gamecenter.common.view.CustomDividerItemDecoration import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.qa.article.edit.ArticleEditActivity -import com.gh.gamecenter.qa.entity.AnswerEntity import com.gh.gamecenter.qa.entity.ArticleEntity import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import io.reactivex.Observable -import io.reactivex.functions.Function class MyArticleFragment : ListFragment>() { diff --git a/app/src/main/java/com/gh/gamecenter/user/UserRepository.java b/app/src/main/java/com/gh/gamecenter/user/UserRepository.java index 40f255019a..325c509eb0 100644 --- a/app/src/main/java/com/gh/gamecenter/user/UserRepository.java +++ b/app/src/main/java/com/gh/gamecenter/user/UserRepository.java @@ -169,7 +169,6 @@ public class UserRepository { Observable observable = null; String userToken = null; - String loginTypeForHumanEyes = ""; try { JSONObject device = DeviceUtils.getLoginDevice(mContext.getApplicationContext()); @@ -177,27 +176,21 @@ public class UserRepository { RequestBody body = RequestBody.create(MediaType.parse("application/json"), content.toString()); if (loginTag == LoginTag.weibo) { - loginTypeForHumanEyes = "微博"; userToken = content.getString("uid"); observable = mApiService.loginByWeibo(body); } else if (loginTag == LoginTag.qq) { - loginTypeForHumanEyes = "QQ"; userToken = content.getString("openid"); observable = mApiService.loginByQQ(body); } else if (loginTag == LoginTag.wechat) { - loginTypeForHumanEyes = "微信"; userToken = content.getString("openid"); observable = mApiService.loginByWechat(body); } else if (loginTag == LoginTag.douyin) { - loginTypeForHumanEyes = "抖音"; userToken = content.getString("openid"); observable = mApiService.loginByDouYin(body); } else if (loginTag == LoginTag.phone) { - loginTypeForHumanEyes = "手机"; userToken = content.getString("mobile"); observable = mApiService.loginByMobile(body); } else if (loginTag == LoginTag.oauth) { - loginTypeForHumanEyes = "一键登录"; userToken = content.getString("token"); observable = mApiService.loginByOauth(body); } else { @@ -207,8 +200,6 @@ public class UserRepository { e.printStackTrace(); } - String finalLoginTypeForHumanEyes = loginTypeForHumanEyes; - if (observable == null) return; final String finalUserToken = userToken; diff --git a/app/src/main/java/com/halo/assistant/HaloApp.java b/app/src/main/java/com/halo/assistant/HaloApp.java index 70be32861c..ed5c2c508e 100644 --- a/app/src/main/java/com/halo/assistant/HaloApp.java +++ b/app/src/main/java/com/halo/assistant/HaloApp.java @@ -81,7 +81,7 @@ import tv.danmaku.ijk.media.exo2.ExoPlayerCacheManager; public class HaloApp extends MultiDexApplication implements Configuration.Provider { private static HaloApp mInstance; - private static ArrayMap sObjectMap = new ArrayMap<>(); + private static final ArrayMap sObjectMap = new ArrayMap<>(); private String mChannel; private String mGid; @@ -99,8 +99,6 @@ public class HaloApp extends MultiDexApplication implements Configuration.Provid public boolean isNewForThisVersion = false; // 当前用户是否是安装当前版本后第一次打开 (包括全新和更新) public boolean isRunningForeground = false; // 标记当前 APP 是否处于前台运行中 - public int mCacheKeyboardHeight = 0; - private final ServiceLoader mApplicationList = ServiceLoader.load(IApplication.class, this.getClass().getClassLoader()); public static void put(String key, Object object) { @@ -459,10 +457,6 @@ public class HaloApp extends MultiDexApplication implements Configuration.Provid mIsReinstallTheSameVersion = value; } - public boolean isPostInitialized() { - return mIsPostInitialized; - } - public Application getApplication() { return this; } @@ -477,6 +471,7 @@ public class HaloApp extends MultiDexApplication implements Configuration.Provid || SPUtils.getBooleanWithContext(context, Constants.SP_IS_USER_ACCEPTED_PRIVACY_STATEMENT, false); } + @NonNull @Override public Configuration getWorkManagerConfiguration() { return new Configuration.Builder().build();