Commit Graph

24 Commits

Author SHA1 Message Date
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 3a3bab6909 删除多余文件 2025-07-21 12:26:01 +08:00
level 69e816f807 获取订阅链接请求新增 version字段 2025-07-10 15:08:15 +08:00
level c55d282acc 需求:
bug fix :1. 单点登录
         2. 用户态
2025-07-01 15:02:51 +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 6637ff110e 一键连相关更改 2025-06-10 12:26:20 +08:00
level b6b439bca4 一键连 2025-06-06 15:36:02 +08:00
level 4ba0f48d00 马上连需求更改2 2025-05-30 15:47:23 +08:00
level 0ec07185d4 1.更换网络BaseURL
2.新增注册功能
3.新增节点选择隐藏显示功能
2025-05-28 18:14:55 +08:00
level 954ccfad39 马上连更改 2025-05-13 09:49:33 +08:00
cyh a0d675c121 Merge remote-tracking branch 'refs/remotes/origin/master' 2025-03-19 10:50:18 +08:00
cyh 5834af4bb2 fix 2025-03-19 10:48:00 +08:00
level 7869a2a827 描述:
1.修改toast 样式
2. 修改记录开启时长
3.新增版本号
2025-03-18 19:08:39 +08:00
level 834fd0129a 描述:
1.影喵 UI 更换到 影猫UI
2025-03-17 17:19:38 +08:00
level 29fe637a7a 描述:
1.更改sdk版本为34
2.sdk34 版本适配
3.接入spotify支付(拉起支付宝)
2025-02-14 18:50:51 +08:00
cyh 4fc198bd26 fix 心跳轮训间隔 2024-10-15 15:58:47 +08:00
cyh df86131200 fix 心跳和退出登录 2024-10-15 15:39:01 +08:00
level 2b8635e45a 描述:
新增报错日志抓取 并上传至阿里云oss
2024-09-30 10:26:42 +08:00
cyh b8747254e8 fix 新用户首次不展示其他窗口,活动页适配 2024-09-04 18:01:38 +08:00
level 07197726ea 描述:
1.新增首页活动弹出框
2.更改注册接口与注册接口加密方式
2024-08-29 16:16:00 +08:00
cyh 3bcd1883d9 添加备用充值返回时对话框 2024-08-14 16:03:48 +08:00
pc a7632227f3 add 跑马灯接口 2024-08-05 18:04:52 +08:00
laochen 1264cb175b init commit 2024-07-03 15:03:56 +08:00