From a7a722721cc10036196c619976f6fbf0ff199579 Mon Sep 17 00:00:00 2001 From: level <1364007522@qq.com> Date: Wed, 7 May 2025 17:49:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=8F=A3=E4=BB=A4?= =?UTF-8?q?=E5=A4=8D=E5=88=B6=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yingmao/clash/act/ActivityActivity.kt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/yingmao/clash/act/ActivityActivity.kt b/app/src/main/java/com/yingmao/clash/act/ActivityActivity.kt index fa81a93..d4418ce 100644 --- a/app/src/main/java/com/yingmao/clash/act/ActivityActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/ActivityActivity.kt @@ -1,5 +1,6 @@ package com.yingmao.clash.act +import android.annotation.SuppressLint import android.content.ClipData import android.content.ClipboardManager import android.content.Context @@ -95,14 +96,12 @@ class ActivityActivity : BaseActivity() { } + @SuppressLint("SetTextI18n") private fun showActDialog(bean: Activity_) { var command = MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_VPN_UserCommand, "")!! -// if (TextUtils.isEmpty(command)){ -// command= MainApplication.getUserInfo()?.userCommand!! -// } - command = resources.getString(R.string.LeadMembers)+"${command}" + command = bean.copyContent+ command copyToClipboard(command) - var act_dialog = MaterialDialog(this@ActivityActivity).show { + MaterialDialog(this@ActivityActivity).show { this.cancelable(false) cornerRadius(res = R.dimen.dp_10) customView( From b0b139e08dac15defeefc380fb478b24043c03c2 Mon Sep 17 00:00:00 2001 From: level <1364007522@qq.com> Date: Thu, 8 May 2025 18:21:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A6=96=E9=A1=B5UI=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/drawable/icon_pay.xml | 24 ++++ .../main/res/layout/home_fragment_layout.xml | 106 +++++++++++++----- app/src/main/res/values-en/strings.xml | 1 + app/src/main/res/values-zh-rHK/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 6 files changed, 107 insertions(+), 27 deletions(-) create mode 100644 app/src/main/res/drawable/icon_pay.xml diff --git a/app/src/main/res/drawable/icon_pay.xml b/app/src/main/res/drawable/icon_pay.xml new file mode 100644 index 0000000..3c5ff4a --- /dev/null +++ b/app/src/main/res/drawable/icon_pay.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + diff --git a/app/src/main/res/layout/home_fragment_layout.xml b/app/src/main/res/layout/home_fragment_layout.xml index 7202b09..938b54f 100644 --- a/app/src/main/res/layout/home_fragment_layout.xml +++ b/app/src/main/res/layout/home_fragment_layout.xml @@ -273,47 +273,98 @@ android:id="@+id/clActivity" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginTop="25dp" - android:layout_marginEnd="36dp" + android:layout_marginTop="10dp" android:background="@drawable/home_activity_bg" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@+id/acceleratedStartup"> + app:layout_constraintEnd_toEndOf="@+id/clMember" + app:layout_constraintStart_toStartOf="@+id/clMember" + app:layout_constraintTop_toBottomOf="@+id/clMember"> - + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" + android:gravity="center" + > + + + + + app:layout_constraintTop_toBottomOf="@+id/acceleratedStartup"> - + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" + android:gravity="center" + > + + + + + android:visibility="gone" + app:layout_constraintBottom_toBottomOf="@+id/clMember" + app:layout_constraintStart_toEndOf="@+id/clMember" + app:layout_constraintTop_toTopOf="@+id/clMember"> Suggest restarting Restart Speed test + Recharge Membership \ No newline at end of file diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 5d9881f..ed9ab9e 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -341,4 +341,5 @@ "建議重啓 " "重啓 " 線路測速 + 充值會員 \ No newline at end of file diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index cb6a362..a233591 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -340,4 +340,5 @@ "建議重啓 " "重啓 " 線路測速 + 充值會員 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fd4a078..b5928c9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -359,4 +359,5 @@ 建议重启 重启 线路测速 + 充值会员 \ No newline at end of file From 981c1f8a99fa3e21671b1d5019e8775bbe88425d Mon Sep 17 00:00:00 2001 From: level <1364007522@qq.com> Date: Thu, 15 May 2025 14:35:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E5=9C=A8=E5=B9=B3=E6=9D=BF=E4=B8=8A=E7=82=B9=E5=87=BB=E4=B8=8D?= =?UTF-8?q?=E4=BA=86=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yingmao/clash/act/NewMainActivity.kt | 34 ++++++++++++------- .../com/yingmao/clash/act/UIMainActivity.kt | 34 ++++++++++++------- .../clash/view/dialog/ActivityViewDialog.java | 26 +++++++------- .../layout/activity_dialog_view_layout.xml | 3 +- 4 files changed, 57 insertions(+), 40 deletions(-) diff --git a/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt b/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt index 14b696c..27f6610 100644 --- a/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt @@ -565,20 +565,22 @@ class NewMainActivity : BaseActivity() { if (data.data.data != null) { if (data.data.data.list.isNotEmpty()) { data.data.data.list[0].redirectLink.let { - activityDialog = - ActivityViewDialog(this, data.data.data.list[0].redirectLink) - activityDialog?.showDialog() - activityDialog?.setOnDialogClickListener(object : - OnDialogClickListener { - override fun onRechargeClickListener() { - //跳转到支付界面 - goBackupRechargeWeb() - } + if(activityDialog==null){ + activityDialog = + ActivityViewDialog(this, data.data.data.list[0].redirectLink) + activityDialog?.setOnDialogClickListener(object : + OnDialogClickListener { + override fun onRechargeClickListener() { + //跳转到支付界面 + goBackupRechargeWeb() + } - override fun onCancelClickListener() { - activityDialog?.dismiss() - } - }) + override fun onCancelClickListener() { + activityDialog?.dismiss() + } + }) + activityDialog?.show() + } } } } @@ -1207,6 +1209,12 @@ class NewMainActivity : BaseActivity() { } override fun onDestroy() { + if (activityDialog != null) { + if(activityDialog!!.isShowing){ + activityDialog!!.dismiss() + } + + } super.onDestroy() stopUploadTimer() mainAtyVM.stopHeartBeat() diff --git a/app/src/main/java/com/yingmao/clash/act/UIMainActivity.kt b/app/src/main/java/com/yingmao/clash/act/UIMainActivity.kt index d2189f5..43aa0d4 100644 --- a/app/src/main/java/com/yingmao/clash/act/UIMainActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/UIMainActivity.kt @@ -230,20 +230,22 @@ class UIMainActivity : BaseActivity() { if (data.code == 200) { if (data.data.data.list.isNotEmpty()) { data.data.data.list[0].redirectLink.let { - activityDialog = - ActivityViewDialog(this, data.data.data.list[0].redirectLink) - activityDialog?.showDialog() - activityDialog?.setOnDialogClickListener(object : - OnDialogClickListener { - override fun onRechargeClickListener() { - //跳转到支付界面 - goBackupRechargeWeb() - } + if(activityDialog==null){ + activityDialog = + ActivityViewDialog(this, data.data.data.list[0].redirectLink) + activityDialog?.setOnDialogClickListener(object : + OnDialogClickListener { + override fun onRechargeClickListener() { + //跳转到支付界面 + goBackupRechargeWeb() + } - override fun onCancelClickListener() { - activityDialog?.dismiss() - } - }) + override fun onCancelClickListener() { + activityDialog?.dismiss() + } + }) + activityDialog?.show() + } } } } @@ -556,6 +558,12 @@ class UIMainActivity : BaseActivity() { } override fun onDestroy() { + if (activityDialog != null) { + if(activityDialog!!.isShowing){ + activityDialog!!.dismiss() + } + + } super.onDestroy() stopUploadTimer() mainAtyVM.stopHeartBeat() diff --git a/app/src/main/java/com/yingmao/clash/view/dialog/ActivityViewDialog.java b/app/src/main/java/com/yingmao/clash/view/dialog/ActivityViewDialog.java index 0c9e3f9..225ca3d 100644 --- a/app/src/main/java/com/yingmao/clash/view/dialog/ActivityViewDialog.java +++ b/app/src/main/java/com/yingmao/clash/view/dialog/ActivityViewDialog.java @@ -20,17 +20,12 @@ public class ActivityViewDialog extends Dialog { public ActivityViewDialog(Context context,String path) { super(context); - setContentView(R.layout.activity_dialog_view_layout); - //设置点击布局外则Dialog消失 - setCanceledOnTouchOutside(false); - ImageView ivActivityImg =findViewById(R.id.ivActivityImg); - Glide.with(context) - .load(path) -// .error(R.drawable.ic_activity_bg) - .diskCacheStrategy(DiskCacheStrategy.DATA)//仅仅只缓存原来的全分辨率的图像 - .into(ivActivityImg); + initDialog(); + viewInit(context,path); } - public void showDialog() { + public void initDialog() { + setContentView(R.layout.activity_dialog_view_layout); + setCanceledOnTouchOutside(true); Window window = getWindow(); //设置弹窗动画 assert window != null; @@ -41,11 +36,16 @@ public class ActivityViewDialog extends Dialog { //设置弹窗位置 wl.gravity = Gravity.CENTER; window.setAttributes(wl); - show(); - initListener(); } - private void initListener() { + private void viewInit(Context context,String path) { + ImageView ivActivityImg =findViewById(R.id.ivActivityImg); + Glide.with(context) + .load(path) +// .error(R.drawable.ic_activity_bg) + .diskCacheStrategy(DiskCacheStrategy.DATA)//仅仅只缓存原来的全分辨率的图像 + .into(ivActivityImg); + ImageView icActivityClose=findViewById(R.id.icActivityClose); AppCompatButton abRecharge=findViewById(R.id.abRecharge); icActivityClose.setOnClickListener(v -> { diff --git a/app/src/main/res/layout/activity_dialog_view_layout.xml b/app/src/main/res/layout/activity_dialog_view_layout.xml index 46008c0..9127212 100644 --- a/app/src/main/res/layout/activity_dialog_view_layout.xml +++ b/app/src/main/res/layout/activity_dialog_view_layout.xml @@ -7,7 +7,6 @@ \ No newline at end of file