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 00cd31d..5e468dd 100644 --- a/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt @@ -68,6 +68,7 @@ import com.cncat.vpn.service.remote.IClashManager import com.cncat.vpn.service.remote.ILogObserver import com.cncat.vpn.service.remote.IProfileManager import com.cncat.vpn.service.remote.wrap +import com.google.android.material.floatingactionbutton.FloatingActionButton import com.yingmao.clash.entity.BannerImgBean import com.yingmao.clash.fragment.NewAccFragment.Companion.CHECK_NODE_REQUEST_CODE import com.yingmao.clash.net.http.entity.ExpensesRecordRsp @@ -130,6 +131,8 @@ class NewMainActivity : BaseActivity() { private var homeActivityDialog: HomeActivityDialog? = null private var timer: Timer? = null private var u_timerTask: TimerTask? = null + private lateinit var clDeepSeek:ConstraintLayout + private lateinit var floating:FloatingActionButton companion object { //记录心跳失败次数 var HEART_BEAT_FAILURE_FREQUENCY = 0 @@ -717,6 +720,8 @@ class NewMainActivity : BaseActivity() { containerVP.adapter = MainVPAdapter(fragments, supportFragmentManager, lifecycle) containerVP.isUserInputEnabled = false clHomeRecharge=findViewById(R.id.clHomeRecharge) + clDeepSeek=findViewById(R.id.clDeepSeek) + floating=findViewById(R.id.floating) tv_exit=findViewById(R.id.tv_exit) clSing=findViewById(R.id.clSing) clSing.setOnClickListener { @@ -730,6 +735,13 @@ class NewMainActivity : BaseActivity() { cleanUserInfo() finish() } + clDeepSeek.setOnClickListener { + startActivity(Intent(this, CustomerServiceWebView::class.java)) + drawer.close() + } + floating.setOnClickListener { + startActivity(Intent(this, CustomerServiceWebView::class.java)) + } setSometion() } diff --git a/app/src/main/res/drawable/deepseek_orange.xml b/app/src/main/res/drawable/deepseek_orange.xml new file mode 100644 index 0000000..407fe7c --- /dev/null +++ b/app/src/main/res/drawable/deepseek_orange.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/oc_setting.xml b/app/src/main/res/drawable/oc_setting.xml index 70f5267..a6cfab7 100644 --- a/app/src/main/res/drawable/oc_setting.xml +++ b/app/src/main/res/drawable/oc_setting.xml @@ -1,11 +1,9 @@ - - - + android:width="25dp" + android:height="25dp" + android:viewportWidth="1024" + android:viewportHeight="1024"> + diff --git a/app/src/main/res/layout/new_main_activity.xml b/app/src/main/res/layout/new_main_activity.xml index d252939..e188d62 100644 --- a/app/src/main/res/layout/new_main_activity.xml +++ b/app/src/main/res/layout/new_main_activity.xml @@ -69,6 +69,17 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@+id/clHomeRecharge" /> + @@ -451,6 +462,7 @@ android:src="@drawable/oc_setting" android:layout_marginTop="5dp" android:layout_marginBottom="5dp" + android:padding="5dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" @@ -470,6 +482,42 @@ app:layout_constraintTop_toTopOf="@+id/ivSetting" /> + + + + + + diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 230396c..1ae9361 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -388,5 +388,11 @@ Service Description\n problems with recharging, click here-> Free experience for tourists Membership expiration date - + Current route + AI intelligent route + Delay $ms + Delay 28ms + Recommended route + Route timeout + DeepSeek intelligent assistant \ 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 b2d442c..6e12a4a 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -378,4 +378,11 @@ 充值有問題 點這裡-> 遊客免費體驗 會員到期時間 + 當前線路 + AI智能線路 + 延遲$ms + 延遲28ms + 推薦線路 + 線路超時 + DeepSeek智能智能助手 \ 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 f853aec..10ba8af 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -376,5 +376,11 @@ 充值有問題 點這裡-> 遊客免費體驗 會員到期時間 - + 當前線路 + AI智能線路 + 延遲$ms + 延遲28ms + 推薦線路 + 線路超時 + DeepSeek智能智能助手 \ 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 b8b109c..7f6041c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -408,4 +408,5 @@ 延迟28ms 推荐线路 线路超时 + DeepSeek智能智能助手 \ No newline at end of file