Skip to content

Commit

Permalink
resolve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Xicheng Guo committed Aug 1, 2024
2 parents c06d1de + 656ce51 commit 37e7794
Show file tree
Hide file tree
Showing 5 changed files with 453 additions and 1,232 deletions.
32 changes: 25 additions & 7 deletions app/src/main/assets/skip_config_v2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,16 @@
- packageName: com.coolapk.market
skipIds:
- id: com.byted.pangle.m:id/tt_splash_skip_btn
skipBounds:
- bound: 1116,219,1332,316
resolution: 1440,3024
# skipBounds:
# - bound: 926,113,1036,223
# resolution: 1080,2287

# 京东阅读
- packageName: com.jd.app.reader
skipIds:
- id: com.jd.app.reader:id/mJumpBtn
- id: com.jd.app.reader:id/count_down_time
skipBounds:
- bound: 1209,113,1338,165
resolution: 1440,3024
- id: com.byted.pangle:id/tt_splash_skip_btn

# 铁路12306
- packageName: com.MobileTicket
Expand Down Expand Up @@ -121,4 +119,24 @@
# 大麦
- packageName: cn.damai
skipIds:
- id: cn.damai:id/homepage_advert_pb
- id: cn.damai:id/homepage_advert_pb

# Cellular-Z
- packageName: make.more.r2d2.cellular_z
skipBounds:
- bound: 926,113,1036,223
resolution: 1080,2287

# 生日助手
- packageName: cn.sleepycoder.birthday
skipIds:
- id: com.byted.pangle.m:id/tt_splash_skip_btn
skipBounds:
- bound: 926,182,1036,292
resolution: 1080,2287

# 工时记
- packageName: cn.weilaihongtech.gongshi
skipBounds:
- bound: 945,158,1060,273
resolution: 1080,2287
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sun Jun 26 10:54:35 GMT+08:00 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-8.7-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
Loading

0 comments on commit 37e7794

Please sign in to comment.