Commit Graph

360 Commits

Author SHA1 Message Date
level 7f4ae28afa 日期:2025.9.1
分支:yijianlian
需求:
1.ui中去除AI字样
2.冗余代码删除
2025-09-01 19:02:58 +08:00
level 9c92506343 bugfix:
1.删除采集用户开启时长定时接口
 2.更改支付界面提示词
 3.更改支付弹窗UI样式
 4.新增蓝海支付支持
2025-08-25 17:36:28 +08:00
level 1b23052085 新增截屏控制和添加字段 2025-08-01 15:43:54 +08:00
level bb99d3768d 1 2025-08-01 15:39:08 +08:00
level 17d7831c08 关闭日志打印 2025-07-29 15:54:14 +08:00
level ea098a2a63 一键连更改客服获取方式 2025-07-29 15:51:09 +08:00
level 3a44431418 一键连更改客服 2025-07-29 15:13:27 +08:00
level e6290145e9 一键连删除冗余类 合并主分支代码 2025-07-22 16:10:12 +08:00
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
level 6e65106408 bug fix :vpn初始化关闭之后关闭之后未正常关闭dialog 2025-07-21 11:39:49 +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 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
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
level e0f793886c bug fix: 1.百度支付回调从新设计 2. 更改源更换启动方式 2025-06-27 17:50:21 +08:00
level 413d7722e9 bug fix :1.初始化优化 2025-06-25 19:01:53 +08:00
level 8a28c1f17c bug fix :1.缓存数据退出登录未清理 2025-06-25 18:37:34 +08:00
level c2eff33c40 ui显示问题 2025-06-24 14:49:27 +08:00
level 86b00ee314 bug fix 2025-06-24 11:58:07 +08:00
level 3b55692d17 一键连新增注册接口 2025-06-23 17:51:37 +08:00
level 2e92990835 fix :注册 2025-06-23 17:18:46 +08:00
level d3aad97202 fix2 2025-06-23 16:50:21 +08:00
level ca90a96025 一键连新增首页源切换功能 2025-06-23 16:48:13 +08:00
level 1cd8f98921 一键连新增百度埋点统计 2025-06-19 16:56:50 +08:00
level 428995e243 一键连相关更改 2025-06-18 12:28:19 +08:00
level 09bcec1012 一键连进入获取订阅地址 2025-06-16 10:10:21 +08:00
level 3fad9e6843 一键连客服更改 2025-06-13 15:23:30 +08:00
level f8a3ff8d7c UI更改 2025-06-12 16:52:58 +08:00
level 2c29aa6324 错误字更改 2025-06-11 10:00:19 +08:00
level e1c656ab26 更改客服 2025-06-10 18:11:52 +08:00
level f7b19b0a86 删除日志 2025-06-10 16:39:53 +08:00
level d7e4de6850 一键连相关更改21 2025-06-10 16:38:55 +08:00
level dd57f3e631 一键连相关更改20 2025-06-10 15:38:56 +08:00
level 365b86f939 一键连相关更改1 2025-06-10 14:58:03 +08:00
level 6637ff110e 一键连相关更改 2025-06-10 12:26:20 +08:00
level fbbc1d6501 一键连更改相关数据4 2025-06-09 17:50:25 +08:00
level 2087ace8bc 一键连更改相关数据3 2025-06-09 17:27:08 +08:00
level 861d617892 一键连更改相关数据 2025-06-09 16:19:22 +08:00
level 0b7589fc9e 一键连更改相关数据3 2025-06-09 14:28:01 +08:00
level 3de2680ade 一键连更改相关数据3 2025-06-09 14:27:23 +08:00
level 066047c515 一键连更改相关数据2 2025-06-09 10:58:39 +08:00
level 7a1312d0b3 一键连更改相关数据 2025-06-09 10:56:04 +08:00
level b6b439bca4 一键连 2025-06-06 15:36:02 +08:00
level b18c0c4e07 马上连更改4 2025-06-06 10:18:41 +08:00
level d5d1a076d2 马上连相关更改3 2025-06-05 18:32:08 +08:00
level 804c309caf 马上连相关更改 2025-06-05 12:02:54 +08:00
level 46efc5574a 客服更改 2025-06-04 18:31:49 +08:00
level 37d9a6ddb7 马上连更改登录UI 2025-06-04 11:30:47 +08:00
level 48e93f59b8 马上新增版本号显示 2025-06-04 10:06:35 +08:00
level ee8aa1d983 马上连注册时候问题 2025-06-03 17:16:09 +08:00
level 7c9b2fb257 更改备用域名 2025-06-03 15:34:39 +08:00
level 155f2c446e 马上连需求更改5 2025-06-03 10:15:05 +08:00
level 40481a94c4 马上连需求更改4 2025-05-30 18:22:59 +08:00
level 4ba0f48d00 马上连需求更改2 2025-05-30 15:47:23 +08:00
cyh 0cf65ab86a fix ym网页注册 2025-05-30 11:02:48 +08:00
level 9bcb8a079e 1.需求更改2 2025-05-29 16:53:31 +08:00
level 91d8227536 1.需求更改 2025-05-29 16:40:18 +08:00
level 8543ee0546 1.更换客服 2025-05-29 15:16:14 +08:00
level 462cdfb2d9 1.需求更改 2025-05-29 10:17:00 +08:00
level 0ec07185d4 1.更换网络BaseURL
2.新增注册功能
3.新增节点选择隐藏显示功能
2025-05-28 18:14:55 +08:00