Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update version to 1.3.0 #83

Open
wants to merge 10 commits into
base: dev
Choose a base branch
from
Open

update version to 1.3.0 #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b5642c7
update version to 1.2.2
xuchengpu Nov 17, 2023
8eac31a
update androidTestImplementation version
xuchengpu Nov 17, 2023
aebeabd
Fixed an issue where audio and video activities were recovered when t…
xuchengpu Nov 30, 2023
a7fa42c
Fixed a bug where the initiator's personal information could not be d…
xuchengpu Nov 30, 2023
5fa2ef0
The audio and video stack is not displayed
xuchengpu Dec 1, 2023
a92c408
remove fpa
xuchengpu Mar 13, 2024
d331e08
add ENABLE_AGORA for pck
xuchengpu Mar 14, 2024
0a3d855
add pin message feature in Agora-Chat demo
xuchengpu Apr 7, 2024
83fcfec
fix conflicts
xuchengpu Apr 7, 2024
beb78a0
update version to 1.3.0
xuchengpu Apr 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ android {
applicationId "io.agora.chatdemo"
minSdkVersion 21
targetSdkVersion 34
versionCode 12
versionName "1.2.0"
versionCode 130
versionName "1.3.0"
multiDexEnabled true

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -48,7 +48,6 @@ android {
//
// externalNativeBuild {
// ndkBuild {
//// arguments "NDK_LIBS_OUT=libs", "all"
// abiFilters "arm64-v8a","armeabi-v7a"
// arguments '-j8'
// }
Expand Down Expand Up @@ -111,8 +110,8 @@ dependencies {
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
testImplementation 'junit:junit:4.+'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
//ViewModel and LiveData
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
// Google firebase cloud messaging
Expand All @@ -139,8 +138,8 @@ dependencies {

implementation 'com.google.code.gson:gson:2.6.2'
// Agora Chat Uikit
implementation 'io.agora.rtc:chat-uikit:1.2.0'
implementation 'io.agora.rtc:chat-callkit:1.2.0'
implementation 'io.agora.rtc:chat-uikit:1.3.0'
implementation 'io.agora.rtc:chat-callkit:1.3.0'
// implementation project(path: ':chat-uikit')
// implementation project(path: ':chat-callkit')
// url preview
Expand Down
1 change: 1 addition & 0 deletions app/jni/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@ include $(CLEAR_VARS)
PB_LITE=1
ENABLE_CALL=0
USE_SQLCIPHER=1
ENABLE_AGORA=1
#libhyphenate.so
include $(LOCAL_PATH)/../../../emclient-linux/Android.mk
4 changes: 4 additions & 0 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,14 +175,18 @@
android:exported="false"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/demo_activity_label_video_call"
android:taskAffinity=".SingleCallTask"
android:launchMode="singleInstance"
android:excludeFromRecents="true"
android:screenOrientation="portrait" />
<activity
android:name=".av.MultipleCallActivity"
android:exported="false"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/demo_activity_label_multi_call"
android:taskAffinity=".MultipleCallTask"
android:launchMode="singleInstance"
android:excludeFromRecents="true"
android:screenOrientation="portrait" />
<!-- custom presence -->
<activity
Expand Down
7 changes: 0 additions & 7 deletions app/src/main/java/io/agora/chatdemo/DemoHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,15 +163,8 @@ public EMAREncryptUtils getEncryptUtils(){
private boolean initSDK(Context context) {
// Set Chat Options
ChatOptions options = initChatOptions(context);
// Configure custom rest server and im server

// options.setRestServer("a1-hsb.easemob.com");
// options.setAppKey("easemob-demo#chatdemoui");
// options.setIMServer("106.75.100.247");
// options.setImPort(6717);
options.setUsingHttpsOnly(true);
// Use fpa by default
options.setFpaEnable(true);
boolean hasAppkey = checkAgoraChatAppKey(context, options);
// You can set your AppKey by options.setAppKey(appkey)
if (!hasAppkey) {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/io/agora/chatdemo/av/DemoCallKitListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,9 +247,9 @@ private void getUserIdByAgoraUid(int uId, String url, EaseCallGetUserAccountCall
String uIdStr = it.next().toString();
int uid = Integer.valueOf(uIdStr).intValue();
String username = resToken.optString(uIdStr);
if (uid == uId) {
if (uid == uId||uid==0) {
//Obtain information such as userName, profile picture, and nickname of the current user
userAccount=new EaseUserAccount(uid, username);
userAccount=new EaseUserAccount(uId, username);
}
}
callback.onUserAccount(userAccount);
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/io/agora/chatdemo/chat/ChatReportActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public void initData(){
}
}
viewModel = new ViewModelProvider(this).get(ChatViewModel.class);
viewModel.getChatManagerObservable().observe(this,response->{
viewModel.getReportMessageObservable().observe(this, response->{
parseResource(response, new OnResourceParseCallback<Boolean>() {
@Override
public void onSuccess(@Nullable Boolean data) {
Expand Down
Loading