From 00d7ad8371133196cb48d5852fdc78e5207d57b5 Mon Sep 17 00:00:00 2001 From: SiberiaDante <994537867@qq.com> Date: Mon, 7 Aug 2017 18:06:32 +0800 Subject: [PATCH] LogUtil --- README.md | 2 +- ...70\347\224\250\346\226\271\346\263\225.md" | 26 ++ collection/MyInformation.md | 8 + collection/NeedStudy.md | 3 + ...66\347\255\211\346\224\266\351\233\206.md" | 6 + customapp/.gitignore | 1 + customapp/build.gradle | 48 ++++ customapp/proguard-rules.pro | 17 ++ .../custom/ExampleInstrumentedTest.java | 26 ++ customapp/src/main/AndroidManifest.xml | 21 ++ .../siberiadante/custom/bean/UserInfo.java | 12 + .../custom/bean/base/WrapResult.java | 12 + .../custom/constant/Constants.java | 12 + .../custom/constant/RequestCode.java | 12 + .../custom/constant/ResultCode.java | 12 + .../custom/http/RetrofitManager.java | 12 + .../siberiadante/custom/ui/MyApplication.java | 33 +++ .../custom/ui/activity/BaseActivity.java | 55 ++++ .../custom/ui/activity/MainActivity.java | 16 ++ .../custom/ui/fragment/BaseFragment.java | 12 + .../src/main/res/layout/activity_main.xml | 13 + .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 3418 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 2206 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 4842 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 7718 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 10486 bytes .../src/main/res/values-w820dp/dimens.xml | 6 + customapp/src/main/res/values/colors.xml | 6 + customapp/src/main/res/values/dimens.xml | 5 + customapp/src/main/res/values/strings.xml | 3 + customapp/src/main/res/values/styles.xml | 11 + .../siberiadante/custom/ExampleUnitTest.java | 17 ++ sample/build.gradle | 5 +- .../java/com/sample/constants/AppInfo.java | 69 +++++ .../java/com/sample/constants/Constants.java | 3 + .../java/com/sample/event/AppExitEven.java | 14 + .../java/com/sample/http/ApiServerce.java | 13 + .../com/sample/ui/activity/BaseActivity.java | 27 +- .../com/sample/ui/activity/MainActivity.java | 39 +++ .../ui/activity/view/QQStepViewActivity.java | 2 +- settings.gradle | 2 +- siberiadante/build.gradle | 4 +- .../com/siberiadante/SiberiaDanteLib.java | 17 ++ .../com/siberiadante/constants/AppInfo.java | 35 +++ .../siberiadante/constants/BuildConfig.java | 13 + .../com/siberiadante/constants/Constants.java | 1 + .../siberiadante/constants/RequestCode.java | 12 + .../siberiadante/constants/ResultCode.java | 12 + .../com/siberiadante/util/CrashHandler.java | 8 +- .../java/com/siberiadante/util/DateUtil.java | 60 ++-- .../java/com/siberiadante/util/LogUtil.java | 264 +++++------------- .../com/siberiadante/util/LogUtilBase.java | 242 ++++++++++++++++ .../java/com/siberiadante/util/SPUtil.java | 257 +++++++++++++++++ .../com/siberiadante/view/TitleBarMin.java | 2 +- 54 files changed, 1281 insertions(+), 227 deletions(-) create mode 100644 "collection/Daily_Notes/\346\265\213\350\257\225\345\270\270\347\224\250\346\226\271\346\263\225.md" create mode 100644 collection/MyInformation.md create mode 100644 collection/NeedStudy.md create mode 100644 "collection/\345\205\266\344\273\226\346\212\200\346\234\257\343\200\201\345\215\232\345\256\242\343\200\201\346\241\206\346\236\266\347\255\211\346\224\266\351\233\206.md" create mode 100644 customapp/.gitignore create mode 100644 customapp/build.gradle create mode 100644 customapp/proguard-rules.pro create mode 100644 customapp/src/androidTest/java/com/siberiadante/custom/ExampleInstrumentedTest.java create mode 100644 customapp/src/main/AndroidManifest.xml create mode 100644 customapp/src/main/java/com/siberiadante/custom/bean/UserInfo.java create mode 100644 customapp/src/main/java/com/siberiadante/custom/bean/base/WrapResult.java create mode 100644 customapp/src/main/java/com/siberiadante/custom/constant/Constants.java create mode 100644 customapp/src/main/java/com/siberiadante/custom/constant/RequestCode.java create mode 100644 customapp/src/main/java/com/siberiadante/custom/constant/ResultCode.java create mode 100644 customapp/src/main/java/com/siberiadante/custom/http/RetrofitManager.java create mode 100644 customapp/src/main/java/com/siberiadante/custom/ui/MyApplication.java create mode 100644 customapp/src/main/java/com/siberiadante/custom/ui/activity/BaseActivity.java create mode 100644 customapp/src/main/java/com/siberiadante/custom/ui/activity/MainActivity.java create mode 100644 customapp/src/main/java/com/siberiadante/custom/ui/fragment/BaseFragment.java create mode 100644 customapp/src/main/res/layout/activity_main.xml create mode 100644 customapp/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 customapp/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 customapp/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 customapp/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 customapp/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 customapp/src/main/res/values-w820dp/dimens.xml create mode 100644 customapp/src/main/res/values/colors.xml create mode 100644 customapp/src/main/res/values/dimens.xml create mode 100644 customapp/src/main/res/values/strings.xml create mode 100644 customapp/src/main/res/values/styles.xml create mode 100644 customapp/src/test/java/com/siberiadante/custom/ExampleUnitTest.java create mode 100644 sample/src/main/java/com/sample/constants/AppInfo.java create mode 100644 sample/src/main/java/com/sample/event/AppExitEven.java create mode 100644 sample/src/main/java/com/sample/http/ApiServerce.java create mode 100644 siberiadante/src/main/java/com/siberiadante/constants/AppInfo.java create mode 100644 siberiadante/src/main/java/com/siberiadante/constants/BuildConfig.java create mode 100644 siberiadante/src/main/java/com/siberiadante/constants/RequestCode.java create mode 100644 siberiadante/src/main/java/com/siberiadante/constants/ResultCode.java create mode 100644 siberiadante/src/main/java/com/siberiadante/util/LogUtilBase.java create mode 100644 siberiadante/src/main/java/com/siberiadante/util/SPUtil.java diff --git a/README.md b/README.md index a208bff..8065f65 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ allprojects { repositories { ... - aven { url 'https://jitpack.io' } + maven { url 'https://jitpack.io' } } } ``` diff --git "a/collection/Daily_Notes/\346\265\213\350\257\225\345\270\270\347\224\250\346\226\271\346\263\225.md" "b/collection/Daily_Notes/\346\265\213\350\257\225\345\270\270\347\224\250\346\226\271\346\263\225.md" new file mode 100644 index 0000000..f0b7720 --- /dev/null +++ "b/collection/Daily_Notes/\346\265\213\350\257\225\345\270\270\347\224\250\346\226\271\346\263\225.md" @@ -0,0 +1,26 @@ +## 利用AndroidStudio测试内存泄露 +* +## 利用Monkey自动化测试 +* 配置adb环境变量 +* adb shell monkey [options] +* adb shell monkey -p package_name -v 100 + +## 利用Monkey自动化测试忽略crash等打印log日志 +* 在PC上执行 运行—>CMD,在弹出的命令窗口中，输入adb devices，检查设备是否连接 +* 在弹出的命令窗口中，输入adb shell，进入Linux Shell +* 执行以下命令 +``` +monkey -p com.shuinsen.zhiri --ignore-crashes --ignore-timeouts --ignore-native-crashes --pct-touch 30 -s 1 -v -v --throttle 200 100000 2>/sdcard/error.txt 1>/sdcard/info.txt + +``` +* -p com.lenovo.ideafriend只仅针对特定包名进行测试 +* --ignore-crashes忽略应用程序崩溃（Force & Close错误），继续发送执行事件，直到事件数执行完成 +* --ignore-timeouts忽略应用程序发生ANR（Application No Responding）错误时，直到事件数执行完成 +* --ignore-native-crashes忽略本地应用程序发生奔溃，直到事件数执行完成 +* --pct-touch 30调整触摸事件为30%。即整个事件过程中触摸事件占30% +* -s 1伪随机数生成器seed值。Seed值为1。相同的seed值再次执行monkey，将产生相同的事件序列。 +* -v -v日志级别为Leve1 1。将提供较为详细的日志，包括每个发送到Activity的事件信息 +* --throttle 200事件之间延时200毫秒。可以控制monkey的执行速度，如果不指定该选项，monkey事件间将不会延时。 +* 100000执行事件数为10万次 +* 2>/sdcard/error.txt Leve1 2日志保存到sdcard上的error.txt中 +* 1>/sdcard/info.txt Leve1 1日志保存到sdcard上的info.txt中 \ No newline at end of file diff --git a/collection/MyInformation.md b/collection/MyInformation.md new file mode 100644 index 0000000..d4e1d01 --- /dev/null +++ b/collection/MyInformation.md @@ -0,0 +1,8 @@ + +* EventBus +* ButterKnife +* Retrofit +* RXJava2 +* RxJava2+Retrofit2 +* 项目整体架构设计 + diff --git a/collection/NeedStudy.md b/collection/NeedStudy.md new file mode 100644 index 0000000..4d8e87d --- /dev/null +++ b/collection/NeedStudy.md @@ -0,0 +1,3 @@ +* 混淆 +* 热修复 +* RXJava2 \ No newline at end of file diff --git "a/collection/\345\205\266\344\273\226\346\212\200\346\234\257\343\200\201\345\215\232\345\256\242\343\200\201\346\241\206\346\236\266\347\255\211\346\224\266\351\233\206.md" "b/collection/\345\205\266\344\273\226\346\212\200\346\234\257\343\200\201\345\215\232\345\256\242\343\200\201\346\241\206\346\236\266\347\255\211\346\224\266\351\233\206.md" new file mode 100644 index 0000000..f2cf29f --- /dev/null +++ "b/collection/\345\205\266\344\273\226\346\212\200\346\234\257\343\200\201\345\215\232\345\256\242\343\200\201\346\241\206\346\236\266\347\255\211\346\224\266\351\233\206.md" @@ -0,0 +1,6 @@ +[EventBus的使用详解] + +[EventBus的使用详解]:http://blog.csdn.net/harvic880925/article/details/40660137 +[Android如何做一个崩溃率少于千分之三噶应用app--章节列表] + +[Android如何做一个崩溃率少于千分之三噶应用app--章节列表]:http://www.jianshu.com/p/94a05b996d78 diff --git a/customapp/.gitignore b/customapp/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/customapp/.gitignore @@ -0,0 +1 @@ +/build diff --git a/customapp/build.gradle b/customapp/build.gradle new file mode 100644 index 0000000..32fc158 --- /dev/null +++ b/customapp/build.gradle @@ -0,0 +1,48 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 25 + buildToolsVersion "25.0.3" + + defaultConfig { + applicationId "com.siberiadante.custom" + minSdkVersion 15 + targetSdkVersion 25 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + compile fileTree(include: ['*.jar'], dir: 'libs') + androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + exclude group: 'com.android.support', module: 'support-annotations' + }) + compile 'com.android.support:appcompat-v7:25.3.1' + testCompile 'junit:junit:4.12' + compile project(':siberiadante') + //RXJava + compile 'io.reactivex.rxjava2:rxandroid:2.0.1' + compile 'io.reactivex.rxjava2:rxjava:2.1.0' + //RxJava2 Adapter + compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0' + //okhttp + compile 'com.squareup.okhttp3:logging-interceptor:3.4.1' + //网络请求 + compile 'com.squareup.retrofit2:retrofit:2.1.0' + compile 'com.squareup.retrofit2:converter-gson:2.2.0' + //butterKnife + compile 'com.jakewharton:butterknife:8.7.0' + annotationProcessor 'com.jakewharton:butterknife-compiler:8.7.0' + //EventBus + compile 'org.greenrobot:eventbus:3.0.0' +} diff --git a/customapp/proguard-rules.pro b/customapp/proguard-rules.pro new file mode 100644 index 0000000..1e65b83 --- /dev/null +++ b/customapp/proguard-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in C:\Users\shuinsen05\AppData\Local\Android\Sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# 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 *; +#} diff --git a/customapp/src/androidTest/java/com/siberiadante/custom/ExampleInstrumentedTest.java b/customapp/src/androidTest/java/com/siberiadante/custom/ExampleInstrumentedTest.java new file mode 100644 index 0000000..c0437e9 --- /dev/null +++ b/customapp/src/androidTest/java/com/siberiadante/custom/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package com.siberiadante.custom; + +import android.content.Context; +import android.support.test.InstrumentationRegistry; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumentation test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() throws Exception { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getTargetContext(); + + assertEquals("com.siberiadante.custom", appContext.getPackageName()); + } +} diff --git a/customapp/src/main/AndroidManifest.xml b/customapp/src/main/AndroidManifest.xml new file mode 100644 index 0000000..cc4e9d4 --- /dev/null +++ b/customapp/src/main/AndroidManifest.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/customapp/src/main/java/com/siberiadante/custom/bean/UserInfo.java b/customapp/src/main/java/com/siberiadante/custom/bean/UserInfo.java new file mode 100644 index 0000000..8438a2e --- /dev/null +++ b/customapp/src/main/java/com/siberiadante/custom/bean/UserInfo.java @@ -0,0 +1,12 @@ +package com.siberiadante.custom.bean; + +/** + * @Created SiberiaDante + * @Describe： + * @Time: 2017/8/7 + * @Email: 994537867@qq.com + * @GitHub: https://github.com/SiberiaDante + */ + +public class UserInfo { +} diff --git a/customapp/src/main/java/com/siberiadante/custom/bean/base/WrapResult.java b/customapp/src/main/java/com/siberiadante/custom/bean/base/WrapResult.java new file mode 100644 index 0000000..b99b45d --- /dev/null +++ b/customapp/src/main/java/com/siberiadante/custom/bean/base/WrapResult.java @@ -0,0 +1,12 @@ +package com.siberiadante.custom.bean.base; + +/** + * @Created SiberiaDante + * @Describe： + * @Time: 2017/8/7 + * @Email: 994537867@qq.com + * @GitHub: https://github.com/SiberiaDante + */ + +public class WrapResult { +} diff --git a/customapp/src/main/java/com/siberiadante/custom/constant/Constants.java b/customapp/src/main/java/com/siberiadante/custom/constant/Constants.java new file mode 100644 index 0000000..c73242b --- /dev/null +++ b/customapp/src/main/java/com/siberiadante/custom/constant/Constants.java @@ -0,0 +1,12 @@ +package com.siberiadante.custom.constant; + +/** + * @Created SiberiaDante + * @Describe： + * @Time: 2017/8/7 + * @Email: 994537867@qq.com + * @GitHub: https://github.com/SiberiaDante + */ + +public class Constants { +} diff --git a/customapp/src/main/java/com/siberiadante/custom/constant/RequestCode.java b/customapp/src/main/java/com/siberiadante/custom/constant/RequestCode.java new file mode 100644 index 0000000..2389d0a --- /dev/null +++ b/customapp/src/main/java/com/siberiadante/custom/constant/RequestCode.java @@ -0,0 +1,12 @@ +package com.siberiadante.custom.constant; + +/** + * @Created SiberiaDante + * @Describe： + * @Time: 2017/8/7 + * @Email: 994537867@qq.com + * @GitHub: https://github.com/SiberiaDante + */ + +public class RequestCode { +} diff --git a/customapp/src/main/java/com/siberiadante/custom/constant/ResultCode.java b/customapp/src/main/java/com/siberiadante/custom/constant/ResultCode.java new file mode 100644 index 0000000..db200e5 --- /dev/null +++ b/customapp/src/main/java/com/siberiadante/custom/constant/ResultCode.java @@ -0,0 +1,12 @@ +package com.siberiadante.custom.constant; + +/** + * @Created SiberiaDante + * @Describe： + * @Time: 2017/8/7 + * @Email: 994537867@qq.com + * @GitHub: https://github.com/SiberiaDante + */ + +public class ResultCode { +} diff --git a/customapp/src/main/java/com/siberiadante/custom/http/RetrofitManager.java b/customapp/src/main/java/com/siberiadante/custom/http/RetrofitManager.java new file mode 100644 index 0000000..1d6c277 --- /dev/null +++ b/customapp/src/main/java/com/siberiadante/custom/http/RetrofitManager.java @@ -0,0 +1,12 @@ +package com.siberiadante.custom.http; + +/** + * @Created SiberiaDante + * @Describe： + * @Time: 2017/8/7 + * @Email: 994537867@qq.com + * @GitHub: https://github.com/SiberiaDante + */ + +public class RetrofitManager { +} diff --git a/customapp/src/main/java/com/siberiadante/custom/ui/MyApplication.java b/customapp/src/main/java/com/siberiadante/custom/ui/MyApplication.java new file mode 100644 index 0000000..f2ef114 --- /dev/null +++ b/customapp/src/main/java/com/siberiadante/custom/ui/MyApplication.java @@ -0,0 +1,33 @@ +package com.siberiadante.custom.ui; + +import android.app.Application; + +import com.siberiadante.SiberiaDanteLib; + +/** + * @Created SiberiaDante + * @Describe： 这是一个通用的APP框架的搭建，开发中可以直接拿来使用 + * @Time: 2017/8/7 + * @Email: 994537867@qq.com + * @GitHub: https://github.com/SiberiaDante + */ + +public class MyApplication extends Application { + private static MyApplication mInstance; + + public static MyApplication getInstance() { + return mInstance; + } + + @Override + public void onCreate() { + super.onCreate(); + mInstance = this; + initSiberiaDante(); + } + + private void initSiberiaDante() { + SiberiaDanteLib.initLib(mInstance); + SiberiaDanteLib.setDebug(true); + } +} diff --git a/customapp/src/main/java/com/siberiadante/custom/ui/activity/BaseActivity.java b/customapp/src/main/java/com/siberiadante/custom/ui/activity/BaseActivity.java new file mode 100644 index 0000000..02bfd04 --- /dev/null +++ b/customapp/src/main/java/com/siberiadante/custom/ui/activity/BaseActivity.java @@ -0,0 +1,55 @@ +package com.siberiadante.custom.ui.activity; + +import android.os.Bundle; +import android.os.PersistableBundle; +import android.support.annotation.Nullable; +import android.support.v7.app.AppCompatActivity; + +import butterknife.BindView; +import butterknife.ButterKnife; + +/** + * @Created SiberiaDante + * @Describe： + * @Time: 2017/8/7 + * @Email: 994537867@qq.com + * @GitHub: https://github.com/SiberiaDante + */ + +public abstract class BaseActivity extends AppCompatActivity { + public static final String TAG = BaseActivity.class.getSimpleName(); + + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + beforeSetContentView(); + setContentView(setLayoutId()); + ButterKnife.bind(this); + initView(savedInstanceState); + initData(); + } + + protected abstract void beforeSetContentView(); + + protected abstract int setLayoutId(); + + protected abstract void initView(Bundle savedInstanceState); + + protected abstract void initData(); + + @Override + protected void onResume() { + super.onResume(); + + } + + @Override + protected void onPause() { + super.onPause(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + } +} diff --git a/customapp/src/main/java/com/siberiadante/custom/ui/activity/MainActivity.java b/customapp/src/main/java/com/siberiadante/custom/ui/activity/MainActivity.java new file mode 100644 index 0000000..5d6addf --- /dev/null +++ b/customapp/src/main/java/com/siberiadante/custom/ui/activity/MainActivity.java @@ -0,0 +1,16 @@ +package com.siberiadante.custom.ui.activity; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; + +import com.siberiadante.custom.R; +import com.siberiadante.util.LogUtil; + +public class MainActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + } +} diff --git a/customapp/src/main/java/com/siberiadante/custom/ui/fragment/BaseFragment.java b/customapp/src/main/java/com/siberiadante/custom/ui/fragment/BaseFragment.java new file mode 100644 index 0000000..4806d73 --- /dev/null +++ b/customapp/src/main/java/com/siberiadante/custom/ui/fragment/BaseFragment.java @@ -0,0 +1,12 @@ +package com.siberiadante.custom.ui.fragment; + +/** + * @Created SiberiaDante + * @Describe： + * @Time: 2017/8/7 + * @Email: 994537867@qq.com + * @GitHub: https://github.com/SiberiaDante + */ + +public class BaseFragment { +} diff --git a/customapp/src/main/res/layout/activity_main.xml b/customapp/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..75414c9 --- /dev/null +++ b/customapp/src/main/res/layout/activity_main.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/customapp/src/main/res/mipmap-hdpi/ic_launcher.png b/customapp/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..cde69bcccec65160d92116f20ffce4fce0b5245c GIT binary patch literal 3418 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 literal 0 HcmV?d00001 diff --git a/customapp/src/main/res/mipmap-xhdpi/ic_launcher.png b/customapp/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..bfa42f0e7b91d006d22352c9ff2f134e504e3c1d GIT binary patch literal 4842 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 literal 0 HcmV?d00001 diff --git a/customapp/src/main/res/mipmap-xxhdpi/ic_launcher.png b/customapp/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..324e72cdd7480cb983fa1bcc7ce686e51ef87fe7 GIT binary patch literal 7718 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 literal 0 HcmV?d00001 diff --git a/customapp/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/customapp/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..aee44e138434630332d88b1680f33c4b24c70ab3 GIT binary patch literal 10486 zcmai4byOU|lb&5k+^GN3bv-?^>(QkVinb zlU9`mfQEQnq$S4VGrg6fmMQ=QFarQQ0ss(?uiys&;LQU7M-~7engIZmZaH5x#UC3m z-zvYBd&I}<`b3rPHj1tDgVv1x| zQss$ELI?W?E(!7PKk$lm@;7PwPX3o43{Ccd9@_BUsL4kQzSMa&=g{>4wj9#)9wgYw;=H@gH9KK{s?Be8N1_8W< z1Rh%Lm&PAfyYb*rGB%E#3q+}riOBB~+@@X<`9mgIiAex!QP8vg-XT>=+N&y*jC-f< zGihyr7XAly+G)|_e)qA?rnKZGG(x?=lLM7nrPk&93@5eX#7I_$g8kMX`0h=}l`HH) z=bpOkBCx=z*-fyr{yp7A9F=%o*qm93t_#tB2lAM@O{fX9ju%X#0~)nRUMvrXClh9w ze8|a0|0}JJg(_@$2wItI?LUY{zF78o(P2BR7;aC^@(jOp{8RE%U3m>MV5%Lu*46b@ zw*c?Nweu!TULS~}*9mi!ejNfNa=`po1*!jiYK)osxi%b59(thEyUZ>#lX@uEXSb_x?3)0kvB?8*TAh)7}IbzSm}5Ia;_?10{}M; z7vq-OS;Ayk8%_c-gg1Ee0FsrRU5phNs#H9Lp!1t+hwyK~9W0bWCxuG$LM~wQuumEw z=fbBD@sQE%1^j z`T@`PZLRVyWjX@*tjc7r;w$H~aW&7vu?|war?84^sg!{J*RH|mhq?KTsCVQBC1~fR z>99jeR=g-Q2b=d;pKwzXwYjrG>?pd3tFSsHN4in{usYLdK;01X2BdRLFI`cuB9yI) zI_ZX?7_(bz`MX2@^mCknx7 z*f}KV@}TBBc}CXMR8T_5yInD3p`KrNROSA;HoJJtlNG3weri%utO$eeY0 z+w-NEn;(;UCBk=OM$f%=%ma24wV7$idelqyNWI>sz1>BlGwr_3UugqVjY+UYyi9P) zxCB?&rPUetoZN?|*D%=hOOJ_${JU3GRjppY%&8Ws^G6>iokr^Bmv1&*@#2#5mXu05 zhPVXaQ`qe5i0lP-1^XL45x`ertKU5d-8b_?*1+tSU!qCeqD9gZP_>ZLq9p)RKtV(B zOh&^x>gV^eqb&c~Oi0|HgGG|gjpbR`9aRdZhOimvS2Y3e?eCFiw+L#_mi9j z;nU}gih+zTn{nv_|L}IllD1Dr3~@yitI}+4C&+;SR+cEfelqJ?eUjZ%&Qz)W8S750 z+vG8Lvo}xXz2C}S-m|9*uE?NWQWT#W+p@$DkH8wVn#=gLKa13M!Yva9qsfE(5Z#0V`A0pN)Ok zP*Eq0(~e$~m@iej0#Av_z703y-7|W6`UuGDS8fpy2rUgINZs#`33@@0(S%~%XUO5G zscEp&x^dU`8syC67USOswNLq>Z_}q#gLh2x`zR)0wvor72-IW@oDpnT0x zWn%LZ_yvR*7geY6<}MC~SViD+4`S9XC|L}N0ANpsUU;50sAjL zb5h>&s<-wcdf2>}P91QgeAu~ZnB7;;FkfKJp^8ne8!-`jK0+O(^`s~#RE0@)=IWiQ z@(vh6D^4jN5ih;*c4J48FMC9MwoN(cXk1Wiq55Vi-^X#p8R_(!y81}YDdMefwdl2F zNA0n}-!P4!FaCe-jnf{^I#?5W=%9T1C|$ z`+tq*x!rEx)Bkv-eO9$mWML9_yId)A_OltKIH-X=0eJ`Opqqj&s^T;PLIZXJ!pEi!=3ZLHPGi*~?<(L&m6;{M(636VC<08tan>&c6fW z%KEuUN9x|i7Wc^-0l&Vf20kI~_XfD4hEac=&}5n&MoYL`Xsx=1po#V*6wUpwB@pu* z*@2n|zglL~zr$9&uOd9_%)GWk&0UN`<&GAm8=Ba-@MT&TH*`NHlt+CMi2Ag;LgGpm zm+ybGL-!1Z$kBYk66=39zAsErw1}|-l1npj-?3g1LE#PXU%%_{8kO=5!W!6pQ?z&i zc_MuV(xKMXSA0ga@IsiwYspm&d4|n@L_zji`zUWxsM}|=@R}BFfT2P!uJcrQf81WG z;7~y_$uMK=ih(2hrfqIGOzb(81e}^7h$dQ*w9&zG_k*kV{ml>Dkn2!p9tb_+Sa82P zf!TC+{4a(i^7UC$53;w?sleb~lFWqeCjv5msi}#JQ!wJtA>=k~`WL0M{^a9PG3%vT z6x=jB0{7wX7$gs%H}xJ&s+hHnzrl#L*=KB8OZd%sPoxKs(`;%|I$(^;nFYa4Cg|3D zmbQ)m6I_Y@t)A~{YBRo!2sYI^n!q)$tPp|m&n1BkYVmX22Z+nY#4N{Bb0!Ko=DOhh z8)8*=>e(W&-%LSWUN;u45Wex{{R747!a~45S>12$wNc{9N95&r%gU+b#-B7PcF%`_ zbDPAsmvpVBsQpf}s{igh23+1)`QSj71!|zjij@kvxgob&J{E97Lwu==Z)RY-lujF1 zts{7+jfS(K5+clZ(CY~%ks(F!=cb)YtqEu(dp_7=A?O!zz8KONrrma{eU-54%}Dm| zMb0!-=YUH?S7JzBX|TVr;=fB(8}a+Mcip|v&=pAeFMCaHj_Nkl!sWeZSb#k<%oczm z#`lGsgJHo7RywsRYYQs4O`J_C=fARQ$)B1peZk)|&ULCaa#RJ45lrml54sxO!CCv< zACe-^PSoZc!)x$#iZa*NuMlS%Jd!_x9|UdgLzlGyF0cI$EUFG4O;L+8*+s;KNL-ld z?R+O)guOt(>{+*e-+_A{1MBbRn&>53j=33ngVZ*A9^^??x8!ww@-m%DVVPmliJh;B zA?gVg!0|Rs7)?hBD^!lSxbI8;-8Q65B4DKw29-K9_w0glvBA&vz=a(hBCWqSnbKS0 zUg%$!iEY%1jOqivHBW;uSX*e&(J!Yr7cborEc&_4TQAAt(Hs@99pynWwVQc-PD)!b zEAfVEq-cX>10nj+=mUt(v;j?>9`bLJayfOcTYEOojVJwg!qg=XHGMAonnJPa; zUJ!+pYTulTHW%^S;&|h~V3suNSc{q3^zg~L0z(5QQ;Fz}<5*7QiE`G{EY!_Bq6Tf3 z#Y6<%5EL^6+vT44<%^2!TOb&Drb?#eUqR@vqcvAd=l_6n*oWcLU38eLio z&XA9a$>+}PoZ&n7&1;j$MfqAp&SK~ziPsl|%{|CWXWM9wxyVKXe0%lk}rDC8g z8X@%6X|;SG;muLTK4d!cPgVxqjvaX=-$(Q65p5S*rI%=0cH7U(J{e1RPLJ7=nOmA) zMlRB`!r37ZXhzV+&X?quSyu}sbAn^a+S992*Te=%QW1izNzH-(Fc!u`0^%jIwx-q{ zjJ$P>vDS90xVX3yM??JQE(8|%*Ent^LOWJSOM1DpOGR5rG_7xH(O_SiI zQPhe?AtaSr$aWQDFB=s4vG}6A7sKS9#`*O?Gvb$VpNFveZ{M$e6gN?k zBAf6x8lMv8irB7O2F*?SxjQ+G9(Zzcf(-v6B#Che%7km*jk@ z)2}#vcILe$u75B8OqP#aD^OyEpX+8%bA;T*9+xPtBOA56r>VBH?W|l@4D*s*oHF7b zKiEI(=9Q&zzKDNu(c_-(iYp|O=RX90e|T*1D)Vi}F|XXxwzlFY%vI5oyr@gp+zfor zE{L0=4=<&pTg$Vb2&yaL(=zg-A=-V)<6G@}QKeym;mw^FzryGI(YX6E{x5!pKKNFb zX2wUTC}&?H`qv0{Ouyp!O!9>BD+&bp+x5*hFxlEJ|Jlx!dC36CiNWcOOOUw5NPT2n zckQz+nHS7$v`1`e33@@emu_-PmpnE%>A~wldBhO+8|uKd(CXF1LguU>p-iuo+6+#A(zwt<~}iz8;e zi$`F>cJ*M;o0PM7dMP=uB26set3i}BC!lE@>Gk`4oZQIG&&(O{wh_khwAz^jz zLMdgg*JfCk1{LlNW)C?WLX_!#5OsEIb3ZPWV7*KBWoBhmt&{(fw|eI)9LZTDrF;Cm zrRI0DXcArT*)L<`{Gy!R-`j)ca2)6Ks~48Jcl^Qg{XgWYyo6RpJj`Aq>-T>){#|lR zRPY`?<2vJ#s7v8mNz1zwnz@<9ofov5TnYTqj(PJN^Hv0N1N6rZY2Q2ixJ9IY`5B)j z?o!|2DLA8bc-{QD-^}@UP_JB`BjVr};f3o#5P`$++U2>eVvNM%RKxPV7J0hzme%(z zR7M~;#x=}vL&%^k)1dkFp)ApEinI%CXma_IcfN1= zghNTqbv$mD$mXwAWysU;hUAFR0^jhAYjE}TV=j$O0>v_@{)|7er^HCFN$j4D(Rxa+ zr>@Me?gS|zVlda*cn+sM7^g8|~YJlBlxK`p<| zo$B!mr$%Z4An3pBbh@BK4Hi-E7l^3GMOiG?^~~z1Oxn$0PAR&}&*9D$O)(_>aB04e z*{ihG%K2UZE9c%O@J$1R+qtuhVW+Li7>Bw~LBLxQ_2GJ6dWmr`sMzGzRfiKQrm?9I zR~`S8uz0=lw5lTY3!?lQ|2LJNx(Ly%0Hkj_Q0C+f8>^@`ot4vM)#Bo9*u)9;#4lPQ zkD$dnQJ;T3;cR_9pRiRuc^MkgYiS>6*;09uV{z*IYw3#i;TH$m(R{*3w>BS-cM7T<{u?6<8}o91iDU^B)<6wJwL{eG{=U+MNz z>#f)F`15Bnp|A(04!41E4ixt89MvouKW88SEk-A`6{3;V9M)Ips3VNFol3u5WiBmL ze0Uor5Z+x~NDGz=5gd!i#D5L)gN!7;`5bPc*8~;4hQOzIJ_RM07TD_cA!r1XISg_x z%9r&%6tsJq$>~|UQ1|7AZe{Oeu!2V&rjYX=>T-qb@S?3(7FC=Z^XOYf24G=+FJR;^ z&+s!YCtoncOWkA~zS!&wfYTiV$WJeR&@pINr7!v$Vw3}H92S?Mj>$ckH9eSoqhxli^L9 zl6?;LH$mT|@_S}#35}P!_7@h%=&u7n2PH0zl8K6L4SX!;*Nkxnnt~qhgVoG_|@w$t9uwee?p`9loMG zr|Qqo!ws?ZaVp;+zT!zH^@xtf^zzvEF*EJK-3hdBe&e4hTya+V7cwy9k?-&u+1W$J9MsjiXQu0{sN!(0)p=yn;5R~ zm8G1M$wClU4oHZeWuEucT>8fj9@#M0kY>Zjx}{F%fX>qa5#{2}lM>g}Xnjo}l|ew8 zkXA5h=I9hvEufUW_wOT8b^(DlBKCuM+=VI>J`Ua;1OioQTVInOmu*pv>=0&M>MOS| z%x%82SVXH|##aK|&I9wXCi2Kuz8@~`}P*VwE0=zPr%s5aHvFP`FsjEx2cBo)6ex*A zWp5GPoq0Vy74R>2aPlQP>~oZKw3$U(jAdy#E}=(clqiqe%$7=zb#t-GOC`@<-LJz{!m%n21KVT2lg4>F^Qyl9E2SvvZNE^Kq<8~8z*~izg_2G$e)DWZ z&r)^t$fjc4=0*E2GgW8V@;;-uQTLpkoe4G&6_Gi{=*bj1demc_{W*z@M)N3w-y!I2 zxt>0g2bLTSCr87lvU@@?w=y0(8-&vH2iDYp1oVatM3hj{k zTI09~y|)(A+XuR&rxolH&~6OyHuw;ulgO_ zPuTLyiVw)P|B03nB7klGZ1SdadQT)(_wcJpUd5Dw*Tl^3%=>G;G`B&%wwFm(MjZi# zMzuQuU>R1Zq8as9MkmM~4%8aV4m60Cl4X`?$zw27Nx(x@)C3hiNs$loyeJV|;3R`m z=2BoxiLeZq;~pUpKfO}+8=>;xkRT&Wh?xRT*$vA=e1-1-a(LQ&8&RQ!R;p| z0{dFY6Iuv97U8}VgGV$6PB!6w5}-jehsz>M8R?2d0-?1=c9Ek)8Yhh)!3TZPk1>d^py>9{d~my1NBGJ)ypHC;!FbEqzyVi zu?k`sqbi!2$c8~?{{=5xCd5}QNx$~UD2(hV0{VWx-}##X2uo*=a!4(~o_<3lOh;=1 zGWy!R&!cXBeOPdKzslPq+FOzt2P)Y6SL*2}8s1q7(#-PEp*Wm`{7r`W-T4WD{gKfb zL=!WtyH86@TGc=5%hW+QVgF5lmp6`bUz|y3kvDq8cEX#Zcon0xK`W6icDQ>?Gb=4k zx9`mayKC`XvhQ;fwwljzxg#~7>oUV^PafLCvQ3GNmYh3%udW9gpP}zdP01_?V#F|} zu+6A+v$!2@w>!LQS}Htz#xrDTMCHF(viHn9B@`r*AN^Uh^K1dYX%OU(L;QO-NS7sm zB}n&5G=+cvZdostKMXC?^Pljs93+p|U_TbCD$_YFH_al)C6D--qOJJg^-4S{e(_Bh(hqonQpIAR3 zLn22yQovcP8^(~lYa;Iw1iN45bC1LAyPgyMn!Us#kC~Od)l{8iBF=vyb{%q5Uo|At z`GioU@7{~W>87(`5`y7oUan|z+y9y6kLnnMdpTsuWXtd+^OE@Rc1&DlS#6q{VJQ~^2R25csGlWAI6%1)G(k1hy(%a6 zP8;j(?t{iGcAAzn*N4^9x1BG`9YQD?lsKuJE}E(!LRb-C04hKL&@?*uDt+rmq#F+E zy;MAG%p~MH`3$_n9%+YIg%-3+vV)5OcqKaeQuCmrhtqvaxZ!JAr|$dSF%)+`Yvoou zOSNuZL?Y9b&gUmyj|pfc5HOzcO#wTn_4)qhXWH?-2h*_V$bXFzOAO}R;U0Utm6jK1 zARXYF88&Au<4|bU zjIqU6CietjeFXz>A`VLxAln~?Tc3Z$!7ZUwvHhxe6;yAIYyV5DChijA_*mxgWa1Hf zpMe^m_ zi=Br9$|jmRXy`ALU7%BL%h!;kp0u2jEG>Y(3_SumS4~Ap=R2K`FOb*E9xFaK2xw@q5)FC9ki5__UGG^ChH* zg8T@CWK(2ZAhn)tl(@xrQ|@?sJZYbg?wPRykjvXSzBgO!5l;~}n=Vx=*>!3~hpG!QO_vZ7nOf(H%X8Zyf5zQI9<;&VgO`J^g!d%ci*Gayzi9E zzV{ggWXFUOwfXv^Cu9g;LXloZZQq$>osapDJ&dlE+FA zOAq0EeuKAV6~J_=V4ai?3X&T(A2S-Y-bb`Ai`xZ-D`VrnQ>pAdiPR0)l-S!eWp};M zhdf*YpjTWa+F;wAvaF(x6TW7LroZ>f%xX1B>ku{kHy23f4Gr*{SyBzch&H417J0V$b=yDLEIl7<2;YbKQ&{=ZOVvMR0}AxP zsmR+tme$kQHP;7Yn9&3eFJljv567buHH|D~F|nOk<45BcE*rk)#MT#RvWplVxMlzpi*dmU?7Pzz{?ICX{O>V+&4<<0nM?7@q6?=qp|+- z^F2j+>w(o9IZ#i9MKt?we*u>AF^=)GwlEo-<8)ZNsl`DO9Ts^3mN?;` zpu-&&=Gn~8C2og^of_Emg!Z)!`}l6?zCnvZ2)$RRO7E_te3B9iY#R5%#LUxR2a$64 zRNuv={A!3W0>=Vd9-Gygqi!GqnO4Wu*hSIx$FOH*78(*CzB@93|C9L^)cR86oytQX zz(VBa;uz&eA4;0&+0T7h>1okMFU4QmpaK8N1A2wlN0S5ncCO%AcYgA${c!kFQ+TiA zSE{2T+HSjei*$%Ai4A}4W1S3}-mXNa1B^jTL+Biw<*SD;pmpz7SdmFu%Z231W zkED`=rBr|FkuV%mCW~b>XQTCw%K0Clxj&QGIm4o%6lpuc4OgwWW^N>I z$CiUaixkCEQf)R*DBF6P&%z|)%AGchvGhBH3v_5YPKL6o6gDG~@`ZoTScT$`HQPz7 zQiqtq$|yTKXN%7 zSaCG2Ucn>50Z`>XxJnz6%(tPlqY9dGm@zHtV2!nWMmS!~Ac!e66nI-(6fh>Qh>8n)+v%wQv>T#tc54h zB%~5--xs;qRhX+bIms&XJP;?K$K2_5H1EpFn-*GyZaD5sGDZ&n5P~FndmWj1xxfxb zSocm{R9OVmD?CfFE;Oebf@%V^7{ZETZUhZ?GM(@uT|gImuIH#AeMtxlE^*teXWH`b z$LnM8?Q_|vjv^u(kO-Y$cB1?ICmH@j5PY(q zaPxf3LgA{hO>D7{M2?XnUpAsX?0!P#eL3cHStcyY4^PB2N&Y`}U05UvjiREStj@u{ z|B)ET + + 64dp + diff --git a/customapp/src/main/res/values/colors.xml b/customapp/src/main/res/values/colors.xml new file mode 100644 index 0000000..3ab3e9c --- /dev/null +++ b/customapp/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ + + + #3F51B5 + #303F9F + #FF4081 + diff --git a/customapp/src/main/res/values/dimens.xml b/customapp/src/main/res/values/dimens.xml new file mode 100644 index 0000000..47c8224 --- /dev/null +++ b/customapp/src/main/res/values/dimens.xml @@ -0,0 +1,5 @@ + + + 16dp + 16dp + diff --git a/customapp/src/main/res/values/strings.xml b/customapp/src/main/res/values/strings.xml new file mode 100644 index 0000000..b7a26f3 --- /dev/null +++ b/customapp/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + CustomApp + diff --git a/customapp/src/main/res/values/styles.xml b/customapp/src/main/res/values/styles.xml new file mode 100644 index 0000000..5885930 --- /dev/null +++ b/customapp/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/customapp/src/test/java/com/siberiadante/custom/ExampleUnitTest.java b/customapp/src/test/java/com/siberiadante/custom/ExampleUnitTest.java new file mode 100644 index 0000000..0ed7876 --- /dev/null +++ b/customapp/src/test/java/com/siberiadante/custom/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package com.siberiadante.custom; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() throws Exception { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/sample/build.gradle b/sample/build.gradle index c5a4c85..5db000f 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -40,6 +40,7 @@ dependencies { compile 'io.reactivex.rxjava2:rxandroid:2.0.1' compile 'com.android.support:multidex:1.0.1' debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.1' -// releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1' -// compile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1' + // releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1' + // compile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1' + compile 'org.greenrobot:eventbus:3.0.0' } diff --git a/sample/src/main/java/com/sample/constants/AppInfo.java b/sample/src/main/java/com/sample/constants/AppInfo.java new file mode 100644 index 0000000..dc8b37a --- /dev/null +++ b/sample/src/main/java/com/sample/constants/AppInfo.java @@ -0,0 +1,69 @@ +package com.sample.constants; + +import com.siberiadante.util.SPUtil; + +/** + * @Created SiberiaDante + * @Describe： + * @Time: 2017/8/3 + * @Email: 994537867@qq.com + * @GitHub: https://github.com/SiberiaDante + */ + +public class AppInfo { + private SPUtil spUtil; + + /** + * 初始化SPUtil + */ + private AppInfo() { + spUtil = new SPUtil(Constants.APP_INFO); + } + + public static AppInfo getInstance() { + return new AppInfo(); + } + + private SPUtil getSpUtil() { + return spUtil; + } + + /** + * 判断用户是否登录 + * + * @return + */ + public boolean isLogin() { + return spUtil.getBoolean("is_login"); + } + + /** + * 设置用户登录状态 + * + * @param isLogin + */ + public void setLogin(boolean isLogin) { + spUtil.put("is_login", isLogin); + final SPUtil spUtil = AppInfo.getInstance().getSpUtil(); + spUtil.put("is_login", true); + } + + /** + * 是否第一次使用app,默认true + */ + public boolean isFirstInstall() { + return spUtil.getBoolean("is_first_install", true); + } + + public void setIsFirstInstall(boolean bool) { + spUtil.put("is_first_install", bool); + } + + /** + * 退出登录 + */ + public void loginOut() { + spUtil.clear(); + spUtil.put("is_first_install", false); + } +} diff --git a/sample/src/main/java/com/sample/constants/Constants.java b/sample/src/main/java/com/sample/constants/Constants.java index 3a3d217..c2e3655 100644 --- a/sample/src/main/java/com/sample/constants/Constants.java +++ b/sample/src/main/java/com/sample/constants/Constants.java @@ -11,4 +11,7 @@ public class Constants { public static final String URL_RECYCLER_VIEW = "http://www.jianshu.com/p/cc3e2af38a62"; public static final String URL_CUSTOM_VIEW = "http://www.jianshu.com/p/b272528165a2"; public static final String URL_RX_JAVA = "http://www.jianshu.com/p/464fa025229e"; + + + public static final String APP_INFO = "app_info_sp"; } diff --git a/sample/src/main/java/com/sample/event/AppExitEven.java b/sample/src/main/java/com/sample/event/AppExitEven.java new file mode 100644 index 0000000..4e16a8e --- /dev/null +++ b/sample/src/main/java/com/sample/event/AppExitEven.java @@ -0,0 +1,14 @@ +package com.sample.event; + +/** + * @Created SiberiaDante + * @Describe： + * @Time: 2017/8/1 + * @Email: 994537867@qq.com + * @GitHub: https://github.com/SiberiaDante + */ + +public class AppExitEven { + public AppExitEven() { + } +} diff --git a/sample/src/main/java/com/sample/http/ApiServerce.java b/sample/src/main/java/com/sample/http/ApiServerce.java new file mode 100644 index 0000000..2018b7d --- /dev/null +++ b/sample/src/main/java/com/sample/http/ApiServerce.java @@ -0,0 +1,13 @@ +package com.sample.http; + +/** + * @Created SiberiaDante + * @Describe： + * @Time: 2017/8/3 + * @Email: 994537867@qq.com + * @GitHub: https://github.com/SiberiaDante + */ + +public class ApiServerce { + +} diff --git a/sample/src/main/java/com/sample/ui/activity/BaseActivity.java b/sample/src/main/java/com/sample/ui/activity/BaseActivity.java index 3644d3d..166b102 100644 --- a/sample/src/main/java/com/sample/ui/activity/BaseActivity.java +++ b/sample/src/main/java/com/sample/ui/activity/BaseActivity.java @@ -4,15 +4,36 @@ import android.support.v7.app.AppCompatActivity; import android.os.Bundle; -import com.sample.R; -import com.sample.SampleApplication; +import com.sample.event.AppExitEven; import com.siberiadante.util.ScreenUtil; -public class BaseActivity extends AppCompatActivity { +import org.greenrobot.eventbus.EventBus; +import org.greenrobot.eventbus.Subscribe; + +public class BaseActivity extends AppCompatActivity { @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); ScreenUtil.setStatusTranslucent(this); + EventBus.getDefault().register(this); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + EventBus.getDefault().unregister(this); + } + + /** + * 退出应用时调用SendExitEvent + */ + public void sendExitEvent() { + EventBus.getDefault().post(new AppExitEven()); + } + + @Subscribe + public void onEventMainThread(AppExitEven event) { + finish(); } } diff --git a/sample/src/main/java/com/sample/ui/activity/MainActivity.java b/sample/src/main/java/com/sample/ui/activity/MainActivity.java index f14ba11..4a81a18 100644 --- a/sample/src/main/java/com/sample/ui/activity/MainActivity.java +++ b/sample/src/main/java/com/sample/ui/activity/MainActivity.java @@ -3,9 +3,12 @@ import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.view.ViewPager; +import android.view.Gravity; +import android.view.KeyEvent; import android.view.View; import android.widget.RadioButton; import android.widget.RadioGroup; +import android.widget.Toast; import com.sample.R; import com.sample.adapter.MainActivityAdapter; @@ -13,9 +16,14 @@ import com.sample.ui.fragment.OtherFragment; import com.sample.ui.fragment.UtilFragment; import com.sample.ui.fragment.ViewFragment; +import com.siberiadante.util.ToastUtil; import java.util.ArrayList; import java.util.List; +import java.util.Timer; +import java.util.TimerTask; + +import javax.xml.datatype.Duration; public class MainActivity extends BaseActivity implements View.OnClickListener, RadioGroup.OnCheckedChangeListener, ViewPager.OnPageChangeListener { public static final String TAG = MainActivity.class.getSimpleName(); @@ -123,4 +131,35 @@ public void onPageSelected(int position) { public void onPageScrollStateChanged(int state) { } + + @Override + public boolean onKeyDown(int keyCode, KeyEvent event) { + if (keyCode == KeyEvent.KEYCODE_BACK) { + exitBy2Click(); //调用双击退出函数 + } + return false; + } + + /** + * 双击退出函数 + */ + private static Boolean isExit = false; + + private void exitBy2Click() { + Timer tExit = null; + if (!isExit) { + isExit = true; // 准备退出 + ToastUtil.showSingletonText( "再按一次退出程序", Toast.LENGTH_LONG, Gravity.CENTER); + tExit = new Timer(); + tExit.schedule(new TimerTask() { + @Override + public void run() { + isExit = false; // 取消退出 + } + }, 2000); // 如果2秒钟内没有按下返回键，则启动定时器取消掉刚才执行的任务 + + } else { + + } + } } diff --git a/sample/src/main/java/com/sample/ui/activity/view/QQStepViewActivity.java b/sample/src/main/java/com/sample/ui/activity/view/QQStepViewActivity.java index ddf968d..23c5367 100644 --- a/sample/src/main/java/com/sample/ui/activity/view/QQStepViewActivity.java +++ b/sample/src/main/java/com/sample/ui/activity/view/QQStepViewActivity.java @@ -27,7 +27,7 @@ private void initView() { mTvStart = (TextView) findViewById(R.id.tv_start); stepView = (QQStepView) findViewById(R.id.step_view); stepView.setStepMax(10000); -// stepView.setCurrentStep(5000);0 +// stepView.setCurrentStep(5000); //属性动画 final ValueAnimator valueAnimator = ObjectAnimator.ofFloat(0, 9000); valueAnimator.setDuration(3000); diff --git a/settings.gradle b/settings.gradle index ce7b0c1..02eae80 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':siberiadante', ':sample' +include ':siberiadante', ':sample', ':customapp' diff --git a/siberiadante/build.gradle b/siberiadante/build.gradle index f1d9e97..0140472 100644 --- a/siberiadante/build.gradle +++ b/siberiadante/build.gradle @@ -7,10 +7,10 @@ android { buildToolsVersion "24.0.3" defaultConfig { - minSdkVersion 16 + minSdkVersion 14 targetSdkVersion 24 versionCode 1 - versionName "1.0" + versionName "1.0.1" consumerProguardFiles 'siberiadante-proguard-rules.pro' // testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/siberiadante/src/main/java/com/siberiadante/SiberiaDanteLib.java b/siberiadante/src/main/java/com/siberiadante/SiberiaDanteLib.java index 8f30767..3fc3a72 100644 --- a/siberiadante/src/main/java/com/siberiadante/SiberiaDanteLib.java +++ b/siberiadante/src/main/java/com/siberiadante/SiberiaDanteLib.java @@ -4,6 +4,8 @@ import android.app.Activity; import android.content.Context; +import com.siberiadante.constants.AppInfo; + /** * Created by SiberiaDante on 2017/5/10. * user this lib,you should init it first：context @@ -19,10 +21,25 @@ public SiberiaDanteLib() { throw new UnsupportedOperationException("not init SiberiaDanteLib"); } + /** + * 初始化 + * + * @param context + */ public static void initLib(Context context) { SiberiaDanteLib.context = context.getApplicationContext(); } + /** + * 日志输出控制 + * + * @param isDebug + */ + public static void setDebug(boolean isDebug) { + AppInfo.getInstance().getSPUtils().put("is_debug", isDebug); + + } + public static void initLib(Activity activity) { SiberiaDanteLib.activity = activity; } diff --git a/siberiadante/src/main/java/com/siberiadante/constants/AppInfo.java b/siberiadante/src/main/java/com/siberiadante/constants/AppInfo.java new file mode 100644 index 0000000..bbc6fad --- /dev/null +++ b/siberiadante/src/main/java/com/siberiadante/constants/AppInfo.java @@ -0,0 +1,35 @@ +package com.siberiadante.constants; + +import com.siberiadante.util.SPUtil; + +/** + * @Created SiberiaDante + * @Describe： + * @Time: 2017/8/7 + * @Email: 994537867@qq.com + * @GitHub: https://github.com/SiberiaDante + */ + +public class AppInfo { + private SPUtil info; + + private AppInfo() { + info = new SPUtil(Constants.INFO); + } + + public static AppInfo getInstance() { + return AppInfoHolder.appInfo; + } + + public SPUtil getSPUtils() { + return info; + } + + private static class AppInfoHolder { + private static final AppInfo appInfo = new AppInfo(); + } + + public boolean isDebug() { + return info.getBoolean("is_debug"); + } +} diff --git a/siberiadante/src/main/java/com/siberiadante/constants/BuildConfig.java b/siberiadante/src/main/java/com/siberiadante/constants/BuildConfig.java new file mode 100644 index 0000000..c56d82a --- /dev/null +++ b/siberiadante/src/main/java/com/siberiadante/constants/BuildConfig.java @@ -0,0 +1,13 @@ +package com.siberiadante.constants; + +/** + * @Created SiberiaDante + * @Describe： + * @Time: 2017/8/7 + * @Email: 994537867@qq.com + * @GitHub: https://github.com/SiberiaDante + */ + +public class BuildConfig { + +} diff --git a/siberiadante/src/main/java/com/siberiadante/constants/Constants.java b/siberiadante/src/main/java/com/siberiadante/constants/Constants.java index d6b73be..b799d01 100644 --- a/siberiadante/src/main/java/com/siberiadante/constants/Constants.java +++ b/siberiadante/src/main/java/com/siberiadante/constants/Constants.java @@ -10,4 +10,5 @@ public class Constants { public static final String STATUS_BAR_HEIGHT_RES_NAME = "status_bar_height"; + public static final String INFO = "common_info"; } diff --git a/siberiadante/src/main/java/com/siberiadante/constants/RequestCode.java b/siberiadante/src/main/java/com/siberiadante/constants/RequestCode.java new file mode 100644 index 0000000..39c06ab --- /dev/null +++ b/siberiadante/src/main/java/com/siberiadante/constants/RequestCode.java @@ -0,0 +1,12 @@ +package com.siberiadante.constants; + +/** + * @Created SiberiaDante + * @Describe： + * @Time: 2017/8/7 + * @Email: 994537867@qq.com + * @GitHub: https://github.com/SiberiaDante + */ + +public class RequestCode { +} diff --git a/siberiadante/src/main/java/com/siberiadante/constants/ResultCode.java b/siberiadante/src/main/java/com/siberiadante/constants/ResultCode.java new file mode 100644 index 0000000..8cc97ef --- /dev/null +++ b/siberiadante/src/main/java/com/siberiadante/constants/ResultCode.java @@ -0,0 +1,12 @@ +package com.siberiadante.constants; + +/** + * @Created SiberiaDante + * @Describe： + * @Time: 2017/8/7 + * @Email: 994537867@qq.com + * @GitHub: https://github.com/SiberiaDante + */ + +public class ResultCode { +} diff --git a/siberiadante/src/main/java/com/siberiadante/util/CrashHandler.java b/siberiadante/src/main/java/com/siberiadante/util/CrashHandler.java index 1dfe2f4..b50d237 100644 --- a/siberiadante/src/main/java/com/siberiadante/util/CrashHandler.java +++ b/siberiadante/src/main/java/com/siberiadante/util/CrashHandler.java @@ -68,7 +68,7 @@ public void uncaughtException(Thread thread, Throwable ex) { try { Thread.sleep(3000); } catch (InterruptedException e) { - LogUtil.eFile(e.toString()); + LogUtilBase.eFile(e.toString()); } //退出程序 android.os.Process.killProcess(android.os.Process.myPid()); @@ -109,7 +109,7 @@ public void collectDeviceInfo(Context ctx) { infos.put("versionCode", versionCode); } } catch (PackageManager.NameNotFoundException e) { - LogUtil.eFile(e.getMessage()); + LogUtilBase.eFile(e.getMessage()); } Field[] fields = Build.class.getDeclaredFields(); for (Field field : fields) { @@ -117,7 +117,7 @@ public void collectDeviceInfo(Context ctx) { field.setAccessible(true); infos.put(field.getName(), field.get(null).toString()); } catch (Exception e) { - LogUtil.eFile(e.getMessage()); + LogUtilBase.eFile(e.getMessage()); } } } @@ -150,7 +150,7 @@ private String saveCrashInfo2File(Throwable ex) { String result = writer.toString(); sb.append(result); sb.append("--------------------end---------------------------"); - LogUtil.eFile(sb.toString()); + LogUtilBase.eFile(sb.toString()); return null; } diff --git a/siberiadante/src/main/java/com/siberiadante/util/DateUtil.java b/siberiadante/src/main/java/com/siberiadante/util/DateUtil.java index 2dbc5d2..8db70a1 100644 --- a/siberiadante/src/main/java/com/siberiadante/util/DateUtil.java +++ b/siberiadante/src/main/java/com/siberiadante/util/DateUtil.java @@ -7,29 +7,28 @@ /** * Created by SiberiaDante on 2017/5/4. * 格式转换参考 - * HH:mm 15:44 - * h:mm a 3:44 下午 - * HH:mm z 15:44 CST - * HH:mm Z 15:44 +0800 - * HH:mm zzzz 15:44 中国标准时间 - * HH:mm:ss 15:44:40 - * yyyy-MM-dd 2016-08-12 - * yyyy-MM-dd HH:mm 2016-08-12 15:44 - * yyyy-MM-dd HH:mm:ss 2016-08-12 15:44:40 - * yyyy-MM-dd HH:mm:ss zzzz 2016-08-12 15:44:40 中国标准时间 - * EEEE yyyy-MM-dd HH:mm:ss zzzz 星期五 2016-08-12 15:44:40 中国标准时间 - * yyyy-MM-dd HH:mm:ss.SSSZ 2016-08-12 15:44:40.461+0800 - * yyyy-MM-dd'T'HH:mm:ss.SSSZ 2016-08-12T15:44:40.461+0800 - * yyyy.MM.dd G 'at' HH:mm:ss z 2016.08.12 公元 at 15:44:40 CST - * K:mm a 3:44 下午 - * EEE, MMM d, ''yy 星期五, 八月 12, '16 - * hh 'o''clock' a, zzzz 03 o'clock 下午, 中国标准时间 - * yyyyy.MMMMM.dd GGG hh:mm aaa 02016.八月.12 公元 03:44 下午 - * EEE, d MMM yyyy HH:mm:ss Z 星期五, 12 八月 2016 15:44:40 +0800 - * yyMMddHHmmssZ 160812154440+0800 - * yyyy-MM-dd'T'HH:mm:ss.SSSZ 2016-08-12T15:44:40.461+0800 + * HH:mm 15:44 + * h:mm a 3:44 下午 + * HH:mm z 15:44 CST + * HH:mm Z 15:44 +0800 + * HH:mm zzzz 15:44 中国标准时间 + * HH:mm:ss 15:44:40 + * yyyy-MM-dd 2016-08-12 + * yyyy-MM-dd HH:mm 2016-08-12 15:44 + * yyyy-MM-dd HH:mm:ss 2016-08-12 15:44:40 + * yyyy-MM-dd HH:mm:ss zzzz 2016-08-12 15:44:40 中国标准时间 + * EEEE yyyy-MM-dd HH:mm:ss zzzz 星期五 2016-08-12 15:44:40 中国标准时间 + * yyyy-MM-dd HH:mm:ss.SSSZ 2016-08-12 15:44:40.461+0800 + * yyyy-MM-dd'T'HH:mm:ss.SSSZ 2016-08-12T15:44:40.461+0800 + * yyyy.MM.dd G 'at' HH:mm:ss z 2016.08.12 公元 at 15:44:40 CST + * K:mm a 3:44 下午 + * EEE, MMM d, ''yy 星期五, 八月 12, '16 + * hh 'o''clock' a, zzzz 03 o'clock 下午, 中国标准时间 + * yyyyy.MMMMM.dd GGG hh:mm aaa 02016.八月.12 公元 03:44 下午 + * EEE, d MMM yyyy HH:mm:ss Z 星期五, 12 八月 2016 15:44:40 +0800 + * yyMMddHHmmssZ 160812154440+0800 + * yyyy-MM-dd'T'HH:mm:ss.SSSZ 2016-08-12T15:44:40.461+0800 * EEEE 'DATE('yyyy-MM-dd')' 'TIME('HH:mm:ss')' zzzz 星期五 DATE(2016-08-12) TIME(15:44:40) 中国标准时间 - * */ public class DateUtil { @@ -55,6 +54,23 @@ public static String getSDFTime(String str, String format) { return sdf.format(new Date(strLong * 1000)); } + /** + * 默认时间格式：yyyy-MM-dd HH:mm:ss + * + * @param str + * @return + */ + public static String getSDFTime(String str) { + //判断时间戳是否为空 + if (str == null || str.isEmpty() || str.equals("null")) { + return ""; + } + String format = "yyyy-MM-dd HH:mm:ss"; + SimpleDateFormat sdf = new SimpleDateFormat(format, Locale.CHINA); + Long strLong = Long.valueOf(str); + return sdf.format(new Date(strLong * 1000)); + } + /** * 日期格式字符串转换成时间戳 * diff --git a/siberiadante/src/main/java/com/siberiadante/util/LogUtil.java b/siberiadante/src/main/java/com/siberiadante/util/LogUtil.java index 7aa6212..33ef61c 100644 --- a/siberiadante/src/main/java/com/siberiadante/util/LogUtil.java +++ b/siberiadante/src/main/java/com/siberiadante/util/LogUtil.java @@ -1,23 +1,16 @@ package com.siberiadante.util; -import android.os.Environment; -import android.text.TextUtils; import android.util.Log; -import com.siberiadante.SiberiaDanteLib; +import com.siberiadante.constants.AppInfo; import com.siberiadante.exception.SiberiaDanteLibException; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; - /** - * Created by SiberiaDante on 2017/5/15. + * @Created SiberiaDante + * @Describe： 日志打印工具类 + * @Time: 2017/8/7 + * @Email: 994537867@qq.com + * @GitHub: https://github.com/SiberiaDante */ public class LogUtil { @@ -25,217 +18,108 @@ public LogUtil() { new SiberiaDanteLibException(); } - /** - * 日志输出级别NONE - */ - public static final int LEVEL_NONE = 0; - /** - * 日志输出级别V - */ - public static final int LEVEL_VERBOSE = 1; - /** - * 日志输出级别D - */ - public static final int LEVEL_DEBUG = 2; - /** - * 日志输出级别I - */ - public static final int LEVEL_INFO = 3; - /** - * 日志输出级别W - */ - public static final int LEVEL_WARN = 4; - /** - * 日志输出级别E - */ - public static final int LEVEL_ERROR = 5; + public static final String TAG = "SiberiaDante"; + private static boolean isDebug = AppInfo.getInstance().isDebug(); - /** - * 日志输出时的TAG - */ - private static String mTag = "SiberiaDanteLib"; - /** - * 是否允许输出log - */ - private static int mDebuggable = 6; - /** - * 用于记时的变量 - */ - private static long mTimestamp = 0; - /** - * 写文件的锁对象 - */ - private static final Object mLogLock = new Object(); + public static void i(String msg) { + if (isDebug) + Log.i(TAG, msg); + } - /** - * 以级别为 v 的形式输出LOG - */ - public static void v(String msg) { - if (mDebuggable >= LEVEL_VERBOSE) { - Log.v(mTag, msg); - } + public static void i(String tag, String msg) { + if (isDebug) + Log.i(tag, msg); } - /** - * 以级别为 d 的形式输出LOG - */ + public static void d(String msg) { - if (mDebuggable >= LEVEL_DEBUG) { - Log.d(mTag, msg); - } + if (isDebug) + Log.d(TAG, msg); } - /** - * 以级别为 i 的形式输出LOG - */ - public static void i(String msg) { - if (mDebuggable >= LEVEL_INFO) { - Log.i(mTag, msg); - } + public static void d(String tag, String msg) { + if (isDebug) + Log.d(TAG, msg); } - /** - * 以级别为 w 的形式输出LOG - */ - public static void w(String msg) { - if (mDebuggable >= LEVEL_WARN) { - Log.w(mTag, msg); - } + public static void e(String msg) { + if (isDebug) + Log.e(TAG, msg); } - /** - * 以级别为 w 的形式输出Throwable - */ - public static void w(Throwable tr) { - if (mDebuggable >= LEVEL_WARN) { - Log.w(mTag, "", tr); - } + public static void e(String tag, String msg) { + if (isDebug) + Log.e(TAG, msg); } - /** - * 以级别为 w 的形式输出LOG信息和Throwable - */ - public static void w(String msg, Throwable tr) { - if (mDebuggable >= LEVEL_WARN && null != msg) { - Log.w(mTag, msg, tr); - } + public static void v(String msg) { + if (isDebug) + Log.v(TAG, msg); } - /** - * 以级别为 e 的形式输出LOG - */ - public static void e(String msg) { - if (mDebuggable >= LEVEL_ERROR) { - Log.e(mTag, msg); - } + public static void v(String tag, String msg) { + if (isDebug) + Log.v(TAG, msg); + } + + public static void w(String msg) { + if (isDebug) + Log.w(TAG, msg); + } + + public static void w(String tag, String msg) { + if (isDebug) + Log.w(TAG, msg); } /** - * 以级别为 e 的形式输出Throwable + * 带时间戳日志，级别i + * + * @param tag + * @param msg */ - public static void e(Throwable tr) { - if (mDebuggable >= LEVEL_ERROR) { - Log.e(mTag, "", tr); - } + public static void printTimeLogI(String tag, String msg) { + d(tag + "[" + DateUtil.getSDFTime(DateUtil.getTimeStamp()) + "]:" + msg); } /** - * 以级别为 e 的形式输出LOG信息和Throwable + * 带时间戳日志，级别d + * + * @param tag + * @param msg */ - public static void e(String msg, Throwable tr) { - if (mDebuggable >= LEVEL_ERROR && null != msg) { - Log.e(mTag, msg, tr); - } + public static void printTimeLogD(String tag, String msg) { + d(tag + "[" + DateUtil.getSDFTime(DateUtil.getTimeStamp()) + "]:" + msg); } /** - * 把Log存储到文件中 - * @param log 需要存储的日志 - * @param path 存储路径 + * 带时间戳日志，级别e + * + * @param tag + * @param msg */ -// public static void log2File(String log, String path) { -// log2File(log, path, true); -// } -// -// public static void log2File(String log, String path, boolean append) { -// synchronized (mLogLock) { -// FileUtils.writeFile(log + "\r\n", path, append); -// } -// } + public static void printTimeLogE(String tag, String msg) { + d(tag + "[" + DateUtil.getSDFTime(DateUtil.getTimeStamp()) + "]:" + msg); + } /** - * 以级别为 e 的形式输出msg信息,附带时间戳，用于输出一个时间段起始点 + * 带时间戳日志，级别v * - * @param msg 需要输出的msg + * @param tag + * @param msg */ - public static void msgStartTime(String msg) { - mTimestamp = System.currentTimeMillis(); - if (!TextUtils.isEmpty(msg)) { - e("[Started：" + mTimestamp + "]" + msg); - } + public static void printTimeLogV(String tag, String msg) { + d(tag + "[" + DateUtil.getSDFTime(DateUtil.getTimeStamp()) + "]:" + msg); } /** - * 以级别为 e 的形式输出msg信息,附带时间戳，用于输出一个时间段结束点* @param msg 需要输出的msg + * 带时间戳日志，级别w + * + * @param tag + * @param msg */ - public static void elapsed(String msg) { - long currentTime = System.currentTimeMillis(); - long elapsedTime = currentTime - mTimestamp; - mTimestamp = currentTime; - e("[Elapsed：" + elapsedTime + "]" + msg); - } - - public static void printList(List list) { - if (list == null || list.size() < 1) { - return; - } - int size = list.size(); - i("---begin---"); - for (int i = 0; i < size; i++) { - i(i + ":" + list.get(i).toString()); - } - i("---end---"); - } - - public static void printArray(T[] array) { - if (array == null || array.length < 1) { - return; - } - int length = array.length; - i("---begin---"); - for (int i = 0; i < length; i++) { - i(i + ":" + array[i].toString()); - } - i("---end---"); - } - - public static void eFile(String info) { - long timestamp = System.currentTimeMillis(); - DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss"); - String time = formatter.format(new Date()); - String fileName = SiberiaDanteLib.getContext().getPackageName() + "crash-" + time + "-" + timestamp + ".log"; - if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) { - String path = "/sdcard/crash/"; - File dir = new File(path); - if (!dir.exists()) { - dir.mkdirs(); - } - FileOutputStream fos = null; - try { - fos = new FileOutputStream(path + fileName); - } catch (FileNotFoundException e) { - e.printStackTrace(); - } - try { - fos.write(info.getBytes()); - } catch (IOException e) { - e.printStackTrace(); - } - try { - fos.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } + public static void printTimeLogW(String tag, String msg) { + d(tag + "[" + DateUtil.getSDFTime(DateUtil.getTimeStamp()) + "]:" + msg); } + } diff --git a/siberiadante/src/main/java/com/siberiadante/util/LogUtilBase.java b/siberiadante/src/main/java/com/siberiadante/util/LogUtilBase.java new file mode 100644 index 0000000..0689923 --- /dev/null +++ b/siberiadante/src/main/java/com/siberiadante/util/LogUtilBase.java @@ -0,0 +1,242 @@ +package com.siberiadante.util; + +import android.os.Environment; +import android.text.TextUtils; +import android.util.Log; + +import com.siberiadante.SiberiaDanteLib; +import com.siberiadante.exception.SiberiaDanteLibException; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; + +/** + * Created by SiberiaDante on 2017/5/15. + * 改方法将整理至LogUtil方法中，此类最终也将废弃，不予维护 + */ + +public class LogUtilBase { + public LogUtilBase() { + new SiberiaDanteLibException(); + } + + /** + * 日志输出级别NONE + */ + public static final int LEVEL_NONE = 0; + /** + * 日志输出级别V + */ + public static final int LEVEL_VERBOSE = 1; + /** + * 日志输出级别D + */ + public static final int LEVEL_DEBUG = 2; + /** + * 日志输出级别I + */ + public static final int LEVEL_INFO = 3; + /** + * 日志输出级别W + */ + public static final int LEVEL_WARN = 4; + /** + * 日志输出级别E + */ + public static final int LEVEL_ERROR = 5; + + /** + * 日志输出时的TAG + */ + private static String mTag = "SiberiaDanteLib"; + /** + * 是否允许输出log + */ + private static int mDebuggable = 6; + /** + * 用于记时的变量 + */ + private static long mTimestamp = 0; + /** + * 写文件的锁对象 + */ + private static final Object mLogLock = new Object(); + + /** + * 以级别为 v 的形式输出LOG + */ + public static void v(String msg) { + if (mDebuggable >= LEVEL_VERBOSE) { + Log.v(mTag, msg); + } + } + + /** + * 以级别为 d 的形式输出LOG + */ + public static void d(String msg) { + if (mDebuggable >= LEVEL_DEBUG) { + Log.d(mTag, msg); + } + } + + /** + * 以级别为 i 的形式输出LOG + */ + public static void i(String msg) { + if (mDebuggable >= LEVEL_INFO) { + Log.i(mTag, msg); + } + } + + /** + * 以级别为 w 的形式输出LOG + */ + public static void w(String msg) { + if (mDebuggable >= LEVEL_WARN) { + Log.w(mTag, msg); + } + } + + /** + * 以级别为 w 的形式输出Throwable + */ + public static void w(Throwable tr) { + if (mDebuggable >= LEVEL_WARN) { + Log.w(mTag, "", tr); + } + } + + /** + * 以级别为 w 的形式输出LOG信息和Throwable + */ + public static void w(String msg, Throwable tr) { + if (mDebuggable >= LEVEL_WARN && null != msg) { + Log.w(mTag, msg, tr); + } + } + + /** + * 以级别为 e 的形式输出LOG + */ + public static void e(String msg) { + if (mDebuggable >= LEVEL_ERROR) { + Log.e(mTag, msg); + } + } + + /** + * 以级别为 e 的形式输出Throwable + */ + public static void e(Throwable tr) { + if (mDebuggable >= LEVEL_ERROR) { + Log.e(mTag, "", tr); + } + } + + /** + * 以级别为 e 的形式输出LOG信息和Throwable + */ + public static void e(String msg, Throwable tr) { + if (mDebuggable >= LEVEL_ERROR && null != msg) { + Log.e(mTag, msg, tr); + } + } + + /** + * 把Log存储到文件中 + * @param log 需要存储的日志 + * @param path 存储路径 + */ +// public static void log2File(String log, String path) { +// log2File(log, path, true); +// } +// +// public static void log2File(String log, String path, boolean append) { +// synchronized (mLogLock) { +// FileUtils.writeFile(log + "\r\n", path, append); +// } +// } + + /** + * 以级别为 e 的形式输出msg信息,附带时间戳，用于输出一个时间段起始点 + * + * @param msg 需要输出的msg + */ + public static void msgStartTime(String msg) { + mTimestamp = System.currentTimeMillis(); + if (!TextUtils.isEmpty(msg)) { + e("[Started：" + mTimestamp + "]" + msg); + } + } + + /** + * 以级别为 e 的形式输出msg信息,附带时间戳，用于输出一个时间段结束点* @param msg 需要输出的msg + */ + public static void elapsed(String msg) { + long currentTime = System.currentTimeMillis(); + long elapsedTime = currentTime - mTimestamp; + mTimestamp = currentTime; + e("[Elapsed：" + elapsedTime + "]" + msg); + } + + public static void printList(List list) { + if (list == null || list.size() < 1) { + return; + } + int size = list.size(); + i("---begin---"); + for (int i = 0; i < size; i++) { + i(i + ":" + list.get(i).toString()); + } + i("---end---"); + } + + public static void printArray(T[] array) { + if (array == null || array.length < 1) { + return; + } + int length = array.length; + i("---begin---"); + for (int i = 0; i < length; i++) { + i(i + ":" + array[i].toString()); + } + i("---end---"); + } + + public static void eFile(String info) { + long timestamp = System.currentTimeMillis(); + DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss"); + String time = formatter.format(new Date()); + String fileName = SiberiaDanteLib.getContext().getPackageName() + "crash-" + time + "-" + timestamp + ".log"; + if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) { + String path = "/sdcard/crash/"; + File dir = new File(path); + if (!dir.exists()) { + dir.mkdirs(); + } + FileOutputStream fos = null; + try { + fos = new FileOutputStream(path + fileName); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } + try { + fos.write(info.getBytes()); + } catch (IOException e) { + e.printStackTrace(); + } + try { + fos.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } +} diff --git a/siberiadante/src/main/java/com/siberiadante/util/SPUtil.java b/siberiadante/src/main/java/com/siberiadante/util/SPUtil.java new file mode 100644 index 0000000..5bd3c89 --- /dev/null +++ b/siberiadante/src/main/java/com/siberiadante/util/SPUtil.java @@ -0,0 +1,257 @@ +package com.siberiadante.util; + +import android.content.Context; +import android.content.SharedPreferences; +import android.support.annotation.Nullable; + +import com.siberiadante.SiberiaDanteLib; + +import java.util.Map; +import java.util.Set; + +/** + * @Created SiberiaDante + * @Describe： + * @Time: 2017/8/3 + * @Email: 994537867@qq.com + * @GitHub: https://github.com/SiberiaDante + */ + +public final class SPUtil { + + private SharedPreferences sp; + private SharedPreferences.Editor editor; + + /** + * SPUtils构造函数 + *

在Application或使用的类中初始化

+ * + * @param spName spName + */ + public SPUtil(String spName) { + sp = SiberiaDanteLib.getContext().getSharedPreferences(spName, Context.MODE_PRIVATE); + editor = sp.edit(); + editor.apply(); + } + + /** + * SP中写入String类型value + * + * @param key 键 + * @param value 值 + */ + public void put(String key, @Nullable String value) { + editor.putString(key, value).apply(); + } + + /** + * SP中读取String + * + * @param key 键 + * @return 存在返回对应值，不存在返回默认值{@code null} + */ + public String getString(String key) { + return getString(key, null); + } + + /** + * SP中读取String + * + * @param key 键 + * @param defaultValue 默认值 + * @return 存在返回对应值，不存在返回默认值{@code defaultValue} + */ + public String getString(String key, String defaultValue) { + return sp.getString(key, defaultValue); + } + + /** + * SP中写入int类型value + * + * @param key 键 + * @param value 值 + */ + public void put(String key, int value) { + editor.putInt(key, value).apply(); + } + + /** + * SP中读取int + * + * @param key 键 + * @return 存在返回对应值，不存在返回默认值-1 + */ + public int getInt(String key) { + return getInt(key, -1); + } + + /** + * SP中读取int + * + * @param key 键 + * @param defaultValue 默认值 + * @return 存在返回对应值，不存在返回默认值{@code defaultValue} + */ + public int getInt(String key, int defaultValue) { + return sp.getInt(key, defaultValue); + } + + /** + * SP中写入long类型value + * + * @param key 键 + * @param value 值 + */ + public void put(String key, long value) { + editor.putLong(key, value).apply(); + } + + /** + * SP中读取long + * + * @param key 键 + * @return 存在返回对应值，不存在返回默认值-1 + */ + public long getLong(String key) { + return getLong(key, -1L); + } + + /** + * SP中读取long + * + * @param key 键 + * @param defaultValue 默认值 + * @return 存在返回对应值，不存在返回默认值{@code defaultValue} + */ + public long getLong(String key, long defaultValue) { + return sp.getLong(key, defaultValue); + } + + /** + * SP中写入float类型value + * + * @param key 键 + * @param value 值 + */ + public void put(String key, float value) { + editor.putFloat(key, value).apply(); + } + + /** + * SP中读取float + * + * @param key 键 + * @return 存在返回对应值，不存在返回默认值-1 + */ + public float getFloat(String key) { + return getFloat(key, -1f); + } + + /** + * SP中读取float + * + * @param key 键 + * @param defaultValue 默认值 + * @return 存在返回对应值，不存在返回默认值{@code defaultValue} + */ + public float getFloat(String key, float defaultValue) { + return sp.getFloat(key, defaultValue); + } + + /** + * SP中写入boolean类型value + * + * @param key 键 + * @param value 值 + */ + public void put(String key, boolean value) { + editor.putBoolean(key, value).apply(); + } + + /** + * SP中读取boolean + * + * @param key 键 + * @return 存在返回对应值，不存在返回默认值{@code false} + */ + public boolean getBoolean(String key) { + return getBoolean(key, false); + } + + /** + * SP中读取boolean + * + * @param key 键 + * @param defaultValue 默认值 + * @return 存在返回对应值，不存在返回默认值{@code defaultValue} + */ + public boolean getBoolean(String key, boolean defaultValue) { + return sp.getBoolean(key, defaultValue); + } + + /** + * SP中写入String集合类型value + * + * @param key 键 + * @param values 值 + */ + public void put(String key, @Nullable Set values) { + editor.putStringSet(key, values).apply(); + } + + /** + * SP中读取StringSet + * + * @param key 键 + * @return 存在返回对应值，不存在返回默认值{@code null} + */ + public Set getStringSet(String key) { + return getStringSet(key, null); + } + + /** + * SP中读取StringSet + * + * @param key 键 + * @param defaultValue 默认值 + * @return 存在返回对应值，不存在返回默认值{@code defaultValue} + */ + public Set getStringSet(String key, @Nullable Set defaultValue) { + return sp.getStringSet(key, defaultValue); + } + + /** + * SP中获取所有键值对 + * + * @return Map对象 + */ + public Map getAll() { + return sp.getAll(); + } + + /** + * SP中移除该key + * + * @param key 键 + */ + public void remove(String key) { + editor.remove(key).apply(); + } + + /** + * SP中是否存在该key + * + * @param key 键 + * @return {@code true}: 存在
{@code false}: 不存在 + */ + public boolean contains(String key) { + return sp.contains(key); + } + + /** + * SP中清除所有数据 + */ + public void clear() { + editor.clear().apply(); + } +} diff --git a/siberiadante/src/main/java/com/siberiadante/view/TitleBarMin.java b/siberiadante/src/main/java/com/siberiadante/view/TitleBarMin.java index 590e8c7..7f4518d 100644 --- a/siberiadante/src/main/java/com/siberiadante/view/TitleBarMin.java +++ b/siberiadante/src/main/java/com/siberiadante/view/TitleBarMin.java @@ -16,7 +16,7 @@ /** * @Created SiberiaDante - * @Describe： + * @Describe： 该类中的部分代码已移植到TitleBar中，此类最终也将废弃，不予维护 * @Time: 2017/6/30 * @Email: 994537867@qq.com * @GitHub: https://github.com/SiberiaDante