Skip to content

M
machine
Commit d7fdc3e1 by wjg
Options

修复bug

parent f44c9f91
Showing with 11 additions and 11 deletions
app/src/main/java/com/ihaoin/hooloo/device/view/ConfirmOrderDialog.java
...@@ -270,7 +270,7 @@ public class ConfirmOrderDialog extends Dialog { ...@@ -270,7 +270,7 @@ public class ConfirmOrderDialog extends Dialog {
return; return;
} }
String id = obj.toString(); String id = obj.toString().replaceAll("\"", "");
// id = AppConfig.MACHINE_CODE; // id = AppConfig.MACHINE_CODE;
Bitmap bitmap = genQRCode(id); Bitmap bitmap = genQRCode(id);
imgQRCode.setImageBitmap(bitmap); imgQRCode.setImageBitmap(bitmap);
......
app/src/main/res/values/dimens.xml
...@@ -37,15 +37,15 @@ ...@@ -37,15 +37,15 @@
<dimen name="tip_margin_top">40px</dimen> <dimen name="tip_margin_top">40px</dimen>
<dimen name="tip_padding_top">33px</dimen> <dimen name="tip_padding_top">33px</dimen>
<dimen name="tip_padding_bottom">33px</dimen> <dimen name="tip_padding_bottom">33px</dimen>
<dimen name="menu_divider_padding_hor">10dp</dimen> <dimen name="menu_divider_padding_hor">10px</dimen>
<dimen name="menu_divider_padding_top">60px</dimen> <dimen name="menu_divider_padding_top">20px</dimen>
<dimen name="menu_divider_padding_bottom">50px</dimen> <dimen name="menu_divider_padding_bottom">20px</dimen>
<dimen name="menu_content_padding_hor">55px</dimen> <dimen name="menu_content_padding_hor">25px</dimen>
<dimen name="menu_content_padding_top">38px</dimen> <dimen name="menu_content_padding_top">18px</dimen>
<dimen name="menu_content_padding_bottom">38px</dimen> <dimen name="menu_content_padding_bottom">18px</dimen>
<dimen name="menu_order_margin_top">43px</dimen> <dimen name="menu_order_margin_top">23px</dimen>
<dimen name="menu_spacing_hor">37px</dimen> <dimen name="menu_spacing_hor">10px</dimen>
<dimen name="menu_spacing_ver">20px</dimen> <dimen name="menu_spacing_ver">100px</dimen>
<dimen name="goods_detail_padding_ver">55px</dimen> <dimen name="goods_detail_padding_ver">55px</dimen>
<dimen name="goods_detail_padding_hor">40px</dimen> <dimen name="goods_detail_padding_hor">40px</dimen>
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
<dimen name="ts_order_number">12sp</dimen> <dimen name="ts_order_number">12sp</dimen>
<dimen name="ts_menu_title">22sp</dimen> <dimen name="ts_menu_title">22sp</dimen>
<dimen name="ts_menu_subtitle">18sp</dimen> <dimen name="ts_menu_subtitle">18sp</dimen>
<dimen name="ts_menu_subtitle1">14sp</dimen> <dimen name="ts_menu_subtitle1">12sp</dimen>
<dimen name="ts_setting_name">16sp</dimen> <dimen name="ts_setting_name">16sp</dimen>
<dimen name="ts_setting_desc">14sp</dimen> <dimen name="ts_setting_desc">14sp</dimen>
</resources> </resources>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment