Commit c5f79090 authored by zhang_z's avatar zhang_z

更新代码;

parent 9366fa06
...@@ -82,8 +82,12 @@ ...@@ -82,8 +82,12 @@
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> <activity android:name=".ui.marketing.marketingMenu.MarketingMenuActivity" />
<activity android:name=".ui.statistics.StatisticsDetailActivity"></activity> <activity android:name=".ui.statistics.StatisticsDetailActivity" />
<activity
android:name=".ui.marketing.ms.MsActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
</application> </application>
</manifest> </manifest>
\ No newline at end of file
...@@ -13,6 +13,7 @@ import com.xingdata.zzdpos.databinding.ActivityMarketingMenuBinding; ...@@ -13,6 +13,7 @@ import com.xingdata.zzdpos.databinding.ActivityMarketingMenuBinding;
import com.xingdata.zzdpos.model.MarketingMenuModel; import com.xingdata.zzdpos.model.MarketingMenuModel;
import com.xingdata.zzdpos.ui.marketing.integral.IntegralActivity; import com.xingdata.zzdpos.ui.marketing.integral.IntegralActivity;
import com.xingdata.zzdpos.ui.marketing.marketingMenu.adapter.MarketingMenuAdapter; import com.xingdata.zzdpos.ui.marketing.marketingMenu.adapter.MarketingMenuAdapter;
import com.xingdata.zzdpos.ui.marketing.ms.MsActivity;
import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketActivity; import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketActivity;
import com.xingdata.zzdpos.util.OnClickListener; import com.xingdata.zzdpos.util.OnClickListener;
...@@ -90,6 +91,7 @@ public class MarketingMenuActivity extends AppCompatActivity { ...@@ -90,6 +91,7 @@ public class MarketingMenuActivity extends AppCompatActivity {
break; break;
case 4: { case 4: {
//营销计划 //营销计划
ActivityUtils.startActivity(MsActivity.class);
} }
break; break;
case 5: { case 5: {
......
package com.xingdata.zzdpos.ui.marketing.ms;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.databinding.ActivityMsBinding;
public class MsActivity extends BaseActivity<MsPresenter, ActivityMsBinding> implements MsContract.View {
@Override
public int getLayoutId() {
return R.layout.activity_ms;
}
@Override
public void initView() {
}
}
package com.xingdata.zzdpos.ui.marketing.ms;
import com.xingdata.zzdpos.base.BasePresenter;
import com.xingdata.zzdpos.base.BaseView;
interface MsContract {
interface View extends BaseView {
}
abstract class Presenter extends BasePresenter<View> {
}
}
package com.xingdata.zzdpos.ui.marketing.ms;
public class MsPresenter extends MsContract.Presenter {
@Override
public void onAttached() {
}
}
package com.xingdata.zzdpos.ui.marketing.ms.fragment;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentMsAddBinding;
import com.xingdata.zzdpos.ui.marketing.ms.MsPresenter;
public class AddFragment extends BaseFragment<MsPresenter, FragmentMsAddBinding> {
@Override
public int getLayoutId() {
return R.layout.fragment_ms_add;
}
@Override
public void initView() {
}
}
package com.xingdata.zzdpos.ui.marketing.ms.fragment;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentMsEditorBinding;
import com.xingdata.zzdpos.ui.marketing.ms.MsPresenter;
public class EditorFragment extends BaseFragment<MsPresenter, FragmentMsEditorBinding> {
@Override
public int getLayoutId() {
return R.layout.fragment_ms_editor;
}
@Override
public void initView() {
}
}
package com.xingdata.zzdpos.ui.marketing.ms.fragment;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentMsManagerBinding;
import com.xingdata.zzdpos.ui.marketing.ms.MsPresenter;
public class ManagerFragment extends BaseFragment<MsPresenter, FragmentMsManagerBinding> {
@Override
public int getLayoutId() {
return R.layout.fragment_ms_manager;
}
@Override
public void initView() {
}
}
...@@ -67,12 +67,6 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin ...@@ -67,12 +67,6 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
}); });
} }
@Override
public void onBackPressedSupport() {
super.onBackPressedSupport();
}
@Override @Override
public <Sku extends BaseSku> void loadSkus(List<Sku> skus, boolean isRefresh) { public <Sku extends BaseSku> void loadSkus(List<Sku> skus, boolean isRefresh) {
mStoreFragment.loadSkus(skus, isRefresh); mStoreFragment.loadSkus(skus, isRefresh);
...@@ -83,6 +77,7 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin ...@@ -83,6 +77,7 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
mStoreFragment.loadSkugrps(sskugrps); mStoreFragment.loadSkugrps(sskugrps);
} }
@Override @Override
public void loadSkugrpState(Long skugrpId) { public void loadSkugrpState(Long skugrpId) {
mStoreFragment.loadSkugrpState(skugrpId); mStoreFragment.loadSkugrpState(skugrpId);
......
...@@ -47,7 +47,6 @@ public class StoreFragment extends BaseFragment<StorePresenter, FragmentStoreBin ...@@ -47,7 +47,6 @@ public class StoreFragment extends BaseFragment<StorePresenter, FragmentStoreBin
mViewBinding.rlSkugrp.setAdapter(mSkugrpAdapter); mViewBinding.rlSkugrp.setAdapter(mSkugrpAdapter);
mViewBinding.rlSkugrp.setLayoutManager(new LinearLayoutManager(mContext)); mViewBinding.rlSkugrp.setLayoutManager(new LinearLayoutManager(mContext));
// set sku listener // set sku listener
mViewBinding.srlSku.setOnRefreshListener(this::refreshSku); mViewBinding.srlSku.setOnRefreshListener(this::refreshSku);
mSkuAdapter.setOnLoadMoreListener(this::loadMoreSku, mViewBinding.rlSku); mSkuAdapter.setOnLoadMoreListener(this::loadMoreSku, mViewBinding.rlSku);
......
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/white_caocao">
<ImageButton
android:id="@+id/btn_back"
android:layout_width="?attr/actionBarSize"
android:layout_height="match_parent"
android:background="?attr/actionBarItemBackground"
android:contentDescription="@string/all_go_back"
android:gravity="center"
android:padding="@dimen/all_margin"
android:src="@mipmap/back_black"
app:layout_constraintLeft_toLeftOf="parent" />
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/ms_title"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size"
app:layout_constraintLeft_toRightOf="parent"
app:layout_constraintRight_toLeftOf="parent" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_gravity="bottom"
android:background="@color/gray_huanggai"
app:layout_constraintBottom_toBottomOf="parent" />
</android.support.constraint.ConstraintLayout>
<FrameLayout
android:id="@+id/f_ms"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
</layout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_zhouyu"
android:orientation="vertical">
</LinearLayout>
</layout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_zhouyu"
android:orientation="vertical">
</LinearLayout>
</layout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_zhouyu"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
android:gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="?attr/actionBarSize"
android:drawablePadding="@dimen/all_spacing"
android:drawableStart="@mipmap/add_bg"
android:gravity="center"
android:text="@string/ms_add"
android:textColor="@color/red_guanyu"
android:textSize="@dimen/all_sub_title_size" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai" />
</LinearLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/rl_ms"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
</layout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="@dimen/settle_pay_item"
android:foreground="?android:attr/selectableItemBackground">
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/iv_background"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:roundedCornerRadius="@dimen/all_shape_radius" />
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/iv_logo"
android:layout_width="@dimen/settle_pay_logo"
android:layout_height="@dimen/settle_pay_logo"
app:layout_constraintBottom_toTopOf="@id/iv_background"
app:layout_constraintLeft_toRightOf="@id/iv_background"
app:layout_constraintRight_toLeftOf="@id/iv_background"
app:layout_constraintTop_toBottomOf="@id/iv_background"
app:roundAsCircle="true" />
</android.support.constraint.ConstraintLayout>
</layout>
...@@ -629,4 +629,5 @@ ...@@ -629,4 +629,5 @@
<string name="ticket_detail_date">使用时间:</string> <string name="ticket_detail_date">使用时间:</string>
<string name="ticket_detail_no">销售单号:</string> <string name="ticket_detail_no">销售单号:</string>
</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