From f2065545d15f59d427ba15f3598f94c214972774 Mon Sep 17 00:00:00 2001 From: Mingyueyixi <1379598589@qq.com> Date: Sun, 9 Jun 2024 23:08:27 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E5=90=88=E5=B9=B6mislock=E7=9A=84goog?= =?UTF-8?q?le=20play=E9=80=82=E9=85=8D=EF=BC=8C=E5=B9=B6=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?google=E4=BE=9D=E8=B5=96=E5=BA=93=E8=87=AA=E5=8A=A8=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E5=AF=BC=E8=87=B4=E7=9A=84=E7=BC=96=E8=AF=91=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/android.yml | 9 +++++---- .github/workflows/release-post.yml | 2 +- app/build.gradle | 17 ++++++++++++++--- .../com/lu/wxmask/plugin/ui/DBInfoListUI.kt | 13 +++++++++++-- settings.gradle | 8 ++++++++ 5 files changed, 39 insertions(+), 10 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 9b54719..af4a3f2 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -12,9 +12,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'temurin' @@ -34,6 +34,7 @@ jobs: echo "GIT_COMMIT=$GIT_COMMIT$">> $GITHUB_ENV echo "GITHUB_RUN_URL=$github_run_url">> $GITHUB_ENV echo "GIT_BRANCH=`git branch --show-current`" >> $GITHUB_ENV + chmod +x robot.py # debug - name: Dump Env @@ -63,13 +64,13 @@ jobs: debugArtifactName=`ls app/build/outputs/apk/debug/*.apk | grep -Po "(?<=debug/).*(?=\.apk)"` && echo "debugArtifactName=$debugArtifactName" >> $GITHUB_OUTPUT - name: Upload Archive Release-Apk - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ steps.prepareArtifact.outputs.releaseArtifactName }} path: app/build/outputs/apk/release/*.apk - name: Upload Archive Debug-Apk - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ steps.prepareArtifact.outputs.debugArtifactName }} path: ./app/build/outputs/apk/debug/*.apk diff --git a/.github/workflows/release-post.yml b/.github/workflows/release-post.yml index 65186bb..92dfc8b 100644 --- a/.github/workflows/release-post.yml +++ b/.github/workflows/release-post.yml @@ -12,7 +12,7 @@ jobs: python-version: [ "3.10" ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: diff --git a/app/build.gradle b/app/build.gradle index 3ae1ad3..b77e8d7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -147,17 +147,28 @@ android { } +configurations.all { + resolutionStrategy { + force 'androidx.core:core:1.13.1' +// force 'androidx.arch.core:core-runtime:2.2.0' + } +} + + + dependencies { implementation(fileTree(dir: "libs", include: ["*.jar", "*.aar"])) implementation(deps['com.github.Mingyueyixi.frame-base-utils:core']) - implementation(deps['com.github.Mingyueyixi.frame-ui:ui-appcompat']) -// implementation('com.github.Mingyueyixi.frame-ui:ui-appcompat:1.0') - + implementation(deps['com.github.Mingyueyixi.frame-ui:ui-appcompat']){ +// exclude(group:'androidx.core', module:'core') + } implementation(deps['com.github.Mingyueyixi.lposed:xposed-api2']) implementation(deps['com.github.Mingyueyixi.lposed:plugin']) implementation(deps['com.google.code.gson:gson']) implementation(deps['androidx.appcompat:appcompat']) +// implementation 'androidx.core:core:1.3.1' + implementation(project(":lib-donate")) compileOnly(deps['de.robv.android.xposed:api']) compileOnly('com.tencent.wcdb:wcdb-android:1.1-19') diff --git a/app/src/main/java/com/lu/wxmask/plugin/ui/DBInfoListUI.kt b/app/src/main/java/com/lu/wxmask/plugin/ui/DBInfoListUI.kt index 94923b2..34339e8 100644 --- a/app/src/main/java/com/lu/wxmask/plugin/ui/DBInfoListUI.kt +++ b/app/src/main/java/com/lu/wxmask/plugin/ui/DBInfoListUI.kt @@ -26,6 +26,7 @@ import com.lu.wxmask.util.ConfigUtil import com.lu.wxmask.util.WxSQLiteManager import com.lu.wxmask.util.ext.dp import com.lu.wxmask.util.ext.toJson +import java.io.File class DBInfoListUI(val context: Context) : IConfigManagerUI { private lateinit var listView: ListView @@ -112,11 +113,18 @@ class DBInfoListUI(val context: Context) : IConfigManagerUI { override fun onBindViewHolder(vh: Holder, position: Int, parent: ViewGroup) { val item = dataList[position] vh.textLeft.text = item.name - vh.textRight.text = item.password.toElseEmptyString() + + val dbFile = File(item.name) + val rightText = item.password.toElseEmptyString() + if (dbFile.exists()) { + "\n${dbFile.length() / 1024L}KB" + } else { + "" + } + vh.textRight.text = rightText vh.itemView.setOnClickListener { val text = "数据库：${item.name}\n密码：${item.password}" if (ClipboardUtil.copy(text)) { -// ToastUtil.show("数据库路径和密码已复制") + ToastUtil.show("数据库路径和密码已复制") ToastUtil.show(WxSQLiteManager.getAllTables(item.name, item.password).toJson()) } @@ -131,6 +139,7 @@ class DBInfoListUI(val context: Context) : IConfigManagerUI { init { itemView.addView(LinearLayout(itemView.context).apply { + orientation = LinearLayout.HORIZONTAL addView(TextView(context).apply { textLeft = this textSize = 16f diff --git a/settings.gradle b/settings.gradle index b48ac87..56cafd4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,9 @@ pluginManagement { repositories { + maven { + allowInsecureProtocol = true + url "http://127.0.0.1:10072" + } maven { url 'https://repo.huaweicloud.com/repository/maven' } //central有的，public聚合仓不一定有，奇葩 maven { url 'https://maven.aliyun.com/repository/central' } @@ -17,6 +21,10 @@ pluginManagement { dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { + maven { + allowInsecureProtocol = true + url "http://127.0.0.1:10072" + } // maven { // url = uri("https://maven.pkg.github.com/mingyueyixi/frame-ui") // credentials {