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

Merge branch 'master' into dev_robouiadapter_1062_221117_1.6.2

Browse Source 
# Conflicts:
#	OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml
#	OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt
#	OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml
#	OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml
#	OCH/mogo-och-taxi/src/main/res/layout/taxi_navi_view.xml
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
#	core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml
#	core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/color.xml
#	gradle.properties
This commit is contained in:
yangyakun
2022-11-18 10:36:15 +08:00
parent 0aadcd8763 2b38bf67c0
commit 1607c60435
527 changed files with 18862 additions and 3434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
View File

@@ -31,7 +31,7 @@ public abstract class MvpActivity<V extends IView, P extends Presenter<V>> exten
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
BarUtils.transparentStatusBar(this);
BarUtils.hideStatusBarAndSticky(this.getWindow());
super.onCreate(savedInstanceState);
beforeSetContentView(savedInstanceState);
setContentView(getLayoutId());
@@ -43,7 +43,6 @@ public abstract class MvpActivity<V extends IView, P extends Presenter<V>> exten
@Override
protected void onResume() {
super.onResume();
BarUtils.setNavBarVisibility(this, false);
}
@@ -77,6 +76,12 @@ public abstract class MvpActivity<V extends IView, P extends Presenter<V>> exten
return this;
}
@Override
public void onWindowFocusChanged(boolean hasFocus) {
super.onWindowFocusChanged(hasFocus);
BarUtils.hideStatusBarAndSticky(this.getWindow());
}
@Override
public boolean dispatchTouchEvent(MotionEvent ev) {
if (ev.getAction() == MotionEvent.ACTION_DOWN && enableDispatchTouchEventToDismissSoftKeyBoard()) {
@@ -94,6 +99,12 @@ public abstract class MvpActivity<V extends IView, P extends Presenter<V>> exten
return true;
}
@Override
protected void onRestart() {
super.onRestart();
BarUtils.hideStatusBarAndSticky(this.getWindow());
}
@Override
protected void onDestroy() {
super.onDestroy();

23
foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java
View File

@@ -5,6 +5,7 @@ import android.content.Context;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.util.ToastUtils;
import com.mogo.tts.base.IMogoTTS;
import com.mogo.tts.base.IMogoTTSCallback;
import com.mogo.tts.base.PreemptType;
/**
@@ -19,6 +20,11 @@ public class AIAssist {
private static volatile AIAssist sInstance;
public static final int LEVEL0 = 3;//P0
public static final int LEVEL1 = 2;//P1
public static final int LEVEL2 = 1;//P2
public static final int LEVEL3 = 0;//P3
private IMogoTTS mTTS;
public static AIAssist getInstance(Context context) {
@@ -90,6 +96,23 @@ public class AIAssist {
}
}
public void speakTTSVoiceWithLevel(String text, int level, IMogoTTSCallback callBack) {
if (mTTS != null) {
mTTS.speakTTSVoiceWithLevel(text, level, callBack);
}
}
/**
* 等级由低到高为0、1、2、3，分别对应p3、p2、p1、p0
* @param text
* @param level
*/
public void speakTTSVoiceWithLevel(String text, int level) {
if (mTTS != null) {
mTTS.speakTTSVoiceWithLevel(text, level);
}
}
/**
* 语音播报
*