From 6ac399cdeda2424a47b367e2ffca7658269c4f86 Mon Sep 17 00:00:00 2001 From: yangxisong Date: Thu, 11 Dec 2025 14:32:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B6=88=E9=99=A4=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Readme.md | 2 +- aar/debug/trackingPoint-debug-1.0.1.aar | Bin 90701 -> 90701 bytes aar/release/trackingPoint-release-1.0.1.aar | Bin 86340 -> 86339 bytes gradle/libs.versions.toml | 9 ++-- library/build.gradle.kts | 12 +++-- .../1.json | 43 ++++++++++++++++++ settings.gradle.kts | 3 ++ 7 files changed, 61 insertions(+), 8 deletions(-) create mode 100644 library/schemas/com.yuanxuan.tracking_point.library.db.TrackingPointDatabase/1.json diff --git a/Readme.md b/Readme.md index 02ef60c..57ac6d2 100644 --- a/Readme.md +++ b/Readme.md @@ -1,4 +1,4 @@ - Room 数据持久化;Worker管理上传任务,初次上传+重试共5次,重试间隔10s线性增加;多上传任务顺序处理; +Room 数据持久化;Worker管理上传任务,初次上传+重试共5次,重试间隔10s线性增加;多上传任务顺序处理; 网络请求 Retrofit ### aar位置 根目录 /aar/xxx/trackingPoint-xxx-x.x.x.aar diff --git a/aar/debug/trackingPoint-debug-1.0.1.aar b/aar/debug/trackingPoint-debug-1.0.1.aar index 174db5454440889e265449f38f14b6d3935f165f..3d6b95a7839ac51100ba8c9b2238045f7583bdda 100644 GIT binary patch delta 6854 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 Ak^lez delta 6854 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

6<}RN+^YS3ar;nRH1PvgOMb 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 A$^ZZW diff --git a/aar/release/trackingPoint-release-1.0.1.aar b/aar/release/trackingPoint-release-1.0.1.aar index 17d2b8664ea0a2a26f1df6a625d308987c774d0a..932a4bca18fea3dbb75b34afc893f04375a590d9 100644 GIT binary patch delta 2523 zcmV<12_*K!q6NdE1+WMK3G>AcXP`_004{?O0k;tW0XRc{)%FJPGae)59W|j_LyStE zH~!u+Qj&MBR~|EFFq)S!lZuqYRbJ)QOSwvUqQCb)4KDpp zsWs-9@t#>{t+Qv%{(k%0k8gi#?{mJ*DgHDn9@U(G#w ze+{XB#wM@!k%hBSU-=bPmiOr*{Y3Zs`ESX#_O%=0ePl&)R(QpByQ6*jIOcA(rFi9p zD>s~Rh&{3G?$NhPI`dBR|C+ zl59yb&kCnXtwfBBtLwBTT*xNY!3;NEuWK%UX?I}^+Zx7o$!q+_DxzqUSwQc#%L!hx zuukOl&|_V@)$Udue}Y8^TW;PTVS>I+3t%$6s*xp}WWDE_`<22ZC{mwol+7zw`x$zz*K4qDK#fU$iFtsI^v^4t53ocF>K2k%#ntz(877MF&m{JC?m?&oJ23>>TMtm#vK9p7q3 zhsG;)^0k<%)68z;tX5N3U7BtY;?l7f8Lgn#1_@r)c_;PX7#ILp3C(_7STP7h9GXH7 zBm{jQ7pb)l9b07LzF-aXSKU7gv}x^5RqjwZd;&nW#l$!%9|=sWsd}ed|ERLHrpbow zVT25=5oSBZUq|W~^*CJ~ziQ`y=f?Qd*IB;?c+YX#CcbR5W(zycscoR6Un@FFPW`N{ z>CbuwW~=apm2GSP9*!W_5mv*+96p}=?|aeFhVT@fSJ|v(>s3}sTR+P+{)y#0d`gJ0EPd_0&oQ6;*5e$>>g}t%pK>~OCd*?QpBA@&KWrG;&{q?c zOFJOP%161LfB(S0EvpxaX_HRV56!6Mq}rd}6<1LfNxjh98o&Ls>lt5h!=}fw55tPY z&ULt%)HXUDY&HrC>27Gq3-*_D6&c9ht!`HFSIT(7Qc27)D8pB!}dN?Nbo{GE} zxn-zHSvD5FA^Q)@iiGr4L(M84RhpyKXrUf}YgJ&AvslljB^-blF6BvZ22B(CKnW^5mHEYU*@Z zm3gw#XBZCCNm|Dv>Gv5V{TNu&Nks8TWY1C}4m+*T^*lm1!{)HcGo4s19}nWgM+Q#n_E>_o3WZknNx0t&ba0=7&Nn;R`HG&`}jJdf4!Zo)um$Rs(`?_k<= z36%D)@a$+mVD=a?2J}hRQ5j*u>vZ|kQun6G?}7tBt<=Oxnq1nFB@3YG3F5U#)D@qR z2Y?nm05Ia=-I1CXk3VK0DN;m63;>d3pp{spIy;OTl}N#V;M^&+J)ll#3W5Z4)pZEe2IBPxTAV2vl%o@FwuzzfVsqAuLTlk z7zggjep?TK!+13cYE1Hc7DndJyK}yj=?7}*B>~kmnmAt`9fJiOn3*)C1;^wp0nbld_f-a-m$0oTXR54x31C(!rvr@_^7BgMgV zxEOTCvP_wS!(vG#xZ-Jh2>}9Hc$cDT4HKL{j;??j!JO1NU|jHY8YPfGM-vJ7AFobA zQE1$Mi?K4W{_>~P-<_bQdk=KNp*uo;znZbm$`92|Um zkV2M3qBVgexIs5z5%<_j0pK#&Yh8G2wsjGpGb#-|;hxL)?p}=Z z?x8&Bk*i#uasMJ8zzRh}j}_vgACE4|Awy6gG!Q=*C?g767dIsdc^piXw8@UJ-y^uaG1oW(SDfjR^K2e-sc0iXg2^TiHlpiBV( lE|+ak0ZIYGm$*;?IRhC_0hc#V0Xmm1Q2`JJ-%kMm006}>-=F{h delta 2517 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 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 00ba8fe..ee594ac 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,8 +13,8 @@ retrofit = "3.0.0" okhttp = "5.3.2" worker = "2.11.0" room = "2.8.4" -moshi="1.15.2" -ksp="2.2.21-2.0.4" +moshi = "1.15.2" +ksp = "2.2.21-2.0.4" [libraries] androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } @@ -27,8 +27,8 @@ androidx-activity = { group = "androidx.activity", name = "activity", version.re androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" } retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" } retrofit-converter-moshi = { group = "com.squareup.retrofit2", name = "converter-moshi", version.ref = "retrofit" } -moshi={ group = "com.squareup.moshi", name = "moshi", version.ref = "moshi" } -moshi-kotlin-codegen={ group = "com.squareup.moshi", name = "moshi-kotlin-codegen", version.ref = "moshi" } +moshi = { group = "com.squareup.moshi", name = "moshi", version.ref = "moshi" } +moshi-kotlin-codegen = { group = "com.squareup.moshi", name = "moshi-kotlin-codegen", version.ref = "moshi" } okhttp-logging-interceptor = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "okhttp" } androidx-work-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "worker" } androidx-room = { group = "androidx.room", name = "room-runtime", version.ref = "room" } @@ -40,4 +40,5 @@ android-application = { id = "com.android.application", version.ref = "agp" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } android-library = { id = "com.android.library", version.ref = "agp" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } +maven-publish = { id = "maven-publish" } diff --git a/library/build.gradle.kts b/library/build.gradle.kts index fd28e35..b365a38 100644 --- a/library/build.gradle.kts +++ b/library/build.gradle.kts @@ -36,15 +36,21 @@ android { sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = "11" - } + buildFeatures { buildConfig = true } } +kotlin { + jvmToolchain(11) +} + +ksp { + arg("room.schemaLocation", "$projectDir/schemas") +} + dependencies { implementation(libs.androidx.core.ktx) implementation(libs.androidx.work.ktx) diff --git a/library/schemas/com.yuanxuan.tracking_point.library.db.TrackingPointDatabase/1.json b/library/schemas/com.yuanxuan.tracking_point.library.db.TrackingPointDatabase/1.json new file mode 100644 index 0000000..7818962 --- /dev/null +++ b/library/schemas/com.yuanxuan.tracking_point.library.db.TrackingPointDatabase/1.json @@ -0,0 +1,43 @@ +{ + "formatVersion": 1, + "database": { + "version": 1, + "identityHash": "a1366f039fdd790a4b1666c6607ffd9e", + "entities": [ + { + "tableName": "tracking_points_table", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `trackingPointJson` TEXT NOT NULL, `uploading` INTEGER NOT NULL)", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "trackingPointJson", + "columnName": "trackingPointJson", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "uploading", + "columnName": "uploading", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": true, + "columnNames": [ + "id" + ] + } + } + ], + "setupQueries": [ + "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", + "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'a1366f039fdd790a4b1666c6607ffd9e')" + ] + } +} \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index 480c60a..bae84c2 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -11,6 +11,9 @@ pluginManagement { gradlePluginPortal() } } +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" +} dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories {