Merge remote-tracking branch 'origin/master'

app/build.gradle

@@ -12,7 +12,7 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         ndk{
-            abiFilters("armeabi", "armeabi-v7a")
+            abiFilters("armeabi", "armeabi-v7a","x86")
         }
     }
     //解决问题的代码

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

@@ -10,7 +10,6 @@ import com.xingdata.zzdpos.databinding.FragmentMsManagerBinding;
 import com.xingdata.zzdpos.model.Ms;
 import com.xingdata.zzdpos.ui.marketing.ms.MsPresenter;
 import com.xingdata.zzdpos.ui.marketing.ms.adapter.MsAdapter;
-import com.xingdata.zzdpos.util.RecyclerViewUtil;
 
 import java.util.List;
 
@@ -29,7 +28,6 @@ public class ManagerFragment extends BaseFragment<MsPresenter, FragmentMsManager
         mMsAdapter = new MsAdapter();
         mViewBinding.rlMs.setAdapter(mMsAdapter);
         mViewBinding.rlMs.setLayoutManager(new LinearLayoutManager(mContext));
-        mViewBinding.rlMs.addItemDecoration(new RecyclerViewUtil.GridSpacingItemDecoration(1, mContext.getResources().getDimensionPixelOffset(R.dimen.all_margin), true));
 
         // set ms listener
         mViewBinding.srlMs.setOnRefreshListener(this::refreshMs);

app/src/main/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java

@@ -242,17 +242,32 @@ public class SettlePresenter extends SettleContract.Presenter {
         q.setChannelAuthCode(payCode);
         q.setKey("Key");
         q.setNotifyUrl("setNotifyUrl");
-
-
         subscribePay(commitOrder().flatMap(s -> {
             q.setOrderNo(s);
             return JniFactory.Settle.pay(JSON.toJSONString(q));
-        }).flatMap(response -> ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(q.getOrderNo(), C.PAY_CHANNEL.CASH))));
+        }).flatMap(response -> ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(q.getOrderNo(), C.PAY_CHANNEL.ALI))));
 
     }
 
     @Override
     public void payInWechat(String payCode) {
+        Pay.Request q = new Pay.Request();
+        q.setOrderType("1");
+        q.setPayChannelType("2");
+        q.setDeviceType("2");
+        q.setMch_id("11");
+        q.setTer_id("11");
+        q.setOrderDateTime(TimeUtils.getNowString(new SimpleDateFormat("yyyymmddHHMMSS", Locale.getDefault())));
+        q.setCurrencyType("156");
+        q.setOrderAmt(ConvertUtil.longToString(mSaleorder.getOrderPayAmt()));
+        q.setOrderName("测试");
+        q.setChannelAuthCode(payCode);
+        q.setKey("Key");
+        q.setNotifyUrl("setNotifyUrl");
+        subscribePay(commitOrder().flatMap(s -> {
+            q.setOrderNo(s);
+            return JniFactory.Settle.pay(JSON.toJSONString(q));
+        }).flatMap(response -> ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(q.getOrderNo(), C.PAY_CHANNEL.WECHAT))));
     }
 
     @Override

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

@@ -4,7 +4,13 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="150dp"
+            android:layout_marginEnd="@dimen/all_margin"
+            android:layout_marginStart="@dimen/all_margin"
             android:background="@mipmap/bg_marketing"
             android:foreground="?android:attr/selectableItemBackground"
             android:orientation="vertical">
@@ -20,7 +26,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/all_margin"
-                android:layout_marginTop="@dimen/all_margin_big"
+                    android:layout_marginTop="@dimen/all_margin"
                     android:layout_weight="1"
                     android:textColor="@color/black_baozheng"
                     android:textSize="@dimen/all_sub_title_size" />
@@ -30,7 +36,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="@dimen/all_margin"
-                android:layout_marginTop="@dimen/all_margin_big"
+                    android:layout_marginTop="@dimen/all_margin"
                     android:contentDescription="@null"
                     android:src="@mipmap/icon_buy01" />
 
@@ -40,6 +46,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="1"
+                android:gravity="center_vertical"
                 android:orientation="vertical">
 
                 <TextView
@@ -47,7 +54,6 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/all_margin"
-                android:layout_marginTop="@dimen/all_margin"
                     android:textColor="@color/black_baozheng"
                     android:textSize="@dimen/all_text_size" />
 
@@ -62,6 +68,14 @@
             </LinearLayout>
         </LinearLayout>
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="10dp"
+            />
+
+
+    </LinearLayout>
+
 </layout>