修改项目目录

app/build.gradle

@@ -15,7 +15,7 @@ android {
     compileSdk 32
 
     defaultConfig {
-        minSdk 19
+        minSdk 21
         targetSdk 32
         versionCode versionCode1()
         versionName versionName1()
@@ -51,33 +51,34 @@ android {
         }
     }
 
-    configurations.all {
-        resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-            //noinspection GradleCompatible
-            def requested = details.requested
-            if (requested.group == 'com.squareup.retrofit2') {
-                if (requested.name=='retrofit' || requested.name=='adapter-rxjava2' ) {
-                    details.useVersion "2.6.0"
-                }
-            }
-            if (requested.group == 'com.squareup.okio') {
-                details.useVersion "2.6.0"
-            }
-            if(requested.group=='com.squareup.okhttp3'){
-                details.useVersion "3.12.2"
-            }
-        }
-    }
+//    configurations.all {
+//        resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+//            //noinspection GradleCompatible
+//            def requested = details.requested
+//            if (requested.group == 'com.squareup.retrofit2') {
+//                if (requested.name=='retrofit' || requested.name=='adapter-rxjava2' ) {
+//                    details.useVersion "2.6.0"
+//                }
+//            }
+//            if (requested.group == 'com.squareup.okio') {
+//                details.useVersion "2.6.0"
+//            }
+//            if(requested.group=='com.squareup.okhttp3'){
+//                details.useVersion "3.12.2"
+//            }
+//        }
+//    }
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+//    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation project(":jd_summarizing")
     implementation 'net.huansi.brand:baseform:23.10.10.1-SNAPSHOT'
 
-    //OkHttp
-    implementation 'com.squareup.okhttp3:okhttp:3.12.2'
-    implementation "com.squareup.okhttp3:logging-interceptor:3.12.2"
-    //Retrofit
-    implementation 'com.squareup.retrofit2:retrofit:2.6.0'
-    implementation "com.squareup.retrofit2:adapter-rxjava2:2.6.0"
+//    //OkHttp
+//    implementation 'com.squareup.okhttp3:okhttp:3.12.2'
+//    implementation "com.squareup.okhttp3:logging-interceptor:3.12.2"
+//    //Retrofit
+//    implementation 'com.squareup.retrofit2:retrofit:2.6.0'
+//    implementation "com.squareup.retrofit2:adapter-rxjava2:2.6.0"
 }
\ No newline at end of file

app/src/main/AndroidManifest.xml

@@ -25,15 +25,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".activity.login.LoginActivity"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="action.board.hssummarizingboard" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-        <activity android:name=".activity.main.MainActivity" />
+
     </application>
 
 </manifest>
\ No newline at end of file

app/src/main/java/net/huansi/app/hssummarizingboard/activity/login/LoginPresenter.kt

-package net.huansi.app.hssummarizingboard.activity.login
-
-import net.huansi.app.hssummarizingboard.base.SutureClothBasePresenter
-
-class LoginPresenter: SutureClothBasePresenter() {
-}
\ No newline at end of file

app/src/main/java/net/huansi/app/hssummarizingboard/utils/Constant.kt

-package net.huansi.app.hssummarizingboard.utils
-
-object Constant {
-    const val SP_DATA_REFRESH_TIME = "data_refresh_time"//数据刷新时间
-}
\ No newline at end of file

jd_summarizing/.gitignore

+/build
\ No newline at end of file

jd_summarizing/build.gradle

+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+}
+apply from :"maven_push.gradle"
+android {
+    compileSdk 32
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+    //数据绑定
+    dataBinding {
+        enabled true
+    }
+    lintOptions {
+        checkReleaseBuilds false
+        abortOnError false
+    }
+}
+
+dependencies {
+
+//    implementation 'androidx.core:core-ktx:1.10.1'
+//    implementation platform('org.jetbrains.kotlin:kotlin-bom:1.8.0')
+//    implementation 'androidx.appcompat:appcompat:1.6.1'
+//    implementation 'com.google.android.material:material:1.9.0'
+//    testImplementation 'junit:junit:4.13.2'
+//    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+//    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    implementation 'net.huansi.brand:baseform:23.10.10.1-SNAPSHOT'
+}
\ No newline at end of file

jd_summarizing/maven_push.gradle

+apply plugin: 'maven-publish'
+
+task generateSourcesJar(type: Jar) {
+    from android.sourceSets.main.java.srcDirs
+    classifier  'sources'
+}
+
+afterEvaluate {
+    publishing {
+        publications {
+            Production(MavenPublication) {
+                from components.release
+                version '1.0.0-SNAPSHOT' //版本号，多次打包不能一致
+                artifactId 'jd_summarizing' //识别Id，与项目名称一致即可
+                groupId 'net.huansi' //组号，类似包名
+                // 上传source，这样使用放可以看到方法注释
+                artifact generateSourcesJar
+            }
+        }
+        repositories {
+            maven {
+                url = 'http://47.110.145.204:8245/repository/hs-maven-snapshots/'
+                allowInsecureProtocol = true
+                credentials {
+                    username = 'admin'
+                    password = 'huansi.net'
+                }
+            }
+        }
+    }
+}

jd_summarizing/proguard-rules.pro

+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file

jd_summarizing/src/main/AndroidManifest.xml

+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="net.huansi.summarizing">
+    <application>
+        <activity
+            android:name=".activity.login.LoginActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="action.board.hssummarizingboard" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity android:name=".activity.main.SummarizingActivity" />
+    </application>
+</manifest>
\ No newline at end of file

app/src/main/java/net/huansi/app/hssummarizingboard/activity/login/LoginActivity.kt → jd_summarizing/src/main/java/net/huansi/summarizing/activity/login/LoginActivity.kt

-package net.huansi.app.hssummarizingboard.activity.login
+package net.huansi.summarizing.activity.login
 
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
 import baseform.android.huansi.net.configui.ConfigActivity
 import baseform.android.huansi.net.util.DeviceUtil
-import net.huansi.app.hssummarizingboard.R
-import net.huansi.app.hssummarizingboard.activity.main.MainActivity
-import net.huansi.app.hssummarizingboard.base.SutureClothBaseActivity
-import net.huansi.app.hssummarizingboard.databinding.ActivityLoginBinding
-import net.huansi.app.hssummarizingboard.dialog.LoginSettingDialog
+import net.huansi.summarizing.activity.main.SummarizingActivity
+import net.huansi.summarizing.base.SutureClothBaseActivity
+import net.huansi.summarizing.dialog.LoginSettingDialog
+import net.huansi.summarizing.R
+import net.huansi.summarizing.databinding.ActivityLoginBinding
 
 @SuppressLint("CheckResult")
 class LoginActivity : SutureClothBaseActivity<ActivityLoginBinding, LoginPresenter>() {
@@ -43,7 +43,7 @@ class LoginActivity : SutureClothBaseActivity<ActivityLoginBinding, LoginPresent
     }
 
     private fun gotoMain() {
-        MainActivity.toThis(this)
+        SummarizingActivity.toThis(this)
         finish()
     }
 

jd_summarizing/src/main/java/net/huansi/summarizing/activity/login/LoginPresenter.kt

+package net.huansi.summarizing.activity.login
+
+import net.huansi.summarizing.base.SutureClothBasePresenter
+
+class LoginPresenter: SutureClothBasePresenter() {
+}
\ No newline at end of file

app/src/main/java/net/huansi/app/hssummarizingboard/activity/main/MainActivity.kt → jd_summarizing/src/main/java/net/huansi/summarizing/activity/main/SummarizingActivity.kt

-package net.huansi.app.hssummarizingboard.activity.main
+package net.huansi.summarizing.activity.main
 
 import android.animation.ObjectAnimator
 import android.animation.ValueAnimator
@@ -9,7 +9,6 @@ import android.view.animation.Animation
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import baseform.android.huansi.net.log.HsLog
 import baseform.android.huansi.net.util.AndroidTableManager
 import baseform.android.huansi.net.util.BasicVariableUtils
 import baseform.android.huansi.net.util.RecyclerViewUtils
@@ -26,20 +25,19 @@ import com.github.mikephil.charting.formatter.IValueFormatter
 import com.github.mikephil.charting.utils.Fill
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import net.huansi.app.hssummarizingboard.R
-import net.huansi.app.hssummarizingboard.adapter.BrandAdapter
-import net.huansi.app.hssummarizingboard.base.SutureClothBaseActivity
-import net.huansi.app.hssummarizingboard.databinding.ActivityMainBinding
-import net.huansi.app.hssummarizingboard.entity.BrandBean
-import net.huansi.app.hssummarizingboard.entity.BrandInfoBean
-import net.huansi.app.hssummarizingboard.entity.PieChartBean
-import net.huansi.app.hssummarizingboard.entity.ProDetailsBean
-import net.huansi.app.hssummarizingboard.utils.Constant
+import net.huansi.summarizing.adapter.BrandAdapter
+import net.huansi.summarizing.base.SutureClothBaseActivity
+import net.huansi.summarizing.entity.BrandBean
+import net.huansi.summarizing.entity.BrandInfoBean
+import net.huansi.summarizing.entity.ProDetailsBean
+import net.huansi.summarizing.utils.Constant
+import net.huansi.summarizing.R
+import net.huansi.summarizing.databinding.ActivityMainBinding
 import java.text.SimpleDateFormat
 import java.util.*
 
 
-class MainActivity : SutureClothBaseActivity<ActivityMainBinding, MainPresenter>() {
+class SummarizingActivity : SutureClothBaseActivity<ActivityMainBinding, SummarizingPresenter>() {
     private var pageCountdownSeconds: Long = 5//页面刷新时间
     private lateinit var mBrandPieChart: PieChartManager
     private lateinit var mProductionBarChart: BarChartManager
@@ -408,7 +406,7 @@ class MainActivity : SutureClothBaseActivity<ActivityMainBinding, MainPresenter>
 
     companion object {
         fun toThis(from: Activity) {
-            val intent = Intent(from, MainActivity::class.java)
+            val intent = Intent(from, SummarizingActivity::class.java)
             from.startActivity(intent)
         }
     }

app/src/main/java/net/huansi/app/hssummarizingboard/activity/main/MainPresenter.kt → jd_summarizing/src/main/java/net/huansi/summarizing/activity/main/SummarizingPresenter.kt

-package net.huansi.app.hssummarizingboard.activity.main
+package net.huansi.summarizing.activity.main
 
 import baseform.android.huansi.net.util.RxTimerManager
-import net.huansi.app.hssummarizingboard.base.SutureClothBasePresenter
-import net.huansi.app.hssummarizingboard.entity.BrandBean
-import net.huansi.app.hssummarizingboard.entity.ListBean
-import net.huansi.app.hssummarizingboard.entity.ProDetailsBean
-import net.huansi.app.hssummarizingboard.entity.StatisticsDataBean
-import net.huansi.app.hssummarizingboard.utils.RequestUtils
+import net.huansi.summarizing.base.SutureClothBasePresenter
+import net.huansi.summarizing.entity.BrandBean
+import net.huansi.summarizing.entity.ListBean
+import net.huansi.summarizing.entity.ProDetailsBean
+import net.huansi.summarizing.entity.StatisticsDataBean
+import net.huansi.summarizing.utils.RequestUtils
 
-class MainPresenter : SutureClothBasePresenter() {
+class SummarizingPresenter : SutureClothBasePresenter() {
     private var mDateTimeRefreshTimer: RxTimerManager? = null
 
     fun startDateTimeRefreshTimer(callback: (l: Long) -> Unit) {

app/src/main/java/net/huansi/app/hssummarizingboard/adapter/BrandAdapter.kt → jd_summarizing/src/main/java/net/huansi/summarizing/adapter/BrandAdapter.kt

-package net.huansi.app.hssummarizingboard.adapter
+package net.huansi.summarizing.adapter
 
 import android.content.Context
 import baseform.android.huansi.net.baseui.HsRecyclerViewBaseAdapter
-import net.huansi.app.hssummarizingboard.R
-import net.huansi.app.hssummarizingboard.databinding.ItemBrandBinding
-import net.huansi.app.hssummarizingboard.entity.BrandBean
+import net.huansi.summarizing.entity.BrandBean
+import net.huansi.summarizing.R
+import net.huansi.summarizing.databinding.ItemBrandBinding
 
 /**
 des:

app/src/main/java/net/huansi/app/hssummarizingboard/api/CommonApi.kt → jd_summarizing/src/main/java/net/huansi/summarizing/api/CommonApi.kt

-package net.huansi.app.checkcloth.api
+package net.huansi.summarizing.api
 
 import baseform.android.huansi.net.request.ApiDoc
 import com.alibaba.fastjson.JSONObject

app/src/main/java/net/huansi/app/hssummarizingboard/base/SutureClothBaseActivity.kt → jd_summarizing/src/main/java/net/huansi/summarizing/base/SutureClothBaseActivity.kt

-package net.huansi.app.hssummarizingboard.base
+package net.huansi.summarizing.base
 
 import androidx.databinding.ViewDataBinding
 import baseform.android.huansi.net.baseui.HsActivity

app/src/main/java/net/huansi/app/hssummarizingboard/base/SutureClothBasePresenter.kt → jd_summarizing/src/main/java/net/huansi/summarizing/base/SutureClothBasePresenter.kt

-package net.huansi.app.hssummarizingboard.base
+package net.huansi.summarizing.base
 
 import baseform.android.huansi.net.formbase.IBaseFormView
 import baseform.android.huansi.net.formbase.TBaseForm

app/src/main/java/net/huansi/app/hssummarizingboard/dialog/LoginSettingDialog.kt → jd_summarizing/src/main/java/net/huansi/summarizing/dialog/LoginSettingDialog.kt

-package net.huansi.app.hssummarizingboard.dialog
+package net.huansi.summarizing.dialog
 
 import android.annotation.SuppressLint
 import android.content.Context
 import baseform.android.huansi.net.baseui.HsCenterPopupView
 import baseform.android.huansi.net.util.ShareUtil
 import baseform.android.huansi.net.util.ToastUtil
-import net.huansi.app.hssummarizingboard.R
-import net.huansi.app.hssummarizingboard.databinding.DialogLoginSettingBinding
-import net.huansi.app.hssummarizingboard.utils.Constant
+import net.huansi.summarizing.utils.Constant
+import net.huansi.summarizing.R
+import net.huansi.summarizing.databinding.DialogLoginSettingBinding
 
 @SuppressLint("ViewConstructor", "MissingPermission")
 class LoginSettingDialog(context: Context) :

app/src/main/java/net/huansi/app/hssummarizingboard/entity/AreaDataBean.kt → jd_summarizing/src/main/java/net/huansi/summarizing/entity/AreaDataBean.kt

-package net.huansi.app.hssummarizingboard.entity
+package net.huansi.summarizing.entity
 
 import baseform.android.huansi.net.model.entity.HsBean
 

app/src/main/java/net/huansi/app/hssummarizingboard/entity/BrandBean.kt → jd_summarizing/src/main/java/net/huansi/summarizing/entity/BrandBean.kt

-package net.huansi.app.hssummarizingboard.entity
+package net.huansi.summarizing.entity
 
 import baseform.android.huansi.net.model.entity.HsBean
 

app/src/main/java/net/huansi/app/hssummarizingboard/entity/BrandInfoBean.kt → jd_summarizing/src/main/java/net/huansi/summarizing/entity/BrandInfoBean.kt

-package net.huansi.app.hssummarizingboard.entity
+package net.huansi.summarizing.entity
 
 import baseform.android.huansi.net.model.entity.HsBean
 

app/src/main/java/net/huansi/app/hssummarizingboard/entity/ListBean.kt → jd_summarizing/src/main/java/net/huansi/summarizing/entity/ListBean.kt

-package net.huansi.app.hssummarizingboard.entity
+package net.huansi.summarizing.entity
 
 import baseform.android.huansi.net.model.entity.HsBean
 import com.alibaba.fastjson.JSONArray

app/src/main/java/net/huansi/app/hssummarizingboard/entity/PieChartBean.kt → jd_summarizing/src/main/java/net/huansi/summarizing/entity/PieChartBean.kt

-package net.huansi.app.hssummarizingboard.entity
+package net.huansi.summarizing.entity
 
 import baseform.android.huansi.net.model.entity.HsBean
 

app/src/main/java/net/huansi/app/hssummarizingboard/entity/ProDetailsBean.kt → jd_summarizing/src/main/java/net/huansi/summarizing/entity/ProDetailsBean.kt

-package net.huansi.app.hssummarizingboard.entity
+package net.huansi.summarizing.entity
 
 import baseform.android.huansi.net.model.entity.HsBean
 

app/src/main/java/net/huansi/app/hssummarizingboard/entity/StatisticsDataBean.kt → jd_summarizing/src/main/java/net/huansi/summarizing/entity/StatisticsDataBean.kt

-package net.huansi.app.hssummarizingboard.entity
+package net.huansi.summarizing.entity
 
 import baseform.android.huansi.net.model.entity.HsBean
 

jd_summarizing/src/main/java/net/huansi/summarizing/utils/Constant.kt

+package net.huansi.summarizing.utils
+
+object Constant {
+    const val SP_DATA_REFRESH_TIME = "summarizing_data_refresh_time"//数据刷新时间
+}
\ No newline at end of file

app/src/main/java/net/huansi/app/hssummarizingboard/utils/RequestUtils.kt → jd_summarizing/src/main/java/net/huansi/summarizing/utils/RequestUtils.kt

-package net.huansi.app.hssummarizingboard.utils
+package net.huansi.summarizing.utils
 
 import android.graphics.Color
-import baseform.android.huansi.net.log.HsLog
 import baseform.android.huansi.net.model.config.AppConfig.SPKey
 import baseform.android.huansi.net.request.BaseFormRequest
 import baseform.android.huansi.net.request.HttpConnectPool
@@ -14,8 +13,13 @@ import com.alibaba.fastjson.JSONArray
 import com.alibaba.fastjson.JSONObject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import net.huansi.app.checkcloth.api.CommonApi
-import net.huansi.app.hssummarizingboard.entity.*
+import net.huansi.summarizing.api.CommonApi
+import net.huansi.summarizing.entity.AreaDataBean
+import net.huansi.summarizing.entity.BrandBean
+import net.huansi.summarizing.entity.BrandInfoBean
+import net.huansi.summarizing.entity.ListBean
+import net.huansi.summarizing.entity.ProDetailsBean
+import net.huansi.summarizing.entity.StatisticsDataBean
 
 
 object RequestUtils {

app/src/main/java/net/huansi/app/hssummarizingboard/utils/_ExpandUtils.kt → jd_summarizing/src/main/java/net/huansi/summarizing/utils/_ExpandUtils.kt

-package net.huansi.app.hssummarizingboard.utils
+package net.huansi.summarizing.utils
 
 import android.widget.EditText
-import baseform.android.huansi.net.request.WebResponseListener
 import baseform.android.huansi.net.util.BasicVariableUtils
 import baseform.android.huansi.net.util.ToastUtil
 import com.alibaba.fastjson.JSON

settings.gradle

 include ':app'
+include ':jd_summarizing'