Skip to content

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

Merge remote-tracking branch 'origin/master'

parents cdf65aec a209e4e1
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 21 deletions
app/src/main/java/com/xingdata/zzdpos/App.java
View file @ da912292
......@@ -118,6 +118,10 @@ public class App extends Application {
*/
private void initFragment() {
// Fragmentation.builder().stackViewMode(Fragmentation.BUBBLE).debug(BuildConfig.DEBUG)
// .handleException(e -> {
// }).install();
//正式版本
Fragmentation.builder().stackViewMode(Fragmentation.BUBBLE)
.handleException(e -> {
}).install();
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/recharge/fragment/RechargeRuleEditFragment.java
View file @ da912292
......@@ -56,6 +56,7 @@ public class RechargeRuleEditFragment extends BaseFragment<RechargeRulePresenter
mViewBinding.ruleNameLayout.setVisibility(View.GONE);
mViewBinding.infoTitle.tvTitle.setText("新增充值优惠");
mViewBinding.ruleNameLayout.setVisibility(View.VISIBLE);
((RadioButton)mViewBinding.ruleState.getChildAt(0)).setChecked(true);
}
mViewBinding.setOnClickListener(view -> {
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/recharge/fragment/RechargeRuleListFragment.java
View file @ da912292
......@@ -70,6 +70,14 @@ public class RechargeRuleListFragment extends BaseFragment<RechargeRulePresenter
}
public void mscardQuerySus(Pager<Mscard> mscardPager) {
if (mscardPager.getList().size() != 0) {
mViewBinding.noRultBg.setVisibility(View.GONE);
} else {
mViewBinding.noRultBg.setVisibility(View.VISIBLE);
}
adapter.setNewData(mscardPager.getList());
adapter.setEnableLoadMore(false);
adapter.loadMoreComplete();
}
}
app/src/main/java/com/xingdata/zzdpos/ui/vip/VipPresenter.java
View file @ da912292
......@@ -161,7 +161,7 @@ public class VipPresenter extends VipContract.Presenter {
// ArrayList<RadioButton> radioButtons = new ArrayList<>();
radioButton.setTextSize(18);
radioButton.setTag(mscard.getCruleGradeNo());
radioButton.setText("充：" + mscard.getCruleChargeAmt() / 100);
radioButton.setText(String.valueOf(mscard.getCruleChargeAmt() / 100));
radioButton.setButtonDrawable(null);
radioButton.setGravity(Gravity.CENTER);
radioButton.getPaint().setFakeBoldText(true);
......
app/src/main/res/layout/fragment_recharge_rule_edit.xml
View file @ da912292
......@@ -21,7 +21,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin"
android:layout_margin="@dimen/all_margin"
android:gravity="center_vertical"
android:orientation="horizontal">
......@@ -32,6 +32,11 @@
android:text="基本信息" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -71,7 +76,6 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginRight="@dimen/all_margin_left"
android:background="@color/line_bg" />
<LinearLayout
......@@ -130,7 +134,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin"
android:layout_margin="@dimen/all_margin"
android:gravity="center_vertical"
android:orientation="horizontal">
......@@ -141,6 +145,11 @@
android:text="优惠规则" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -148,7 +157,6 @@
android:orientation="horizontal">
<TextView
style="@style/default_blacktext_margin_smallstyle"
android:layout_width="100dp"
android:layout_height="wrap_content"
......@@ -174,6 +182,11 @@
android:text="元" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -206,6 +219,10 @@
android:text="元" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<LinearLayout
android:layout_width="match_parent"
......@@ -230,6 +247,11 @@
android:onClick="@{onClickListener}" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -253,6 +275,11 @@
android:onClick="@{onClickListener}" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
......
app/src/main/res/layout/fragment_user_info.xml
View file @ da912292
......@@ -92,10 +92,6 @@
android:layout_height="1dp"
android:background="@color/line_bg" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<LinearLayout
android:layout_width="match_parent"
......
app/src/main/res/layout/fragment_user_info_edit.xml
View file @ da912292
......@@ -17,14 +17,16 @@
<include
android:id="@+id/info_title"
layout="@layout/title_pop" />
<View
android:layout_marginTop="@dimen/all_margin"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/white"
android:orientation="horizontal">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......
app/src/main/res/layout/fragment_vip_info_edit.xml
View file @ da912292
......@@ -208,7 +208,10 @@
android:onClick="@{onClickListener}" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
......
app/src/main/res/layout/fragment_vip_level_edit.xml
View file @ da912292
......@@ -21,7 +21,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin"
android:layout_margin="@dimen/all_margin"
android:gravity="center_vertical"
android:orientation="horizontal">
......@@ -32,6 +32,11 @@
android:text="基本信息" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -89,14 +94,14 @@
<EditText
android:id="@+id/level_discont"
android:maxLength="3"
style="@style/dialog_edit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:digits="0123456789"
android:hint="%"
android:inputType="numberSigned" />
android:inputType="numberSigned"
android:maxLength="3" />
</LinearLayout>
</LinearLayout>
......@@ -116,7 +121,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin"
android:layout_margin="@dimen/all_margin"
android:gravity="center_vertical"
android:orientation="horizontal">
......@@ -127,6 +132,11 @@
android:text="晋级标准" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -147,9 +157,9 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@null"
android:maxLength="3"
android:digits="0123456789"
android:inputType="phone" />
android:inputType="phone"
android:maxLength="3" />
<TextView
style="@style/default_blacktext_margin_smallstyle"
......@@ -158,6 +168,11 @@
android:text="天" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -177,10 +192,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:maxLength="8"
android:background="@null"
android:digits="0123456789"
android:inputType="phone" />
android:inputType="phone"
android:maxLength="8" />
<TextView
style="@style/default_blacktext_margin_smallstyle"
......
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