Skip to content

Y
YDL-Component-Medical
Commit c798c1f7 by konghaorui
Options

升级云信版本号

parent c0d6d99e
Showing with 161 additions and 24 deletions
app/src/main/java/com/ydl/component/mvp/DemoModel.kt
......@@ -20,9 +20,6 @@ class DemoModel : BaseModel(), DemoContract.Model {
return YDLHttpUtils.obtainApi(DemoService::class.java)
.getFMData()
.compose(RxUtils.resultJavaData())
.map {
throw RuntimeException("runtime exception")
}
}
override fun getHome(): Observable<JsonObject> {
......
app/src/main/java/com/ydl/component/mvp/DemoPresenter.kt
......@@ -26,7 +26,7 @@ class DemoPresenter : BasePresenter<DemoContract.View,DemoContract.Model>(),
}
override fun onSuccess(homeFMBean: HomeFMBean) {
throw RuntimeException("runtime exception")
// throw RuntimeException("runtime exception")
homeFMBean.list?.let {
AudioPlayer.get().addPlayList(stringToMusicPlayerList(it))
mView.setData("")
......
config.gradle
ext {
kotlin_version = "1.3.21"
dev_mode = false
dev_mode = true
ydl_app = [
appName : "心理咨询壹点灵",
......
m-dynamic/src/main/java/com/yidianling/dynamic/common/net/NetApiStore.java
......@@ -102,8 +102,8 @@ public interface NetApiStore {
Observable<BaseResponse<Object>> reportWorry(@FieldMap Map<String, String> params);
//发布动态
@Multipart
@POST("sq-active/publish")
@Multipart
Observable<BaseResponse<PublishTrendResult>> publishTrend(@PartMap Map<String, RequestBody> params);
//话题列表
......
m-im/build.gradle
......@@ -84,10 +84,10 @@ dependencies {
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
kapt 'com.alibaba:arouter-compiler:1.2.2'
api 'com.ydl:nim-base:1.0.1'
api 'com.netease.nimlib:basesdk:6.4.0'
api 'com.netease.nimlib:avchat:6.4.0'
api 'com.netease.nimlib:nrtc:6.4.0'
api 'com.ydl:nim-base:1.0.4'
api 'com.netease.nimlib:basesdk:7.0.3'
api 'com.netease.nimlib:avchat:7.0.3'
api 'com.netease.nimlib:nrtc:7.0.3'
api rootProject.ext.dependencies["ydl-user-router"]
if (rootProject.ext.dev_mode){
......
m-im/src/main/java/com/yidianling/avchatkit/module/SimpleAVChatStateObserver.java
......@@ -5,6 +5,8 @@ import com.netease.nimlib.sdk.avchat.model.AVChatAudioFrame;
import com.netease.nimlib.sdk.avchat.model.AVChatNetworkStats;
import com.netease.nimlib.sdk.avchat.model.AVChatSessionStats;
import com.netease.nimlib.sdk.avchat.model.AVChatVideoFrame;
import com.netease.nrtc.sdk.common.VideoFilterParameter;
import com.netease.nrtc.sdk.video.VideoFrame;
import java.util.Map;
import java.util.Set;
......@@ -20,6 +22,16 @@ public class SimpleAVChatStateObserver implements AVChatStateObserver {
}
@Override
public void onAVRecordingStart(String account, String fileDir) {
}
@Override
public void onAudioRecordingStart(String fileDir) {
}
@Override
public void onAVRecordingCompletion(String account, String filePath) {
}
......@@ -55,6 +67,46 @@ public class SimpleAVChatStateObserver implements AVChatStateObserver {
}
@Override
public void onPublishVideoResult(int result) {
}
@Override
public void onUnpublishVideoResult(int result) {
}
@Override
public void onSubscribeVideoResult(String account, int videoType, int result) {
}
@Override
public void onUnsubscribeVideoResult(String account, int videoType, int result) {
}
@Override
public void onRemotePublishVideo(String account, int[] videoTypes) {
}
@Override
public void onRemoteUnpublishVideo(String account) {
}
@Override
public void onUnsubscribeAudioResult(int result) {
}
@Override
public void onSubscribeAudioResult(int result) {
}
@Override
public void onJoinedChannel(int code, String audioFile, String videoFile, int elapsed) {
}
......@@ -130,6 +182,11 @@ public class SimpleAVChatStateObserver implements AVChatStateObserver {
}
@Override
public boolean onVideoFrameFilter(VideoFrame input, VideoFrame[] outputFrames, VideoFilterParameter filterParameter) {
return false;
}
@Override
public boolean onAudioFrameFilter(AVChatAudioFrame frame) {
return false;
}
......
m-im/src/main/java/com/yidianling/avchatkit/teamavchat/module/SimpleAVChatStateObserver.java
......@@ -5,6 +5,8 @@ import com.netease.nimlib.sdk.avchat.model.AVChatAudioFrame;
import com.netease.nimlib.sdk.avchat.model.AVChatNetworkStats;
import com.netease.nimlib.sdk.avchat.model.AVChatSessionStats;
import com.netease.nimlib.sdk.avchat.model.AVChatVideoFrame;
import com.netease.nrtc.sdk.common.VideoFilterParameter;
import com.netease.nrtc.sdk.video.VideoFrame;
import java.util.Map;
import java.util.Set;
......@@ -20,6 +22,16 @@ public class SimpleAVChatStateObserver implements AVChatStateObserver {
}
@Override
public void onAVRecordingStart(String account, String fileDir) {
}
@Override
public void onAudioRecordingStart(String fileDir) {
}
@Override
public void onConnectionTypeChanged(int netType) {
}
......@@ -60,6 +72,46 @@ public class SimpleAVChatStateObserver implements AVChatStateObserver {
}
@Override
public void onPublishVideoResult(int result) {
}
@Override
public void onUnpublishVideoResult(int result) {
}
@Override
public void onSubscribeVideoResult(String account, int videoType, int result) {
}
@Override
public void onUnsubscribeVideoResult(String account, int videoType, int result) {
}
@Override
public void onRemotePublishVideo(String account, int[] videoTypes) {
}
@Override
public void onRemoteUnpublishVideo(String account) {
}
@Override
public void onUnsubscribeAudioResult(int result) {
}
@Override
public void onSubscribeAudioResult(int result) {
}
@Override
public void onFirstVideoFrameAvailable(String account) {
}
......@@ -131,6 +183,11 @@ public class SimpleAVChatStateObserver implements AVChatStateObserver {
}
@Override
public boolean onVideoFrameFilter(VideoFrame input, VideoFrame[] outputFrames, VideoFilterParameter filterParameter) {
return false;
}
@Override
public boolean onAudioFrameFilter(AVChatAudioFrame frame) {
return false;
}
......
m-im/src/main/java/com/yidianling/im/config/NimSDKOptionConfig.java
......@@ -17,7 +17,6 @@ import com.yidianling.im.R;
import com.yidianling.im.config.constants.UserPreferences;
import com.yidianling.im.config.provider.CustomUserInfoProvider;
import com.yidianling.im.preference.IMCache;
import com.yidianling.uikit.api.NimUIKitImpl;
import com.yidianling.uikit.api.wrapper.MessageRevokeTip;
import com.yidianling.uikit.business.session.viewholder.MsgViewHolderThumbBase;
......@@ -198,14 +197,37 @@ class NimSDKOptionConfig {
// 第三方推送配置
MixPushConfig config = new MixPushConfig();
// 小米推送
config.xmAppId = "2882303761517432980";
config.xmAppKey = "5241743243980";
config.xmCertificateName = "ydlUser";
// 华为推送
config.hwCertificateName = "ydlUserHw";
String appFrom = BaseApp.Companion.getInstance().getGlobalConfig().getAppFrom();
if (YDLConstants.FROM_YDL.equals(appFrom)) {
// 小米推送
config.xmAppId = "2882303761517432980";
config.xmAppKey = "5241743243980";
config.xmCertificateName = "ydlUser";
// 华为推送
config.hwCertificateName = "ydlUserHw";
//OPPO 推送
config.oppoAppId = "3245516";
config.oppoAppKey = "afk71f35VogGw0w0wKsookksc";
config.oppoAppSercet = "691184F044acA7a6851F578451f67616";
config.oppoCertificateName = "ydlUserOPPO";
//VIVO 推送
config.vivoCertificateName = "ydlUserVIVO";
}else if(YDLConstants.FROM_XLZX.equals(appFrom)) {
// 小米推送
config.xmAppId = "2882303761517549919";
config.xmAppKey = "5111754949919";
config.xmCertificateName = "ydlXLZXXM";
// 华为推送
config.hwCertificateName = "ydlXLZX";
//OPPO 推送
config.oppoAppId = "3601521";
config.oppoAppKey = "c500cJ5mzvSow848048gOsG4G";
config.oppoAppSercet = "F13EbCf4380b683Fb0e316336eeC9Deb";
config.oppoCertificateName = "ydlXLZXOPPO";
//VIVO 推送
config.vivoCertificateName = "ydlXLZXVIVO";
}
return config;
}
......
m-im/src/main/java/com/yidianling/uikit/business/session/helper/TeamNotificationHelper.java
......@@ -182,7 +182,7 @@ public class TeamNotificationHelper {
}
} else if (field.getKey() == TeamFieldEnum.Extension) {
sb.append("群扩展字段被更新为 " + field.getValue());
} else if (field.getKey() == TeamFieldEnum.Ext_Server) {
} else if (field.getKey() == TeamFieldEnum.Ext_Server_Only) {
sb.append("群扩展字段(服务器)被更新为 " + field.getValue());
} else if (field.getKey() == TeamFieldEnum.ICON) {
sb.append("群头像已更新");
......
ydl-platform/src/main/java/com/ydl/ydlcommon/app/YdlRepository.kt
......@@ -5,7 +5,6 @@ import android.app.Application
import com.alibaba.android.arouter.launcher.ARouter
import com.lzy.imagepicker.ImagePicker
import com.lzy.imagepicker.view.CropImageView
import com.ydl.devicesidlib.DeviceIDHelper
import com.ydl.ydlcommon.actions.imagepicker.YdlImageLoader
import com.ydl.ydlcommon.base.BaseApp
import com.ydl.ydlcommon.data.http.UpLoadLogUtils
......@@ -28,7 +27,7 @@ object YdlRepository {
// 需要在主 module 的 application 的 onCreate 方法中调用此方法
fun initApp(app: Application,isDebug:Boolean) {
DeviceIDHelper.getInstance().init(app.applicationContext)
//DeviceIDHelper.getInstance().init(app.applicationContext)
LogHelper.getInstance().deleteExpireLogSync()
LogUtil.debug = BaseApp.instance.getGlobalConfig().appDebug
com.yidianling.common.tools.LogUtil.debug = BaseApp.instance.getGlobalConfig().appDebug
......
ydl-platform/src/main/java/com/ydl/ydlcommon/base/delegate/AppDelegate.kt
......@@ -6,6 +6,7 @@ import com.ydl.ydlcommon.app.YdlRepository
import com.ydl.ydlcommon.base.config.GlobalConfig
import com.ydl.ydlcommon.base.config.IApp
import com.ydl.ydlcommon.base.config.IConfigModule
import com.ydl.ydlcommon.utils.AppProgressUtils
import com.ydl.ydlcommon.utils.ManifestParser
import java.util.*
......@@ -45,8 +46,12 @@ class AppDelegate(context: Context) : IAppLifecycles,IApp{
this.mApplication = application
mGlobalConfig = initModuleConfig(application, mModules!!)
mGlobalConfig!!.initEnv()
//初始化YDL第三方依赖
YdlRepository.initApp(application,mGlobalConfig?.appDebug?:false)
if (AppProgressUtils.isMainProcess(application)){
//初始化YDL第三方依赖
YdlRepository.initApp(application,mGlobalConfig?.appDebug?:false)
}
//执行 扩展的 App onCreate 逻辑
for (lifecycle in mAppLifecycles!!) {
......
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