Skip to content

Commit 484ab54

Browse files
DziubaVLaDDziubaVLaD
committed
gradle build fix
1 parent be40fd6 commit 484ab54

File tree

8 files changed

+131
-60
lines changed

8 files changed

+131
-60
lines changed

‎app/app.iml

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -113,32 +113,42 @@
113113
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
114114
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
115115
</content>
116-
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
116+
<orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
117117
<orderEntry type="sourceFolder" forTests="false" />
118118
<orderEntry type="library" name="Gradle: com.github.gabrielemariotti.changeloglib:library-1.5.2" level="project" />
119119
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/SocialSDK_QQZone_1.jar:unspecified@jar" level="project" />
120-
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/SocialSDK_laiwang_1.jar:unspecified@jar" level="project" />
121-
<orderEntry type="library" name="Gradle: com.nhaarman.listviewanimations:lib-manipulation-3.1.0" level="project" />
122120
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/umeng_social_sdk.jar:unspecified@jar" level="project" />
123-
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/SocialSDK_WeiXin_1.jar:unspecified@jar" level="project" />
124-
<orderEntry type="library" name="Gradle: com.nhaarman.listviewanimations:lib-core-slh-3.1.0" level="project" />
125-
<orderEntry type="library" name="Gradle: com.github.castorflex.smoothprogressbar:library-circular-1.0.0" level="project" />
126-
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:21.0.3@jar" level="project" />
127121
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/SocialSDK_Sina.jar:unspecified@jar" level="project" />
122+
<orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-27.0.0" level="project" />
128123
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/SocialSDK_laiwang_2.jar:unspecified@jar" level="project" />
129124
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/SocialSDK_WeiXin_2.jar:unspecified@jar" level="project" />
125+
<orderEntry type="library" name="Gradle: com.android.support:support-compat-27.0.0" level="project" />
126+
<orderEntry type="library" name="Gradle: com.android.support:support-v4-27.0.0" level="project" />
127+
<orderEntry type="library" name="Gradle: android.arch.core:common:1.0.0@jar" level="project" />
130128
<orderEntry type="library" name="Gradle: com.umeng.analytics:analytics:6.1.4@jar" level="project" />
131-
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/nineoldandroids-2.4.0.jar:unspecified@jar" level="project" />
132129
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/httpmime-4.1.3.jar:unspecified@jar" level="project" />
133-
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-21.0.3" level="project" />
134-
<orderEntry type="library" name="Gradle: com.android.support:support-v4-21.0.3" level="project" />
135-
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/SocialSDK_sms.jar:unspecified@jar" level="project" />
130+
<orderEntry type="library" name="Gradle: com.android.support:support-media-compat-27.0.0" level="project" />
131+
<orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-27.0.0" level="project" />
136132
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/umeng-update-v2.5.0.jar:unspecified@jar" level="project" />
137133
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/SocialSDK_QQZone_2.jar:unspecified@jar" level="project" />
134+
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils-27.0.0" level="project" />
135+
<orderEntry type="library" name="Gradle: com.android.support:support-core-ui-27.0.0" level="project" />
136+
<orderEntry type="library" name="Gradle: com.nhaarman.listviewanimations:lib-core-3.1.0" level="project" />
137+
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-27.0.0" level="project" />
138+
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/SocialSDK_laiwang_1.jar:unspecified@jar" level="project" />
139+
<orderEntry type="library" name="Gradle: com.nhaarman.listviewanimations:lib-manipulation-3.1.0" level="project" />
140+
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/SocialSDK_WeiXin_1.jar:unspecified@jar" level="project" />
141+
<orderEntry type="library" name="Gradle: com.nhaarman.listviewanimations:lib-core-slh-3.1.0" level="project" />
142+
<orderEntry type="library" name="Gradle: com.android.support:support-fragment-27.0.0" level="project" />
143+
<orderEntry type="library" name="Gradle: com.github.castorflex.smoothprogressbar:library-circular-1.0.0" level="project" />
144+
<orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.0.0@jar" level="project" />
145+
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/nineoldandroids-2.4.0.jar:unspecified@jar" level="project" />
146+
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:27.0.0@jar" level="project" />
147+
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/SocialSDK_sms.jar:unspecified@jar" level="project" />
138148
<orderEntry type="library" name="Gradle: com.hannesdorfmann.smoothprogressbar:library-1.0.0" level="project" />
139149
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/SocialSDK_QQZone_3.jar:unspecified@jar" level="project" />
140150
<orderEntry type="library" name="Gradle: com.jakewharton:butterknife:6.0.0@jar" level="project" />
141-
<orderEntry type="library" name="Gradle: com.nhaarman.listviewanimations:lib-core-3.1.0" level="project" />
151+
<orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.0.0" level="project" />
142152
<orderEntry type="module" module-name="library" />
143153
</component>
144154
</module>

‎app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apply plugin: 'com.android.application'
22
android.defaultConfig.javaCompileOptions.annotationProcessorOptions.includeCompileClasspath = true
33
android {
4-
compileSdkVersion 21
4+
compileSdkVersion 27
55
buildToolsVersion '27.0.3'
66

77
defaultConfig {
88
applicationId "com.yzy.supercleanmaster"
99
minSdkVersion 14
10-
targetSdkVersion 21
10+
targetSdkVersion 27
1111
versionCode 3
1212
versionName "1.0"
1313
}
@@ -21,7 +21,7 @@ android {
2121

2222
dependencies {
2323
implementation fileTree(include: ['*.jar'], dir: 'libs')
24-
implementation 'com.android.support:appcompat-v7:21.0.3'
24+
implementation 'com.android.support:appcompat-v7:27.0.0'
2525
implementation 'com.jakewharton:butterknife:6.0.0'
2626
implementation 'com.nhaarman.listviewanimations:lib-core:3.1.0@aar'
2727
implementation 'com.nhaarman.listviewanimations:lib-manipulation:3.1.0@aar'
@@ -38,5 +38,5 @@ dependencies {
3838
implementation files('libs/SocialSDK_laiwang_1.jar')
3939
implementation files('libs/SocialSDK_laiwang_2.jar')
4040
implementation files('libs/SocialSDK_QQZone_1.jar')
41-
implementation 'com.android.support:support-v4:21.0.3'
41+
implementation 'com.android.support:support-v4:27.0.0'
4242
}

‎app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
1010
<uses-permission android:name="android.permission.GET_PACKAGE_SIZE" />
1111
<uses-permission android:name="android.permission.CLEAR_APP_CACHE" />
12+
<uses-permission android:name="android.permission.DELETE_CACHE_FILES" />
1213
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
1314
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
1415
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />

‎app/src/main/java/com/yzy/supercleanmaster/fragment/MainFragment.java

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.yzy.supercleanmaster.ui.BatterySavingActivity;
2222
import com.yzy.supercleanmaster.ui.MemoryCleanActivity;
2323
import com.yzy.supercleanmaster.ui.RubbishCleanActivity;
24+
import com.yzy.supercleanmaster.ui.ShortCutActivity;
2425
import com.yzy.supercleanmaster.ui.SoftwareManageActivity;
2526
import com.yzy.supercleanmaster.utils.AppUtil;
2627
import com.yzy.supercleanmaster.utils.StorageUtil;
@@ -166,40 +167,28 @@ void rubbishClean() {
166167

167168
@OnClick(R.id.card3)
168169
void batterySaving() {
169-
List<ApplicationInfo> packages;
170-
PackageManager pm;
171-
pm = getPackageManager();
172-
//get a list of installed apps.
173-
packages = pm.getInstalledApplications(0);
174-
175-
ActivityManager mActivityManager = (ActivityManager)context.getSystemService(Context.ACTIVITY_SERVICE);
176-
177-
for (ApplicationInfo packageInfo : packages) {
178-
if((packageInfo.flags & ApplicationInfo.FLAG_SYSTEM)==1)continue;
179-
if(packageInfo.packageName.equals("mypackage")) continue;
180-
mActivityManager.killBackgroundProcesses(packageInfo.packageName);
181-
}
182-
//startActivity(BatterySavingActivity.class);
170+
// List<ApplicationInfo> packages;
171+
// PackageManager pm;
172+
// pm = getPackageManager();
173+
// //get a list of installed apps.
174+
// packages = pm.getInstalledApplications(0);
175+
176+
// ActivityManager mActivityManager = (ActivityManager)context.getSystemService(Context.ACTIVITY_SERVICE);
177+
178+
// for (ApplicationInfo packageInfo : packages) {
179+
// if((packageInfo.flags & ApplicationInfo.FLAG_SYSTEM)==1)continue;
180+
// if(packageInfo.packageName.equals("mypackage")) continue;
181+
// mActivityManager.killBackgroundProcesses(packageInfo.packageName);
182+
// }
183+
// startActivity(ShortCutActivity.class);
183184
}
184185

185186

186187
@OnClick(R.id.card4)
187188
void SoftwareManage() {
188189
startActivity(SoftwareManageActivity.class);
189190
}
190-
List<ApplicationInfo> packages;
191-
PackageManager pm;
192-
pm = getPackageManager();
193-
//get a list of installed apps.
194-
packages = pm.getInstalledApplications(0);
195-
196-
ActivityManager mActivityManager = (ActivityManager)context.getSystemService(Context.ACTIVITY_SERVICE);
197-
198-
for (ApplicationInfo packageInfo : packages) {
199-
if((packageInfo.flags & ApplicationInfo.FLAG_SYSTEM)==1)continue;
200-
if(packageInfo.packageName.equals("mypackage")) continue;
201-
mActivityManager.killBackgroundProcesses(packageInfo.packageName);
202-
}
191+
203192
@Override
204193
public void onDestroyView() {
205194
super.onDestroyView();

‎app/src/main/java/com/yzy/supercleanmaster/ui/BatterySavingActivity.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@
1010

1111
public class BatterySavingActivity {
1212

13-
List<ApplicationInfo> packages;
14-
PackageManager pm;
15-
pm = getPackageManager();
16-
//get a list of installed apps.
17-
packages = pm.getInstalledApplications(0);
18-
19-
ActivityManager mActivityManager = (ActivityManager)context.getSystemService(Context.ACTIVITY_SERVICE);
20-
21-
for (ApplicationInfo packageInfo : packages) {
22-
if((packageInfo.flags & ApplicationInfo.FLAG_SYSTEM)==1)continue;
23-
if(packageInfo.packageName.equals("mypackage")) continue;
24-
mActivityManager.killBackgroundProcesses(packageInfo.packageName);
25-
}
13+
// List<ApplicationInfo> packages;
14+
// PackageManager pm;
15+
// pm = getPackageManager();
16+
// //get a list of installed apps.
17+
// packages = pm.getInstalledApplications(0);
18+
19+
// ActivityManager mActivityManager = (ActivityManager)context.getSystemService(Context.ACTIVITY_SERVICE);
20+
21+
//for (ApplicationInfo packageInfo : packages) {
22+
// if((packageInfo.flags & ApplicationInfo.FLAG_SYSTEM)==1)continue;
23+
// if(packageInfo.packageName.equals("mypackage")) continue;
24+
// mActivityManager.killBackgroundProcesses(packageInfo.packageName);
25+
// }
2626

2727
// ActivityManager actvityManager = (ActivityManager)
2828
// getApplicationContext().getSystemService( getApplicationContext().ACTIVITY_SERVICE );

‎app/src/main/java/com/yzy/supercleanmaster/ui/RubbishCleanActivity.java

Lines changed: 68 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
package com.yzy.supercleanmaster.ui;
22

3+
import android.Manifest;
34
import android.annotation.TargetApi;
45
import android.app.ActionBar;
56
import android.content.ComponentName;
67
import android.content.Context;
78
import android.content.Intent;
89
import android.content.ServiceConnection;
10+
import android.content.pm.PackageManager;
911
import android.content.res.Resources;
1012
import android.os.Build;
1113
import android.os.Bundle;
1214
import android.os.IBinder;
1315
import android.support.annotation.NonNull;
16+
import android.support.v4.app.ActivityCompat;
17+
import android.support.v4.content.ContextCompat;
1418
import android.text.format.Formatter;
1519
import android.view.MenuItem;
1620
import android.view.View;
@@ -121,7 +125,7 @@ public void onServiceDisconnected(ComponentName name) {
121125

122126

123127
@Override
124-
protected void onCreate(Bundle savedInstanceState) {
128+
protected void onCreate(Bundle savedInstanceState) {
125129
super.onCreate(savedInstanceState);
126130
setContentView(R.layout.activity_rublish_clean);
127131
getActionBar().setDisplayHomeAsUpEnabled(true);
@@ -141,6 +145,8 @@ protected void onCreate(Bundle savedInstanceState) {
141145
mListView.setOnScrollListener(new QuickReturnListViewOnScrollListener(QuickReturnType.FOOTER, null, 0, bottom_lin, footerHeight));
142146
bindService(new Intent(mContext, CleanerService.class),
143147
mServiceConnection, Context.BIND_AUTO_CREATE);
148+
// for android 6.0+
149+
144150
}
145151

146152
@Override
@@ -158,6 +164,35 @@ public void onDismiss(@NonNull ViewGroup viewGroup, @NonNull int[] ints) {
158164

159165
}
160166

167+
public void onRequestPermissionsResult(int requestCode,
168+
String permissions[], int[] grantResults) {
169+
switch (requestCode) {
170+
case 1: {
171+
// If request is cancelled, the result arrays are empty.
172+
if (grantResults.length > 0
173+
&& grantResults[0] == PackageManager.PERMISSION_GRANTED) {
174+
175+
// permission was granted, yay! Do the
176+
177+
// contacts-related task you need to do.
178+
179+
180+
} else {
181+
182+
// permission denied, boo! Disable the
183+
// functionality that depends on this permission.
184+
185+
Toast.makeText(mContext,"You need to accept the permission",Toast.LENGTH_SHORT).show();
186+
}
187+
return;
188+
}
189+
190+
// other 'case' lines to check for other
191+
// permissions this app might request
192+
}
193+
}
194+
195+
161196
@Override
162197
public void onScanStarted(Context context) {
163198
mProgressBarText.setText(R.string.scanning);
@@ -256,6 +291,38 @@ private void applyKitKatTranslucency() {
256291

257292
@OnClick(R.id.clear_button)
258293
public void onClickClear() {
294+
if (ActivityCompat.checkSelfPermission(mContext, Manifest.permission.CLEAR_APP_CACHE) != PackageManager.PERMISSION_GRANTED) {
295+
// TODO: Consider calling
296+
// ActivityCompat#requestPermissions
297+
// here to request the missing permissions, and then overriding
298+
// public void onRequestPermissionsResult(int requestCode, String[] permissions,
299+
// int[] grantResults)
300+
// to handle the case where the user grants the permission. See the documentation
301+
// for ActivityCompat#requestPermissions for more details.
302+
if (ActivityCompat.shouldShowRequestPermissionRationale( this,
303+
Manifest.permission.CLEAR_APP_CACHE)) {
304+
305+
// Show an expanation to the user *asynchronously* -- don't block
306+
// this thread waiting for the user's response! After the user
307+
// sees the explanation, try again to request the permission.
308+
309+
ActivityCompat.requestPermissions(RubbishCleanActivity.this,
310+
new String[]{Manifest.permission.CLEAR_APP_CACHE},
311+
1);
312+
313+
} else {
314+
315+
// No explanation needed, we can request the permission.
316+
317+
ActivityCompat.requestPermissions(RubbishCleanActivity.this,
318+
new String[]{Manifest.permission.CLEAR_APP_CACHE},
319+
1);
320+
321+
// 1 is an int constant. The callback method gets the result of the request.
322+
}
323+
324+
return;
325+
}
259326

260327
if (mCleanerService != null && !mCleanerService.isScanning() &&
261328
!mCleanerService.isCleaning() && mCleanerService.getCacheSize() > 0) {

‎app/src/main/java/com/yzy/supercleanmaster/ui/ShortCutActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,16 +145,16 @@ public void onCleanStarted(Context context) {
145145
@Override
146146
public void onCleanCompleted(Context context, long cacheSize) {
147147
if (cacheSize > 0) {
148-
T.showLong(mContext, "一键清理 开源版,为您释放" + StorageUtil.convertStorage(cacheSize) + "内存");
148+
T.showLong(mContext, "1" + StorageUtil.convertStorage(cacheSize) + "память");
149149
} else {
150-
T.showLong(mContext, "您刚刚清理过内存,请稍后再来~");
150+
T.showLong(mContext, "Вы уже очистили память, пожалуйста, вернитесь позже");
151151
}
152152

153153
finish();
154154
}
155155

156156

157-
private void killProcess() {
157+
public void killProcess() {
158158
// TODO Auto-generated method stub
159159

160160
ActivityManager am = (ActivityManager) getBaseContext()

‎library/library.iml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,19 @@
8585
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
8686
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8787
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
8889
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/attr" />
8990
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
9091
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/extractedTypedefs" />
9193
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
9294
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
9395
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
9496
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_and_local_jars_jni" />
9598
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
9699
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-aidl" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-classes" />
97101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packagedAssets" />
98102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged_res" />
99103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/public_res" />

0 commit comments

Comments
 (0)