Merge remote-tracking branch 'origin/master'

app/src/main/AndroidManifest.xml

@@ -82,8 +82,12 @@
             android:name=".ui.vip.VipActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />
-        <activity android:name=".ui.marketing.marketingMenu.MarketingMenuActivity"></activity>
-        <activity android:name=".ui.statistics.StatisticsDetailActivity"></activity>
+        <activity android:name=".ui.marketing.marketingMenu.MarketingMenuActivity" />
+        <activity android:name=".ui.statistics.StatisticsDetailActivity" />
+        <activity
+            android:name=".ui.marketing.ms.MsActivity"
+            android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
+            android:windowSoftInputMode="adjustUnspecified|stateHidden" />
     </application>
 
 </manifest>
\ No newline at end of file

app/src/main/java/com/xingdata/zzdpos/ui/marketing/marketingMenu/MarketingMenuActivity.java

@@ -13,6 +13,7 @@ import com.xingdata.zzdpos.databinding.ActivityMarketingMenuBinding;
 import com.xingdata.zzdpos.model.MarketingMenuModel;
 import com.xingdata.zzdpos.ui.marketing.integral.IntegralActivity;
 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.util.OnClickListener;
 
@@ -90,6 +91,7 @@ public class MarketingMenuActivity extends AppCompatActivity {
                     break;
                     case 4: {
                         //营销计划
+                        ActivityUtils.startActivity(MsActivity.class);
                     }
                     break;
                     case 5: {

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/MsActivity.java

+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() {
+
+    }
+}

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/MsContract.java

+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> {
+    }
+
+}

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/MsPresenter.java

+package com.xingdata.zzdpos.ui.marketing.ms;
+
+
+public class MsPresenter extends MsContract.Presenter {
+    @Override
+    public void onAttached() {
+
+    }
+}

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/fragment/AddFragment.java

+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() {
+
+    }
+}

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/fragment/EditorFragment.java

+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() {
+    }
+
+}

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/fragment/ManagerFragment.java

+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() {
+    }
+
+}

app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsDetailActivity.java

@@ -145,7 +145,7 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
                 itemSettleSaledetailBinding.tvCount.setText(saledetail.getCnt());
                 itemSettleSaledetailBinding.tvPrice.setText("￥" + saledetail.getPrice());
                 itemSettleSaledetailBinding.tvName.setText(saledetail.getName());
-//                        itemSettleSaledetailBinding.tvInitialPrice.setText(saledetail.getpr);
+//              itemSettleSaledetailBinding.tvInitialPrice.setText(saledetail.getpr);
                 viewOrderDetailBinding.llGoodsList.addView(view);
 
             }

app/src/main/java/com/xingdata/zzdpos/ui/store/StoreActivity.java

@@ -67,12 +67,6 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
         });
     }
 
-
-    @Override
-    public void onBackPressedSupport() {
-        super.onBackPressedSupport();
-    }
-
     @Override
     public <Sku extends BaseSku> void loadSkus(List<Sku> skus, boolean isRefresh) {
         mStoreFragment.loadSkus(skus, isRefresh);
@@ -83,6 +77,7 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
         mStoreFragment.loadSkugrps(sskugrps);
     }
 
+
     @Override
     public void loadSkugrpState(Long skugrpId) {
         mStoreFragment.loadSkugrpState(skugrpId);

app/src/main/java/com/xingdata/zzdpos/ui/store/fragment/StoreFragment.java

@@ -47,7 +47,6 @@ public class StoreFragment extends BaseFragment<StorePresenter, FragmentStoreBin
         mViewBinding.rlSkugrp.setAdapter(mSkugrpAdapter);
         mViewBinding.rlSkugrp.setLayoutManager(new LinearLayoutManager(mContext));
 
-
         // set sku listener
         mViewBinding.srlSku.setOnRefreshListener(this::refreshSku);
         mSkuAdapter.setOnLoadMoreListener(this::loadMoreSku, mViewBinding.rlSku);

app/src/main/res/layout/activity_ms.xml

+<?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

app/src/main/res/layout/fragment_ms_add.xml

+<?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

app/src/main/res/layout/fragment_ms_editor.xml

+<?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

app/src/main/res/layout/fragment_ms_manager.xml

+<?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

app/src/main/res/layout/fragment_myself.xml

@@ -47,7 +47,7 @@
                 android:id="@+id/user_img"
                 android:layout_width="60dp"
                 android:layout_height="60dp"
-                android:layout_margin="@dimen/all_margin"
+                android:layout_margin="@dimen/all_padding_left_right"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
@@ -111,7 +111,7 @@
                 android:id="@+id/drop_down_fff"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/all_margin"
+                android:layout_margin="@dimen/all_padding_left_right"
                 android:src="@mipmap/drop_down_fff"
                 android:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="parent"

app/src/main/res/layout/fragment_order_list.xml

@@ -12,24 +12,17 @@
             name="amt"
             type="String" />
 
-
     </data>
 
-    <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <RelativeLayout 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"
         android:background="@color/gray_zhouyu"
-        tools:context="com.example.administrator.tangkupos.CasherFragment">
+        android:orientation="vertical">
 
         <!-- TODO: Update blank fragmfragment_integral_indexyout -->
-        <android.support.constraint.Guideline
-            android:id="@+id/guideline"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintGuide_percent="0.38" />
+
 
         <LinearLayout
             android:id="@+id/ll_title"
@@ -61,13 +54,9 @@
 
         <android.support.v4.widget.SwipeRefreshLayout
             android:id="@+id/srl_product"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ll_title">
-
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/ll_title">
 
 
             <android.support.v7.widget.RecyclerView
@@ -77,23 +66,19 @@
                 android:visibility="gone">
 
 
-
             </android.support.v7.widget.RecyclerView>
 
         </android.support.v4.widget.SwipeRefreshLayout>
 
         <LinearLayout
             android:id="@+id/ll_empty"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/ll_title"
             android:background="@color/white_caocao"
             android:gravity="center"
             android:orientation="vertical"
-            android:visibility="gone"
-            app:layout_constraintEnd_toEndOf="@id/srl_product"
-            app:layout_constraintStart_toStartOf="@id/srl_product"
-            app:layout_constraintTop_toTopOf="@id/srl_product"
-            app:layout_constraintBottom_toBottomOf="@id/srl_product">
+            android:visibility="gone">
 
             <TextView
                 android:id="@+id/tv_empty"
@@ -106,5 +91,5 @@
                 android:textColor="@color/gray_huanggai"
                 android:textSize="@dimen/all_text_size" />
         </LinearLayout>
-    </android.support.constraint.ConstraintLayout>
+    </RelativeLayout>
 </layout>
\ No newline at end of file

app/src/main/res/layout/item_announcement_detail.xml

@@ -31,7 +31,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical"
-                android:paddingBottom="@dimen/all_margin">
+                android:paddingBottom="@dimen/all_padding_left_right">
 
                 <TextView
                     android:id="@+id/title"

app/src/main/res/layout/item_ms.xml

+<?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>
+
+

app/src/main/res/layout/item_statistics.xml

@@ -12,7 +12,10 @@
             android:id="@+id/img_left"
             android:layout_width="45dp"
             android:layout_height="45dp"
-            android:layout_margin="@dimen/all_padding"
+            android:layout_marginBottom="@dimen/all_padding"
+            android:layout_marginEnd="@dimen/all_padding"
+            android:layout_marginStart="@dimen/all_padding_left_right"
+            android:layout_marginTop="@dimen/all_padding"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -31,7 +34,7 @@
             android:id="@+id/tv_right_bottom"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/all_margin"
+            android:layout_marginEnd="@dimen/all_padding_left_right"
             android:text="本店"
             android:textSize="@dimen/small_text_size"
             app:layout_constraintBottom_toBottomOf="@id/img_left"

app/src/main/res/layout/view_order_detail.xml

@@ -50,7 +50,10 @@
         <android.support.v7.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/all_margin"
+            android:layout_marginBottom="@dimen/all_margin"
+            android:layout_marginEnd="@dimen/all_padding_left_right"
+            android:layout_marginStart="@dimen/all_padding_left_right"
+            android:layout_marginTop="@dimen/all_margin"
             android:padding="@dimen/dp_4">
 
             <android.support.constraint.ConstraintLayout

app/src/main/res/layout/view_ticket.xml

@@ -16,7 +16,6 @@
             type="String" />
 
 
-
     </data>
 
     <FrameLayout
@@ -26,7 +25,10 @@
         <android.support.v7.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/all_margin"
+            android:layout_marginBottom="@dimen/all_margin"
+            android:layout_marginEnd="@dimen/all_padding_left_right"
+            android:layout_marginStart="@dimen/all_padding_left_right"
+            android:layout_marginTop="@dimen/all_margin"
             android:padding="@dimen/dp_4">
 
             <android.support.constraint.ConstraintLayout

app/src/main/res/layout/view_vip_recharge.xml

@@ -43,7 +43,10 @@
         <android.support.v7.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/all_margin"
+            android:layout_marginBottom="@dimen/all_margin"
+            android:layout_marginEnd="@dimen/all_padding_left_right"
+            android:layout_marginStart="@dimen/all_padding_left_right"
+            android:layout_marginTop="@dimen/all_margin"
             android:padding="@dimen/dp_4">
 
             <android.support.constraint.ConstraintLayout
@@ -53,8 +56,7 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent">
-
-
+                
                 <TextView
                     android:id="@+id/tv_amt"
                     android:layout_width="match_parent"
@@ -136,7 +138,6 @@
                                     android:textSize="@dimen/small_text_size" />
 
 
-
                                 <TextView
                                     style="@style/textView_body_small"
                                     android:layout_width="wrap_content"
@@ -199,7 +200,6 @@
                                     android:textSize="@dimen/small_text_size" />
 
 
-
                                 <TextView
                                     style="@style/textView_body_small"
                                     android:layout_width="wrap_content"

app/src/main/res/values/strings.xml

@@ -629,4 +629,5 @@
     <string name="ticket_detail_date">使用时间:</string>
     <string name="ticket_detail_no">销售单号:</string>
 
+
 </resources>