Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/datainquiry/activity/DataInquiryListActivity.java

@@ -17,6 +17,7 @@ import android.widget.AdapterView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.common.LogUtil;
@@ -89,6 +90,7 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
     private TextView mExactOptionResetTv;
     private TextView mExactOptionConfirmTv;
     private View mFuzzyViewBg, mExactViewBg;
+    private RelativeLayout mTotalHideRl;
     private Animation mInAnimation, mOutAnimation;
     private int mPageIndex = 1, mPagesize = 10;
     private List<HistoricalRecordBean> mHistoricalRecordBeans;
@@ -211,6 +213,7 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
         mTotalLv = (ListView) findViewById(R.id.data_inquiry_list_total_lv);
         mFuzzyViewBg = findViewById(R.id.data_inquiry_list_fuzzy_bg);
         mExactViewBg = findViewById(R.id.data_inquiry_list_exact_bg);
+        mTotalHideRl = (RelativeLayout) findViewById(R.id.data_inquiry_list_total_hide_rl);
 
 //        mFuzzyWholeLl.setLayerType(View.LAYER_TYPE_HARDWARE, null);
 //        mExactWholeLl.setLayerType(View.LAYER_TYPE_HARDWARE, null);
@@ -393,6 +396,16 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                 }
             }
         });
+
+        mTotalHideRl.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mTotalLl.getVisibility() == View.VISIBLE) {
+                    mTotalLl.setVisibility(View.GONE);
+                }
+                mTotalSpreadImageView.setVisibility(View.VISIBLE);
+            }
+        });
     }
 
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/datainquiry/activity/PDFDownloadActivity.java

@@ -206,6 +206,6 @@ public class PDFDownloadActivity extends BaseActivity implements View.OnClickLis
 
     @Override
     public void onInitiallyRendered(int nbPages, float pageWidth, float pageHeight) {
-//        mPDFView.fitToWidth();
+        mPDFView.fitToWidth();
     }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/datainquiry/adapter/DataInquiryTotalAdapter.java

@@ -66,7 +66,7 @@ public class DataInquiryTotalAdapter extends BaseAdapter {
     }
 
     private void initializeViews(DataInquiryTotalBean object, ViewHolder holder, int position) {
-        holder.dataInquiryItemTotalCaption.setText("当前合计" + object.getCaption() + ":");
+        holder.dataInquiryItemTotalCaption.setText(object.getCaption() + ":");
         holder.dataInquiryItemTotalValue.setText(mNumberFormat.format(object.getTotal()));
 
         holder.dataInquiryItemTotalDeleteIv.setOnClickListener(new View.OnClickListener() {

WeiChat/src/main/res/layout/activity_data_inquiry_list.xml

@@ -47,20 +47,38 @@
             android:layout_height="0.5dp"
             android:background="@color/gray_light"/>
 
-        <ImageView
-            android:id="@+id/data_inquiry_list_total_hide_iv"
+        <RelativeLayout
+            android:id="@+id/data_inquiry_list_total_hide_rl"
             android:layout_width="match_parent"
             android:layout_height="26dp"
             android:background="@color/background"
-            android:scaleType="centerInside"
-            android:src="@drawable/ic_expansion_retract"/>
+            >
+
+            <ImageView
+                android:id="@+id/data_inquiry_list_total_hide_iv"
+                android:layout_width="wrap_content"
+                android:layout_height="26dp"
+                android:layout_centerInParent="true"
+                android:scaleType="centerInside"
+                android:src="@drawable/ic_expansion_retract"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginRight="10dp"
+                android:layout_toLeftOf="@id/data_inquiry_list_total_hide_iv"
+                android:gravity="center_vertical"
+                android:text="合计"
+                android:textSize="14sp"/>
+
+        </RelativeLayout>
 
         <ListView
             android:id="@+id/data_inquiry_list_total_lv"
             android:layout_width="match_parent"
             android:layout_height="120dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp"/>
+            android:layout_marginBottom="10dp"
+            android:layout_marginTop="10dp"/>
     </LinearLayout>
 
     <LinearLayout
@@ -83,10 +101,10 @@
                 android:background="#eeeeee"
                 android:clickable="true"
                 android:orientation="horizontal"
+                android:paddingBottom="8dp"
                 android:paddingLeft="16dp"
                 android:paddingRight="16dp"
-                android:paddingTop="8dp"
-                android:paddingBottom="8dp">
+                android:paddingTop="8dp">
 
                 <TextView
                     android:layout_width="0dp"

WeiChat/src/main/res/layout/item_list_data_inquiry_total.xml

@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:gravity="center_vertical"
     android:orientation="horizontal"
-    android:padding="4dp">
+    android:padding="6dp">
 
     <TextView
         android:id="@+id/data_inquiry_item_total_caption"