Browse Source

修复多种不同口味冰激凌无法制作的问题

ccc 10 tháng trước cách đây
mục cha
commit
234352f989

+ 2 - 2
.idea/misc.xml

@@ -42,7 +42,7 @@
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_clean_finish.xml" value="0.24947916666666667" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_clean_schedule.xml" value="0.24947916666666667" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_common.xml" value="0.1358695652173913" />
-        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_ice_cream.xml" value="0.18895348837209303" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_ice_cream.xml" value="0.2" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_lock.xml" value="0.176" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_log.xml" value="0.24947916666666667" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_main.xml" value="0.152" />
@@ -59,7 +59,7 @@
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/item_shop_cart_dishes.xml" value="0.264" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/item_switch.xml" value="0.176" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/item_technology.xml" value="0.4" />
-        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/view_batching.xml" value="0.1" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/view_batching.xml" value="0.46194690265486726" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/view_contact.xml" value="0.6" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/view_shop_cart.xml" value="0.2" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/xml/file_paths.xml" value="0.1" />

+ 1 - 1
BaseLibrary/src/main/java/com/hboxs/base_library/constant/Global.java

@@ -33,7 +33,7 @@ public abstract class Global {
      * 1:
      * 2:国外线上
      */
-    public static final int isVersions = 2;
+    public static final int isVersions = 1;
 
     /**
      * 信用卡支付方式user

BIN
BaseLibrary/src/main/res/drawable/logo_umimatic.png


+ 1 - 1
app/src/main/java/com/bgy/autosale/ui/consumer/IceCreamFragment.java

@@ -1692,7 +1692,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
                 double totalSum = 0.0; // 用于存储总和
                 if (orderHelper.getOrderList().get(i).selectSpecBeans.size() > 0) {
                     for (int j = 0; j < orderHelper.getOrderList().get(i).selectSpecBeans.size(); j++) {
-                        totalSum += Double.parseDouble(orderHelper.getOrderList().get(i).selectSpecBeans.get(i).price);
+                        totalSum += Double.parseDouble(orderHelper.getOrderList().get(j).selectSpecBeans.get(j).price);
                     }
                     totalSum += shoppingCart.getPrice();
                 } else {

+ 2 - 0
app/src/main/res/layout/view_batching.xml

@@ -23,6 +23,8 @@
         android:background="@drawable/bg_button_white_rect"
         android:gravity="center"
         android:singleLine="true"
+        android:ellipsize="marquee"
+        android:marqueeRepeatLimit="5"
         android:clickable="true"
         android:textColor="@color/colorPrimary"
         android:textSize="@dimen/sp_9"

+ 1 - 1
config.gradle

@@ -5,7 +5,7 @@ ext {
             "minSdkVersion"                : 19,
             "targetSdkVersion"             : 28,
             "versionCode"                  : 110,
-            "versionName"                  : "1.0.32",//版本号修改
+            "versionName"                  : "1.0.34",//版本号修改
 
             "androidSupport"               : "28.0.0",
             "constraint-layout"            : "1.1.3",