From 253696516632efa8a3aaad9e0469909c46655606 Mon Sep 17 00:00:00 2001 From: joyo Date: Wed, 22 Aug 2018 10:12:51 +0800 Subject: [PATCH 01/19] Update README.md --- README.md | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/README.md b/README.md index b759026..04c7ea8 100644 --- a/README.md +++ b/README.md @@ -2,35 +2,3 @@ superCleanMaster is deprecated Thanks for all your support! -一键清理 开源版，包括内存加速，缓存清理，自启管理，软件管理等。
- -## 说明 - -## 基本功能 -* 内存加速 -* 缓存清理 -* 自启管理 -* 软件管理 -* 设备信息
-##应用截图 -
- -![](https://github.com/joyoyao/superCleanMaster/blob/master/screenshot/home.jpg) - -![](https://github.com/joyoyao/superCleanMaster/blob/master/screenshot/1.jpg) - -![](https://github.com/joyoyao/superCleanMaster/blob/master/screenshot/2.jpg) - -![](https://github.com/joyoyao/superCleanMaster/blob/master/screenshot/3.jpg) - -##Open source projects -* [ButterKnife](http://jakewharton.github.io/butterknife/) -* [changelog](https://github.com/gabrielemariotti/changeloglib) -* [smoothprogressbar](https://github.com/castorflex/SmoothProgressBar) -* [ListViewAnimations](https://github.com/nhaarman/ListViewAnimations) -* [LDrawer](https://github.com/ikimuhendis/LDrawer) -* [CircleProgress](https://github.com/lzyzsd/CircleProgress) -* [TextCounter](https://github.com/premnirmal/TextCounter) -* [WaveView](https://github.com/john990/WaveView) -* [QuickReturn](https://github.com/lawloretienne/QuickReturn) - From 0b4452da97c8ec81a8d796b6725b7285d5fe4778 Mon Sep 17 00:00:00 2001 From: dzuba Date: Sun, 9 Sep 2018 16:16:41 +0300 Subject: [PATCH 02/19] gradle build fix --- .idea/misc.xml | 31 ++++- app/app.iml | 140 ++++++++++++++--------- app/build.gradle | 4 +- build.gradle | 3 +- gradle/wrapper/gradle-wrapper.properties | 4 +- library/build.gradle | 2 +- library/library.iml | 91 +++++++++------ superCleanMaster.iml | 10 +- 8 files changed, 180 insertions(+), 105 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 7d2fd3b..b23f1ee 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,29 @@ - - + + + @@ -19,8 +41,7 @@ - + - - + \ No newline at end of file diff --git a/app/app.iml b/app/app.iml index 44beb51..92434be 100644 --- a/app/app.iml +++ b/app/app.iml @@ -1,5 +1,5 @@ - + @@ -11,9 +11,9 @@ - + + + - - - - - - - + + + + + + + + + - + + + + + + + + + + + + + + + - + + + + + + + + - + - + + + + - - - - - - - - + + + + + + + + - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 7ae8b1a..ac76ed1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.android.application' - +android.defaultConfig.javaCompileOptions.annotationProcessorOptions.includeCompileClasspath = true android { compileSdkVersion 21 - buildToolsVersion "21.1.2" + buildToolsVersion '27.0.3' defaultConfig { applicationId "com.yzy.supercleanmaster" diff --git a/build.gradle b/build.gradle index f9a8e3c..74898df 100644 --- a/build.gradle +++ b/build.gradle @@ -4,9 +4,10 @@ buildscript { repositories { maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:1.0.0' + classpath 'com.android.tools.build:gradle:3.1.4' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0c71e76..100cf9d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 10 15:27:10 PDT 2013 +#Sun Sep 09 15:31:16 MSK 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/library/build.gradle b/library/build.gradle index 108f065..3b8357e 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -6,7 +6,7 @@ android { } } compileSdkVersion 21 - buildToolsVersion "21.1.1" + buildToolsVersion '27.0.3' defaultConfig { minSdkVersion 14 targetSdkVersion 21 diff --git a/library/library.iml b/library/library.iml index a0e1bfd..0d33ad1 100644 --- a/library/library.iml +++ b/library/library.iml @@ -1,5 +1,5 @@ - + @@ -11,82 +11,105 @@ - + + + - - - - - - - + + + + + + + + + - + + + + + + + + + + + + + + + - + + + + + + + + - - - + + + - - - - - - - - + + + + - - - + + + + + + - - - + + + - - + \ No newline at end of file diff --git a/superCleanMaster.iml b/superCleanMaster.iml index 2a02201..9308729 100644 --- a/superCleanMaster.iml +++ b/superCleanMaster.iml @@ -1,15 +1,14 @@ - + - - - + @@ -17,5 +16,4 @@ - - + \ No newline at end of file From cd914aa0b254d08d014637025221c5b030497a61 Mon Sep 17 00:00:00 2001 From: dzuba Date: Tue, 11 Sep 2018 22:02:15 +0300 Subject: [PATCH 03/19] gradle build fix --- app/app.iml | 19 ++--- app/build.gradle | 37 +++++---- .../fragment/MainFragment.java | 10 ++- .../fragment/NavigationDrawerFragment.java | 4 +- .../yzy/supercleanmaster/ui/MainActivity.java | 1 - app/src/main/res/layout/about.xml | 35 +------- .../res/layout/activity_rublish_clean.xml | 12 +-- app/src/main/res/layout/activity_splish.xml | 22 ++--- .../main/res/layout/fragment_auto_start.xml | 2 +- app/src/main/res/layout/fragment_main.xml | 66 ++++++++------- .../res/layout/fragment_navigation_drawer.xml | 32 +------ app/src/main/res/layout/fragment_software.xml | 2 +- app/src/main/res/layout/include_main_card.xml | 83 +++++++++---------- .../main/res/layout/listview_auto_start.xml | 2 +- app/src/main/res/layout/listview_software.xml | 4 +- app/src/main/res/layout/tb_munion_adview.xml | 2 +- .../umeng_bak_platform_selector_dialog.xml | 2 +- .../res/layout/umeng_socialize_at_view.xml | 2 +- .../umeng_socialize_bind_select_dialog.xml | 16 ++-- .../umeng_socialize_failed_load_page.xml | 2 +- .../layout/umeng_socialize_oauth_dialog.xml | 2 +- .../umeng_socialize_shareboard_item.xml | 2 +- app/src/main/res/raw/changelog.xml | 4 +- app/src/main/res/values/strings.xml | 51 ++++++------ .../main/res/values/umeng_common_strings.xml | 28 +++---- .../umeng_socialize_laiwang_strings.xml | 4 +- .../res/values/umeng_socialize_strings.xml | 4 +- .../main/res/values/umeng_update_string.xml | 28 +++---- app/src/main/res/xml/ui_settings.xml | 6 +- build.gradle | 4 +- library/build.gradle | 5 +- library/library.iml | 1 - 32 files changed, 216 insertions(+), 278 deletions(-) diff --git a/app/app.iml b/app/app.iml index 92434be..37683da 100644 --- a/app/app.iml +++ b/app/app.iml @@ -117,29 +117,28 @@ + + + + + + + + - - - - - - - - - - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index ac76ed1..1127410 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,22 +20,23 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:21.0.3' - compile 'com.jakewharton:butterknife:6.0.0' - compile 'com.nhaarman.listviewanimations:lib-core:3.1.0@aar' - compile 'com.nhaarman.listviewanimations:lib-manipulation:3.1.0@aar' - compile 'com.nhaarman.listviewanimations:lib-core-slh:3.1.0@aar' - compile 'com.umeng.analytics:analytics:latest.integration' - compile 'com.github.gabrielemariotti.changeloglib:library:1.5.2' - compile 'com.hannesdorfmann.smoothprogressbar:library:1.0.0' - compile 'com.github.castorflex.smoothprogressbar:library-circular:1.0.0' - compile project(':library') - compile files('libs/nineoldandroids-2.4.0.jar') - compile files('libs/umeng-update-v2.5.0.jar') - compile files('libs/httpmime-4.1.3.jar') - compile files('libs/umeng_social_sdk.jar') - compile files('libs/SocialSDK_laiwang_1.jar') - compile files('libs/SocialSDK_laiwang_2.jar') - compile files('libs/SocialSDK_QQZone_1.jar') + implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation 'com.android.support:appcompat-v7:21.0.3' + implementation 'com.jakewharton:butterknife:6.0.0' + implementation 'com.nhaarman.listviewanimations:lib-core:3.1.0@aar' + implementation 'com.nhaarman.listviewanimations:lib-manipulation:3.1.0@aar' + implementation 'com.nhaarman.listviewanimations:lib-core-slh:3.1.0@aar' + implementation 'com.umeng.analytics:analytics:latest.integration' + implementation 'com.github.gabrielemariotti.changeloglib:library:1.5.2' + implementation 'com.hannesdorfmann.smoothprogressbar:library:1.0.0' + implementation 'com.github.castorflex.smoothprogressbar:library-circular:1.0.0' + implementation project(':library') + implementation files('libs/nineoldandroids-2.4.0.jar') + implementation files('libs/umeng-update-v2.5.0.jar') + implementation files('libs/httpmime-4.1.3.jar') + implementation files('libs/umeng_social_sdk.jar') + implementation files('libs/SocialSDK_laiwang_1.jar') + implementation files('libs/SocialSDK_laiwang_2.jar') + implementation files('libs/SocialSDK_QQZone_1.jar') + implementation 'com.android.support:support-v4:21.0.3' } diff --git a/app/src/main/java/com/yzy/supercleanmaster/fragment/MainFragment.java b/app/src/main/java/com/yzy/supercleanmaster/fragment/MainFragment.java index 6d9697b..1f76178 100644 --- a/app/src/main/java/com/yzy/supercleanmaster/fragment/MainFragment.java +++ b/app/src/main/java/com/yzy/supercleanmaster/fragment/MainFragment.java @@ -6,7 +6,9 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.Button; import android.widget.TextView; +import android.widget.Toast; import com.umeng.update.UmengUpdateAgent; import com.yzy.supercleanmaster.R; @@ -42,6 +44,7 @@ public class MainFragment extends BaseFragment { private Timer timer; private Timer timer2; + Button CleanRubbish; @Override @@ -50,6 +53,8 @@ public View onCreateView(LayoutInflater inflater, // TODO Auto-generated method stub View view = inflater.inflate(R.layout.fragment_main, container, false); + + ButterKnife.inject(this, view); mContext = getActivity(); @@ -155,10 +160,7 @@ void rubbishClean() { } - @OnClick(R.id.card3) - void AutoStartManage() { - startActivity(AutoStartManageActivity.class); - } + @OnClick(R.id.card4) void SoftwareManage() { diff --git a/app/src/main/java/com/yzy/supercleanmaster/fragment/NavigationDrawerFragment.java b/app/src/main/java/com/yzy/supercleanmaster/fragment/NavigationDrawerFragment.java index ec86329..de94b63 100644 --- a/app/src/main/java/com/yzy/supercleanmaster/fragment/NavigationDrawerFragment.java +++ b/app/src/main/java/com/yzy/supercleanmaster/fragment/NavigationDrawerFragment.java @@ -25,8 +25,8 @@ public class NavigationDrawerFragment extends BaseFragment { private NavigationDrawerCallbacks mCallbacks; final int radioIds[] = { R.id.radio0, - R.id.radio1, - R.id.radio2 + //R.id.radio1, + // R.id.radio2 }; RadioButton radios[] = new RadioButton[radioIds.length]; diff --git a/app/src/main/java/com/yzy/supercleanmaster/ui/MainActivity.java b/app/src/main/java/com/yzy/supercleanmaster/ui/MainActivity.java index ca60a8b..1365649 100644 --- a/app/src/main/java/com/yzy/supercleanmaster/ui/MainActivity.java +++ b/app/src/main/java/com/yzy/supercleanmaster/ui/MainActivity.java @@ -42,7 +42,6 @@ public class MainActivity extends BaseActivity implements NavigationDrawerFragme ActionBar ab; private CharSequence mTitle; - private ActionBarDrawerToggle mDrawerToggle; private DrawerArrowDrawable drawerArrow; private boolean drawerArrowColor; diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml index 11dd8ef..7e467c0 100644 --- a/app/src/main/res/layout/about.xml +++ b/app/src/main/res/layout/about.xml @@ -72,7 +72,7 @@ android:layout_centerHorizontal="true" android:layout_marginTop="3.0dip" android:includeFontPadding="false" - android:text="V1.05" /> + android:text="V1.00" /> @@ -141,35 +141,6 @@ android:focusable="true" android:orientation="horizontal"> - - - @@ -98,14 +98,14 @@