Skip to content

Commit cca59da

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

File tree

15 files changed

+402
-37
lines changed

15 files changed

+402
-37
lines changed

‎.idea/codeStyles/Project.xml

Lines changed: 29 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/runConfigurations.xml

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/app.iml

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -49,20 +49,20 @@
4949
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
5050
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
5151
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
52-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
53-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
54-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
55-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
56-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
57-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
58-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
5952
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
6053
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
6154
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
6255
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
6356
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
6457
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
6558
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
59+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
60+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
61+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
62+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
63+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
64+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
6767
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
6868
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -115,38 +115,45 @@
115115
</content>
116116
<orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
117117
<orderEntry type="sourceFolder" forTests="false" />
118+
<orderEntry type="library" name="Gradle: __local_aars__:C.\Users\vladz\AndroidStudioProjects\superCleanMaster\app\libs\httpmime-4.1.3.jar:unspecified@jar" level="project" />
118119
<orderEntry type="library" name="Gradle: com.github.gabrielemariotti.changeloglib:library-1.5.2" level="project" />
119-
<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/umeng_social_sdk.jar:unspecified@jar" level="project" />
121-
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/SocialSDK_Sina.jar:unspecified@jar" level="project" />
120+
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-basement-15.0.1" level="project" />
122121
<orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-27.0.0" level="project" />
123-
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/SocialSDK_laiwang_2.jar:unspecified@jar" level="project" />
124-
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/SocialSDK_WeiXin_2.jar:unspecified@jar" level="project" />
122+
<orderEntry type="library" name="Gradle: __local_aars__:C.\Users\vladz\AndroidStudioProjects\superCleanMaster\app\libs\SocialSDK_WeiXin_1.jar:unspecified@jar" level="project" />
125123
<orderEntry type="library" name="Gradle: com.android.support:support-compat-27.0.0" level="project" />
126124
<orderEntry type="library" name="Gradle: com.android.support:support-v4-27.0.0" level="project" />
125+
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-base-15.0.1" level="project" />
126+
<orderEntry type="library" name="Gradle: __local_aars__:C.\Users\vladz\AndroidStudioProjects\superCleanMaster\app\libs\umeng-update-v2.5.0.jar:unspecified@jar" level="project" />
127127
<orderEntry type="library" name="Gradle: android.arch.core:common:1.0.0@jar" level="project" />
128128
<orderEntry type="library" name="Gradle: com.umeng.analytics:analytics:6.1.4@jar" level="project" />
129-
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/httpmime-4.1.3.jar:unspecified@jar" level="project" />
129+
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-lite-15.0.1" level="project" />
130+
<orderEntry type="library" name="Gradle: __local_aars__:C.\Users\vladz\AndroidStudioProjects\superCleanMaster\app\libs\SocialSDK_QQZone_3.jar:unspecified@jar" level="project" />
130131
<orderEntry type="library" name="Gradle: com.android.support:support-media-compat-27.0.0" level="project" />
131132
<orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-27.0.0" level="project" />
132-
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/umeng-update-v2.5.0.jar:unspecified@jar" level="project" />
133-
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/SocialSDK_QQZone_2.jar:unspecified@jar" level="project" />
133+
<orderEntry type="library" name="Gradle: __local_aars__:C.\Users\vladz\AndroidStudioProjects\superCleanMaster\app\libs\SocialSDK_Sina.jar:unspecified@jar" level="project" />
134+
<orderEntry type="library" name="Gradle: __local_aars__:C.\Users\vladz\AndroidStudioProjects\superCleanMaster\app\libs\SocialSDK_laiwang_2.jar:unspecified@jar" level="project" />
134135
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils-27.0.0" level="project" />
135136
<orderEntry type="library" name="Gradle: com.android.support:support-core-ui-27.0.0" level="project" />
137+
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-gass-15.0.1" level="project" />
136138
<orderEntry type="library" name="Gradle: com.nhaarman.listviewanimations:lib-core-3.1.0" level="project" />
139+
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-identifier-15.0.1" level="project" />
140+
<orderEntry type="library" name="Gradle: __local_aars__:C.\Users\vladz\AndroidStudioProjects\superCleanMaster\app\libs\SocialSDK_laiwang_1.jar:unspecified@jar" level="project" />
137141
<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" />
142+
<orderEntry type="library" name="Gradle: __local_aars__:C.\Users\vladz\AndroidStudioProjects\superCleanMaster\app\libs\SocialSDK_QQZone_1.jar:unspecified@jar" level="project" />
139143
<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" />
141144
<orderEntry type="library" name="Gradle: com.nhaarman.listviewanimations:lib-core-slh-3.1.0" level="project" />
142145
<orderEntry type="library" name="Gradle: com.android.support:support-fragment-27.0.0" level="project" />
143146
<orderEntry type="library" name="Gradle: com.github.castorflex.smoothprogressbar:library-circular-1.0.0" level="project" />
144147
<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" />
148+
<orderEntry type="library" name="Gradle: __local_aars__:C.\Users\vladz\AndroidStudioProjects\superCleanMaster\app\libs\SocialSDK_WeiXin_2.jar:unspecified@jar" level="project" />
149+
<orderEntry type="library" name="Gradle: __local_aars__:C.\Users\vladz\AndroidStudioProjects\superCleanMaster\app\libs\umeng_social_sdk.jar:unspecified@jar" level="project" />
150+
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-15.0.1" level="project" />
151+
<orderEntry type="library" name="Gradle: __local_aars__:C.\Users\vladz\AndroidStudioProjects\superCleanMaster\app\libs\nineoldandroids-2.4.0.jar:unspecified@jar" level="project" />
152+
<orderEntry type="library" name="Gradle: __local_aars__:C.\Users\vladz\AndroidStudioProjects\superCleanMaster\app\libs\SocialSDK_sms.jar:unspecified@jar" level="project" />
146153
<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" />
154+
<orderEntry type="library" name="Gradle: __local_aars__:C.\Users\vladz\AndroidStudioProjects\superCleanMaster\app\libs\SocialSDK_QQZone_2.jar:unspecified@jar" level="project" />
155+
<orderEntry type="library" name="Gradle: com.android.support:customtabs-26.1.0" level="project" />
148156
<orderEntry type="library" name="Gradle: com.hannesdorfmann.smoothprogressbar:library-1.0.0" level="project" />
149-
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/SocialSDK_QQZone_3.jar:unspecified@jar" level="project" />
150157
<orderEntry type="library" name="Gradle: com.jakewharton:butterknife:6.0.0@jar" level="project" />
151158
<orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.0.0" level="project" />
152159
<orderEntry type="module" module-name="library" />

‎app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ android {
2121

2222
dependencies {
2323
implementation fileTree(include: ['*.jar'], dir: 'libs')
24+
implementation 'com.google.android.gms:play-services-ads:15.0.1'
2425
implementation 'com.android.support:appcompat-v7:27.0.0'
2526
implementation 'com.jakewharton:butterknife:6.0.0'
2627
implementation 'com.nhaarman.listviewanimations:lib-core:3.1.0@aar'

‎app/src/main/AndroidManifest.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
<uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" />
66
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
77
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
8+
<permission android:name="android.permission.CLEAR_APP_CACHE"/>
9+
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
810
<uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
911
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
1012
<uses-permission android:name="android.permission.GET_PACKAGE_SIZE" />
@@ -114,6 +116,9 @@
114116

115117
<meta-data android:value="54d9a36afd98c56d450008ab" android:name="UMENG_APPKEY"></meta-data>
116118
<meta-data android:value="Channel ID" android:name="UMENG_CHANNEL"/>
119+
<meta-data
120+
android:name="com.google.android.gms.ads.APPLICATION_ID"
121+
android:value="REPLACE_WITH_YOUR_ADMOB_APP_ID"/>
117122

118123
<service
119124
android:name="com.umeng.update.net.DownloadingService"

‎app/src/main/aidl/android/content/pm/IPackageDataObserver.aidl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ package android.content.pm;
2323
* statistics related to code, data, cache usage(TODO)
2424
* {@hide}
2525
*/
26-
oneway interface IPackageDataObserver {
26+
interface IPackageDataObserver {
2727
void onRemoveCompleted(in String packageName, boolean succeeded);
2828
}

‎app/src/main/aidl/android/content/pm/IPackageStatsObserver.aidl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import android.content.pm.PackageStats;
2424
* statistics related to code, data, cache usage(TODO)
2525
* {@hide}
2626
*/
27-
oneway interface IPackageStatsObserver {
27+
interface IPackageStatsObserver {
2828

2929
void onGetStatsCompleted(in PackageStats pStats, boolean succeeded);
3030
}

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
import android.view.WindowManager;
1515
import android.widget.FrameLayout;
1616

17+
import com.google.android.gms.ads.AdRequest;
18+
import com.google.android.gms.ads.InterstitialAd;
19+
import com.google.android.gms.ads.MobileAds;
1720
import com.ikimuhendis.ldrawer.ActionBarDrawerToggle;
1821
import com.ikimuhendis.ldrawer.DrawerArrowDrawable;
1922
import com.yzy.supercleanmaster.R;
@@ -41,6 +44,7 @@ public class MainActivity extends BaseActivity implements NavigationDrawerFragme
4144
DrawerLayout mDrawerLayout;
4245

4346
ActionBar ab;
47+
private InterstitialAd mInterstitialAd;
4448
private CharSequence mTitle;
4549
private ActionBarDrawerToggle mDrawerToggle;
4650
private DrawerArrowDrawable drawerArrow;
@@ -63,7 +67,10 @@ protected void onCreate(Bundle savedInstanceState) {
6367

6468
onNavigationDrawerItemSelected(0);
6569
initDrawer();
66-
70+
MobileAds.initialize(this, "ca-app-pub-3982529297840521~5735971553");
71+
mInterstitialAd = new InterstitialAd(this);
72+
mInterstitialAd.setAdUnitId("ca-app-pub-3940256099942544/1033173712");
73+
mInterstitialAd.loadAd(new AdRequest.Builder().build());
6774

6875
}
6976

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

Lines changed: 45 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import android.os.Bundle;
1111
import android.os.IBinder;
1212
import android.support.annotation.NonNull;
13+
import android.util.Log;
1314
import android.view.MenuItem;
1415
import android.view.View;
1516
import android.view.ViewGroup;
@@ -24,6 +25,9 @@
2425

2526
import com.etiennelawlor.quickreturn.library.enums.QuickReturnType;
2627
import com.etiennelawlor.quickreturn.library.listeners.QuickReturnListViewOnScrollListener;
28+
import com.google.android.gms.ads.AdListener;
29+
import com.google.android.gms.ads.AdRequest;
30+
import com.google.android.gms.ads.InterstitialAd;
2731
import com.john.waveview.WaveView;
2832
import com.nhaarman.listviewanimations.appearance.simple.SwingBottomInAnimationAdapter;
2933
import com.nhaarman.listviewanimations.itemmanipulation.swipedismiss.OnDismissCallback;
@@ -81,9 +85,9 @@ public class MemoryCleanActivity extends BaseSwipeBackActivity implements OnDism
8185
Button clearButton;
8286
private static final int INITIAL_DELAY_MILLIS = 300;
8387
SwingBottomInAnimationAdapter swingBottomInAnimationAdapter;
84-
88+
private static final String TAG = "myLogs";
8589
private CoreService mCoreService;
86-
90+
private InterstitialAd mInterstitialAd;
8791
private ServiceConnection mServiceConnection = new ServiceConnection() {
8892
@Override
8993
public void onServiceConnected(ComponentName name, IBinder service) {
@@ -119,6 +123,9 @@ protected void onCreate(Bundle savedInstanceState) {
119123
textCounter.setAutoStart(false);
120124
textCounter.setIncrement(5f); // the amount the number increments at each time interval
121125
textCounter.setTimeInterval(50); // the time interval (ms) at which the text changes
126+
mInterstitialAd = new InterstitialAd(this);
127+
mInterstitialAd.setAdUnitId("ca-app-pub-3940256099942544/1033173712");
128+
mInterstitialAd.loadAd(new AdRequest.Builder().build());
122129
}
123130

124131
@Override
@@ -264,7 +271,43 @@ public void onClickClear() {
264271
if (Allmemory > 0) {
265272
refeshTextCounter();
266273
}
274+
if (mInterstitialAd.isLoaded()) {
275+
mInterstitialAd.show();
276+
} else {
277+
Log.d("TAG", "The interstitial wasn't loaded yet.");
278+
}
279+
mInterstitialAd.setAdListener(new AdListener() {
280+
@Override
281+
public void onAdLoaded() {
282+
Log.d(TAG,"onAdLoaded");
283+
// Code to be executed when an ad finishes loading.
284+
}
285+
286+
@Override
287+
public void onAdFailedToLoad(int errorCode) {
288+
Log.d(TAG,"onAdFailedToLoad");
289+
// Code to be executed when an ad request fails.
290+
}
267291

292+
@Override
293+
public void onAdOpened() {
294+
Log.d(TAG,"onAdOpened");
295+
296+
// Code to be executed when the ad is displayed.
297+
}
298+
299+
@Override
300+
public void onAdLeftApplication() {
301+
Log.d(TAG,"onAdLeftApplication");
302+
// Code to be executed when the user has left the app.
303+
}
304+
305+
@Override
306+
public void onAdClosed() {
307+
Log.d(TAG,"onAdClosed");
308+
// Code to be executed when when the interstitial ad is closed.
309+
}
310+
});
268311

269312
}
270313

0 commit comments

Comments
 (0)