diff --git a/app/src/main/java/com/gh/common/util/MessageShareUtils.java b/app/src/main/java/com/gh/common/util/MessageShareUtils.java index cc5b1ffd38..25a12e1986 100644 --- a/app/src/main/java/com/gh/common/util/MessageShareUtils.java +++ b/app/src/main/java/com/gh/common/util/MessageShareUtils.java @@ -86,13 +86,17 @@ public class MessageShareUtils { @Override public void onError(UiError uiError) { // 单分享图片不支持显示未安装弹窗,手动调出 - Activity activity = mActivity.get(); - if (activity != null && !ShareUtils.isQQClientAvailable(activity.getApplication())) { - new TDialog(activity, - "", - "http://openmobile.qq.com/oauth2.0/m_jump_by_version", - null, - new QQToken("")).show(); + if (mActivity != null) { + Activity activity = mActivity.get(); + if (activity != null && !ShareUtils.isQQClientAvailable(activity.getApplication())) { + new TDialog(activity, + "", + "http://openmobile.qq.com/oauth2.0/m_jump_by_version", + null, + new QQToken("")).show(); + } else { + Utils.toast(mContext, "分享失败"); + } } else { Utils.toast(mContext, "分享失败"); } diff --git a/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt index 191eb85059..a8c5c1e350 100644 --- a/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt @@ -103,7 +103,7 @@ class ColumnCollectionDetailActivity : ListActivity - val statusBarHeight = if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT) 0 else DisplayUtils.getStatusBarHeight(resources) - val absOffset = abs(verticalOffset) - val invisibleOffset = 264f.dip2px() - 50f.dip2px() - 2f.dip2px() - statusBarHeight - if (absOffset < invisibleOffset) { - toolbar.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.transparent)) - toolbarContainer.background = null - userSmallContainer.visibility = View.GONE - } else { - if (this@UserHomeFragment::mBitmap.isInitialized) { - toolbar.setBackgroundColor(R.color.white.toColor()) - toolbarContainer.background = BitmapDrawable(resources, mBitmap) + if (isAdded) { + val statusBarHeight = if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT) 0 else DisplayUtils.getStatusBarHeight(resources) + val absOffset = abs(verticalOffset) + val invisibleOffset = 264f.dip2px() - 50f.dip2px() - 2f.dip2px() - statusBarHeight + if (absOffset < invisibleOffset) { + toolbar.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.transparent)) + toolbarContainer.background = null + userSmallContainer.visibility = View.GONE } else { - toolbar.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.theme)) + if (this@UserHomeFragment::mBitmap.isInitialized) { + toolbar.setBackgroundColor(R.color.white.toColor()) + toolbarContainer.background = BitmapDrawable(resources, mBitmap) + } else { + toolbar.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.theme)) + } + userSmallContainer.visibility = View.VISIBLE } - userSmallContainer.visibility = View.VISIBLE } }) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditViewModel.kt index 97d983b38a..467f1d382e 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditViewModel.kt @@ -156,14 +156,18 @@ class ArticleEditViewModel(application: Application) : AndroidViewModel(applicat val pictureList = ArrayList() for (uri in uris) { val picturePath = PathUtils.getPath(getApplication(), uri) - if (File(picturePath).length() > ImageUtils.getUploadFileMaxSize()) { - val count = ImageUtils.getUploadFileMaxSize() / 1024 / 1024 - val application: Application = getApplication() - Utils.toast(getApplication(), application.getString(R.string.pic_max_hint, count)) - continue + if (picturePath != null) { + if (File(picturePath).length() > ImageUtils.getUploadFileMaxSize()) { + val count = ImageUtils.getUploadFileMaxSize() / 1024 / 1024 + val application: Application = getApplication() + Utils.toast(getApplication(), application.getString(R.string.pic_max_hint, count)) + continue + } + Utils.log("picturePath = $picturePath") + pictureList.add(picturePath) + } else { + Utils.log("picturePath is null") } - Utils.log("picturePath = $picturePath") - pictureList.add(picturePath) } if (pictureList.size == 0) return diff --git a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListFragment.kt b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListFragment.kt index 49a7664b45..17373c6cb5 100644 --- a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListFragment.kt @@ -40,9 +40,12 @@ class SimulatorGameListFragment : ListFragment { if (isResumed()) { setNavigationTitle(view.getTitle()); @@ -364,7 +371,10 @@ public class WebFragment extends NormalFragment implements IScrollable { } } }); - boolean isSecurityCertification = args.getBoolean(KEY_IS_SECURITY_CERTIFICATION, false); + boolean isSecurityCertification = false; + if (args != null) { + isSecurityCertification = args.getBoolean(KEY_IS_SECURITY_CERTIFICATION, false); + } if (isSecurityCertification) { HashMap extraHeaders = new HashMap<>(); extraHeaders.put("Referer", "https://www.ghzs.com");