支付服务器切换为原来服务器

app/src/main/java/com/xingdata/zzdpos/C.java

@@ -59,10 +59,10 @@ public class C {
 
     public static final class URL {
 //        public static final String BASE_URL = "http://demo.51zzd.cn:8080/";
-//        public static final String TEMP_PAY_URL = "http://demo.51zzd.cn/";
+        public static final String TEMP_PAY_URL = "http://demo.51zzd.cn/";
 
         public static final String BASE_URL = "http://121.40.56.52:8080/";
-        public static final String TEMP_PAY_URL = "http://121.40.56.52:8081/";
+//        public static final String TEMP_PAY_URL = "http://121.40.56.52:8081/";
 
         private static final String PKG = "/tk/";
 

app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/fragment/IntegralIndexFragment.java

@@ -137,7 +137,7 @@ public class IntegralIndexFragment extends BaseFragment<IntegralPresenter,
         }
         this.isLoadMore = isLoadMore;
         if (pager == null || pager.getList() == null || pager.getList().size() <= 0) {
-            integralAdapter.setEmptyView(getEmptyView("没有规则"));
+            integralAdapter.setEmptyView(getEmptyView("没有积分规则~"));
         }
         if (pager.getList() != null) {
             switch (queryType) {

app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/SendTickerFragment.java

@@ -3,6 +3,7 @@ package com.xingdata.zzdpos.ui.sendticke.fragment;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.view.View;
+import android.widget.TextView;
 
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ToastUtils;
@@ -122,7 +123,7 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
                             }
                         }
                     }
-                    case R.id.cl_all:{
+                    case R.id.cl_all: {
                         mViewBinding.llAllVipGroup.setVisibility(View.VISIBLE);
                         mViewBinding.clAll.setVisibility(View.GONE);
                     }
@@ -253,18 +254,22 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
         closeLoading(loadingDialog);
         if (trulePager == null || trulePager.getList() == null || trulePager.getList().size() <=
                 0) {
-            mViewBinding.tvEmpty.setVisibility(View.VISIBLE);
-            mViewBinding.rlTicker.setVisibility(View.GONE);
+            returnTicketAdapter.setEmptyView(getEmptyView("没有优惠券~"));
         }
         if (trulePager != null && trulePager.getList() != null && trulePager.getList().size() > 0) {
             truleList = trulePager.getList();
-            mViewBinding.tvEmpty.setVisibility(View.GONE);
             mViewBinding.rlTicker.setVisibility(View.VISIBLE);
             trulePager.getList().get(0).setSelect(true);
             returnTicketAdapter.setNewData(trulePager.getList());
         }
     }
 
+    private View getEmptyView(String str) {
+        View view = getLayoutInflater().inflate(R.layout.view_empty, null);
+        ((TextView) view.findViewById(R.id.tv_empty)).setText(str);
+        return view;
+    }
+
     /**
      * 0单个会员发券，1按会员类型发券
      *

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

@@ -13,7 +13,7 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/appBack"
+        android:background="@color/white_caocao"
         tools:context="com.xingdata.zzdhd.ui.manager.ticket.ReturnTicketActivity">
 
 

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

@@ -14,7 +14,7 @@
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
                   android:layout_width="match_parent"
                   android:layout_height="match_parent"
-                  android:background="@color/appBack"
+                  android:background="@color/white_caocao"
                   android:orientation="vertical">
 
 
@@ -24,7 +24,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_gravity="center"
-            android:background="@color/appBack"/>
+            android:background="@color/white_caocao"/>
 
 
     </LinearLayout>

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

@@ -26,7 +26,7 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="@color/white_caocao"
-            app:layout_constraintBottom_toTopOf="@id/tv_keyword"
+            app:layout_constraintBottom_toTopOf="@id/ll_keyword"
             app:layout_constraintTop_toTopOf="parent">
 
             <ImageButton
@@ -177,7 +177,6 @@
             android:layout_height="0dp"
             android:background="@color/white"
             android:orientation="vertical"
-            android:padding="@dimen/all_padding"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
@@ -188,6 +187,7 @@
                 android:id="@+id/ll_null"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:background="@color/white"
                 android:gravity="center"
                 android:orientation="vertical"
                 android:visibility="gone">
@@ -196,6 +196,7 @@
                     android:id="@+id/tv_empty"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:background="@color/white"
                     android:drawablePadding="@dimen/all_margin"
                     android:drawableTop="@mipmap/nong"
                     android:gravity="center"
@@ -209,7 +210,9 @@
             <android.support.v4.widget.SwipeRefreshLayout
                 android:id="@+id/srl_products"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="match_parent"
+                android:background="@color/gray_zhouyu"
+                android:padding="@dimen/all_padding">
 
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/rc_bale_shop"

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

@@ -251,21 +251,9 @@
                 android:layout_height="0dp"
                 android:layout_weight="9"
                 android:paddingLeft="@dimen/all_padding"
-                android:paddingRight="@dimen/all_padding"/>
+                android:paddingRight="@dimen/all_padding"
+                android:visibility="visible"/>
 
-            <TextView
-                android:id="@+id/tv_empty"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_weight="9"
-                android:background="@color/appBack"
-                android:drawableTop="@mipmap/icon_things_null"
-                android:gravity="center"
-                android:padding="100dp"
-                android:text="@string/empty_other_select"
-                android:textColor="@color/white_half"
-                android:textSize="@dimen/all_text_size_big"
-                android:visibility="gone"/>
         </LinearLayout>
 
         <LinearLayout

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

@@ -4,6 +4,7 @@
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
                   android:layout_width="match_parent"
                   android:layout_height="match_parent"
+                  android:background="@color/gray_zhouyu"
                   android:gravity="center"
                   android:orientation="vertical">
 
@@ -17,7 +18,7 @@
             android:gravity="center"
             android:lineSpacingExtra="@dimen/all_padding"
             android:textColor="@color/gray_huanggai"
-            android:textSize="@dimen/all_text_size" />
+            android:textSize="@dimen/all_text_size"/>
 
     </LinearLayout>
 </layout>
\ No newline at end of file