diff --git a/.gradle/7.3.3/executionHistory/executionHistory.bin b/.gradle/7.3.3/executionHistory/executionHistory.bin index 2ef0155..258834f 100644 Binary files a/.gradle/7.3.3/executionHistory/executionHistory.bin and b/.gradle/7.3.3/executionHistory/executionHistory.bin differ diff --git a/.gradle/7.3.3/executionHistory/executionHistory.lock b/.gradle/7.3.3/executionHistory/executionHistory.lock index ff90921..897500b 100644 Binary files a/.gradle/7.3.3/executionHistory/executionHistory.lock and b/.gradle/7.3.3/executionHistory/executionHistory.lock differ diff --git a/.gradle/7.3.3/fileHashes/fileHashes.bin b/.gradle/7.3.3/fileHashes/fileHashes.bin index 7bc084d..0626b4a 100644 Binary files a/.gradle/7.3.3/fileHashes/fileHashes.bin and b/.gradle/7.3.3/fileHashes/fileHashes.bin differ diff --git a/.gradle/7.3.3/fileHashes/fileHashes.lock b/.gradle/7.3.3/fileHashes/fileHashes.lock index f5e2b3d..6dfdabb 100644 Binary files a/.gradle/7.3.3/fileHashes/fileHashes.lock and b/.gradle/7.3.3/fileHashes/fileHashes.lock differ diff --git a/.gradle/7.3.3/fileHashes/resourceHashesCache.bin b/.gradle/7.3.3/fileHashes/resourceHashesCache.bin index 56e19c3..ecb36c5 100644 Binary files a/.gradle/7.3.3/fileHashes/resourceHashesCache.bin and b/.gradle/7.3.3/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 274f22d..0e0468e 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index bb46f1a..d1a4028 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index f1dbd6a..6c42e23 100644 Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ diff --git a/app/src/main/java/com/coldmint/rust/pro/ThanksActivity.kt b/app/src/main/java/com/coldmint/rust/pro/ThanksActivity.kt index 82b5f89..414a549 100644 --- a/app/src/main/java/com/coldmint/rust/pro/ThanksActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/ThanksActivity.kt @@ -37,6 +37,7 @@ class ThanksActivity : BaseActivity() { list.add(ThanksDataBean("空调大郎", "帮助翻译俄语版本。", 1491779490)) list.add(ThanksDataBean("Ling ASDJ", "制作助手新手模板,已被整合至助手内置模版。跟随助手更新。", 2735951230)) list.add(ThanksDataBean("Alice's Dream", "帮助薄荷优化代码表。", 3372003670)) + list.add(ThanksDataBean("克鲁鲁.采佩西", "帮助薄荷制作教程。", 2275140013)) viewBinding.recyclerView.adapter = ThanksAdapter(this, list) } diff --git a/app/src/main/java/com/coldmint/rust/pro/WebModInfoActivity.kt b/app/src/main/java/com/coldmint/rust/pro/WebModInfoActivity.kt index a0bd2e6..bb8950b 100644 --- a/app/src/main/java/com/coldmint/rust/pro/WebModInfoActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/WebModInfoActivity.kt @@ -28,6 +28,7 @@ import com.bumptech.glide.request.RequestOptions import com.coldmint.dialog.CoreDialog import com.coldmint.rust.core.ModClass import com.coldmint.rust.core.dataBean.ApiResponse +import com.coldmint.rust.core.dataBean.AppUpdateData import com.coldmint.rust.core.dataBean.mod.WebModCommentData import com.coldmint.rust.core.dataBean.mod.WebModInfoData import com.coldmint.rust.core.dataBean.mod.WebModUpdateLogData @@ -52,6 +53,7 @@ import com.coldmint.rust.pro.tool.TextStyleMaker import com.google.android.material.appbar.AppBarLayout import com.google.android.material.snackbar.Snackbar import com.google.android.material.tabs.TabLayoutMediator +import com.google.gson.Gson import com.youth.banner.adapter.BannerImageAdapter import com.youth.banner.holder.BannerImageHolder import com.youth.banner.indicator.CircleIndicator @@ -130,151 +132,10 @@ class WebModInfoActivity : BaseActivity() { } } -// viewBinding.modCommentRecyclerView.layoutManager = -// LinearLayoutManager(this@WebModInfoActivity) -// viewBinding.modCommentRecyclerView.addItemDecoration( -// DividerItemDecoration(this@WebModInfoActivity, DividerItemDecoration.VERTICAL) -// ) tip = getString(R.string.file_download_progress) } } -// private fun initData() { -// -// if (token.isBlank()) { -// viewBinding.progressBar.isVisible = false -// viewBinding.tipView.isVisible = true -// viewBinding.tipView.setText(R.string.please_login_first) -// return -// } -// -// loadModCommentList(modId) -// -// -// WebMod.instance.getInfo(token, modId, object : ApiCallBack { -// override fun onResponse(t: WebModInfoData) { -// if (t.code == ServerConfiguration.Success_Code) { -// developer = t.data.developer -// isOpen = t.data.hidden == 0 -// viewBinding.loadLayout.isVisible = false -// viewBinding.relativeLayout.isVisible = true -// val icon = t.data.icon -// if (icon != null && icon.isNotBlank()) { -// Glide.with(this@WebModInfoActivity) -// .load(ServerConfiguration.getRealLink(icon)) -// .apply(GlobalMethod.getRequestOptions()) -// .into(viewBinding.iconView) -// } -// title = t.data.name -// val screenshotListData = t.data.screenshots -// if (screenshotListData != null && screenshotListData.isNotBlank()) { -// val list = ArrayList() -// val lineParser = LineParser() -// lineParser.symbol = "," -// lineParser.text = screenshotListData -// lineParser.analyse { lineNum, lineData, isEnd -> -// list.add(lineData) -// true -// } -// val adapter = object : BannerImageAdapter(list) { -// override fun onBindView( -// holder: BannerImageHolder?, -// data: String?, -// position: Int, -// size: Int -// ) { -// if (data != null && holder != null) { -// Glide.with(this@WebModInfoActivity) -// .load(ServerConfiguration.getRealLink(data)) -// .apply(GlobalMethod.getRequestOptions()) -// .into(holder.imageView) -// } -// } -// } -// viewBinding.banner.setAdapter(adapter) -// viewBinding.banner.addBannerLifecycleObserver(this@WebModInfoActivity) -// viewBinding.banner.indicator = CircleIndicator(this@WebModInfoActivity) -// viewBinding.banner.setIndicatorSelectedColorRes(R.color.blue_500) -// viewBinding.banner.isAutoLoop(false) -// } else { -// viewBinding.banner.isVisible = false -// } -// val tags = t.data.tags -// val lineParser = LineParser(tags) -// val tagList = ArrayList() -// lineParser.symbol = "," -// lineParser.analyse { lineNum, lineData, isEnd -> -// val tag = lineData.subSequence(1, lineData.length - 1).toString() -// tagList.add(tag) -// true -// } -// if (tagList.size > 0) { -// viewBinding.belongStackLabelView.labels = tagList -// viewBinding.belongStackLabelView.setOnLabelClickListener { index, v, s -> -// val bundle = Bundle() -// bundle.putString("tag", s) -// bundle.putString( -// "title", -// String.format(getString(R.string.tag_title), s) -// ) -// bundle.putString("action", "tag") -// val thisIntent = -// Intent(this@WebModInfoActivity, TagActivity::class.java) -// thisIntent.putExtra("data", bundle) -// startActivity(thisIntent) -// } -// } else { -// viewBinding.belongStackLabelView.isVisible = false -// } -// viewBinding.titleView.text = t.data.name -// TextStyleMaker.instance.load( -// viewBinding.modInfoView, -// t.data.describe -// ) { type, data -> -// TextStyleMaker.instance.clickEvent(this@WebModInfoActivity, type, data) -// } -// viewBinding.numView.text = -// String.format( -// getString(R.string.unit_and_downloadnum), -// t.data.unitNumber, -// t.data.downloadNumber, -// t.data.versionName -// ) -// viewBinding.updateTimeView.text = -// String.format(getString(R.string.recent_update), t.data.updateTime) -// viewBinding.button.isVisible = true -// if (t.data.hidden == 0) { -// viewBinding.auditLayout.isVisible = false -// } -// loadDeveloperInfo(t.data.developer) -// -// viewBinding.button.setOnClickListener { -// val type = viewBinding.button.text -// val installation = getString(R.string.installation) -// when (type) { -// installation -> { -// downloadAction(t) -// } -// } -// -// } -// } else { -// viewBinding.tipView.isVisible = true -// viewBinding.tipView.text = t.message -// viewBinding.progressBar.isVisible = false -// } -// } -// -// override fun onFailure(e: Exception) { -// viewBinding.progressBar.isVisible = false -// viewBinding.tipView.isVisible = true -// viewBinding.tipView.setText(R.string.network_error) -// } -// -// }) -// -// } - /** * 下载事件 * @param t WebModInfoData @@ -339,6 +200,23 @@ class WebModInfoActivity : BaseActivity() { ).show() } } + R.id.share_item -> { + val link = AppSettings.getValue(AppSettings.Setting.ServerAddress, "") + val updateData = AppSettings.getValue(AppSettings.Setting.UpdateData, "") + var appUpdateLink = "" + if (!updateData.isNullOrBlank()) { + val gson = Gson() + val updateDataObj = gson.fromJson(updateData, AppUpdateData.Data::class.java) + appUpdateLink = updateDataObj.link + } + val s = String.format( + getString(R.string.share_mod_msg), + title, + link + "website/pages/modPage.php?&modId=" + modId, appUpdateLink + ) + + AppOperator.shareText(this,getString(R.string.share_mod),s) + } R.id.update_record -> { GlobalMethod.showUpdateLog(this, modId) } @@ -346,11 +224,6 @@ class WebModInfoActivity : BaseActivity() { return super.onOptionsItemSelected(item) } -// override fun onResume() { -// super.onResume() -// loadModCommentList(modId) -// } - /** * 下载工作 diff --git a/app/src/main/java/com/coldmint/rust/pro/adapters/InsertCoinsAdapter.kt b/app/src/main/java/com/coldmint/rust/pro/adapters/InsertCoinsAdapter.kt index 1153858..96ae222 100644 --- a/app/src/main/java/com/coldmint/rust/pro/adapters/InsertCoinsAdapter.kt +++ b/app/src/main/java/com/coldmint/rust/pro/adapters/InsertCoinsAdapter.kt @@ -39,7 +39,8 @@ class InsertCoinsAdapter(context: Context, dataList: MutableList -// WebMod.instance.insertCoins(token, modId) -// false -// }.setNegativeButton(R.string.dialog_cancel) { -// -// }.show() } loadButton() } diff --git a/app/src/main/res/layout/item_audit_mod.xml b/app/src/main/res/layout/item_audit_mod.xml index b4960f2..4630433 100644 --- a/app/src/main/res/layout/item_audit_mod.xml +++ b/app/src/main/res/layout/item_audit_mod.xml @@ -12,33 +12,44 @@ android:layout_height="wrap_content" android:layout_margin="16dp"> - + android:layout_marginBottom="8dp"> + + + + + + android:text="@string/name" />