修复登录按钮需要点两次才有反应

调整首页UI顶部对齐

OneToOne/build.gradle

@@ -119,7 +119,7 @@ android {
         minSdkVersion rootProject.ext.android.minSdkVersion
         targetSdkVersion rootProject.ext.android.targetSdkVersion
         versionCode rootProject.ext.android.otoversionCode
-        versionName rootProject.ext.android.otoversionName +new Date().format("HHmm", TimeZone.getTimeZone("GMT+8"))
+        versionName rootProject.ext.android.otoversionName //+new Date().format("HHmm", TimeZone.getTimeZone("GMT+8"))
         manifestPlaceholders = rootProject.ext.manifestPlaceholders
         ndk {
             abiFilters "armeabi-v7a", "arm64-v8a"

OneToOne/src/main/java/com/shayu/onetoone/activity/message/ChatActivity.java

@@ -2,8 +2,11 @@ package com.shayu.onetoone.activity.message;
 
 import android.app.Dialog;
 import android.os.Bundle;
+import android.view.Gravity;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -32,6 +35,7 @@ import com.shayu.onetoone.manager.RouteManager;
 import com.shayu.onetoone.manager.SendMessageManager;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.http.base.HttpCallback;
+import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.SpUtil;
 import com.yunbao.common.utils.StringUtil;
@@ -92,7 +96,9 @@ public class ChatActivity extends AbsOTOActivity {
         Bundle bundle = getIntent().getExtras();
         if (bundle != null) {
             int bundleInt = bundle.getInt("type", -1);
+            // bundleInt=CALL_CHAT_TYPE_MATCH;
             String data = bundle.getString("data");
+            // data="{\"accostMsg\":\"\",\"code\":0,\"mateUser\":{\"giftNum\":0,\"info\":{\"area\":\"\",\"auth\":false,\"auth_back\":\"\",\"auth_remark\":\"\",\"b_y\":1996,\"b_ym\":199611,\"b_ymd\":\"19961122\",\"cn_label\":[],\"create_time\":0,\"en_label\":[],\"first_mate\":0,\"id\":353551,\"is_hello\":1,\"is_hot\":0,\"label_id\":\"\",\"nameAuth\":true,\"name_auth\":\"2\",\"name_auth_time\":0,\"price\":\"0.00\",\"sage_auth\":\"1\",\"sage_auth_time\":0,\"sex\":1,\"star\":11,\"star_name\":\"天蝎座\",\"update_time\":1700615190,\"vodie_price\":\"0.00\"},\"level\":{\"charm\":20,\"charm_icon\":\"https://downs.yaoulive.com/20231117/8337cffc7a880988543a7e3da1fc8668.png\",\"charm_level\":1,\"charm_level_update\":0,\"charm_update\":1700716732,\"create_time\":1700716732,\"exp\":0,\"exp_update\":0,\"icon\":\"\",\"id\":353551,\"level\":10,\"level_update\":1700716732,\"wealth\":40,\"wealth_icon\":\"https://downs.yaoulive.com/20231123/9239a063fefa972762e58fba32099e70.png\",\"wealth_level\":9,\"wealth_level_update\":0,\"wealth_update\":1700716732},\"status\":0,\"user\":{\"agentSwitch\":\"\",\"area\":\"\",\"avatar\":\"https://downs.yaoulive.com/20231126230429_3748b35536c0cd799cf3677677a9c676?imageView2/2/w/600/h/600\",\"avatar2\":\"\",\"avatarThumb\":\"https://downs.yaoulive.com/20231126230429_3748b35536c0cd799cf3677677a9c676?imageView2/2/w/200/h/200\",\"birthday\":\"1996-11-22\",\"city\":\"\",\"coin\":0,\"consumption\":31105,\"contentColor\":\"\",\"contribution\":\"\",\"createTime\":\"\",\"customColorId\":\"\",\"dress\":{\"avatarFrame\":\"\",\"bubble\":\"\",\"medal\":\"\",\"medalNew\":\"\"},\"endColor\":\"\",\"familySwitch\":0,\"fans\":0,\"firstLogin\":0,\"follow\":false,\"follows\":0,\"frontTask\":0,\"giftEffect\":false,\"gold\":0,\"goldsumption\":0,\"goodnum\":\"\",\"goodnumExpireTime\":\"\",\"guardType\":\"\",\"id\":353551,\"isAccost\":1,\"isAdmin\":\"\",\"isAttention\":0,\"isBind\":0,\"isChat\":\"\",\"isGuess\":\"\",\"isRong\":\"\",\"isagent\":0,\"issuper\":0,\"langue\":\"\",\"level\":\"\",\"levelAnchor\":\"\",\"liang\":{\"name\":\"\"},\"lives\":0,\"location\":\"\",\"maxNobleEndTime\":\"\",\"medalLevel\":\"\",\"medalName\":\"\",\"medalNoDisplaySrc\":\"\",\"mobile\":\"\",\"mountEffect\":false,\"needBind\":0,\"nobleEndTime\":\"\",\"nobleId\":0,\"nobleName\":\"\",\"num\":\"\",\"online\":\"1\",\"province\":\"\",\"sex\":1,\"signature\":\"这家伙很懒，什么都没留下\",\"startColor\":\"\",\"token\":\"\",\"tokenRong\":\"\",\"userAlbum\":[],\"userInfoComplete\":0,\"userNicename\":\"灯灯\",\"userStatus\":0,\"usersType\":\"B\",\"version\":\"\",\"vip\":{\"type\":\"\"},\"votestotal\":0}},\"money\":\"0.0000\",\"mp3Time\":0,\"msg\":\"操作成功\",\"prop\":{\"callback\":\"MateTicket\",\"cnTitle\":\"灵魂速配卡\",\"createTime\":1,\"enTitle\":\"linhuncard\",\"exTime\":0,\"icon\":\"https://downs.yaoulive.com/20231116/37cfa701c548327beaa70631b4aa58d9.png\",\"id\":2,\"num\":10,\"status\":1,\"type\":1,\"updateTime\":1700127674},\"videoTime\":0}";
             SendConsumeBean bean = JSONObject.parseObject(data, SendConsumeBean.class);
             if (bean == null) {
                 return;
@@ -114,6 +120,9 @@ public class ChatActivity extends AbsOTOActivity {
                             public void onCreateView(View itemView) {
                                 super.onCreateView(itemView);
                                 ImgLoader.display(ChatActivity.this, bean.getProp().getIcon(), (ImageView) itemView);
+                                FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(DpUtil.dp2px(80), DpUtil.dp2px(47));
+                                params.gravity= Gravity.CENTER;
+                                itemView.setLayoutParams(params);
                             }
                         }).showDialog();
             } else if (bundleInt == CALL_CHAT_TYPE_CHAT_UP) {

OneToOne/src/main/res/layout/dialog_tips1.xml

@@ -33,7 +33,7 @@
 
     <TextView
         android:id="@+id/content"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="14dp"
         android:layout_marginTop="9dp"

OneToOne/src/main/res/layout/fragment_friends.xml

@@ -61,20 +61,20 @@
         android:id="@+id/btn_filter"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="42dp"
         android:layout_marginEnd="14dp"
+        app:layout_constraintBottom_toBottomOf="@+id/btn_top"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/btn_top"
         app:srcCompat="@mipmap/ic_tab_dynamic_filter" />
 
     <ImageView
         android:id="@+id/btn_top"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="42dp"
         android:layout_marginEnd="24dp"
+        app:layout_constraintBottom_toBottomOf="@+id/dslTabLayout"
         app:layout_constraintEnd_toStartOf="@+id/btn_filter"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/dslTabLayout"
         app:srcCompat="@mipmap/ic_tab_dynamic_top" />
 
     <ImageView

common/src/main/java/com/yunbao/common/views/weight/ViewClicksAntiShake.java

@@ -28,7 +28,8 @@ public class ViewClicksAntiShake {
                 .subscribe(new Observer<Unit>() {
                     @Override
                     public void onSubscribe(Disposable d) {
-
+                        if (callBack != null)
+                            callBack.onViewClicks();
                     }
 
                     @Override

config.gradle

@@ -6,7 +6,7 @@ ext {
             targetSdkVersion : 33,
             versionCode      : 445,
             versionName      : "6.6.2",
-            otoversionCode   : 7,
+            otoversionCode   : 8,
             otoversionName   : "1.01"
     ]
     manifestPlaceholders = [