diff --git a/.idea/modules.xml b/.idea/modules.xml index 7ddd2436..58fc8a76 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,8 +2,6 @@ - - diff --git a/app/build.gradle b/app/build.gradle index 10d331d8..dfc47cf3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -147,5 +147,4 @@ dependencies { compile project(':automator') compile project(':common') compile project(':autojs') - compile files('libs/GDTUnionSDK.4.9.545.min.jar') } \ No newline at end of file diff --git a/app/libs/GDTUnionSDK.4.9.545.min.jar b/app/libs/GDTUnionSDK.4.9.545.min.jar deleted file mode 100644 index 6fd58f48..00000000 Binary files a/app/libs/GDTUnionSDK.4.9.545.min.jar and /dev/null differ diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/main/MainActivity.java b/app/src/main/java/com/stardust/scriptdroid/ui/main/MainActivity.java index 315e6b15..d4b64ac9 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/main/MainActivity.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/main/MainActivity.java @@ -18,8 +18,6 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; -import com.qq.e.ads.ADActivity; -import com.qq.e.comm.DownloadService; import com.stardust.app.FragmentPagerAdapterBuilder; import com.stardust.app.OnActivityResultDelegate; import com.stardust.enhancedfloaty.FloatyService; @@ -28,27 +26,27 @@ import com.stardust.scriptdroid.BuildConfig; import com.stardust.scriptdroid.Pref; import com.stardust.scriptdroid.R; import com.stardust.scriptdroid.autojs.AutoJs; +import com.stardust.scriptdroid.storage.file.StorageFileProvider; +import com.stardust.scriptdroid.tool.AccessibilityServiceTool; +import com.stardust.scriptdroid.ui.BaseActivity; import com.stardust.scriptdroid.ui.common.NotAskAgainDialog; import com.stardust.scriptdroid.ui.doc.DocsFragment_; import com.stardust.scriptdroid.ui.floating.FloatyWindowManger; -import com.stardust.scriptdroid.storage.file.StorageFileProvider; +import com.stardust.scriptdroid.ui.log.LogActivity_; import com.stardust.scriptdroid.ui.main.community.CommunityFragment; import com.stardust.scriptdroid.ui.main.community.CommunityFragment_; -import com.stardust.scriptdroid.ui.log.LogActivity_; import com.stardust.scriptdroid.ui.main.sample.SampleListFragment_; import com.stardust.scriptdroid.ui.main.scripts.MyScriptListFragment_; import com.stardust.scriptdroid.ui.main.task.TaskManagerFragment_; -import com.stardust.theme.ThemeColorManager; -import com.stardust.theme.dialog.ThemeColorMaterialDialogBuilder; -import com.stardust.util.DeveloperUtils; -import com.stardust.scriptdroid.tool.AccessibilityServiceTool; -import com.stardust.scriptdroid.ui.BaseActivity; import com.stardust.scriptdroid.ui.settings.SettingsActivity_; import com.stardust.scriptdroid.ui.update.VersionGuard; -import com.stardust.util.BackPressedHandler; -import com.stardust.util.DrawerAutoClose; import com.stardust.scriptdroid.ui.widget.CommonMarkdownView; import com.stardust.scriptdroid.ui.widget.SearchViewItem; +import com.stardust.theme.ThemeColorManager; +import com.stardust.theme.dialog.ThemeColorMaterialDialogBuilder; +import com.stardust.util.BackPressedHandler; +import com.stardust.util.DeveloperUtils; +import com.stardust.util.DrawerAutoClose; import org.androidannotations.annotations.AfterViews; import org.androidannotations.annotations.Click; @@ -214,8 +212,6 @@ public class MainActivity extends BaseActivity implements OnActivityResultDelega @Override protected void onPause() { super.onPause(); - //not working - stopService(new Intent(this, DownloadService.class)); } @Override @@ -263,11 +259,6 @@ public class MainActivity extends BaseActivity implements OnActivityResultDelega if (!BuildConfig.DEBUG) { DeveloperUtils.verifyApk(this, R.string.dex_crcs); } - if (!DeveloperUtils.isActivityRegistered(this, ADActivity.class) || - !DeveloperUtils.isServiceRegistered(this, DownloadService.class)) { - finish(); - } - } diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/splash/SplashActivity.java b/app/src/main/java/com/stardust/scriptdroid/ui/splash/SplashActivity.java index 83412ffc..dea7ba54 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/splash/SplashActivity.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/splash/SplashActivity.java @@ -1,19 +1,13 @@ package com.stardust.scriptdroid.ui.splash; -import android.Manifest; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.util.Log; import android.view.View; import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.TextView; -import android.widget.Toast; -import com.qq.e.ads.splash.SplashAD; -import com.qq.e.ads.splash.SplashADListener; -import com.stardust.scriptdroid.Constants; import com.stardust.scriptdroid.Pref; import com.stardust.scriptdroid.R; import com.stardust.scriptdroid.ui.BaseActivity; @@ -23,8 +17,6 @@ import org.androidannotations.annotations.AfterViews; import org.androidannotations.annotations.EActivity; import org.androidannotations.annotations.ViewById; -import java.util.Locale; - /** * Created by Stardust on 2017/7/7. */ @@ -48,7 +40,6 @@ public class SplashActivity extends BaseActivity { @ViewById(R.id.ad) FrameLayout mAd; - private SplashAD mSplashAD; private boolean mCanEnterNextActivity = false; private boolean mNotStartMainActivity; @@ -99,34 +90,6 @@ public class SplashActivity extends BaseActivity { } private void fetchSplashAD() { - mSplashAD = new SplashAD(this, mAd, mSkipView, Constants.APP_ID, Constants.SPLASH_POS_ID, new SplashADListener() { - @Override - public void onADDismissed() { - Log.v(LOG_TAG, "onADDismissed"); - enterNextActivityIfNeeded(); - } - @Override - public void onNoAD(int errno) { - Log.e(LOG_TAG, "onNoAD: " + errno); - enterNextActivity(); - } - - @Override - public void onADPresent() { - Log.v(LOG_TAG, "onADPresent"); - mSkipView.setVisibility(View.VISIBLE); - } - - @Override - public void onADClicked() { - Log.v(LOG_TAG, "onADClicked"); - } - - @Override - public void onADTick(long l) { - mSkipView.setText(String.format(Locale.getDefault(), getString(R.string.format_skip), Math.round(l / 1000f))); - } - }, 0); } }