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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
cyh 2025-05-20 16:36:10 +08:00
parent 4a4cb4753c 981c1f8a99
commit aca373cd8c
11 changed files with 175 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/yingmao/clash/act/ActivityActivity.kt
View File

@ -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(

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.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()
}
}
}
}
@ -1224,6 +1226,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 -> {

24
app/src/main/res/drawable/icon_pay.xml Normal file
View File

@ -0,0 +1,24 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="2200"
android:viewportHeight="2200">
<path
android:fillColor="#33c5f2"
android:pathData="M1528.8,1289.4v184.5a67.7,67.7 0,0 0,67.6 67.6h340.1V1854a98.3,98.3 0,0 1,-98.3 98.3h-1435A98.3,98.3 0,0 1,305 1854V909.2A98.3,98.3 0,0 1,403.3 811h1435a98.3,98.3 0,0 1,98.3 98.3v312.5H1596.4A67.7,67.7 0,0 0,1528.8 1289.4Z" />
<path
android:fillColor="#2a3468"
android:pathData="M1596.4,1253.7a35.7,35.7 0,0 0,-35.6 35.6v184.5a35.7,35.7 0,0 0,35.6 35.6h340.1L1936.5,1253.7ZM1701.7,1435.2a53.5,53.5 0,1 1,53.5 -53.5A53.5,53.5 0,0 1,1701.7 1435.2Z" />
<path
android:fillColor="#2a3468"
android:pathData="M423.1,765.6l1185.2,-294.2a64.8,64.8 0,0 1,80.4 62.9V765.6Z" />
<path
android:fillColor="#2a3468"
android:pathData="M1524.3,444.5 L617.7,669.6 1421,302.4a62.2,62.2 0,0 1,86.4 46.1Z" />
</vector>

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>

106
app/src/main/res/layout/home_fragment_layout.xml
View File

@ -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">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="50dp"
android:layout_height="47dp"
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
android:src="@mipmap/ic_home_activity"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:gravity="center"
>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/actIcon"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginEnd="5dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:src="@mipmap/ic_home_activity"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tvActIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/activity"
android:textColor="@color/bule_1F22B8"
android:textSize="18sp"
android:textStyle="bold"
android:layout_marginStart="10dp"
android:layout_marginEnd="30dp"
app:layout_constraintStart_toEndOf="@+id/actIcon"
app:layout_constraintTop_toTopOf="@+id/actIcon"
app:layout_constraintBottom_toBottomOf="@+id/actIcon"
/>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/clMember"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="36dp"
android:layout_marginEnd="10dp"
android:layout_marginStart="50dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="50dp"
android:background="@drawable/home_activity_bg"
app:layout_constraintBottom_toBottomOf="@+id/clActivity"
app:layout_constraintEnd_toStartOf="@+id/clActivity"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/clActivity">
app:layout_constraintTop_toBottomOf="@+id/acceleratedStartup">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/appCompatImageView"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="41dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:src="@mipmap/ic_home_notice"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:gravity="center"
>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/appCompatImageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:src="@drawable/icon_pay"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tvTxt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="@string/CZHY"
android:textColor="@color/bule_1F22B8"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/appCompatImageView"
app:layout_constraintStart_toEndOf="@+id/appCompatImageView"
app:layout_constraintTop_toTopOf="@+id/appCompatImageView" />
</LinearLayout>
<LinearLayout
android:id="@+id/llGetMember"
@ -321,9 +372,10 @@
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="@+id/appCompatImageView"
app:layout_constraintStart_toEndOf="@+id/appCompatImageView"
app:layout_constraintTop_toTopOf="@+id/appCompatImageView">
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/clMember"
app:layout_constraintStart_toEndOf="@+id/clMember"
app:layout_constraintTop_toTopOf="@+id/clMember">
<TextView
android:id="@+id/tvGetMember"

2
app/src/main/res/values-en/strings.xml
View File

@ -352,8 +352,10 @@ Service Description\n
<string name="sure_restart">Suggest restarting</string>
<string name="restart">Restart</string>
<string name="node_item_test">Speed test</string>
<string name="agree">Agree</string>
<string name="disagree">Disagree</string>
<string name="skip">Go to login</string>
<string name="email_or_phone_register">Email registration</string>
<string name="CZHY">Recharge Membership</string>
</resources>

3
app/src/main/res/values-zh-rHK/strings.xml
View File

@ -341,9 +341,12 @@
<string name="sure_restart">"建議重啓 "</string>
<string name="restart">"重啓 "</string>
<string name="node_item_test">線路測速</string>
<string name="agree">同意</string>
<string name="disagree">不同意</string>
<string name="skip">直接登入</string>
<string name="app_name_yunti">雲梯加速器</string>
<string name="email_or_phone_register">郵箱註冊</string>
<string name="CZHY">充值會員</string>
</resources>

3
app/src/main/res/values-zh-rTW/strings.xml
View File

@ -340,9 +340,12 @@
<string name="sure_restart">"建議重啓 "</string>
<string name="restart">"重啓 "</string>
<string name="node_item_test">線路測速</string>
<string name="agree">同意</string>
<string name="disagree">不同意</string>
<string name="skip">直接登入</string>
<string name="app_name_yunti">雲梯加速器</string>
<string name="email_or_phone_register">郵箱註冊</string>
<string name="CZHY">充值會員</string>
</resources>

3
app/src/main/res/values/strings.xml
View File

@ -360,10 +360,13 @@
<string name="sure_restart">建议重启</string>
<string name="restart">重启</string>
<string name="node_item_test">线路测速</string>
<string name="agree">同意</string>
<string name="disagree">不同意</string>
<string name="skip">直接登录</string>
<string name="app_name_yunti">云梯加速器</string>
<string name="email_or_phone_register">邮箱注册</string>
<string name="CZHY">充值会员</string>
</resources>