From d662d5c3eadeac640b952db5735952b3a5a47863 Mon Sep 17 00:00:00 2001 From: Martin <13046765170@163.com> Date: Sat, 14 Sep 2024 16:38:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/custom/MyRelativeLayout5.java | 2 +- .../com/yunbao/common/utils/RouteUtil.java | 2 +- config.gradle | 4 +-- .../yunbao/main/activity/MainActivity.java | 2 +- .../main/views/MainHomeLiveViewHolder.java | 2 +- .../main/res/layout/item_main_home_lives.xml | 10 +++--- .../main/res/layout/item_main_home_lives2.xml | 3 +- main/src/main/res/layout/view_main_home.xml | 33 ++++++++----------- .../main/res/layout/view_main_home_live.xml | 5 +-- 9 files changed, 29 insertions(+), 34 deletions(-) diff --git a/common/src/main/java/com/yunbao/common/custom/MyRelativeLayout5.java b/common/src/main/java/com/yunbao/common/custom/MyRelativeLayout5.java index d0176be41..a187a6b19 100644 --- a/common/src/main/java/com/yunbao/common/custom/MyRelativeLayout5.java +++ b/common/src/main/java/com/yunbao/common/custom/MyRelativeLayout5.java @@ -26,6 +26,6 @@ public class MyRelativeLayout5 extends RelativeLayout { protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { int widthSize = MeasureSpec.getSize(widthMeasureSpec); heightMeasureSpec = MeasureSpec.makeMeasureSpec(widthSize, MeasureSpec.EXACTLY); - super.onMeasure(widthMeasureSpec, heightMeasureSpec+100); + super.onMeasure(widthMeasureSpec, heightMeasureSpec+150); } } diff --git a/common/src/main/java/com/yunbao/common/utils/RouteUtil.java b/common/src/main/java/com/yunbao/common/utils/RouteUtil.java index f0ee9a43c..eb5f17c45 100644 --- a/common/src/main/java/com/yunbao/common/utils/RouteUtil.java +++ b/common/src/main/java/com/yunbao/common/utils/RouteUtil.java @@ -332,7 +332,7 @@ public class RouteUtil { */ public static void forwardCustomerService(String url) { ARouter.getInstance().build(PATH_CS) - .withString(Constants.URL, url) + .withString(Constants.URL, url+"?1=1") .navigation(); } diff --git a/config.gradle b/config.gradle index 9632ac9e3..08103abcc 100644 --- a/config.gradle +++ b/config.gradle @@ -4,8 +4,8 @@ ext { buildToolsVersion: "29.0.2", minSdkVersion : 23, targetSdkVersion : 34, - versionCode : 697, - versionName : "6.8.1" + versionCode : 1, + versionName : "1.0" ] manifestPlaceholders = [ //正式、 diff --git a/main/src/main/java/com/yunbao/main/activity/MainActivity.java b/main/src/main/java/com/yunbao/main/activity/MainActivity.java index 1553a9874..778dffba6 100644 --- a/main/src/main/java/com/yunbao/main/activity/MainActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/MainActivity.java @@ -577,7 +577,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene }); //获取指导员账号 ConversationIMListManager.get(this).getUserInstructor(this); - checkVersion(); + //checkVersion(); //获取声网Token getSwToken(); initLogUpdate(); 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 fd378b760..70f8fed77 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java @@ -170,7 +170,7 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement } }); mRefreshView.setLayoutManager(gridLayoutManager); - ItemDecoration decoration = new ItemDecoration(mContext, 0x00000000, 5, 0); + ItemDecoration decoration = new ItemDecoration(mContext, 0x00000000, 7, 0); decoration.setOnlySetItemOffsetsButNoDraw(true); mRefreshView.setItemDecoration(decoration); mAdapter = new MainHomeLiveAdapter(mContext, MainActivity.Height); diff --git a/main/src/main/res/layout/item_main_home_lives.xml b/main/src/main/res/layout/item_main_home_lives.xml index a01aae16d..00fe774a4 100644 --- a/main/src/main/res/layout/item_main_home_lives.xml +++ b/main/src/main/res/layout/item_main_home_lives.xml @@ -11,7 +11,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"> - - + android:layout_height="20dp" + android:layout_marginBottom="7dp"> + android:layout_marginBottom="10dp"> + android:layout_marginBottom="10dp"> @@ -51,42 +52,36 @@ + android:layout_alignParentRight="true"> + android:onClick="mainClick" /> @@ -98,7 +93,7 @@ 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 c98693050..4f4df8df8 100644 --- a/main/src/main/res/layout/view_main_home_live.xml +++ b/main/src/main/res/layout/view_main_home_live.xml @@ -7,6 +7,7 @@ @@ -14,8 +15,8 @@ android:id="@+id/refreshView" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginLeft="4dp" - android:layout_marginRight="10dp" + android:paddingStart="15dp" + android:paddingEnd="15dp" android:layout_marginBottom="55dp" />