fix ui

meanfan · Nov 5, 2018 · be9c459 · be9c459
1 parent aaa2968
commit be9c459
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/app/src/main/java/com/mxswork/order/SelectCouponActivity.java b/app/src/main/java/com/mxswork/order/SelectCouponActivity.java
@@ -6,6 +6,7 @@
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.RadioButton;
@@ -53,19 +54,22 @@ private void initListView(){
         if(userCouponInfos.length==0){
             findViewById(R.id.tv_coupon_none).setVisibility(View.VISIBLE);
         }
+        //TODO margin没效果
+        RadioGroup.LayoutParams rglp = new RadioGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,ViewGroup.LayoutParams.WRAP_CONTENT);
+        rglp.setMargins(5,15,0,0);
         rg_select_coupon = findViewById(R.id.rg_select_coupon);
         RadioButton firstRadioButton = (RadioButton) LayoutInflater.from(this).inflate(R.layout.item_select_coupon_radio_button,null);
         firstRadioButton.setId(0);
         firstRadioButton.setText("不使用优惠券");
-        rg_select_coupon.addView(firstRadioButton);
+        rg_select_coupon.addView(firstRadioButton,rglp);
         for(int i=0;i<userCouponInfos.length;i++){
             String name = LocalJsonHelper.getCouponById(this,userCouponInfos[i].getId()).getName();
             int amount = userCouponInfos[i].getCount();
             String title = String.format("%s （ %d 张）",name,amount);
             RadioButton radioButton = (RadioButton) LayoutInflater.from(this).inflate(R.layout.item_select_coupon_radio_button,null);
             radioButton.setId(userCouponInfos[i].getId());  //为方便将优惠券id设置为radioButton的id
             radioButton.setText(title);
-            rg_select_coupon.addView(radioButton);
+            rg_select_coupon.addView(radioButton,rglp);
         }
         rg_select_coupon.clearCheck();
         if(selectedCouponId == -1){

diff --git a/app/src/main/java/com/mxswork/order/fragment/DishFragment.java b/app/src/main/java/com/mxswork/order/fragment/DishFragment.java
@@ -333,7 +333,6 @@ public int compare(OrderDishInfo info, OrderDishInfo i1) {
                     if(TextUtils.equals(info.getFlavour(),i1.getFlavour())){
                         return 0;
                     }else{
-                        //TODO 测试是否保持了顺序
                         return -1;
                     }
                 }