Commit ee6bb789 authored by 王海's avatar 王海

发券

parent 01372794
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.xingdata.zzdpos"> package="com.xingdata.zzdpos">
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.SEND_SMS" /> <uses-permission android:name="android.permission.SEND_SMS"/>
<application <application
android:name=".App" android:name=".App"
...@@ -25,64 +25,65 @@ ...@@ -25,64 +25,65 @@
android:configChanges="keyboard|orientation|screenSize|keyboardHidden" android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity
android:name=".ui.login.LoginActivity" android:name=".ui.login.LoginActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden" android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:windowSoftInputMode="adjustUnspecified|stateHidden" /> android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
<activity <activity
android:name=".ui.exception.ErrorDialogActivity" android:name=".ui.exception.ErrorDialogActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden" android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:theme="@style/Theme.AppCompat.Light.Dialog" /> android:theme="@style/Theme.AppCompat.Light.Dialog"/>
<activity <activity
android:name=".ui.exception.ServerErrActivity" android:name=".ui.exception.ServerErrActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden" android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:theme="@style/Theme.AppCompat.Light.Dialog" /> android:theme="@style/Theme.AppCompat.Light.Dialog"/>
<activity <activity
android:name=".ui.payment.PaymentActivity" android:name=".ui.payment.PaymentActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden" android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:windowSoftInputMode="adjustUnspecified|stateHidden" /> android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
<activity <activity
android:name=".ui.marketing.integral.IntegralActivity" android:name=".ui.marketing.integral.IntegralActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden" android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:theme="@style/AppTheme" android:theme="@style/AppTheme"
android:windowSoftInputMode="adjustUnspecified|stateHidden" /> android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
<activity <activity
android:name=".ui.marketing.ticket.ReturnTicketActivity" android:name=".ui.marketing.ticket.ReturnTicketActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden" android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:label="@string/title_activity_ticket" android:label="@string/title_activity_ticket"
android:theme="@style/AppTheme" /> android:theme="@style/AppTheme"/>
<activity <activity
android:name=".ui.sendticke.SendTicketActivity" android:name=".ui.sendticke.SendTicketActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden" android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:label="@string/title_activity_ticket" android:label="@string/title_activity_ticket"
android:theme="@style/AppTheme" /> android:theme="@style/AppTheme"/>
<activity <activity
android:name=".ui.settle.SettleActivity" android:name=".ui.settle.SettleActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden" android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:windowSoftInputMode="adjustUnspecified|stateHidden" /> android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
<activity <activity
android:name=".ui.store.StoreActivity" android:name=".ui.store.StoreActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden" android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:windowSoftInputMode="adjustUnspecified|stateHidden" /> android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
<activity <activity
android:name=".ui.announcement.AnnouncementActivity" android:name=".ui.announcement.AnnouncementActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden" android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/AppTheme" android:theme="@style/AppTheme"
android:windowSoftInputMode="adjustUnspecified|stateHidden" /> android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
<activity android:name=".ui.help.HelpActivity" /> <activity android:name=".ui.help.HelpActivity"/>
<activity android:name=".ui.feedback.FeedBackActivity" /> <activity android:name=".ui.feedback.FeedBackActivity"/>
<activity android:name=".ui.statistics.StatisticsActivity"></activity> <activity android:name=".ui.statistics.StatisticsActivity"/>
<activity <activity
android:name=".ui.vip.VipActivity" android:name=".ui.vip.VipActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden" android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:windowSoftInputMode="adjustUnspecified|stateHidden" /> android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
<activity android:name=".ui.marketing.marketingMenu.MarketingMenuActivity">
</activity>
</application> </application>
</manifest> </manifest>
\ No newline at end of file
package com.xingdata.zzdpos.ui.marketing.marketingMenu;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import com.xingdata.zzdpos.R;
public class MarketingMenuActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_marketing_menu);
}
}
...@@ -52,13 +52,15 @@ public class SendTicketActivity extends BaseActivity<SendTicketPresenter, ...@@ -52,13 +52,15 @@ public class SendTicketActivity extends BaseActivity<SendTicketPresenter,
@Override @Override
public void sendTickerSucc(LoadingDialog loadingDialog) { public void sendTickerSucc(LoadingDialog loadingDialog) {
closeLoading(loadingDialog);
mPresenter.sendTickerFragment.sendSucc();
} }
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
} }
private void closeLoading(LoadingDialog loadingDialog) { private void closeLoading(LoadingDialog loadingDialog) {
if (loadingDialog != null) { if (loadingDialog != null) {
loadingDialog.dismiss(); loadingDialog.dismiss();
......
...@@ -5,6 +5,7 @@ import com.xingdata.zzdpos.model.Vip; ...@@ -5,6 +5,7 @@ import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog; import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.sendticke.fragment.SendTickerFragment; import com.xingdata.zzdpos.ui.sendticke.fragment.SendTickerFragment;
import com.xingdata.zzdpos.ui.sendticke.fragment.SendTickerIndexFragment; import com.xingdata.zzdpos.ui.sendticke.fragment.SendTickerIndexFragment;
import com.xingdata.zzdpos.ui.sendticke.fragment.SendTickerSuccFragment;
import com.xingdata.zzdpos.ui.sendticke.fragment.VipFragment; import com.xingdata.zzdpos.ui.sendticke.fragment.VipFragment;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -18,6 +19,7 @@ public class SendTicketPresenter extends SendTicketContract.Presenter { ...@@ -18,6 +19,7 @@ public class SendTicketPresenter extends SendTicketContract.Presenter {
public SendTickerIndexFragment sendTickerIndexFragment = new SendTickerIndexFragment(); public SendTickerIndexFragment sendTickerIndexFragment = new SendTickerIndexFragment();
public VipFragment vipFragment = new VipFragment(); public VipFragment vipFragment = new VipFragment();
public SendTickerFragment sendTickerFragment = new SendTickerFragment(); public SendTickerFragment sendTickerFragment = new SendTickerFragment();
public SendTickerSuccFragment sendTickerSuccFragment = new SendTickerSuccFragment();
/** /**
* 当前会员 * 当前会员
*/ */
......
...@@ -122,7 +122,6 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter, ...@@ -122,7 +122,6 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
} }
ToastUtils.showLong("发券");
} }
} }
...@@ -189,9 +188,11 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter, ...@@ -189,9 +188,11 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
SendTickerC.getVipType().get(0).setSelect(true); SendTickerC.getVipType().get(0).setSelect(true);
levelList.add(SendTickerC.getVipType().get(0)); levelList.add(SendTickerC.getVipType().get(0));
for (int i = 0; i < levels.size(); i++) { for (int i = 0; i < levels.size(); i++) {
levels.get(i).setSelect(false);
levelList.add(levels.get(i)); levelList.add(levels.get(i));
} }
for (int i = 1; i < SendTickerC.getVipType().size(); i++) { for (int i = 1; i < SendTickerC.getVipType().size(); i++) {
SendTickerC.getVipType().get(i).setSelect(false);
levelList.add(SendTickerC.getVipType().get(i)); levelList.add(SendTickerC.getVipType().get(i));
} }
mViewBinding.tvSelect.setText(levelList.get(nowVipGroupId).getVipLevelName()); mViewBinding.tvSelect.setText(levelList.get(nowVipGroupId).getVipLevelName());
...@@ -255,4 +256,17 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter, ...@@ -255,4 +256,17 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
} }
return true; return true;
} }
public void sendSucc() {
mPresenter.sendTickerSuccFragment = new SendTickerSuccFragment();
if (nowtype == 0) {
mPresenter.sendTickerSuccFragment.setUiData(truleList
.get(nowTickerItemId).getTruleName(), nowVip.getVipName());
}else {
mPresenter.sendTickerSuccFragment.setUiData(truleList
.get(nowTickerItemId).getTruleName(), levelList.get(nowVipGroupId).getVipLevelName());
}
startWithPop(mPresenter.sendTickerSuccFragment);
}
} }
\ No newline at end of file
package com.xingdata.zzdpos.ui.sendticke.fragment;
import android.view.View;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentSendSuccTickerBinding;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.sendticke.SendTicketPresenter;
import com.xingdata.zzdpos.util.OnClickListener;
public class SendTickerSuccFragment extends BaseFragment<SendTicketPresenter,
FragmentSendSuccTickerBinding> {
String tickerName, sendUser;
@Override
public int getLayoutId() {
return R.layout.fragment_send_succ_ticker;
}
@Override
public void initView() {
mViewBinding.icTitle.tvTitle.setText("发券成功");
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
mPresenter.sendTickerIndexFragment = new SendTickerIndexFragment();
startWithPop(mPresenter.sendTickerIndexFragment);
}
});
mViewBinding.tvTickerName.setText(tickerName);
mViewBinding.tvSendTickerUser.setText(sendUser);
mViewBinding.tvSendTickerTime.setText(com.blankj.utilcode.util.TimeUtils.getNowString());
mViewBinding.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
mPresenter.sendTickerIndexFragment = new SendTickerIndexFragment();
startWithPop(mPresenter.sendTickerIndexFragment);
}
});
}
private void closeLoading(LoadingDialog loadingDialog) {
if (loadingDialog != null) {
loadingDialog.dismiss();
}
}
public void setUiData(String tickerName, String sendUser) {
this.tickerName = tickerName;
this.sendUser = sendUser;
}
}
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.xingdata.zzdpos.ui.marketing.marketingMenu.MarketingMenuActivity">
<include
android:id="@+id/ic_title"
layout="@layout/title"
app:layout_constraintBottom_toTopOf="@+id/rv_menu"/>
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_menu"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ic_title"></android.support.v7.widget.RecyclerView>
</android.support.constraint.ConstraintLayout>
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
<variable
name="OnClickListener"
type="com.xingdata.zzdpos.util.OnClickListener"/>
</data>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_zhouyu">
<include
android:id="@+id/ic_title"
layout="@layout/title"/>
<LinearLayout
android:id="@+id/ll_top"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/ll_bottom"
android:layout_below="@+id/ic_title"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="300dp"
android:layout_margin="@dimen/all_padding"
android:background="@color/white"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
<ImageView
android:id="@+id/iv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:src="@mipmap/ic_succeed"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/iv"
android:layout_marginTop="@dimen/all_padding"
android:gravity="center"
android:text="发券成功"
android:textSize="@dimen/text_three_title"
android:textStyle="bold"/>
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/light_gray"></View>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="@dimen/all_padding">
<TextView
android:layout_width="@dimen/all_textview_width"
android:layout_height="wrap_content"
android:text="优惠券:"
android:textSize="@dimen/et_textsize"/>
<TextView
android:id="@+id/tv_ticker_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:textSize="@dimen/et_textsize"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="@dimen/all_padding">
<TextView
android:layout_width="@dimen/all_textview_width"
android:layout_height="wrap_content"
android:text="发送对象:"
android:textSize="@dimen/et_textsize"/>
<TextView
android:id="@+id/tv_send_ticker_user"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:textSize="@dimen/et_textsize"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="@dimen/all_padding">
<TextView
android:layout_width="@dimen/all_textview_width"
android:layout_height="wrap_content"
android:text="发送时间:"
android:textSize="@dimen/et_textsize"/>
<TextView
android:id="@+id/tv_send_ticker_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:textSize="@dimen/et_textsize"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
<Button
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/red_border"
android:onClick="@{OnClickListener}"
android:text="确 定"
android:textColor="@color/white"
android:textSize="@dimen/three_grid_unit"/>
</LinearLayout>
</RelativeLayout>
</layout>
\ No newline at end of file
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
<dimen name="all_margin_left">15dp</dimen> <dimen name="all_margin_left">15dp</dimen>
<dimen name="title_height">50dp</dimen> <dimen name="title_height">50dp</dimen>
<dimen name="small_text_size">13sp</dimen> <dimen name="small_text_size">13sp</dimen>
<dimen name="all_textview_width">120dp</dimen>
<dimen name="big_text_size">18sp</dimen> <dimen name="big_text_size">18sp</dimen>
<dimen name="sbig_text_size">25sp</dimen> <dimen name="sbig_text_size">25sp</dimen>
<integer name="all_top_weight">2</integer> <integer name="all_top_weight">2</integer>
......
...@@ -132,7 +132,6 @@ ...@@ -132,7 +132,6 @@
<string name="vip_info_discount">折扣:%s折</string> <string name="vip_info_discount">折扣:%s折</string>
<!--抹零页面--> <!--抹零页面-->
<string name="dis_change_title">抹零</string> <string name="dis_change_title">抹零</string>
<string name="dis_change_amt">应收:</string> <string name="dis_change_amt">应收:</string>
......
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