Browse Source

1.23ui修改

小狼 5 years ago
parent
commit
e11d8a5447

+ 0 - 1
app/src/main/java/com/smileflowpig/money/moneyplatfrom/LaunchActivity.java

231
 
231
 
232
     }
232
     }
233
 
233
 
234
-
235
     @Override
234
     @Override
236
     public void setStartImage(AdModel adModel) {
235
     public void setStartImage(AdModel adModel) {
237
         this.adModel = adModel;
236
         this.adModel = adModel;

+ 18 - 2
app/src/main/java/com/smileflowpig/money/moneyplatfrom/activities/DetailActivity.java

535
         name.setText(product.getName());
535
         name.setText(product.getName());
536
         //text.setText(product.getDescription());
536
         //text.setText(product.getDescription());
537
         //mark.setValue(Double.parseDouble(product.getStar()));
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
         //timer.setText("期限(" + product.getTerm() + ")");
557
         //timer.setText("期限(" + product.getTerm() + ")");
541
         if (product.getIs_quality() != null) {
558
         if (product.getIs_quality() != null) {
542
             if (product.getIs_quality().equals("0")) {
559
             if (product.getIs_quality().equals("0")) {
1132
         popupWindow.setFocusable(true);
1149
         popupWindow.setFocusable(true);
1133
         popupWindow.showAtLocation(layout, Gravity.BOTTOM, 0, 0);
1150
         popupWindow.showAtLocation(layout, Gravity.BOTTOM, 0, 0);
1134
         light(0.8f);
1151
         light(0.8f);
1135
-
1136
         popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
1152
         popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
1137
             @Override
1153
             @Override
1138
             public void onDismiss() {
1154
             public void onDismiss() {

+ 0 - 1
app/src/main/res/layout/newsex_layout.xml

3
     android:layout_width="match_parent"
3
     android:layout_width="match_parent"
4
     android:layout_height="match_parent"
4
     android:layout_height="match_parent"
5
     android:orientation="vertical"
5
     android:orientation="vertical"
6
-
7
     android:gravity="center_horizontal"
6
     android:gravity="center_horizontal"
8
     >
7
     >
9
     <LinearLayout
8
     <LinearLayout