1.算法bug处理2.界面以及逻辑调整3.添加BOSS数据监听界面

PCRTeamAnalyser/src/main/java/cn/sun45/pcrteamanalyser/analyse/Analyser.java

@@ -180,7 +180,15 @@ public Set<AnalyseResult>[] analyse(List<AnalyseTeam> teamlistOne, List<AnalyseT
  * @return 比对通过
  */
  public boolean compareTwo(AnalyseTeam teamOne, AnalyseTeam teamTwo, int[]... borrowIds) {
- if (teamOne.isEmpty() || teamTwo.isEmpty()) {
+ if (teamOne.isEmpty()) {
+ if (borrowIds.length == 1) {
+ borrowIds[0][1] = teamTwo.getBorrowId();
+ }
+ return true;
+ } else if (teamTwo.isEmpty()) {
+ if (borrowIds.length == 1) {
+ borrowIds[0][0] = teamOne.getBorrowId();
+ }
  return true;
  }
  List<Integer> repeatIdList = getRepeatIds(teamOne.getIds(), teamTwo.getIds());
@@ -202,17 +210,18 @@ public boolean compareTwo(AnalyseTeam teamOne, AnalyseTeam teamTwo, int[]... bor
  if (borrowDemand > 2) {
  return false;
  }
+ //需要生成借人位唯一Id列表
  if (borrowIds.length == 1) {
- if (borrowIdOne != 0) {
- if (repeatIdList.size() > 0) {
+ if (repeatIdList.size() > 0) {
+ if (borrowIdOne == 0) {
  borrowIdOne = repeatIdList.get(0);
  repeatIdList.remove(0);
  }
- }
- if (borrowIdTwo != 0) {
  if (repeatIdList.size() > 0) {
- borrowIdTwo = repeatIdList.get(0);
- repeatIdList.remove(0);
+ if (borrowIdTwo == 0) {
+ borrowIdTwo = repeatIdList.get(0);
+ repeatIdList.remove(0);
+ }
  }
  }
  borrowIds[0][0] = borrowIdOne;

app/build.gradle

@@ -88,4 +88,6 @@ dependencies {
  implementation files('libs/commons-compress-1.19.jar')
 
  implementation 'com.github.wanglu1209:PhotoViewer:0.50'
+
+ implementation files('libs/bcrloglib-release.aar')
 }

app/src/main/java/cn/sun45/warbanner/document/preference/BossConfigPreference.java

@@ -0,0 +1,269 @@
+package cn.sun45.warbanner.document.preference;
+
+import cn.sun45.warbanner.framework.document.preference.BasePreference;
+
+/**
+ * Created by Sun45 on 2023/9/10
+ */
+public class BossConfigPreference extends BasePreference {
+ //一王一阶段血量
+ private long bossOneStageOneHp;
+ //一王二阶段血量
+ private long bossOneStageTwoHp;
+ //一王三阶段血量
+ private long bossOneStageThreeHp;
+ //一王四阶段血量
+ private long bossOneStageFourHp;
+ //一王五阶段血量
+ private long bossOneStageFiveHp;
+
+
+ //二王一阶段血量
+ private long bossTwoStageOneHp;
+ //二王二阶段血量
+ private long bossTwoStageTwoHp;
+ //二王三阶段血量
+ private long bossTwoStageThreeHp;
+ //二王四阶段血量
+ private long bossTwoStageFourHp;
+ //二王五阶段血量
+ private long bossTwoStageFiveHp;
+
+ //三王一阶段血量
+ private long bossThreeStageOneHp;
+ //三王二阶段血量
+ private long bossThreeStageTwoHp;
+ //三王三阶段血量
+ private long bossThreeStageThreeHp;
+ //三王四阶段血量
+ private long bossThreeStageFourHp;
+ //三王五阶段血量
+ private long bossThreeStageFiveHp;
+
+ //四王一阶段血量
+ private long bossFourStageOneHp;
+ //四王二阶段血量
+ private long bossFourStageTwoHp;
+ //四王三阶段血量
+ private long bossFourStageThreeHp;
+ //四王四阶段血量
+ private long bossFourStageFourHp;
+ //四王五阶段血量
+ private long bossFourStageFiveHp;
+
+ //五王一阶段血量
+ private long bossFiveStageOneHp;
+ //五王二阶段血量
+ private long bossFiveStageTwoHp;
+ //五王三阶段血量
+ private long bossFiveStageThreeHp;
+ //五王四阶段血量
+ private long bossFiveStageFourHp;
+ //五王五阶段血量
+ private long bossFiveStageFiveHp;
+
+ public long getBossOneStageOneHp() {
+ return load("bossOneStageOneHp");
+ }
+
+ public void setBossOneStageOneHp(long bossOneStageOneHp) {
+ save("bossOneStageOneHp", bossOneStageOneHp);
+ }
+
+ public long getBossOneStageTwoHp() {
+ return load("bossOneStageTwoHp");
+ }
+
+ public void setBossOneStageTwoHp(long bossOneStageTwoHp) {
+ save("bossOneStageTwoHp", bossOneStageTwoHp);
+ }
+
+ public long getBossOneStageThreeHp() {
+ return load("bossOneStageThreeHp");
+ }
+
+ public void setBossOneStageThreeHp(long bossOneStageThreeHp) {
+ save("bossOneStageThreeHp", bossOneStageThreeHp);
+ }
+
+ public long getBossOneStageFourHp() {
+ return load("bossOneStageFourHp");
+ }
+
+ public void setBossOneStageFourHp(long bossOneStageFourHp) {
+ save("bossOneStageFourHp", bossOneStageFourHp);
+ }
+
+ public long getBossOneStageFiveHp() {
+ return load("bossOneStageFiveHp");
+ }
+
+ public void setBossOneStageFiveHp(long bossOneStageFiveHp) {
+ save("bossOneStageFiveHp", bossOneStageFiveHp);
+ }
+
+ public long getBossTwoStageOneHp() {
+ return load("bossTwoStageOneHp");
+ }
+
+ public void setBossTwoStageOneHp(long bossTwoStageOneHp) {
+ save("bossTwoStageOneHp", bossTwoStageOneHp);
+ }
+
+ public long getBossTwoStageTwoHp() {
+ return load("bossTwoStageTwoHp");
+ }
+
+ public void setBossTwoStageTwoHp(long bossTwoStageTwoHp) {
+ save("bossTwoStageTwoHp", bossTwoStageTwoHp);
+ }
+
+ public long getBossTwoStageThreeHp() {
+ return load("bossTwoStageThreeHp");
+ }
+
+ public void setBossTwoStageThreeHp(long bossTwoStageThreeHp) {
+ save("bossTwoStageThreeHp", bossTwoStageThreeHp);
+ }
+
+ public long getBossTwoStageFourHp() {
+ return load("bossTwoStageFourHp");
+ }
+
+ public void setBossTwoStageFourHp(long bossTwoStageFourHp) {
+ save("bossTwoStageFourHp", bossTwoStageFourHp);
+ }
+
+ public long getBossTwoStageFiveHp() {
+ return load("bossTwoStageFiveHp");
+ }
+
+ public void setBossTwoStageFiveHp(long bossTwoStageFiveHp) {
+ save("bossTwoStageFiveHp", bossTwoStageFiveHp);
+ }
+
+ public long getBossThreeStageOneHp() {
+ return load("bossThreeStageOneHp");
+ }
+
+ public void setBossThreeStageOneHp(long bossThreeStageOneHp) {
+ save("bossThreeStageOneHp", bossThreeStageOneHp);
+ }
+
+ public long getBossThreeStageTwoHp() {
+ return load("bossThreeStageTwoHp");
+ }
+
+ public void setBossThreeStageTwoHp(long bossThreeStageTwoHp) {
+ save("bossThreeStageTwoHp", bossThreeStageTwoHp);
+ }
+
+ public long getBossThreeStageThreeHp() {
+ return load("bossThreeStageThreeHp");
+ }
+
+ public void setBossThreeStageThreeHp(long bossThreeStageThreeHp) {
+ save("bossThreeStageThreeHp", bossThreeStageThreeHp);
+ }
+
+ public long getBossThreeStageFourHp() {
+ return load("bossThreeStageFourHp");
+ }
+
+ public void setBossThreeStageFourHp(long bossThreeStageFourHp) {
+ save("bossThreeStageFourHp", bossThreeStageFourHp);
+ }
+
+ public long getBossThreeStageFiveHp() {
+ return load("bossThreeStageFiveHp");
+ }
+
+ public void setBossThreeStageFiveHp(long bossThreeStageFiveHp) {
+ save("bossThreeStageFiveHp", bossThreeStageFiveHp);
+ }
+
+ public long getBossFourStageOneHp() {
+ return load("bossFourStageOneHp");
+ }
+
+ public void setBossFourStageOneHp(long bossFourStageOneHp) {
+ save("bossFourStageOneHp", bossFourStageOneHp);
+ }
+
+ public long getBossFourStageTwoHp() {
+ return load("bossFourStageTwoHp");
+ }
+
+ public void setBossFourStageTwoHp(long bossFourStageTwoHp) {
+ save("bossFourStageTwoHp", bossFourStageTwoHp);
+ }
+
+ public long getBossFourStageThreeHp() {
+ return load("bossFourStageThreeHp");
+ }
+
+ public void setBossFourStageThreeHp(long bossFourStageThreeHp) {
+ save("bossFourStageThreeHp", bossFourStageThreeHp);
+ }
+
+ public long getBossFourStageFourHp() {
+ return load("bossFourStageFourHp");
+ }
+
+ public void setBossFourStageFourHp(long bossFourStageFourHp) {
+ save("bossFourStageFourHp", bossFourStageFourHp);
+ }
+
+ public long getBossFourStageFiveHp() {
+ return load("bossFourStageFiveHp");
+ }
+
+ public void setBossFourStageFiveHp(long bossFourStageFiveHp) {
+ save("bossFourStageFiveHp", bossFourStageFiveHp);
+ }
+
+ public long getBossFiveStageOneHp() {
+ return load("bossFiveStageOneHp");
+ }
+
+ public void setBossFiveStageOneHp(long bossFiveStageOneHp) {
+ save("bossFiveStageOneHp", bossFiveStageOneHp);
+ }
+
+ public long getBossFiveStageTwoHp() {
+ return load("bossFiveStageTwoHp");
+ }
+
+ public void setBossFiveStageTwoHp(long bossFiveStageTwoHp) {
+ save("bossFiveStageTwoHp", bossFiveStageTwoHp);
+ }
+
+ public long getBossFiveStageThreeHp() {
+ return load("bossFiveStageThreeHp");
+ }
+
+ public void setBossFiveStageThreeHp(long bossFiveStageThreeHp) {
+ save("bossFiveStageThreeHp", bossFiveStageThreeHp);
+ }
+
+ public long getBossFiveStageFourHp() {
+ return load("bossFiveStageFourHp");
+ }
+
+ public void setBossFiveStageFourHp(long bossFiveStageFourHp) {
+ save("bossFiveStageFourHp", bossFiveStageFourHp);
+ }
+
+ public long getBossFiveStageFiveHp() {
+ return load("bossFiveStageFiveHp");
+ }
+
+ public void setBossFiveStageFiveHp(long bossFiveStageFiveHp) {
+ save("bossFiveStageFiveHp", bossFiveStageFiveHp);
+ }
+
+ @Override
+ public String getName() {
+ return "bossconfig";
+ }
+}