Преглед изворни кода

限时抢购中原价添加一条线;修复简单任务作为子任务时无法打开的问题

zengjiebin пре 7 година
родитељ
комит
e32b04f21c

+ 1 - 0
app/src/main/java/com/sheep/gamegroup/module/game/util/PromoteGoodsHelper.java

@@ -132,6 +132,7 @@ public class PromoteGoodsHelper {
         if(item == null){
             return;
         }
+        ViewUtil.showMiddleLine(item_yuan_jia_tv);
         ViewUtil.setImage(item_icon_iv, item.getGoods_thumb());
         ViewUtil.setText(item_name_tv, item.getGoods_name());
         ViewUtil.setText(item_remainder_time, item.getRemainderTime());

+ 3 - 2
app/src/main/java/com/sheep/gamegroup/module/home/adapter/AdpPromoteGoods.java

@@ -45,11 +45,12 @@ public class AdpPromoteGoods extends BaseQuickAdapter<PromoteGoods, BaseViewHold
         if(item == null){
             return;
         }
+        ViewUtil.showMiddleLine(item_yuan_jia_tv);
         ViewUtil.setImage(item_icon_iv, item.getGoods_thumb());
         ViewUtil.setText(item_name_tv, item.getGoods_name());
         ViewUtil.setText(item_remainder_time, item.getRemainderTime());
-        ViewUtil.setText(item_yuan_jia_tv, item.getPromotePriceText());
-        ViewUtil.setText(item_xian_jia_tv, item.getMarketPriceText());
+        ViewUtil.setText(item_xian_jia_tv, item.getPromotePriceText());
+        ViewUtil.setText(item_yuan_jia_tv, item.getMarketPriceText());
         ViewUtil.setText(item_discount_tv, item.getDiscountText());
         item_discount_box.setOnClickListener(view -> {
             String url = String.format(Locale.CHINA, "%s?id=%s", baseUrl, item.getGoods_id());

+ 0 - 4
app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -2027,10 +2027,6 @@ public class Jump2View {
      * 幂动科技
      */
     public void goMiDong(final Activity activity, Object o) {
-        if (!SheepApp.getInstance().isShowMidong()) {
-            G.showToast("敬请期待");
-            return;
-        }
         CommonUtil.getInstance().initMiDong(activity, DataUtil.getInstance().getUserId());
         if (SheepApp.getInstance().isInitMidong()) {
             Intent intent = new Intent(activity, ActMiDong.class);

+ 12 - 0
app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java

@@ -10,6 +10,7 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
+import android.graphics.Paint;
 import android.graphics.Typeface;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
@@ -372,6 +373,17 @@ public class ViewUtil {
 
     }
 
+    public static void showMiddleLine(TextView textView) {
+        if(textView != null){
+            textView.getPaint().setFlags(Paint.STRIKE_THRU_TEXT_FLAG | Paint.ANTI_ALIAS_FLAG );
+        }
+    }
+    public static void showUnderLine(TextView textView) {
+        if(textView != null){
+            textView.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG  | Paint.ANTI_ALIAS_FLAG );
+        }
+    }
+
     /**
      * 主页抢任务,更换任务时,获取新的任务
      *

+ 2 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/ActSheepApkList.java

@@ -12,6 +12,7 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.kfzs.duanduan.utils.ApkUtils;
 import com.sheep.gamegroup.absBase.AbsObserver;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.ApkInfo;
@@ -142,6 +143,7 @@ public class ActSheepApkList extends BaseActivity {
         appInfo.setApkSize(Formatter.formatFileSize(SheepApp.getInstance(), apkSize));
         appInfo.setUserApp(false);
         appInfo.setSD(false);
+        appInfo.setSignMd5(ApkUtils.getSignMd5(pkgInfo));
 
         apkInfo.setAppInfo(appInfo);
         apkInfo.setFile(file);

+ 0 - 1
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtSmallSheep.java

@@ -874,7 +874,6 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
             }
             addNewTask();
             SheepApp.getInstance().setShowQB(isShowQB);
-            SheepApp.getInstance().setShowMidong(isShowMd);
             ViewUtil.notifyDataSetChanged(full_home_list_rv);
             adpHomeList.notifyDataSetChanged();
         }

+ 0 - 9
app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -90,7 +90,6 @@ public class SheepApp extends MultiDexApplication {
     private NetComponent netComponent;
     private boolean isShowQB;
     private boolean isInitMidong = false;
-    private boolean isShowMidong = false;
     private String gameCode;//游戏code
     private String gamePackgeName;
     private boolean gameFlag;
@@ -119,14 +118,6 @@ public class SheepApp extends MultiDexApplication {
         this.gameCode = gameCode;
     }
 
-    public boolean isShowMidong() {
-        return isShowMidong;
-    }
-
-    public void setShowMidong(boolean showMidong) {
-        isShowMidong = showMidong;
-    }
-
     public boolean isInitMidong() {
         return isInitMidong;
     }