move mainApplication to MainActivity to prevent popup window

openatx · Jan 7, 2020 · 7095eb5 · 7095eb5
1 parent ea26d02
commit 7095eb5
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 11 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -95,6 +95,7 @@ dependencies {
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'org.nanohttpd:nanohttpd:2.3.1'
     implementation 'com.squareup.okhttp3:okhttp:3.11.0'
+
     // test
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test:rules:1.0.2'

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -30,8 +30,7 @@
         android:label="@string/app_name"
         android:persistent="true"
         android:theme="@style/AppTheme"
-        android:usesCleartextTraffic="true"
-        android:name=".MainApplication">
+        android:usesCleartextTraffic="true">
         <activity
             android:name=".IdentifyActivity"
             android:excludeFromRecents="true"

diff --git a/app/src/main/java/com/github/uiautomator/FloatView.java b/app/src/main/java/com/github/uiautomator/FloatView.java
@@ -76,6 +76,7 @@ public void show() {
         windowManager.getDefaultDisplay().getSize(size);
         int screenWidth = size.x;
         int screenHeight = size.y;
+        int minWidthHeight = size.x > size.y ? size.y : size.x;
 
         WindowManager.LayoutParams params = new WindowManager.LayoutParams();
         params.packageName = context.getPackageName();
@@ -99,8 +100,8 @@ public void show() {
         params.type = mType;
         params.format = PixelFormat.RGBA_8888;
         params.gravity = Gravity.LEFT | Gravity.TOP;
-        params.width = screenWidth / 10;
-        params.height = screenWidth / 10;
+        params.width = minWidthHeight / 10;
+        params.height = minWidthHeight / 10;
         params.x = screenWidth - sideGap() - params.width;
         params.y = screenHeight / 3 * 2;
         params.alpha = 0.5f;

diff --git a/app/src/main/java/com/github/uiautomator/MainActivity.java b/app/src/main/java/com/github/uiautomator/MainActivity.java
@@ -29,6 +29,7 @@
 import com.github.uiautomator.util.MemoryManager;
 import com.github.uiautomator.util.OkhttpManager;
 import com.github.uiautomator.util.Permissons4App;
+import com.tendcloud.tenddata.TCAgent;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -80,12 +81,24 @@ public void handleMessage(Message msg) {
         }
     };
 
+    private void initTCAgent() {
+        TCAgent.LOG_ON = true;
+        // App ID: 在TalkingData创建应用后，进入数据报表页中，在“系统设置”-“编辑应用”页面里查看App ID。
+        // 渠道 ID: 是渠道标识符，可通过不同渠道单独追踪数据。
+        TCAgent.init(this, BuildConfig.buildTendId, BuildConfig.buildChannel);
+        // 如果已经在AndroidManifest.xml配置了App ID和渠道ID，调用TCAgent.init(this)即可；或与AndroidManifest.xml中的对应参数保持一致。
+        TCAgent.setReportUncaughtExceptions(true);
+        Log.i(TAG, "TCAgent init done");
+    }
+
     @RequiresApi(api = Build.VERSION_CODES.O)
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
+        this.initTCAgent();
+
         tvAgentStatus = findViewById(R.id.atx_agent_status);
 
         Button btnFinish = findViewById(R.id.btn_finish);
@@ -172,7 +185,7 @@ public void stopUiautomator(View view) {
                 .url(ATX_AGENT_URL + "/uiautomator")
                 .delete()
                 .build();
-        okhttpManager.newCall(request,new Callback() {
+        okhttpManager.newCall(request, new Callback() {
             @Override
             public void onFailure(Call call, IOException e) {
                 e.printStackTrace();
@@ -210,7 +223,7 @@ private void uiToaster(final String msg) {
         handler.post(new Runnable() {
             @Override
             public void run() {
-                Toast.makeText(MainActivity.this, msg , Toast.LENGTH_SHORT).show();
+                Toast.makeText(MainActivity.this, msg, Toast.LENGTH_SHORT).show();
             }
         });
     }

diff --git a/...m/github/uiautomator/MainApplication.java → ...ithub/uiautomator/TCAgentApplication.java b/...m/github/uiautomator/MainApplication.java → ...ithub/uiautomator/TCAgentApplication.java
@@ -5,18 +5,19 @@
 
 import com.tendcloud.tenddata.TCAgent;
 
-public class MainApplication extends Application {
-    private static final String TAG = ">>>>>MainApplication";
-    @Override 
+public class TCAgentApplication extends Application {
+    private static final String TAG = "TCAgentApplication";
+
+    @Override
     public void onCreate() {
         super.onCreate();
-//        JLibrary.InitEntry(this); //移动安全联盟统一SDK初始化
+        // JLibrary.InitEntry(this); //移动安全联盟统一SDK初始化
         TCAgent.LOG_ON = true;
         // App ID: 在TalkingData创建应用后，进入数据报表页中，在“系统设置”-“编辑应用”页面里查看App ID。  
         // 渠道 ID: 是渠道标识符，可通过不同渠道单独追踪数据。
         TCAgent.init(this, BuildConfig.buildTendId, BuildConfig.buildChannel);
         // 如果已经在AndroidManifest.xml配置了App ID和渠道ID，调用TCAgent.init(this)即可；或与AndroidManifest.xml中的对应参数保持一致。
         TCAgent.setReportUncaughtExceptions(true);
-        Log.e(TAG, "TCAgent init over>>>>>");
+        Log.i(TAG, "TCAgent init done");
     }
 }