Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

app/src/main/java/com/kfzs/duanduan/adp/AdpSearchGame.java

@@ -9,6 +9,7 @@ import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
 import com.kfzs.duanduan.proto.GameOuterClass;
+import com.kfzs.duanduan.utils.DiscountUtils;
 import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.kfzs.duanduan.utils.dlg.DownBtnUtils;
 import com.kfzs.duanduan.utils.dlg.SkipUtils;
@@ -64,9 +65,12 @@ public class AdpSearchGame extends BaseAdpterWithDownBtn {
             convertView = View.inflate(mContext, R.layout.listview_item_game_info, null);
             convertView.setOnClickListener(cls_GoDetail);
         }
+        DiscountUtils.getInstance().showDiscount(convertView,
+                getItem(position).getIconImage(),
+                getItem(position).getDiscount());
 
-        Glide.with(mContext).load(getItem(position).getIconImage())
-                .into(ViewFindUtils.find(convertView, R.id.img_logo, ImageView.class));
+//        Glide.with(mContext).load(getItem(position).getIconImage())
+//                .into(ViewFindUtils.find(convertView, R.id.img_logo, ImageView.class));
 
         ViewFindUtils.find(convertView, R.id.img_listview_item_game_info)
                 .setVisibility(getItem(position).getExistGift() == 1 ? View.VISIBLE : View.GONE);

app/src/main/res/layout/logo_60dp.xml

@@ -16,7 +16,8 @@
         android:id="@+id/img_discount"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/jiaobiao_bg" />
+        android:src="@drawable/jiaobiao_bg"
+        android:visibility="gone"/>
 
     <TextView
         android:id="@+id/txt_logo_discount"
@@ -29,7 +30,7 @@
         android:layout_marginTop="2dp"
         android:gravity="top|left"
         android:rotation="315"
-        android:text="9.5折"
+        android:text=""
         android:textColor="@color/white"
         android:textSize="9sp" />
 </RelativeLayout>