Commit 30b8eb2b authored by sheteng's avatar sheteng

fix bug

parent 547a26bb
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<map> <map>
<entry key="..\:/project/ccwangluoIm/app/src/main/res/layout/activity_main.xml" value="0.20153985507246377" /> <entry key="..\:/project/ccwangluoIm/app/src/main/res/layout/activity_main.xml" value="0.20153985507246377" />
<entry key="..\:/project/ccwangluoIm/app/src/main/res/layout/content_main.xml" value="0.20153985507246377" /> <entry key="..\:/project/ccwangluoIm/app/src/main/res/layout/content_main.xml" value="0.20153985507246377" />
<entry key="..\:/project/ccwangluoIm/app/src/main/res/layout/fragment_first.xml" value="0.4530812324929972" /> <entry key="..\:/project/ccwangluoIm/app/src/main/res/layout/fragment_first.xml" value="0.25" />
</map> </map>
</option> </option>
</component> </component>
......
...@@ -42,8 +42,8 @@ public class FirstFragment extends Fragment { ...@@ -42,8 +42,8 @@ public class FirstFragment extends Fragment {
public void onViewCreated(@NonNull View view, Bundle savedInstanceState) { public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState); super.onViewCreated(view, savedInstanceState);
String appKey = "c981adfde9c4000"; String appKey = "c981adfde9c4000";
String userName = "user101"; String userName = "user106";
Long userId = 101L; Long userId = 106L;
String extData = "extData"; String extData = "extData";
Long ts = System.currentTimeMillis(); Long ts = System.currentTimeMillis();
String data = appKey + "&" + userId + "&" + userName + "&" + extData + "&" + ts + String data = appKey + "&" + userId + "&" + userName + "&" + extData + "&" + ts +
...@@ -51,7 +51,7 @@ public class FirstFragment extends Fragment { ...@@ -51,7 +51,7 @@ public class FirstFragment extends Fragment {
//sign计算在服务器,本地不要暴露appsecrect //sign计算在服务器,本地不要暴露appsecrect
String sign = HmacUtil.stringToSign("wW7cR31PwJseIoZMOs311nljHpwUmujs",data); String sign = HmacUtil.stringToSign("wW7cR31PwJseIoZMOs311nljHpwUmujs",data);
CCIMClient.getInstance().initSDK(appKey, userName, extData,101L, ts, sign, new OnConnectListener() { CCIMClient.getInstance().initSDK(appKey, userName, extData,userId, ts, sign, new OnConnectListener() {
@Override @Override
public void onSocketConnection() { public void onSocketConnection() {
refreshLogView("connect success"); refreshLogView("connect success");
...@@ -314,7 +314,7 @@ public class FirstFragment extends Fragment { ...@@ -314,7 +314,7 @@ public class FirstFragment extends Fragment {
new Handler(Looper.getMainLooper()).post(new Runnable() { new Handler(Looper.getMainLooper()).post(new Runnable() {
@Override @Override
public void run() { public void run() {
binding.txLog.append(msg); binding.txLog.append(msg + "\r\n");
int offset = binding.txLog.getLineCount() * binding.txLog.getLineHeight(); int offset = binding.txLog.getLineCount() * binding.txLog.getLineHeight();
if (offset > binding.txLog.getHeight()) { if (offset > binding.txLog.getHeight()) {
binding.txLog.scrollTo(0, offset - binding.txLog.getHeight() + binding.txLog.getLineHeight() * 2); binding.txLog.scrollTo(0, offset - binding.txLog.getHeight() + binding.txLog.getLineHeight() * 2);
......
...@@ -14,15 +14,11 @@ ...@@ -14,15 +14,11 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:id="@+id/tx_log" android:id="@+id/tx_log"
android:layout_height="100dp"/> android:layout_height="200dp"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:text="userId"
android:layout_height="wrap_content"/>
<EditText <EditText
android:id="@+id/userId" android:id="@+id/userId"
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -30,10 +26,13 @@ ...@@ -30,10 +26,13 @@
android:hint="userId" android:hint="userId"
android:text="103" /> android:text="103" />
<TextView <EditText
android:id="@+id/userName"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:text="groupId" android:layout_height="wrap_content"
android:layout_height="wrap_content"/> android:hint="userName"
android:text="feng" />
<EditText <EditText
android:id="@+id/groupId" android:id="@+id/groupId"
...@@ -42,17 +41,14 @@ ...@@ -42,17 +41,14 @@
android:hint="channelId" android:hint="channelId"
android:text="1" /> android:text="1" />
<TextView
android:layout_width="wrap_content"
android:text="channelId"
android:layout_height="wrap_content"/>
<EditText <EditText
android:id="@+id/channelId" android:id="@+id/channelId"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="channelId" android:hint="channelId"
android:text="6857982583817506816" /> android:text="6857982583817506816" />
</LinearLayout> </LinearLayout>
<EditText <EditText
......
...@@ -13,6 +13,7 @@ import com.ccwangluo.ccim.manage.SocketManageer; ...@@ -13,6 +13,7 @@ import com.ccwangluo.ccim.manage.SocketManageer;
import com.ccwangluo.ccim.util.MediaHelper; import com.ccwangluo.ccim.util.MediaHelper;
import com.google.protobuf.RepeatedFieldBuilder; import com.google.protobuf.RepeatedFieldBuilder;
import com.permissionx.guolindev.PermissionX; import com.permissionx.guolindev.PermissionX;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.logging.Logger; import java.util.logging.Logger;
...@@ -46,10 +47,10 @@ public class CCIMClient { ...@@ -46,10 +47,10 @@ public class CCIMClient {
return mInstance; return mInstance;
} }
public void initSDK(String appKey, String userName,String extData, Long userId, Long ts, String sign, OnConnectListener resultCallback) { public void initSDK(String appKey, String userName, String extData, Long userId, Long ts, String sign, OnConnectListener resultCallback) {
callBackManager = new CallBackManager<>(); callBackManager = new CallBackManager<>();
socketManageer = new SocketManageer(callBackManager); socketManageer = new SocketManageer(callBackManager);
socketManageer.initChat(appKey, userName,extData, userId,ts,sign,resultCallback); socketManageer.initChat(appKey, userName, extData, userId, ts, sign, resultCallback);
} }
...@@ -98,7 +99,7 @@ public class CCIMClient { ...@@ -98,7 +99,7 @@ public class CCIMClient {
/** /**
* 同步离线消息 * 同步离线消息
*/ */
public void getOfflineMessage(Long lastPullMsgId,ResultEventCallback<List<Message.PullOfflineMessageResponse.OfflineMessage>> resultEventCallback) { public void getOfflineMessage(Long lastPullMsgId, ResultEventCallback<List<Message.PullOfflineMessageResponse.OfflineMessage>> resultEventCallback) {
Message.PullOfflineMessageRequest offlineMessageRequest = Message.PullOfflineMessageRequest.newBuilder() Message.PullOfflineMessageRequest offlineMessageRequest = Message.PullOfflineMessageRequest.newBuilder()
.setLastPulledMsgId(lastPullMsgId) .setLastPulledMsgId(lastPullMsgId)
.build(); .build();
...@@ -356,10 +357,8 @@ public class CCIMClient { ...@@ -356,10 +357,8 @@ public class CCIMClient {
callBackManager.addCallBack(id, new ResultEventCallback<Chat.ChatResponseMessage>() { callBackManager.addCallBack(id, new ResultEventCallback<Chat.ChatResponseMessage>() {
@Override @Override
public void onSuccess(Chat.ChatResponseMessage chatResponseMessage) { public void onSuccess(Chat.ChatResponseMessage chatResponseMessage) {
if (chatResponseMessage.hasSendMsgRes()) {
callback.onSuccess(); callback.onSuccess();
} }
}
@Override @Override
public void onFailed(int errorCode) { public void onFailed(int errorCode) {
...@@ -372,7 +371,7 @@ public class CCIMClient { ...@@ -372,7 +371,7 @@ public class CCIMClient {
/** /**
* 创建频道 * 创建频道
*/ */
public void createChannel(String channelName,String tag,boolean isOpen,List<Long> userIds, ResultEventCallback<Long> callback) { public void createChannel(String channelName, String tag, boolean isOpen, List<Long> userIds, ResultEventCallback<Long> callback) {
Channel.CreateChannelRequest.Builder builder = Channel.CreateChannelRequest.newBuilder() Channel.CreateChannelRequest.Builder builder = Channel.CreateChannelRequest.newBuilder()
.setName(channelName) .setName(channelName)
.setTag(tag) .setTag(tag)
...@@ -408,11 +407,9 @@ public class CCIMClient { ...@@ -408,11 +407,9 @@ public class CCIMClient {
callBackManager.addCallBack(id, new ResultEventCallback<Chat.ChatResponseMessage>() { callBackManager.addCallBack(id, new ResultEventCallback<Chat.ChatResponseMessage>() {
@Override @Override
public void onSuccess(Chat.ChatResponseMessage chatResponseMessage) { public void onSuccess(Chat.ChatResponseMessage chatResponseMessage) {
if (chatResponseMessage.hasJoinChannelRes()) {
logger.info(String.valueOf(chatResponseMessage)); logger.info(String.valueOf(chatResponseMessage));
callback.onSuccess(); callback.onSuccess();
} }
}
@Override @Override
public void onFailed(int errorCode) { public void onFailed(int errorCode) {
...@@ -424,7 +421,7 @@ public class CCIMClient { ...@@ -424,7 +421,7 @@ public class CCIMClient {
/** /**
* 移除频道成员 * 移除频道成员
*/ */
public void removeChannelMember(Long channelId,Long userId, ResultCallback callback) { public void removeChannelMember(Long channelId, Long userId, ResultCallback callback) {
Channel.RemoveMemberRequest.Builder builder = Channel.RemoveMemberRequest.newBuilder() Channel.RemoveMemberRequest.Builder builder = Channel.RemoveMemberRequest.newBuilder()
.setChannelId(channelId) .setChannelId(channelId)
.setUserId(userId); .setUserId(userId);
...@@ -455,11 +452,9 @@ public class CCIMClient { ...@@ -455,11 +452,9 @@ public class CCIMClient {
callBackManager.addCallBack(id, new ResultEventCallback<Chat.ChatResponseMessage>() { callBackManager.addCallBack(id, new ResultEventCallback<Chat.ChatResponseMessage>() {
@Override @Override
public void onSuccess(Chat.ChatResponseMessage chatResponseMessage) { public void onSuccess(Chat.ChatResponseMessage chatResponseMessage) {
if (chatResponseMessage.hasRemoveMemberRes()) {
logger.info(String.valueOf(chatResponseMessage)); logger.info(String.valueOf(chatResponseMessage));
callback.onSuccess(); callback.onSuccess();
} }
}
@Override @Override
public void onFailed(int errorCode) { public void onFailed(int errorCode) {
...@@ -536,18 +531,18 @@ public class CCIMClient { ...@@ -536,18 +531,18 @@ public class CCIMClient {
}); });
} }
public void stopAndSendAudioMessage(){ public void stopAndSendAudioMessage() {
MediaHelper.getInstance().release(); MediaHelper.getInstance().release();
String filePath = MediaHelper.getInstance().getFilePath(); String filePath = MediaHelper.getInstance().getFilePath();
} }
public void cancleAudioMessage(){ public void cancleAudioMessage() {
MediaHelper.getInstance().cancel(); MediaHelper.getInstance().cancel();
} }
public void startPlayAudio(String filePath){ public void startPlayAudio(String filePath) {
MediaHelper.getInstance().play(filePath); MediaHelper.getInstance().play(filePath);
} }
......
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