diff --git a/app/src/main/java/com/mogo/cloud/LivePlayActivity.java b/app/src/main/java/com/mogo/cloud/LivePlayActivity.java index a69631f..02acde9 100644 --- a/app/src/main/java/com/mogo/cloud/LivePlayActivity.java +++ b/app/src/main/java/com/mogo/cloud/LivePlayActivity.java @@ -11,7 +11,7 @@ import androidx.appcompat.app.AppCompatActivity; import com.mogo.cloud.live.listener.ILiveProgressListener; import com.mogo.cloud.live.manager.MoGoLiveManager; -import com.mogo.cloud.util.Devices; +import com.mogo.cloud.passport.MoGoAiCloudClientConfig; public class LivePlayActivity extends AppCompatActivity { @@ -36,7 +36,7 @@ public class LivePlayActivity extends AppCompatActivity { if (isChecked) { String roomId = etLookRoomId.getText().toString().trim(); MoGoLiveManager.getInstance().init(this.getApplication(), null); - MoGoLiveManager.getInstance().loginRoom(Devices.getSn(), roomId); + MoGoLiveManager.getInstance().loginRoom(MoGoAiCloudClientConfig.getInstance().getSn(), roomId); MoGoLiveManager.getInstance().setLiveProgressListener(listener); } else { MoGoLiveManager.getInstance().stopLive(); diff --git a/app/src/main/java/com/mogo/cloud/LivePushActivity.java b/app/src/main/java/com/mogo/cloud/LivePushActivity.java index e475248..3d8a479 100644 --- a/app/src/main/java/com/mogo/cloud/LivePushActivity.java +++ b/app/src/main/java/com/mogo/cloud/LivePushActivity.java @@ -6,6 +6,7 @@ import com.mogo.cloud.live.manager.CameraFrameManager; import com.mogo.cloud.live.manager.ILiveStreamManager; import com.mogo.cloud.live.manager.LiveStreamManagerImpl; import com.mogo.cloud.live.server.PushService; +import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.cloud.util.Devices; @@ -21,7 +22,7 @@ public class LivePushActivity extends BaseLiveActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); // 初始化直播流管理 - ILiveStreamManager liveStreamManager = LiveStreamManagerImpl.getInstance(this, Devices.getSn()); + ILiveStreamManager liveStreamManager = LiveStreamManagerImpl.getInstance(this, MoGoAiCloudClientConfig.getInstance().getSn()); liveStreamManager.uploadCamStatus(1, 1); } diff --git a/app/src/main/java/com/mogo/cloud/MoGoApplication.java b/app/src/main/java/com/mogo/cloud/MoGoApplication.java index e8e6d06..2c4748c 100644 --- a/app/src/main/java/com/mogo/cloud/MoGoApplication.java +++ b/app/src/main/java/com/mogo/cloud/MoGoApplication.java @@ -8,6 +8,7 @@ import com.mogo.cloud.httpdns.listener.IHttpDnsCurrentLocation; import com.mogo.cloud.passport.IMoGoTokenCallback; import com.mogo.cloud.passport.MoGoAiCloudClient; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; +import com.mogo.cloud.util.Devices; import org.jetbrains.annotations.Nullable; @@ -45,7 +46,7 @@ public class MoGoApplication extends MultiDexApplication { // 设置从蘑菇AI开放平台获取的APPKey clientConfig.setThirdPartyAppKey("bydauto"); // 设置车机设备的唯一标识(这些表识必须是通过后台录入的设备) - clientConfig.setThirdPartyDeviceId("bydauto"); + clientConfig.setThirdPartyDeviceId(Devices.getSn()); // 设置循环检测间隔时间 clientConfig.setLoopCheckDelay(15 * 1000); diff --git a/app/src/main/res/layout/activity_live_play.xml b/app/src/main/res/layout/activity_live_play.xml index b3f5411..56cca6a 100644 --- a/app/src/main/res/layout/activity_live_play.xml +++ b/app/src/main/res/layout/activity_live_play.xml @@ -17,7 +17,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="请输入要查看的车机SN" - android:text="F803EB2046PZD00149" + android:text="X1020210128F803EB2046PZD00149" android:textColor="#FFFF" app:layout_constraintBottom_toTopOf="@+id/liveToggleBtn" app:layout_constraintEnd_toEndOf="parent" diff --git a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java index 81eac81..71e3b7d 100644 --- a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java +++ b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java @@ -6,8 +6,10 @@ import android.widget.Toast; import androidx.annotation.Keep; +import com.elegant.utils.DeviceIdUtil; import com.mogo.cloud.httpdns.MogoHttpDnsClient; import com.mogo.cloud.httpdns.MogoHttpDnsConfig; +import com.mogo.utils.DeviceIdUtils; import com.mogo.utils.logger.LogLevel; import com.mogo.utils.logger.Logger; import com.zhidao.thirdlogin.Environment; @@ -106,7 +108,7 @@ public class MoGoAiCloudClient { // 变量赋值 if (mAiCloudClientConfig != null) { - mAiCloudClientConfig.setSn("F803EB2046PZD00149"); + mAiCloudClientConfig.setSn(result.sn); mAiCloudClientConfig.setToken(result.token); }