androidcode
/
yijianlianUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

活动弹窗在平板上点击不了的问题

This commit is contained in:
level 2025-05-15 14:35:41 +08:00
parent b0b139e08d
commit 981c1f8a99
4 changed files with 57 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt
View File

@ -565,20 +565,22 @@ class NewMainActivity : BaseActivity() {
if (data.data.data != null) { if (data.data.data != null) {
if (data.data.data.list.isNotEmpty()) { if (data.data.data.list.isNotEmpty()) {
data.data.data.list[0].redirectLink.let { data.data.data.list[0].redirectLink.let {
activityDialog = if(activityDialog==null){
ActivityViewDialog(this, data.data.data.list[0].redirectLink) activityDialog =
activityDialog?.showDialog() ActivityViewDialog(this, data.data.data.list[0].redirectLink)
activityDialog?.setOnDialogClickListener(object : activityDialog?.setOnDialogClickListener(object :
OnDialogClickListener { OnDialogClickListener {
override fun onRechargeClickListener() { override fun onRechargeClickListener() {
//跳转到支付界面 //跳转到支付界面
goBackupRechargeWeb() goBackupRechargeWeb()
} }
override fun onCancelClickListener() { override fun onCancelClickListener() {
activityDialog?.dismiss() activityDialog?.dismiss()
} }
}) })
activityDialog?.show()
}
} }
} }
} }
@ -1207,6 +1209,12 @@ class NewMainActivity : BaseActivity() {
} }
override fun onDestroy() { override fun onDestroy() {
if (activityDialog != null) {
if(activityDialog!!.isShowing){
activityDialog!!.dismiss()
}
}
super.onDestroy() super.onDestroy()
stopUploadTimer() stopUploadTimer()
mainAtyVM.stopHeartBeat() mainAtyVM.stopHeartBeat()

34
app/src/main/java/com/yingmao/clash/act/UIMainActivity.kt
View File

@ -230,20 +230,22 @@ class UIMainActivity : BaseActivity() {
if (data.code == 200) { if (data.code == 200) {
if (data.data.data.list.isNotEmpty()) { if (data.data.data.list.isNotEmpty()) {
data.data.data.list[0].redirectLink.let { data.data.data.list[0].redirectLink.let {
activityDialog = if(activityDialog==null){
ActivityViewDialog(this, data.data.data.list[0].redirectLink) activityDialog =
activityDialog?.showDialog() ActivityViewDialog(this, data.data.data.list[0].redirectLink)
activityDialog?.setOnDialogClickListener(object : activityDialog?.setOnDialogClickListener(object :
OnDialogClickListener { OnDialogClickListener {
override fun onRechargeClickListener() { override fun onRechargeClickListener() {
//跳转到支付界面 //跳转到支付界面
goBackupRechargeWeb() goBackupRechargeWeb()
} }
override fun onCancelClickListener() { override fun onCancelClickListener() {
activityDialog?.dismiss() activityDialog?.dismiss()
} }
}) })
activityDialog?.show()
}
} }
} }
} }
@ -556,6 +558,12 @@ class UIMainActivity : BaseActivity() {
} }
override fun onDestroy() { override fun onDestroy() {
if (activityDialog != null) {
if(activityDialog!!.isShowing){
activityDialog!!.dismiss()
}
}
super.onDestroy() super.onDestroy()
stopUploadTimer() stopUploadTimer()
mainAtyVM.stopHeartBeat() mainAtyVM.stopHeartBeat()

26
app/src/main/java/com/yingmao/clash/view/dialog/ActivityViewDialog.java
View File

@ -20,17 +20,12 @@ public class ActivityViewDialog extends Dialog {
public ActivityViewDialog(Context context,String path) { public ActivityViewDialog(Context context,String path) {
super(context); super(context);
setContentView(R.layout.activity_dialog_view_layout); initDialog();
//设置点击布局外则Dialog消失 viewInit(context,path);
setCanceledOnTouchOutside(false);
ImageView ivActivityImg =findViewById(R.id.ivActivityImg);
Glide.with(context)
.load(path)
// .error(R.drawable.ic_activity_bg)
.diskCacheStrategy(DiskCacheStrategy.DATA)//仅仅只缓存原来的全分辨率的图像
.into(ivActivityImg);
} }
public void showDialog() { public void initDialog() {
setContentView(R.layout.activity_dialog_view_layout);
setCanceledOnTouchOutside(true);
Window window = getWindow(); Window window = getWindow();
//设置弹窗动画 //设置弹窗动画
assert window != null; assert window != null;
@ -41,11 +36,16 @@ public class ActivityViewDialog extends Dialog {
//设置弹窗位置 //设置弹窗位置
wl.gravity = Gravity.CENTER; wl.gravity = Gravity.CENTER;
window.setAttributes(wl); 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); ImageView icActivityClose=findViewById(R.id.icActivityClose);
AppCompatButton abRecharge=findViewById(R.id.abRecharge); AppCompatButton abRecharge=findViewById(R.id.abRecharge);
icActivityClose.setOnClickListener(v -> { icActivityClose.setOnClickListener(v -> {

3
app/src/main/res/layout/activity_dialog_view_layout.xml
View File

@ -7,7 +7,6 @@
<ImageView <ImageView
android:id="@+id/ivActivityImg" android:id="@+id/ivActivityImg"
android:layout_width="0dp" android:layout_width="0dp"
app:layout_constraintWidth_percent="0.95" app:layout_constraintWidth_percent="0.95"
app:layout_constraintHeight_percent="0.71" app:layout_constraintHeight_percent="0.71"
@ -44,6 +43,8 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/abRecharge" app:layout_constraintTop_toBottomOf="@+id/abRecharge"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="20dp"
android:layout_marginTop="@dimen/dp_15" android:layout_marginTop="@dimen/dp_15"
app:srcCompat="@drawable/ic_close_activity" /> app:srcCompat="@drawable/ic_close_activity" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>