Commit 33461bc2 authored by sheteng's avatar sheteng

开始测试 2

搜索好友列表
parent cd37fbf6
...@@ -60,5 +60,9 @@ dependencies { ...@@ -60,5 +60,9 @@ dependencies {
implementation 'com.google.protobuf:protobuf-java-util:3.12.0' implementation 'com.google.protobuf:protobuf-java-util:3.12.0'
implementation 'com.guolindev.permissionx:permissionx:1.6.1' implementation 'com.guolindev.permissionx:permissionx:1.6.1'
implementation 'io.netty:netty-all:4.1.4.Final' implementation 'io.netty:netty-all:4.1.4.Final'
implementation 'com.squareup.okhttp3:okhttp:4.9.0'
def room_version = "2.3.0"
implementation "androidx.room:room-runtime:$room_version"
annotationProcessor "androidx.room:room-compiler:$room_version"
} }
\ No newline at end of file
...@@ -155,6 +155,11 @@ public class FirstFragment extends Fragment { ...@@ -155,6 +155,11 @@ public class FirstFragment extends Fragment {
public void onSuccess() { public void onSuccess() {
refreshLogView("addContact success"); refreshLogView("addContact success");
} }
@Override
public void onFailed(int errorCode) {
}
}); });
} }
}); });
...@@ -163,12 +168,16 @@ public class FirstFragment extends Fragment { ...@@ -163,12 +168,16 @@ public class FirstFragment extends Fragment {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
CCIMClient.getInstance().sendTextMessage(binding.msg.getText().toString(), Long.parseLong(binding.userId.getText().toString()), binding.userName.getText().toString(), CCIMClient.getInstance().sendTextMessage(binding.msg.getText().toString(), Long.parseLong(binding.userId.getText().toString()), binding.userName.getText().toString(),
new ResultEventCallback<MessageContent>() { new ResultEventCallback<MessageContent>() {
@Override @Override
public void onSuccess(MessageContent messageContent) { public void onSuccess(MessageContent messageContent) {
} }
@Override
public void onFailed(int errorCode) {
}
}); });
} }
}); });
...@@ -198,6 +207,11 @@ public class FirstFragment extends Fragment { ...@@ -198,6 +207,11 @@ public class FirstFragment extends Fragment {
public void onSuccess() { public void onSuccess() {
refreshLogView("checkContactRequests success"); refreshLogView("checkContactRequests success");
} }
@Override
public void onFailed(int errorCode) {
}
}); });
} }
}); });
...@@ -209,6 +223,11 @@ public class FirstFragment extends Fragment { ...@@ -209,6 +223,11 @@ public class FirstFragment extends Fragment {
public void onSuccess(Long aLong) { public void onSuccess(Long aLong) {
refreshLogView("createContactGroupRequest : " + aLong); refreshLogView("createContactGroupRequest : " + aLong);
} }
@Override
public void onFailed(int errorCode) {
}
}); });
} }
}); });
...@@ -221,6 +240,11 @@ public class FirstFragment extends Fragment { ...@@ -221,6 +240,11 @@ public class FirstFragment extends Fragment {
public void onSuccess() { public void onSuccess() {
refreshLogView("moveContactGroupRequest success "); refreshLogView("moveContactGroupRequest success ");
} }
@Override
public void onFailed(int errorCode) {
}
}); });
} }
}); });
...@@ -233,6 +257,11 @@ public class FirstFragment extends Fragment { ...@@ -233,6 +257,11 @@ public class FirstFragment extends Fragment {
public void onSuccess() { public void onSuccess() {
refreshLogView("deleteContact success "); refreshLogView("deleteContact success ");
} }
@Override
public void onFailed(int errorCode) {
}
}); });
} }
}); });
...@@ -245,6 +274,11 @@ public class FirstFragment extends Fragment { ...@@ -245,6 +274,11 @@ public class FirstFragment extends Fragment {
public void onSuccess() { public void onSuccess() {
refreshLogView("blockContact success "); refreshLogView("blockContact success ");
} }
@Override
public void onFailed(int errorCode) {
}
}); });
} }
}); });
...@@ -257,6 +291,11 @@ public class FirstFragment extends Fragment { ...@@ -257,6 +291,11 @@ public class FirstFragment extends Fragment {
public void onSuccess() { public void onSuccess() {
refreshLogView("reportIllegalUser success "); refreshLogView("reportIllegalUser success ");
} }
@Override
public void onFailed(int errorCode) {
}
}); });
} }
}); });
...@@ -282,6 +321,11 @@ public class FirstFragment extends Fragment { ...@@ -282,6 +321,11 @@ public class FirstFragment extends Fragment {
public void onSuccess() { public void onSuccess() {
} }
@Override
public void onFailed(int errorCode) {
}
}); });
} }
}); });
...@@ -310,6 +354,11 @@ public class FirstFragment extends Fragment { ...@@ -310,6 +354,11 @@ public class FirstFragment extends Fragment {
binding.channelId.setText(aLong.toString()); binding.channelId.setText(aLong.toString());
refreshLogView("createChannel " + aLong); refreshLogView("createChannel " + aLong);
} }
@Override
public void onFailed(int errorCode) {
}
}); });
} }
}); });
...@@ -322,6 +371,11 @@ public class FirstFragment extends Fragment { ...@@ -322,6 +371,11 @@ public class FirstFragment extends Fragment {
public void onSuccess() { public void onSuccess() {
refreshLogView("joinChannel "); refreshLogView("joinChannel ");
} }
@Override
public void onFailed(int errorCode) {
}
}); });
} }
}); });
...@@ -334,6 +388,11 @@ public class FirstFragment extends Fragment { ...@@ -334,6 +388,11 @@ public class FirstFragment extends Fragment {
public void onSuccess() { public void onSuccess() {
refreshLogView("removeChannelMember: "); refreshLogView("removeChannelMember: ");
} }
@Override
public void onFailed(int errorCode) {
}
}); });
} }
}); });
...@@ -346,6 +405,11 @@ public class FirstFragment extends Fragment { ...@@ -346,6 +405,11 @@ public class FirstFragment extends Fragment {
public void onSuccess() { public void onSuccess() {
refreshLogView("exitChannel: "); refreshLogView("exitChannel: ");
} }
@Override
public void onFailed(int errorCode) {
}
}); });
} }
}); });
......
...@@ -87,6 +87,11 @@ public class ChannelMsgAdapter extends BaseAdapter { ...@@ -87,6 +87,11 @@ public class ChannelMsgAdapter extends BaseAdapter {
public void onSuccess() { public void onSuccess() {
Toast.makeText(context, "播放成功", Toast.LENGTH_SHORT).show(); Toast.makeText(context, "播放成功", Toast.LENGTH_SHORT).show();
} }
@Override
public void onFailed(int errorCode) {
}
}); });
} }
} }
......
...@@ -165,6 +165,11 @@ public class ContactExpandableAdapter extends BaseExpandableListAdapter { ...@@ -165,6 +165,11 @@ public class ContactExpandableAdapter extends BaseExpandableListAdapter {
public void onSuccess() { public void onSuccess() {
loginViewModel.getContactList(); loginViewModel.getContactList();
} }
@Override
public void onFailed(int errorCode) {
}
}); });
} }
}) })
...@@ -233,6 +238,11 @@ public class ContactExpandableAdapter extends BaseExpandableListAdapter { ...@@ -233,6 +238,11 @@ public class ContactExpandableAdapter extends BaseExpandableListAdapter {
public void onSuccess() { public void onSuccess() {
loginViewModel.getContactList(); loginViewModel.getContactList();
} }
@Override
public void onFailed(int errorCode) {
}
}); });
break; break;
case 1: case 1:
...@@ -241,6 +251,11 @@ public class ContactExpandableAdapter extends BaseExpandableListAdapter { ...@@ -241,6 +251,11 @@ public class ContactExpandableAdapter extends BaseExpandableListAdapter {
public void onSuccess() { public void onSuccess() {
loginViewModel.getContactList(); loginViewModel.getContactList();
} }
@Override
public void onFailed(int errorCode) {
}
}); });
break; break;
case 2: case 2:
...@@ -263,6 +278,11 @@ public class ContactExpandableAdapter extends BaseExpandableListAdapter { ...@@ -263,6 +278,11 @@ public class ContactExpandableAdapter extends BaseExpandableListAdapter {
public void onSuccess() { public void onSuccess() {
Toast.makeText(context, "举报成功", Toast.LENGTH_SHORT).show(); Toast.makeText(context, "举报成功", Toast.LENGTH_SHORT).show();
} }
@Override
public void onFailed(int errorCode) {
}
}); });
} }
...@@ -298,6 +318,11 @@ public class ContactExpandableAdapter extends BaseExpandableListAdapter { ...@@ -298,6 +318,11 @@ public class ContactExpandableAdapter extends BaseExpandableListAdapter {
Toast.makeText(context, "移动成功", Toast.LENGTH_SHORT).show(); Toast.makeText(context, "移动成功", Toast.LENGTH_SHORT).show();
loginViewModel.getContactList(); loginViewModel.getContactList();
} }
@Override
public void onFailed(int errorCode) {
}
}); });
} }
}) })
......
...@@ -91,6 +91,11 @@ public class PrivateMsgAdapter extends BaseAdapter { ...@@ -91,6 +91,11 @@ public class PrivateMsgAdapter extends BaseAdapter {
public void onSuccess() { public void onSuccess() {
Toast.makeText(context, "播放成功", Toast.LENGTH_SHORT).show(); Toast.makeText(context, "播放成功", Toast.LENGTH_SHORT).show();
} }
@Override
public void onFailed(int errorCode) {
}
}); });
} }
} }
......
...@@ -46,8 +46,8 @@ public class LoginViewModel extends ViewModel { ...@@ -46,8 +46,8 @@ public class LoginViewModel extends ViewModel {
@Override @Override
public void onSocketDisconnection() { public void onSocketDisconnection() {
// loginState.postValue(false); //重连
// System.out.println("链接断开"); login(context, appKey, appsecret, username, userId, ip, port);
} }
}); });
} }
......
...@@ -106,6 +106,11 @@ public class ConnectFragment extends Fragment { ...@@ -106,6 +106,11 @@ public class ConnectFragment extends Fragment {
public void onSuccess() { public void onSuccess() {
} }
@Override
public void onFailed(int errorCode) {
}
}); });
} }
......
...@@ -124,6 +124,11 @@ public class ContactsFragment extends Fragment { ...@@ -124,6 +124,11 @@ public class ContactsFragment extends Fragment {
showSearchResultdialog(searchRes.getUsers()); showSearchResultdialog(searchRes.getUsers());
} }
} }
@Override
public void onFailed(int errorCode) {
}
}); });
} }
}); });
...@@ -210,6 +215,11 @@ public class ContactsFragment extends Fragment { ...@@ -210,6 +215,11 @@ public class ContactsFragment extends Fragment {
alertDialog.show(); alertDialog.show();
} }
} }
@Override
public void onFailed(int errorCode) {
}
}); });
} }
......
...@@ -65,7 +65,7 @@ public class LoginActivity extends AppCompatActivity { ...@@ -65,7 +65,7 @@ public class LoginActivity extends AppCompatActivity {
String appSecret = binding.appSecret.getText().toString(); String appSecret = binding.appSecret.getText().toString();
String ip = binding.ip.getText().toString(); String ip = binding.ip.getText().toString();
int port = Integer.parseInt(binding.port.getText().toString()); int port = Integer.parseInt(binding.port.getText().toString());
loginViewModel.login(LoginActivity.this,appkey,appSecret,username, id,ip,port); loginViewModel.login(getApplicationContext(),appkey,appSecret,username, id,ip,port);
} }
}); });
} }
......
...@@ -104,6 +104,11 @@ public class ConnectChannelFragment extends Fragment { ...@@ -104,6 +104,11 @@ public class ConnectChannelFragment extends Fragment {
public void onSuccess() { public void onSuccess() {
} }
@Override
public void onFailed(int errorCode) {
}
}); });
} }
......
...@@ -62,8 +62,6 @@ dependencies { ...@@ -62,8 +62,6 @@ dependencies {
implementation 'com.google.android.material:material:1.4.0' implementation 'com.google.android.material:material:1.4.0'
implementation 'com.google.protobuf:protobuf-java:3.13.0' implementation 'com.google.protobuf:protobuf-java:3.13.0'
implementation 'com.google.protobuf:protobuf-java-util:3.12.0' implementation 'com.google.protobuf:protobuf-java-util:3.12.0'
// implementation 'com.tonystark.android:socket:latest.release'
// implementation 'com.tonystark.android:socket-server:latest.release'
implementation 'com.guolindev.permissionx:permissionx:1.6.1' implementation 'com.guolindev.permissionx:permissionx:1.6.1'
implementation 'com.google.code.gson:gson:2.8.7' implementation 'com.google.code.gson:gson:2.8.7'
implementation 'io.netty:netty-all:4.1.4.Final' implementation 'io.netty:netty-all:4.1.4.Final'
......
...@@ -4,9 +4,7 @@ import android.Manifest; ...@@ -4,9 +4,7 @@ import android.Manifest;
import android.content.Context; import android.content.Context;
import android.os.Environment; import android.os.Environment;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentActivity;
import com.ccwangluo.ccim.listener.ContactsCallBack; import com.ccwangluo.ccim.listener.ContactsCallBack;
import com.ccwangluo.ccim.listener.OnClientConnectListener; import com.ccwangluo.ccim.listener.OnClientConnectListener;
import com.ccwangluo.ccim.listener.OnConnectListener; import com.ccwangluo.ccim.listener.OnConnectListener;
...@@ -29,7 +27,6 @@ import com.ccwangluo.ccim.util.MediaHelper; ...@@ -29,7 +27,6 @@ import com.ccwangluo.ccim.util.MediaHelper;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.protobuf.util.JsonFormat; import com.google.protobuf.util.JsonFormat;
import com.permissionx.guolindev.PermissionX; import com.permissionx.guolindev.PermissionX;
import java.io.File; import java.io.File;
import java.util.List; import java.util.List;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
...@@ -60,7 +57,6 @@ public class CCIMClient { ...@@ -60,7 +57,6 @@ public class CCIMClient {
private ExecutorService executor = Executors.newSingleThreadExecutor(); private ExecutorService executor = Executors.newSingleThreadExecutor();
private CCIMClient() { private CCIMClient() {
callBackManager = new CallBackManager<>(); callBackManager = new CallBackManager<>();
socketManager = new SocketManager(callBackManager); socketManager = new SocketManager(callBackManager);
...@@ -119,7 +115,9 @@ public class CCIMClient { ...@@ -119,7 +115,9 @@ public class CCIMClient {
public void registerMessageListener(OnPushMsgListener pushMsgListener) { public void registerMessageListener(OnPushMsgListener pushMsgListener) {
callBackManager.addCallBack(0, chatResponseMessage -> { callBackManager.addCallBack(0, new ResultEventCallback<Chat.ChatResponseMessage>() {
@Override
public void onSuccess(Chat.ChatResponseMessage chatResponseMessage) {
Gson gson = new Gson(); Gson gson = new Gson();
if (chatResponseMessage.hasPushPrivateMsgRes()) { if (chatResponseMessage.hasPushPrivateMsgRes()) {
MessageSpec.ChatMessage pushPrivateMsgRes = chatResponseMessage.getPushPrivateMsgRes().getMessage(); MessageSpec.ChatMessage pushPrivateMsgRes = chatResponseMessage.getPushPrivateMsgRes().getMessage();
...@@ -192,6 +190,12 @@ public class CCIMClient { ...@@ -192,6 +190,12 @@ public class CCIMClient {
pushMsgListener.pushContactNewReq(new User(id, username)); pushMsgListener.pushContactNewReq(new User(id, username));
} }
}
@Override
public void onFailed(int errorCode) {
}
}); });
} }
...@@ -381,7 +385,7 @@ public class CCIMClient { ...@@ -381,7 +385,7 @@ public class CCIMClient {
/** /**
* 推送私人消息成功ack * 推送私人消息成功ack
*/ */
public void pushPrivateMessageAck(Long contactUserId, Long msgId) { private void pushPrivateMessageAck(Long contactUserId, Long msgId) {
Chat.ChatRequestMessage.Builder builder = Chat.ChatRequestMessage.newBuilder(); Chat.ChatRequestMessage.Builder builder = Chat.ChatRequestMessage.newBuilder();
Push.PushPrivateMessageAckRequest pushPrivateMessageAckRequest = Push.PushPrivateMessageAckRequest.newBuilder() Push.PushPrivateMessageAckRequest pushPrivateMessageAckRequest = Push.PushPrivateMessageAckRequest.newBuilder()
.setContactUserId(contactUserId) .setContactUserId(contactUserId)
...@@ -395,7 +399,7 @@ public class CCIMClient { ...@@ -395,7 +399,7 @@ public class CCIMClient {
/** /**
* 推送渠道消息成功ack * 推送渠道消息成功ack
*/ */
public void pushChannelMessage(Long channelId, Long msgId) { private void pushChannelMessage(Long channelId, Long msgId) {
Chat.ChatRequestMessage.Builder builder = Chat.ChatRequestMessage.newBuilder(); Chat.ChatRequestMessage.Builder builder = Chat.ChatRequestMessage.newBuilder();
Push.PushChannelMessageAckRequest channelMessageAckRequest = Push.PushChannelMessageAckRequest.newBuilder() Push.PushChannelMessageAckRequest channelMessageAckRequest = Push.PushChannelMessageAckRequest.newBuilder()
.setChannelId(channelId) .setChannelId(channelId)
...@@ -408,7 +412,6 @@ public class CCIMClient { ...@@ -408,7 +412,6 @@ public class CCIMClient {
/** /**
* 开始录音 * 开始录音
*/ */
public void startRecordAudioMessage(FragmentActivity activity, ResultCallback resultCallback) { public void startRecordAudioMessage(FragmentActivity activity, ResultCallback resultCallback) {
PermissionX.init(activity) PermissionX.init(activity)
.permissions(Manifest.permission.RECORD_AUDIO) .permissions(Manifest.permission.RECORD_AUDIO)
......
...@@ -4,8 +4,7 @@ import androidx.room.Database; ...@@ -4,8 +4,7 @@ import androidx.room.Database;
import androidx.room.RoomDatabase; import androidx.room.RoomDatabase;
import com.ccwangluo.ccim.modle.MessageContent; import com.ccwangluo.ccim.modle.MessageContent;
@Database(entities = {MessageContent.class}, version = 1,exportSchema = false)
@Database(entities = {MessageContent.class}, version = 1)
public abstract class AppDatabase extends RoomDatabase { public abstract class AppDatabase extends RoomDatabase {
public abstract MessageDao messageDao(); public abstract MessageDao messageDao();
} }
...@@ -3,7 +3,5 @@ package com.ccwangluo.ccim.listener; ...@@ -3,7 +3,5 @@ package com.ccwangluo.ccim.listener;
public interface ResultCallback { public interface ResultCallback {
void onSuccess(); void onSuccess();
default void onFailed(int errorCode){ void onFailed(int errorCode);
};
} }
...@@ -3,7 +3,5 @@ package com.ccwangluo.ccim.listener; ...@@ -3,7 +3,5 @@ package com.ccwangluo.ccim.listener;
public interface ResultEventCallback<T> { public interface ResultEventCallback<T> {
void onSuccess(T t); void onSuccess(T t);
default void onFailed(int errorCode){ void onFailed(int errorCode);
}
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment