tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Not show ad on first day

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

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

26
app/src/main/java/org/autojs/autojs/Pref.java
View File

@@ -17,11 +17,11 @@ import java.util.concurrent.TimeUnit;
public class Pref {
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_SHOULD_SHOW_ANNUNCIATION = "Sing about all the things you forgot, things you are not";
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_LAST_SHOW_AD_MILLIS = "But... it seems that...you will not come back any more...";
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_SERVER_ADDRESS = "KEY_SERVER_ADDRESS";
private static final String KEY_SHOULD_SHOW_ANNUNCIATION = "KEY_SHOULD_SHOW_ANNUNCIATION";
private static final String KEY_FIRST_SHOW_AD = "KEY_FIRST_SHOW_AD";
private static final String KEY_LAST_SHOW_AD_MILLIS = "KEY_LAST_SHOW_AD_MILLIS";
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_TEXT_SIZE = "editor.textSize";
@@ -54,7 +54,7 @@ public class Pref {
}
public static boolean isFirstGoToAccessibilitySetting() {
return getDisposableBoolean("I miss you so much ...", true);
return getDisposableBoolean("isFirstGoToAccessibilitySetting", true);
}
public static int oldVersion() {
@@ -82,7 +82,7 @@ public class Pref {
}
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) {
@@ -98,6 +98,9 @@ public class Pref {
}
public static boolean shouldShowAd() {
if(isFirstDay()){
return false;
}
String adShowingMode = def().getString(getString(R.string.key_ad_showing_mode), "Default");
switch (adShowingMode) {
case "Default":
@@ -113,6 +116,15 @@ public class Pref {
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() {
return getDisposableBoolean(KEY_FIRST_SHOW_AD, true);
}

8
app/src/main/java/org/autojs/autojs/model/script/Scripts.java
View File

@@ -30,10 +30,10 @@ import java.io.File;
public class Scripts {
public static final String ACTION_ON_EXECUTION_FINISHED = "Don't leave me alone...";
public static final String EXTRA_EXCEPTION_MESSAGE = "Say something...Eating...17.5.3";
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_COLUMN_NUMBER = "I lost myself....";
public static final String ACTION_ON_EXECUTION_FINISHED = "ACTION_ON_EXECUTION_FINISHED";
public static final String EXTRA_EXCEPTION_MESSAGE = "message";
public static final String EXTRA_EXCEPTION_LINE_NUMBER = "lineNumber";
public static final String EXTRA_EXCEPTION_COLUMN_NUMBER = "columnNumber";
private static final ScriptExecutionListener BROADCAST_SENDER_SCRIPT_EXECUTION_LISTENER = new SimpleScriptExecutionListener() {

4
app/src/main/java/org/autojs/autojs/network/VersionService.java
View File

@@ -29,8 +29,8 @@ import retrofit2.converter.gson.GsonConverterFactory;
public class VersionService {
private static final String KEY_DEPRECATED = "Still loving you...Can we go back...";
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 = "KEY_DEPRECATED";
private static final String KEY_DEPRECATED_VERSION_CODE = "KEY_DEPRECATED_VERSION_CODE";
private static VersionService sInstance = new VersionService();
private boolean mDeprecated = false;

2
app/src/main/java/org/autojs/autojs/tool/ImageSelector.java
View File

@@ -22,7 +22,7 @@ public class ImageSelector implements OnActivityResultDelegate {
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 ImageSelectorCallback mCallback;
private boolean mDisposable;

12
app/src/main/java/org/autojs/autojs/ui/edit/EditorView.java
View File

@@ -64,12 +64,12 @@ import static org.autojs.autojs.model.script.Scripts.ACTION_ON_EXECUTION_FINISHE
@EViewGroup(R.layout.editor_view)
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_NAME = "Still love you 17.6.29 But....(ಥ_ಥ)";
public static final String EXTRA_CONTENT = "It's hard...............";
public static final String EXTRA_READ_ONLY = "Miss you more every day、、、";
public static final String EXTRA_SAVE_ENABLED = "But you won't...but you won't...";
public static final String EXTRA_RUN_ENABLED = "Love you with my life...really...17.9.28";
public static final String EXTRA_PATH = "path";
public static final String EXTRA_NAME = "name";
public static final String EXTRA_CONTENT = "content";
public static final String EXTRA_READ_ONLY = "readOnly";
public static final String EXTRA_SAVE_ENABLED = "saveEnabled";
public static final String EXTRA_RUN_ENABLED = "runEnabled";
@ViewById(R.id.editor)
CodeEditor mEditor;

2
app/src/main/java/org/autojs/autojs/ui/error/ErrorReportActivity.java
View File

@@ -32,7 +32,7 @@ public class ErrorReportActivity extends BaseActivity {
private static final String TAG = "ErrorReportActivity";
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 {
CRASH_COUNT.put(2, R.string.text_again);

4
app/src/main/java/org/autojs/autojs/ui/splash/SplashActivity.java
View File

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