diff --git a/live/src/main/java/com/yunbao/live/dialog/VoiceDialog.java b/live/src/main/java/com/yunbao/live/dialog/VoiceDialog.java index 4e8ec052d..c941620e4 100644 --- a/live/src/main/java/com/yunbao/live/dialog/VoiceDialog.java +++ b/live/src/main/java/com/yunbao/live/dialog/VoiceDialog.java @@ -21,6 +21,7 @@ import com.iflytek.cloud.SpeechConstant; import com.iflytek.cloud.SpeechError; import com.iflytek.cloud.SpeechRecognizer; import com.yunbao.common.dialog.AbsDialogFragment; +import com.yunbao.common.utils.WordsTypeUtil; import com.yunbao.live.R; import com.yunbao.live.activity.LiveAudienceActivity; @@ -284,7 +285,8 @@ public class VoiceDialog extends AbsDialogFragment { endOfSpeech(); } builder.append(text); - voiceChat.setText(builder); + + voiceChat.setText(WordsTypeUtil.changeTraditional(builder.toString())); } catch (JSONException e) { e.printStackTrace(); } diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java index c00ac8e45..570a00ddd 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java @@ -152,6 +152,7 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement mAdapter = new MainHomeLiveAdapter(mContext, MainActivity.Height); mAdapter.setOnItemClickListener(MainHomeLiveViewHolder.this); mAdapter.setHasStableIds(true);// + mRefreshView.setLoadMoreEnable(true); mRefreshView.setRecyclerViewAdapter(mAdapter); mRefreshView.setDataHelper(new CommonRefreshView.DataHelper() { @Override diff --git a/main/src/main/res/layout/view_main_home.xml b/main/src/main/res/layout/view_main_home.xml index bb1b81f3f..09d56d5f8 100644 --- a/main/src/main/res/layout/view_main_home.xml +++ b/main/src/main/res/layout/view_main_home.xml @@ -1,42 +1,39 @@ - + android:orientation="vertical" + android:background="@color/white"> + app:layout_behavior="com.yunbao.common.custom.FixAppBarLayoutBehavior"> + app:layout_scrollFlags="scroll|enterAlways"> + android:src="@mipmap/icon_main_search" /> - + android:layout_marginBottom="5dp" + android:layout_toLeftOf="@id/btn_search"> + android:layout_height="match_parent" /> - @@ -82,6 +75,5 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:overScrollMode="never" - app:layout_behavior="@string/appbar_scrolling_view_behavior" - /> - \ No newline at end of file + app:layout_behavior="@string/appbar_scrolling_view_behavior" /> + \ No newline at end of file diff --git a/main/src/main/res/layout/view_main_home_live.xml b/main/src/main/res/layout/view_main_home_live.xml index 4abb8036e..a8350a20c 100644 --- a/main/src/main/res/layout/view_main_home_live.xml +++ b/main/src/main/res/layout/view_main_home_live.xml @@ -16,7 +16,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="4dp" - android:layout_marginRight="10dp"/> + android:layout_marginRight="10dp" />