Commit 79e1b92e authored by zhang_z's avatar zhang_z

修改Activity;

parent f644bd13
...@@ -12,7 +12,6 @@ import com.xingdata.zzdpos.model.Cor; ...@@ -12,7 +12,6 @@ import com.xingdata.zzdpos.model.Cor;
import com.xingdata.zzdpos.model.Pager; import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Sskugrp; import com.xingdata.zzdpos.model.Sskugrp;
import com.xingdata.zzdpos.model.Sssku; import com.xingdata.zzdpos.model.Sssku;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.manage.replenishment.ReplenishmentActivity; import com.xingdata.zzdpos.ui.manage.replenishment.ReplenishmentActivity;
import com.xingdata.zzdpos.ui.manage.sssku.fragment.AddFragment; import com.xingdata.zzdpos.ui.manage.sssku.fragment.AddFragment;
import com.xingdata.zzdpos.ui.manage.sssku.fragment.DetailFragment; import com.xingdata.zzdpos.ui.manage.sssku.fragment.DetailFragment;
...@@ -40,7 +39,6 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin ...@@ -40,7 +39,6 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
private PriceFragment mPriceFragment = new PriceFragment(); private PriceFragment mPriceFragment = new PriceFragment();
private VipFragment mVipFragment = new VipFragment(); private VipFragment mVipFragment = new VipFragment();
private LoadingDialog mLoadingDialog = new LoadingDialog();
private ScanFragment mScanFragment = new ScanFragment(); private ScanFragment mScanFragment = new ScanFragment();
@Override @Override
......
...@@ -11,7 +11,6 @@ import com.xingdata.zzdpos.base.BaseSku; ...@@ -11,7 +11,6 @@ import com.xingdata.zzdpos.base.BaseSku;
import com.xingdata.zzdpos.databinding.ActivityMsBinding; import com.xingdata.zzdpos.databinding.ActivityMsBinding;
import com.xingdata.zzdpos.model.Ms; import com.xingdata.zzdpos.model.Ms;
import com.xingdata.zzdpos.model.Pager; import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.marketing.ms.fragment.AddFragment; import com.xingdata.zzdpos.ui.marketing.ms.fragment.AddFragment;
import com.xingdata.zzdpos.ui.marketing.ms.fragment.EditorFragment; import com.xingdata.zzdpos.ui.marketing.ms.fragment.EditorFragment;
import com.xingdata.zzdpos.ui.marketing.ms.fragment.ManagerFragment; import com.xingdata.zzdpos.ui.marketing.ms.fragment.ManagerFragment;
...@@ -34,8 +33,6 @@ public class MsActivity<Sku extends BaseSku> extends BaseActivity<MsPresenter, A ...@@ -34,8 +33,6 @@ public class MsActivity<Sku extends BaseSku> extends BaseActivity<MsPresenter, A
private SearchFragment<Sku> mSearchFragment = new SearchFragment<>(); private SearchFragment<Sku> mSearchFragment = new SearchFragment<>();
private ScanFragment mScanFragment = new ScanFragment<>(); private ScanFragment mScanFragment = new ScanFragment<>();
private LoadingDialog mLoadingDialog = new LoadingDialog();
@Override @Override
public int getLayoutId() { public int getLayoutId() {
return R.layout.activity_ms; return R.layout.activity_ms;
......
...@@ -13,7 +13,6 @@ import com.xingdata.zzdpos.model.Saledetail; ...@@ -13,7 +13,6 @@ import com.xingdata.zzdpos.model.Saledetail;
import com.xingdata.zzdpos.model.Saleorder; import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.model.Ticket; import com.xingdata.zzdpos.model.Ticket;
import com.xingdata.zzdpos.model.Vip; import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.main.MainActivity; import com.xingdata.zzdpos.ui.main.MainActivity;
import com.xingdata.zzdpos.ui.payment.PaymentActivity; import com.xingdata.zzdpos.ui.payment.PaymentActivity;
import com.xingdata.zzdpos.ui.scan.ScanFragment; import com.xingdata.zzdpos.ui.scan.ScanFragment;
...@@ -41,7 +40,6 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle ...@@ -41,7 +40,6 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
private PasswordDialog mPasswordDialog = new PasswordDialog(); private PasswordDialog mPasswordDialog = new PasswordDialog();
private PayResultFragment mPayResultFragment = new PayResultFragment(); private PayResultFragment mPayResultFragment = new PayResultFragment();
private LoadingDialog mLoadingDialog = new LoadingDialog();
private PayingDialog mPayingDialog = new PayingDialog(); private PayingDialog mPayingDialog = new PayingDialog();
private ScanFragment mScanFragment = new ScanFragment(); private ScanFragment mScanFragment = new ScanFragment();
......
...@@ -22,7 +22,6 @@ import com.xingdata.zzdpos.model.Pager; ...@@ -22,7 +22,6 @@ import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Saledetail; import com.xingdata.zzdpos.model.Saledetail;
import com.xingdata.zzdpos.model.Saleorder; import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.model.Sskugrp; import com.xingdata.zzdpos.model.Sskugrp;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.scan.ScanFragment; import com.xingdata.zzdpos.ui.scan.ScanFragment;
import com.xingdata.zzdpos.ui.settle.SettleActivity; import com.xingdata.zzdpos.ui.settle.SettleActivity;
import com.xingdata.zzdpos.ui.store.dialog.CartDialog; import com.xingdata.zzdpos.ui.store.dialog.CartDialog;
...@@ -44,8 +43,6 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin ...@@ -44,8 +43,6 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
private CartDialog mCartDialog = new CartDialog(); private CartDialog mCartDialog = new CartDialog();
private MsDialog mMsDialog = new MsDialog(); private MsDialog mMsDialog = new MsDialog();
private LoadingDialog mLoadingDialog = new LoadingDialog();
@Override @Override
public int getLayoutId() { public int getLayoutId() {
return R.layout.activity_store; return R.layout.activity_store;
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layout xmlns:app="http://schemas.android.com/apk/res-auto" <layout 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"> xmlns:tools="http://schemas.android.com/tools">
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.constraint.ConstraintLayout
xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="match_parent"
android:layout_height="match_parent" android:background="@color/gray_zhouyu">
android:background="@color/gray_zhouyu"
>
<include <include
android:id="@+id/ic_title" android:id="@+id/ic_title"
...@@ -16,7 +15,6 @@ ...@@ -16,7 +15,6 @@
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<FrameLayout <FrameLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
...@@ -29,25 +27,25 @@ ...@@ -29,25 +27,25 @@
android:id="@+id/view_order_detail" android:id="@+id/view_order_detail"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout="@layout/view_order_detail"/> android:layout="@layout/view_order_detail" />
<ViewStub <ViewStub
android:id="@+id/view_vip_recharge" android:id="@+id/view_vip_recharge"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout="@layout/view_vip_recharge"/> android:layout="@layout/view_vip_recharge" />
<ViewStub <ViewStub
android:id="@+id/view_ticket" android:id="@+id/view_ticket"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout="@layout/view_ticket"/> android:layout="@layout/view_ticket" />
<ViewStub <ViewStub
android:id="@+id/view_cs" android:id="@+id/view_cs"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout="@layout/view_inventory_detail"/> android:layout="@layout/view_inventory_detail" />
</FrameLayout> </FrameLayout>
<android.support.constraint.ConstraintLayout <android.support.constraint.ConstraintLayout
...@@ -74,7 +72,7 @@ ...@@ -74,7 +72,7 @@
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@id/btn_return" app:layout_constraintRight_toLeftOf="@id/btn_return"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:targetApi="lollipop"/> tools:targetApi="lollipop" />
<Button <Button
android:id="@+id/btn_return" android:id="@+id/btn_return"
...@@ -90,13 +88,13 @@ ...@@ -90,13 +88,13 @@
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_goneMarginStart="@dimen/all_margin_big_big" app:layout_goneMarginStart="@dimen/all_margin_big_big"
tools:targetApi="lollipop"/> tools:targetApi="lollipop" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050" android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_huanggai" android:background="@color/gray_huanggai"
app:layout_constraintTop_toTopOf="parent"/> app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>
</layout> </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