fix viewpager case exception.

wildfirechat · Apr 27, 2019 · 8732185 · 8732185
1 parent e251e14
commit 8732185
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/chat/release/output.json b/chat/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"chat-release.apk","fullName":"release","baseName":"release"},"path":"chat-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":6,"versionName":"0.4.3","enabled":true,"outputFile":"chat-release.apk","fullName":"release","baseName":"release"},"path":"chat-release.apk","properties":{}}]
diff --git a/chat/src/main/res/layout/activity_mm_preview.xml b/chat/src/main/res/layout/activity_mm_preview.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:background="@android:color/black">
 
-    <androidx.viewpager.widget.ViewPager
+    <cn.wildfire.chat.kit.widget.ViewPagerFixed
         android:id="@+id/viewPager"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />

diff --git a/chat/src/main/res/layout/conversation_input_panel.xml b/chat/src/main/res/layout/conversation_input_panel.xml
@@ -113,7 +113,7 @@
             android:visibility="gone">
 
             <!--其他功能-->
-            <androidx.viewpager.widget.ViewPager
+            <cn.wildfire.chat.kit.widget.ViewPagerFixed
                 android:id="@+id/conversationExtViewPager"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />

diff --git a/chat/src/main/res/layout/login_activity_sms.xml b/chat/src/main/res/layout/login_activity_sms.xml
@@ -56,6 +56,7 @@
                 android:focusableInTouchMode="true"
                 android:gravity="center_vertical"
                 android:hint="请输入验证码"
+                android:inputType="number"
                 android:maxLines="1"
                 android:textColor="@color/black"
                 android:textColorHint="@color/gray1"

diff --git a/chat/src/main/res/layout/main_activity.xml b/chat/src/main/res/layout/main_activity.xml
@@ -8,7 +8,7 @@
 
     <include layout="@layout/toolbar" />
 
-    <androidx.viewpager.widget.ViewPager
+    <cn.wildfire.chat.kit.widget.ViewPagerFixed
         android:id="@+id/vpContent"
         android:layout_width="match_parent"
         android:layout_height="0dp"

diff --git a/emojilibrary/src/main/res/layout/emotion_layout.xml b/emojilibrary/src/main/res/layout/emotion_layout.xml
@@ -5,7 +5,7 @@
               android:orientation="vertical">
 
     <!--内容显示区-->
-    <androidx.viewpager.widget.ViewPager
+    <com.lqr.emoji.ViewPagerFixed
         android:id="@+id/vpEmotioin"
         android:layout_width="match_parent"
         android:layout_height="0dp"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"chat-release.apk","fullName":"release","baseName":"release"},"path":"chat-release.apk","properties":{}}]
		[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":6,"versionName":"0.4.3","enabled":true,"outputFile":"chat-release.apk","fullName":"release","baseName":"release"},"path":"chat-release.apk","properties":{}}]