update bug add gif

chenpengfei88 · Nov 4, 2016 · 2aae8b8 · 2aae8b8
1 parent 35ca512
commit 2aae8b8
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 28 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -8,7 +8,7 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity" android:screenOrientation="landscape">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

diff --git a/app/src/main/java/com/fe/verticalmarqueeview/MarqueeView.java b/app/src/main/java/com/fe/verticalmarqueeview/MarqueeView.java
@@ -17,8 +17,6 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * Created by chenepengfei on 2016/11/3.
@@ -93,12 +91,12 @@ public class MarqueeView extends View {
     /**
      * 文本最大的宽度
      */
-    private Rect mTextMaxRect;
+    private int mTextMaxWidth;
 
     /**
-     *  文本rect集合
+     *  文本高度
      */
-    private List<Rect> mTextRectList;
+    private int mTextHeight;
 
     /**
      *  画笔
@@ -191,7 +189,7 @@ private int getViewWidth(ViewGroup.LayoutParams lp, int pWidth) {
         if(lp.width >= 0) {
             width = lp.width;
         } else if(lp.width == ViewGroup.LayoutParams.WRAP_CONTENT){
-            width = mTextMaxRect.width() + mPaddingLeft;
+            width = mTextMaxWidth + mPaddingLeft;
         } else if(lp.width == ViewGroup.LayoutParams.MATCH_PARENT) {
             width = pWidth;
         }
@@ -203,7 +201,7 @@ private int getViewHeight(ViewGroup.LayoutParams lp, int pHeight) {
         if(lp.height >= 0) {
             height = lp.height;
         } else if(lp.height == ViewGroup.LayoutParams.WRAP_CONTENT) {
-            height = mTextMaxRect.height() + mPaddingTop + mPaddingBottom;
+            height = mTextHeight  + mPaddingTop + mPaddingBottom;
         } else if(lp.height == ViewGroup.LayoutParams.MATCH_PARENT) {
             height = pHeight;
         }
@@ -229,23 +227,15 @@ public void setTextArray(String[] textArray) {
     }
 
     private void initTextRect() {
-        if(mTextRectList == null) {
-            mTextRectList = new ArrayList<>(mTextArray.length);
-        } else {
-            if(mTextRectList.size() > 0) mTextRectList.clear();
-        }
         int size = mTextArray.length;
         for(int i = 0; i < size; i++) {
             String text = mTextArray[i];
             Rect rect = new Rect();
             mPaint.getTextBounds(text, 0, text.length(), rect);
-            mTextRectList.add(rect);
-            if(mTextMaxRect == null) {
-                mTextMaxRect = rect;
-            } else {
-                if(rect.width() > mTextMaxRect.width())
-                    mTextMaxRect = rect;
-            }
+            if(mTextHeight == 0)
+                mTextHeight = rect.height();
+            if(rect.width() > mTextMaxWidth)
+                mTextMaxWidth = rect.width();
         }
     }
 
@@ -263,7 +253,7 @@ private void setTextCurrentOrNextStatus(int currentPosition, int nextPosition, b
             @Override
             public void onGlobalLayout() {
                 mCurrentTextInitMarginTop = mCurrentTextMoveMarginTop = getFontBaseLine();
-                mNextTextInitMarginTop = mNextTextMoveMarginTop = mTextRectList.get(0).height() +  getMeasuredHeight();
+                mNextTextInitMarginTop = mNextTextMoveMarginTop = mTextHeight +  getMeasuredHeight();
                 mTextMoveOffset = mNextTextInitMarginTop - mCurrentTextInitMarginTop;
             }
         });
@@ -299,7 +289,6 @@ public void run() {
                         va.resume();
                     }
                 }, reRepeatDelayTime);
-
             }
         });
         va.setRepeatCount(-1);

diff --git a/app/src/main/res/drawable/bg_marqueeview.xml b/app/src/main/res/drawable/bg_marqueeview.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle" >
     <solid android:color="@android:color/white" />
-    <stroke android:color="@android:color/black" android:width="1px"/>
+    <stroke android:color="#cccccc" android:width="1px"/>
 </shape>
diff --git a/app/src/main/res/drawable/xg.gif b/app/src/main/res/drawable/xg.gif
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -8,6 +10,14 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
-        android:background="@drawable/bg_marqueeview"/>
+        android:background="@drawable/bg_marqueeview"
+        app:textSize="16sp"
+        app:textColor="#333333"
+        app:paddingLeft="10dp"
+        app:paddingTopBottom="15dp"
+        app:startDelayTime="500"
+        app:reRepeatDelayTime="1000"
+        app:itemAnimationTime="700"
+        />
 
 </RelativeLayout>