From f047a5e8a03b24e86ef372604309f87415571a53 Mon Sep 17 00:00:00 2001
From: 1754048656 <1754048656@qq.com>
Date: Sat, 27 Apr 2024 16:16:08 +0800
Subject: [PATCH] 1. OAID/AAID 2. add code obfuscation 3. fastjson -> gson
---
app/src/main/AndroidManifest.xml | 2 +-
.../FATJS/activitys/aione_editor/MainActivity.java | 1 +
.../com/linsheng/FATJS/config/GlobalVariableHolder.java | 3 ++-
.../main/java/com/linsheng/FATJS/ui/home/HomeFragment.java | 3 ---
.../java/com/linsheng/FATJS/ui/home/HomeViewModel.java | 4 ++--
app/src/main/java/com/linsheng/FATJS/utils/FileUtils.java | 1 -
.../main/java/com/linsheng/FATJS/utils/VibratorUtil.java | 7 -------
7 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8eef527..b2f3e35 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,7 +16,7 @@
-
+
diff --git a/app/src/main/java/com/linsheng/FATJS/activitys/aione_editor/MainActivity.java b/app/src/main/java/com/linsheng/FATJS/activitys/aione_editor/MainActivity.java
index a4cedfc..a456239 100644
--- a/app/src/main/java/com/linsheng/FATJS/activitys/aione_editor/MainActivity.java
+++ b/app/src/main/java/com/linsheng/FATJS/activitys/aione_editor/MainActivity.java
@@ -96,6 +96,7 @@ public void onOAIDGetComplete(String result) {
Log.i(TAG, "guid: " + _guid);
Log.i(TAG, "supported: " + DeviceID.supportedOAID(context));
Log.i(TAG, "OAID/AAID: " + result);
+ FATJS_INFO += String.format("\n\npseudoID:\n%s\n\nguid:\n%s\n\nOAID/AAID:\n%s", pseudoID, guid, result);
}
@Override
public void onOAIDGetError(Exception error) {
diff --git a/app/src/main/java/com/linsheng/FATJS/config/GlobalVariableHolder.java b/app/src/main/java/com/linsheng/FATJS/config/GlobalVariableHolder.java
index 3862f82..1439d00 100644
--- a/app/src/main/java/com/linsheng/FATJS/config/GlobalVariableHolder.java
+++ b/app/src/main/java/com/linsheng/FATJS/config/GlobalVariableHolder.java
@@ -19,7 +19,8 @@ public class GlobalVariableHolder {
public static boolean DEV_MODE = false; // FATJS 的开发者模式
public static V8Runtime v8Runtime;
public static final String PATH = "/FATJS_DIR/";
- public static final String FATJS_INFO = "\n\n\n\n\n\n\n\n\n\nauthor: 林笙\n\nwx: FATJS_Lin\n\nGitHub: FATJS";
+ public static String FATJS_INFO = "author: 林笙\n\nwx: FATJS_Lin\n\nGitHub: FATJS";
+ public static String FATJS_INFO_HOME = "\n\n\n\n\n\n\n\n\n\nauthor: 林笙\n\nwx: FATJS_Lin\n\nGitHub: FATJS";
public static String ANDROID_ID = "";
public static String pseudoID = "";
public static String guid = "";
diff --git a/app/src/main/java/com/linsheng/FATJS/ui/home/HomeFragment.java b/app/src/main/java/com/linsheng/FATJS/ui/home/HomeFragment.java
index a99f70d..f356162 100644
--- a/app/src/main/java/com/linsheng/FATJS/ui/home/HomeFragment.java
+++ b/app/src/main/java/com/linsheng/FATJS/ui/home/HomeFragment.java
@@ -10,7 +10,6 @@
import android.content.DialogInterface;
import android.content.Intent;
import android.net.Uri;
-import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.provider.Settings;
@@ -210,7 +209,6 @@ public void onClick(View view) {
}
});
holder.run_script.setOnClickListener(new View.OnClickListener() {
- @RequiresApi(api = Build.VERSION_CODES.O)
@Override
public void onClick(View view) {
if (!name.endsWith(".js")) {
@@ -318,7 +316,6 @@ private void deleteScript(String name) {
}
private List threadList = new ArrayList<>();
- @RequiresApi(api = Build.VERSION_CODES.O)
private void runScript(String name) {
String script_path = Environment.getExternalStorageDirectory() + PATH + name;
if (!isAccessibilityServiceOn()){
diff --git a/app/src/main/java/com/linsheng/FATJS/ui/home/HomeViewModel.java b/app/src/main/java/com/linsheng/FATJS/ui/home/HomeViewModel.java
index 1aad830..6dd82ac 100644
--- a/app/src/main/java/com/linsheng/FATJS/ui/home/HomeViewModel.java
+++ b/app/src/main/java/com/linsheng/FATJS/ui/home/HomeViewModel.java
@@ -1,6 +1,6 @@
package com.linsheng.FATJS.ui.home;
-import static com.linsheng.FATJS.config.GlobalVariableHolder.FATJS_INFO;
+import static com.linsheng.FATJS.config.GlobalVariableHolder.FATJS_INFO_HOME;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
@@ -12,7 +12,7 @@ public class HomeViewModel extends ViewModel {
public HomeViewModel() {
mText = new MutableLiveData<>();
- mText.setValue(FATJS_INFO);
+ mText.setValue(FATJS_INFO_HOME);
}
public LiveData getText() {
diff --git a/app/src/main/java/com/linsheng/FATJS/utils/FileUtils.java b/app/src/main/java/com/linsheng/FATJS/utils/FileUtils.java
index 98584aa..57a3fc6 100755
--- a/app/src/main/java/com/linsheng/FATJS/utils/FileUtils.java
+++ b/app/src/main/java/com/linsheng/FATJS/utils/FileUtils.java
@@ -37,7 +37,6 @@ public class FileUtils {
* @param filePath 文件的路径
* @return
*/
- @RequiresApi(api = Build.VERSION_CODES.O)
public static String readFile(String filePath) {
StringBuilder content = new StringBuilder();
try (BufferedReader reader = new BufferedReader(
diff --git a/app/src/main/java/com/linsheng/FATJS/utils/VibratorUtil.java b/app/src/main/java/com/linsheng/FATJS/utils/VibratorUtil.java
index 4d78f1e..174caf8 100644
--- a/app/src/main/java/com/linsheng/FATJS/utils/VibratorUtil.java
+++ b/app/src/main/java/com/linsheng/FATJS/utils/VibratorUtil.java
@@ -5,13 +5,6 @@
import android.content.Context;
import android.os.Vibrator;
-/**
- * Package: com.zh.touchassistant
- * FileName: VibratorHelper
- * Create Date: 2018/12/13 下午6:48
- * Author: zihe
- * Description:
- */
public class VibratorUtil {
private VibratorUtil() {
}