1023

baseSDK/src/main/java/com/dayu/common/Constants.java

@@ -172,7 +172,7 @@ public class Constants {
 
 
 
 
     /***********************其他配置**********************************/
     /***********************其他配置**********************************/
-    public final static int PAGESIZE = 200;
+    public final static int PAGESIZE = 20;
     public final static int NOT_LOGIN = -1;
     public final static int NOT_LOGIN = -1;
     /**
     /**
      * 店长.
      * 店长.

orderCenter/src/main/java/com/dayu/order/presenter/orderdoing/OrderDoingPresenter.java

@@ -103,6 +103,9 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
         if (requestPage >= page && page != 1)
         if (requestPage >= page && page != 1)
             return;
             return;
         requestPage = page;
         requestPage = page;
+        if (mView instanceof OrderSecondTabFragment && 0 != position){
+            pageSize = 200;
+        }
         OrderApiFactory.getOrders(state, userId, siteId, page, pageSize).subscribe(baseObserver(
         OrderApiFactory.getOrders(state, userId, siteId, page, pageSize).subscribe(baseObserver(
                 orderBasePageBean -> {
                 orderBasePageBean -> {
                     datas.set(orderBasePageBean);
                     datas.set(orderBasePageBean);

orderCenter/src/main/java/com/dayu/order/ui/activity/OrderDetailsClockActivity.java

@@ -3,6 +3,7 @@ package com.dayu.order.ui.activity;
 import android.Manifest;
 import android.Manifest;
 import android.app.Activity;
 import android.app.Activity;
 import android.os.Bundle;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup;
 
 
@@ -141,14 +142,25 @@ public class OrderDetailsClockActivity extends BaseActivity<OrderDetailClockPres
         mBind.ivUser.setOnClickListener(new View.OnClickListener() {
         mBind.ivUser.setOnClickListener(new View.OnClickListener() {
             @Override
             @Override
             public void onClick(View v) {
             public void onClick(View v) {
-                CommonUtils.dialPhone(OrderDetailsClockActivity.this, detail.getCustomerMobile());
+                String customerMobile = detail.getCustomerMobile();
+                if (TextUtils.isEmpty(customerMobile)){
+                    ToastUtils.showShortToast("号码异常");
+                }else{
+                    CommonUtils.dialPhone(OrderDetailsClockActivity.this, customerMobile);
+                }
             }
             }
         });
         });
 
 
         mBind.ivServer.setOnClickListener(new View.OnClickListener() {
         mBind.ivServer.setOnClickListener(new View.OnClickListener() {
             @Override
             @Override
             public void onClick(View v) {
             public void onClick(View v) {
-                CommonUtils.dialPhone(OrderDetailsClockActivity.this, detail.getCustomerTelphome());
+                String customerTelphome = detail.getCustomerTelphome();
+                if (TextUtils.isEmpty(customerTelphome)){
+                    ToastUtils.showShortToast("号码异常");
+                }else{
+                    CommonUtils.dialPhone(OrderDetailsClockActivity.this, customerTelphome);
+                }
+
             }
             }
         });
         });
 
 

orderCenter/src/main/res/layout/activity_order_details_clock.xml

@@ -371,16 +371,6 @@
                         android:textColor="@color/cl_order_text_one"
                         android:textColor="@color/cl_order_text_one"
                         android:textSize="@dimen/sp_14" />
                         android:textSize="@dimen/sp_14" />
 
 
-                    <ImageView
-                        android:id="@+id/iv_server"
-                        android:layout_width="@dimen/dp_60"
-                        android:layout_height="@dimen/dp_20"
-                        android:src="@drawable/icon_order_phone"
-                        android:layout_toRightOf="@id/text_eleven"
-                        android:layout_below="@id/tv_nine"
-                        android:layout_marginLeft="@dimen/dp_13"
-                        android:layout_marginTop="@dimen/dp_13"/>
-
                     <TextView
                     <TextView
                         android:id="@+id/tv_pro_num"
                         android:id="@+id/tv_pro_num"
                         android:layout_width="wrap_content"
                         android:layout_width="wrap_content"
@@ -391,6 +381,16 @@
                         android:layout_toRightOf="@id/text_eleven"
                         android:layout_toRightOf="@id/text_eleven"
                         android:textColor="@color/cl_home_title_text_color"
                         android:textColor="@color/cl_home_title_text_color"
                         android:textSize="@dimen/sp_14" />
                         android:textSize="@dimen/sp_14" />
+
+                    <ImageView
+                        android:id="@+id/iv_server"
+                        android:layout_width="@dimen/dp_60"
+                        android:layout_height="@dimen/dp_20"
+                        android:layout_below="@id/tv_nine"
+                        android:layout_marginLeft="@dimen/dp_13"
+                        android:layout_marginTop="@dimen/dp_13"
+                        android:layout_toRightOf="@id/tv_pro_num"
+                        android:src="@drawable/icon_order_phone" />
                 </RelativeLayout>
                 </RelativeLayout>
 
 
                 <RelativeLayout
                 <RelativeLayout