yangyakun921/MoGoAiCloudSdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
zhongchao
2021-02-25 17:16:31 +08:00
parent b69a8180de 8c9b8f4607
commit 0915315678
8 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/gradle.xml generated
View File

@@ -26,7 +26,6 @@
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
<option name="useQualifiedModuleNames" value="true" />
</GradleProjectSettings>
</option>
</component>

2
.idea/misc.xml generated
View File

@@ -13,7 +13,7 @@
<option name="HEAP_SIZE" value="1024" />
<option name="LOCALE" value="zh_CN" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="12" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

22
app/src/main/AndroidManifest.xml
View File

@@ -26,7 +26,9 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".MainActivity">
<activity
android:name=".MainActivity"
android:launchMode="singleTask">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -36,22 +38,28 @@
<activity
android:name=".ConfigInfoActivity"
android:label="配置信息" />
android:label="配置信息"
android:launchMode="singleTask" />
<activity
android:name=".LivePushActivity"
android:label="直播播放" />
android:label="直播播放"
android:launchMode="singleTask" />
<activity
android:name=".LivePlayActivity"
android:label="直播推送" />
android:label="直播推送"
android:launchMode="singleTask" />
<activity
android:name="com.mogo.cloud.network.NetworkActivity"
android:label="网络测试" />
android:label="网络测试"
android:launchMode="singleTask" />
<activity
android:name=".RealTimeActivity"
android:label="实时数据测试" />
android:label="实时数据测试"
android:launchMode="singleTask" />
<activity
android:name=".RoadConditionActivity"
android:label="路况服务" />
android:label="路况服务"
android:launchMode="singleTask" />
<receiver android:name=".WifiBroadCastReceiver" />
</application>

2
app/src/main/java/com/mogo/cloud/MoGoApplication.java
View File

@@ -42,7 +42,7 @@ public class MoGoApplication extends MultiDexApplication {
// 设置是否是第三APP登录
clientConfig.setThirdLogin(true);
// 设置是否输出日志
clientConfig.setShowDebugLog(true);
clientConfig.setShowDebugLog(false);
// 设置从蘑菇AI开放平台获取的APPKey
clientConfig.setThirdPartyAppKey("wbvpzgar");
// 设置AI云平台分配给三方应用的签名密钥，需要从AI云平台申请

2
app/src/main/res/layout/activity_live_play.xml
View File

@@ -17,7 +17,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="请输入要查看的车机SN"
android:text="F803EB2046PZD00149"
android:text="F803BB2037EZD00071"
android:textColor="#FFFF"
app:layout_constraintBottom_toTopOf="@+id/liveToggleBtn"
app:layout_constraintEnd_toEndOf="parent"

4
foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java
View File

@@ -7,6 +7,7 @@ import android.view.SurfaceView;
import com.mogo.cloud.live.listener.ILiveProgressListener;
import com.mogo.cloud.live.listener.ILiveRoomPersonListener;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.cloud.utils.logger.Logger;
import org.json.JSONObject;
@@ -18,6 +19,7 @@ import im.zego.zegoexpress.ZegoExpressEngine;
import im.zego.zegoexpress.callback.IZegoCustomVideoCaptureHandler;
import im.zego.zegoexpress.callback.IZegoEventHandler;
import im.zego.zegoexpress.constants.ZegoEngineState;
import im.zego.zegoexpress.constants.ZegoLanguage;
import im.zego.zegoexpress.constants.ZegoPlayerState;
import im.zego.zegoexpress.constants.ZegoPublishChannel;
import im.zego.zegoexpress.constants.ZegoPublisherState;
@@ -320,6 +322,8 @@ public class MoGoLiveManager {
ZegoScenario.GENERAL,
mApplication,
mEventHandler);
// 关闭日志
mExpressEngine.setDebugVerbose(MoGoAiCloudClientConfig.getInstance().isShowDebugLog(), ZegoLanguage.CHINESE);
if (mLivePushConfig != null) {
// 创建自定义视频采集对象
customVideoCaptureConfig = new ZegoCustomVideoCaptureConfig();

2
foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java
View File

@@ -64,6 +64,8 @@ public class MoGoAiCloudClient {
// 控制日志输出
if (!mAiCloudClientConfig.isShowDebugLog()) {
Logger.init(LogLevel.OFF);
// 关闭鉴权模块的日志
com.elegant.log.simplelog.Logger.init(com.elegant.log.simplelog.LogLevel.OFF);
}
// 刷新令牌
refreshToken();

20
gradle.properties
View File

@@ -27,23 +27,23 @@ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/
USERNAME=xintai
PASSWORD=xintai2018
# 编译模式: false - 依赖本地版本， true - 依赖 maven 版本
RELEASE=false
RELEASE=true
# AI CLOUD 云平台
# 工具类
MOGO_UTILS_VERSION=1.0.40-SNAPSHOT
MOGO_UTILS_VERSION=1.0.40
# 网络请求
MOGO_NETWORK_VERSION=1.0.40-SNAPSHOT
MOGO_NETWORK_VERSION=1.0.40
# 网络DNS
MOGO_HTTPDNS_VERSION=1.0.40-SNAPSHOT
MOGO_HTTPDNS_VERSION=1.0.40
# 鉴权
MOGO_PASSPORT_VERSION=1.0.40-SNAPSHOT
MOGO_PASSPORT_VERSION=1.0.40
# 常链接
MOGO_SOCKET_VERSION=1.0.40-SNAPSHOT
MOGO_SOCKET_VERSION=1.0.40
# 数据采集
MOGO_REALTIME_VERSION=1.0.40-SNAPSHOT
MOGO_REALTIME_VERSION=1.0.40
# 探路，道路事件发布，获取
MOGO_TANLU_VERSION=1.0.40-SNAPSHOT
MOGO_TANLU_VERSION=1.0.40
# 直播推流
MOGO_LIVE_VERSION=1.0.40-SNAPSHOT
MOGO_LIVE_VERSION=1.0.40
# 直播拉流
MOGO_TRAFFICLIVE_VERSION=1.0.40-SNAPSHOT
MOGO_TRAFFICLIVE_VERSION=1.0.40