[+] UI调整

app/build.gradle

@@ -1,14 +1,12 @@
 plugins {
     id 'com.android.application'
-    //生成的proto文件路径
-    //id 'com.google.protobuf'
 }
 android {
 
     namespace 'com.bogo.android'
     defaultConfig {
 
-        applicationId "com.nb.imchat"
+        applicationId "com.manliao.imchat"
         minSdkVersion 26
         targetSdkVersion 35
         compileSdk 35
@@ -91,6 +89,7 @@ android {
         }
 
         debug {
+            applicationIdSuffix = '.debug'
             signingConfig signingConfigs.release
             shrinkResources false
             minifyEnabled false
@@ -98,15 +97,6 @@ android {
         }
     }
 
-//    生成的proto文件路径
-//    sourceSets {
-//        main {
-//            proto {
-//                srcDir 'src/main/java/com/bogo/model/proto'
-//            }
-//        }
-//    }
-
     packagingOptions {
         resources {
             excludes += ['META-INF/LICENSE.txt', 'META-INF/NOTICE.txt']
@@ -190,20 +180,4 @@ dependencies {
 
     implementation 'com.getui:gtsdk:3.3.11.0'  //个推SDK
     implementation 'com.getui:gtc:3.2.18.0'  //个推核心组件
-}
-
-//    生成的proto文件路径
-//protobuf {
-//    protoc {
-//        artifact = 'com.google.protobuf:protoc:3.25.4' // ✅ 自动下载 protoc 编译器
-//    }
-//    generateProtoTasks {
-//        all().each { task ->
-//            task.builtins {
-//                java {
-//                    option 'lite' // ✅ 生成 javalite 兼容类
-//                }
-//            }
-//        }
-//    }
-//}
+}

app/src/main/AndroidManifest.xml

@@ -65,6 +65,7 @@
         android:persistent="true"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
+        android:usesCleartextTraffic="true"
         tools:ignore="GoogleAppIndexingWarning">
 
         <meta-data
@@ -610,11 +611,11 @@
 
 
         <!-- ****************************************推送配置 begin*************************************** -->
-
         <meta-data
             android:name="GETUI_APPID"
             android:value="${GETUI_APPID}" />
 
+
         <!-- 请根据您当前自定义的 PushService 名称路径进行配置-->
         <service
             android:name=".push.DemoPushService"
@@ -622,6 +623,7 @@
             android:label="PushService"
             android:process=":pushservice"/>
 
+
         <service
             android:name="com.bogo.messaging.PushService"
             android:exported="false"

app/src/main/java/com/bogo/android/BogoApplication.java

@@ -21,6 +21,7 @@ import android.os.Handler;
 import android.os.Looper;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 
 import androidx.annotation.NonNull;
@@ -35,6 +36,7 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.baidu.location.LocationClient;
 import com.baidu.mapapi.SDKInitializer;
+import com.baidu.mapauto.auth.util.LogUtil;
 import com.bogo.android.common.App;
 import com.bogo.android.common.Global;
 import com.bogo.android.common.GlobalVideoCache;
@@ -64,6 +66,7 @@ import com.bogo.android.webrtc.ui.VoiceCallingActivity;
 import com.bogo.android.webrtc.ui.VoiceIncomingCallActivity;
 import com.bogo.messaging.PushManager;
 import com.google.android.material.color.DynamicColors;
+import com.igexin.sdk.IUserLoggerInterface;
 import com.tencent.bugly.crashreport.CrashReport;
 
 import org.apache.commons.io.IOUtils;
@@ -121,7 +124,17 @@ public class BogoApplication extends Application implements Application.Activity
             DynamicColors.applyToActivitiesIfAvailable(this);
         }
 
-        com.igexin.sdk.PushManager.getInstance().initialize(context);
+        if (isMainProcess){
+            com.igexin.sdk.PushManager.getInstance().initialize(this);
+            com.igexin.sdk.PushManager.getInstance().setDebugLogger(this, new IUserLoggerInterface()
+            {
+                @Override
+                public void log(String s)
+                {
+                    Log.d("PushManager",s);
+                }
+            });
+        }
 
         globalVideoCache = new GlobalVideoCache(this);
     }

app/src/main/java/com/bogo/android/push/DemoPushService.java

@@ -1,4 +1,18 @@
 package com.bogo.android.push;
 
-public class DemoPushService extends com.igexin.sdk.PushService {
+import android.content.Context;
+import android.util.Log;
+
+import com.igexin.sdk.message.GTTransmitMessage;
+
+public class DemoPushService extends com.igexin.sdk.GTIntentService {
+    @Override
+    public void onReceiveClientId(Context context, String cid) {
+        Log.d("GT", "ClientId: " + cid);  // 保存CID至服务端:cite[2]:cite[4]
+    }
+
+    @Override
+    public void onReceiveMessageData(Context context, GTTransmitMessage msg) {
+        String payload = new String(msg.getPayload());  // 处理透传消息:cite[2]:cite[7]
+    }
 }

app/src/main/res/layout/fragment_home_me.xml

@@ -96,7 +96,7 @@
             android:layout_height="8dp"
             android:background="?colorSurfaceContainerHigh" />
 
-        <RelativeLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/menu_moment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -104,29 +104,38 @@
 
             <ImageView
                 android:id="@+id/iv_total_moment"
-                android:layout_width="24dip"
-                android:layout_height="24dip"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
                 android:layout_centerVertical="true"
                 android:layout_marginStart="15dp"
                 android:layout_marginTop="16dp"
                 android:layout_marginBottom="16dp"
-                app:srcCompat="@drawable/icon_moment" />
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:srcCompat="@mipmap/iv_icon_moment" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_marginStart="50dp"
+                android:layout_marginStart="15dp"
                 android:text="@string/label_function_moment"
                 android:textColor="?colorOnSurface"
                 android:textSize="16sp"
-                android:textStyle="bold" />
+                android:textStyle="bold"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toEndOf="@id/iv_total_moment"
+                app:layout_constraintTop_toTopOf="parent" />
 
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
                 android:layout_centerVertical="true"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/icon_setting_arrow" />
 
             <RelativeLayout
@@ -135,8 +144,11 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
                 android:layout_centerVertical="true"
-                android:layout_marginEnd="16dp"
+                android:layout_marginEnd="25dp"
                 android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
                 tools:visibility="visible">
 
                 <com.bogo.android.common.widget.WebImageView
@@ -157,13 +169,17 @@
             <TextView
                 android:id="@+id/new_msg_count_label"
                 style="@style/badgeTextViewStyle"
+                android:layout_alignParentEnd="true"
                 android:layout_centerVertical="true"
-                android:layout_marginEnd="10dip"
-                android:layout_toStartOf="@id/newMsgHintView"
+                android:layout_marginEnd="10dp"
                 android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/newMsgHintView"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_goneMarginEnd="25dp"
                 tools:visibility="visible" />
 
-        </RelativeLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <View
             android:layout_width="match_parent"
@@ -177,12 +193,11 @@
             android:layout_height="60dp">
 
             <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
                 android:layout_centerVertical="true"
                 android:layout_marginStart="15dp"
-                app:srcCompat="@drawable/icon_menu_album"
-                app:tint="?colorOnSurface" />
+                app:srcCompat="@mipmap/iv_icon_menu_album" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -213,12 +228,11 @@
             android:layout_height="60dp">
 
             <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
                 android:layout_centerVertical="true"
                 android:layout_marginStart="15dp"
-                app:srcCompat="@drawable/icon_main_note"
-                app:tint="?colorOnSurface" />
+                app:srcCompat="@mipmap/iv_icon_main_note" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -249,12 +263,11 @@
             android:layout_height="60dp">
 
             <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
                 android:layout_centerVertical="true"
                 android:layout_marginStart="15dp"
-                app:srcCompat="@drawable/icon_menu_emoticon"
-                app:tint="?colorOnSurface" />
+                app:srcCompat="@mipmap/iv_icon_menu_emoticon" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -276,8 +289,7 @@
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginStart="15dp"
+            android:layout_height="7.5dp"
             android:background="?colorSurfaceContainerHigh" />
 
         <RelativeLayout
@@ -286,12 +298,11 @@
             android:layout_height="60dp">
 
             <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
                 android:layout_centerVertical="true"
                 android:layout_marginStart="15dp"
-                app:srcCompat="@drawable/icon_menu_setting"
-                app:tint="?colorOnSurface" />
+                app:srcCompat="@mipmap/iv_icon_menu_setting" />
 
             <TextView
                 android:layout_width="wrap_content"

app/src/main/res/layout/item_list_contact_header.xml

@@ -25,7 +25,7 @@
             android:text="@string/common_search"
             android:textColor="#FF575858"
             android:textStyle="bold"
-            app:background_normal="#FFF4F4F4"
+            app:background_normal="?colorSurfaceContainerHigh"
             app:corner_radius="10dp"
             app:icon_normal_left="@drawable/icon_appbar_search"
             app:layout_constraintBottom_toBottomOf="parent"

app/src/main/res/layout/layout_header_view.xml

@@ -15,7 +15,7 @@
         android:text="@string/common_search"
         android:textColor="#FF575858"
         android:textStyle="bold"
-        app:background_normal="#FFF4F4F4"
+        app:background_normal="?colorSurfaceContainerHigh"
         app:corner_radius="10dp"
         app:icon_normal_left="@drawable/icon_appbar_search"
         app:layout_constraintBottom_toBottomOf="parent"

app/src/main/res/layout/layout_simple_input_panel.xml

@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.bogo.android.common.widget.SimpleInputPanelView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@android:id/inputArea"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_alignParentBottom="true"
     android:visibility="gone"
+    tools:visibility="visible"
     android:gravity="center_vertical"
     android:orientation="vertical">
 

app/src/main/res/layout/layout_timeline_moment_header.xml

@@ -53,7 +53,7 @@
             app:cardCornerRadius="2dp"
             app:cardElevation="5dp"
             app:contentPadding="5dp"
-            tools:visibility="gone">
+            tools:visibility="visible">
 
             <com.bogo.android.common.widget.WebImageView
                 android:layout_width="32.0dip"

app/src/main/res/layout/layout_user_banner_header.xml

@@ -2,6 +2,7 @@
 
 <com.bogo.android.common.widget.UserBannerHeaderView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/banner_view"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -79,9 +80,11 @@
                     android:paddingBottom="10dp"
                     android:textColor="?colorOutline"
                     android:textSize="14sp"
+                    android:visibility="gone"
                     app:layout_constraintBottom_toBottomOf="@id/icon"
                     app:layout_constraintEnd_toEndOf="@id/icon"
-                    app:layout_constraintStart_toStartOf="@id/icon" />
+                    app:layout_constraintStart_toStartOf="@id/icon"
+                    tools:text="123123" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 

build.gradle

@@ -1,6 +1,4 @@
 plugins {
     id 'com.android.application' version '8.8.2' apply false
     id 'org.jetbrains.kotlin.android' version '2.0.21' apply false
-    // 生成的proto文件路径
-    // id 'com.google.protobuf' version '0.9.2' apply false
 }