更新到v1.3.5

AnyLifeZLB · Mar 26, 2019 · e7bb254 · e7bb254
1 parent afe0f7b
commit e7bb254
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 65 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/README.md b/README.md
@@ -20,15 +20,15 @@
 
 # Gradle 集成使用
 ```
- compile 'anylife.scrolltextview:ScrollTextviewLib:1.3' [new]
+ compile 'anylife.scrolltextview:ScrollTextviewLib:1.3.5' [new]
 ```
 
 # Maven 集成使用
 ```
 <dependency>
   <groupId>anylife.scrolltextview</groupId>
   <artifactId>ScrollTextviewLib</artifactId>
-  <version>1.3</version>
+  <version>1.3.5</version>
   <type>pom</type>
 </dependency>
 ```

diff --git a/ScrollTextviewLib/build.gradle b/ScrollTextviewLib/build.gradle
@@ -28,7 +28,7 @@ dependencies {
     implementation 'com.android.support:appcompat-v7:26.1.0'
 }
 
-version = "1.3"      //版本号，每次提交到Jcenter都要修改
+version = "1.3.5"      //版本号，每次提交到Jcenter都要修改
 def siteUrl = "https://github.com/AnyLifeZLB/ScrollTextView"       // project homepage
 def gitUrl  = "https://github.com/AnyLifeZLB/ScrollTextView.git"    // project git
 group = "anylife.scrolltextview"

diff --git a/app/build.gradle b/app/build.gradle
@@ -24,11 +24,11 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'com.android.support:appcompat-v7:26.1.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 
     implementation project(':ScrollTextviewLib')                //依赖 library ScrollTextViewLib
 
-//    implementation 'anylife.scrolltextview:ScrollTextviewLib:1.2'  //when OK
+    implementation 'anylife.scrolltextview:ScrollTextviewLib:1.3.5'  //when OK
 
 
 

diff --git a/app/src/main/java/com/anylife/fragment/scrolltextview/MainActivity.java b/app/src/main/java/com/anylife/fragment/scrolltextview/MainActivity.java
@@ -18,13 +18,34 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_main);
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        //下面的不看了🙈
+
+
         TextView titleText=findViewById(R.id.item1).findViewById(R.id.item_title);
         titleText.setText("房号");
         ImageView itemIcon=findViewById(R.id.item1).findViewById(R.id.item_icon);
         itemIcon.setImageResource(R.drawable.room_no);
 
         ScrollTextView scrollTextView1=findViewById(R.id.item1).findViewById(R.id.item_content);
-        scrollTextView1.setText("深圳慧风雅苑净书阁B栋712");
+        scrollTextView1.setText("深圳慧风雅苑净书阁X栋A12");
         scrollTextView1.setHorizontal(false);
 
 
@@ -40,8 +61,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
 
 
-
-
         TextView titleText3=findViewById(R.id.item3).findViewById(R.id.item_title);
         titleText3.setText("车位");
         ImageView itemIcon3=findViewById(R.id.item3).findViewById(R.id.item_icon);

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -64,9 +64,12 @@
 
         <View
             android:id="@+id/view2"
-            android:layout_width="1dp"
-            android:layout_height="40dp"
+            android:layout_width="1px"
+            android:layout_height="33dp"
             android:background="#ffffffff"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent" />
 
@@ -102,9 +105,11 @@
 
         <View
             android:id="@+id/view1"
-            android:layout_width="1dp"
-            android:layout_height="40dp"
+            android:layout_width="1px"
+            android:layout_height="33dp"
             android:background="#ffffffff"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent" />
 
@@ -125,60 +130,27 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
-        android:layout_marginTop="33dp"
+        android:layout_margin="33dp"
         android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/constraint_layout_2">
 
-        <LinearLayout
-            android:id="@+id/cancel_welcome"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
-            android:orientation="vertical"
-            app:layout_constraintEnd_toStartOf="@+id/go_welcome"
-            app:layout_constraintHorizontal_chainStyle="spread"
-            app:layout_constraintStart_toStartOf="parent">
-
-            <ImageView
-                android:layout_width="70dp"
-                android:layout_height="70dp"
-                android:src="@drawable/cancel" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:paddingTop="8dp"
-                android:text="忽略"
-                android:textColor="#ffffffff"
-                android:textSize="12sp" />
 
-        </LinearLayout>
-
-
-        <LinearLayout
-            android:id="@+id/go_welcome"
-            android:layout_width="wrap_content"
+        <!--// 滚动字幕-->
+        <anylife.scrolltextview.ScrollTextView
+            android:id="@+id/scrollText"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/cancel_welcome">
-
-            <ImageView
-                android:layout_width="70dp"
-                android:layout_height="70dp"
-                android:src="@drawable/service" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:paddingTop="8dp"
-                android:text="忽略"
-                android:textColor="#ffffffff"
-                android:textSize="12sp" />
-        </LinearLayout>
+            android:singleLine="true"
+            customAttr:clickEnable="true"
+            customAttr:isHorizontal="true"
+            customAttr:speed="4"
+            customAttr:text="这是滚动字幕，这是滚动的字幕，ABCDEFGHIJK1234567890"
+            customAttr:text_color="@color/colorAccent"
+            customAttr:text_size="19sp"
+            customAttr:times="567" />
+
 
     </android.support.constraint.ConstraintLayout>
 

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -2,5 +2,5 @@
 <resources>
     <color name="colorPrimary">#3F51B5</color>
     <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
+    <color name="colorAccent">#43ff40</color>
 </resources>
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:3.2.1'
 
         //添加一下两个classpath。
 

diff --git a/gradle.properties b/gradle.properties
@@ -15,4 +15,5 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# org.gradle.parallel=true
+
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Sep 11 15:43:13 CST 2018
+#Tue Mar 26 16:29:49 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip