merge
This commit is contained in:
@@ -4,13 +4,13 @@ import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_NOT
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager;
|
||||
import com.mogo.eagle.core.data.notice.NoticeNormalData;
|
||||
import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData;
|
||||
import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
|
||||
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
|
||||
import com.mogo.eagle.core.network.utils.GsonUtil;
|
||||
import com.mogo.module.common.MogoApisHandler;
|
||||
import com.mogo.service.cloud.socket.IMogoOnMessageListener;
|
||||
import com.mogo.aicloud.services.socket.IMogoOnMessageListener;
|
||||
|
||||
/**
|
||||
* @author Jing
|
||||
@@ -33,16 +33,16 @@ class NoticeSocketManager {
|
||||
|
||||
public void registerSocketMessageListener(Context context) {
|
||||
mContext = context;
|
||||
MogoApisHandler.getInstance().getApis().getSocketManagerApi(context).
|
||||
MogoAiCloudSocketManager.getInstance(context).
|
||||
registerOnMessageListener(301001, mTrafficNoticeListener);
|
||||
MogoApisHandler.getInstance().getApis().getSocketManagerApi(context).
|
||||
MogoAiCloudSocketManager.getInstance(context).
|
||||
registerOnMessageListener(100, mNormalNoticeListener);
|
||||
}
|
||||
|
||||
public void unRegisterSocketMessageListener() {
|
||||
MogoApisHandler.getInstance().getApis().getSocketManagerApi(mContext).
|
||||
MogoAiCloudSocketManager.getInstance(mContext).
|
||||
unregisterOnMessageListener(301001, mTrafficNoticeListener);
|
||||
MogoApisHandler.getInstance().getApis().getSocketManagerApi(mContext).
|
||||
MogoAiCloudSocketManager.getInstance(mContext).
|
||||
unregisterOnMessageListener(100, mNormalNoticeListener);
|
||||
}
|
||||
|
||||
|
||||
@@ -171,10 +171,6 @@ class PushRepository(mContext: Context) {
|
||||
}
|
||||
}
|
||||
|
||||
fun setPushUIShow(show: Boolean) {
|
||||
statusManager.setPushUIShow(PushUIConstants.PATH, show)
|
||||
}
|
||||
|
||||
fun delete(bean: PushBean) {
|
||||
HandlerUtils.mBgHandler.post {
|
||||
pushBeanDao.delete(bean)
|
||||
|
||||
@@ -124,7 +124,6 @@ class PushViewModel(
|
||||
}
|
||||
floatView?.pushBeanChanged(field)
|
||||
registerVoiceCMD()
|
||||
pushRepository.setPushUIShow(field != null)
|
||||
}
|
||||
|
||||
fun pushMessageFinish(needSave: Boolean = false) {
|
||||
|
||||
Reference in New Issue
Block a user