|
@@ -535,8 +535,25 @@ public class DetailActivity extends PresenterActivity<DetailContract.Presenter>
|
535
|
535
|
name.setText(product.getName());
|
536
|
536
|
//text.setText(product.getDescription());
|
537
|
537
|
//mark.setValue(Double.parseDouble(product.getStar()));
|
|
538
|
+ int upper_amount = product.getLower_amount();
|
|
539
|
+ int upper_amount1 = product.getUpper_amount();
|
|
540
|
+ if(upper_amount<100000){
|
|
541
|
+ if(upper_amount1<10000){
|
|
542
|
+ money1.setText(product.getUpper_amount()+"-" + product.getLower_amount());
|
|
543
|
+ }else {
|
|
544
|
+ money1.setText(getoverdate(product.getUpper_amount())+"万-" + getoverdate2(product.getLower_amount())+"万");
|
|
545
|
+
|
|
546
|
+ }
|
|
547
|
+
|
|
548
|
+ }else {
|
|
549
|
+ if(upper_amount1<1000){
|
|
550
|
+ money1.setText(product.getUpper_amount()+"-" + getoverdate2(product.getLower_amount())+"万");
|
|
551
|
+ }else {
|
|
552
|
+ money1.setText(getoverdate(product.getUpper_amount())+"万-" + getoverdate2(product.getLower_amount())+"万");
|
|
553
|
+
|
|
554
|
+ }
|
|
555
|
+ }
|
538
|
556
|
|
539
|
|
- money1.setText(getoverdate(product.getUpper_amount()) + "万-" + getoverdate2(product.getLower_amount())+"万");
|
540
|
557
|
//timer.setText("期限(" + product.getTerm() + ")");
|
541
|
558
|
if (product.getIs_quality() != null) {
|
542
|
559
|
if (product.getIs_quality().equals("0")) {
|
|
@@ -1132,7 +1149,6 @@ try {
|
1132
|
1149
|
popupWindow.setFocusable(true);
|
1133
|
1150
|
popupWindow.showAtLocation(layout, Gravity.BOTTOM, 0, 0);
|
1134
|
1151
|
light(0.8f);
|
1135
|
|
-
|
1136
|
1152
|
popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
|
1137
|
1153
|
@Override
|
1138
|
1154
|
public void onDismiss() {
|