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

Merge branch 'master' into ConnectImmediately

This commit is contained in:
level 2025-05-15 14:52:20 +08:00
parent 37e76ac5b9 981c1f8a99
commit 51b55ce246
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

@ -548,20 +548,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()
}
}
}
}
@ -1242,6 +1244,12 @@ class NewMainActivity : BaseActivity() {
}
override fun onDestroy() {
if (activityDialog != null) {
if(activityDialog!!.isShowing){
activityDialog!!.dismiss()
}
}
super.onDestroy()
stopUploadTimer()
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.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()

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) {
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 -> {

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

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