yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zlzw 2022-11-08 13:28:05 +08:00
commit 977067eda5
4 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
live/src/main/java/com/yunbao/live/dialog/VoiceDialog.java
View File

@ -21,6 +21,7 @@ import com.iflytek.cloud.SpeechConstant;
import com.iflytek.cloud.SpeechError; import com.iflytek.cloud.SpeechError;
import com.iflytek.cloud.SpeechRecognizer; import com.iflytek.cloud.SpeechRecognizer;
import com.yunbao.common.dialog.AbsDialogFragment; import com.yunbao.common.dialog.AbsDialogFragment;
import com.yunbao.common.utils.WordsTypeUtil;
import com.yunbao.live.R; import com.yunbao.live.R;
import com.yunbao.live.activity.LiveAudienceActivity; import com.yunbao.live.activity.LiveAudienceActivity;
@ -284,7 +285,8 @@ public class VoiceDialog extends AbsDialogFragment {
endOfSpeech(); endOfSpeech();
} }
builder.append(text); builder.append(text);
voiceChat.setText(builder);
voiceChat.setText(WordsTypeUtil.changeTraditional(builder.toString()));
} catch (JSONException e) { } catch (JSONException e) {
e.printStackTrace(); e.printStackTrace();
} }

1
main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java
View File

@ -152,6 +152,7 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
mAdapter = new MainHomeLiveAdapter(mContext, MainActivity.Height); mAdapter = new MainHomeLiveAdapter(mContext, MainActivity.Height);
mAdapter.setOnItemClickListener(MainHomeLiveViewHolder.this); mAdapter.setOnItemClickListener(MainHomeLiveViewHolder.this);
mAdapter.setHasStableIds(true);// mAdapter.setHasStableIds(true);//
mRefreshView.setLoadMoreEnable(true);
mRefreshView.setRecyclerViewAdapter(mAdapter); mRefreshView.setRecyclerViewAdapter(mAdapter);
mRefreshView.setDataHelper(new CommonRefreshView.DataHelper<LiveBean>() { mRefreshView.setDataHelper(new CommonRefreshView.DataHelper<LiveBean>() {
@Override @Override

42
main/src/main/res/layout/view_main_home.xml
View File

@ -1,42 +1,39 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/white" android:orientation="vertical"
> android:background="@color/white">
<com.google.android.material.appbar.AppBarLayout <com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout" android:id="@+id/appBarLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="70dp" android:layout_height="70dp"
android:layout_marginTop="10dp"
android:background="@color/transparent" android:background="@color/transparent"
android:fadingEdge="none" android:fadingEdge="none"
app:elevation="0dp" app:elevation="0dp"
android:layout_marginTop="10dp" app:layout_behavior="com.yunbao.common.custom.FixAppBarLayoutBehavior">
app:layout_behavior="com.yunbao.common.custom.FixAppBarLayoutBehavior"
>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
app:layout_scrollFlags="scroll|enterAlways" app:layout_scrollFlags="scroll|enterAlways">
>
<ImageView <ImageView
android:id="@+id/btn_search" android:id="@+id/btn_search"
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_alignParentBottom="true"
android:layout_marginBottom="2dp"
android:layout_marginRight="45dp"
android:onClick="mainClick"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginRight="45dp"
android:layout_marginBottom="2dp"
android:contentDescription="TODO"
android:onClick="mainClick"
android:padding="9dp" android:padding="9dp"
android:src="@mipmap/icon_main_search" android:src="@mipmap/icon_main_search" />
android:contentDescription="TODO" />
<ImageView <ImageView
android:id="@+id/img_trophy" android:id="@+id/img_trophy"
@ -54,25 +51,21 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="37dp" android:layout_height="37dp"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_marginBottom="5dp"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:layout_toLeftOf="@id/btn_search" android:layout_marginBottom="5dp"
> android:layout_toLeftOf="@id/btn_search">
<net.lucode.hackware.magicindicator.MagicIndicator <net.lucode.hackware.magicindicator.MagicIndicator
android:id="@+id/indicator" android:id="@+id/indicator"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent" />
/>
</FrameLayout> </FrameLayout>
</RelativeLayout> </RelativeLayout>
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>
@ -82,6 +75,5 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:overScrollMode="never" android:overScrollMode="never"
app:layout_behavior="@string/appbar_scrolling_view_behavior" app:layout_behavior="@string/appbar_scrolling_view_behavior" />
/> </LinearLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>