 level
|
d9d32a31a6
|
Merge branch 'master' into yijianlian
# 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/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/app/MainApplication.kt
# app/src/main/java/com/yingmao/clash/base/BaseActivity.kt
# app/src/main/java/com/yingmao/clash/base/BaseViewMode.kt
# app/src/main/java/com/yingmao/clash/fragment/NewAccFragment.kt
# app/src/main/java/com/yingmao/clash/fragment/home/HomeFragment.kt
# app/src/main/java/com/yingmao/clash/fragment/recharge/RechargeFragment.kt
# app/src/main/java/com/yingmao/clash/fragment/setting/SettingFragment.kt
# app/src/main/java/com/yingmao/clash/net/http/HttpApi.kt
# app/src/main/java/com/yingmao/clash/service/ConnectionService.java
# app/src/main/java/com/yingmao/clash/vm/MainAtyVM.kt
# 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/strings.xml
# build.gradle.kts
# gradle/wrapper/gradle-wrapper.properties
|
2025-07-22 14:52:09 +08:00 |
cyh
|
9026dff6b4
|
删除多余文件2
|
2025-07-21 14:50:57 +08:00 |
|
level
|
dd75a744a5
|
新增权限管理组
|
2025-07-21 14:40:20 +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
|
95e2ac3a73
|
ignore gradle-wrapper.properties
|
2025-07-21 11:48:53 +08:00 |
|
level
|
6e65106408
|
bug fix :vpn初始化关闭之后关闭之后未正常关闭dialog
|
2025-07-21 11:39:49 +08:00 |
|
cyh
|
77ae53e43d
|
ignore gradle-wrapper.properties
|
2025-07-21 11:29:15 +08:00 |
|
cyh
|
53ffd91b84
|
Merge remote-tracking branch 'refs/remotes/origin/master'
|
2025-07-17 18:05:40 +08:00 |
|
level
|
ae1e837055
|
提示
|
2025-07-17 12:26:56 +08:00 |
|
level
|
9b57d51a1a
|
big fix: 切换源问题
|
2025-07-15 17:00:33 +08:00 |
|
level
|
0932839b27
|
big fix: 线程切换问题
|
2025-07-15 15:49:54 +08:00 |
|
level
|
dce52cd52c
|
big fix: 线程切换问题
|
2025-07-15 15:44:27 +08:00 |
|
level
|
654f28c2cd
|
一键连更改
|
2025-07-15 15:26:24 +08:00 |
|
level
|
a063a4753e
|
一键连更改
|
2025-07-15 14:48:17 +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
|
3bb67f05bb
|
一键连
|
2025-07-14 18:28:25 +08:00 |
|
level
|
bc308ed86f
|
bug fix 初始化修复时间延长
|
2025-07-10 18:09:52 +08:00 |
|
level
|
f7d7b6e21a
|
bug fix 初始化引用问题
|
2025-07-10 17:39:01 +08:00 |
|
level
|
c5b54e7e42
|
q
|
2025-07-10 16:50:03 +08:00 |
|
level
|
69e816f807
|
获取订阅链接请求新增 version字段
|
2025-07-10 15:08:15 +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
|
b82bc9a4b4
|
需求:
一键连更新
|
2025-07-04 17:53:33 +08:00 |
|
level
|
c738f27742
|
需求:
代码遗留1
|
2025-07-04 17:22:37 +08:00 |
|
level
|
51dede7fb2
|
需求:
commit loacal
更新代码4
|
2025-07-04 17:00:18 +08:00 |
|
level
|
b2fd37a68e
|
需求:
commit loacal
更新代码3
|
2025-07-04 16:27:40 +08:00 |
|
level
|
d315250538
|
需求:
commit loacal
更新代码2
|
2025-07-04 16:06:28 +08:00 |
|
level
|
1e3265785a
|
需求:
commit loacal
更新代码1
|
2025-07-04 15:38:30 +08:00 |
|
level
|
d9096d5a44
|
需求:
commit
更新代码
|
2025-07-04 15:22:25 +08:00 |
|
level
|
7c270b68a5
|
需求:
commit local
|
2025-07-04 12:30:54 +08:00 |
|
cyh
|
1c5e0f0aec
|
fix
|
2025-07-03 16:43:20 +08:00 |
|
cyh
|
fb9a73fc4a
|
Merge remote-tracking branch 'refs/remotes/origin/master'
|
2025-07-03 16:40:35 +08:00 |
|
cyh
|
38f5963797
|
添加自动切换节点
|
2025-07-03 16:30:34 +08:00 |
|
level
|
f142dd82f9
|
需求:
重启逻辑遗留更改
|
2025-07-03 14:44:37 +08:00 |
|
level
|
cddef05978
|
需求:
重启逻辑更改
|
2025-07-03 12:11:56 +08:00 |
|
level
|
2f240e85a5
|
需求:
bug fix :1.单点登录 充值界面检测登录状态改变之后退出到登录页面
2.用户使用状态上传由10s改为60s
3.内核删除文件后等待初始化提示完成提示
|
2025-07-01 17:21:57 +08:00 |
|
level
|
c55d282acc
|
需求:
bug fix :1. 单点登录
2. 用户态
|
2025-07-01 15:02:51 +08:00 |
|
level
|
f307753dd6
|
bug fix :引用问题
|
2025-06-30 18:40:35 +08:00 |
|
level
|
e1bfc380d3
|
bug fix :用户单点登录点击充值后显示无数据的相关问题
|
2025-06-30 18:28:41 +08:00 |
|
level
|
29ce1726ca
|
bug fix :更新用户使用时长回调时间由10s更改为60s
|
2025-06-30 16:17:35 +08:00 |
|
level
|
53bc91c07a
|
bug fix :更新用户使用时长回调时间由10s更改为60s
|
2025-06-30 15:34:33 +08:00 |
|
level
|
64eba307bc
|
bug fix :应用状态请求异常
|
2025-06-30 15:08:14 +08:00 |