diff --git a/app/src/main/java/com/coldmint/rust/pro/EditActivity.kt b/app/src/main/java/com/coldmint/rust/pro/EditActivity.kt index c9e32d0..40acc3c 100644 --- a/app/src/main/java/com/coldmint/rust/pro/EditActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/EditActivity.kt @@ -106,59 +106,6 @@ class EditActivity : BaseActivity() { // EditEndBinding.bind(viewBinding.root) // } - fun showRenewalTip() { - val debugKey = "续费提示" - val account = AppSettings.getValue(AppSettings.Setting.Account, "") - val time = AppSettings.getValue(AppSettings.Setting.ExpirationTime, 0.toLong()) - if (time == 0.toLong() || account.isBlank()) { - DebugHelper.printLog(debugKey, "没有账号或续费信息,关闭界面。") - Toast.makeText(this, "请先登录", Toast.LENGTH_SHORT).show() - finish() - } else { - val stringTime = ServerConfiguration.toStringTime(time) - if (stringTime == ServerConfiguration.ForeverTime) { - DebugHelper.printLog(debugKey, "永久用户无需处理续费提示。") - } else { - val difference = time - System.currentTimeMillis() - if (difference < 0) { - //已经过期 - DebugHelper.printLog(debugKey, "此用户的助手已经过期。") - MaterialAlertDialogBuilder(this).setTitle(R.string.activation_app) - .setMessage( - R.string.activation_app_tip - ).setPositiveButton(R.string.activate) { i, i2 -> - finish() - val intent = Intent(this, ActivateActivity::class.java) - startActivity(intent) - }.setNegativeButton(R.string.dialog_cancel) { i, i2 -> - finish() - }.setCancelable(false).show() - } else if (difference < 604800000) { - //如果在7天内到期 - val day = difference / 86400000 + 1 - DebugHelper.printLog( - debugKey, - "显示续费提醒(" + difference + "/86400000)" + day + "天。" - ) - MaterialAlertDialogBuilder(this).setTitle(R.string.renewal_tip_title) - .setMessage( - String.format( - getString(R.string.renewal_tip_msg), - account, - day - ) - ).setPositiveButton(R.string.renewal) { i, i2 -> - val intent = Intent(this, ActivateActivity::class.java) - startActivity(intent) - }.setNegativeButton(R.string.dialog_cancel) { i, i2 -> - }.setCancelable(false).show() - } else { - DebugHelper.printLog(debugKey, "还剩余7天以上,无需提示。") - - } - } - } - } /** * 加载主要的观察者 @@ -496,7 +443,6 @@ class EditActivity : BaseActivity() { initCodeEditor() initStartView() // initEndView() - showRenewalTip() loadCustomStyle() loadSearchLayout() turretCoordinateResults = diff --git a/app/src/main/java/com/coldmint/rust/pro/base/BaseFragment.kt b/app/src/main/java/com/coldmint/rust/pro/base/BaseFragment.kt index 8e1837a..ed0ca06 100644 --- a/app/src/main/java/com/coldmint/rust/pro/base/BaseFragment.kt +++ b/app/src/main/java/com/coldmint/rust/pro/base/BaseFragment.kt @@ -14,11 +14,7 @@ import com.google.firebase.ktx.Firebase abstract class BaseFragment : Fragment() { protected lateinit var firebaseAnalytics: FirebaseAnalytics - - val viewBinding: T by lazy { - val layoutInflater = LayoutInflater.from(requireActivity()) - getViewBindingObject(layoutInflater) - } + protected lateinit var viewBinding: T /** @@ -52,6 +48,7 @@ abstract class BaseFragment : Fragment() { container: ViewGroup?, savedInstanceState: Bundle? ): View? { + viewBinding = getViewBindingObject(inflater) return viewBinding.root } diff --git a/app/src/main/java/com/coldmint/rust/pro/fragments/AllUnitsFragment.kt b/app/src/main/java/com/coldmint/rust/pro/fragments/AllUnitsFragment.kt index 798ad52..fd1b9b3 100644 --- a/app/src/main/java/com/coldmint/rust/pro/fragments/AllUnitsFragment.kt +++ b/app/src/main/java/com/coldmint/rust/pro/fragments/AllUnitsFragment.kt @@ -153,8 +153,9 @@ class AllUnitsFragment( */ fun loadFiles(file: File? = modClass?.modFile) { if (file == null) { - Snackbar.make(viewBinding.unitList, R.string.file_not_exist, Snackbar.LENGTH_SHORT) - .show() + if (isAdded) { + Toast.makeText(requireContext(), R.string.file_not_exist, Toast.LENGTH_SHORT).show() + } return } val handler = Handler(Looper.getMainLooper()) diff --git a/app/src/main/java/com/coldmint/rust/pro/fragments/CommunityFragment.kt b/app/src/main/java/com/coldmint/rust/pro/fragments/CommunityFragment.kt index e42a0c3..a7f9846 100644 --- a/app/src/main/java/com/coldmint/rust/pro/fragments/CommunityFragment.kt +++ b/app/src/main/java/com/coldmint/rust/pro/fragments/CommunityFragment.kt @@ -17,11 +17,7 @@ import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayoutMediator class CommunityFragment : BaseFragment() { - // 当请求时,此适配器返回一个 - // representing an object in the collection. - private val communityAdapter: CommunityAdapter by lazy { - CommunityAdapter(this) - } + fun loadTab() { @@ -60,7 +56,7 @@ class CommunityFragment : BaseFragment() { } override fun whenViewCreated(inflater: LayoutInflater, savedInstanceState: Bundle?) { - viewBinding.pager.adapter = communityAdapter + viewBinding.pager.adapter = CommunityAdapter(this) viewBinding.pager.isSaveEnabled = false loadTab() } diff --git a/app/src/main/res/layout/activity_pack.xml b/app/src/main/res/layout/activity_pack.xml index 01f42c4..9e08e91 100644 --- a/app/src/main/res/layout/activity_pack.xml +++ b/app/src/main/res/layout/activity_pack.xml @@ -35,13 +35,12 @@ android:animateLayoutChanges="true" android:orientation="vertical"> - + android:visibility="gone"> + android:text="@string/packmod" /> - +