From 843e8ffb27afb28ef72da118c1fba872de672baa Mon Sep 17 00:00:00 2001 From: yimiao Date: Mon, 19 Jul 2021 15:55:53 +0800 Subject: [PATCH] =?UTF-8?q?author:wangyimiao=20desc:=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E5=BA=93=EF=BC=8C=E5=8C=85=E5=90=8D=E4=B8=BA?= =?UTF-8?q?common?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 4 ++-- .../commonlibtest/MainActivity.java | 6 +++--- .../{yinuo => common}/commonlibtest/MyApplication.kt | 4 ++-- .../{yinuo => common}/commonlibtest/bean/Article.kt | 2 +- .../commonlibtest/bean/ArticleTag.kt | 2 +- .../{yinuo => common}/commonlibtest/bean/Articles.kt | 3 +-- .../commonlibtest/bean/ArticlesResponse.kt | 4 ++-- .../commonlibtest/manager/InternetLoader.kt | 6 +++--- commonLib/proguard-rules.pro | 12 ++++++------ commonLib/src/main/AndroidManifest.xml | 2 +- .../{yinuo => common}/commonlib/CommonApplication.kt | 2 +- .../{yinuo => common}/commonlib/net/BaseObserve.kt | 4 +--- .../commonlib/net/RequestCallBack.kt | 0 .../commonlib/net/RequestManager.kt | 4 ++-- .../commonlib/net/bean/BaseResponse.kt | 2 +- .../commonlib/net/bean/RequestParam.kt | 2 +- .../commonlib/net/interceptor/BaseUrlInterceptor.kt | 6 +++--- .../net/interceptor/HttpCommonInterceptor.kt | 2 +- .../{yinuo => common}/commonlib/utils/BaseUtils.kt | 2 +- .../{yinuo => common}/commonlib/utils/DateUtils.kt | 2 +- .../commonlib/utils/DisplayUtils.kt | 2 +- .../{yinuo => common}/commonlib/utils/PhotoUtils.kt | 2 +- .../{yinuo => common}/commonlib/utils/SpManager.kt | 2 +- .../{yinuo => common}/commonlib/utils/StringUtils.kt | 2 +- .../commonlib/view/CommonTitleView.java | 6 +++--- .../{yinuo => common}/commonlib/view/MikeView.java | 4 ++-- .../commonlib/view/SlideRecyclerView.java | 2 +- .../commonlib/view/SpaceItemDecoration.java | 2 +- .../commonlib/view/activity/BaseActivity.java | 4 ++-- .../commonlib/view/fragment/BaseFragment.java | 2 +- .../view/fragment/BaseNavigationFragment.kt | 2 +- 31 files changed, 49 insertions(+), 52 deletions(-) rename app/src/main/java/com/{yinuo => common}/commonlibtest/MainActivity.java (90%) rename app/src/main/java/com/{yinuo => common}/commonlibtest/MyApplication.kt (68%) rename app/src/main/java/com/{yinuo => common}/commonlibtest/bean/Article.kt (96%) rename app/src/main/java/com/{yinuo => common}/commonlibtest/bean/ArticleTag.kt (82%) rename app/src/main/java/com/{yinuo => common}/commonlibtest/bean/Articles.kt (78%) rename app/src/main/java/com/{yinuo => common}/commonlibtest/bean/ArticlesResponse.kt (65%) rename app/src/main/java/com/{yinuo => common}/commonlibtest/manager/InternetLoader.kt (82%) rename commonLib/src/main/java/com/{yinuo => common}/commonlib/CommonApplication.kt (92%) rename commonLib/src/main/java/com/{yinuo => common}/commonlib/net/BaseObserve.kt (96%) rename commonLib/src/main/java/com/{yinuo => common}/commonlib/net/RequestCallBack.kt (100%) rename commonLib/src/main/java/com/{yinuo => common}/commonlib/net/RequestManager.kt (91%) rename commonLib/src/main/java/com/{yinuo => common}/commonlib/net/bean/BaseResponse.kt (90%) rename commonLib/src/main/java/com/{yinuo => common}/commonlib/net/bean/RequestParam.kt (75%) rename commonLib/src/main/java/com/{yinuo => common}/commonlib/net/interceptor/BaseUrlInterceptor.kt (95%) rename commonLib/src/main/java/com/{yinuo => common}/commonlib/net/interceptor/HttpCommonInterceptor.kt (97%) rename commonLib/src/main/java/com/{yinuo => common}/commonlib/utils/BaseUtils.kt (91%) rename commonLib/src/main/java/com/{yinuo => common}/commonlib/utils/DateUtils.kt (98%) rename commonLib/src/main/java/com/{yinuo => common}/commonlib/utils/DisplayUtils.kt (93%) rename commonLib/src/main/java/com/{yinuo => common}/commonlib/utils/PhotoUtils.kt (99%) rename commonLib/src/main/java/com/{yinuo => common}/commonlib/utils/SpManager.kt (97%) rename commonLib/src/main/java/com/{yinuo => common}/commonlib/utils/StringUtils.kt (95%) rename commonLib/src/main/java/com/{yinuo => common}/commonlib/view/CommonTitleView.java (98%) rename commonLib/src/main/java/com/{yinuo => common}/commonlib/view/MikeView.java (98%) rename commonLib/src/main/java/com/{yinuo => common}/commonlib/view/SlideRecyclerView.java (99%) rename commonLib/src/main/java/com/{yinuo => common}/commonlib/view/SpaceItemDecoration.java (96%) rename commonLib/src/main/java/com/{yinuo => common}/commonlib/view/activity/BaseActivity.java (91%) rename commonLib/src/main/java/com/{yinuo => common}/commonlib/view/fragment/BaseFragment.java (89%) rename commonLib/src/main/java/com/{yinuo => common}/commonlib/view/fragment/BaseNavigationFragment.kt (97%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fb215d2..be3a4dd 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,14 +3,14 @@ package="com.yinuo.commonlibtest"> - + diff --git a/app/src/main/java/com/yinuo/commonlibtest/MainActivity.java b/app/src/main/java/com/common/commonlibtest/MainActivity.java similarity index 90% rename from app/src/main/java/com/yinuo/commonlibtest/MainActivity.java rename to app/src/main/java/com/common/commonlibtest/MainActivity.java index 4944494..f55c5e1 100644 --- a/app/src/main/java/com/yinuo/commonlibtest/MainActivity.java +++ b/app/src/main/java/com/common/commonlibtest/MainActivity.java @@ -1,4 +1,4 @@ -package com.yinuo.commonlibtest; +package com.common.commonlibtest; import androidx.appcompat.app.AppCompatActivity; @@ -6,9 +6,9 @@ import android.os.Bundle; import android.util.Log; import com.common.commonlib.net.RequestCallBack; -import com.yinuo.commonlibtest.bean.ArticlesResponse; +import com.common.commonlibtest.bean.ArticlesResponse; +import com.common.commonlibtest.manager.InternetLoader; import com.yinuo.commonlibtest.databinding.ActivityMainBinding; -import com.yinuo.commonlibtest.manager.InternetLoader; import org.jetbrains.annotations.Nullable; diff --git a/app/src/main/java/com/yinuo/commonlibtest/MyApplication.kt b/app/src/main/java/com/common/commonlibtest/MyApplication.kt similarity index 68% rename from app/src/main/java/com/yinuo/commonlibtest/MyApplication.kt rename to app/src/main/java/com/common/commonlibtest/MyApplication.kt index 5a51a42..4273915 100644 --- a/app/src/main/java/com/yinuo/commonlibtest/MyApplication.kt +++ b/app/src/main/java/com/common/commonlibtest/MyApplication.kt @@ -1,7 +1,7 @@ -package com.yinuo.commonlibtest +package com.common.commonlibtest import android.app.Application -import com.yinuo.commonlib.CommonApplication +import com.common.commonlib.CommonApplication class MyApplication : Application() { override fun onCreate() { diff --git a/app/src/main/java/com/yinuo/commonlibtest/bean/Article.kt b/app/src/main/java/com/common/commonlibtest/bean/Article.kt similarity index 96% rename from app/src/main/java/com/yinuo/commonlibtest/bean/Article.kt rename to app/src/main/java/com/common/commonlibtest/bean/Article.kt index 42f65c8..6642693 100644 --- a/app/src/main/java/com/yinuo/commonlibtest/bean/Article.kt +++ b/app/src/main/java/com/common/commonlibtest/bean/Article.kt @@ -1,4 +1,4 @@ -package com.yinuo.commonlibtest.bean +package com.common.commonlibtest.bean import android.os.Parcelable import kotlinx.android.parcel.Parcelize diff --git a/app/src/main/java/com/yinuo/commonlibtest/bean/ArticleTag.kt b/app/src/main/java/com/common/commonlibtest/bean/ArticleTag.kt similarity index 82% rename from app/src/main/java/com/yinuo/commonlibtest/bean/ArticleTag.kt rename to app/src/main/java/com/common/commonlibtest/bean/ArticleTag.kt index 9c9d091..0074cc0 100644 --- a/app/src/main/java/com/yinuo/commonlibtest/bean/ArticleTag.kt +++ b/app/src/main/java/com/common/commonlibtest/bean/ArticleTag.kt @@ -1,4 +1,4 @@ -package com.yinuo.commonlibtest.bean +package com.common.commonlibtest.bean import android.os.Parcelable import kotlinx.android.parcel.Parcelize diff --git a/app/src/main/java/com/yinuo/commonlibtest/bean/Articles.kt b/app/src/main/java/com/common/commonlibtest/bean/Articles.kt similarity index 78% rename from app/src/main/java/com/yinuo/commonlibtest/bean/Articles.kt rename to app/src/main/java/com/common/commonlibtest/bean/Articles.kt index feb4845..4ddd20d 100644 --- a/app/src/main/java/com/yinuo/commonlibtest/bean/Articles.kt +++ b/app/src/main/java/com/common/commonlibtest/bean/Articles.kt @@ -1,7 +1,6 @@ -package com.yinuo.commonlibtest.bean +package com.common.commonlibtest.bean import android.os.Parcelable -import com.yinuo.commonlibtest.bean.Article import kotlinx.android.parcel.Parcelize @Parcelize diff --git a/app/src/main/java/com/yinuo/commonlibtest/bean/ArticlesResponse.kt b/app/src/main/java/com/common/commonlibtest/bean/ArticlesResponse.kt similarity index 65% rename from app/src/main/java/com/yinuo/commonlibtest/bean/ArticlesResponse.kt rename to app/src/main/java/com/common/commonlibtest/bean/ArticlesResponse.kt index c23590d..e13a5f4 100644 --- a/app/src/main/java/com/yinuo/commonlibtest/bean/ArticlesResponse.kt +++ b/app/src/main/java/com/common/commonlibtest/bean/ArticlesResponse.kt @@ -1,7 +1,7 @@ -package com.yinuo.commonlibtest.bean +package com.common.commonlibtest.bean import android.os.Parcelable -import com.yinuo.commonlib.net.bean.BaseResponse +import com.common.commonlib.net.bean.BaseResponse import kotlinx.android.parcel.Parcelize @Parcelize diff --git a/app/src/main/java/com/yinuo/commonlibtest/manager/InternetLoader.kt b/app/src/main/java/com/common/commonlibtest/manager/InternetLoader.kt similarity index 82% rename from app/src/main/java/com/yinuo/commonlibtest/manager/InternetLoader.kt rename to app/src/main/java/com/common/commonlibtest/manager/InternetLoader.kt index 1152059..1e74af8 100644 --- a/app/src/main/java/com/yinuo/commonlibtest/manager/InternetLoader.kt +++ b/app/src/main/java/com/common/commonlibtest/manager/InternetLoader.kt @@ -1,8 +1,8 @@ -package com.yinuo.commonlibtest.manager +package com.common.commonlibtest.manager import com.common.commonlib.net.RequestCallBack -import com.yinuo.commonlib.net.BaseObserve -import com.yinuo.commonlibtest.bean.ArticlesResponse +import com.common.commonlib.net.BaseObserve +import com.common.commonlibtest.bean.ArticlesResponse import io.reactivex.Observable import retrofit2.http.GET import retrofit2.http.Headers diff --git a/commonLib/proguard-rules.pro b/commonLib/proguard-rules.pro index 34cee7f..7f95977 100644 --- a/commonLib/proguard-rules.pro +++ b/commonLib/proguard-rules.pro @@ -101,31 +101,31 @@ -dontwarn androidx.** # 保留BaseFragment公共成员和方法不被混淆 --keep class com.yinuo.commonlib.utils.*{*;} +-keep class com.common.commonlib.utils.*{*;} # 保留BaseFragment公共成员和方法不被混淆 --keep class com.yinuo.commonlib.view.fragment.BaseFragment{ +-keep class com.common.commonlib.view.fragment.BaseFragment{ public; public; } # 保留BaseNavigationFragment公共成员和方法不被混淆 --keep class com.yinuo.commonlib.view.fragment.BaseNavigationFragment{ +-keep class com.common.commonlib.view.fragment.BaseNavigationFragment{ public; public; } # 保留BaseActivity公共成员和方法不被混淆 --keep class com.yinuo.commonlib.view.activity.BaseActivity{ +-keep class com.common.commonlib.view.activity.BaseActivity{ public; public; } # 保留CommonTitleView的内部类不被混淆 --keep class com.yinuo.commonlib.view.CommonTitleView$*{ +-keep class com.common.commonlib.view.CommonTitleView$*{ *; } # 保留BaseNavigationFragment公共成员和方法不被混淆 --keep class com.yinuo.commonlib.view.SlideRecyclerView{ +-keep class com.common.commonlib.view.SlideRecyclerView{ public; public; } diff --git a/commonLib/src/main/AndroidManifest.xml b/commonLib/src/main/AndroidManifest.xml index 915197a..8b98006 100644 --- a/commonLib/src/main/AndroidManifest.xml +++ b/commonLib/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.common.commonlib"> \ No newline at end of file diff --git a/commonLib/src/main/java/com/yinuo/commonlib/CommonApplication.kt b/commonLib/src/main/java/com/common/commonlib/CommonApplication.kt similarity index 92% rename from commonLib/src/main/java/com/yinuo/commonlib/CommonApplication.kt rename to commonLib/src/main/java/com/common/commonlib/CommonApplication.kt index cb598d0..0386b77 100644 --- a/commonLib/src/main/java/com/yinuo/commonlib/CommonApplication.kt +++ b/commonLib/src/main/java/com/common/commonlib/CommonApplication.kt @@ -1,4 +1,4 @@ -package com.yinuo.commonlib +package com.common.commonlib import android.annotation.SuppressLint import android.app.Application diff --git a/commonLib/src/main/java/com/yinuo/commonlib/net/BaseObserve.kt b/commonLib/src/main/java/com/common/commonlib/net/BaseObserve.kt similarity index 96% rename from commonLib/src/main/java/com/yinuo/commonlib/net/BaseObserve.kt rename to commonLib/src/main/java/com/common/commonlib/net/BaseObserve.kt index ba53285..1eda43a 100644 --- a/commonLib/src/main/java/com/yinuo/commonlib/net/BaseObserve.kt +++ b/commonLib/src/main/java/com/common/commonlib/net/BaseObserve.kt @@ -1,9 +1,7 @@ -package com.yinuo.commonlib.net +package com.common.commonlib.net import android.net.ParseException import android.util.Log -import com.common.commonlib.net.RequestCallBack -import com.common.commonlib.net.RequestManager import com.google.gson.JsonParseException import io.reactivex.Observable import io.reactivex.Observer diff --git a/commonLib/src/main/java/com/yinuo/commonlib/net/RequestCallBack.kt b/commonLib/src/main/java/com/common/commonlib/net/RequestCallBack.kt similarity index 100% rename from commonLib/src/main/java/com/yinuo/commonlib/net/RequestCallBack.kt rename to commonLib/src/main/java/com/common/commonlib/net/RequestCallBack.kt diff --git a/commonLib/src/main/java/com/yinuo/commonlib/net/RequestManager.kt b/commonLib/src/main/java/com/common/commonlib/net/RequestManager.kt similarity index 91% rename from commonLib/src/main/java/com/yinuo/commonlib/net/RequestManager.kt rename to commonLib/src/main/java/com/common/commonlib/net/RequestManager.kt index a4ea8a0..cf52a11 100644 --- a/commonLib/src/main/java/com/yinuo/commonlib/net/RequestManager.kt +++ b/commonLib/src/main/java/com/common/commonlib/net/RequestManager.kt @@ -1,7 +1,7 @@ package com.common.commonlib.net -import com.yinuo.commonlib.net.interceptor.BaseUrlInterceptor -import com.yinuo.commonlib.net.interceptor.HttpCommonInterceptor +import com.common.commonlib.net.interceptor.BaseUrlInterceptor +import com.common.commonlib.net.interceptor.HttpCommonInterceptor import okhttp3.OkHttpClient import retrofit2.Retrofit import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory diff --git a/commonLib/src/main/java/com/yinuo/commonlib/net/bean/BaseResponse.kt b/commonLib/src/main/java/com/common/commonlib/net/bean/BaseResponse.kt similarity index 90% rename from commonLib/src/main/java/com/yinuo/commonlib/net/bean/BaseResponse.kt rename to commonLib/src/main/java/com/common/commonlib/net/bean/BaseResponse.kt index f5d894d..1c8394c 100644 --- a/commonLib/src/main/java/com/yinuo/commonlib/net/bean/BaseResponse.kt +++ b/commonLib/src/main/java/com/common/commonlib/net/bean/BaseResponse.kt @@ -1,4 +1,4 @@ -package com.yinuo.commonlib.net.bean +package com.common.commonlib.net.bean import android.os.Parcelable import kotlinx.android.parcel.Parcelize diff --git a/commonLib/src/main/java/com/yinuo/commonlib/net/bean/RequestParam.kt b/commonLib/src/main/java/com/common/commonlib/net/bean/RequestParam.kt similarity index 75% rename from commonLib/src/main/java/com/yinuo/commonlib/net/bean/RequestParam.kt rename to commonLib/src/main/java/com/common/commonlib/net/bean/RequestParam.kt index b81cf00..f8e6845 100644 --- a/commonLib/src/main/java/com/yinuo/commonlib/net/bean/RequestParam.kt +++ b/commonLib/src/main/java/com/common/commonlib/net/bean/RequestParam.kt @@ -1,4 +1,4 @@ -package com.yinuo.commonlib.net.bean +package com.common.commonlib.net.bean /** * 请求参数 diff --git a/commonLib/src/main/java/com/yinuo/commonlib/net/interceptor/BaseUrlInterceptor.kt b/commonLib/src/main/java/com/common/commonlib/net/interceptor/BaseUrlInterceptor.kt similarity index 95% rename from commonLib/src/main/java/com/yinuo/commonlib/net/interceptor/BaseUrlInterceptor.kt rename to commonLib/src/main/java/com/common/commonlib/net/interceptor/BaseUrlInterceptor.kt index 95d1640..1713edd 100644 --- a/commonLib/src/main/java/com/yinuo/commonlib/net/interceptor/BaseUrlInterceptor.kt +++ b/commonLib/src/main/java/com/common/commonlib/net/interceptor/BaseUrlInterceptor.kt @@ -1,9 +1,9 @@ -package com.yinuo.commonlib.net.interceptor +package com.common.commonlib.net.interceptor import android.text.TextUtils import android.util.Log -import com.yinuo.commonlib.BuildConfig -import com.yinuo.commonlib.CommonApplication +import com.common.commonlib.BuildConfig +import com.common.commonlib.CommonApplication import okhttp3.HttpUrl import okhttp3.HttpUrl.Companion.toHttpUrlOrNull import okhttp3.Interceptor diff --git a/commonLib/src/main/java/com/yinuo/commonlib/net/interceptor/HttpCommonInterceptor.kt b/commonLib/src/main/java/com/common/commonlib/net/interceptor/HttpCommonInterceptor.kt similarity index 97% rename from commonLib/src/main/java/com/yinuo/commonlib/net/interceptor/HttpCommonInterceptor.kt rename to commonLib/src/main/java/com/common/commonlib/net/interceptor/HttpCommonInterceptor.kt index b4d40a0..38fd104 100644 --- a/commonLib/src/main/java/com/yinuo/commonlib/net/interceptor/HttpCommonInterceptor.kt +++ b/commonLib/src/main/java/com/common/commonlib/net/interceptor/HttpCommonInterceptor.kt @@ -1,4 +1,4 @@ -package com.yinuo.commonlib.net.interceptor +package com.common.commonlib.net.interceptor import okhttp3.Interceptor import okhttp3.Request diff --git a/commonLib/src/main/java/com/yinuo/commonlib/utils/BaseUtils.kt b/commonLib/src/main/java/com/common/commonlib/utils/BaseUtils.kt similarity index 91% rename from commonLib/src/main/java/com/yinuo/commonlib/utils/BaseUtils.kt rename to commonLib/src/main/java/com/common/commonlib/utils/BaseUtils.kt index 2b0986b..9e50201 100644 --- a/commonLib/src/main/java/com/yinuo/commonlib/utils/BaseUtils.kt +++ b/commonLib/src/main/java/com/common/commonlib/utils/BaseUtils.kt @@ -1,4 +1,4 @@ -package com.yinuo.commonlib.utils +package com.common.commonlib.utils import android.content.Context diff --git a/commonLib/src/main/java/com/yinuo/commonlib/utils/DateUtils.kt b/commonLib/src/main/java/com/common/commonlib/utils/DateUtils.kt similarity index 98% rename from commonLib/src/main/java/com/yinuo/commonlib/utils/DateUtils.kt rename to commonLib/src/main/java/com/common/commonlib/utils/DateUtils.kt index 13aed85..2ad1d63 100644 --- a/commonLib/src/main/java/com/yinuo/commonlib/utils/DateUtils.kt +++ b/commonLib/src/main/java/com/common/commonlib/utils/DateUtils.kt @@ -1,4 +1,4 @@ -package com.yinuo.commonlib.utils +package com.common.commonlib.utils import android.annotation.SuppressLint import java.text.SimpleDateFormat diff --git a/commonLib/src/main/java/com/yinuo/commonlib/utils/DisplayUtils.kt b/commonLib/src/main/java/com/common/commonlib/utils/DisplayUtils.kt similarity index 93% rename from commonLib/src/main/java/com/yinuo/commonlib/utils/DisplayUtils.kt rename to commonLib/src/main/java/com/common/commonlib/utils/DisplayUtils.kt index c484207..3dedb34 100644 --- a/commonLib/src/main/java/com/yinuo/commonlib/utils/DisplayUtils.kt +++ b/commonLib/src/main/java/com/common/commonlib/utils/DisplayUtils.kt @@ -1,4 +1,4 @@ -package com.yinuo.commonlib.utils +package com.common.commonlib.utils import android.content.Context diff --git a/commonLib/src/main/java/com/yinuo/commonlib/utils/PhotoUtils.kt b/commonLib/src/main/java/com/common/commonlib/utils/PhotoUtils.kt similarity index 99% rename from commonLib/src/main/java/com/yinuo/commonlib/utils/PhotoUtils.kt rename to commonLib/src/main/java/com/common/commonlib/utils/PhotoUtils.kt index c779db1..c6deb78 100644 --- a/commonLib/src/main/java/com/yinuo/commonlib/utils/PhotoUtils.kt +++ b/commonLib/src/main/java/com/common/commonlib/utils/PhotoUtils.kt @@ -1,4 +1,4 @@ -package com.yinuo.commonlib.utils +package com.common.commonlib.utils import android.content.Context import android.graphics.Bitmap diff --git a/commonLib/src/main/java/com/yinuo/commonlib/utils/SpManager.kt b/commonLib/src/main/java/com/common/commonlib/utils/SpManager.kt similarity index 97% rename from commonLib/src/main/java/com/yinuo/commonlib/utils/SpManager.kt rename to commonLib/src/main/java/com/common/commonlib/utils/SpManager.kt index 46dcadf..e361cae 100644 --- a/commonLib/src/main/java/com/yinuo/commonlib/utils/SpManager.kt +++ b/commonLib/src/main/java/com/common/commonlib/utils/SpManager.kt @@ -1,4 +1,4 @@ -package com.yinuo.commonlib.utils +package com.common.commonlib.utils import android.annotation.SuppressLint import android.content.Context diff --git a/commonLib/src/main/java/com/yinuo/commonlib/utils/StringUtils.kt b/commonLib/src/main/java/com/common/commonlib/utils/StringUtils.kt similarity index 95% rename from commonLib/src/main/java/com/yinuo/commonlib/utils/StringUtils.kt rename to commonLib/src/main/java/com/common/commonlib/utils/StringUtils.kt index 858a558..a9fd8be 100644 --- a/commonLib/src/main/java/com/yinuo/commonlib/utils/StringUtils.kt +++ b/commonLib/src/main/java/com/common/commonlib/utils/StringUtils.kt @@ -1,4 +1,4 @@ -package com.yinuo.commonlib.utils +package com.common.commonlib.utils import android.text.TextUtils diff --git a/commonLib/src/main/java/com/yinuo/commonlib/view/CommonTitleView.java b/commonLib/src/main/java/com/common/commonlib/view/CommonTitleView.java similarity index 98% rename from commonLib/src/main/java/com/yinuo/commonlib/view/CommonTitleView.java rename to commonLib/src/main/java/com/common/commonlib/view/CommonTitleView.java index d7d90cc..fb379a3 100644 --- a/commonLib/src/main/java/com/yinuo/commonlib/view/CommonTitleView.java +++ b/commonLib/src/main/java/com/common/commonlib/view/CommonTitleView.java @@ -1,4 +1,4 @@ -package com.yinuo.commonlib.view; +package com.common.commonlib.view; import android.content.Context; import android.content.res.TypedArray; @@ -11,8 +11,8 @@ import android.widget.TextView; import androidx.navigation.Navigation; -import com.yinuo.commonlib.R; -import com.yinuo.commonlib.utils.DisplayUtils; +import com.common.commonlib.R; +import com.common.commonlib.utils.DisplayUtils; public class CommonTitleView extends FrameLayout implements View.OnClickListener { private Context mContext; diff --git a/commonLib/src/main/java/com/yinuo/commonlib/view/MikeView.java b/commonLib/src/main/java/com/common/commonlib/view/MikeView.java similarity index 98% rename from commonLib/src/main/java/com/yinuo/commonlib/view/MikeView.java rename to commonLib/src/main/java/com/common/commonlib/view/MikeView.java index bbe6bc6..638f522 100644 --- a/commonLib/src/main/java/com/yinuo/commonlib/view/MikeView.java +++ b/commonLib/src/main/java/com/common/commonlib/view/MikeView.java @@ -1,4 +1,4 @@ -package com.yinuo.commonlib.view; +package com.common.commonlib.view; import android.content.Context; import android.graphics.Bitmap; @@ -14,7 +14,7 @@ import android.view.View; import androidx.annotation.Nullable; -import com.yinuo.commonlib.R; +import com.common.commonlib.R; public class MikeView extends View { //进度条格数 diff --git a/commonLib/src/main/java/com/yinuo/commonlib/view/SlideRecyclerView.java b/commonLib/src/main/java/com/common/commonlib/view/SlideRecyclerView.java similarity index 99% rename from commonLib/src/main/java/com/yinuo/commonlib/view/SlideRecyclerView.java rename to commonLib/src/main/java/com/common/commonlib/view/SlideRecyclerView.java index 47d875c..88c1865 100644 --- a/commonLib/src/main/java/com/yinuo/commonlib/view/SlideRecyclerView.java +++ b/commonLib/src/main/java/com/common/commonlib/view/SlideRecyclerView.java @@ -1,4 +1,4 @@ -package com.yinuo.commonlib.view; +package com.common.commonlib.view; import android.content.Context; import android.graphics.Rect; diff --git a/commonLib/src/main/java/com/yinuo/commonlib/view/SpaceItemDecoration.java b/commonLib/src/main/java/com/common/commonlib/view/SpaceItemDecoration.java similarity index 96% rename from commonLib/src/main/java/com/yinuo/commonlib/view/SpaceItemDecoration.java rename to commonLib/src/main/java/com/common/commonlib/view/SpaceItemDecoration.java index 7e92367..c7f4484 100644 --- a/commonLib/src/main/java/com/yinuo/commonlib/view/SpaceItemDecoration.java +++ b/commonLib/src/main/java/com/common/commonlib/view/SpaceItemDecoration.java @@ -1,4 +1,4 @@ -package com.yinuo.commonlib.view; +package com.common.commonlib.view; import android.graphics.Rect; import android.view.View; diff --git a/commonLib/src/main/java/com/yinuo/commonlib/view/activity/BaseActivity.java b/commonLib/src/main/java/com/common/commonlib/view/activity/BaseActivity.java similarity index 91% rename from commonLib/src/main/java/com/yinuo/commonlib/view/activity/BaseActivity.java rename to commonLib/src/main/java/com/common/commonlib/view/activity/BaseActivity.java index d25a06c..2233bd8 100644 --- a/commonLib/src/main/java/com/yinuo/commonlib/view/activity/BaseActivity.java +++ b/commonLib/src/main/java/com/common/commonlib/view/activity/BaseActivity.java @@ -1,4 +1,4 @@ -package com.yinuo.commonlib.view.activity; +package com.common.commonlib.view.activity; import android.os.Bundle; import android.view.Window; @@ -7,7 +7,7 @@ import android.view.WindowManager; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import com.yinuo.commonlib.R; +import com.common.commonlib.R; public class BaseActivity extends AppCompatActivity { diff --git a/commonLib/src/main/java/com/yinuo/commonlib/view/fragment/BaseFragment.java b/commonLib/src/main/java/com/common/commonlib/view/fragment/BaseFragment.java similarity index 89% rename from commonLib/src/main/java/com/yinuo/commonlib/view/fragment/BaseFragment.java rename to commonLib/src/main/java/com/common/commonlib/view/fragment/BaseFragment.java index 2e2c6ca..8b169b5 100644 --- a/commonLib/src/main/java/com/yinuo/commonlib/view/fragment/BaseFragment.java +++ b/commonLib/src/main/java/com/common/commonlib/view/fragment/BaseFragment.java @@ -1,4 +1,4 @@ -package com.yinuo.commonlib.view.fragment; +package com.common.commonlib.view.fragment; import android.content.Context; diff --git a/commonLib/src/main/java/com/yinuo/commonlib/view/fragment/BaseNavigationFragment.kt b/commonLib/src/main/java/com/common/commonlib/view/fragment/BaseNavigationFragment.kt similarity index 97% rename from commonLib/src/main/java/com/yinuo/commonlib/view/fragment/BaseNavigationFragment.kt rename to commonLib/src/main/java/com/common/commonlib/view/fragment/BaseNavigationFragment.kt index f0f7b44..a1e26d2 100644 --- a/commonLib/src/main/java/com/yinuo/commonlib/view/fragment/BaseNavigationFragment.kt +++ b/commonLib/src/main/java/com/common/commonlib/view/fragment/BaseNavigationFragment.kt @@ -1,4 +1,4 @@ -package com.yinuo.commonlib.view.fragment +package com.common.commonlib.view.fragment import android.os.Bundle import android.view.LayoutInflater