From d82f89f11c9cd24d5855c83c51c06843a96d2339 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Thu, 5 Oct 2023 14:12:03 +0800
Subject: [PATCH] update
---
OneToOne/README.md | 61 ++
OneToOne/build.gradle | 2 +-
OneToOne/src/main/AndroidManifest.xml | 12 +-
.../java/com/shayu/onetoone/AppContext.java | 21 +-
.../onetoone/activity/AbsOTOActivity.java | 20 +
.../onetoone/activity/LauncherActivity.java | 43 +-
.../shayu/onetoone/activity/MainActivity.java | 10 +-
.../activity/fragments/BaseFragment.java | 11 +
.../activity/fragments/DynamicFragment.java | 3 +
.../activity/fragments/FriendsFragment.java | 3 +
.../activity/fragments/MessageFragment.java | 3 +
.../activity/fragments/MyFragment.java | 5 +-
.../activity/fragments/home/HotFragment.java | 31 +
.../fragments/home/RecommendFragment.java | 31 +
.../message/ChatMessageFragment.java | 125 ++-
.../fragments/message/MsgFriendFragment.java | 3 +
.../fragments/message/MsgMessageFragment.java | 275 ++++++-
.../activity/message/ChatActivity.java | 3 +
.../message/MsgMoreConfigActivity.java | 3 +
.../fragments/home/RecommendActivity.java | 27 -
.../adapter/MsgGreetConfigAdapter.java | 3 +
.../MsgMessageRecyclerViewAdapter.java | 9 +-
.../onetoone/bean/MsgGreetConfigBean.java | 3 +
.../shayu/onetoone/bean/MsgMessageBean.java | 3 +
.../shayu/onetoone/dialog/MsgMoreDialog.java | 3 +
.../shayu/onetoone/manager/OTONetManager.java | 56 ++
.../shayu/onetoone/manager/RouteManager.java | 6 +-
.../java/com/shayu/onetoone/network/API.java | 100 +++
.../shayu/onetoone/network/OneToOneApi.java | 80 ++
.../provider/CustomConversationProvider.java | 23 +
.../shayu/onetoone/utils/MainHttpConsts.java | 56 ++
.../shayu/onetoone/utils/MainHttpUtil.java | 776 ++++++++++++++++++
.../utils/MessageMsgInputPanelPlugin.java | 32 +
.../res/drawable/bg_home_recommend_item.xml | 9 +
.../src/main/res/drawable/bg_msg_send.xml | 9 +
.../main/res/layout-v26/item_msg_message.xml | 71 --
.../src/main/res/layout/activity_launcher.xml | 39 +-
.../src/main/res/layout/activity_msg_chat.xml | 1 -
.../src/main/res/layout/fragment_dynamic.xml | 2 +-
.../src/main/res/layout/fragment_friends.xml | 49 +-
OneToOne/src/main/res/layout/fragment_hot.xml | 21 +
OneToOne/src/main/res/layout/fragment_msg.xml | 5 +-
.../main/res/layout/fragment_msg_message.xml | 54 +-
OneToOne/src/main/res/layout/fragment_my.xml | 2 +-
.../main/res/layout/fragment_recommend.xml | 31 +
...tivity_recommend.xml => item_home_hot.xml} | 0
.../main/res/layout/item_home_recommend.xml | 75 ++
.../src/main/res/layout/item_msg_message.xml | 66 --
.../res/layout/rc_conversationlist_item.xml | 83 ++
.../res/layout/rc_extension_input_panel.xml | 153 ++++
.../mipmap-xxhdpi/ic_home_recommend_chat.png | Bin 0 -> 20978 bytes
.../ic_home_recommend_chat_up.png | Bin 0 -> 25052 bytes
.../src/main/res/mipmap-xxhdpi/ic_msg_add.png | Bin 0 -> 4576 bytes
.../main/res/mipmap-xxhdpi/ic_msg_audio.png | Bin 0 -> 5054 bytes
.../main/res/mipmap-xxhdpi/ic_msg_call.png | Bin 0 -> 4473 bytes
.../main/res/mipmap-xxhdpi/ic_msg_emoji.png | Bin 0 -> 5217 bytes
.../main/res/mipmap-xxhdpi/ic_msg_gift.png | Bin 0 -> 3521 bytes
.../main/res/mipmap-xxhdpi/ic_msg_image.png | Bin 0 -> 3860 bytes
.../main/res/mipmap-xxhdpi/ic_msg_video.png | Bin 0 -> 3041 bytes
.../res/mipmap-xxhdpi/ic_recommend_top.png | Bin 0 -> 8154 bytes
common/build.gradle | 8 +-
.../yunbao/common/utils/ProcessImageUtil.java | 22 +-
.../live/activity/LiveRyAnchorActivity.java | 2 +-
63 files changed, 2221 insertions(+), 323 deletions(-)
create mode 100644 OneToOne/README.md
create mode 100644 OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/home/HotFragment.java
create mode 100644 OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/home/RecommendFragment.java
delete mode 100644 OneToOne/src/main/java/com/shayu/onetoone/activitys/fragments/home/RecommendActivity.java
create mode 100644 OneToOne/src/main/java/com/shayu/onetoone/manager/OTONetManager.java
create mode 100644 OneToOne/src/main/java/com/shayu/onetoone/network/API.java
create mode 100644 OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java
create mode 100644 OneToOne/src/main/java/com/shayu/onetoone/provider/CustomConversationProvider.java
create mode 100644 OneToOne/src/main/java/com/shayu/onetoone/utils/MainHttpConsts.java
create mode 100644 OneToOne/src/main/java/com/shayu/onetoone/utils/MainHttpUtil.java
create mode 100644 OneToOne/src/main/java/com/shayu/onetoone/utils/MessageMsgInputPanelPlugin.java
create mode 100644 OneToOne/src/main/res/drawable/bg_home_recommend_item.xml
create mode 100644 OneToOne/src/main/res/drawable/bg_msg_send.xml
delete mode 100644 OneToOne/src/main/res/layout-v26/item_msg_message.xml
create mode 100644 OneToOne/src/main/res/layout/fragment_hot.xml
create mode 100644 OneToOne/src/main/res/layout/fragment_recommend.xml
rename OneToOne/src/main/res/layout/{activity_recommend.xml => item_home_hot.xml} (100%)
create mode 100644 OneToOne/src/main/res/layout/item_home_recommend.xml
delete mode 100644 OneToOne/src/main/res/layout/item_msg_message.xml
create mode 100644 OneToOne/src/main/res/layout/rc_conversationlist_item.xml
create mode 100644 OneToOne/src/main/res/layout/rc_extension_input_panel.xml
create mode 100644 OneToOne/src/main/res/mipmap-xxhdpi/ic_home_recommend_chat.png
create mode 100644 OneToOne/src/main/res/mipmap-xxhdpi/ic_home_recommend_chat_up.png
create mode 100644 OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_add.png
create mode 100644 OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_audio.png
create mode 100644 OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_call.png
create mode 100644 OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_emoji.png
create mode 100644 OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_gift.png
create mode 100644 OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_image.png
create mode 100644 OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_video.png
create mode 100644 OneToOne/src/main/res/mipmap-xxhdpi/ic_recommend_top.png
diff --git a/OneToOne/README.md b/OneToOne/README.md
new file mode 100644
index 000000000..ae0a93274
--- /dev/null
+++ b/OneToOne/README.md
@@ -0,0 +1,61 @@
+# 项目结构
+- `app` PDLive入口
+- `baidu` 百度模块，废弃
+- `beauty` 旧美颜模块，废弃
+- `common` 公共模块
+- `FaceUnity` 美颜模块
+- `lib_country_code` 不管他
+- `live` PDLive直播模块
+- `main` PDLive主页模块
+- `OneToOne` 1v1入口*
+- `pluginsForAnchor` PDLive插件化打包模块
+- `Share` PDLive分享模块
+- `TabLayout` [滑动翻页库模块](!https://github.com/angcyo/DslTabLayout)
+- `video` PDLive 视频模块
+- `ViewPager2Delegate` [滑动翻页附属模块](!https://github.com/angcyo/DslTabLayout)
+# 运行说明
+Gradle版本：
+distributionUrl=`https://services.gradle.org/distributions/gradle-6.1.1-all.zip`
+
+jdk版本：`11.0.2`
+
+AndroidStudio版本：`Android Studio Giraffe | 2022.3.1 Patch 2`
+
+### 若无法编译请检查`gradle.properties`的代理设置
+
+# 1V1项目介绍
+## [项目文档](!https://alidocs.dingtalk.com/i/nodes/YQBnd5ExVEw1DlvwFNaZElK48yeZqMmz?utm_scene=person_space)
+## [蓝图](!https://lanhuapp.com/web/#/item/project/stage?tid=a589c634-a1c0-415a-9691-7bad6c77312c&pid=be2586b6-6583-4447-ac83-bf9669ad4854)
+
+## 1v1项目结构
+
+- `activity` 页面
+- - `fragments`
+- - - `message` 消息页面外层内容
+- - `message` 消息页面独立Activity
+- `adapter` 适配器
+- `bean` 数据Bean类
+- `dialog` 对话框类
+- `network` 网络请求
+- `manager` 单例模式
+- `utils` 工具类
+- `AppContext` Application
+
+### 项目说明
+[即时通讯(IM)融云SDK](!https://doc.rongcloud.cn/im/Android/5.X/ui/init)
+
+[实时音视频融云SDK](!https://doc.rongcloud.cn/call/Android/5.X/callkit/init)
+
+Activity 跳转用Route模块，参考`RouteManager`和`MainActivity`
+
+网络请求使用`OTONetManager`
+图片加载使用`ImgLoader.display(Context context, String url, ImageView imageView)`
+
+### 签名文件
+签名暂时共享PDLive项目签名，用根目录下的`hdl.jks`，其余参考`build.gradle`文件
+
+### APP账号密码
+运行PDLive项目，注册即可，暂时共用
+
+### 混淆
+暂不混淆
\ No newline at end of file
diff --git a/OneToOne/build.gradle b/OneToOne/build.gradle
index 9b26cb6db..72e86dffc 100644
--- a/OneToOne/build.gradle
+++ b/OneToOne/build.gradle
@@ -94,7 +94,7 @@ dependencies {
implementation 'com.google.android.exoplayer:exoplayer:2.18.5'
implementation 'com.google.android.exoplayer:exoplayer-core:2.18.5@aar'
- implementation 'cn.rongcloud.sdk:call_kit:5.2.0' // 音视频通话能力 UI 组件
+ implementation 'cn.rongcloud.sdk:call_kit:5.5.0' // 音视频通话能力 UI 组件
implementation 'com.github.luqiming666:SwipeRecyclerView:1.4.8'//支持侧滑删除
implementation 'com.google.android.material:material:1.6.1'
implementation 'com.blankj:utilcode:1.30.0'//獲取uuid
diff --git a/OneToOne/src/main/AndroidManifest.xml b/OneToOne/src/main/AndroidManifest.xml
index a1de195a8..eb9bd8076 100644
--- a/OneToOne/src/main/AndroidManifest.xml
+++ b/OneToOne/src/main/AndroidManifest.xml
@@ -112,8 +112,18 @@
+
+
+
+
+
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/AppContext.java b/OneToOne/src/main/java/com/shayu/onetoone/AppContext.java
index 41a84d3ab..ef148d31b 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/AppContext.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/AppContext.java
@@ -12,25 +12,33 @@ import com.alibaba.android.arouter.launcher.ARouter;
import com.facebook.FacebookSdk;
import com.shayu.onetoone.activity.fragments.message.ChatMessageFragment;
import com.shayu.onetoone.activity.message.ChatActivity;
+import com.shayu.onetoone.provider.CustomConversationProvider;
import com.shayu.onetoone.utils.NeverCrashUtils;
import com.yunbao.common.BuildConfig;
import com.yunbao.common.CommonAppContext;
import com.yunbao.common.manager.imrongcloud.InstructorSendRewardProvider;
import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
import com.yunbao.common.utils.AppManager;
+import com.yunbao.common.utils.L;
+import com.yunbao.common.utils.ToastUtil;
import io.rong.imkit.RongIM;
import io.rong.imkit.config.RongConfigCenter;
+import io.rong.imkit.conversationlist.model.BaseUiConversation;
+import io.rong.imkit.conversationlist.provider.PrivateConversationProvider;
import io.rong.imkit.utils.RouteUtils;
+import io.rong.imkit.widget.adapter.ProviderManager;
import io.rong.imlib.IMLibRTCClient;
import io.rong.imlib.RongIMClient;
import io.rong.imlib.model.Message;
+import io.rong.imlib.model.MessageContent;
+import io.rong.message.TextMessage;
public class AppContext extends CommonAppContext {
@Override
public void onCreate() {
super.onCreate();
-
+ L.setDeBug(true);
NeverCrashUtils.getInstance()
.setDebugMode(BuildConfig.DEBUG)
.setMainCrashHandler((t, e) -> {
@@ -60,12 +68,23 @@ public class AppContext extends CommonAppContext {
String appKey = "pvxdm17jpd3hr";
boolean enablePush = true;
RongIM.init(this, appKey, enablePush);
+ RongIM.setConnectionStatusListener(new RongIMClient.ConnectionStatusListener() {
+ @Override
+ public void onChanged(ConnectionStatus status) {
+ Log.i("融云", "onChanged: "+status.getMessage());
+ }
+ });
+ ProviderManager providerManager = RongConfigCenter.conversationListConfig().getProviderManager();
+ providerManager.replaceProvider(PrivateConversationProvider.class,new CustomConversationProvider());
+
RongcloudIMManager.initRongIM(this);
RongConfigCenter.conversationConfig().addMessageProvider(new InstructorSendRewardProvider(getApplicationContext()));
RongcloudIMManager.addRongcloudIMOnReceiveMessageListener(new RongIMClient.OnReceiveMessageWrapperListener() {
@Override
public boolean onReceived(Message message, int left, boolean hasPackage, boolean offline) {
+ TextMessage content = (TextMessage) message.getContent();
+ ToastUtil.show("收到:"+content.getContent());
return false;
}
});
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/AbsOTOActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/AbsOTOActivity.java
index 0ed0ca6f5..0de909b71 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/AbsOTOActivity.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/AbsOTOActivity.java
@@ -1,8 +1,11 @@
package com.shayu.onetoone.activity;
import android.content.Context;
+import android.os.Build;
import android.os.Bundle;
import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
import android.widget.TextView;
import androidx.annotation.Nullable;
@@ -10,12 +13,16 @@ import androidx.appcompat.app.AppCompatActivity;
import com.shayu.onetoone.R;
+/**
+ * Activity基类
+ */
public abstract class AbsOTOActivity extends AppCompatActivity {
public Context mContext;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ setStatusBar();
setContentView(getLayoutId());
mContext = this;
main(savedInstanceState);
@@ -24,11 +31,24 @@ public abstract class AbsOTOActivity extends AppCompatActivity {
view.setOnClickListener(v -> finish());
}
}
+ private void setStatusBar() {
+ Window window = getWindow();
+ window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+ window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+ window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+ window.setStatusBarColor(0);
+ }
+ /**
+ * 设置布局id
+ */
protected abstract int getLayoutId();
protected abstract void main(Bundle savedInstanceState);
+ /**
+ * 设置标题
+ */
public void setTitle(String title) {
TextView view = findViewById(R.id.title);
if (view != null) {
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/LauncherActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/LauncherActivity.java
index 564483d92..b7e2279a4 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/LauncherActivity.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/LauncherActivity.java
@@ -4,6 +4,7 @@ import static com.yunbao.common.CommonAppContext.home_zdy_img_cn;
import static com.yunbao.common.CommonAppContext.home_zdy_img_us;
import android.os.Bundle;
+import android.widget.EditText;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -12,6 +13,7 @@ import com.blankj.utilcode.util.GsonUtils;
import com.lzy.okgo.model.Response;
import com.shayu.onetoone.R;
import com.shayu.onetoone.manager.RouteManager;
+import com.shayu.onetoone.utils.MainHttpUtil;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.CommonAppContext;
import com.yunbao.common.bean.IMLoginModel;
@@ -28,8 +30,34 @@ import com.yunbao.common.utils.ToastUtil;
import org.greenrobot.eventbus.EventBus;
+import com.linecorp.linesdk.Scope;
+import com.linecorp.linesdk.auth.LineAuthenticationParams;
+import com.linecorp.linesdk.auth.LineLoginApi;
+import com.linecorp.linesdk.auth.LineLoginResult;
+import com.twitter.sdk.android.core.Callback;
+import com.twitter.sdk.android.core.DefaultLogger;
+import com.twitter.sdk.android.core.Result;
+import com.twitter.sdk.android.core.Twitter;
+import com.twitter.sdk.android.core.TwitterAuthConfig;
+import com.twitter.sdk.android.core.TwitterAuthToken;
+import com.twitter.sdk.android.core.TwitterConfig;
+import com.twitter.sdk.android.core.TwitterException;
+import com.twitter.sdk.android.core.TwitterSession;
+import com.twitter.sdk.android.core.identity.TwitterLoginButton;
+import com.facebook.AccessToken;
+import com.facebook.CallbackManager;
+import com.facebook.FacebookCallback;
+import com.facebook.FacebookException;
+import com.facebook.Profile;
+import com.facebook.ProfileTracker;
+import com.facebook.login.LoginManager;
+import com.facebook.login.LoginResult;
+
import java.util.Arrays;
+/**
+ * 启动Activity
+ */
public class LauncherActivity extends AbsOTOActivity {
@Override
@@ -39,14 +67,12 @@ public class LauncherActivity extends AbsOTOActivity {
@Override
protected void main(Bundle savedInstanceState) {
- //临时用的登录代码，将就下
- HttpClient.getInstance().get("Login.userLogin", "setLoginInfo")
- .params("user_login", "95001")
- .params("user_pass", "123")
- .params("pushid", "")
- .params("lastlogindevice", "Android")
- .params("uuid_Device", DeviceUtils.getUniqueDeviceId())
- .execute(new HttpCallback() {
+
+ findViewById(R.id.login).setOnClickListener(view -> {
+ //账号密码登录 临时用的登录代码，将就下
+ String account = ((EditText) findViewById(R.id.edit_user)).getText().toString();
+ String password= ((EditText) findViewById(R.id.edit_password)).getText().toString();
+ MainHttpUtil.login(account, password, DeviceUtils.getUniqueDeviceId(), new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (code == 0 && info.length > 0) {
@@ -66,6 +92,7 @@ public class LauncherActivity extends AbsOTOActivity {
}
});
+ });
}
private void connectRongCloud() {
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/MainActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/MainActivity.java
index 427012160..a98c1d431 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/MainActivity.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/MainActivity.java
@@ -19,14 +19,22 @@ import com.shayu.onetoone.activity.fragments.FriendsFragment;
import com.shayu.onetoone.activity.fragments.MessageFragment;
import com.shayu.onetoone.activity.fragments.MyFragment;
import com.shayu.onetoone.manager.RouteManager;
+import com.yunbao.common.CommonAppConfig;
+import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
+import com.yunbao.common.utils.ToastUtil;
import java.util.ArrayList;
import java.util.List;
+import io.rong.imkit.RongIM;
+import io.rong.imlib.RongIMClient;
import kotlin.Unit;
import kotlin.jvm.functions.Function1;
import kotlin.jvm.functions.Function4;
+/**
+ * 主页Activity
+ */
@Route(path = RouteManager.ACTIVITY_MAIN)
public class MainActivity extends AbsOTOActivity {
List fragments = new ArrayList<>();
@@ -73,7 +81,7 @@ public class MainActivity extends AbsOTOActivity {
return null;
}
});
-
+ RongcloudIMManager.connectIM(mContext);
}
@Override
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/BaseFragment.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/BaseFragment.java
index 12d0440f9..44f22bf16 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/BaseFragment.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/BaseFragment.java
@@ -10,6 +10,9 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
+/**
+ * Fragment基类
+ */
public abstract class BaseFragment extends Fragment {
public Context mContext;
@@ -23,8 +26,16 @@ public abstract class BaseFragment extends Fragment {
return itemView;
}
+ /**
+ * 初始化页面
+ * @param itemView 布局view
+ */
public abstract void initView(View itemView);
+ /**
+ * 创建页面
+ * @return 布局
+ */
public abstract View createView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState);
}
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/DynamicFragment.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/DynamicFragment.java
index a98ac352a..d44964874 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/DynamicFragment.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/DynamicFragment.java
@@ -8,6 +8,9 @@ import android.view.ViewGroup;
import com.shayu.onetoone.R;
+/**
+ * 动态主页面
+ */
public class DynamicFragment extends BaseFragment {
@Override
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/FriendsFragment.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/FriendsFragment.java
index 5cde347cf..cd810cbc4 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/FriendsFragment.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/FriendsFragment.java
@@ -8,6 +8,9 @@ import android.view.ViewGroup;
import com.shayu.onetoone.R;
+/**
+ * 交友主页面
+ */
public class FriendsFragment extends BaseFragment {
@Override
public void initView(View itemView) {
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MessageFragment.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MessageFragment.java
index df5a7485e..23decc80c 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MessageFragment.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MessageFragment.java
@@ -27,6 +27,9 @@ import kotlin.Unit;
import kotlin.jvm.functions.Function1;
import kotlin.jvm.functions.Function4;
+/**
+ * 消息主页面
+ */
public class MessageFragment extends BaseFragment implements View.OnClickListener {
List fragments = new ArrayList<>();
View more;
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java
index 7ecef1a42..b9a30fb0b 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java
@@ -8,6 +8,9 @@ import android.view.ViewGroup;
import com.shayu.onetoone.R;
+/**
+ * 我的主页面
+ */
public class MyFragment extends BaseFragment {
@Override
public void initView(View itemView) {
@@ -16,6 +19,6 @@ public class MyFragment extends BaseFragment {
@Override
public View createView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
- return inflater.inflate(R.layout.activity_msg_config, container, false);
+ return inflater.inflate(R.layout.fragment_my, container, false);
}
}
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/home/HotFragment.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/home/HotFragment.java
new file mode 100644
index 000000000..0104f7bc6
--- /dev/null
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/home/HotFragment.java
@@ -0,0 +1,31 @@
+package com.shayu.onetoone.activity.fragments.home;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.shayu.onetoone.R;
+import com.yunbao.common.fragment.BaseFragment;
+
+public class HotFragment extends BaseFragment {
+ @Override
+ public View createView(LayoutInflater inflater, ViewGroup container) {
+ return inflater.inflate(R.layout.fragment_hot, container, false);
+ }
+
+ @Override
+ protected void initVariables(Bundle bundle) {
+
+ }
+
+ @Override
+ protected void initViews(Bundle savedInstanceState, View contentView) {
+
+ }
+
+ @Override
+ protected void loadData() {
+
+ }
+}
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/home/RecommendFragment.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/home/RecommendFragment.java
new file mode 100644
index 000000000..7a767b04d
--- /dev/null
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/home/RecommendFragment.java
@@ -0,0 +1,31 @@
+package com.shayu.onetoone.activity.fragments.home;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.shayu.onetoone.R;
+import com.yunbao.common.fragment.BaseFragment;
+
+public class RecommendFragment extends BaseFragment {
+ @Override
+ public View createView(LayoutInflater inflater, ViewGroup container) {
+ return inflater.inflate(R.layout.fragment_recommend, container, false);
+ }
+
+ @Override
+ protected void initVariables(Bundle bundle) {
+
+ }
+
+ @Override
+ protected void initViews(Bundle savedInstanceState, View contentView) {
+
+ }
+
+ @Override
+ protected void loadData() {
+
+ }
+}
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/ChatMessageFragment.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/ChatMessageFragment.java
index c52ce7e3c..71ce4d376 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/ChatMessageFragment.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/ChatMessageFragment.java
@@ -1,46 +1,135 @@
package com.shayu.onetoone.activity.fragments.message;
-import static io.rong.imkit.conversation.extension.component.inputpanel.InputPanel.InputStyle.STYLE_CONTAINER_EXTENSION;
-import static io.rong.imkit.conversation.extension.component.inputpanel.InputPanel.InputStyle.STYLE_SWITCH_CONTAINER_EXTENSION;
-
+import android.net.Uri;
import android.os.Bundle;
-import android.util.Log;
-import android.view.LayoutInflater;
import android.view.View;
-import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.core.content.FileProvider;
+import com.shayu.onetoone.R;
+import com.yunbao.common.CommonAppConfig;
+import com.yunbao.common.Constants;
+import com.yunbao.common.interfaces.ImageResultCallback;
+import com.yunbao.common.utils.ProcessImageUtil;
import com.yunbao.common.utils.ToastUtil;
+import java.io.File;
+import java.lang.reflect.Field;
+import java.util.Date;
+
import io.rong.imkit.IMCenter;
import io.rong.imkit.conversation.ConversationFragment;
+import io.rong.imlib.IRongCallback;
+import io.rong.imlib.ISendMessageCallback;
import io.rong.imlib.RongIMClient;
import io.rong.imlib.model.Conversation;
import io.rong.imlib.model.Message;
-import io.rong.message.TextMessage;
+import io.rong.message.ImageMessage;
+/**
+ * 融云聊天UI
+ */
public class ChatMessageFragment extends ConversationFragment {
+ Button mSendBtn;
+ View mInputPanel;
+ ImageView img, call, video, gift;
+ ProcessImageUtil cameraUtil;
+ String targetId;
+ Conversation.ConversationType conversationType= Conversation.ConversationType.PRIVATE;
+
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
- Conversation.ConversationType conversationType = Conversation.ConversationType.PRIVATE;
- String targetId = "user1";
- Message.SentStatus sentStatus = Message.SentStatus.SENT;
- TextMessage content = TextMessage.obtain("这里是消息内容");
- long sentTime = System.currentTimeMillis();
- IMCenter.getInstance().insertOutgoingMessage(conversationType, targetId, sentStatus, content, sentTime, new RongIMClient.ResultCallback() {
+ initBtn();
+ targetId = getActivity().getIntent().getStringExtra("targetId");
+ cameraUtil = new ProcessImageUtil(getActivity(), "com.shayu.onetoone.fileprovider");
+ mSendBtn.setOnClickListener(v -> sendText());
+ img.setOnClickListener(v -> cameraUtil.getImageByCamera());
+ cameraUtil.setImageResultCallback(new ImageResultCallback() {
@Override
- public void onSuccess(Message message) {
- ToastUtil.show("消息发送成功");
+ public void beforeCamera() {
+
}
@Override
- public void onError(RongIMClient.ErrorCode e) {
- ToastUtil.show("消息发送失败:"+e.msg);
- Log.i("聊天", "onError: "+e);
+ public void onSuccess(File file) {
+ sendImage(file);
+ }
+
+ @Override
+ public void onFailure() {
+
}
});
}
+
+ private void initBtn() {
+ try {
+ Field field = mRongExtension.getInputPanel().getClass().getDeclaredField("mInputPanel");
+ field.setAccessible(true);
+ mInputPanel = (View) field.get(mRongExtension.getInputPanel());
+ assert mInputPanel != null;
+ mSendBtn = mInputPanel.findViewById(R.id.send_btn);
+ img = mInputPanel.findViewById(R.id.input_panel_image_btn);
+ video = mInputPanel.findViewById(R.id.input_panel_video_btn);
+ call = mInputPanel.findViewById(R.id.input_panel_call_btn);
+ gift = mInputPanel.findViewById(R.id.input_panel_gift_btn);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private void sendText() {
+ try {
+ Field field = mRongExtension.getInputPanel().getClass().getDeclaredField("mSendBtn");
+ field.setAccessible(true);
+ Button send = (Button) field.get(mRongExtension.getInputPanel());
+ assert send != null;
+ send.callOnClick();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private void sendImage(File file) {
+ ImageMessage imageMessage = ImageMessage.obtain(Uri.parse("file://"+file.getAbsolutePath()),true);
+ Message message = Message.obtain(targetId, conversationType, imageMessage);
+ message.setSenderUserId(CommonAppConfig.getInstance().getUid());
+ message.setObjectName("RC:ImgMsg");
+ message.setExtra("");
+ message.setSentTime(new Date().getTime());
+ message.setTargetId(targetId);
+ IMCenter.getInstance().sendMediaMessage(message, null, null, new IRongCallback.ISendMediaMessageCallback() {
+
+ @Override
+ public void onProgress(Message message, int progress) {
+
+ }
+
+ @Override
+ public void onCanceled(Message message) {
+
+ }
+
+ @Override
+ public void onAttached(Message message) {
+
+ }
+
+ @Override
+ public void onSuccess(Message message) {
+ }
+
+ @Override
+ public void onError(Message message, RongIMClient.ErrorCode errorCode) {
+ ToastUtil.show("发送失败");
+ System.out.println("发送失败：" + errorCode.getMessage());
+ }
+ });
+
+ }
}
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MsgFriendFragment.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MsgFriendFragment.java
index fb3147008..662d00a14 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MsgFriendFragment.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MsgFriendFragment.java
@@ -8,6 +8,9 @@ import android.view.ViewGroup;
import com.shayu.onetoone.R;
import com.shayu.onetoone.activity.fragments.BaseFragment;
+/**
+ * 消息-好友
+ */
public class MsgFriendFragment extends BaseFragment {
@Override
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MsgMessageFragment.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MsgMessageFragment.java
index 05f264f1d..d9889c879 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MsgMessageFragment.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MsgMessageFragment.java
@@ -2,12 +2,21 @@ package com.shayu.onetoone.activity.fragments.message;
import android.graphics.Color;
import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
-import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import com.shayu.onetoone.R;
@@ -27,51 +36,83 @@ import com.yunbao.common.utils.ToastUtil;
import java.util.ArrayList;
import java.util.List;
+import io.rong.common.RLog;
+import io.rong.imkit.IMCenter;
+import io.rong.imkit.config.ConversationListBehaviorListener;
+import io.rong.imkit.config.RongConfigCenter;
+import io.rong.imkit.conversationlist.ConversationListAdapter;
+import io.rong.imkit.conversationlist.ConversationListFragment;
+import io.rong.imkit.conversationlist.model.BaseUiConversation;
+import io.rong.imkit.conversationlist.model.GatheredConversation;
+import io.rong.imkit.conversationlist.viewmodel.ConversationListViewModel;
+import io.rong.imkit.event.Event;
+import io.rong.imkit.model.NoticeContent;
import io.rong.imkit.utils.RouteUtils;
+import io.rong.imkit.widget.FixedLinearLayoutManager;
+import io.rong.imkit.widget.adapter.BaseAdapter;
+import io.rong.imkit.widget.adapter.ViewHolder;
+import io.rong.imkit.widget.dialog.OptionsPopupDialog;
+import io.rong.imkit.widget.refresh.SmartRefreshLayout;
+import io.rong.imkit.widget.refresh.api.RefreshLayout;
+import io.rong.imkit.widget.refresh.constant.RefreshState;
+import io.rong.imkit.widget.refresh.listener.OnLoadMoreListener;
+import io.rong.imkit.widget.refresh.listener.OnRefreshListener;
+import io.rong.imkit.widget.refresh.wrapper.RongRefreshHeader;
+import io.rong.imlib.RongIMClient;
import io.rong.imlib.model.Conversation;
-import io.rong.imlib.model.ConversationIdentifier;
-public class MsgMessageFragment extends BaseFragment {
- SwipeRecyclerView recyclerView;
- SwipeRefreshLayout swipeRefreshLayout;
- ConstraintLayout netError;
- MsgMessageRecyclerViewAdapter adapter;
+/**
+ * 消息-消息
+ * copy {@link io.rong.imkit.conversationlist.ConversationListFragment}
+ */
+public class MsgMessageFragment extends BaseFragment implements BaseAdapter.OnItemClickListener {
+ private static final String TAG = MsgMessageFragment.class.getSimpleName();
+ SwipeRecyclerView mList;
+ SmartRefreshLayout mRefreshLayout;
+ ConversationListAdapter mAdapter;
List list;
+ protected View mNoticeContainerView;
+ protected TextView mNoticeContentTv;
+ protected ImageView mNoticeIconIv;
+ protected ConversationListViewModel mConversationListViewModel;
+ protected Handler mHandler = new Handler(Looper.getMainLooper());
+ protected boolean delayRefresh = false;
+
@Override
public void initView(View itemView) {
- recyclerView = itemView.findViewById(R.id.recyclerView);
- swipeRefreshLayout = itemView.findViewById(R.id.swipeRefreshLayout);
- netError = itemView.findViewById(R.id.net_error);
- adapter = new MsgMessageRecyclerViewAdapter(getContext());
+ mList = itemView.findViewById(R.id.recyclerView);
+ mRefreshLayout = itemView.findViewById(R.id.swipeRefreshLayout);
+ mAdapter = new ConversationListAdapter();
list = new ArrayList<>();
initData();
- recyclerView.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false));
- recyclerView.setSwipeMenuCreator(initSwipeMenuCreator());
+ mList.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false));
+ mList.setSwipeMenuCreator(initSwipeMenuCreator());
initMoreListener();
- initRefreshListener();
- recyclerView.setOnItemMenuClickListener(new OnItemMenuClickListener() {
+ mList.setOnItemMenuClickListener(new OnItemMenuClickListener() {
@Override
public void onItemClick(SwipeMenuBridge menuBridge, int adapterPosition) {
menuBridge.closeMenu();
if (menuBridge.getPosition() == 0) {
- ToastUtil.showDebug("置顶：" + adapter.getList().get(adapterPosition).getNickname());
+ BaseUiConversation conversation = mAdapter.getData().get(adapterPosition);
+ IMCenter.getInstance().setConversationToTop(Conversation.ConversationType.PRIVATE, conversation.mCore.getTargetId(), !conversation.mCore.isTop(), true, new RongIMClient.ResultCallback() {
+ @Override
+ public void onSuccess(Boolean aBoolean) {
+ }
+
+ @Override
+ public void onError(RongIMClient.ErrorCode e) {
+
+ }
+ });
+ // ToastUtil.showDebug("置顶：" + mAdapter.getList().get(adapterPosition).getNickname());
} else {
- ToastUtil.showDebug("删除：" + adapter.getList().get(adapterPosition).getNickname());
- adapter.getList().remove(adapterPosition);
- adapter.notifyDataSetChanged();
+ // ToastUtil.showDebug("删除：" + mAdapter.getList().get(adapterPosition).getNickname());
+ mAdapter.getData().remove(adapterPosition);
+ mAdapter.notifyDataSetChanged();
}
}
});
- recyclerView.setOnItemClickListener(new OnItemClickListener() {
- @Override
- public void onItemClick(View view, int i) {
- RouteManager.forwardMsgChatActivity();
- }
- });
- recyclerView.setAdapter(adapter);
- adapter.setList(list);
-
}
@Override
@@ -79,6 +120,168 @@ public class MsgMessageFragment extends BaseFragment {
return inflater.inflate(R.layout.fragment_msg_message, container, false);
}
+ protected int mNewState = 0;
+
+ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+ if (!IMCenter.getInstance().isInitialized()) {
+ RLog.e(TAG, "Please init SDK first!");
+ } else {
+ LinearLayoutManager layoutManager = new FixedLinearLayoutManager(this.getActivity());
+ this.mList.setLayoutManager(layoutManager);
+ this.mList.setAdapter(this.mAdapter);
+ this.mList.addOnScrollListener(new RecyclerView.OnScrollListener() {
+ public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
+ MsgMessageFragment.this.mNewState = newState;
+ if (MsgMessageFragment.this.mNewState == 0 && MsgMessageFragment.this.delayRefresh && MsgMessageFragment.this.mAdapter != null && MsgMessageFragment.this.mConversationListViewModel != null) {
+ MsgMessageFragment.this.delayRefresh = false;
+ MsgMessageFragment.this.mAdapter.setDataCollection((List) MsgMessageFragment.this.mConversationListViewModel.getConversationListLiveData().getValue());
+ }
+
+ }
+ });
+ this.mAdapter.setItemClickListener(this);
+ this.mNoticeContainerView = view.findViewById(R.id.rc_conversationlist_notice_container);
+ this.mNoticeContentTv = (TextView) view.findViewById(R.id.rc_conversationlist_notice_tv);
+ this.mNoticeIconIv = (ImageView) view.findViewById(R.id.rc_conversationlist_notice_icon_iv);
+ this.initRefreshView();
+ this.subscribeUi();
+ }
+ }
+
+ public void onResume() {
+ super.onResume();
+ if (this.mConversationListViewModel != null) {
+ this.mConversationListViewModel.clearAllNotification();
+ }
+
+ }
+
+ protected void initRefreshView() {
+ if (this.mRefreshLayout == null) {
+ RLog.d(this.TAG, "initRefreshView null");
+ } else {
+ this.mRefreshLayout.setNestedScrollingEnabled(false);
+ this.mRefreshLayout.setRefreshHeader(new RongRefreshHeader(this.getContext()));
+ this.mRefreshLayout.setRefreshFooter(new RongRefreshHeader(this.getContext()));
+ this.mRefreshLayout.setOnRefreshListener(new OnRefreshListener() {
+ public void onRefresh(@NonNull RefreshLayout refreshLayout) {
+ MsgMessageFragment.this.onConversationListRefresh(refreshLayout);
+ }
+ });
+ this.mRefreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() {
+ public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
+ MsgMessageFragment.this.onConversationListLoadMore();
+ }
+ });
+ }
+ }
+
+ protected void subscribeUi() {
+ this.mConversationListViewModel = (ConversationListViewModel) (new ViewModelProvider(this)).get(ConversationListViewModel.class);
+ this.mConversationListViewModel.getConversationList(false, false, 0L);
+ this.mConversationListViewModel.getConversationListLiveData().observe(this.getViewLifecycleOwner(), new Observer>() {
+ public void onChanged(List uiConversations) {
+ RLog.d(MsgMessageFragment.this.TAG, "conversation list onChanged.");
+ if (MsgMessageFragment.this.mNewState == 0) {
+ MsgMessageFragment.this.mAdapter.setDataCollection(uiConversations);
+ } else {
+ MsgMessageFragment.this.delayRefresh = true;
+ }
+
+ }
+ });
+ this.mConversationListViewModel.getNoticeContentLiveData().observe(this.getViewLifecycleOwner(), new Observer() {
+ public void onChanged(NoticeContent noticeContent) {
+ if (MsgMessageFragment.this.mNoticeContainerView.getVisibility() == View.GONE) {
+ MsgMessageFragment.this.mHandler.postDelayed(new Runnable() {
+ public void run() {
+ MsgMessageFragment.this.updateNoticeContent((NoticeContent) MsgMessageFragment.this.mConversationListViewModel.getNoticeContentLiveData().getValue());
+ }
+ }, 4000L);
+ } else {
+ MsgMessageFragment.this.updateNoticeContent(noticeContent);
+ }
+
+ }
+ });
+ this.mConversationListViewModel.getRefreshEventLiveData().observe(this.getViewLifecycleOwner(), new Observer() {
+ public void onChanged(Event.RefreshEvent refreshEvent) {
+ if (refreshEvent.state.equals(RefreshState.LoadFinish)) {
+ if (MsgMessageFragment.this.mRefreshLayout != null) {
+ MsgMessageFragment.this.mRefreshLayout.finishLoadMore();
+ } else {
+ RLog.d(MsgMessageFragment.this.TAG, "onChanged finishLoadMore error");
+ }
+ } else if (refreshEvent.state.equals(RefreshState.RefreshFinish)) {
+ if (MsgMessageFragment.this.mRefreshLayout != null) {
+ MsgMessageFragment.this.mRefreshLayout.finishRefresh();
+ } else {
+ RLog.d(MsgMessageFragment.this.TAG, "onChanged finishRefresh error");
+ }
+ }
+
+ }
+ });
+ }
+
+ protected void onConversationListRefresh(RefreshLayout refreshLayout) {
+ if (this.mConversationListViewModel != null) {
+ this.mConversationListViewModel.getConversationList(false, true, 0L);
+ }
+
+ }
+
+ protected void onConversationListLoadMore() {
+ if (this.mConversationListViewModel != null) {
+ this.mConversationListViewModel.getConversationList(true, true, 0L);
+ }
+
+ }
+
+ protected void updateNoticeContent(NoticeContent content) {
+ if (content != null) {
+ if (content.isShowNotice()) {
+ this.mNoticeContainerView.setVisibility(View.VISIBLE);
+ this.mNoticeContentTv.setText(content.getContent());
+ if (content.getIconResId() != 0) {
+ this.mNoticeIconIv.setImageResource(content.getIconResId());
+ }
+ } else {
+ this.mNoticeContainerView.setVisibility(View.GONE);
+ }
+
+ }
+ }
+
+
+ public void onItemClick(View view, ViewHolder holder, int position) {
+ if (position >= 0 && position < this.mAdapter.getData().size()) {
+ BaseUiConversation baseUiConversation = (BaseUiConversation) this.mAdapter.getItem(position);
+ ConversationListBehaviorListener listBehaviorListener = RongConfigCenter.conversationListConfig().getListener();
+ if (listBehaviorListener != null && listBehaviorListener.onConversationClick(view.getContext(), view, baseUiConversation)) {
+ RLog.d(this.TAG, "ConversationList item click event has been intercepted by App.");
+ } else {
+ if (baseUiConversation != null && baseUiConversation.mCore != null) {
+ if (baseUiConversation instanceof GatheredConversation) {
+ RouteUtils.routeToSubConversationListActivity(view.getContext(), ((GatheredConversation) baseUiConversation).mGatheredType, baseUiConversation.mCore.getConversationTitle());
+ } else {
+ RouteUtils.routeToConversationActivity(view.getContext(), baseUiConversation.getConversationIdentifier());
+ }
+ } else {
+ RLog.e(this.TAG, "invalid conversation.");
+ }
+
+ }
+ }
+ }
+
+ @Override
+ public boolean onItemLongClick(View view, ViewHolder holder, int position) {
+ return false;
+ }
+
+
private SwipeMenuCreator initSwipeMenuCreator() {
SwipeMenuCreator creator = (leftMenu, rightMenu, position) -> {
SwipeMenuItem top = new SwipeMenuItem(getContext());
@@ -107,24 +310,14 @@ public class MsgMessageFragment extends BaseFragment {
new ArrayList<>(list);
initData();
tmp.addAll(list);
- adapter.setList(tmp);
+ // mAdapter.setDataCollection(tmp);
list = new ArrayList<>(tmp);
- recyclerView.loadMoreFinish(false, true);
+ mList.loadMoreFinish(false, true);
}
};
- recyclerView.setLoadMoreListener(moreListener);
+ mList.setLoadMoreListener(moreListener);
}
- private void initRefreshListener() {
- swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
- @Override
- public void onRefresh() {
- initData();
- adapter.setList(list);
- swipeRefreshLayout.setRefreshing(false);
- }
- });
- }
private void initData() {
list = new ArrayList<>();
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/message/ChatActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/message/ChatActivity.java
index bf9593678..b42d38eff 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/message/ChatActivity.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/message/ChatActivity.java
@@ -13,6 +13,9 @@ import com.shayu.onetoone.manager.RouteManager;
import io.rong.imkit.conversation.ConversationFragment;
+/**
+ * 聊天界面
+ */
@Route(path = RouteManager.ACTIVITY_MSG_CHAT)
public class ChatActivity extends AbsOTOActivity {
@Override
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/message/MsgMoreConfigActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/message/MsgMoreConfigActivity.java
index 5633bc174..8d12b7931 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/message/MsgMoreConfigActivity.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/message/MsgMoreConfigActivity.java
@@ -17,6 +17,9 @@ import com.shayu.onetoone.bean.MsgGreetConfigBean;
import com.shayu.onetoone.manager.RouteManager;
import com.yunbao.common.interfaces.OnItemClickListener;
+/**
+ * 打招呼设置界面
+ */
@Route(path = RouteManager.ACTIVITY_MSG_MORE_CONFIG_ACTIVITY)
public class MsgMoreConfigActivity extends AbsOTOActivity {
RecyclerView recyclerView;
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activitys/fragments/home/RecommendActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activitys/fragments/home/RecommendActivity.java
deleted file mode 100644
index bd31dfc3f..000000000
--- a/OneToOne/src/main/java/com/shayu/onetoone/activitys/fragments/home/RecommendActivity.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.shayu.onetoone.activitys.fragments.home;
-
-import android.os.Bundle;
-
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
-
-import com.shayu.onetoone.R;
-import com.shayu.onetoone.activity.AbsOTOActivity;
-import com.shayu.onetoone.activity.fragments.message.ChatMessageFragment;
-
-import io.rong.imkit.conversation.ConversationFragment;
-
-/**
- * 推荐
- */
-public class RecommendActivity extends AbsOTOActivity {
- @Override
- protected int getLayoutId() {
- return R.layout.activity_recommend;
- }
-
- @Override
- protected void main(Bundle savedInstanceState) {
-
- }
-}
\ No newline at end of file
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/adapter/MsgGreetConfigAdapter.java b/OneToOne/src/main/java/com/shayu/onetoone/adapter/MsgGreetConfigAdapter.java
index 04bfb5c23..f617bb03a 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/adapter/MsgGreetConfigAdapter.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/adapter/MsgGreetConfigAdapter.java
@@ -19,6 +19,9 @@ import com.yunbao.common.interfaces.OnItemClickListener;
import java.util.ArrayList;
import java.util.List;
+/**
+ * 打招呼设置适配器
+ */
public class MsgGreetConfigAdapter extends RecyclerView.Adapter {
List mList;
Context mContext;
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/adapter/MsgMessageRecyclerViewAdapter.java b/OneToOne/src/main/java/com/shayu/onetoone/adapter/MsgMessageRecyclerViewAdapter.java
index 4245877f4..f36303e04 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/adapter/MsgMessageRecyclerViewAdapter.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/adapter/MsgMessageRecyclerViewAdapter.java
@@ -16,6 +16,9 @@ import com.yunbao.common.glide.ImgLoader;
import java.util.List;
+/**
+ * 聊天列表适配器
+ */
public class MsgMessageRecyclerViewAdapter extends RecyclerView.Adapter {
List list;
Context mContext;
@@ -36,7 +39,7 @@ public class MsgMessageRecyclerViewAdapter extends RecyclerView.Adapter callback) {
+ API.get().pdLiveApi(mContext)
+ .getGiftNamingInfo(giftId)
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new Consumer>() {
+ @Override
+ public void accept(ResponseModel liveGiftBeanResponseModel) throws Exception {
+ if (callback!=null){
+ callback.onSuccess(liveGiftBeanResponseModel.getData().getInfo());
+ }
+ }
+ }, new Consumer() {
+ @Override
+ public void accept(Throwable throwable) throws Exception {
+ if (callback != null) {
+ callback.onError(mContext.getString(com.yunbao.common.R.string.net_error));
+ }
+ }
+ }).isDisposed();
+ }
+*/
+
+}
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/manager/RouteManager.java b/OneToOne/src/main/java/com/shayu/onetoone/manager/RouteManager.java
index b7052c4ea..63958998d 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/manager/RouteManager.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/manager/RouteManager.java
@@ -6,9 +6,9 @@ import com.alibaba.android.arouter.launcher.ARouter;
* 路由跳转Activity
*/
public class RouteManager {
- public static final String ACTIVITY_MAIN = "/activity/MainActivity";
- public static final String ACTIVITY_MSG_MORE_CONFIG_ACTIVITY = "/activity/MsgMoreConfigActivity";
- public static final String ACTIVITY_MSG_CHAT = "/activity/ChatActivity";
+ public static final String ACTIVITY_MAIN = "/activity/MainActivity"; //主页
+ public static final String ACTIVITY_MSG_MORE_CONFIG_ACTIVITY = "/activity/MsgMoreConfigActivity";//打招呼页面
+ public static final String ACTIVITY_MSG_CHAT = "/activity/ChatActivity";//聊天页面
public static void forwardMainActivity() {
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/network/API.java b/OneToOne/src/main/java/com/shayu/onetoone/network/API.java
new file mode 100644
index 000000000..e1f5634e4
--- /dev/null
+++ b/OneToOne/src/main/java/com/shayu/onetoone/network/API.java
@@ -0,0 +1,100 @@
+package com.shayu.onetoone.network;
+
+import android.content.Context;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.internal.bind.DateTypeAdapter;
+import com.yunbao.common.CommonAppConfig;
+import com.yunbao.common.CommonAppContext;
+import com.yunbao.common.http.HttpLoggingInterceptor;
+import com.yunbao.common.http.base.BaseApi;
+import com.yunbao.common.http.base.ParamsContext;
+
+import java.io.IOException;
+import java.util.Date;
+
+import okhttp3.Interceptor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
+import retrofit2.converter.gson.GsonConverterFactory;
+
+/**
+ * 网络请求接口
+ */
+public class API extends BaseApi {
+ private OneToOneApi otoApi;
+
+ private static API api;
+
+
+ /**
+ * 获取单利
+ *
+ * @return
+ */
+ public static API get() {
+ if (null == api) {
+ api = new API();
+ }
+ return api;
+ }
+
+ public OneToOneApi otoApi(Context context) {
+ if (null == otoApi) {
+ //实例化gson
+ otoApi = createOneToOneApi(true, true);
+ }
+ return otoApi;
+ }
+
+ /**
+ * 创建新的OneToOneApi，兼容部分接口需要控制是否添加UID参数
+ * 仅有需要不添加uid的接口使用，默认请用otoApi()
+ *
+ * @param isNeedUid 是否需要用户uid参数
+ * @return OneToOneApi
+ */
+ public OneToOneApi createOneToOneApi(boolean isNeedUid) {
+ return createOneToOneApi(isNeedUid, true);
+ }
+
+ /**
+ * 创建新的OneToOneApi，兼容部分接口需要控制是否添加UID参数
+ * 仅有需要不添加uid或token的接口使用，默认请用otoApi()
+ *
+ * @param isNeedUid 是否需要用户uid参数
+ * @param isNeedToken 是否需要用户Token
+ * @return OneToOneApi
+ */
+ public OneToOneApi createOneToOneApi(boolean isNeedUid, boolean isNeedToken) {
+ Gson gson = new GsonBuilder()
+ .registerTypeAdapter(Date.class, new DateTypeAdapter())
+ .create();
+ HttpLoggingInterceptor loggingInterceptor = new HttpLoggingInterceptor("http");
+ loggingInterceptor.setPrintLevel(HttpLoggingInterceptor.Level.BODY);
+ OkHttpClient.Builder builder = new OkHttpClient()
+ .newBuilder()
+
+ .addInterceptor(initQuery(isNeedUid, isNeedToken, CommonAppContext.sInstance.getApplicationContext()))
+ .addInterceptor(loggingInterceptor);
+ return create(builder.build(),
+ GsonConverterFactory.create(gson), RxJava2CallAdapterFactory.create(), CommonAppConfig.HOST, OneToOneApi.class);
+ }
+
+ //公共参数
+ public Interceptor initQuery(boolean isNeedUid, boolean isNeedToken, final Context context) {
+ Interceptor addQueryParameterInterceptor = new Interceptor() {
+ @Override
+ public Response intercept(Chain chain) throws IOException {
+ Request request = chain.request();
+ //配置公共参数
+ request = new ParamsContext(request, context).getInRequest(isNeedUid, isNeedToken);
+ return chain.proceed(request);
+ }
+ };
+ return addQueryParameterInterceptor;
+ }
+}
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java b/OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java
new file mode 100644
index 000000000..9cb3ee677
--- /dev/null
+++ b/OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java
@@ -0,0 +1,80 @@
+package com.shayu.onetoone.network;
+
+import com.alibaba.fastjson.JSONObject;
+import com.yunbao.common.bean.ActiveModel;
+import com.yunbao.common.bean.AnchorRecommendItemModel;
+import com.yunbao.common.bean.AnchorRecommendModel;
+import com.yunbao.common.bean.BaseModel;
+import com.yunbao.common.bean.BlindBoxInfoModel;
+import com.yunbao.common.bean.CheckLiveModel;
+import com.yunbao.common.bean.ContributeModel;
+import com.yunbao.common.bean.CustomSidebarInfoModel;
+import com.yunbao.common.bean.DiscountsModel;
+import com.yunbao.common.bean.EnterRoomNewModel;
+import com.yunbao.common.bean.FaceBookUpModel;
+import com.yunbao.common.bean.FansCheckRed;
+import com.yunbao.common.bean.FansGroupGiftPack;
+import com.yunbao.common.bean.FansGroupGiftPackInfo;
+import com.yunbao.common.bean.GiftAlreadyWallModel;
+import com.yunbao.common.bean.GiftGuideModel;
+import com.yunbao.common.bean.GiftNamingInfoModel;
+import com.yunbao.common.bean.GiftWallGiftDetail;
+import com.yunbao.common.bean.GiftWallModel;
+import com.yunbao.common.bean.HourRank;
+import com.yunbao.common.bean.HttpCallbackModel;
+import com.yunbao.common.bean.IMLoginModel;
+import com.yunbao.common.bean.LinkMicUserBeanV2;
+import com.yunbao.common.bean.ListInfoMessageModel;
+import com.yunbao.common.bean.LiveAiRobotBean;
+import com.yunbao.common.bean.LiveAnchorCallMeModel;
+import com.yunbao.common.bean.LiveAnchorSayModel;
+import com.yunbao.common.bean.LiveDataInfoModel;
+import com.yunbao.common.bean.LiveInfoModel;
+import com.yunbao.common.bean.LiveRoomActivityBanner;
+import com.yunbao.common.bean.LiveRoomVoteModel;
+import com.yunbao.common.bean.LiveStetUpStatusModel;
+import com.yunbao.common.bean.LiveTaskModel;
+import com.yunbao.common.bean.LiveUserMailBoxModel;
+import com.yunbao.common.bean.MedalAchievementModel;
+import com.yunbao.common.bean.MsgSwitchDetailModel;
+import com.yunbao.common.bean.NewPeopleInfo;
+import com.yunbao.common.bean.NobleRankHideUserListModel;
+import com.yunbao.common.bean.NobleTrumpetModel;
+import com.yunbao.common.bean.PkRankBean;
+import com.yunbao.common.bean.PrankGiftBean;
+import com.yunbao.common.bean.PrankHttpTurntableBean;
+import com.yunbao.common.bean.RandomPkUserBean;
+import com.yunbao.common.bean.RankPkInfoBean;
+import com.yunbao.common.bean.RedPacketDetailsBean;
+import com.yunbao.common.bean.RedPacketGiftModel;
+import com.yunbao.common.bean.RedPacketInfoModel;
+import com.yunbao.common.bean.RedPacketListBean;
+import com.yunbao.common.bean.SearchModel;
+import com.yunbao.common.bean.SetAttentsModel;
+import com.yunbao.common.bean.SlideInBannerModel;
+import com.yunbao.common.bean.StarChallengeStatusModel;
+import com.yunbao.common.bean.UserAreaBean;
+import com.yunbao.common.bean.UserAvatarSelectBean;
+import com.yunbao.common.bean.VipModel;
+import com.yunbao.common.bean.WishListGiftConfModel;
+import com.yunbao.common.bean.WishListModel;
+import com.yunbao.common.http.ResponseModel;
+
+import java.util.List;
+import java.util.Map;
+
+import io.reactivex.Observable;
+import retrofit2.http.Field;
+import retrofit2.http.FormUrlEncoded;
+import retrofit2.http.GET;
+import retrofit2.http.POST;
+import retrofit2.http.Query;
+import retrofit2.http.QueryMap;
+
+/**
+ * 1v1网络接口访问 参考 {@link com.yunbao.common.http.PDLiveApi}
+ */
+public interface OneToOneApi {
+
+
+}
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/provider/CustomConversationProvider.java b/OneToOne/src/main/java/com/shayu/onetoone/provider/CustomConversationProvider.java
new file mode 100644
index 000000000..999092f29
--- /dev/null
+++ b/OneToOne/src/main/java/com/shayu/onetoone/provider/CustomConversationProvider.java
@@ -0,0 +1,23 @@
+package com.shayu.onetoone.provider;
+
+import java.util.List;
+
+import io.rong.imkit.conversationlist.model.BaseUiConversation;
+import io.rong.imkit.conversationlist.provider.BaseConversationProvider;
+import io.rong.imkit.widget.adapter.IViewProviderListener;
+import io.rong.imkit.widget.adapter.ViewHolder;
+import io.rong.imlib.model.Conversation;
+
+public class CustomConversationProvider extends BaseConversationProvider {
+ @Override
+ public boolean isItemViewType(BaseUiConversation item) {
+ return item.mCore.getConversationType().equals(Conversation.ConversationType.PRIVATE);
+ }
+
+ @Override
+ public void bindViewHolder(ViewHolder holder, BaseUiConversation uiConversation, int position, List list, IViewProviderListener listener) {
+ super.bindViewHolder(holder, uiConversation, position, list, listener);
+ BaseUiConversation conversation = list.get(position);
+
+ }
+}
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/utils/MainHttpConsts.java b/OneToOne/src/main/java/com/shayu/onetoone/utils/MainHttpConsts.java
new file mode 100644
index 000000000..bbf44837a
--- /dev/null
+++ b/OneToOne/src/main/java/com/shayu/onetoone/utils/MainHttpConsts.java
@@ -0,0 +1,56 @@
+package com.shayu.onetoone.utils;
+
+/**
+ * Created by cxf on 2019/2/16.
+ */
+
+public class MainHttpConsts {
+ public static final String LOGIN = "setLoginInfo";
+ public static final String LOGIN_BY_THIRD = "loginByThird";
+ public static final String REQUEST_BONUS = "requestBonus";
+ public static final String GET_BONUS = "getBonus";
+ public static final String SET_DISTRIBUT = "setDistribut";
+ public static final String GET_HOT = "getHot";
+ public static final String GET_FOLLOW = "getFollow";
+ public static final String GET_NEAR = "getNear";
+ public static final String PROFIT_LIST = "profitList";
+ public static final String CONSUME_LIST = "consumeList";
+ public static final String BLIND_BOX_LIST = "blindBoxList";
+ public static final String GET_BASE_INFO = "getBaseInfo";
+ public static final String SET_BLACK = "setBlack";
+ public static final String GET_SETTING_LIST = "getSettingList";
+ public static final String SEARCH = "search";
+ public static final String GET_FOLLOW_LIST = "getFollowList";
+ public static final String GET_FANS_LIST = "getFansList";
+ public static final String UPDATE_AVATAR = "updateAvatar";
+ public static final String UPDATE_FIELDS = "updateFields";
+ public static final String GET_MY_IMPRESS = "getMyImpress";
+ public static final String GET_PROFIT = "getProfit";
+ public static final String GET_USER_ACCOUNT_LIST = "getUserAccountList";
+ public static final String ADD_CASH_ACCOUNT = "addCashAccount";
+ public static final String DEL_CASH_ACCOUNT = "deleteCashAccount";
+ public static final String DO_CASH = "doCash";
+ public static final String GET_CLASS_LIVE = "getClassLive";
+ public static final String GET_RECOMMEND = "getRecommend";
+ public static final String RECOMMEND_FOLLOW = "recommendFollow";
+ public static final String GET_REGISTER_CODE = "getRegisterCode";
+ public static final String REGISTER = "register";
+ public static final String FIND_PWD = "findPwd";
+ public static final String GET_FIND_PWD_CODE = "getCode";
+ public static final String GET_QR_CODE = "getQrCode";
+ public static final String MODIFY_PWD = "modifyPwd";
+ public static final String HOME_TOP = "getHomeTop";
+ public static final String SEND_DYNAMICGIFT = "sendDynamicGift";
+ public static final String GET_DYNAMICGIFTINFO = "getDynamicGiftInfo";
+ public static final String GET_DYNAMICSENDGIFTLIST = "getDynamicSendGiftList";
+ public static final String ISANCHOR = "isAnchor";
+ public static final String GET_RANDOM= "getRandom";
+ public static final String GET_HOME_FOLLOW= "Home.getFollow";
+ public static final String GET_USER_FRONTTASKTYPE= "getUserFrontTaskType";
+ public static final String UPDATEBINDMOBILE = "updateBindMobile";
+ public static final String BINDMOBILE = "bindMobile";
+ public static final String GETCUSTOMERSERVICE = "getCustomerService";
+ public static final String GETINSTRUCTORREMARK = "getInstructorRemark";
+ public static final String ISINSTRUCTOR = "isInstructor";
+
+}
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/utils/MainHttpUtil.java b/OneToOne/src/main/java/com/shayu/onetoone/utils/MainHttpUtil.java
new file mode 100644
index 000000000..fd0d4179d
--- /dev/null
+++ b/OneToOne/src/main/java/com/shayu/onetoone/utils/MainHttpUtil.java
@@ -0,0 +1,776 @@
+package com.shayu.onetoone.utils;
+
+import android.util.Log;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.blankj.utilcode.util.AppUtils;
+import com.blankj.utilcode.util.DeviceUtils;
+import com.yunbao.common.CommonAppConfig;
+import com.yunbao.common.CommonAppContext;
+import com.yunbao.common.bean.GoogleBean;
+import com.yunbao.common.bean.UserBean;
+import com.yunbao.common.event.UpdateTablePointMe;
+import com.yunbao.common.http.HttpCallback;
+import com.yunbao.common.http.HttpClient;
+import com.yunbao.common.interfaces.CommonCallback;
+import com.yunbao.common.manager.IMLoginManager;
+import com.yunbao.common.utils.MD5Util;
+import com.yunbao.common.utils.SpUtil;
+import com.yunbao.common.utils.VersionUtil;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.io.File;
+import java.net.NetworkInterface;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Created by cxf on 2018/9/17.
+ */
+
+public class MainHttpUtil {
+
+ private static final String SALT = "76576076c1f5f657b634e966c8836a06";
+ private static final String DEVICE = "android";
+
+ /**
+ * 取消网络请求
+ */
+ public static void cancel(String tag) {
+ HttpClient.getInstance().cancel(tag);
+ }
+
+ /**
+ * 手机号 密码登录
+ */
+ public static void login(String phoneNum, String pwd, String uuid, HttpCallback callback) {
+ HttpClient.getInstance().get("Login.userLogin", MainHttpConsts.LOGIN)
+ .params("user_login", phoneNum)
+ .params("user_pass", pwd)
+ .params("pushid", "")
+ .params("lastlogindevice", "Android")
+ .params("uuid_Device", uuid)
+ .execute(callback);
+
+ }
+
+ /**
+ * 第三方登录
+ */
+ public static void loginByThird(String openid, String nicename, String avatar, String type, HttpCallback callback) {
+ String sign = MD5Util.getMD5("openid=" + openid + "&" + SALT);
+ HttpClient.getInstance().get("Login.userLoginByThird", MainHttpConsts.LOGIN_BY_THIRD)
+ .params("openid", openid)
+ .params("nicename", nicename)
+ .params("app_source", CommonAppConfig.IS_GOOGLE_PLAY == true ? "1" : "3")
+ .params("avatar", avatar)
+ .params("type", type)
+ .params("source", DEVICE)
+ .params("sign", sign)
+ .params("lastlogindevice", "Android")
+ .params("pushid", "")
+ .execute(callback);
+ }
+
+
+ /**
+ * 第三方登录---增加参数：推广码,手机唯一标识
+ */
+
+ public static void loginByThird(String UserID, String openid, String promoCode, String uuidDevice, String nicename, String avatar, String type, HttpCallback callback) {
+ String sign = MD5Util.getMD5("openid=" + openid + "&" + SALT);
+ HttpClient.getInstance().get("Login.userLoginByThird", MainHttpConsts.LOGIN_BY_THIRD)
+ .params("openid", openid)
+ .params("app_source", CommonAppConfig.IS_GOOGLE_PLAY == true ? "1" : "3")
+ .params("admin_id", promoCode)
+ .params("uuid_Device", uuidDevice)
+ .params("nicename", nicename)
+ .params("avatar", avatar)
+ .params("type", type)
+ .params("user_id", UserID)
+ .params("source", DEVICE)
+ .params("sign", sign)
+ .params("lastlogindevice", "Android")
+ .params("pushid", "")
+ .execute(callback);
+ }
+
+ /**
+ * 请求签到奖励
+ */
+ public static void requestBonus(HttpCallback callback) {
+ String appVer = AppUtils.getAppVersionName();
+ HttpClient.getInstance().get("User.bonus", MainHttpConsts.REQUEST_BONUS)
+ .params("appAndroidVersion", appVer)
+ .execute(callback);
+ }
+
+ /**
+ * 新版本签到奖励
+ */
+ public static void requestNewBonus(HttpCallback callback) {
+ HttpClient.getInstance().get("Sign.userSign", MainHttpConsts.REQUEST_BONUS)
+ .params("uuid_Device", DeviceUtils.getUniqueDeviceId())
+ .params("lastlogindevice", "Android")
+ .params("model", android.os.Build.BRAND + android.os.Build.MODEL)
+ .execute(callback);
+ }
+
+ /**
+ * 获取签到奖励
+ */
+ public static void getBonus(HttpCallback callback) {
+ HttpClient.getInstance().get("User.getBonus", MainHttpConsts.GET_BONUS)
+ .execute(callback);
+ }
+
+ /**
+ * 用于用户首次登录设置分销关系
+ */
+ public static void setDistribut(String code, HttpCallback callback) {
+ HttpClient.getInstance().get("User.setDistribut", MainHttpConsts.SET_DISTRIBUT)
+ .params("code", code)
+ .execute(callback);
+ }
+
+ /**
+ * 首页直播
+ */
+ public static void getHot(int p, HttpCallback callback) {
+ HttpClient.getInstance().get("Home.getHot", MainHttpConsts.GET_HOT)
+ .params("p", p)
+ .execute(callback);
+ }
+
+ /**
+ * 首页推荐直播
+ */
+ public static void getRandom(int p, HttpCallback callback) {
+ HttpClient.getInstance().get("Home.getRandom", MainHttpConsts.GET_RANDOM)
+ .execute(callback);
+ }
+
+ /**
+ * 首页关注直播
+ */
+ public static void getHomeFollow(int p, HttpCallback callback) {
+ HttpClient.getInstance().get("Home.getFollow", MainHttpConsts.GET_HOME_FOLLOW)
+ .params("p", p)
+ .execute(callback);
+ }
+
+ /**
+ * 首页红包专区
+ */
+ public static void getRedPacket(int p, HttpCallback callback) {
+ HttpClient.getInstance().get("Home.getRedPacket", MainHttpConsts.GET_RANDOM)
+ .execute(callback);
+ }
+
+ /**
+ * 首页
+ */
+ public static void getFollow(int p, HttpCallback callback) {
+ HttpClient.getInstance().get("Home.getFollow", MainHttpConsts.GET_FOLLOW)
+ .params("p", p)
+ .execute(callback);
+ }
+
+ /**
+ * 首页 附近
+ */
+ public static void getNear(int p, HttpCallback callback) {
+ HttpClient.getInstance().get("Home.getNearby", MainHttpConsts.GET_NEAR)
+ .params("lng", CommonAppConfig.getInstance().getLng())
+ .params("lat", CommonAppConfig.getInstance().getLat())
+ .params("p", p)
+ .execute(callback);
+ }
+
+
+ //排行榜 魅力榜
+ public static void profitList(String type, int p, HttpCallback callback) {
+ HttpClient.getInstance().get("Home.profitList", MainHttpConsts.PROFIT_LIST)
+ .params("type", type)
+ .params("p", p)
+ .execute(callback);
+ }
+
+ //排行榜 豪气榜
+ public static void consumeList(String type, int p, HttpCallback callback) {
+ HttpClient.getInstance().get("Home.consumeList", MainHttpConsts.CONSUME_LIST)
+ .params("type", type)
+ .params("p", p)
+ .execute(callback);
+
+ }
+
+ //排行榜 盲盒榜
+ public static void blindBoxList(String type, int p, HttpCallback callback) {
+ HttpClient.getInstance().get("Home.blindBoxList", MainHttpConsts.BLIND_BOX_LIST)
+ .params("type", type)
+ .params("p", p)
+ .execute(callback);
+
+ }
+
+ /**
+ * 获取谷歌
+ */
+ public static void getGoogle(String token, final CommonCallback commonCallback) {
+ HttpClient.getInstance().get("Charge.getChargeHide", MainHttpConsts.GET_BASE_INFO)
+ .params("terminal", "1")
+ .params("token", token)
+ .execute(new HttpCallback() {
+ @Override
+ public void onSuccess(int code, String msg, String info[]) {
+ if (code == 0) {
+ JSONObject obj = JSON.parseObject(info[0]);
+ GoogleBean bean = JSON.toJavaObject(obj, GoogleBean.class);
+ if (commonCallback != null) {
+ Log.i("tag", bean.getIs_hide());
+ commonCallback.callback(bean);
+ }
+ }
+ }
+
+ @Override
+ public void onError() {
+ if (commonCallback != null) {
+ commonCallback.callback(null);
+ }
+ }
+ });
+ }
+
+ /**
+ * 获取用户信息
+ */
+ public static void getBaseInfo(String uid, String token, final CommonCallback commonCallback) {
+ HttpClient.getInstance().get("User.getBaseInfos", MainHttpConsts.GET_BASE_INFO)
+ .execute(new HttpCallback() {
+ @Override
+ public void onSuccess(int code, String msg, String[] info) {
+ if (code == 0 && info.length > 0) {
+ IMLoginManager.get(CommonAppContext.sInstance.getApplicationContext()).upDataUserInfo(info[0]);
+ JSONObject obj = JSON.parseObject(info[0]);
+ UserBean bean = JSON.toJavaObject(obj, UserBean.class);
+ bean.setMedalName(obj.getString("medal_name"));
+ bean.setMedalLevel(obj.getIntValue("medal_level"));
+ CommonAppConfig.getInstance().setUserBean(bean);
+ CommonAppConfig.getInstance().setUserItemList(obj.getString("list"));
+ bean.seUserInfoComplete(obj.getIntValue("user_info_complete"));
+ SpUtil.getInstance().setStringValue(SpUtil.USER_INFO, info[0]);
+ if (commonCallback != null) {
+ commonCallback.callback(bean);
+ }
+ if ("0".equals(bean.getFront_task())) {
+ EventBus.getDefault().post(new UpdateTablePointMe(0));
+ } else {
+ EventBus.getDefault().post(new UpdateTablePointMe(1));
+ }
+ }
+ }
+
+ @Override
+ public void onError() {
+ if (commonCallback != null) {
+ commonCallback.callback(null);
+ }
+ }
+ });
+ }
+
+ public static void getBaseInfos(String uid, String token, HttpCallback callback) {
+ HttpClient.getInstance().get("User.getBaseInfos", MainHttpConsts.GET_BASE_INFO)
+ .execute(callback);
+ }
+
+ /**
+ * 获取用户信息
+ */
+ public static void getBaseInfo(CommonCallback commonCallback) {
+ getBaseInfo(CommonAppConfig.getInstance().getUid(),
+ CommonAppConfig.getInstance().getToken(),
+ commonCallback);
+ }
+
+ /**
+ * 获取用户钱
+ */
+ public static void getBalance(HttpCallback callback) {
+ HttpClient.getInstance().get("User.getUserBalance", "User.getUserBalance")
+ .execute(callback);
+ }
+
+ /**
+ * 获取谷歌上架
+ */
+ public static void getGoogle(CommonCallback commonCallback) {
+ getGoogle(CommonAppConfig.getInstance().getToken(),
+ commonCallback);
+ }
+
+ /**
+ * 拉黑对方， 解除拉黑
+ */
+ public static void setBlack(String toUid, HttpCallback callback) {
+ HttpClient.getInstance().get("User.setBlack", MainHttpConsts.SET_BLACK)
+ .params("touid", toUid)
+ .execute(callback);
+ }
+
+ /**
+ * 获取个性设置列表
+ */
+ public static void getSettingList(HttpCallback callback) {
+ HttpClient.getInstance().get("User.getPerSetting", MainHttpConsts.GET_SETTING_LIST)
+ .params("version", VersionUtil.getVersion())
+ .execute(callback);
+ }
+
+ /**
+ * 搜索
+ */
+ public static void search(String key, int type, int p, HttpCallback callback) {
+ HttpClient.getInstance().get("Home.search", MainHttpConsts.SEARCH)
+ .params("key", key)
+ .params("type", type)
+ .params("p", p)
+ .execute(callback);
+ }
+
+ /**
+ * 搜索
+ */
+ public static void searchnew(String fan_key, String jian_key, int type, int p, HttpCallback callback) {
+ HttpClient.getInstance().get("", MainHttpConsts.SEARCH)
+ .params("jian_key", jian_key)
+ .params("fan_key", fan_key)
+ .params("type", type)
+ .params("p", p)
+ .execute(callback);
+ }
+
+ /**
+ * 获取我的拉黑列表
+ */
+ public static void getBlackList(int p, HttpCallback callback) {
+ HttpClient.getInstance().get("User.getBlackList", "User.getBlackList")
+ .params("p", p)
+ .execute(callback);
+ }
+
+ /**
+ * 获取对方的关注列表
+ *
+ * @param touid 对方的uid
+ */
+ public static void getFollowList(String touid, int p, HttpCallback callback) {
+ HttpClient.getInstance().get("User.getFollowsList", MainHttpConsts.GET_FOLLOW_LIST)
+ .params("touid", touid)
+ .params("p", p)
+ .execute(callback);
+ }
+
+ /**
+ * 获取对方的粉丝列表
+ *
+ * @param touid 对方的uid
+ */
+ public static void getFansList(String touid, int p, HttpCallback callback) {
+ HttpClient.getInstance().get("User.getFansList", MainHttpConsts.GET_FANS_LIST)
+ .params("touid", touid)
+ .params("p", p)
+ .execute(callback);
+
+ }
+
+ /**
+ * 上传头像，用post
+ */
+ public static void updateAvatar(File file, HttpCallback callback) {
+ HttpClient.getInstance().post("User.updateAvatar", MainHttpConsts.UPDATE_AVATAR)
+ .isMultipart(true)
+ .params("file", file)
+ .execute(callback);
+ }
+
+ /**
+ * 更新用户资料
+ *
+ * @param fields 用户资料 ,以json形式出现
+ */
+ public static void updateFields(String fields, HttpCallback callback) {
+ HttpClient.getInstance().get("User.updateFields", MainHttpConsts.UPDATE_FIELDS)
+ .params("fields", fields)
+ .execute(callback);
+ }
+
+
+ /**
+ * 获取 我的收益 可提现金额数
+ */
+ public static void getProfit(HttpCallback callback) {
+ HttpClient.getInstance().get("User.getProfit", MainHttpConsts.GET_PROFIT)
+ .execute(callback);
+ }
+
+ /**
+ * 获取 提现账户列表
+ */
+ public static void getCashAccountList(HttpCallback callback) {
+ HttpClient.getInstance().get("User.getUserAccountList", MainHttpConsts.GET_USER_ACCOUNT_LIST)
+ .execute(callback);
+ }
+
+
+ /**
+ * 添加 提现账户
+ */
+ public static void addCashAccount(String account, String name, String bank, int type, HttpCallback callback) {
+ HttpClient.getInstance().get("User.setUserAccount", MainHttpConsts.ADD_CASH_ACCOUNT)
+ .params("account", account)
+ .params("name", name)
+ .params("account_bank", bank)
+ .params("type", type)
+ .execute(callback);
+ }
+
+ /**
+ * 删除 提现账户
+ */
+ public static void deleteCashAccount(String accountId, HttpCallback callback) {
+ HttpClient.getInstance().get("User.delUserAccount", MainHttpConsts.DEL_CASH_ACCOUNT)
+ .params("id", accountId)
+ .execute(callback);
+ }
+
+ /**
+ * 提现
+ */
+ public static void doCash(String votes, String accountId, HttpCallback callback) {
+ HttpClient.getInstance().get("User.setCash", MainHttpConsts.DO_CASH)
+ .params("cashvote", votes)//提现的票数
+ .params("accountid", accountId)//账号ID
+ .execute(callback);
+ }
+
+
+ /**
+ * 分类直播
+ */
+ public static void getClassLive(int classId, int p, HttpCallback callback) {
+ HttpClient.getInstance().get("Home.getClassLive", MainHttpConsts.GET_CLASS_LIVE)
+ .params("liveclassid", classId)
+ .params("p", p)
+ .execute(callback);
+ }
+
+ /**
+ * 获取自己收到的主播印象列表
+ */
+ public static void getMyImpress(HttpCallback callback) {
+ HttpClient.getInstance().get("User.getMyLabel", MainHttpConsts.GET_MY_IMPRESS)
+ .execute(callback);
+ }
+
+ /**
+ * 用于用户首次登录推荐
+ */
+ public static void getRecommend(HttpCallback callback) {
+ HttpClient.getInstance().get("Home.getRecommend", MainHttpConsts.GET_RECOMMEND)
+ .execute(callback);
+ }
+
+
+ /**
+ * 用于用户首次登录推荐,关注主播
+ */
+ public static void recommendFollow(String touid, HttpCallback callback) {
+ HttpClient.getInstance().get("Home.attentRecommend", MainHttpConsts.RECOMMEND_FOLLOW)
+ .params("touid", touid)
+ .execute(callback);
+ }
+
+ /**
+ * 获取验证码接口 注册用
+ */
+ public static void getRegisterCode(String mobile, HttpCallback callback) {
+ String sign = MD5Util.getMD5("mobile=" + mobile + "&" + SALT);
+ HttpClient.getInstance().get("Login.getCode", MainHttpConsts.GET_REGISTER_CODE)
+ .params("mobile", mobile)
+ .params("sign", sign)
+ .params("source", "1")
+ .execute(callback);
+ }
+
+
+ /**
+ * 获取验证码接口 注册用
+ * 增加：国家代码
+ */
+ public static void getRegisterCode(String Randstr, String Ticket, String mobile, int countryCode, HttpCallback callback) {
+ String sign = MD5Util.getMD5("mobile=" + mobile + "&" + SALT);
+ String uuid = DeviceUtils.getUniqueDeviceId();
+
+ HttpClient.getInstance().get("Login.getCode", MainHttpConsts.GET_REGISTER_CODE)
+ .params("mobile", mobile)
+ .params("country_code", countryCode + "")
+ .params("sign", sign)
+ .params("Randstr", Randstr)
+ .params("Ticket", Ticket)
+ .params("MacAddress", getNewMac())
+ .params("Imei", uuid)
+ .params("source", "1")
+ .execute(callback);
+ }
+
+ /**
+ * 第三方绑定手机号
+ */
+ public static void bindPhone(String mobile, int countryCode, String uid, String token, String user_pass, String user_pass2, String code, HttpCallback callback) {
+ HttpClient.getInstance().get("Login.bindMobile", MainHttpConsts.BINDMOBILE)
+ .params("mobile", mobile)
+ .params("country_code", countryCode + "")
+ .params("uid", uid, true)
+ .params("token", token, true)
+ .params("user_pass", user_pass)
+ .params("user_pass2", user_pass2)
+ .params("code", code)
+ .execute(callback);
+ }
+
+ /**
+ * 修改绑定手机号
+ */
+ public static void updateBindMobile(String mobile, int countryCode, String uid, String token, String code, HttpCallback callback) {
+ HttpClient.getInstance().get("Login.updateBindMobile", MainHttpConsts.UPDATEBINDMOBILE)
+ .params("mobile", mobile)
+ .params("country_code", countryCode + "")
+ .params("uid", uid, true)
+ .params("token", token, true)
+ .params("code", code)
+ .execute(callback);
+ }
+
+// /**
+// * 手机注册接口
+// */
+// public static void register(String user_login, String pass, String pass2, String code, HttpCallback callback) {
+// HttpClient.getInstance().get("Login.userReg", MainHttpConsts.REGISTER)
+// .params("user_login", user_login)
+// .params("user_pass", pass)
+// .params("user_pass2", pass2)
+// .params("code", code)
+// .params("source", DEVICE)
+// .execute(callback);
+// }
+
+ /**
+ * 手机注册接口---增加参数：推广码,手机唯一标识,国家代码
+ */
+ public static void register(String UserID, String invitecode, String user_login, String promo_code, String uuidDevice, int countryCode, String pass, String pass2, String code, HttpCallback callback) {
+ HttpClient.getInstance().get("Login.userReg", MainHttpConsts.REGISTER)
+ .params("user_login", user_login)
+ .params("app_source", CommonAppConfig.IS_GOOGLE_PLAY == true ? "1" : "3")
+ //增加参数：推广码
+ .params("user_activation_key", promo_code)
+ .params("admin_id", promo_code)
+ .params("user_id", UserID)
+ //增加参数：手机唯一标识
+ .params("uuid_Device", uuidDevice)
+ //增加国家代码
+ .params("country_code", countryCode + "")
+ .params("user_pass", pass)
+ .params("user_pass2", pass2)
+ .params("code", code)
+ .params("source", DEVICE)
+ .params("invitation_code", invitecode)
+ .execute(callback);
+ }
+
+ /**
+ * 找回密码
+ */
+ public static void findPwd(String user_login, String pass, String pass2, String code, HttpCallback callback) {
+ HttpClient.getInstance().get("Login.userFindPass", MainHttpConsts.FIND_PWD)
+ .params("user_login", user_login)
+ .params("user_pass", pass)
+ .params("user_pass2", pass2)
+ .params("code", code)
+ .execute(callback);
+ }
+
+
+ /**
+ * 重置密码
+ */
+ public static void modifyPwd(String oldpass, String pass, String pass2, HttpCallback callback) {
+ HttpClient.getInstance().get("User.updatePass", MainHttpConsts.MODIFY_PWD)
+ .params("oldpass", oldpass)
+ .params("pass", pass)
+ .params("pass2", pass2)
+ .execute(callback);
+ }
+
+
+ /**
+ * 获取验证码接口 找回密码用
+ */
+ public static void getFindPwdCode(String mobile, String country_code, HttpCallback callback) {
+// String sign = MD5Util.getMD5("mobile=" + mobile + "&" + SALT);
+ HttpClient.getInstance().get("Login.getCode", MainHttpConsts.GET_FIND_PWD_CODE)
+ .params("mobile", mobile)
+ .params("country_code", country_code)
+ .params("source", "1")
+ .execute(callback);
+ }
+
+
+ /**
+ * 三级分销页面 获取二维码
+ */
+ public static void getQrCode(HttpCallback callback) {
+ HttpClient.getInstance().get("Agent.getCode", MainHttpConsts.GET_QR_CODE)
+ .params("source", "1")
+ .execute(callback);
+ }
+
+
+ /**
+ * 首页的排行榜轮播
+ */
+ public static void getHomeTop(HttpCallback callback) {
+ HttpClient.getInstance().get("Home.consumeproList", MainHttpConsts.HOME_TOP)
+ .params("type", "month")
+ .params("p", "1")
+ .execute(callback);
+ }
+
+ /**
+ * 动态赠送礼物
+ */
+ public static void sendDynamicGift(String id, int gift_num, String gift_id, HttpCallback callback) {
+ HttpClient.getInstance().get("Community.sendDynamicGift", MainHttpConsts.SEND_DYNAMICGIFT)
+ .params("dynamic_id", id)
+ .params("gift_num", gift_num)
+ .params("gift_id", gift_id)
+ .execute(callback);
+ }
+
+ /**
+ * 动态赠送礼物列表
+ */
+ public static void getDynamicGiftInfo(HttpCallback callback) {
+ HttpClient.getInstance().get("Community.getDynamicGiftInfo", MainHttpConsts.GET_DYNAMICGIFTINFO)
+ .execute(callback);
+ }
+
+ /**
+ * 社区动态礼物信息列表
+ */
+ public static void getDynamicSendGiftList(String id, HttpCallback callback) {
+ HttpClient.getInstance().get("Community.getDynamicSendGiftList", MainHttpConsts.GET_DYNAMICSENDGIFTLIST)
+ .params("dynamic_id", id)
+ .execute(callback);
+ }
+
+ /**
+ * 是否是主播
+ */
+ public static void isAnchor(HttpCallback callback) {
+ HttpClient.getInstance().get("User.isAnchor", MainHttpConsts.ISANCHOR)
+ .execute(callback);
+ }
+
+ /**
+ * 是否是完成任务
+ */
+ public static void getUserFrontTaskType(HttpCallback callback) {
+ HttpClient.getInstance().get("Task.getUserFrontTaskType", MainHttpConsts.GET_USER_FRONTTASKTYPE)
+ .execute(callback);
+ }
+
+ /**
+ * 客服地址
+ */
+ public static void getCustomerService(HttpCallback callback) {
+ HttpClient.getInstance().get("Home.getCustomerService", MainHttpConsts.GETCUSTOMERSERVICE)
+ .execute(callback);
+ }
+
+ /**
+ * 获取im备注信息
+ */
+ public static void getInstructorRemark(HttpCallback callback) {
+ HttpClient.getInstance().get("User.getInstructorRemark", MainHttpConsts.GETINSTRUCTORREMARK)
+ .execute(callback);
+ }
+
+ /**
+ * 是否管理员
+ */
+ public static void isInstructor(HttpCallback callback) {
+ HttpClient.getInstance().get("User.isInstructor", MainHttpConsts.ISINSTRUCTOR)
+ .execute(callback);
+ }
+
+ //
+ public static void setMessageReadAll() {
+ HttpClient.getInstance().get("User.getUserInstructor", "")
+ .execute(new HttpCallback() {
+ @Override
+ public void onSuccess(int code, String msg, String[] info) {
+
+ }
+ });
+ }
+
+ /**
+ * 获取设备号有没有注册过
+ */
+ public static void getDeviceLoginType(HttpCallback callback) {
+ HttpClient.getInstance().get("Login.getDeviceLoginType", "Login.getDeviceLoginType")
+ .params("uuid_Device", DeviceUtils.getUniqueDeviceId())
+ .execute(callback);
+
+ }
+
+ /**
+ * 通过网络接口取
+ * @return
+ */
+ public static String getNewMac() {
+ try {
+ List all = Collections.list(NetworkInterface.getNetworkInterfaces());
+ for (NetworkInterface nif : all) {
+ if (!nif.getName().equalsIgnoreCase("wlan0")) continue;
+
+ byte[] macBytes = nif.getHardwareAddress();
+ if (macBytes == null) {
+ return null;
+ }
+
+ StringBuilder res1 = new StringBuilder();
+ for (byte b : macBytes) {
+ res1.append(String.format("%02X:", b));
+ }
+
+ if (res1.length() > 0) {
+ res1.deleteCharAt(res1.length() - 1);
+ }
+ return res1.toString();
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ return null;
+ }
+}
+
+
+
+
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/utils/MessageMsgInputPanelPlugin.java b/OneToOne/src/main/java/com/shayu/onetoone/utils/MessageMsgInputPanelPlugin.java
new file mode 100644
index 000000000..738a5c8c3
--- /dev/null
+++ b/OneToOne/src/main/java/com/shayu/onetoone/utils/MessageMsgInputPanelPlugin.java
@@ -0,0 +1,32 @@
+package com.shayu.onetoone.utils;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+
+import androidx.fragment.app.Fragment;
+
+import io.rong.imkit.conversation.extension.RongExtension;
+import io.rong.imkit.conversation.extension.component.plugin.IPluginModule;
+
+public class MessageMsgInputPanelPlugin implements IPluginModule {
+ @Override
+ public Drawable obtainDrawable(Context context) {
+ return null;
+ }
+
+ @Override
+ public String obtainTitle(Context context) {
+ return null;
+ }
+
+ @Override
+ public void onClick(Fragment currentFragment, RongExtension extension, int index) {
+
+ }
+
+ @Override
+ public void onActivityResult(int requestCode, int resultCode, Intent data) {
+
+ }
+}
diff --git a/OneToOne/src/main/res/drawable/bg_home_recommend_item.xml b/OneToOne/src/main/res/drawable/bg_home_recommend_item.xml
new file mode 100644
index 000000000..272c1319d
--- /dev/null
+++ b/OneToOne/src/main/res/drawable/bg_home_recommend_item.xml
@@ -0,0 +1,9 @@
+
+
+ -
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OneToOne/src/main/res/drawable/bg_msg_send.xml b/OneToOne/src/main/res/drawable/bg_msg_send.xml
new file mode 100644
index 000000000..61c18dbb6
--- /dev/null
+++ b/OneToOne/src/main/res/drawable/bg_msg_send.xml
@@ -0,0 +1,9 @@
+
+
+ -
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OneToOne/src/main/res/layout-v26/item_msg_message.xml b/OneToOne/src/main/res/layout-v26/item_msg_message.xml
deleted file mode 100644
index b739809f1..000000000
--- a/OneToOne/src/main/res/layout-v26/item_msg_message.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/OneToOne/src/main/res/layout/activity_launcher.xml b/OneToOne/src/main/res/layout/activity_launcher.xml
index d2960a407..2d05c2df0 100644
--- a/OneToOne/src/main/res/layout/activity_launcher.xml
+++ b/OneToOne/src/main/res/layout/activity_launcher.xml
@@ -1,10 +1,41 @@
-
-
\ No newline at end of file
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OneToOne/src/main/res/layout/activity_msg_chat.xml b/OneToOne/src/main/res/layout/activity_msg_chat.xml
index 1a082de33..d4acda0b1 100644
--- a/OneToOne/src/main/res/layout/activity_msg_chat.xml
+++ b/OneToOne/src/main/res/layout/activity_msg_chat.xml
@@ -8,7 +8,6 @@
android:id="@+id/container"
android:layout_width="0dp"
android:layout_height="0dp"
- android:background="@color/color_b14066"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/OneToOne/src/main/res/layout/fragment_dynamic.xml b/OneToOne/src/main/res/layout/fragment_dynamic.xml
index a60ab8854..cb41134fd 100644
--- a/OneToOne/src/main/res/layout/fragment_dynamic.xml
+++ b/OneToOne/src/main/res/layout/fragment_dynamic.xml
@@ -9,7 +9,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="357dp"
android:layout_marginEnd="142dp"
- android:text="Dynamic"
+ android:text="动态"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
\ No newline at end of file
diff --git a/OneToOne/src/main/res/layout/fragment_friends.xml b/OneToOne/src/main/res/layout/fragment_friends.xml
index 57006769c..0795f3935 100644
--- a/OneToOne/src/main/res/layout/fragment_friends.xml
+++ b/OneToOne/src/main/res/layout/fragment_friends.xml
@@ -1,14 +1,12 @@
-
-
+ android:text="推荐" />
+ android:text="热门" />
-
-
-
-
-
-
-
+ app:layout_constraintTop_toBottomOf="@+id/dslTabLayout" >
+
+
+
+
+
+
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/OneToOne/src/main/res/layout/fragment_hot.xml b/OneToOne/src/main/res/layout/fragment_hot.xml
new file mode 100644
index 000000000..3f06e53ce
--- /dev/null
+++ b/OneToOne/src/main/res/layout/fragment_hot.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OneToOne/src/main/res/layout/fragment_msg.xml b/OneToOne/src/main/res/layout/fragment_msg.xml
index 255b910c5..3580cd463 100644
--- a/OneToOne/src/main/res/layout/fragment_msg.xml
+++ b/OneToOne/src/main/res/layout/fragment_msg.xml
@@ -6,8 +6,8 @@
-
+ app:layout_constraintTop_toTopOf="parent"
+ tools:visibility="visible" />
-
-
-
-
-
-
-
-
-
+ app:layout_constraintTop_toBottomOf="@+id/rc_conversationlist_notice_container">
-
+ tools:listitem="@layout/rc_conversationlist_item" />
+
\ No newline at end of file
diff --git a/OneToOne/src/main/res/layout/fragment_my.xml b/OneToOne/src/main/res/layout/fragment_my.xml
index 6c6cdbccd..c94a52c52 100644
--- a/OneToOne/src/main/res/layout/fragment_my.xml
+++ b/OneToOne/src/main/res/layout/fragment_my.xml
@@ -9,7 +9,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="357dp"
android:layout_marginEnd="142dp"
- android:text="My"
+ android:text="我的"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
\ No newline at end of file
diff --git a/OneToOne/src/main/res/layout/fragment_recommend.xml b/OneToOne/src/main/res/layout/fragment_recommend.xml
new file mode 100644
index 000000000..6ad10f2ff
--- /dev/null
+++ b/OneToOne/src/main/res/layout/fragment_recommend.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OneToOne/src/main/res/layout/activity_recommend.xml b/OneToOne/src/main/res/layout/item_home_hot.xml
similarity index 100%
rename from OneToOne/src/main/res/layout/activity_recommend.xml
rename to OneToOne/src/main/res/layout/item_home_hot.xml
diff --git a/OneToOne/src/main/res/layout/item_home_recommend.xml b/OneToOne/src/main/res/layout/item_home_recommend.xml
new file mode 100644
index 000000000..3c49432eb
--- /dev/null
+++ b/OneToOne/src/main/res/layout/item_home_recommend.xml
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OneToOne/src/main/res/layout/item_msg_message.xml b/OneToOne/src/main/res/layout/item_msg_message.xml
deleted file mode 100644
index 03fb56c77..000000000
--- a/OneToOne/src/main/res/layout/item_msg_message.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/OneToOne/src/main/res/layout/rc_conversationlist_item.xml b/OneToOne/src/main/res/layout/rc_conversationlist_item.xml
new file mode 100644
index 000000000..0207182a8
--- /dev/null
+++ b/OneToOne/src/main/res/layout/rc_conversationlist_item.xml
@@ -0,0 +1,83 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OneToOne/src/main/res/layout/rc_extension_input_panel.xml b/OneToOne/src/main/res/layout/rc_extension_input_panel.xml
new file mode 100644
index 000000000..5545f9965
--- /dev/null
+++ b/OneToOne/src/main/res/layout/rc_extension_input_panel.xml
@@ -0,0 +1,153 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_recommend_chat.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_recommend_chat.png
new file mode 100644
index 0000000000000000000000000000000000000000..30a18337638218ceab938e97010ba068d098f9fd
GIT binary patch
literal 20978
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
literal 0
HcmV?d00001
diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_recommend_chat_up.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_recommend_chat_up.png
new file mode 100644
index 0000000000000000000000000000000000000000..edd1e414a7014015391d2815881233bbe126d9dd
GIT binary patch
literal 25052
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