Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/res/layout/fragment_mine.xml

app/src/main/java/com/kuxuan/moneynote/ui/activitys/AboutActivity.java

@@ -53,7 +53,7 @@ public class AboutActivity extends BaseActivity {
         TextView textView = (TextView) findViewById(R.id.version);
         String versionName = getVersionName(this);
         textView.setText(versionName);
-        Glide.with(this).load(R.mipmap.icon_logo).transform(new GlideRoundTransform(this, 16)).into(imageView);
+        Glide.with(this).load(R.mipmap.icon_logo).transform(new GlideRoundTransform(this, 10)).into(imageView);
     }
 
     /**

app/src/main/java/com/kuxuan/moneynote/ui/adapter/BillAdapter.java

@@ -24,4 +24,6 @@ public class BillAdapter extends BaseQuickAdapter<BillJsonList,BillHolder> {
         TextSetUtil.setTextForMoey(item.getPay(),(TextView)helper.getView(R.id.stock_list_header_last_lixi),18,12);
         TextSetUtil.setTextForMoey(item.getBalance(),(TextView)helper.getView(R.id.stock_list_header_price_change),18,12);
     }
+
+
 }

app/src/main/java/com/kuxuan/moneynote/ui/fragments/mine/MineFragment.java

@@ -182,6 +182,8 @@ public class MineFragment extends MVPFragment<MinePresent, MineModel> implements
        mPresenter.getMineData();
        mPresenter.getMineBill(year);
 
+
+
     }
 
     @OnClick(R.id.bill_lin)

app/src/main/java/com/kuxuan/moneynote/ui/weight/MyTextView.java

@@ -0,0 +1,42 @@
+package com.kuxuan.moneynote.ui.weight;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.support.annotation.Nullable;
+import android.text.SpannableStringBuilder;
+import android.util.AttributeSet;
+import android.widget.TextView;
+
+/**
+ * @author HFRX hfrx1314@qq.com
+ * @version 1.0.0
+ */
+public class MyTextView extends TextView {
+    public MyTextView(Context context) {
+        super(context);
+    }
+
+    public MyTextView(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public MyTextView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+
+    /**
+     * 注意：spannableString 设置Spannable 的对象到spannableString中时，要用Spannable.SPAN_EXCLUSIVE_EXCLUSIVE的flag值，不然可能会会出现后面的衔接字符串不会显示
+     */
+    @Override
+    protected void onDraw(Canvas canvas) {
+        CharSequence charSequence = getText() ;
+        int lastCharDown = getLayout().getLineVisibleEnd(0) ;
+        if (charSequence.length() > lastCharDown){
+            SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder() ;
+            spannableStringBuilder.append(charSequence.subSequence(0,lastCharDown-2)).append("...") ;
+            setText(spannableStringBuilder);
+        }
+        super.onDraw(canvas);
+    }
+}

app/src/main/java/com/kuxuan/moneynote/utils/PickerUtil.java

@@ -52,7 +52,7 @@ public class PickerUtil {
         picker.setHeight(picker.getScreenHeightPixels()/2-250);
         picker.setRangeStart(2010, 10, 14);
         picker.setTitleText(mTitle);
-        picker.setRangeEnd(2020, 11, 11);
+        picker.setRangeEnd(mYear, mMonth, mDay);
         picker.setSelectedItem(mYear, mMonth,mDay);
         picker.setWeightEnable(true);
         picker.setWheelModeEnable(true);

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

@@ -12,11 +12,11 @@
         android:textSize="@dimen/font_12"
         android:layout_height="wrap_content"
         android:text="结余"/>
-   <TextView
+   <com.kuxuan.moneynote.ui.weight.MyTextView
        android:layout_width="wrap_content"
        android:id="@+id/balance_text"
        android:ellipsize="end"
-       android:lines="1"
+       android:maxLines="1"
        android:layout_height="wrap_content"
        android:text="11111.0000"
        />
@@ -25,11 +25,13 @@
         android:layout_marginTop="@dimen/len_8"
         android:layout_width="match_parent"
         android:orientation="horizontal"
-        android:layout_marginStart="@dimen/len_48"
-        android:layout_marginEnd="@dimen/len_48"
         android:paddingBottom="@dimen/len_16"
         android:layout_height="wrap_content">
-
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:layout_height="wrap_content">
         <TextView
         android:layout_width="wrap_content"
         android:textSize="@dimen/font_12"
@@ -37,28 +39,26 @@
         android:layout_marginEnd="@dimen/len_8"
         android:text="收入"
         />
-        <TextView
+        <com.kuxuan.moneynote.ui.weight.MyTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/income_text"
             android:ellipsize="end"
-            android:lines="1"
+            android:maxLines="1"
             android:text="5000.00"
             />
-        <Space
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"/>
+        </LinearLayout>
         <View
             android:layout_width="1px"
             android:layout_height="match_parent"
             android:background="@color/first_text"
             android:layout_gravity="center"
             />
-        <Space
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"/>
+     <LinearLayout
+         android:layout_width="0dp"
+         android:layout_weight="1"
+         android:gravity="center"
+         android:layout_height="wrap_content">
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -66,14 +66,15 @@
             android:layout_marginEnd="@dimen/len_8"
             android:text="支出"
             />
-        <TextView
+        <com.kuxuan.moneynote.ui.weight.MyTextView
             android:layout_width="wrap_content"
             android:id="@+id/pay_text"
             android:ellipsize="end"
-            android:lines="1"
+            android:maxLines="1"
             android:layout_height="wrap_content"
             android:text="7710.00"
             />
+     </LinearLayout>
     </LinearLayout>
     <include layout="@layout/item_billl_layout"></include>
 <android.support.v7.widget.RecyclerView

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

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -16,7 +15,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/bg_title_gray"
-            android:gravity="center"
+            android:gravity="center_horizontal"
             android:orientation="vertical"
             android:paddingBottom="@dimen/len_20"
             android:paddingTop="@dimen/len_48">
@@ -136,6 +135,9 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/len_16"
+                        android:lines="1"
+                        android:ellipsize="end"
+                        android:maxEms="18"
                         android:textColor="@color/first_text"
                         android:textSize="@dimen/len_20" />
 
@@ -146,35 +148,34 @@
                         android:layout_marginStart="@dimen/len_8"
                         android:background="@color/first_text" />
 
-                    <TextView
+                    <com.kuxuan.moneynote.ui.weight.MyTextView
                         android:id="@+id/income_text"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
+                        android:maxLines="1"
                         android:gravity="center_horizontal"
-                        android:lines="1"
-                        android:text="23213213123213213213213"
+                        android:ellipsize="end"
                         android:textColor="@color/first_text" />
 
-                    <TextView
+                    <com.kuxuan.moneynote.ui.weight.MyTextView
                         android:id="@+id/pay_text"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
+                        android:maxLines="1"
                         android:gravity="center_horizontal"
-                        android:singleLine="true"
                         android:ellipsize="end"
-                        android:text="23213213123213213213213"
                         android:textColor="@color/first_text" />
 
-                    <TextView
+                    <com.kuxuan.moneynote.ui.weight.MyTextView
                         android:id="@+id/balance_text"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
+                        android:ellipsize="end"
+                        android:maxLines="1"
                         android:gravity="center_horizontal"
-                        android:lines="1"
-                        android:text="23213213123213213213213"
                         android:textColor="@color/first_text" />
                 </LinearLayout>
 

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

@@ -18,7 +18,7 @@
                 android:text="月份"
                 android:layout_width="0dp"
                 android:ellipsize="end"
-                android:lines="1"
+                android:singleLine="true"
                 android:layout_weight="14"
                 android:textColor="@color/first_text"
                 android:layout_height="wrap_content"
@@ -26,39 +26,39 @@
                 android:padding="2dip"
                 />
 
-            <TextView
+            <com.kuxuan.moneynote.ui.weight.MyTextView
                 android:id="@+id/stock_list_header_price"
                 android:text="收入"
                 android:layout_width="0dp"
                 android:textColor="@color/first_text"
                 android:layout_weight="28"
                 android:ellipsize="end"
-                android:lines="1"
+                android:maxLines="1"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:padding="2dip"
                 />
 
-            <TextView
+            <com.kuxuan.moneynote.ui.weight.MyTextView
                 android:id="@+id/stock_list_header_last_lixi"
                 android:text="支出"
                 android:layout_width="0dp"
                 android:layout_weight="28"
                 android:ellipsize="end"
-                android:lines="1"
+                android:maxLines="1"
                 android:textColor="@color/first_text"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:padding="2dip"
                 />
 
-            <TextView
+            <com.kuxuan.moneynote.ui.weight.MyTextView
                 android:id="@+id/stock_list_header_price_change"
                 android:text="结余"
+                android:maxLines="1"
                 android:layout_width="0dp"
                 android:layout_weight="28"
                 android:ellipsize="end"
-                android:lines="1"
                 android:textColor="@color/first_text"
                 android:layout_height="wrap_content"
                 android:gravity="center"

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

@@ -32,8 +32,8 @@
 
             <ImageView
                 android:id="@+id/tab_mingxi_img"
-                android:layout_width="28dp"
-                android:layout_height="28dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_gravity="top|center"
                 android:layout_marginTop="5dp"
                 android:src="@mipmap/ic_launcher"/>
@@ -57,8 +57,8 @@
 
             <ImageView
                 android:id="@+id/tab_baobiao_img"
-                android:layout_width="28dp"
-                android:layout_height="28dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_gravity="top|center"
                 android:layout_marginTop="5dp"
                 android:src="@mipmap/ic_launcher"/>
@@ -87,8 +87,8 @@
 
             <ImageView
                 android:id="@+id/tab_faxian_img"
-                android:layout_width="27dp"
-                android:layout_height="27dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_gravity="top|center"
                 android:layout_marginTop="5dp"
                 android:src="@mipmap/ic_launcher"/>
@@ -111,8 +111,8 @@
 
             <ImageView
                 android:id="@+id/tab_user_img"
-                android:layout_width="27dp"
-                android:layout_height="27dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_gravity="top|center"
                 android:layout_marginTop="5dp"
                 android:src="@mipmap/ic_launcher"/>

app/src/main/res/values/strings.xml

@@ -77,7 +77,7 @@
 
 
     <!--关于我们-->
-    <string name="about">财务自由就上钱多多随手记</string>
+    <string name="about">钱多多随手记</string>
 
 
     <!--修改密码-->