diff --git a/.project b/.project new file mode 100644 index 0000000..1897cd1 --- /dev/null +++ b/.project @@ -0,0 +1,17 @@ + + + Arknights-Helper + Project Arknights-Helper created by Buildship. + + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + + org.eclipse.buildship.core.gradleprojectnature + + diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs new file mode 100644 index 0000000..e889521 --- /dev/null +++ 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 new file mode 100644 index 0000000..4a04201 --- /dev/null +++ b/app/.classpath @@ -0,0 +1,6 @@ + + + + + + diff --git a/app/.project b/app/.project new file mode 100644 index 0000000..ac485d7 --- /dev/null +++ b/app/.project @@ -0,0 +1,23 @@ + + + app + Project app created by Buildship. + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.buildship.core.gradleprojectnature + + diff --git a/app/.settings/org.eclipse.buildship.core.prefs b/app/.settings/org.eclipse.buildship.core.prefs new file mode 100644 index 0000000..b1886ad --- /dev/null +++ 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 index fe3cc07..ab9b152 100644 --- 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 index f43ecc7..591bb8f 100644 Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ diff --git a/app/release/output.json b/app/release/output.json index 8969abb..1eede1e 100644 --- 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":{}}] \ No newline at end of file +[{"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":{}}] \ No newline at end of file diff --git a/app/src/main/java/com/ssyanhuo/arknightshelper/overlay/Hr.java b/app/src/main/java/com/ssyanhuo/arknightshelper/overlay/Hr.java index 0301d34..6a5c10f 100644 --- 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 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 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 index baaa04a..22bc3f7 100644 --- 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系统无法获取悬浮窗权限的问题 -尝试修复企鹅物流无法登录的问题 \ No newline at end of file +重写了公开招募查询逻辑 \ No newline at end of file