Skip to content

T
TangKuPos
Commit 63cad057 authored by zhang_z's avatar zhang_z
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 59c7eb1f ac775b7a
Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 77 deletions
app/src/main/java/com/xingdata/zzdpos/ui/marketing/viplevel/fragment/VipLevelEditFragment.java
View file @ 63cad057
......@@ -33,7 +33,7 @@ public class VipLevelEditFragment extends BaseFragment<LevelPresenter, FragmentV
pop();
});
if (mLevel != null) {
mViewBinding.infoTitle.tvTitle.setText("修改会员");
mViewBinding.infoTitle.tvTitle.setText("等级编辑");
mViewBinding.levelName.setText(mLevel.getVipLevelName());
mViewBinding.levelDiscont.setText(String.valueOf(mLevel.getVipDefDiscount()));
mViewBinding.updateMoney.setText( ConvertUtil.fenToYuanNoZero(mLevel.getVipUpgradeAmtTp()));
......
app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java
View file @ 63cad057
......@@ -28,8 +28,8 @@ public final class SystemUtil {
* @return 设备型号
*/
public static String getDeviceModel() {
// return DeviceUtils.getModel();
return "AECRC10";
return DeviceUtils.getModel();
// return "AECRC10";
}
......@@ -57,8 +57,8 @@ public final class SystemUtil {
e.printStackTrace();
}
}
// return deviceSN;
return "548496";
return deviceSN;
// return "548496";
}
/**
......
app/src/main/res/layout/fragment_vip_level_edit.xml
View file @ 63cad057
......@@ -75,7 +75,6 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginRight="@dimen/all_margin_left"
android:background="@color/line_bg" />
<LinearLayout
......@@ -106,11 +105,7 @@
</LinearLayout>
</LinearLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="@mipmap/img_grade" />
</LinearLayout>
<View
......
app/src/main/res/layout/item_user_list_item.xml
View file @ 63cad057
......@@ -4,78 +4,87 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_margin"
android:background="@mipmap/img_boss" />
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="horizontal">
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_margin"
android:background="@mipmap/img_boss" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:layout_weight="1"
<TextView
android:id="@+id/user_name"
style="@style/default_blacktext_bigstyle"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="张小萌" />
android:orientation="horizontal">
<TextView
android:id="@+id/user_mobile"
style="@style/default_blacktext_smallstyle"
<TextView
android:id="@+id/user_name"
style="@style/default_blacktext_bigstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="张小萌" />
<TextView
android:id="@+id/user_mobile"
style="@style/default_blacktext_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="13311556556" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="13311556556" />
android:orientation="horizontal">
<TextView
android:id="@+id/today_income"
style="@style/default_gray_huanggaitext_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/Today_Income"
android:visibility="gone" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:layout_marginRight="@dimen/all_margin"
android:orientation="vertical">
<TextView
android:id="@+id/today_income"
style="@style/default_gray_huanggaitext_smallstyle"
android:id="@+id/vip_level_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/Today_Income"
android:visibility="gone" />
android:textColor="@color/black"
android:textSize="@dimen/detail_textview_size" />
<TextView
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="@color/deep_red" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/all_margin"
android:orientation="vertical">
<TextView
android:id="@+id/vip_level_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textSize="@dimen/detail_textview_size" />
<TextView
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="@color/deep_red" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/item_vip_expense_item.xml
View file @ 63cad057
......@@ -73,7 +73,10 @@
android:textColor="@color/black_likui" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
</LinearLayout>
......
app/src/main/res/layout/item_vip_list_item.xml
View file @ 63cad057
......@@ -4,32 +4,45 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:text="张小萌"
android:id="@+id/vip_name"
style="@style/default_blacktext_bigstyle"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/vip_name"
style="@style/default_blacktext_bigstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="张小萌" />
<TextView
android:id="@+id/vip_mobile"
style="@style/default_blacktext_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="13311556556" />
</LinearLayout>
<TextView
android:text="13311556556"
android:id="@+id/vip_mobile"
android:id="@+id/vipDiscount"
style="@style/default_blacktext_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:text="85折" />
</LinearLayout>
<TextView
android:text="85折"
android:id="@+id/vipDiscount"
style="@style/default_blacktext_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
</LinearLayout>
</layout>
\ No newline at end of file
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