Not show ad on first day

This commit is contained in:
hyb1996
2018-07-09 16:28:50 +08:00
parent e247943035
commit b9c7250cf8
13 changed files with 48 additions and 38 deletions

Binary file not shown.

View File

@@ -8,8 +8,8 @@ android {
applicationId "org.autojs.autojs" applicationId "org.autojs.autojs"
minSdkVersion 17 minSdkVersion 17
targetSdkVersion 23 targetSdkVersion 23
versionCode 403 versionCode 404
versionName "4.0.0 Beta" versionName "4.0.1 Beta"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true multiDexEnabled true
ndk { ndk {

View File

@@ -17,11 +17,11 @@ import java.util.concurrent.TimeUnit;
public class Pref { public class Pref {
private static final SharedPreferences DISPOSABLE_BOOLEAN = GlobalAppContext.get().getSharedPreferences("DISPOSABLE_BOOLEAN", Context.MODE_PRIVATE); private static final SharedPreferences DISPOSABLE_BOOLEAN = GlobalAppContext.get().getSharedPreferences("DISPOSABLE_BOOLEAN", Context.MODE_PRIVATE);
private static final String KEY_SERVER_ADDRESS = "Still love you...17.5.14"; private static final String KEY_SERVER_ADDRESS = "KEY_SERVER_ADDRESS";
private static final String KEY_SHOULD_SHOW_ANNUNCIATION = "Sing about all the things you forgot, things you are not"; private static final String KEY_SHOULD_SHOW_ANNUNCIATION = "KEY_SHOULD_SHOW_ANNUNCIATION";
private static final String KEY_FIRST_SHOW_AD = "En, Today is 17.7.7, but, I'm still love you so...."; private static final String KEY_FIRST_SHOW_AD = "KEY_FIRST_SHOW_AD";
private static final String KEY_LAST_SHOW_AD_MILLIS = "But... it seems that...you will not come back any more..."; private static final String KEY_LAST_SHOW_AD_MILLIS = "KEY_LAST_SHOW_AD_MILLIS";
private static final String KEY_FLOATING_MENU_SHOWN = "17.10.28 I have idea of what you think...maybe...I'm overthinking..."; private static final String KEY_FLOATING_MENU_SHOWN = "KEY_FLOATING_MENU_SHOWN";
private static final String KEY_EDITOR_THEME = "editor.theme"; private static final String KEY_EDITOR_THEME = "editor.theme";
private static final String KEY_EDITOR_TEXT_SIZE = "editor.textSize"; private static final String KEY_EDITOR_TEXT_SIZE = "editor.textSize";
@@ -54,7 +54,7 @@ public class Pref {
} }
public static boolean isFirstGoToAccessibilitySetting() { public static boolean isFirstGoToAccessibilitySetting() {
return getDisposableBoolean("I miss you so much ...", true); return getDisposableBoolean("isFirstGoToAccessibilitySetting", true);
} }
public static int oldVersion() { public static int oldVersion() {
@@ -82,7 +82,7 @@ public class Pref {
} }
public static boolean isEditActivityFirstUsing() { public static boolean isEditActivityFirstUsing() {
return getDisposableBoolean("Still Love Eating 17.4.6", true); return getDisposableBoolean("Love Honmua 18.7.9", true);
} }
public static String getServerAddressOrDefault(String defaultAddress) { public static String getServerAddressOrDefault(String defaultAddress) {
@@ -98,6 +98,9 @@ public class Pref {
} }
public static boolean shouldShowAd() { public static boolean shouldShowAd() {
if(isFirstDay()){
return false;
}
String adShowingMode = def().getString(getString(R.string.key_ad_showing_mode), "Default"); String adShowingMode = def().getString(getString(R.string.key_ad_showing_mode), "Default");
switch (adShowingMode) { switch (adShowingMode) {
case "Default": case "Default":
@@ -113,6 +116,15 @@ public class Pref {
return true; return true;
} }
private static boolean isFirstDay() {
long firstUsingMillis = def().getLong("firstUsingMillis", -1);
if(firstUsingMillis == -1){
def().edit().putLong("firstUsingMillis", System.currentTimeMillis()).apply();
return true;
}
return System.currentTimeMillis() - firstUsingMillis <= TimeUnit.DAYS.toMillis(1);
}
public static boolean isFirstShowingAd() { public static boolean isFirstShowingAd() {
return getDisposableBoolean(KEY_FIRST_SHOW_AD, true); return getDisposableBoolean(KEY_FIRST_SHOW_AD, true);
} }

View File

@@ -30,10 +30,10 @@ import java.io.File;
public class Scripts { public class Scripts {
public static final String ACTION_ON_EXECUTION_FINISHED = "Don't leave me alone..."; public static final String ACTION_ON_EXECUTION_FINISHED = "ACTION_ON_EXECUTION_FINISHED";
public static final String EXTRA_EXCEPTION_MESSAGE = "Say something...Eating...17.5.3"; public static final String EXTRA_EXCEPTION_MESSAGE = "message";
public static final String EXTRA_EXCEPTION_LINE_NUMBER = "Can we fall in love with each other again...17.9.28"; public static final String EXTRA_EXCEPTION_LINE_NUMBER = "lineNumber";
public static final String EXTRA_EXCEPTION_COLUMN_NUMBER = "I lost myself...."; public static final String EXTRA_EXCEPTION_COLUMN_NUMBER = "columnNumber";
private static final ScriptExecutionListener BROADCAST_SENDER_SCRIPT_EXECUTION_LISTENER = new SimpleScriptExecutionListener() { private static final ScriptExecutionListener BROADCAST_SENDER_SCRIPT_EXECUTION_LISTENER = new SimpleScriptExecutionListener() {

View File

@@ -29,8 +29,8 @@ import retrofit2.converter.gson.GsonConverterFactory;
public class VersionService { public class VersionService {
private static final String KEY_DEPRECATED = "Still loving you...Can we go back..."; private static final String KEY_DEPRECATED = "KEY_DEPRECATED";
private static final String KEY_DEPRECATED_VERSION_CODE = "I miss you so much tonight...Baby don't let me cry..."; private static final String KEY_DEPRECATED_VERSION_CODE = "KEY_DEPRECATED_VERSION_CODE";
private static VersionService sInstance = new VersionService(); private static VersionService sInstance = new VersionService();
private boolean mDeprecated = false; private boolean mDeprecated = false;

View File

@@ -22,7 +22,7 @@ public class ImageSelector implements OnActivityResultDelegate {
private static final String TAG = ImageSelector.class.getSimpleName(); private static final String TAG = ImageSelector.class.getSimpleName();
private static final int REQUEST_CODE = "LOVE EATING".hashCode() >> 16; private static final int REQUEST_CODE = "LOVE HONMUA".hashCode() >> 16;
private Activity mActivity; private Activity mActivity;
private ImageSelectorCallback mCallback; private ImageSelectorCallback mCallback;
private boolean mDisposable; private boolean mDisposable;

View File

@@ -64,12 +64,12 @@ import static org.autojs.autojs.model.script.Scripts.ACTION_ON_EXECUTION_FINISHE
@EViewGroup(R.layout.editor_view) @EViewGroup(R.layout.editor_view)
public class EditorView extends FrameLayout implements CodeCompletionBar.OnHintClickListener, FunctionsKeyboardView.ClickCallback { public class EditorView extends FrameLayout implements CodeCompletionBar.OnHintClickListener, FunctionsKeyboardView.ClickCallback {
public static final String EXTRA_PATH = "Still Love Eating 17.4.5"; public static final String EXTRA_PATH = "path";
public static final String EXTRA_NAME = "Still love you 17.6.29 But....(ಥ_ಥ)"; public static final String EXTRA_NAME = "name";
public static final String EXTRA_CONTENT = "It's hard..............."; public static final String EXTRA_CONTENT = "content";
public static final String EXTRA_READ_ONLY = "Miss you more every day、、、"; public static final String EXTRA_READ_ONLY = "readOnly";
public static final String EXTRA_SAVE_ENABLED = "But you won't...but you won't..."; public static final String EXTRA_SAVE_ENABLED = "saveEnabled";
public static final String EXTRA_RUN_ENABLED = "Love you with my life...really...17.9.28"; public static final String EXTRA_RUN_ENABLED = "runEnabled";
@ViewById(R.id.editor) @ViewById(R.id.editor)
CodeEditor mEditor; CodeEditor mEditor;

View File

@@ -32,7 +32,7 @@ public class ErrorReportActivity extends BaseActivity {
private static final String TAG = "ErrorReportActivity"; private static final String TAG = "ErrorReportActivity";
private static final SparseIntArray CRASH_COUNT = new SparseIntArray(); private static final SparseIntArray CRASH_COUNT = new SparseIntArray();
private static final String KEY_CRASH_COUNT = "Eating... you are my halo..."; private static final String KEY_CRASH_COUNT = "crashCount";
static { static {
CRASH_COUNT.put(2, R.string.text_again); CRASH_COUNT.put(2, R.string.text_again);

View File

@@ -35,8 +35,8 @@ import org.androidannotations.annotations.ViewById;
@EActivity(R.layout.activity_splash) @EActivity(R.layout.activity_splash)
public class SplashActivity extends BaseActivity { public class SplashActivity extends BaseActivity {
public static final String NOT_START_MAIN_ACTIVITY = "Eating...I...really...love...you..."; public static final String NOT_START_MAIN_ACTIVITY = "notStartMainActivity";
public static final String FORCE_SHOW_AD = "I will be better but can you take just a glance at me..."; public static final String FORCE_SHOW_AD = "forceShowAd";
private static final String LOG_TAG = SplashActivity.class.getSimpleName(); private static final String LOG_TAG = SplashActivity.class.getSimpleName();

View File

@@ -224,9 +224,9 @@ public class ScriptEngineService {
private static class ScriptExecutionEvent { private static class ScriptExecutionEvent {
static final int ON_START = "Eating...".hashCode(); static final int ON_START = 1001;
static final int ON_SUCCESS = "I...lov...".hashCode(); static final int ON_SUCCESS = 1002;
static final int ON_EXCEPTION = "...Sorry...I should not have said it...".hashCode(); static final int ON_EXCEPTION = 1003;
private final int mCode; private final int mCode;
private final String mMessage; private final String mMessage;

View File

@@ -50,6 +50,7 @@ public class ScriptCanvasView extends SurfaceView implements SurfaceHolder.Callb
private void init() { private void init() {
mHolder.addCallback(this); mHolder.addCallback(this);
setZOrderOnTop(false);
} }
@Override @Override

View File

@@ -55,7 +55,7 @@ public interface ScreenCaptureRequester {
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
class ActivityScreenCaptureRequester extends AbstractScreenCaptureRequester implements ScreenCaptureRequester, OnActivityResultDelegate { class ActivityScreenCaptureRequester extends AbstractScreenCaptureRequester implements ScreenCaptureRequester, OnActivityResultDelegate {
private static final int REQUEST_CODE_MEDIA_PROJECTION = "Eating...Today is 17.5.20 yet...The 90 days、、、".hashCode() >> 16; private static final int REQUEST_CODE_MEDIA_PROJECTION = 17777;
private OnActivityResultDelegate.Mediator mMediator; private OnActivityResultDelegate.Mediator mMediator;
private Activity mActivity; private Activity mActivity;

View File

@@ -1,15 +1,12 @@
{ {
"versionCode": 163, "versionCode": 404,
"versionName": "2.0.16 Beta2", "versionName": "4.0.1 Beta",
"releaseNotes": "* 优化root录制录制脚本接近完美可自行录制游戏脚本\n* 提高部分脚本的运行速度\n* 新增 按键事件、通知事件监听\n*修复 一些问题", "releaseNotes": "* 全新的文档、界面\n* 更丰富的功能\n期待您的体验~",
"downloadUrl": "http://i.autojs.org/autojs/release-4.0.1Beta.apk",
"downloads" : [ "downloads" : [
{ {
"name": "应用宝", "name": "酷安",
"url": "http://a.app.qq.com/o/simple.jsp?pkgname=org.autojs.autojs" "url": "https://www.coolapk.com/apk/188448"
},
{
"name": "百度手机助手",
"url": "http://shouji.baidu.com/software/22060055.html"
} }
], ],
"oldVersions": [ "oldVersions": [