订单列表调整

app/proguard-rules.pro

@@ -23,7 +23,8 @@
 # If you keep the line number information, uncomment this to
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 #-renamesourcefileattribute SourceFile
-#1.基本指令区
+#-------------------------------------------基本不用动区域--------------------------------------------
+#---------------------------------基本指令区----------------------------------
 -optimizationpasses 5
 -optimizationpasses 5
 -dontusemixedcaseclassnames
 -dontusemixedcaseclassnames
 -dontskipnonpubliclibraryclasses
 -dontskipnonpubliclibraryclasses
@@ -35,10 +36,11 @@
 -keepattributes *Annotation*,InnerClasses
 -keepattributes *Annotation*,InnerClasses
 -keepattributes Signature
 -keepattributes Signature
 -keepattributes SourceFile,LineNumberTable
 -keepattributes SourceFile,LineNumberTable
+#----------------------------------------------------------------------------
 
 
-#2.默认保留区
+#---------------------------------默认保留区---------------------------------
 -keep public class * extends android.app.Activity
 -keep public class * extends android.app.Activity
--keep public class * extends android.app.Application
+-keep public class * extends android.app.Appliction
 -keep public class * extends android.app.Service
 -keep public class * extends android.app.Service
 -keep public class * extends android.content.BroadcastReceiver
 -keep public class * extends android.content.BroadcastReceiver
 -keep public class * extends android.content.ContentProvider
 -keep public class * extends android.content.ContentProvider
@@ -86,8 +88,9 @@
 -keepclassmembers class * {
 -keepclassmembers class * {
     void *(**On*Event);
     void *(**On*Event);
 }
 }
+#----------------------------------------------------------------------------
 
 
-#3.webview
+#---------------------------------webview------------------------------------
 -keepclassmembers class fqcn.of.javascript.interface.for.webview {
 -keepclassmembers class fqcn.of.javascript.interface.for.webview {
    public *;
    public *;
 }
 }
@@ -98,6 +101,19 @@
 -keepclassmembers class * extends android.webkit.webViewClient {
 -keepclassmembers class * extends android.webkit.webViewClient {
     public void *(android.webkit.webView, jav.lang.String);
     public void *(android.webkit.webView, jav.lang.String);
 }
 }
+#----------------------------------------------------------------------------
+
+
+#-----------------AOP----------------------------------------------------------------------------------
+
+-adaptclassstrings
+-keepattributes InnerClasses, EnclosingMethod, Signature, *Annotation*
+
+#-keepnames @org.aspectj.lang.annotation.Aspect class * {
+#    ajc* <methods>;
+#}
+#---------------------------------------------------------------------------------------------------
+
 
 
 
 
 
 

app/src/main/java/com/dayu/bigfish/ui/fragment/OrderSecondTabFragment.java

@@ -49,7 +49,7 @@ public class OrderSecondTabFragment extends BaseFragment<OrderTwoTabPresenter, O
     private int siteId = GetUserInfo.getSITE_ID(MyApplication.getContext());
     private int siteId = GetUserInfo.getSITE_ID(MyApplication.getContext());
     private int userId = GetUserInfo.getACCOUNT_ID(MyApplication.getContext());
     private int userId = GetUserInfo.getACCOUNT_ID(MyApplication.getContext());
     private int mTotalPage;
     private int mTotalPage;
-    private int mPageSize = 5;
+    private int mPageSize = 10;
     private int mPage = 1;
     private int mPage = 1;
     private int mRefreshState = 1; //1:刷新，private int mRefreshState;
     private int mRefreshState = 1; //1:刷新，private int mRefreshState;
     private List<Order> mDatas;
     private List<Order> mDatas;

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

@@ -191,7 +191,7 @@
                     android:gravity="center_vertical"
                     android:gravity="center_vertical"
                     android:maxEms="500"
                     android:maxEms="500"
                     android:maxLines="2"
                     android:maxLines="2"
-                    android:text="暂无数据daaaaaaaaackahkvajclclncl.NC了》Ncl>Nc.NC.NC.出》ncNC.NC.C.NC.NC.NC.NC>NC.NC.nc>N>Cn"
+                    android:text="暂无数据"
                     android:textColor="@color/cl_home_title_text_color"
                     android:textColor="@color/cl_home_title_text_color"
                     android:textSize="13.3sp"/>
                     android:textSize="13.3sp"/>
 
 

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

@@ -219,7 +219,6 @@
             android:layout_width="0dp"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_height="match_parent"
             android:layout_alignParentBottom="true"
             android:layout_alignParentBottom="true"
-            android:layout_marginLeft="20.7dp"
             android:layout_weight="1"
             android:layout_weight="1"
             android:gravity="center"
             android:gravity="center"
             android:text="@string/tv_home_tab_one_phone"
             android:text="@string/tv_home_tab_one_phone"
@@ -239,8 +238,6 @@
             android:id="@+id/item_updata_time"
             android:id="@+id/item_updata_time"
             android:layout_width="0dp"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp"
             android:layout_weight="1"
             android:layout_weight="1"
             android:gravity="center"
             android:gravity="center"
             android:text="@string/tv_home_tab_updata_subscribe_time"
             android:text="@string/tv_home_tab_updata_subscribe_time"
@@ -262,7 +259,6 @@
             android:id="@+id/tv_item_process"
             android:id="@+id/tv_item_process"
             android:layout_width="0dp"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginRight="20.7dp"
             android:layout_weight="1"
             android:layout_weight="1"
             android:gravity="center"
             android:gravity="center"
             android:text="@string/tv_home_tab_start"
             android:text="@string/tv_home_tab_start"