author:wangyimiao

desc:替换基础库,包名为common
master
yimiao 3 years ago
parent b0bac7d3c2
commit 843e8ffb27

@ -3,14 +3,14 @@
package="com.yinuo.commonlibtest"> package="com.yinuo.commonlibtest">
<application <application
android:name=".MyApplication" android:name="com.common.commonlibtest.MyApplication"
android:allowBackup="true" android:allowBackup="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round" android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/Theme.CommonLibTest"> android:theme="@style/Theme.CommonLibTest">
<activity android:name=".MainActivity"> <activity android:name="com.common.commonlibtest.MainActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />

@ -1,4 +1,4 @@
package com.yinuo.commonlibtest; package com.common.commonlibtest;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
@ -6,9 +6,9 @@ import android.os.Bundle;
import android.util.Log; import android.util.Log;
import com.common.commonlib.net.RequestCallBack; 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.databinding.ActivityMainBinding;
import com.yinuo.commonlibtest.manager.InternetLoader;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;

@ -1,7 +1,7 @@
package com.yinuo.commonlibtest package com.common.commonlibtest
import android.app.Application import android.app.Application
import com.yinuo.commonlib.CommonApplication import com.common.commonlib.CommonApplication
class MyApplication : Application() { class MyApplication : Application() {
override fun onCreate() { override fun onCreate() {

@ -1,4 +1,4 @@
package com.yinuo.commonlibtest.bean package com.common.commonlibtest.bean
import android.os.Parcelable import android.os.Parcelable
import kotlinx.android.parcel.Parcelize import kotlinx.android.parcel.Parcelize

@ -1,4 +1,4 @@
package com.yinuo.commonlibtest.bean package com.common.commonlibtest.bean
import android.os.Parcelable import android.os.Parcelable
import kotlinx.android.parcel.Parcelize import kotlinx.android.parcel.Parcelize

@ -1,7 +1,6 @@
package com.yinuo.commonlibtest.bean package com.common.commonlibtest.bean
import android.os.Parcelable import android.os.Parcelable
import com.yinuo.commonlibtest.bean.Article
import kotlinx.android.parcel.Parcelize import kotlinx.android.parcel.Parcelize
@Parcelize @Parcelize

@ -1,7 +1,7 @@
package com.yinuo.commonlibtest.bean package com.common.commonlibtest.bean
import android.os.Parcelable import android.os.Parcelable
import com.yinuo.commonlib.net.bean.BaseResponse import com.common.commonlib.net.bean.BaseResponse
import kotlinx.android.parcel.Parcelize import kotlinx.android.parcel.Parcelize
@Parcelize @Parcelize

@ -1,8 +1,8 @@
package com.yinuo.commonlibtest.manager package com.common.commonlibtest.manager
import com.common.commonlib.net.RequestCallBack import com.common.commonlib.net.RequestCallBack
import com.yinuo.commonlib.net.BaseObserve import com.common.commonlib.net.BaseObserve
import com.yinuo.commonlibtest.bean.ArticlesResponse import com.common.commonlibtest.bean.ArticlesResponse
import io.reactivex.Observable import io.reactivex.Observable
import retrofit2.http.GET import retrofit2.http.GET
import retrofit2.http.Headers import retrofit2.http.Headers

@ -101,31 +101,31 @@
-dontwarn androidx.** -dontwarn androidx.**
# 保留BaseFragment公共成员和方法不被混淆 # 保留BaseFragment公共成员和方法不被混淆
-keep class com.yinuo.commonlib.utils.*{*;} -keep class com.common.commonlib.utils.*{*;}
# 保留BaseFragment公共成员和方法不被混淆 # 保留BaseFragment公共成员和方法不被混淆
-keep class com.yinuo.commonlib.view.fragment.BaseFragment{ -keep class com.common.commonlib.view.fragment.BaseFragment{
public<fields>; public<fields>;
public<methods>; public<methods>;
} }
# 保留BaseNavigationFragment公共成员和方法不被混淆 # 保留BaseNavigationFragment公共成员和方法不被混淆
-keep class com.yinuo.commonlib.view.fragment.BaseNavigationFragment{ -keep class com.common.commonlib.view.fragment.BaseNavigationFragment{
public<fields>; public<fields>;
public<methods>; public<methods>;
} }
# 保留BaseActivity公共成员和方法不被混淆 # 保留BaseActivity公共成员和方法不被混淆
-keep class com.yinuo.commonlib.view.activity.BaseActivity{ -keep class com.common.commonlib.view.activity.BaseActivity{
public<fields>; public<fields>;
public<methods>; public<methods>;
} }
# 保留CommonTitleView的内部类不被混淆 # 保留CommonTitleView的内部类不被混淆
-keep class com.yinuo.commonlib.view.CommonTitleView$*{ -keep class com.common.commonlib.view.CommonTitleView$*{
*; *;
} }
# 保留BaseNavigationFragment公共成员和方法不被混淆 # 保留BaseNavigationFragment公共成员和方法不被混淆
-keep class com.yinuo.commonlib.view.SlideRecyclerView{ -keep class com.common.commonlib.view.SlideRecyclerView{
public<fields>; public<fields>;
public<methods>; public<methods>;
} }

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.yinuo.commonlib"> package="com.common.commonlib">
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
</manifest> </manifest>

@ -1,4 +1,4 @@
package com.yinuo.commonlib package com.common.commonlib
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.app.Application import android.app.Application

@ -1,9 +1,7 @@
package com.yinuo.commonlib.net package com.common.commonlib.net
import android.net.ParseException import android.net.ParseException
import android.util.Log import android.util.Log
import com.common.commonlib.net.RequestCallBack
import com.common.commonlib.net.RequestManager
import com.google.gson.JsonParseException import com.google.gson.JsonParseException
import io.reactivex.Observable import io.reactivex.Observable
import io.reactivex.Observer import io.reactivex.Observer

@ -1,7 +1,7 @@
package com.common.commonlib.net package com.common.commonlib.net
import com.yinuo.commonlib.net.interceptor.BaseUrlInterceptor import com.common.commonlib.net.interceptor.BaseUrlInterceptor
import com.yinuo.commonlib.net.interceptor.HttpCommonInterceptor import com.common.commonlib.net.interceptor.HttpCommonInterceptor
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
import retrofit2.Retrofit import retrofit2.Retrofit
import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory

@ -1,4 +1,4 @@
package com.yinuo.commonlib.net.bean package com.common.commonlib.net.bean
import android.os.Parcelable import android.os.Parcelable
import kotlinx.android.parcel.Parcelize import kotlinx.android.parcel.Parcelize

@ -1,4 +1,4 @@
package com.yinuo.commonlib.net.bean package com.common.commonlib.net.bean
/** /**
* 请求参数 * 请求参数

@ -1,9 +1,9 @@
package com.yinuo.commonlib.net.interceptor package com.common.commonlib.net.interceptor
import android.text.TextUtils import android.text.TextUtils
import android.util.Log import android.util.Log
import com.yinuo.commonlib.BuildConfig import com.common.commonlib.BuildConfig
import com.yinuo.commonlib.CommonApplication import com.common.commonlib.CommonApplication
import okhttp3.HttpUrl import okhttp3.HttpUrl
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
import okhttp3.Interceptor import okhttp3.Interceptor

@ -1,4 +1,4 @@
package com.yinuo.commonlib.net.interceptor package com.common.commonlib.net.interceptor
import okhttp3.Interceptor import okhttp3.Interceptor
import okhttp3.Request import okhttp3.Request

@ -1,4 +1,4 @@
package com.yinuo.commonlib.utils package com.common.commonlib.utils
import android.content.Context import android.content.Context

@ -1,4 +1,4 @@
package com.yinuo.commonlib.utils package com.common.commonlib.utils
import android.annotation.SuppressLint import android.annotation.SuppressLint
import java.text.SimpleDateFormat import java.text.SimpleDateFormat

@ -1,4 +1,4 @@
package com.yinuo.commonlib.utils package com.common.commonlib.utils
import android.content.Context import android.content.Context

@ -1,4 +1,4 @@
package com.yinuo.commonlib.utils package com.common.commonlib.utils
import android.content.Context import android.content.Context
import android.graphics.Bitmap import android.graphics.Bitmap

@ -1,4 +1,4 @@
package com.yinuo.commonlib.utils package com.common.commonlib.utils
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Context import android.content.Context

@ -1,4 +1,4 @@
package com.yinuo.commonlib.utils package com.common.commonlib.utils
import android.text.TextUtils import android.text.TextUtils

@ -1,4 +1,4 @@
package com.yinuo.commonlib.view; package com.common.commonlib.view;
import android.content.Context; import android.content.Context;
import android.content.res.TypedArray; import android.content.res.TypedArray;
@ -11,8 +11,8 @@ import android.widget.TextView;
import androidx.navigation.Navigation; import androidx.navigation.Navigation;
import com.yinuo.commonlib.R; import com.common.commonlib.R;
import com.yinuo.commonlib.utils.DisplayUtils; import com.common.commonlib.utils.DisplayUtils;
public class CommonTitleView extends FrameLayout implements View.OnClickListener { public class CommonTitleView extends FrameLayout implements View.OnClickListener {
private Context mContext; private Context mContext;

@ -1,4 +1,4 @@
package com.yinuo.commonlib.view; package com.common.commonlib.view;
import android.content.Context; import android.content.Context;
import android.graphics.Bitmap; import android.graphics.Bitmap;
@ -14,7 +14,7 @@ import android.view.View;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.yinuo.commonlib.R; import com.common.commonlib.R;
public class MikeView extends View { public class MikeView extends View {
//进度条格数 //进度条格数

@ -1,4 +1,4 @@
package com.yinuo.commonlib.view; package com.common.commonlib.view;
import android.content.Context; import android.content.Context;
import android.graphics.Rect; import android.graphics.Rect;

@ -1,4 +1,4 @@
package com.yinuo.commonlib.view; package com.common.commonlib.view;
import android.graphics.Rect; import android.graphics.Rect;
import android.view.View; import android.view.View;

@ -1,4 +1,4 @@
package com.yinuo.commonlib.view.activity; package com.common.commonlib.view.activity;
import android.os.Bundle; import android.os.Bundle;
import android.view.Window; import android.view.Window;
@ -7,7 +7,7 @@ import android.view.WindowManager;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import com.yinuo.commonlib.R; import com.common.commonlib.R;
public class BaseActivity extends AppCompatActivity { public class BaseActivity extends AppCompatActivity {

@ -1,4 +1,4 @@
package com.yinuo.commonlib.view.fragment; package com.common.commonlib.view.fragment;
import android.content.Context; import android.content.Context;

@ -1,4 +1,4 @@
package com.yinuo.commonlib.view.fragment package com.common.commonlib.view.fragment
import android.os.Bundle import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
Loading…
Cancel
Save