Bug fix.

ssYanhuo · Sep 9, 2019 · b2925f9 · b2925f9
1 parent a02d68a
commit b2925f9
Show file tree

Hide file tree

Showing 10 changed files with 72 additions and 9 deletions.
diff --git a/.project b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Arknights-Helper</name>
+	<comment>Project Arknights-Helper created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>
diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+connection.project.dir=
+eclipse.preferences.version=1
diff --git a/app/.classpath b/app/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin/default"/>
+</classpath>
diff --git a/app/.project b/app/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>app</name>
+	<comment>Project app created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>
diff --git a/app/.settings/org.eclipse.buildship.core.prefs b/app/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+connection.project.dir=..
+eclipse.preferences.version=1
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.ssyanhuo.arknightshelper"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 6
-        versionName "Alpha-3.2"
+        versionCode 7
+        versionName "Alpha-3.3"
         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":6,"versionName":"Alpha-3.2","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":7,"versionName":"Alpha-3.3","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/overlay/Hr.java b/app/src/main/java/com/ssyanhuo/arknightshelper/overlay/Hr.java
@@ -33,6 +33,7 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 
 public class Hr {
     private final String TAG = "Hr";
@@ -239,6 +240,9 @@ public void getResultFuzzy(){
                 matchedTags.addAll(JSONArray.parseArray(JSON.toJSONString(type)));
                 matchedTags.addAll(JSONArray.parseArray(JSON.toJSONString(sex)));
                 matchedTags.addAll(JSONArray.parseArray(JSON.toJSONString(tag)));
+                List list = JSONArray.parseArray(matchedTags.toJSONString());
+                Collections.sort(list);
+                matchedTags = JSONArray.parseArray(list.toString());
                 jsonObject.put("matchedTags", matchedTags);
                 result.add(jsonObject);
                 Log.i(TAG, "Found:" + name);
@@ -282,6 +286,9 @@ public void showResultExact(ArrayList<JSONObject> result){
                 case 5:
                     button.setBackground(applicationContext.getResources().getDrawable(R.drawable.checkbox_background_red));
                     break;
+                case 3:
+                    button.setBackground(applicationContext.getResources().getDrawable(R.drawable.checkbox_background_green));
+                    break;
                 case 2:
                 case 1:
                     button.setBackground(applicationContext.getResources().getDrawable(R.drawable.checkbox_background_lime));
@@ -312,6 +319,7 @@ public boolean onTouch(View view, MotionEvent motionEvent) {
                             textView.setText(tags);
                             easyPopup = EasyPopup.create(applicationContext)
                                     .setContentView(cardView)
+                                    .setFocusable(false)
                                     .apply();
                             easyPopup.showAtAnchorView(view, YGravity.ABOVE, XGravity.CENTER);
                              break;
@@ -355,6 +363,9 @@ public void showResultFuzzy(ArrayList<JSONObject> result){
                 case 5:
                     button.setBackground(applicationContext.getResources().getDrawable(R.drawable.checkbox_background_red));
                     break;
+                case 3:
+                    button.setBackground(applicationContext.getResources().getDrawable(R.drawable.checkbox_background_green));
+                    break;
                 case 2:
                 case 1:
                     button.setBackground(applicationContext.getResources().getDrawable(R.drawable.checkbox_background_lime));
@@ -385,6 +396,7 @@ public boolean onTouch(View view, MotionEvent motionEvent) {
                             textView.setText(tags);
                             easyPopup = EasyPopup.create(applicationContext)
                                     .setContentView(cardView)
+                                    .setFocusable(false)
                                     .apply();
                             easyPopup.showAtAnchorView(view, YGravity.ABOVE, XGravity.CENTER);
                             break;

diff --git a/versioninfo b/versioninfo
@@ -1,9 +1,10 @@
-versionCode 6
-versionName Alpha-3.2
-releaseNote 更新目标 SDK 为 Android Q
+versionCode 7
+versionName Alpha-3.3
+releaseNote 修复了公开招募查询干员信息窗口会意外获取焦点的问题
+公开招募查询 3★ 干员和 4★ 干员加以颜色区分
+修复了公开招募模糊查询结果标签重复的问题
+更新目标 SDK 为 Android Q
 添加公开招募模糊查询
 公开招募优先显示高星级干员
 暂时去除有时会很烦人的自动滚动
-重写了公开招募查询逻辑
-尝试修复Flyme系统无法获取悬浮窗权限的问题
-尝试修复企鹅物流无法登录的问题
+重写了公开招募查询逻辑