From b01a87d25f377738250d2ae1ffc8b76564053410 Mon Sep 17 00:00:00 2001 From: level <1364007522@qq.com> Date: Fri, 9 May 2025 16:27:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yingmao/clash/act/NewMainActivity.kt | 43 ++++---- app/src/main/res/drawable/ic_s_copy.xml | 6 +- app/src/main/res/drawable/ic_share.xml | 9 ++ app/src/main/res/drawable/ic_sing.xml | 9 ++ app/src/main/res/layout/new_main_activity.xml | 104 +++++++++++++++--- 5 files changed, 128 insertions(+), 43 deletions(-) create mode 100644 app/src/main/res/drawable/ic_share.xml create mode 100644 app/src/main/res/drawable/ic_sing.xml 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 987352b..cad7aa1 100644 --- a/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt @@ -104,7 +104,7 @@ class NewMainActivity : BaseActivity() { public val fragments = arrayListOf() private lateinit var iv_slider: ImageView private lateinit var ll_slider: LinearLayout - private lateinit var tv_exit: TextView + private lateinit var tv_exit: ConstraintLayout // private lateinit var tv_band: TextView lateinit var containerVP: ViewPager2 val clashRunning: Boolean @@ -691,7 +691,7 @@ class NewMainActivity : BaseActivity() { tv_username = findViewById(R.id.tv_username) iv_slider = findViewById(R.id.iv_slider) ll_slider = findViewById(R.id.ll_slider) - tv_exit = findViewById(R.id.tv_exit) + tv_exit = findViewById(R.id.clExit) // tv_band = findViewById(R.id.tv_band) // containerVP.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() { // override fun onPageSelected(position: Int) { @@ -764,26 +764,22 @@ class NewMainActivity : BaseActivity() { clipboardManager.setPrimaryClip(clipData) RxToast.info(resources.getString(R.string.CopyToClipboard)) } -// findViewById(R.id.tv_share).setOnClickListener {//分享 -// startActivity(Intent(this@NewMainActivity, ShareActivity::class.java)) -// drawer.close() -// } -// findViewById(R.id.tv_setting).setOnClickListener {//设置 -// startActivity(Intent(this, SettingActivity::class.java)) -// drawer.close() -// } -// findViewById(R.id.tv_dianka).setOnClickListener {//点卡 -// startActivity(Intent(this, MyPointCardActivity::class.java)) -// drawer.close() -// } -// findViewById(R.id.tv_vip_sign).setOnClickListener {//会员签到 -// mainAtyVM.vipSign() -//// drawer.close() -// } -// findViewById(R.id.tv_tixian).setOnClickListener {//提现 -// startActivity(Intent(this, ZFBTXActivity::class.java)) -// drawer.close() -// } + findViewById(R.id.clShare).setOnClickListener {//分享 + startActivity(Intent(this@NewMainActivity, ShareActivity::class.java)) + drawer.close() + } + findViewById(R.id.clActivity).setOnClickListener {//活动 + startActivity(Intent(this@NewMainActivity, ActivityActivity::class.java)) + drawer.close() + } + findViewById(R.id.clSetting).setOnClickListener {//设置 + startActivity(Intent(this, SettingActivity::class.java)) + drawer.close() + } + findViewById(R.id.clSing).setOnClickListener {//会员签到 + mainAtyVM.vipSign() + } + // val telegramBtn = findViewById(R.id.tv_dianbao) // telegramBtn.setOnClickListener {//电报 // var uri = Uri.parse(BZYConstants.DefTGUrl) @@ -799,9 +795,8 @@ class NewMainActivity : BaseActivity() { // startActivity(intent) // drawer.close() // } - findViewById(R.id.tv_kefu).setOnClickListener {//客服 + findViewById(R.id.clCustomerService).setOnClickListener {//客服 startActivity(Intent(this, BZYWebViewKeFu::class.java)) - drawer.close() } // findViewById(R.id.tv_fds).setOnClickListener {//防丢失 diff --git a/app/src/main/res/drawable/ic_s_copy.xml b/app/src/main/res/drawable/ic_s_copy.xml index dcd9e83..85b3ac1 100644 --- a/app/src/main/res/drawable/ic_s_copy.xml +++ b/app/src/main/res/drawable/ic_s_copy.xml @@ -5,11 +5,11 @@ android:viewportHeight="1024"> + android:fillColor="#1095db"/> + android:fillColor="#1095db"/> + android:fillColor="#1095db"/> diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml new file mode 100644 index 0000000..9453923 --- /dev/null +++ b/app/src/main/res/drawable/ic_share.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_sing.xml b/app/src/main/res/drawable/ic_sing.xml new file mode 100644 index 0000000..5172ccf --- /dev/null +++ b/app/src/main/res/drawable/ic_sing.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/new_main_activity.xml b/app/src/main/res/layout/new_main_activity.xml index f8116bc..4b046f0 100644 --- a/app/src/main/res/layout/new_main_activity.xml +++ b/app/src/main/res/layout/new_main_activity.xml @@ -208,11 +208,14 @@ /> @@ -233,6 +236,7 @@ android:textSize="15sp" android:textColor="@color/black" android:textStyle="bold" + android:drawableRight="@drawable/ic_s_copy" /> + + + + + + app:layout_constraintTop_toBottomOf="@+id/clSing"> + + + + + + +