Commit Graph

358 Commits

Author SHA1 Message Date
level dd2e226def bugfix:
更改
2025-08-26 10:53:52 +08:00
level 96961cadff bugfix:侧边栏忘记关闭 2025-08-14 17:28:07 +08:00
level 2eff8244f6 宙连新增节点是否可选择功能 2025-08-14 17:20:36 +08:00
level 9ba51abdd9 宙连更改初始化修复 2025-08-12 17:21:46 +08:00
level 39fe37b817 新增初始化修复 2025-08-12 16:58:24 +08:00
level be818f7aa2 宙连新增初始化 2025-08-12 15:36:28 +08:00
level dcba423d03 宙连更改备用地址 2025-08-12 12:14:14 +08:00
level efd13191ad 宙连相关更改 2025-08-12 11:06:36 +08:00
level 337f57506d 自动注册隐藏bug 2025-08-11 18:49:36 +08:00
level 4dc6c55eb6 宇连 2025-07-31 16:32:58 +08:00
level 72dc23f4ed 宙连应用更改 2025-07-24 10:02:58 +08:00
level e474d6bd57 合并提交 2025-07-23 18:25:26 +08:00
level 93ead85629 宇连 2025-07-23 18:02:32 +08:00
level 5258438208 宙连更改1 2025-07-23 16:46:06 +08:00
level 4dc537b759 宙连更改 2025-07-23 16:23:34 +08:00
level b3b9d18eac Merge branch 'msl' into ZhouLian
# Conflicts:
#	app/src/main/java/com/yingmao/clash/act/ChangeNodeActivity.kt
#	app/src/main/java/com/yingmao/clash/act/LoginActivity.kt
#	app/src/main/java/com/yingmao/clash/act/MemberRechargeActivity.kt
#	app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt
#	app/src/main/java/com/yingmao/clash/act/SettingActivity.kt
#	app/src/main/java/com/yingmao/clash/fragment/NewAccFragment.kt
#	app/src/main/java/com/yingmao/clash/vm/MainAtyVM.kt
#	app/src/main/res/drawable/oc_proxy_bg.xml
#	app/src/main/res/drawable/oc_proxy_choose_bg.xml
#	app/src/main/res/layout/activity_change_node.xml
#	app/src/main/res/layout/activity_change_pwd.xml
#	app/src/main/res/layout/activity_forget_pwd.xml
#	app/src/main/res/layout/activity_setting.xml
#	app/src/main/res/layout/fragment_accelerate.xml
#	app/src/main/res/layout/layout_activity_activity.xml
#	app/src/main/res/layout/layout_activity_login.xml
#	app/src/main/res/layout/layout_activity_share.xml
#	app/src/main/res/layout/layout_splash_activity.xml
#	app/src/main/res/layout/member_recharge_layout.xml
#	app/src/main/res/layout/new_main_activity.xml
#	app/src/main/res/layout/vip_recharge_list_item_layout.xml
#	app/src/main/res/values-en/strings.xml
#	app/src/main/res/values-zh-rHK/strings.xml
#	app/src/main/res/values-zh-rTW/strings.xml
#	app/src/main/res/values/colors.xml
#	app/src/main/res/values/strings.xml
#	build.gradle.kts
2025-07-23 16:01:44 +08:00
level b1614f6f59 更改组名 2025-07-21 17:43:15 +08:00
level 56bef38426 保存数据 2025-07-21 16:40:51 +08:00
level ab92ade8e0 删除必要文件 2025-07-21 15:30:07 +08:00
level 5ebd3cdfaa Merge branch 'master' into msl
# Conflicts:
#	app/src/main/java/com/yingmao/clash/act/ChangeNodeActivity.kt
#	app/src/main/java/com/yingmao/clash/act/MainActivity.kt
#	app/src/main/java/com/yingmao/clash/act/MemberRechargeActivity.kt
#	app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt
#	app/src/main/java/com/yingmao/clash/act/SettingActivity.kt
#	app/src/main/java/com/yingmao/clash/act/SplashActivity.kt
#	app/src/main/java/com/yingmao/clash/fragment/NewAccFragment.kt
#	app/src/main/java/com/yingmao/clash/fragment/recharge/RechargeFragment.kt
#	app/src/main/res/values-en/strings.xml
#	gradle/wrapper/gradle-wrapper.properties
2025-07-21 15:07:47 +08:00
cyh 9026dff6b4 删除多余文件2 2025-07-21 14:50:57 +08:00
cyh 78e546310d fix timer启动时先清空 2025-07-21 12:32:48 +08:00
cyh ef0c75737d Merge remote-tracking branch 'refs/remotes/origin/master' 2025-07-21 12:26:08 +08:00
cyh 3a3bab6909 删除多余文件 2025-07-21 12:26:01 +08:00
level dd4069538c Merge branch 'master' of 10.10.25.26:/usr/local/git/v_clash_android 2025-07-21 12:01:30 +08:00
level 3729279449 bug fix :vpn初始化关闭之后未正常关闭dialog 2025-07-21 12:01:01 +08:00
level 662bfcb252 bug fix :vpn初始化关闭之后未正常关闭dialog 2025-07-21 11:59:10 +08:00
cyh 77ae53e43d ignore gradle-wrapper.properties 2025-07-21 11:29:15 +08:00
level e5e467f981 bug fix :vpn初始化关闭之后关闭之后未正常关闭dialog 2025-07-18 15:50:39 +08:00
level 7a4cdff588 版本升级 2025-07-18 12:16:31 +08:00
cyh 53ffd91b84 Merge remote-tracking branch 'refs/remotes/origin/master' 2025-07-17 18:05:40 +08:00
level 15097cd982 新增参数 2025-07-17 17:54:58 +08:00
level ae1e837055 提示 2025-07-17 12:26:56 +08:00
level 2b25dd4fb2 代码冗余 2025-07-16 15:00:06 +08:00
level 268d990c24 马上连360注册新增oaid 2025-07-16 14:26:14 +08:00
level e10061e5e7 马上连注册新增oaid 2025-07-16 12:42:45 +08:00
level e6cdf3b766 马上连注册新增oaid 2025-07-16 12:07:12 +08:00
level 7a2a1cfcb2 big fix: 切换源问题 2025-07-15 17:09:53 +08:00
level 3bc5e26744 big fix: 启动问题 2025-07-15 16:02:11 +08:00
level dce52cd52c big fix: 线程切换问题 2025-07-15 15:44:27 +08:00
level 66971ecab1 更改 2025-07-15 14:33:23 +08:00
level 9e8f99a1ff 启动clash弹窗更改 2025-07-15 14:14:36 +08:00
level 82b2cb5662 启动clash弹窗更改 2025-07-15 12:07:10 +08:00
level 6e8fb10047 启动clash弹窗 2025-07-15 12:05:21 +08:00
level b982e3b440 启动clash弹窗 2025-07-15 12:04:47 +08:00
level 391e44c0d7 未充值用户提示问题 2025-07-14 18:46:58 +08:00
level 5ab6aa4ac4 马上连提示问题 2025-07-14 18:33:49 +08:00
cyh 6c312a1d29 Merge remote-tracking branch 'refs/remotes/origin/master' 2025-07-10 15:06:54 +08:00
cyh f762b1a1c7 fix 启动act自动切换 2025-07-10 15:06:42 +08:00
level 241ee97db6 马上连更改 2025-07-09 15:50:42 +08:00