修复测试反馈问题

common/src/main/java/com/yunbao/common/dialog/GiftWallMainTab2ClassicInfoDialog.java

@@ -193,7 +193,7 @@ public class GiftWallMainTab2ClassicInfoDialog extends AbsDialogPopupWindow {
         });
         if (giftWallGiftInfoDialog == null) {
             ViewUtils.findViewById(this, R.id.tv_rank, TextView.class).setText(WordUtil.getNewString(R.string.dialog_gift_wall_gfit_info_list_bottom_tips4));
-            ViewUtils.findViewById(this, R.id.rank_value, TextView.class).setText(String.valueOf(rank));
+            ViewUtils.findViewById(this, R.id.rank_value, TextView.class).setText("1");
         } else {
             ViewUtils.findViewById(this, R.id.rank_value, TextView.class).setText(String.valueOf(rank));
         }

common/src/main/java/com/yunbao/common/dialog/SudGameDoubleDialog.java

@@ -115,8 +115,9 @@ public class SudGameDoubleDialog extends AbsDialogCenterPopupWindow {
             boolean isFirstMe = CommonAppConfig.getInstance().getUid().equals(sudSettleBean1.getUid());
             boolean isDraw = sudSettleBean1.getWin_num() == sudSettleBean2.getWin_num();
             boolean isZh = WordUtil.isNewZh();
+            String myUid = CommonAppConfig.getInstance().getUid();
             LogUtils.e("isFirstMe:" + isFirstMe);
-            if(isActivityGame){
+            if (isActivityGame) {
                 findViewById(R.id.tips).setVisibility(View.INVISIBLE);
             }
             if (containMe) {
@@ -157,6 +158,15 @@ public class SudGameDoubleDialog extends AbsDialogCenterPopupWindow {
                     sub_title.setImageResource(isZh ? (isFirstMe ? R.mipmap.sub_win_zh : R.mipmap.sub_loss_zh) : (isFirstMe ? R.mipmap.sub_win_en : R.mipmap.sub_loss_en));
                     sub_win_hat.setVisibility(View.VISIBLE);
                 }
+                if (isActivityGame) {
+                    if (sudSettleBean1.getUid().equals(myUid)) {
+                        sub_loss_score.setVisibility(View.INVISIBLE);
+                        lossActivityIcon.setVisibility(View.INVISIBLE);
+                    } else {
+                        sub_win_score.setVisibility(View.INVISIBLE);
+                        winActivityIcon.setVisibility(View.INVISIBLE);
+                    }
+                }
             } else {
                 // 当前用户不在游戏中
                 ImgLoader.display(mContext, sudSettleBean1.getAvatar_url(), sub_win_head);
@@ -181,6 +191,12 @@ public class SudGameDoubleDialog extends AbsDialogCenterPopupWindow {
                     sub_title.setImageResource(isZh ? R.mipmap.sub_win_zh : R.mipmap.sub_win_en);
                     sub_win_hat.setVisibility(View.VISIBLE);
                 }
+                if (isActivityGame) {
+                    sub_win_score.setVisibility(View.INVISIBLE);
+                    winActivityIcon.setVisibility(View.INVISIBLE);
+                    sub_loss_score.setVisibility(View.INVISIBLE);
+                    lossActivityIcon.setVisibility(View.INVISIBLE);
+                }
             }
         }
         System.out.println("是否为活动游戏" + isActivityGame + " 成就内容:" + gameSettle.achievement);
@@ -194,8 +210,19 @@ public class SudGameDoubleDialog extends AbsDialogCenterPopupWindow {
                 ss.setSpan(new ForegroundColorSpan(Color.parseColor("#FFBA6A")), activityGameAchievementText.length(), ss.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
                 activityGameAchievement.setText(ss);
             }
-            lossActivityIcon.setVisibility(View.VISIBLE);
+            if (sub_loss_score.getVisibility() == View.VISIBLE) {
-            winActivityIcon.setVisibility(View.VISIBLE);
+                lossActivityIcon.setVisibility(View.VISIBLE);
+            }
+            if (sub_win_score.getVisibility() == View.VISIBLE) {
+                winActivityIcon.setVisibility(View.VISIBLE);
+            }
+            if(!containMe){
+                sub_win_score.setVisibility(View.INVISIBLE);
+                winActivityIcon.setVisibility(View.INVISIBLE);
+                sub_loss_score.setVisibility(View.INVISIBLE);
+                lossActivityIcon.setVisibility(View.INVISIBLE);
+            }
+
         }
     }
 

common/src/main/java/com/yunbao/common/manager/RandomSudGameManager.java

@@ -137,6 +137,7 @@ public class RandomSudGameManager {
         DialogUitl.Builder builder = new DialogUitl.Builder(mContext)
                 .setTitle(WordUtil.isNewZh() ? "提示" : "Hint")
                 .setHtmlCode(ss)
+                .setCancelable(true)
                 .setShowConfirmButton(true)
                 .setShowCancelButton(true);
         if (isAudience) {

common/src/main/java/com/yunbao/common/manager/game/BilliardsRandomManager.java

@@ -185,9 +185,6 @@ public class BilliardsRandomManager extends AbsRandomGameManager {
     @Override
     public void onGameMGCommonGameBilliardsHitState(SudMGPMGState.MGCommonGameBilliardsHitState model) {
         if (Integer.parseInt(model.uid) == IMLoginManager.get(AppManager.getInstance().getMainActivity()).getUserInfo().getId()) {
-            if (isOneOverForOther == 1) {
-                isOneOverForOther = 0;
-            }
             if (isOneOverForMy == -1) {
                 isOneOverForMy = 1;
             }
@@ -204,9 +201,6 @@ public class BilliardsRandomManager extends AbsRandomGameManager {
         } else {
             if (isOneOverForMy == 1) {
                 isOneOverForMy = 0;
-            }
-            if (isOneOverForMy == 0) {
-                isOneOverForMy = 2;
                 onSendNotOneOver();
             }
             if (isOneOverForOther == -1) {