Bug fix.

ssYanhuo · Oct 5, 2019 · da14789 · da14789
1 parent ae9ab4c
commit da14789
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 37 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.ssyanhuo.arknightshelper"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 9
-        versionName "Beta-EarlyAutumn-1.0.0"
+        versionCode 10
+        versionName "Beta-EarlyAutumn-1.0.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/output.json b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":9,"versionName":"Beta-EarlyAutumn-1.0.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":10,"versionName":"Beta-EarlyAutumn-1.0.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
diff --git a/app/src/main/java/com/ssyanhuo/arknightshelper/activity/MainActivity.java b/app/src/main/java/com/ssyanhuo/arknightshelper/activity/MainActivity.java
@@ -62,7 +62,7 @@ public void startEngine(View view, boolean startGame){
         SharedPreferences.Editor editor = sharedPreferences.edit();
         editor.putBoolean("firstRun", false);
         editor.apply();
-        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O){
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M){
             if(Settings.canDrawOverlays(getApplicationContext())){
                 Intent intent1 = new Intent(getApplicationContext(), BackendService.class);
                 try{
@@ -74,7 +74,7 @@ public void startEngine(View view, boolean startGame){
                     final Intent intent2 = new Intent(Intent.ACTION_MAIN);
                     intent2.addCategory(Intent.CATEGORY_LAUNCHER);
                     if(checkApplication("com.hypergryph.arknights") && checkApplication("com.hypergryph.arknights.bilibili")){
-                        AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this, R.style.Theme_AppCompat_Light_Dialog_Alert);
+                        AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this, R.style.AppTheme_AlertDialog);
                         builder.setTitle(R.string.start_two_apps)
                                 .setPositiveButton(R.string.game_official, new DialogInterface.OnClickListener() {
                                     @Override
@@ -139,7 +139,7 @@ public void onClick(View view) {
                 final Intent intent2 = new Intent(Intent.ACTION_MAIN);
                 intent2.addCategory(Intent.CATEGORY_LAUNCHER);
                 if(checkApplication("com.hypergryph.arknights") && checkApplication("com.hypergryph.arknights.bilibili")){
-                    AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this, R.style.Theme_AppCompat_Light_Dialog_Alert);
+                    AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this, R.style.AppTheme);
                     builder.setTitle(R.string.start_two_apps)
                             .setPositiveButton(R.string.game_official, new DialogInterface.OnClickListener() {
                                 @Override

diff --git a/app/src/main/java/com/ssyanhuo/arknightshelper/overlay/BackendService.java b/app/src/main/java/com/ssyanhuo/arknightshelper/overlay/BackendService.java
@@ -43,14 +43,6 @@ public class BackendService extends Service {
     ScrollView scrollView_exp;
     ScrollView scrollView_material;
     Button button;
-    //公开招募
-
-    //经验计算
-    //TODO 变量放在类里面
-    //材料计算
-    String hrJson;
-    String expJson;
-    String materialJson;
     final int HR = 0;
     final int EXP = 1;
     final int MATERIAL = 2;
@@ -101,6 +93,8 @@ public void onCreate() {
             layoutParams.type = WindowManager.LayoutParams.TYPE_PHONE;
         }
         startFloatingButton();
+        //预处理
+        floatingWindowPreProcess();
     }
 
     public void startFloatingButton(){
@@ -149,25 +143,11 @@ public void onClick(View view) {
             }
         });
         windowManager.addView(button, layoutParams);
+
     }
 
-    public void showFloatingWindow(){
+    public void floatingWindowPreProcess(){
         linearLayout = (LinearLayout) LayoutInflater.from(this).inflate(R.layout.overlay_main, null);
-        windowManager.removeView(button);
-        DisplayMetrics displayMetrics = new DisplayMetrics();
-        windowManager.getDefaultDisplay().getMetrics(displayMetrics);
-        int rotation = windowManager.getDefaultDisplay().getRotation();
-        layoutParams.gravity = Gravity.END | Gravity.TOP;
-        layoutParams.x = 0;
-        layoutParams.y = 0;
-        if(rotation == 1 || rotation == 3){
-            layoutParams.height = displayMetrics.heightPixels;
-            layoutParams.width = displayMetrics.widthPixels / 2;
-        }else {
-            layoutParams.height = displayMetrics.heightPixels / 2;
-            layoutParams.width = displayMetrics.widthPixels;
-        }
-        windowManager.addView(linearLayout, layoutParams);
         //实例化view
         scrollView_hr = linearLayout.findViewById(R.id.scroll_hr);
         scrollView_exp = linearLayout.findViewById(R.id.scroll_exp);
@@ -218,6 +198,25 @@ public void onTabReselected(TabLayout.Tab tab) {
         Material material = new Material();
         material.init(getApplicationContext(), linearLayout_material);
     }
+
+    public void showFloatingWindow(){
+        windowManager.removeView(button);
+        DisplayMetrics displayMetrics = new DisplayMetrics();
+        windowManager.getDefaultDisplay().getMetrics(displayMetrics);
+        int rotation = windowManager.getDefaultDisplay().getRotation();
+        layoutParams.gravity = Gravity.END | Gravity.TOP;
+        layoutParams.x = 0;
+        layoutParams.y = 0;
+        if(rotation == 1 || rotation == 3){
+            layoutParams.height = displayMetrics.heightPixels;
+            layoutParams.width = displayMetrics.widthPixels / 2;
+        }else {
+            layoutParams.height = displayMetrics.heightPixels / 2;
+            layoutParams.width = displayMetrics.widthPixels;
+        }
+        windowManager.addView(linearLayout, layoutParams);
+
+    }
     public void changeFloatingWindowContent(int i){
         switch (i){
             case HR:
@@ -248,6 +247,7 @@ public void changeFloatingWindowContent(int i){
     public void hideFloatingWindow(){
         windowManager.removeView(linearLayout);
         startFloatingButton();
+        floatingWindowPreProcess();
     }
     @Override
     public void onDestroy() {

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -7,6 +7,11 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
     </style>
+    <style name="AppTheme.AlertDialog" parent="Theme.AppCompat.Light.Dialog.Alert">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
 
     <style name="AppTheme.NoActionBar">
         <item name="windowActionBar">false</item>

diff --git a/versioninfo b/versioninfo
@@ -1,7 +1,6 @@
-versionCode 9
-versionName Beta-EarlyAutumn-1.0.0
-releaseNote 掉落查询正式上线
+versionCode 10
+versionName Beta-EarlyAutumn-1.0.1
+releaseNote 修复了部分系统不能正常启动悬浮窗的问题
+掉落查询正式上线
 应用已初步完成构建，进入Beta测试阶段
-修复了一些在竖屏模式下可能遇到的小问题
-添加调试工具，用于提交错误报告
-更新依赖库至最新版本
+修复了一些在竖屏模式下可能遇到的小问题