支付和打印组件迁移到基础Lib

app/build.gradle

@@ -27,9 +27,6 @@ android {
         versionName VERSION_NAME.toString()
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        buildConfigField 'String', "CHANNEL", "\"$CHANNEL\""
-        buildConfigField "Boolean", "ISTEST", ISTEST.toString()
-        buildConfigField "String", "appType", "\"mpos\""
     }
 
     buildTypes {
@@ -70,35 +67,21 @@ android {
 }
 
 dependencies {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.core:core-ktx:1.3.1'
-    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'com.google.android.material:material:1.2.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
-    implementation("com.squareup.okhttp3:okhttp:4.9.3")
-    implementation("com.squareup.okhttp3:logging-interceptor:3.9.0")
-    implementation("com.squareup.retrofit2:retrofit:2.9.0")
+    implementation project(':lib_common')
+
+
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'com.rengwuxian.materialedittext:library:2.1.4'
     implementation 'com.github.GrenderG:Toasty:1.5.2'
     kapt 'androidx.room:room-compiler:2.4.0'
     implementation 'androidx.room:room-runtime:2.4.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation files('libs/Pay-Platform.jar')
     testImplementation 'junit:junit:4.+'
-    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
-    implementation('com.squareup.retrofit2:converter-simplexml:2.9.0') {
-        exclude group: 'xpp3', module: 'xpp3'
-        exclude group: 'stax', module: 'stax-api'
-        exclude group: 'stax', module: 'stax'
-    }
+
     implementation 'com.alibaba:fastjson:1.2.8'
     implementation 'com.blankj:utilcode:1.30.0'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-    implementation files('libs/miya-print-1.0.23.aar')
     implementation 'com.tencent:mmkv:1.2.12'
     implementation 'com.github.ybq:Android-SpinKit:1.4.0'
     implementation 'com.github.d-max:spots-dialog:1.1@aar'

app/src/main/java/com/miya/fastcashier/log/LFilePickerActivity.java

@@ -15,7 +15,7 @@ import android.widget.Toast;
 import com.blankj.utilcode.util.EncodeUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.StringUtils;
-import com.miya.fastcashier.BuildConfig;
+import com.fastcashier.lib_common.BuildConfig;
 import com.miya.fastcashier.R;
 import com.miya.fastcashier.beans.SelfCashierTerminalConfig;
 import com.miya.fastcashier.net.ApiConfig;

app/src/main/java/com/miya/fastcashier/log/SystemParameterDialog.kt

@@ -2,21 +2,17 @@ package com.miya.fastcashier.log
 
 import android.app.Dialog
 import android.content.Context
-import com.miya.fastcashier.service.AccountService.getAccountInfo
-import com.miya.fastcashier.net.ApiConfig.baseUrl
-import com.miya.fastcashier.R
-import com.miya.fastcashier.beans.SelfCashierAccountInfo
-import com.miya.fastcashier.service.AccountService
-import com.miya.fastcashier.net.ApiConfig
-import com.miya.print.PrinterManager
-import android.widget.TextView
-import com.miya.fastcashier.log.SystemParameterDialog
-import android.view.WindowManager
 import android.view.Gravity
 import android.view.View
-import com.miya.fastcashier.BuildConfig
+import android.view.WindowManager
+import android.widget.TextView
+import com.fastcashier.lib_common.BuildConfig
+import com.miya.fastcashier.R
 import com.miya.fastcashier.databinding.DialogSystemParameterBinding
+import com.miya.fastcashier.net.ApiConfig.baseUrl
+import com.miya.fastcashier.service.AccountService.getAccountInfo
 import com.miya.fastcashier.utils.*
+import com.miya.print.PrinterManager
 import java.util.*
 
 class SystemParameterDialog(context: Context) : Dialog(context, R.style.CommonDialog) {

app/src/main/java/com/miya/fastcashier/net/ApiConfig.kt

 package com.miya.fastcashier.net
 
 import android.text.TextUtils
-import com.miya.fastcashier.BuildConfig
+import com.fastcashier.lib_common.BuildConfig
 import com.miya.fastcashier.beans.SelfCashierTerminalConfig
 
 object ApiConfig {

app/src/main/java/com/miya/fastcashier/net/ApiRequest.kt

@@ -9,7 +9,6 @@ import okhttp3.MultipartBody
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
-import java.util.concurrent.TimeUnit
 import javax.net.ssl.SSLSocketFactory
 import javax.net.ssl.X509TrustManager
 

app/src/main/java/com/miya/fastcashier/net/ApiService.kt

 package com.miya.fastcashier.net
 
+import com.fastcashier.lib_common.net.BaseResponse
 import com.miya.fastcashier.beans.LoginRequest
 import com.miya.fastcashier.beans.SelfCashierAccountInfo
 import okhttp3.MultipartBody

app/src/main/java/com/miya/fastcashier/net/CommonCallback.kt

 package com.miya.fastcashier.net
 
 import android.util.Log
+import com.fastcashier.lib_common.net.BaseResponse
 import com.miya.fastcashier.BaseApplication.Companion.getApplication
 import com.miya.fastcashier.R
 import com.miya.fastcashier.utils.isNetworkConnected

lib_common/build.gradle

@@ -12,8 +12,11 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
+
+        buildConfigField 'String', "CHANNEL", "\"$CHANNEL\""
+        buildConfigField "Boolean", "ISTEST", ISTEST.toString()
+        buildConfigField "String", "appType", "\"mpos\""
     }
 
     buildTypes {
@@ -32,8 +35,23 @@ android {
 }
 
 dependencies {
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    api files('libs/miya-print-1.0.23.aar')
+    api files('libs/Pay-Platform.jar')
 
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.3.0'
+    api 'androidx.core:core-ktx:1.3.1'
+    api 'androidx.appcompat:appcompat:1.3.1'
+    api 'com.google.android.material:material:1.2.1'
+    api 'androidx.constraintlayout:constraintlayout:2.0.1'
+    api 'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0'
+    api 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
+    api("com.squareup.okhttp3:okhttp:4.9.3")
+    api("com.squareup.okhttp3:logging-interceptor:3.9.0")
+    api("com.squareup.retrofit2:retrofit:2.9.0")
+    api 'com.squareup.retrofit2:converter-gson:2.9.0'
+    api('com.squareup.retrofit2:converter-simplexml:2.9.0') {
+        exclude group: 'xpp3', module: 'xpp3'
+        exclude group: 'stax', module: 'stax-api'
+        exclude group: 'stax', module: 'stax'
+    }
 }
\ No newline at end of file

app/src/main/java/com/miya/fastcashier/net/BaseResponse.kt → lib_common/src/main/java/com/fastcashier/lib_common/net/BaseResponse.kt

-package com.miya.fastcashier.net
+package com.fastcashier.lib_common.net
 
 import java.io.Serializable