Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
ccim_sdk_android
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sheteng
ccim_sdk_android
Commits
53b7c52b
Commit
53b7c52b
authored
Jun 16, 2022
by
sheteng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
敏感词替换
语音转文字
parent
57f5faf0
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
75 additions
and
26 deletions
+75
-26
.idea/.name
.idea/.name
+1
-0
.idea/misc.xml
.idea/misc.xml
+1
-3
app/src/main/java/com/ccwangluo/im/util/ToastUtil.java
app/src/main/java/com/ccwangluo/im/util/ToastUtil.java
+4
-4
app/src/main/res/layout/activity_login.xml
app/src/main/res/layout/activity_login.xml
+1
-1
ccim/src/main/java/com/ccwangluo/ccim/CCIMClient.java
ccim/src/main/java/com/ccwangluo/ccim/CCIMClient.java
+5
-2
ccim/src/main/java/com/ccwangluo/ccim/database/UserConverter.java
.../main/java/com/ccwangluo/ccim/database/UserConverter.java
+18
-0
ccim/src/main/java/com/ccwangluo/ccim/manage/MessageManager.java
...c/main/java/com/ccwangluo/ccim/manage/MessageManager.java
+25
-5
ccim/src/main/java/com/ccwangluo/ccim/modle/MessageContent.java
...rc/main/java/com/ccwangluo/ccim/modle/MessageContent.java
+14
-0
ccim/src/main/java/com/ccwangluo/ccim/util/MediaHelper.java
ccim/src/main/java/com/ccwangluo/ccim/util/MediaHelper.java
+3
-1
ccim/src/main/proto/message.proto
ccim/src/main/proto/message.proto
+2
-10
ccim/src/main/proto/message_spec.proto
ccim/src/main/proto/message_spec.proto
+1
-0
No files found.
.idea/.name
0 → 100644
View file @
53b7c52b
ccwangluoIm
\ No newline at end of file
.idea/misc.xml
View file @
53b7c52b
...
...
@@ -3,6 +3,7 @@
<component
name=
"DesignSurface"
>
<option
name=
"filePathToZoomLevelMap"
>
<map>
<entry
key=
"..\:/ccwangluo/ccim_sdk_android/app/src/main/res/layout/activity_login.xml"
value=
"0.1612008072653885"
/>
<entry
key=
"..\:/project/ccwangluoIm/app/src/main/res/layout/activity_connect.xml"
value=
"0.3170289855072464"
/>
<entry
key=
"..\:/project/ccwangluoIm/app/src/main/res/layout/activity_connect_channel.xml"
value=
"0.26403985507246375"
/>
<entry
key=
"..\:/project/ccwangluoIm/app/src/main/res/layout/activity_login.xml"
value=
"0.322463768115942"
/>
...
...
@@ -28,9 +29,6 @@
</map>
</option>
</component>
<component
name=
"ProjectPlainTextFileTypeManager"
>
<file
url=
"file://$PROJECT_DIR$/app/release/output-metadata.json"
/>
</component>
<component
name=
"ProjectRootManager"
version=
"2"
languageLevel=
"JDK_1_8"
default=
"true"
project-jdk-name=
"1.8"
project-jdk-type=
"JavaSDK"
>
<output
url=
"file://$PROJECT_DIR$/build/classes"
/>
</component>
...
...
app/src/main/java/com/ccwangluo/im/util/ToastUtil.java
View file @
53b7c52b
package
com.ccwangluo.im.util
;
import
android.content.Context
;
import
android.os.Handler
;
import
android.os.Looper
;
import
android.widget.Toast
;
public
class
ToastUtil
{
private
Handler
handler
=
new
Handler
(
Looper
.
getMainLooper
());
public
static
void
show
(
Context
context
,
String
msg
)
{
if
(
context
==
null
)
{
return
;
}
Toast
.
makeText
(
context
,
msg
,
Toast
.
LENGTH_SHORT
).
show
();
}
}
app/src/main/res/layout/activity_login.xml
View file @
53b7c52b
...
...
@@ -69,7 +69,7 @@
android:layout_height=
"wrap_content"
android:layout_marginTop=
"8dp"
android:hint=
"ip"
android:text=
"10
6.15.237.6
7"
android:text=
"10
.17.4.20
7"
android:imeActionLabel=
"@string/action_sign_in_short"
android:imeOptions=
"actionDone"
android:selectAllOnFocus=
"true"
...
...
ccim/src/main/java/com/ccwangluo/ccim/CCIMClient.java
View file @
53b7c52b
...
...
@@ -3,6 +3,8 @@ package com.ccwangluo.ccim;
import
android.Manifest
;
import
android.content.Context
;
import
android.os.Environment
;
import
android.os.Handler
;
import
android.os.Looper
;
import
android.text.TextUtils
;
import
com.ccwangluo.ccim.listener.OnClientConnectListener
;
...
...
@@ -56,8 +58,9 @@ public class CCIMClient {
private
int
maxSendMsgInterval
=
0
;
private
int
maxAudioDuration
=
0
;
private
final
int
minAudioDuration
=
500
;
private
String
downloadPrefix
;
private
String
cachePath
;
public
String
downloadPrefix
;
public
String
cachePath
;
private
Handler
handler
=
new
Handler
(
Looper
.
getMainLooper
());
private
ExecutorService
executor
=
Executors
.
newSingleThreadExecutor
();
...
...
ccim/src/main/java/com/ccwangluo/ccim/database/UserConverter.java
0 → 100644
View file @
53b7c52b
package
com.ccwangluo.ccim.database
;
import
androidx.room.TypeConverter
;
import
com.ccwangluo.ccim.modle.User
;
import
com.google.gson.Gson
;
public
class
UserConverter
{
@TypeConverter
public
User
jsonToModel
(
String
json
)
{
return
new
Gson
().
fromJson
(
json
,
User
.
class
);
}
@TypeConverter
public
String
modelToJson
(
User
user
)
{
return
new
Gson
().
toJson
(
user
);
}
}
ccim/src/main/java/com/ccwangluo/ccim/manage/MessageManager.java
View file @
53b7c52b
...
...
@@ -117,16 +117,20 @@ public class MessageManager {
if
(
chatResponseMessage
.
hasSendMsgRes
())
{
Message
.
SendMessageResponse
sendMsgRes
=
chatResponseMessage
.
getSendMsgRes
();
long
msgId
=
sendMsgRes
.
getMsgId
();
String
text
=
content
;
if
(
messageType
==
MessageSpec
.
MessageType
.
MESSAGE_TYPE_TEXT
)
{
text
=
sendMsgRes
.
getContent
();
}
MessageContent
message
=
new
MessageContent
();
message
.
setSenderUserId
(
userId
);
message
.
setReciveUserId
(
reciveUserId
);
message
.
setMsgId
(
msgId
);
message
.
setContent
(
conten
t
);
message
.
setContent
(
tex
t
);
message
.
setMsgType
(
MessageContent
.
MessageType
.
valueOf
(
messageType
.
name
()));
message
.
setCreatedDate
(
System
.
currentTimeMillis
());
message
.
setMsgSrcType
(
MessageContent
.
MessageSourceType
.
MESSAGE_SOURCE_TYPE_PRIVATE
);
callback
.
onSuccess
(
message
);
pushNewMessage
(
message
);
callback
.
onSuccess
(
message
);
}
}
...
...
@@ -155,16 +159,20 @@ public class MessageManager {
if
(
chatResponseMessage
.
hasSendChannelMsgRes
())
{
Message
.
SendMessageResponse
sendMsgRes
=
chatResponseMessage
.
getSendMsgRes
();
long
msgId
=
sendMsgRes
.
getMsgId
();
String
text
=
content
;
if
(
messageType
==
MessageSpec
.
MessageType
.
MESSAGE_TYPE_TEXT
)
{
text
=
sendMsgRes
.
getContent
();
}
MessageContent
message
=
new
MessageContent
();
message
.
setSenderUserId
(
userId
);
message
.
setChannelId
(
channelId
);
message
.
setMsgId
(
msgId
);
message
.
setContent
(
conten
t
);
message
.
setContent
(
tex
t
);
message
.
setMsgType
(
MessageContent
.
MessageType
.
valueOf
(
messageType
.
name
()));
message
.
setCreatedDate
(
System
.
currentTimeMillis
());
message
.
setMsgSrcType
(
MessageContent
.
MessageSourceType
.
MESSAGE_SOURCE_TYPE_PRIVATE
);
callback
.
onSuccess
(
message
);
pushNewMessage
(
message
);
callback
.
onSuccess
(
message
);
}
}
...
...
@@ -192,7 +200,19 @@ public class MessageManager {
FileUtils
.
uploadFile
(
filePath
,
preSignedUrl
,
new
ResultEventCallback
<
Void
>()
{
@Override
public
void
onSuccess
(
Void
unused
)
{
callback
.
onSuccess
(
filename
);
File
file
=
new
File
(
CCIMClient
.
getInstance
().
cachePath
,
filename
);
FileUtils
.
downLoadFile
(
CCIMClient
.
getInstance
().
downloadPrefix
+
filename
,
file
,
new
ResultEventCallback
<
File
>()
{
@Override
public
void
onSuccess
(
File
file
)
{
logger
.
info
(
"success"
);
callback
.
onSuccess
(
filename
);
}
@Override
public
void
onFailed
(
int
errorCode
)
{
logger
.
info
(
"onFailed"
);
}
});
}
@Override
...
...
ccim/src/main/java/com/ccwangluo/ccim/modle/MessageContent.java
View file @
53b7c52b
...
...
@@ -2,7 +2,11 @@ package com.ccwangluo.ccim.modle;
import
androidx.room.Entity
;
import
androidx.room.Index
;
import
androidx.room.TypeConverters
;
import
com.ccwangluo.ccim.database.UserConverter
;
import
com.google.gson.JsonObject
;
@TypeConverters
(
UserConverter
.
class
)
@Entity
(
primaryKeys
=
{
"msgId"
},
indices
=
{
@Index
(
value
=
{
"msgId"
},
unique
=
true
)})
public
class
MessageContent
{
...
...
@@ -15,7 +19,9 @@ public class MessageContent {
private
Long
channelId
;
private
MessageType
msgType
=
MessageType
.
MESSAGE_TYPE_TEXT
;
private
MessageSourceType
msgSrcType
=
MessageSourceType
.
MESSAGE_SOURCE_TYPE_PRIVATE
;
private
User
senderUser
;
private
String
voiceContent
;
//音频的语音转文字
public
User
getSenderUser
()
{
return
senderUser
;
...
...
@@ -25,6 +31,14 @@ public class MessageContent {
this
.
senderUser
=
senderUser
;
}
public
String
getVoiceContent
()
{
return
voiceContent
;
}
public
void
setVoiceContent
(
String
voiceContent
)
{
this
.
voiceContent
=
voiceContent
;
}
public
MessageType
getMsgType
()
{
return
msgType
;
}
...
...
ccim/src/main/java/com/ccwangluo/ccim/util/MediaHelper.java
View file @
53b7c52b
...
...
@@ -3,6 +3,9 @@ package com.ccwangluo.ccim.util;
import
android.media.MediaPlayer
;
import
android.media.MediaRecorder
;
import
android.os.Build
;
import
android.os.Handler
;
import
android.os.Looper
;
import
com.ccwangluo.ccim.listener.ResultEventCallback
;
import
java.io.File
;
...
...
@@ -17,7 +20,6 @@ public class MediaHelper {
/**
* 单例模式获取 MediaHelper
* 双检锁/双重校验锁
*/
public
static
MediaHelper
getInstance
()
{
if
(
mInstance
==
null
)
{
...
...
ccim/src/main/proto/message.proto
View file @
53b7c52b
...
...
@@ -12,18 +12,9 @@ message SendMessageRequest {
message
SendMessageResponse
{
int64
msg_id
=
1
;
string
content
=
2
;
}
//message SendGroupMessageRequest {
// int64 group_id = 1;
// string content = 2;
// MessageType msg_type = 3;
//}
//
//message SendGroupMessageResponse {
// int64 msg_id = 1;
//}
message
SendChannelMessageRequest
{
int64
channel_id
=
1
;
string
content
=
2
;
...
...
@@ -32,6 +23,7 @@ message SendChannelMessageRequest {
message
SendChannelMessageResponse
{
int64
msg_id
=
1
;
string
content
=
2
;
}
message
PullOfflineMessageRequest
{
...
...
ccim/src/main/proto/message_spec.proto
View file @
53b7c52b
...
...
@@ -29,4 +29,5 @@ message ChatMessage {
int64
modified_date
=
8
;
UserInfo
sender_user
=
9
;
string
voice_content
=
10
;
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment