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

暂提

Browse Source
This commit is contained in:
Martin 2024-09-14 16:38:24 +08:00
parent b9a6d9b966
commit d662d5c3ea
9 changed files with 29 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/com/yunbao/common/custom/MyRelativeLayout5.java
View File

@ -26,6 +26,6 @@ public class MyRelativeLayout5 extends RelativeLayout {
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
int widthSize = MeasureSpec.getSize(widthMeasureSpec); int widthSize = MeasureSpec.getSize(widthMeasureSpec);
heightMeasureSpec = MeasureSpec.makeMeasureSpec(widthSize, MeasureSpec.EXACTLY); heightMeasureSpec = MeasureSpec.makeMeasureSpec(widthSize, MeasureSpec.EXACTLY);
super.onMeasure(widthMeasureSpec, heightMeasureSpec+100); super.onMeasure(widthMeasureSpec, heightMeasureSpec+150);
} }
} }

2
common/src/main/java/com/yunbao/common/utils/RouteUtil.java
View File

@ -332,7 +332,7 @@ public class RouteUtil {
*/ */
public static void forwardCustomerService(String url) { public static void forwardCustomerService(String url) {
ARouter.getInstance().build(PATH_CS) ARouter.getInstance().build(PATH_CS)
.withString(Constants.URL, url) .withString(Constants.URL, url+"?1=1")
.navigation(); .navigation();
} }

4
config.gradle
View File

@ -4,8 +4,8 @@ ext {
buildToolsVersion: "29.0.2", buildToolsVersion: "29.0.2",
minSdkVersion : 23, minSdkVersion : 23,
targetSdkVersion : 34, targetSdkVersion : 34,
versionCode : 697, versionCode : 1,
versionName : "6.8.1" versionName : "1.0"
] ]
manifestPlaceholders = [ manifestPlaceholders = [
//正式、 //正式、

2
main/src/main/java/com/yunbao/main/activity/MainActivity.java
View File

@ -577,7 +577,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
}); });
//获取指导员账号 //获取指导员账号
ConversationIMListManager.get(this).getUserInstructor(this); ConversationIMListManager.get(this).getUserInstructor(this);
checkVersion(); //checkVersion();
//获取声网Token //获取声网Token
getSwToken(); getSwToken();
initLogUpdate(); initLogUpdate();

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

@ -170,7 +170,7 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
} }
}); });
mRefreshView.setLayoutManager(gridLayoutManager); mRefreshView.setLayoutManager(gridLayoutManager);
ItemDecoration decoration = new ItemDecoration(mContext, 0x00000000, 5, 0); ItemDecoration decoration = new ItemDecoration(mContext, 0x00000000, 7, 0);
decoration.setOnlySetItemOffsetsButNoDraw(true); decoration.setOnlySetItemOffsetsButNoDraw(true);
mRefreshView.setItemDecoration(decoration); mRefreshView.setItemDecoration(decoration);
mAdapter = new MainHomeLiveAdapter(mContext, MainActivity.Height); mAdapter = new MainHomeLiveAdapter(mContext, MainActivity.Height);

10
main/src/main/res/layout/item_main_home_lives.xml
View File

@ -11,7 +11,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<LinearLayout <LinearLayout
android:id="@+id/live_info_view" android:id="@+id/live_info_view"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -21,10 +20,8 @@
<com.yunbao.common.custom.MyRelativeLayout5 <com.yunbao.common.custom.MyRelativeLayout5
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="220dp" android:layout_height="20dp"
android:layout_marginBottom="9dp" android:layout_marginBottom="7dp">
android:paddingLeft="5dp">
<com.makeramen.roundedimageview.RoundedImageView <com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/cover" android:id="@+id/cover"
@ -115,6 +112,7 @@
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:ellipsize="end" android:ellipsize="end"
android:layout_marginBottom="5dp"
android:includeFontPadding="false" android:includeFontPadding="false"
android:maxLines="1" android:maxLines="1"
android:textColor="#fff" android:textColor="#fff"
@ -125,7 +123,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:gravity="center_vertical" android:gravity="center_vertical"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="5dp"> android:layout_marginBottom="10dp">
<TextView <TextView
android:id="@+id/name" android:id="@+id/name"

3
main/src/main/res/layout/item_main_home_lives2.xml
View File

@ -101,6 +101,7 @@
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:ellipsize="end" android:ellipsize="end"
android:layout_marginBottom="5dp"
android:includeFontPadding="false" android:includeFontPadding="false"
android:maxLines="1" android:maxLines="1"
android:textColor="#fff" android:textColor="#fff"
@ -111,7 +112,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:gravity="center_vertical" android:gravity="center_vertical"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="5dp"> android:layout_marginBottom="10dp">
<TextView <TextView
android:id="@+id/name" android:id="@+id/name"

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

@ -25,6 +25,7 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="40dp"
android:paddingStart="12dp"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
app:layout_scrollFlags="scroll|enterAlways"> app:layout_scrollFlags="scroll|enterAlways">
@ -51,42 +52,36 @@
<LinearLayout <LinearLayout
android:id="@+id/ijiasdw" android:id="@+id/ijiasdw"
android:gravity="center_vertical"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentRight="true" android:layout_alignParentRight="true">
android:layout_alignParentBottom="true">
<ImageView <ImageView
android:id="@+id/img_trophy" android:id="@+id/img_trophy"
android:layout_width="40dp" android:layout_width="19dp"
android:layout_height="40dp" android:layout_marginEnd="20dp"
android:layout_marginRight="5dp" android:layout_height="19dp"
android:src="@mipmap/icon_main_bangdan" android:src="@mipmap/icon_main_bangdan"
android:layout_marginBottom="2dp"
android:contentDescription="TODO" android:contentDescription="TODO"
android:onClick="mainClick" android:onClick="mainClick" />
android:padding="9dp" />
<ImageView <ImageView
android:id="@+id/btn_search" android:id="@+id/btn_search"
android:layout_width="40dp" android:layout_width="19dp"
android:layout_height="40dp" android:layout_height="19dp"
android:layout_marginRight="5dp" android:layout_marginEnd="21dp"
android:layout_marginBottom="2dp"
android:contentDescription="TODO" android:contentDescription="TODO"
android:onClick="mainClick" android:onClick="mainClick"
android:padding="9dp"
android:src="@mipmap/icon_main_search" /> android:src="@mipmap/icon_main_search" />
<ImageView <ImageView
android:id="@+id/btn_start_live" android:id="@+id/btn_start_live"
android:layout_width="40dp" android:layout_width="25dp"
android:layout_height="40dp" android:layout_height="19dp"
android:layout_marginBottom="2dp" android:layout_marginEnd="17dp"
android:layout_marginEnd="10dp"
android:contentDescription="TODO" android:contentDescription="TODO"
android:onClick="mainClick" android:onClick="mainClick"
android:padding="6dp"
android:src="@mipmap/icon_main_start_live_new" /> android:src="@mipmap/icon_main_start_live_new" />
</LinearLayout> </LinearLayout>
@ -98,7 +93,7 @@
<androidx.viewpager.widget.ViewPager <androidx.viewpager.widget.ViewPager
android:id="@+id/viewPager" android:id="@+id/viewPager"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_marginTop="78dp" android:layout_marginTop="75dp"
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" />

5
main/src/main/res/layout/view_main_home_live.xml
View File

@ -7,6 +7,7 @@
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/classRecyclerView_top" android:id="@+id/classRecyclerView_top"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_marginStart="10dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:overScrollMode="never" /> android:overScrollMode="never" />
@ -14,8 +15,8 @@
android:id="@+id/refreshView" android:id="@+id/refreshView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="4dp" android:paddingStart="15dp"
android:layout_marginRight="10dp" android:paddingEnd="15dp"
android:layout_marginBottom="55dp" /> android:layout_marginBottom="55dp" />
<FrameLayout <FrameLayout