diff --git a/common/src/main/res/layout/dialog_live_gift_popup.xml b/common/src/main/res/layout/dialog_live_gift_popup.xml index 3f631f656..c289530fa 100644 --- a/common/src/main/res/layout/dialog_live_gift_popup.xml +++ b/common/src/main/res/layout/dialog_live_gift_popup.xml @@ -15,9 +15,9 @@ android:id="@+id/operate_image" android:layout_width="122dp" android:layout_height="50dp" + android:layout_gravity="end|bottom" android:layout_marginEnd="5dp" - android:scaleType="fitXY" - android:layout_gravity="end|bottom" /> + android:scaleType="fitXY" /> @@ -358,8 +358,8 @@ android:id="@+id/gift_title" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginEnd="10dp" - android:layout_marginStart="8dp" /> + android:layout_marginStart="8dp" + android:layout_marginEnd="10dp" /> diff --git a/config.gradle b/config.gradle index 9778093f9..a192301cc 100644 --- a/config.gradle +++ b/config.gradle @@ -4,7 +4,7 @@ ext { buildToolsVersion: "29.0.2", minSdkVersion : 21, targetSdkVersion : 31, - versionCode : 442, + versionCode : 443, versionName : "6.5.4" ] manifestPlaceholders = [ @@ -21,10 +21,10 @@ ext { baiduAppKey : "zgCgFhUKEOV7I3ZXDFpTfnRB", baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S", // true表示谷歌支付 false - isGooglePlay : false, + isGooglePlay : true, //是否上报异常日志 isUploadLog : true, //是否打包成插件包模式 - isPluginModel : true, + isPluginModel : false, ] } diff --git a/live/src/main/res/layout/item_frame_gift.xml b/live/src/main/res/layout/item_frame_gift.xml index b650e2808..e6495ce45 100644 --- a/live/src/main/res/layout/item_frame_gift.xml +++ b/live/src/main/res/layout/item_frame_gift.xml @@ -2,7 +2,7 @@ @@ -66,7 +66,7 @@ android:layout_height="match_parent" android:background="#C0000000" android:gravity="center" - android:visibility="visible"> + android:visibility="gone">