解决冲突

王琳
2 parents 21faa20c 82b6e7a1
Showing 3 changed files with 1 additions and 1 deletions
app/libs/libcnlivestream.jar
app/libs/libcnlivevideo.jar
app/src/main/res/layout/activity_main.xml
@@ -52,7 +52,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
-                android:hint="请输入ChannelId" />
+                android:hint="请输入ChannelId,测试qwert" />
         </LinearLayout>
     </LinearLayout>