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

Merge remote-tracking branch 'origin/dev_MogoAP_eagle-1030_211020_8.0.14' into dev_MogoAP_eagle-1030_211020_8.0.14

Browse Source
This commit is contained in:
donghongyu
2021-11-08 18:52:20 +08:00
parent 099fde5d46 c269f0bc83
commit 8a693b5d94
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java
View File

@@ -234,6 +234,9 @@ public class NoticeTrafficDialog extends BaseFloatDialog {
e.printStackTrace();
}
}
if (dataArrayList.size() == 0) {
requestTrafficInfo();
}
}
private void liveCallBack() {
@@ -266,6 +269,9 @@ public class NoticeTrafficDialog extends BaseFloatDialog {
@Override
public void onPrepared(String url, Object... objects) {
Log.d(TAG, "onPrepared");
thumbnailImage.setVisibility(View.GONE);
playImageView.setVisibility(View.GONE);
connect.setVisibility(View.GONE);
}
@Override
@@ -332,6 +338,7 @@ public class NoticeTrafficDialog extends BaseFloatDialog {
@Override
public void onClickStartThumb(String url, Object... objects) {
Log.d(TAG, "onClickStartThumb");
}
@Override
@@ -422,7 +429,7 @@ public class NoticeTrafficDialog extends BaseFloatDialog {
/**
* 判断网络状态
*/
private void netWorkStatus(){
private void netWorkStatus() {
if (NetworkUtils.isAvailable(getContext())) {
Log.d(TAG, "网络可用");
thumbnailImage.setVisibility(View.GONE);
@@ -432,6 +439,7 @@ public class NoticeTrafficDialog extends BaseFloatDialog {
connect.setVisibility(View.VISIBLE);
}
}
public void cancel() {
}

13
core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/network/NoticeNetWorkManager.java
View File

@@ -1,5 +1,7 @@
package com.mogo.eagle.core.function.notice.network;
import android.util.Log;
import com.mogo.cloud.network.NetConstants;
import com.mogo.cloud.network.RetrofitFactory;
import com.mogo.cloud.passport.MoGoAiCloudClient;
@@ -25,12 +27,12 @@ import io.reactivex.schedulers.Schedulers;
* @since: 10/28/21
*/
public class NoticeNetWorkManager {
private String TAG = "NoticeNetWorkManager";
private String TAG = "AINotice";
private static volatile NoticeNetWorkManager requestNoticeManager;
private final NoticeApiService mNoticeApiService;
private NoticeNetWorkManager() {
mNoticeApiService = RetrofitFactory.INSTANCE.getInstance(NetConstants.DEVA_HOST) //todo 涉及云公告
mNoticeApiService = RetrofitFactory.INSTANCE.getInstance(NetConstants.DEVA_HOST)
.create(NoticeApiService.class);
}
@@ -53,7 +55,6 @@ public class NoticeNetWorkManager {
* @param callBack 回调
*/
public void requestAccidentInfo(String infoId, String sn, NoticeNetCallBack callBack) {
String snString = MoGoAiCloudClient.getInstance().getAiCloudClientConfig().getSn();
Map<String, String> map = new HashMap<>();
map.put("sn", sn);
map.put("infoId", infoId);
@@ -63,7 +64,7 @@ public class NoticeNetWorkManager {
.subscribe(new Observer<NoticeTrafficStyleInfo>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
Log.d(TAG, "onSubscribe");
}
@Override
@@ -75,12 +76,12 @@ public class NoticeNetWorkManager {
@Override
public void onError(@NonNull Throwable e) {
Log.d(TAG, "requestAccidentInfo--error"+e.toString());
}
@Override
public void onComplete() {
Log.d(TAG, "onComplete");
}
});
}