= ssdStateProcessor.toFlowable()
override fun inSetup() {
- bindDataProcessor(KeyTools.createKey(CameraKey.KeyIsInternalSSDSupported, cameraIndex), ssdSupportedProcessor)
- bindDataProcessor(KeyTools.createKey(CameraKey.KeySSDRemainingSpaceInMB, cameraIndex), ssdRemainingCapacityProcessor)
- bindDataProcessor(KeyTools.createKey(CameraKey.KeySSDOperationState, cameraIndex), ssdOperationStateProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ CameraKey.KeyIsInternalSSDSupported, cameraIndex), ssdSupportedProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ CameraKey.KeySSDRemainingSpaceInMB, cameraIndex), ssdRemainingCapacityProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ CameraKey.KeySSDOperationState, cameraIndex), ssdOperationStateProcessor)
}
override fun updateStates() {
@@ -89,7 +95,9 @@ class SSDStatusListItemWidgetModel(
* Format SSD
*/
fun formatSSD(): Completable {
- return djiSdkModel.performActionWithOutResult(KeyTools.createKey(CameraKey.KeyFormatStorage, cameraIndex))
+ return djiSdkModel.performActionWithOutResult(
+ KeyTools.createKey(
+ CameraKey.KeyFormatStorage, cameraIndex))
}
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/panel/listitem/travelmode/TravelModeListItemWidget.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/panel/listitem/travelmode/TravelModeListItemWidget.kt
index b035157d..2fc4d340 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/panel/listitem/travelmode/TravelModeListItemWidget.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/panel/listitem/travelmode/TravelModeListItemWidget.kt
@@ -186,6 +186,9 @@ open class TravelModeListItemWidget @JvmOverloads constructor(
TravelModeState.Active -> {
exitTravelMode()
}
+ else -> {
+ //do something
+ }
}
}, { }))
}
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/panel/systemstatus/SmartListInternalModel.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/panel/systemstatus/SmartListInternalModel.kt
index c77d8855..f6b81409 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/panel/systemstatus/SmartListInternalModel.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/panel/systemstatus/SmartListInternalModel.kt
@@ -54,7 +54,9 @@ class SmartListInternalModel(
//region Lifecycle
override fun inSetup() {
- bindDataProcessor(KeyTools.createKey(ProductKey.KeyProductType), modelProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ ProductKey.KeyProductType), modelProcessor)
}
override fun inCleanup() {
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/panel/topbar/TopBarPanelWidget.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/panel/topbar/TopBarPanelWidget.kt
index e7d5ba24..7fd43512 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/panel/topbar/TopBarPanelWidget.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/panel/topbar/TopBarPanelWidget.kt
@@ -141,7 +141,7 @@ open class TopBarPanelWidget @JvmOverloads constructor(
/**
* Getter for [SettingWidget]. Null when excluded from the bar panel.
*/
-// val settingWidget: SettingWidget?
+ val settingWidget: SettingWidget?
/**
* Getter for [ConnectionWidget]. Null when excluded from the bar panel.
@@ -225,12 +225,12 @@ open class TopBarPanelWidget @JvmOverloads constructor(
batteryWidget = null
}
-// if (!WidgetValue.SETTING.isItemExcluded(excludedItemsValue)) {
-// settingWidget = SettingWidget(context, attrs)
-// rightPanelItems.add(PanelItem(settingWidget))
-// } else {
-// settingWidget = null
-// }
+ if (!WidgetValue.SETTING.isItemExcluded(excludedItemsValue)) {
+ settingWidget = SettingWidget(context, attrs)
+ rightPanelItems.add(PanelItem(settingWidget))
+ } else {
+ settingWidget = null
+ }
addRightWidgets(rightPanelItems.toTypedArray())
}
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/hsi/HSIWidgetModel.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/hsi/HSIWidgetModel.java
index 4fd07c1c..976541b6 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/hsi/HSIWidgetModel.java
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/hsi/HSIWidgetModel.java
@@ -28,8 +28,6 @@
import dji.v5.manager.aircraft.perception.listener.PerceptionInformationListener;
import dji.v5.manager.aircraft.perception.radar.RadarInformation;
import dji.v5.manager.aircraft.perception.radar.RadarInformationListener;
-import dji.v5.manager.interfaces.IPerceptionManager;
-import dji.v5.manager.interfaces.IRadarManager;
import dji.v5.ux.core.base.DJISDKModel;
import dji.v5.ux.core.base.WidgetModel;
import dji.v5.ux.core.communication.ObservableInMemoryKeyedStore;
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/hsi/config/IOmniAbility.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/hsi/config/IOmniAbility.kt
index e40c0497..faec6b22 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/hsi/config/IOmniAbility.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/hsi/config/IOmniAbility.kt
@@ -48,7 +48,9 @@ interface IOmniAbility {
* 当前未考虑遥控器连接不同飞机，未观察连接飞机的变化，当出现遥控支持不同飞机时，需要观察飞机状态变化。
*/
fun getCurrent(): IOmniAbility {
- val type = KeyManager.getInstance().getValue(KeyTools.createKey(ProductKey.KeyProductType), ProductType.UNKNOWN)
+ val type = KeyManager.getInstance().getValue(
+ KeyTools.createKey(
+ ProductKey.KeyProductType), ProductType.UNKNOWN)
return when {
DpadProductManager.getInstance().isSmartController || type == ProductType.M300_RTK || type == ProductType.M350_RTK -> M300OmniAbility
DpadProductManager.getInstance().isDjiRcPlus || type == ProductType.M30_SERIES -> M30OmniAbility
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/hsi/dashboard/AttitudeDashBoard.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/hsi/dashboard/AttitudeDashBoard.java
index 3a8dee2a..fe6a9b43 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/hsi/dashboard/AttitudeDashBoard.java
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/hsi/dashboard/AttitudeDashBoard.java
@@ -893,15 +893,12 @@ private int drawSettingPerceptionIndicator(Canvas canvas, int orientation, int r
private int drawBarrierIndicator(Canvas canvas, int orientation, int restArea, float ratio, float[] canvasOffsetY) {
float barrierDistance = orientation == UPWARD ? getUpwardBarrierDistance() : getDownVisionDistance();
float barrierAvoidanceDistance = orientation == UPWARD ? mUserSetUpBarrierAvoidanceDistance : mUserSetDownBarrierAvoidanceDistance;
- Log.d(TAG, "orientation=" + orientation + ",barrierDistance=" + barrierDistance + ",barrierAvoidanceDistance=" + barrierAvoidanceDistance);
float barrierValue = mBarrierDistanceStrategy.getBarrierValue(barrierDistance);
float barrierAvoidanceValue = mBarrierDistanceStrategy.getBarrierValue(barrierAvoidanceDistance);
float upBarrierArea = (Math.min(barrierValue, barrierAvoidanceValue)) * ratio;
- Log.d(TAG, "barrierValue=" + barrierValue + ",barrierAvoidanceValue=" + barrierAvoidanceValue + ",upBarrierArea=" + upBarrierArea + ",ratio" +
- "=" + ratio);
if (upBarrierArea > 0) {
mPaint.setColor(mBarrierIndicatorColor);
@@ -920,7 +917,6 @@ private int drawBarrierIndicator(Canvas canvas, int orientation, int restArea, f
top = 0;
bottom = (int) upBarrierArea;
}
- Log.d(TAG, "top=" + top + ",bottom=" + bottom);
RECT.set(-mAvoidanceIndicatorWidth, top, 0, bottom);
canvas.drawRect(RECT, mPaint);
@@ -1019,8 +1015,6 @@ interface IBarrierDistanceStrategy {
private static class HsiBarrierDistanceStrategy implements IBarrierDistanceStrategy {
@Override
public float getBarrierValue(float distance) {
- Log.d(TAG, "HsiBarrierDistanceStrategy getBarrierValue=" + distance);
-
if (distance <= 0) {
return 0;
} else if (distance <= 2) {
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/hsi/dashboard/ScrollableAttributeDashBoard.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/hsi/dashboard/ScrollableAttributeDashBoard.java
index c5477adb..9e3c96d3 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/hsi/dashboard/ScrollableAttributeDashBoard.java
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/hsi/dashboard/ScrollableAttributeDashBoard.java
@@ -24,7 +24,6 @@
import dji.v5.utils.common.DJIExecutor;
-import dji.v5.utils.common.LogUtils;
import dji.v5.ux.R;
import dji.v5.utils.common.AndUtil;
import dji.v5.ux.core.util.FontUtils;
@@ -517,7 +516,6 @@ protected void onDraw(Canvas canvas) {
super.onDraw(canvas);
drawCurrentValue(canvas);
clipPointerArea(canvas);
- LogUtils.d(TAG,"mShowFramework="+mShowFramework);
if (mShowFramework) {
drawCalibration(canvas);
drawCalibrationFramework(canvas);
@@ -538,7 +536,6 @@ protected boolean isShowFramework() {
* @see #drawCurrentBackground(Canvas, int, int)
*/
private void clipPointerArea(Canvas canvas) {
- LogUtils.d(TAG,"mPointerHeight="+mPointerHeight);
int currentAreaOffsetX = mFrameworkPaddingStart + mPointerLineInnerWidth + mTextPadding;
boolean alginLeft = isAlginLeft();
if (!alginLeft) {
@@ -749,7 +746,6 @@ private void drawCurrentValue(Canvas canvas) {
drawCurrentValueLine(canvas, mPointerHeight, alginLeft);
drawCurrentBackground(canvas, currentWidth, mPointerHeight);
}
- LogUtils.d(TAG,"mShowBorder="+mShowBorder);
drawCurrentText(canvas, currentValueString, alginLeft);
drawCurrentName(canvas, mAttributeName, alginLeft);
drawCurrentUnit(canvas, displayValue.mDisplayUnit, alginLeft);
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/hsi/fpv/IFPVParams.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/hsi/fpv/IFPVParams.kt
index 4744bced..fe3264bf 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/hsi/fpv/IFPVParams.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/hsi/fpv/IFPVParams.kt
@@ -38,7 +38,9 @@ interface IFPVParams {
* 当前未考虑遥控器连接不同飞机，未观察连接飞机的变化，当出现遥控支持不同飞机时，需要观察飞机状态变化。
*/
fun getCurrent(): IFPVParams {
- val type = KeyManager.getInstance().getValue(KeyTools.createKey(ProductKey.KeyProductType), ProductType.UNKNOWN)
+ val type = KeyManager.getInstance().getValue(
+ KeyTools.createKey(
+ ProductKey.KeyProductType), ProductType.UNKNOWN)
if (type == ProductType.M300_RTK || type == ProductType.M350_RTK) {
return M300FpvParams
} else if (type == ProductType.M30_SERIES) {
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/SettingFragmentPagerAdapter.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/SettingFragmentPagerAdapter.java
index 3fab58c8..ecc040d4 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/SettingFragmentPagerAdapter.java
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/SettingFragmentPagerAdapter.java
@@ -13,12 +13,14 @@
import dji.v5.utils.common.AndUtil;
import dji.v5.utils.common.ContextUtil;
+import dji.v5.utils.common.LogUtils;
import dji.v5.ux.R;
import dji.v5.ux.core.ui.setting.data.MenuBean;
import dji.v5.ux.core.ui.setting.taplayout.QTabView;
import dji.v5.ux.core.ui.setting.taplayout.TabAdapter;
import dji.v5.ux.core.ui.setting.ui.MenuFragmentFactory;
import dji.v5.ux.core.ui.setting.ui.SettingMenuFragment;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
/**
* Description :
@@ -93,12 +95,10 @@ public void removeSearchlightPayloadPanel() {
}
public void removeRTKPanel() {
-
removeMenuPanel(MenuFragmentFactory.FRAGMENT_TAG_RTK, R.drawable.uxsdk_ic_setting_rtk);
}
public void addRTKPanel() {
-
addMenuPanel(MenuFragmentFactory.FRAGMENT_TAG_GIMBAL, MenuFragmentFactory.FRAGMENT_TAG_RTK, R.drawable.uxsdk_ic_setting_rtk_active,
R.drawable.uxsdk_ic_setting_rtk);
}
@@ -125,7 +125,7 @@ public void removeMenuPanel(String page, int normalIcon) {
MenuBean menu = mAdapterMenus.get(payloadIndex);
if (menu.getNormalIcon() == normalIcon) {
mAdapterMenus.remove(payloadIndex);
- mAdapterFragments.remove(payloadIndex);
+ mAdapterFragments.remove(payloadIndex);
notifyDataSetChanged();
}
}
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/BatteryInfoDetailFragment.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/BatteryInfoDetailFragment.java
new file mode 100644
index 00000000..9c568d67
--- /dev/null
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/BatteryInfoDetailFragment.java
@@ -0,0 +1,44 @@
+package dji.v5.ux.core.ui.setting.fragment;
+
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import dji.v5.utils.common.ContextUtil;
+import dji.v5.utils.common.StringUtils;
+import dji.v5.ux.R;
+import dji.v5.ux.core.ui.setting.ui.MenuFragment;
+import dji.v5.ux.core.widget.battery.BatteryGroupInfoWidget;
+import dji.v5.ux.core.widget.battery.BatteryGroupWidget;
+
+/**
+ * Description :
+ *
+ * @author: Byte.Cai
+ * date : 2023/9/21
+ *
+ * Copyright (c) 2022, DJI All Rights Reserved.
+ */
+public class BatteryInfoDetailFragment extends MenuFragment {
+ @Override
+ protected int getLayoutId() {
+ return R.layout.uxsdk_fragment_battery_info_detail;
+ }
+
+ @Override
+ protected String getPreferencesTitle() {
+ return StringUtils.getResStr(ContextUtil.getContext(), R.string.uxsdk_setting_menu_title_battery);
+
+ }
+
+ @Override
+ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+ BatteryGroupWidget batteryGroupWidget = (BatteryGroupWidget)view.findViewById(R.id.setting_menu_battery);
+ batteryGroupWidget.setEnableBatteryCells(true);
+ batteryGroupWidget.setEnableSerialNumber(true);
+
+ }
+}
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/BatteryMenuFragment.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/BatteryMenuFragment.java
index 97ac9955..35d77695 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/BatteryMenuFragment.java
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/BatteryMenuFragment.java
@@ -1,9 +1,17 @@
package dji.v5.ux.core.ui.setting.fragment;
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
import dji.v5.utils.common.ContextUtil;
import dji.v5.utils.common.StringUtils;
import dji.v5.ux.R;
import dji.v5.ux.core.ui.setting.ui.MenuFragment;
+import dji.v5.ux.core.widget.battery.BatteryGroupInfoWidget;
+import dji.v5.ux.core.widget.battery.BatterySettingWidget;
/**
* Description :
@@ -22,6 +30,16 @@ protected String getPreferencesTitle() {
@Override
protected int getLayoutId() {
- return R.layout.uxsdk_fragment_not_yet_implement;
+ return R.layout.uxsdk_fragment_setting_menu_battery_layout;
+ }
+
+ @Override
+ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+ BatterySettingWidget batterySettingWidget = (BatterySettingWidget) view.findViewById(R.id.battery_setting_widget);
+ batterySettingWidget.getBatteryGroupInfoWidget().setOnDetailOnClickListener(v -> {
+ BatteryInfoDetailFragment fragment = new BatteryInfoDetailFragment();
+ addFragment(getFragmentManager(), fragment, true);
+ });
}
}
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/ChannelSelectFragment.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/ChannelSelectFragment.java
new file mode 100644
index 00000000..9902f53f
--- /dev/null
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/ChannelSelectFragment.java
@@ -0,0 +1,37 @@
+package dji.v5.ux.core.ui.setting.fragment;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import dji.v5.utils.common.AndUtil;
+import dji.v5.ux.R;
+import dji.v5.ux.core.ui.setting.ui.MenuFragment;
+
+
+public class ChannelSelectFragment extends MenuFragment {
+
+ @Override
+ protected int getLayoutId() {
+ return R.layout.uxsdk_setting_menu_hd_channel_select;
+ }
+
+ @Override
+ protected String getPreferencesTitle() {
+ return AndUtil.getResString(R.string.uxsdk_setting_ui_hd_sdr_channel_select);
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+ super.onCreateView(inflater, container, savedInstanceState);
+ return mFragmentRoot;
+ }
+
+ @Override
+ public void onSaveInstanceState(Bundle outState) {
+ super.onSaveInstanceState(outState);
+ }
+
+
+}
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/CommonAboutFragment.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/CommonAboutFragment.java
new file mode 100644
index 00000000..dfb5bf43
--- /dev/null
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/CommonAboutFragment.java
@@ -0,0 +1,41 @@
+package dji.v5.ux.core.ui.setting.fragment;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import dji.v5.utils.common.AndUtil;
+import dji.v5.ux.R;
+import dji.v5.ux.core.base.CompassStatusWidget;
+import dji.v5.ux.core.base.ImuStatusWidget;
+import dji.v5.ux.core.base.TabGroupWidget;
+import dji.v5.ux.core.ui.setting.ui.MenuFragment;
+
+
+
+
+public class CommonAboutFragment extends MenuFragment {
+
+ @Override
+ protected int getLayoutId() {
+ return R.layout.uxsdk_setting_menu_common_about;
+ }
+
+ @Override
+ protected String getPreferencesTitle() {
+ return AndUtil.getResString(R.string.uxsdk_setting_menu_title_about);
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+ super.onCreateView(inflater, container, savedInstanceState);
+ return mFragmentRoot;
+ }
+
+ @Override
+ public void onSaveInstanceState(Bundle outState) {
+ super.onSaveInstanceState(outState);
+ }
+
+}
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/CommonMenuFragment.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/CommonMenuFragment.java
index 2635bfd1..1b7d2280 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/CommonMenuFragment.java
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/CommonMenuFragment.java
@@ -1,10 +1,15 @@
package dji.v5.ux.core.ui.setting.fragment;
-import android.view.Menu;
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import dji.v5.utils.common.ContextUtil;
import dji.v5.utils.common.StringUtils;
import dji.v5.ux.R;
+import dji.v5.ux.core.base.TextCell;
import dji.v5.ux.core.ui.setting.ui.MenuFragment;
/**
@@ -23,6 +28,29 @@ protected String getPreferencesTitle() {
@Override
protected int getLayoutId() {
- return R.layout.uxsdk_fragment_not_yet_implement;
+ return R.layout.uxsdk_setting_menu_common_layout;
+ }
+
+
+ @Override
+ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+
+ view.findViewById(R.id.setting_common_about).setOnClickListener(view1 -> {
+ CommonAboutFragment fragment = new CommonAboutFragment();
+ addFragment(getFragmentManager(), fragment, true);
+ });
+
+
+ view.findViewById(R.id.setting_device_name).setOnClickListener(view12 -> {
+ DeviceNameFragment fragment = new DeviceNameFragment();
+ addFragment(getFragmentManager(), fragment, true);
+ });
+ view.findViewById(R.id.setting_led).setOnClickListener(view13 -> {
+ LedMenuFragment fragment = new LedMenuFragment();
+ addFragment(getFragmentManager(), fragment, true);
+ });
+
+
}
}
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/DeviceNameFragment.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/DeviceNameFragment.java
new file mode 100644
index 00000000..38f1427b
--- /dev/null
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/DeviceNameFragment.java
@@ -0,0 +1,45 @@
+package dji.v5.ux.core.ui.setting.fragment;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import dji.v5.utils.common.AndUtil;
+import dji.v5.ux.R;
+import dji.v5.ux.core.base.CompassStatusWidget;
+import dji.v5.ux.core.base.ImuStatusWidget;
+import dji.v5.ux.core.base.TabGroupWidget;
+import dji.v5.ux.core.ui.setting.ui.MenuFragment;
+
+
+public class DeviceNameFragment extends MenuFragment {
+
+
+ @Override
+ protected int getLayoutId() {
+ return R.layout.uxsdk_setting_menu_common_devicename;
+ }
+
+ @Override
+ protected String getPreferencesTitle() {
+ return AndUtil.getResString(R.string.uxsdk_setting_menu_title_device_name);
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+ super.onCreateView(inflater, container, savedInstanceState);
+
+
+
+ return mFragmentRoot;
+ }
+
+ @Override
+ public void onSaveInstanceState(Bundle outState) {
+
+ super.onSaveInstanceState(outState);
+ }
+
+
+}
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/FlycMenuFragment.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/FlycMenuFragment.java
index 46057737..008d9c1b 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/FlycMenuFragment.java
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/FlycMenuFragment.java
@@ -1,8 +1,15 @@
package dji.v5.ux.core.ui.setting.fragment;
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
import dji.v5.utils.common.ContextUtil;
import dji.v5.utils.common.StringUtils;
import dji.v5.ux.R;
+import dji.v5.ux.core.base.TextCell;
import dji.v5.ux.core.ui.setting.ui.MenuFragment;
/**
@@ -21,6 +28,17 @@ protected String getPreferencesTitle() {
@Override
protected int getLayoutId() {
- return R.layout.uxsdk_fragment_not_yet_implement;
+ return R.layout.uxsdk_setting_menu_aircraft_layout;
+ }
+
+ @Override
+ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+ TextCell textCell = view.findViewById(R.id.setting_flyc_sensors_state);
+ textCell.setOnClickListener(view1 -> {
+ SensorsMenuFragment fragment = new SensorsMenuFragment();
+ addFragment(getFragmentManager(), fragment, true);
+ });
+
}
}
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/GimbalMenuFragment.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/GimbalMenuFragment.java
index b49b5280..521500d5 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/GimbalMenuFragment.java
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/GimbalMenuFragment.java
@@ -21,6 +21,6 @@ protected String getPreferencesTitle() {
@Override
protected int getLayoutId() {
- return R.layout.uxsdk_fragment_not_yet_implement;
+ return R.layout.uxsdk_setting_menu_gimbal_layout;
}
}
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/HDMenuFragment.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/HDMenuFragment.java
index 378f9780..a6d88895 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/HDMenuFragment.java
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/HDMenuFragment.java
@@ -1,5 +1,11 @@
package dji.v5.ux.core.ui.setting.fragment;
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
import dji.v5.utils.common.ContextUtil;
import dji.v5.utils.common.StringUtils;
import dji.v5.ux.R;
@@ -22,6 +28,16 @@ protected String getPreferencesTitle() {
@Override
protected int getLayoutId() {
- return R.layout.uxsdk_fragment_not_yet_implement;
+ return R.layout.uxsdk_setting_menu_hd_layout;
+ }
+
+ @Override
+ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+
+ view.findViewById(R.id.tc_setting_menu_sdr_info_text).setOnClickListener(view1 -> {
+ ChannelSelectFragment fragment = new ChannelSelectFragment();
+ addFragment(getFragmentManager(), fragment, true);
+ });
}
}
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/LEDSettingFragment.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/LEDSettingFragment.java
new file mode 100644
index 00000000..f7463526
--- /dev/null
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/LEDSettingFragment.java
@@ -0,0 +1,36 @@
+package dji.v5.ux.core.ui.setting.fragment;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import dji.v5.utils.common.AndUtil;
+import dji.v5.ux.R;
+import dji.v5.ux.core.ui.setting.ui.MenuFragment;
+
+
+public class LEDSettingFragment extends MenuFragment {
+
+ @Override
+ protected int getLayoutId() {
+ return R.layout.uxsdk_setting_menu_common_devicename;
+ }
+
+ @Override
+ protected String getPreferencesTitle() {
+ return AndUtil.getResString(R.string.uxsdk_setting_menu_title_device_name);
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+ super.onCreateView(inflater, container, savedInstanceState);
+ return mFragmentRoot;
+ }
+
+ @Override
+ public void onSaveInstanceState(Bundle outState) {
+ super.onSaveInstanceState(outState);
+ }
+
+}
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/LedMenuFragment.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/LedMenuFragment.java
new file mode 100644
index 00000000..3e8780eb
--- /dev/null
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/LedMenuFragment.java
@@ -0,0 +1,332 @@
+package dji.v5.ux.core.ui.setting.fragment;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+
+import dji.sdk.keyvalue.key.FlightAssistantKey;
+import dji.sdk.keyvalue.key.FlightControllerKey;
+import dji.sdk.keyvalue.key.KeyTools;
+import dji.sdk.keyvalue.key.ProductKey;
+import dji.sdk.keyvalue.value.flightassistant.AuxiliaryLightMode;
+import dji.sdk.keyvalue.value.flightcontroller.LEDsSettings;
+import dji.sdk.keyvalue.value.product.ProductType;
+import dji.v5.common.callback.CommonCallbacks;
+import dji.v5.common.error.IDJIError;
+import dji.v5.manager.KeyManager;
+import dji.v5.utils.common.LogUtils;
+import dji.v5.utils.common.StringUtils;
+import dji.v5.ux.R;
+import dji.v5.ux.core.base.SwitcherCell;
+import dji.v5.ux.core.base.TabSelectCell;
+import dji.v5.ux.core.ui.setting.ui.MenuFragment;
+import dji.v5.ux.core.util.ViewUtil;
+
+
+
+/**
+ * Created by Lahm.Long on 2019/12/23
+ * desc :
+ */
+public class LedMenuFragment extends MenuFragment
+ implements
+ SwitcherCell.OnCheckedChangedListener,
+ TabSelectCell.OnTabChangeListener {
+// @Inject
+// LedMenuContract.Presenter mPresenter;
+
+ private SwitcherCell mLEDBeaconCell;//夜航灯
+ private SwitcherCell mLEDArmCell;//机臂灯
+ private SwitcherCell mLEDStatusCell;//状态灯
+ private SwitcherCell m430LEDsHideModeCell;//隐藏模式
+ private LinearLayout m430LedSettingLayout;
+ private SwitcherCell m430BeaconLedCell;//430夜航灯开关
+
+ private TabSelectCell m430TopAuxiliaryTabSelectCell;//430上补光灯
+ private TabSelectCell m430BottomAuxiliaryTabSelectCell;//430下补光灯
+
+ private void initView(View view) {
+ mLEDBeaconCell = view.findViewById(R.id.setting_menu_common_led_beacon);
+ mLEDArmCell = view.findViewById(R.id.setting_menu_common_led_arm);
+ mLEDStatusCell = view.findViewById(R.id.setting_menu_common_led_status);
+ m430LEDsHideModeCell = view.findViewById(R.id.setting_menu_common_leds_hide_mode);
+ m430LedSettingLayout = view.findViewById(R.id.setting_menu_common_led);
+ m430BeaconLedCell = view.findViewById(R.id.setting_menu_common_beacon_led);
+ m430TopAuxiliaryTabSelectCell =view.findViewById(R.id.setting_menu_common_top_auxiliary_light);
+ m430BottomAuxiliaryTabSelectCell = view.findViewById(R.id.setting_menu_common_bottom_auxiliary_light);
+ }
+
+ @Override
+ protected String getPreferencesTitle() {
+ return StringUtils.getResStr(R.string.uxsdk_setting_menu_title_led);
+ }
+
+ @Override
+ protected int getLayoutId() {
+ return R.layout.uxsdk_setting_menu_led_layout;
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+// DaggerLedMenuComponent.builder()
+// .appComponent(((AppActivity) getActivity()).getAppComponent())
+// .ledMenuModule(new LedMenuModule(this))
+// .build()
+// .inject(this);
+ super.onCreate(savedInstanceState);
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+ super.onCreateView(inflater, container, savedInstanceState);
+
+ return mFragmentRoot;
+ }
+
+
+ @Override
+ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+ initView(view);
+ init430LEDsHideModeView();
+ initKey();
+ }
+
+ private void initKey() {
+ KeyManager.getInstance().getValue(KeyTools.createKey(FlightControllerKey.KeyHasInternalBeaconLeds), new CommonCallbacks.CompletionCallbackWithParam() {
+ @Override
+ public void onSuccess(Boolean aBoolean) {
+ if (aBoolean) {
+ updateViewsByState();
+ }
+ }
+ @Override
+ public void onFailure(@NonNull IDJIError error) {
+ //add log
+ }
+ });
+
+ KeyManager.getInstance().listen(KeyTools.createKey(FlightAssistantKey.KeyBottomAuxiliaryLightMode), this, (oldValue, mode) -> {
+ if (mode != null) {
+ setCellTab(m430BottomAuxiliaryTabSelectCell, mode.value());
+ }
+ });
+
+
+ KeyManager.getInstance().getValue(KeyTools.createKey(ProductKey.KeyProductType), new CommonCallbacks.CompletionCallbackWithParam() {
+ @Override
+ public void onSuccess(ProductType productType) {
+
+ if (productType == ProductType.M30_SERIES || productType == ProductType.DJI_MAVIC_3_ENTERPRISE_SERIES) {
+ m430TopAuxiliaryTabSelectCell.setVisibility(View.GONE);
+ m430BeaconLedCell.setVisibility(View.VISIBLE);
+ }else{
+ updateTopAuxiliaryTabSelectCell();
+
+ }
+ }
+ @Override
+ public void onFailure(@NonNull IDJIError error) {
+ //add log
+ }
+ });
+
+
+ }
+
+ private void updateTopAuxiliaryTabSelectCell() {
+ KeyManager.getInstance().listen(KeyTools.createKey(FlightAssistantKey.KeyTopAuxiliaryLightMode), this, (oldValue, mode) -> {
+ if(mode != null) {
+ setCellTab(m430TopAuxiliaryTabSelectCell, mode.value());
+ }
+ });
+ }
+
+ private void updateViewsByState() {
+ KeyManager.getInstance().listen(KeyTools.createKey(FlightControllerKey.KeyLEDsSettings), this, (oldValue, leDsSettings) -> {
+ if (leDsSettings != null) {
+ setCellCheck(m430BeaconLedCell, leDsSettings.getNavigationLEDsOn());
+ setCellCheck(mLEDStatusCell, leDsSettings.getStatusIndicatorLEDsOn());
+ setCellCheck(mLEDArmCell, leDsSettings.getFrontLEDsOn());
+ }
+ });
+
+ }
+
+ @Override
+ public void onDestroyView() {
+ super.onDestroyView();
+ KeyManager.getInstance().cancelListen(this);
+ }
+
+ @Override
+ public void onDestroy() {
+ super.onDestroy();
+ }
+
+ //可设置隐藏模式及夜航灯，上下补光灯
+ private void init430LEDsHideModeView() {
+ mLEDBeaconCell.setVisibility(View.GONE);
+ mLEDArmCell.setVisibility(View.GONE);
+ mLEDStatusCell.setVisibility(View.GONE);
+ m430LEDsHideModeCell.setVisibility(View.GONE);
+ m430LEDsHideModeCell.setOnCheckedChangedListener(this);
+ m430BeaconLedCell.setOnCheckedChangedListener(this);
+ m430TopAuxiliaryTabSelectCell.setOnTabChangeListener(this);
+ m430BottomAuxiliaryTabSelectCell.setOnTabChangeListener(this);
+// mCompositeDisposable.add(LEDDiscreetModeLiveData.getInstance().observable(getLifecycle()).subscribe(isHideMode -> {
+// if (m430LEDsHideModeCell != null && m430LEDsHideModeCell.isChecked() != isHideMode) {
+// setCellCheck(m430LEDsHideModeCell, isHideMode);
+// }
+//
+// m430LedSettingLayout.setVisibility(isHideMode ? View.GONE : View.VISIBLE);
+// }));
+ m430LedSettingLayout.setVisibility( View.VISIBLE);
+ }
+
+ @Override
+ public void onCheckedChanged(SwitcherCell cell, boolean isChecked) {
+ int id = cell.getId();//夜航灯
+ if (id == R.id.setting_menu_common_leds_hide_mode) {//隐藏模式按钮
+ if (isChecked) {
+ openLEDsHide(true);
+ } else {
+ openLEDsHide(false);
+ }
+ } else if (id == R.id.setting_menu_common_beacon_led || id == R.id.setting_menu_common_led_beacon) {//非430夜航灯
+
+ LEDsSettings leDsSettings = createLedsBuilder();
+ leDsSettings.setNavigationLEDsOn(isChecked);
+ KeyManager.getInstance().setValue(KeyTools.createKey(FlightControllerKey.KeyLEDsSettings), leDsSettings, new CommonCallbacks.CompletionCallback() {
+ @Override
+ public void onSuccess() {
+ //add tips
+ }
+ @Override
+ public void onFailure(@NonNull IDJIError error) {
+ //add log
+ }
+ });
+ } else if (id == R.id.setting_menu_common_led_arm) {//机臂灯
+
+ LEDsSettings leDsSettings = createLedsBuilder();
+ leDsSettings.setFrontLEDsOn(isChecked);
+ leDsSettings.setRearLEDsOn(isChecked);
+ leDsSettings.setStatusIndicatorLEDsOn(isChecked);
+ KeyManager.getInstance().setValue(KeyTools.createKey(FlightControllerKey.KeyLEDsSettings), leDsSettings, new CommonCallbacks.CompletionCallback() {
+ @Override
+ public void onSuccess() {
+ if (!isChecked) {
+ ViewUtil.showToast(getContext(), R.string.uxsdk_app_operator_fail, Toast.LENGTH_SHORT);
+ }
+ }
+
+ @Override
+ public void onFailure(@NonNull IDJIError error) {
+ //add log
+ }
+ });
+ } else if (id == R.id.setting_menu_common_led_status) {//状态灯
+ LEDsSettings leDsSettings = createLedsBuilder();
+ leDsSettings.setStatusIndicatorLEDsOn(isChecked);
+ KeyManager.getInstance().setValue(KeyTools.createKey(FlightControllerKey.KeyLEDsSettings), leDsSettings, new CommonCallbacks.CompletionCallback() {
+ @Override
+ public void onSuccess() {
+ if (!isChecked) {
+ ViewUtil.showToast(getContext(), R.string.uxsdk_app_operator_fail, Toast.LENGTH_SHORT);
+ }
+ }
+
+ @Override
+ public void onFailure(@NonNull IDJIError error) {
+ //add log
+ }
+ });
+ }
+ }
+
+ private LEDsSettings createLedsBuilder() {
+ //先获取现阶段的值
+ LEDsSettings defaultSettings = new LEDsSettings();
+ LEDsSettings leDsSettings = KeyManager.getInstance().getValue(KeyTools.createKey(FlightControllerKey.KeyLEDsSettings) ,defaultSettings);
+ return new LEDsSettings(leDsSettings.getFrontLEDsOn(),leDsSettings.getStatusIndicatorLEDsOn(),leDsSettings.getRearLEDsOn(),leDsSettings.getNavigationLEDsOn());
+
+ }
+
+ private void openLEDsHide(boolean isHide) {
+ LogUtils.i(TAG , "leds hide mode " + isHide);
+// mCompositeDisposable.add(LEDDiscreetModeLiveData.getInstance().discreetMode(isHide)
+// .subscribe(aBoolean -> {
+// if (!aBoolean) {
+// ViewUtil.showToast(getContext() ,(R.string.uxsdk_app_operator_fail,Toast.LENGTH_SHORT);
+// } else {
+// m430LedSettingLayout.setVisibility(isHide ? View.GONE : View.VISIBLE);
+// m430BeaconLedCell.setChecked(false);
+// }
+// }));
+
+ }
+
+
+ @Override
+ public void onTabChanged(TabSelectCell cell, int oldIndex, int newIndex) {
+ if (oldIndex == newIndex) {
+ return;
+ }
+ int id = cell.getId();
+ if (id == R.id.setting_menu_common_top_auxiliary_light) {
+
+ KeyManager.getInstance().setValue(KeyTools.createKey(FlightAssistantKey.KeyTopAuxiliaryLightMode), AuxiliaryLightMode.find(newIndex), new CommonCallbacks.CompletionCallback() {
+ @Override
+ public void onSuccess() {
+ //do nothing
+ }
+
+ @Override
+ public void onFailure(@NonNull IDJIError error) {
+ ViewUtil.showToast(getContext(), R.string.uxsdk_app_operator_fail, Toast.LENGTH_SHORT);
+ }
+ });
+
+ } else if (id == R.id.setting_menu_common_bottom_auxiliary_light) {
+ AuxiliaryLightMode mode = AuxiliaryLightMode.find(newIndex);
+ if (mode == AuxiliaryLightMode.OFF) {
+ ViewUtil.showToast(getContext(),R.string.uxsdk_setting_menu_close_bottom_aux_tips , Toast.LENGTH_LONG);
+ }
+ KeyManager.getInstance().setValue(KeyTools.createKey(FlightAssistantKey.KeyBottomAuxiliaryLightMode), AuxiliaryLightMode.find(newIndex), new CommonCallbacks.CompletionCallback() {
+ @Override
+ public void onSuccess() {
+ //do nothing
+ }
+ @Override
+ public void onFailure(@NonNull IDJIError error) {
+ ViewUtil.showToast(getContext(), R.string.uxsdk_app_operator_fail, Toast.LENGTH_SHORT);
+ }
+ });
+
+ }
+ }
+
+ private void setCellCheck(SwitcherCell cell, boolean isCheck) {
+ if (null != cell) {
+ cell.setOnCheckedChangedListener(null);
+ cell.setChecked(isCheck);
+ cell.setOnCheckedChangedListener(this);
+ }
+ }
+
+ private void setCellTab(TabSelectCell cell, int tab) {
+ if (null != cell) {
+ cell.setOnTabChangeListener(null);
+ cell.setCurrentTab(tab);
+ cell.setOnTabChangeListener(this);
+ }
+ }
+}
\ No newline at end of file
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/OmniPerceptionMenuFragment.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/OmniPerceptionMenuFragment.java
index ee5e4012..6d3eaf38 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/OmniPerceptionMenuFragment.java
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/OmniPerceptionMenuFragment.java
@@ -1,9 +1,22 @@
package dji.v5.ux.core.ui.setting.fragment;
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import dji.sdk.keyvalue.key.FlightControllerKey;
+import dji.sdk.keyvalue.key.KeyTools;
+import dji.sdk.keyvalue.utils.ProductUtil;
+import dji.v5.common.callback.CommonCallbacks;
+import dji.v5.manager.KeyManager;
import dji.v5.utils.common.ContextUtil;
import dji.v5.utils.common.StringUtils;
import dji.v5.ux.R;
import dji.v5.ux.core.ui.setting.ui.MenuFragment;
+import dji.v5.ux.obstacle.PrecisionLandingWidget;
+import dji.v5.ux.obstacle.VisionPositionWidget;
/**
* Description :
@@ -14,6 +27,9 @@
* Copyright (c) 2022, DJI All Rights Reserved.
*/
public class OmniPerceptionMenuFragment extends MenuFragment {
+ private PrecisionLandingWidget precisionLandingWidget;
+ private boolean isDownwardVisionSystemOpen;
+
@Override
protected String getPreferencesTitle() {
return StringUtils.getResStr(ContextUtil.getContext(), R.string.uxsdk_setting_menu_title_perception);
@@ -21,6 +37,43 @@ protected String getPreferencesTitle() {
@Override
protected int getLayoutId() {
- return R.layout.uxsdk_fragment_not_yet_implement;
+ return R.layout.uxsdk_fragemnt_setting_menu_omni_perception_layout;
+ }
+
+ @Override
+ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+ VisionPositionWidget visionPositionWidget = (VisionPositionWidget) view.findViewById(R.id.omni_vision_position_widget);
+ precisionLandingWidget = (PrecisionLandingWidget) view.findViewById(R.id.omni_vision_precision_landing_widget);
+ visionPositionWidget.setSwitchStateListener(check -> {
+ isDownwardVisionSystemOpen = check;
+ updatePrecisionWidgetVisible();
+ });
+
+ KeyManager.getInstance().listen(KeyTools.createKey(FlightControllerKey.KeyConnection), this, (oldValue, newValue) -> updatePrecisionWidgetVisible());
+
+
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ }
+
+ @Override
+ public void onDestroyView() {
+ super.onDestroyView();
+ KeyManager.getInstance().cancelListen(this);
+ }
+
+ private void updatePrecisionWidgetVisible() {
+ if (precisionLandingWidget == null) {
+ return;
+ }
+ if (isDownwardVisionSystemOpen && !ProductUtil.isM3EProduct()) {
+ precisionLandingWidget.setVisibility(View.VISIBLE);
+ } else {
+ precisionLandingWidget.setVisibility(View.GONE);
+ }
}
}
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/RCMenuFragment.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/RCMenuFragment.java
index d7d88a57..06ecfde8 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/RCMenuFragment.java
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/RCMenuFragment.java
@@ -1,9 +1,19 @@
package dji.v5.ux.core.ui.setting.fragment;
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import dji.sdk.keyvalue.key.FlightControllerKey;
+import dji.sdk.keyvalue.key.KeyTools;
+import dji.v5.manager.KeyManager;
import dji.v5.utils.common.ContextUtil;
import dji.v5.utils.common.StringUtils;
import dji.v5.ux.R;
import dji.v5.ux.core.ui.setting.ui.MenuFragment;
+import dji.v5.ux.core.util.ViewUtil;
/**
* Description :
@@ -21,6 +31,24 @@ protected String getPreferencesTitle() {
@Override
protected int getLayoutId() {
- return R.layout.uxsdk_fragment_not_yet_implement;
+ return R.layout.uxsdk_fragment_setting_menu_remote_controller_layout;
+ }
+
+ @Override
+ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+ view.findViewById(R.id.setting_menu_rc_calibration).setOnClickListener(v -> {
+ if (isAircraftConnected()) {
+ String content = StringUtils.getResStr(R.string.uxsdk_setting_ui_rc_calibration_tip);
+ ViewUtil.showToast(getContext(), content);
+ }else {
+ RcCalibrationFragment fragment = new RcCalibrationFragment();
+ addFragment(getFragmentManager(), fragment, true);
+ }
+ });
+ }
+
+ private boolean isAircraftConnected() {
+ return KeyManager.getInstance().getValue(KeyTools.createKey(FlightControllerKey.KeyConnection),false);
}
}
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/RcCalibrationFragment.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/RcCalibrationFragment.java
new file mode 100644
index 00000000..75cfa290
--- /dev/null
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/RcCalibrationFragment.java
@@ -0,0 +1,27 @@
+package dji.v5.ux.core.ui.setting.fragment;
+
+import dji.v5.utils.common.ContextUtil;
+import dji.v5.utils.common.StringUtils;
+import dji.v5.ux.R;
+import dji.v5.ux.core.ui.setting.ui.MenuFragment;
+
+/**
+ * Description :
+ *
+ * @author: Byte.Cai
+ * date : 2023/9/20
+ *
+ * Copyright (c) 2022, DJI All Rights Reserved.
+ */
+public class RcCalibrationFragment extends MenuFragment {
+ @Override
+ protected int getLayoutId() {
+ return R.layout.uxsdk_fragment_rc_calibration;
+ }
+
+ @Override
+ protected String getPreferencesTitle() {
+ return StringUtils.getResStr(ContextUtil.getContext(), R.string.uxsdk_setting_ui_rc_calibration);
+
+ }
+}
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/RtkMenuFragment.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/RtkMenuFragment.java
index b6d88faa..d265e6bb 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/RtkMenuFragment.java
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/fragment/RtkMenuFragment.java
@@ -22,6 +22,6 @@ protected String getPreferencesTitle() {
@Override
protected int getLayoutId() {
- return R.layout.uxsdk_fragment_not_yet_implement;
+ return R.layout.uxsdk_fragemnt_setting_ui_rtk_layout;
}
}
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/ui/AppFragment.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/ui/AppFragment.java
index 1ddd142c..c3d490af 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/ui/AppFragment.java
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/ui/AppFragment.java
@@ -9,7 +9,6 @@
import androidx.fragment.app.FragmentActivity;
-import dji.v5.common.utils.RxUtil;
import io.reactivex.rxjava3.disposables.CompositeDisposable;
/*
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/ui/SettingMenuFragment.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/ui/SettingMenuFragment.java
index b9fa2b85..11ca6d97 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/ui/SettingMenuFragment.java
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/ui/setting/ui/SettingMenuFragment.java
@@ -64,6 +64,7 @@ public void onCreate(Bundle savedInstanceState) {
fragmentManager = getChildFragmentManager();
fragmentManager.addOnBackStackChangedListener(this);
mFragmentTag = getArguments().getString(ARG_PARAM, "");
+
mLazyInflateTask = this::inflateFunctionFragment;
}
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/airsense/AirSenseWidgetModel.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/airsense/AirSenseWidgetModel.kt
index 40d131ba..aa0778da 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/airsense/AirSenseWidgetModel.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/airsense/AirSenseWidgetModel.kt
@@ -108,8 +108,12 @@ class AirSenseWidgetModel @JvmOverloads constructor(
//region Lifecycle
override fun inSetup() {
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyAirSenseSystemConnected), airSenseConnectedProcessor)
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyAirSenseSystemInformation), airSenseSystemInformationProcessor){
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyAirSenseSystemConnected), airSenseConnectedProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyAirSenseSystemInformation), airSenseSystemInformationProcessor){
airSenseWarningLevelProcessor.onNext(it.warningLevel)
}
}
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/altitude/AltitudeWidgetModel.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/altitude/AltitudeWidgetModel.kt
index 3712fe3b..2be8081b 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/altitude/AltitudeWidgetModel.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/altitude/AltitudeWidgetModel.kt
@@ -57,8 +57,12 @@ class AltitudeWidgetModel @JvmOverloads constructor(
get() = altitudeStateProcessor.toFlowable()
override fun inSetup() {
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyAltitude), altitudeProcessor)
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyTakeoffLocationAltitude), takeOffLocationAltitudeProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyAltitude), altitudeProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyTakeoffLocationAltitude), takeOffLocationAltitudeProcessor)
bindDataProcessor(GlobalPreferenceKeys.create(GlobalPreferenceKeys.UNIT_TYPE), unitTypeDataProcessor)
preferencesManager?.setUpListener()
preferencesManager?.let { unitTypeDataProcessor.onNext(it.unitType) }
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/battery/BatteryGroupInfoWidget.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/battery/BatteryGroupInfoWidget.java
index 0e869870..538a71bb 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/battery/BatteryGroupInfoWidget.java
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/battery/BatteryGroupInfoWidget.java
@@ -2,7 +2,9 @@
import android.content.Context;
import android.util.AttributeSet;
+import android.view.View;
import android.view.ViewGroup;
+import android.widget.Button;
import android.widget.LinearLayout;
import android.widget.TextView;
@@ -24,9 +26,10 @@ public class BatteryGroupInfoWidget extends ConstraintLayoutWidget {
protected BatteryGroupInfoWidgetModel widgetModel = new BatteryGroupInfoWidgetModel(DJISDKModel.getInstance(), ObservableInMemoryKeyedStore.getInstance());
+ protected BatteryGroupWidget batteryGroupWidget;
protected TextView batteryChargeRemaining;
protected TextView flightTime;
- protected ViewGroup container;
+ protected Button batteryDetail;
protected boolean isConnected;
@@ -49,9 +52,13 @@ protected void initView(@NonNull Context context, @Nullable AttributeSet attrs,
batteryChargeRemaining = findViewById(R.id.setting_menu_battery_charge_remain);
flightTime = findViewById(R.id.setting_menu_battery_fly_time);
- container = findViewById(R.id.setting_menu_battery_info_view_layout);
+ batteryDetail = findViewById(R.id.setting_menu_battery_info_detail_view);
+ batteryGroupWidget = findViewById(R.id.setting_menu_battery_group_view);
setBackgroundResource(R.drawable.uxsdk_background_fpv_setting_battery_group);
+
+ batteryGroupWidget.setEnableBatteryCells(false);
+ batteryGroupWidget.setEnableSerialNumber(false);
}
@Override
@@ -60,8 +67,6 @@ protected void reactToModelChanges() {
addReaction(widgetModel.getFlightTimeInSeconds().subscribe(this::updateFlightTime));
- addReaction(widgetModel.getBatteryOverview().subscribe(this::updateBatteryWidget));
-
addReaction(widgetModel.getConnection().subscribe(connection -> {
if (Boolean.compare(isConnected, connection) == 0) {
return;
@@ -102,32 +107,8 @@ private void updateBatteryChargeRemaining(int percent) {
batteryChargeRemaining.setText(getResources().getString(R.string.uxsdk_battery_percent, percent));
}
- private void updateBatteryWidget(List batteryOverviewList) {
- List availableList = new ArrayList<>();
- for (BatteryOverviewValue value : batteryOverviewList) {
- if (value.getIsConnected().equals(true)) {
- availableList.add(value);
- }
- }
- int childCount = container.getChildCount();
- int newCount = availableList.size();
- if (childCount < newCount) {
- for (int i = childCount; i < newCount; i++) {
- BatteryInfoWidget view = new BatteryInfoWidget(getContext());
- LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
- params.topMargin = getResources().getDimensionPixelSize(R.dimen.uxsdk_15_dp);
- container.addView(view, params);
- }
- } else if (childCount > newCount) {
- for (int i = childCount - 1; i >= newCount; i--) {
- container.removeViewAt(i);
- }
- }
-
- for (int i = 0; i < container.getChildCount(); i++) {
- BatteryInfoWidget view = (BatteryInfoWidget) container.getChildAt(i);
- view.setBatteryIndex(availableList.get(i).getIndex());
- }
-
+ public void setOnDetailOnClickListener(@Nullable View.OnClickListener listener) {
+ batteryDetail.setVisibility(listener == null ? GONE : VISIBLE);
+ batteryDetail.setOnClickListener(listener);
}
}
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/battery/BatteryGroupWidget.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/battery/BatteryGroupWidget.java
new file mode 100644
index 00000000..8351b80d
--- /dev/null
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/battery/BatteryGroupWidget.java
@@ -0,0 +1,138 @@
+package dji.v5.ux.core.widget.battery;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import dji.sdk.keyvalue.value.battery.BatteryOverviewValue;
+import dji.v5.ux.R;
+import dji.v5.ux.core.base.DJISDKModel;
+import dji.v5.ux.core.base.widget.ConstraintLayoutWidget;
+import dji.v5.ux.core.base.widget.FrameLayoutWidget;
+import dji.v5.ux.core.communication.ObservableInMemoryKeyedStore;
+
+public class BatteryGroupWidget extends FrameLayoutWidget {
+
+ protected BatteryGroupInfoWidgetModel widgetModel = new BatteryGroupInfoWidgetModel(DJISDKModel.getInstance(), ObservableInMemoryKeyedStore.getInstance());
+
+ protected ViewGroup container;
+
+ protected boolean isConnected = false;
+ protected boolean isEnableBatteryCells = true;
+ protected boolean isEnableSerialNumber = true;
+
+
+ public BatteryGroupWidget(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+ super(context, attrs, defStyleAttr);
+ }
+
+ public BatteryGroupWidget(@NonNull Context context, @Nullable AttributeSet attrs) {
+ super(context, attrs);
+ }
+
+ public BatteryGroupWidget(@NonNull Context context) {
+ super(context);
+ }
+
+ @Override
+ protected void initView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+ inflate(context, R.layout.uxsdk_view_group_battery, this);
+
+ container = findViewById(R.id.setting_menu_battery_info_view_layout);
+ }
+
+ @Override
+ protected void reactToModelChanges() {
+ addReaction(widgetModel.getBatteryOverview().subscribe(this::updateBatteryWidget));
+
+ addReaction(widgetModel.getConnection().subscribe(connection -> {
+ if (Boolean.compare(isConnected, connection) == 0) {
+ return;
+ }
+ isConnected = connection;
+ if (!isConnected) {
+ widgetModel.reset();
+ }
+ }));
+ }
+
+ @Override
+ protected void onAttachedToWindow() {
+ super.onAttachedToWindow();
+ if (!isInEditMode()) {
+ widgetModel.setup();
+ }
+ }
+
+ @Override
+ protected void onDetachedFromWindow() {
+ super.onDetachedFromWindow();
+ if (!isInEditMode()) {
+ widgetModel.cleanup();
+ }
+ }
+
+ private void updateBatteryWidget(List batteryOverviewList) {
+ List availableList = new ArrayList<>();
+ for (BatteryOverviewValue value : batteryOverviewList) {
+ if (value.getIsConnected().equals(true)) {
+ availableList.add(value);
+ }
+ }
+ int childCount = container.getChildCount();
+ int newCount = availableList.size();
+ if (childCount < newCount) {
+ for (int i = childCount; i < newCount; i++) {
+ BatteryInfoWidget view = new BatteryInfoWidget(getContext());
+ LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+ params.topMargin = getResources().getDimensionPixelSize(R.dimen.uxsdk_15_dp);
+ container.addView(view, params);
+ view.setEnableSerialNumber(isEnableSerialNumber);
+ view.setEnableBatteryCells(isEnableBatteryCells);
+ }
+ } else if (childCount > newCount) {
+ for (int i = childCount - 1; i >= newCount; i--) {
+ container.removeViewAt(i);
+ }
+ }
+
+ for (int i = 0; i < container.getChildCount(); i++) {
+ BatteryInfoWidget view = (BatteryInfoWidget) container.getChildAt(i);
+ view.setBatteryIndex(availableList.get(i).getIndex());
+ }
+
+ }
+
+ public void setEnableBatteryCells(boolean isEnable) {
+ this.isEnableBatteryCells = isEnable;
+ updateBatteryInfoWidget();
+ }
+
+ public void setEnableSerialNumber(boolean isEnable) {
+ this.isEnableSerialNumber = isEnable;
+ updateBatteryInfoWidget();
+ }
+
+ private void updateBatteryInfoWidget() {
+ for (int i = 0; i < container.getChildCount(); i++) {
+ View childView = container.getChildAt(i);
+ if (childView instanceof BatteryInfoWidget) {
+ BatteryInfoWidget widget = (BatteryInfoWidget) childView;
+ widget.setEnableBatteryCells(isEnableBatteryCells);
+ widget.setEnableSerialNumber(isEnableSerialNumber);
+ }
+ }
+ }
+
+}
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/battery/BatteryInfoWidget.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/battery/BatteryInfoWidget.java
index 730bf042..0f57db9a 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/battery/BatteryInfoWidget.java
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/battery/BatteryInfoWidget.java
@@ -56,11 +56,11 @@ public class BatteryInfoWidget extends ConstraintLayoutWidget {
protected TextView serialNumber;
protected TextView productionDate;
protected ViewGroup cellsLayout;
+ protected ViewGroup batteryBottomLayout;
protected Group highVoltage;
protected int temperatureType = Temperature.TEMPERATURE_CELSIUS;
protected float temperatureValue = 0.0f;
-
protected boolean supportHighVoltageHint = false;
protected boolean isConnected;
@@ -97,6 +97,7 @@ protected void initView(@NonNull Context context, @Nullable AttributeSet attrs,
productionDate = findViewById(R.id.setting_menu_battery_production_date);
highVoltage = findViewById(R.id.group_high_voltage);
cellsLayout = findViewById(R.id.setting_menu_battery_cells_view_stub);
+ batteryBottomLayout = findViewById(R.id.setting_menu_battery_bottom_view);
setBackgroundResource(R.drawable.uxsdk_background_fpv_setting);
showHighVoltage(supportHighVoltage());
@@ -382,10 +383,8 @@ private void updateTemperature() {
private void updateBatteryCells(List cellVoltages) {
if (cellVoltages == null || cellVoltages.isEmpty()) {
cellsLayout.removeAllViews();
- cellsLayout.setVisibility(GONE);
return;
}
- cellsLayout.setVisibility(VISIBLE);
int cellNumber = cellVoltages.size();
int childCount = cellsLayout.getChildCount();
if (childCount < cellNumber) {
@@ -408,6 +407,13 @@ private void updateBatteryCells(List cellVoltages) {
}
}
+ public void setEnableBatteryCells(boolean isEnable) {
+ cellsLayout.setVisibility(isEnable ? VISIBLE : GONE);
+ }
+
+ public void setEnableSerialNumber(boolean isEnable) {
+ batteryBottomLayout.setVisibility(isEnable ? VISIBLE : GONE);
+ }
/**
* 是否支持高压存储，M350新电池、M30新版本电池
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/battery/BatteryInfoWidgetModel.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/battery/BatteryInfoWidgetModel.kt
index babfacff..359128d1 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/battery/BatteryInfoWidgetModel.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/battery/BatteryInfoWidgetModel.kt
@@ -66,20 +66,48 @@ class BatteryInfoWidgetModel(
get() = productTypeProcessor.toFlowableOnUI()
override fun inSetup() {
- bindDataProcessor(KeyTools.createKey(BatteryKey.KeyBatteryException, batteryIndex), batteryExceptionProcessor)
- bindDataProcessor(KeyTools.createKey(BatteryKey.KeyBatteryTemperature, batteryIndex), batteryTemperatureProcessor)
- bindDataProcessor(KeyTools.createKey(BatteryKey.KeyVoltage, batteryIndex), batteryVoltageProcessor)
- bindDataProcessor(KeyTools.createKey(BatteryKey.KeyChargeRemainingInPercent, batteryIndex), batteryChargeRemainingProcessor)
- bindDataProcessor(KeyTools.createKey(BatteryKey.KeyConnection, batteryIndex), batteryConnectionProcessor)
- bindDataProcessor(KeyTools.createKey(BatteryKey.KeyIsCommunicationException, batteryIndex), batteryIsCommunicationExceptionProcessor)
- bindDataProcessor(KeyTools.createKey(BatteryKey.KeyNumberOfDischarges, batteryIndex), batteryNumberOfDischargesProcessor)
- bindDataProcessor(KeyTools.createKey(BatteryKey.KeyIndustryBatteryType, batteryIndex), batteryIndustryBatteryTypeProcessor)
- bindDataProcessor(KeyTools.createKey(BatteryKey.KeyBatteryHighVoltageStorageTime, batteryIndex), batteryBatteryHighVoltageStorageSecProcessor)
- bindDataProcessor(KeyTools.createKey(BatteryKey.KeySerialNumber, batteryIndex), batterySerialNumberProcessor)
- bindDataProcessor(KeyTools.createKey(BatteryKey.KeyBatteryManufacturedDate, batteryIndex), batteryManufacturedDateProcessor)
- bindDataProcessor(KeyTools.createKey(BatteryKey.KeyCellVoltages, batteryIndex), batteryCellVoltagesProcessor)
- bindDataProcessor(KeyTools.createKey(BatteryKey.KeyBatteryOverviews, ComponentIndexType.AGGREGATION), batteryOverviewProcessor)
- bindDataProcessor(KeyTools.createKey(ProductKey.KeyProductType), productTypeProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ BatteryKey.KeyBatteryException, batteryIndex), batteryExceptionProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ BatteryKey.KeyBatteryTemperature, batteryIndex), batteryTemperatureProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ BatteryKey.KeyVoltage, batteryIndex), batteryVoltageProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ BatteryKey.KeyChargeRemainingInPercent, batteryIndex), batteryChargeRemainingProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ BatteryKey.KeyConnection, batteryIndex), batteryConnectionProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ BatteryKey.KeyIsCommunicationException, batteryIndex), batteryIsCommunicationExceptionProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ BatteryKey.KeyNumberOfDischarges, batteryIndex), batteryNumberOfDischargesProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ BatteryKey.KeyIndustryBatteryType, batteryIndex), batteryIndustryBatteryTypeProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ BatteryKey.KeyBatteryHighVoltageStorageTime, batteryIndex), batteryBatteryHighVoltageStorageSecProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ BatteryKey.KeySerialNumber, batteryIndex), batterySerialNumberProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ BatteryKey.KeyBatteryManufacturedDate, batteryIndex), batteryManufacturedDateProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ BatteryKey.KeyCellVoltages, batteryIndex), batteryCellVoltagesProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ BatteryKey.KeyBatteryOverviews, ComponentIndexType.AGGREGATION), batteryOverviewProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ ProductKey.KeyProductType), productTypeProcessor)
}
override fun inCleanup() {
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/battery/BatterySettingWidget.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/battery/BatterySettingWidget.java
index 1c31337a..39ec90ae 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/battery/BatterySettingWidget.java
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/battery/BatterySettingWidget.java
@@ -2,6 +2,7 @@
import android.content.Context;
import android.util.AttributeSet;
+import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -10,6 +11,7 @@
import dji.v5.ux.core.base.widget.FrameLayoutWidget;
public class BatterySettingWidget extends FrameLayoutWidget {
+ private BatteryGroupInfoWidget batteryGroupInfoWidget;
public BatterySettingWidget(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
@@ -25,12 +27,17 @@ public BatterySettingWidget(@NonNull Context context) {
@Override
protected void initView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
- inflate(context, R.layout.uxsdk_setting_battery_widget, this);
- setBackgroundResource(R.drawable.uxsdk_background_black_rectangle);
+ View view = inflate(context, R.layout.uxsdk_setting_battery_widget, this);
+ batteryGroupInfoWidget = view.findViewById(R.id.setting_menu_battery_group);
}
@Override
protected void reactToModelChanges() {
//Do NothingBasicRangeSeekBarWidget
}
+
+ public BatteryGroupInfoWidget getBatteryGroupInfoWidget() {
+ return batteryGroupInfoWidget;
+ }
+
}
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/battery/BatteryWidgetModel.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/battery/BatteryWidgetModel.kt
index 6dc064e1..9c0de5d7 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/battery/BatteryWidgetModel.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/battery/BatteryWidgetModel.kt
@@ -80,24 +80,56 @@ class BatteryWidgetModel(
get() = batteryStateProcessor.toFlowable()
override fun inSetup() {
- bindDataProcessor(KeyTools.createKey(BatteryKey.KeyChargeRemainingInPercent, ComponentIndexType.LEFT_OR_MAIN), batteryPercentageProcessor1)
- bindDataProcessor(KeyTools.createKey(BatteryKey.KeyCellVoltages, ComponentIndexType.LEFT_OR_MAIN), batteryVoltageProcessor1)
- bindDataProcessor(KeyTools.createKey(BatteryKey.KeyBatteryException, ComponentIndexType.LEFT_OR_MAIN), batteryWarningRecordProcessor1)
- bindDataProcessor(KeyTools.createKey(BatteryKey.KeyChargeRemainingInPercent, ComponentIndexType.RIGHT), batteryPercentageProcessor2)
- bindDataProcessor(KeyTools.createKey(BatteryKey.KeyCellVoltages, ComponentIndexType.RIGHT), batteryVoltageProcessor2)
- bindDataProcessor(KeyTools.createKey(BatteryKey.KeyBatteryException, ComponentIndexType.RIGHT), batteryWarningRecordProcessor2)
-
- bindDataProcessor(KeyTools.createKey(BatteryKey.KeyNumberOfConnectedBatteries, ComponentIndexType.AGGREGATION), batteryConnectedProcessor)
- bindDataProcessor(KeyTools.createKey(BatteryKey.KeyIsAnyBatteryDisconnected, ComponentIndexType.AGGREGATION), isAnyBatteryDisconnectedProcessor)
- bindDataProcessor(KeyTools.createKey(BatteryKey.KeyIsCellDamaged, ComponentIndexType.AGGREGATION), isCellDamagedDisconnectedProcessor)
- bindDataProcessor(KeyTools.createKey(BatteryKey.KeyIsFirmwareDifferenceDetected, ComponentIndexType.AGGREGATION), isFirmwareDifferenceDetectedProcessor)
- bindDataProcessor(KeyTools.createKey(BatteryKey.KeyIsVoltageDifferenceDetected, ComponentIndexType.AGGREGATION), isVoltageDifferenceDetectedProcessor)
- bindDataProcessor(KeyTools.createKey(BatteryKey.KeyIsLowCellVoltageDetected, ComponentIndexType.AGGREGATION), isLowCellVoltageDetectedProcessor)
- bindDataProcessor(KeyTools.createKey(BatteryKey.KeyBatteryOverviews, ComponentIndexType.AGGREGATION), batteryOverviewsProcessor)
-
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyBatteryThresholdBehavior), batteryThresholdBehaviorProcessor)
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyBatteryPercentNeededToGoHome), batteryNeededToGoHomeProcessor)
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyIsFlying), isAircraftFlyingDataProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ BatteryKey.KeyChargeRemainingInPercent, ComponentIndexType.LEFT_OR_MAIN), batteryPercentageProcessor1)
+ bindDataProcessor(
+ KeyTools.createKey(
+ BatteryKey.KeyCellVoltages, ComponentIndexType.LEFT_OR_MAIN), batteryVoltageProcessor1)
+ bindDataProcessor(
+ KeyTools.createKey(
+ BatteryKey.KeyBatteryException, ComponentIndexType.LEFT_OR_MAIN), batteryWarningRecordProcessor1)
+ bindDataProcessor(
+ KeyTools.createKey(
+ BatteryKey.KeyChargeRemainingInPercent, ComponentIndexType.RIGHT), batteryPercentageProcessor2)
+ bindDataProcessor(
+ KeyTools.createKey(
+ BatteryKey.KeyCellVoltages, ComponentIndexType.RIGHT), batteryVoltageProcessor2)
+ bindDataProcessor(
+ KeyTools.createKey(
+ BatteryKey.KeyBatteryException, ComponentIndexType.RIGHT), batteryWarningRecordProcessor2)
+
+ bindDataProcessor(
+ KeyTools.createKey(
+ BatteryKey.KeyNumberOfConnectedBatteries, ComponentIndexType.AGGREGATION), batteryConnectedProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ BatteryKey.KeyIsAnyBatteryDisconnected, ComponentIndexType.AGGREGATION), isAnyBatteryDisconnectedProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ BatteryKey.KeyIsCellDamaged, ComponentIndexType.AGGREGATION), isCellDamagedDisconnectedProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ BatteryKey.KeyIsFirmwareDifferenceDetected, ComponentIndexType.AGGREGATION), isFirmwareDifferenceDetectedProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ BatteryKey.KeyIsVoltageDifferenceDetected, ComponentIndexType.AGGREGATION), isVoltageDifferenceDetectedProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ BatteryKey.KeyIsLowCellVoltageDetected, ComponentIndexType.AGGREGATION), isLowCellVoltageDetectedProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ BatteryKey.KeyBatteryOverviews, ComponentIndexType.AGGREGATION), batteryOverviewsProcessor)
+
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyBatteryThresholdBehavior), batteryThresholdBehaviorProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyBatteryPercentNeededToGoHome), batteryNeededToGoHomeProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyIsFlying), isAircraftFlyingDataProcessor)
}
override fun updateStates() {
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/common/CommonAboutWidget.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/common/CommonAboutWidget.java
index 73ee1dc2..0f6629ff 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/common/CommonAboutWidget.java
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/common/CommonAboutWidget.java
@@ -94,7 +94,7 @@ protected void initView(@NonNull Context context, @Nullable AttributeSet attrs,
textCellHeight = getResources().getDimensionPixelSize(R.dimen.uxsdk_58_dp);
- setBackgroundResource(R.drawable.uxsdk_background_black_rectangle);
+ // setBackgroundResource(R.drawable.uxsdk_background_black_rectangle);
}
@Override
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/common/CommonDeviceNameWidget.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/common/CommonDeviceNameWidget.java
index 54ad1815..cf20867a 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/common/CommonDeviceNameWidget.java
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/common/CommonDeviceNameWidget.java
@@ -52,7 +52,7 @@ protected void initView(@NonNull Context context, @Nullable AttributeSet attrs,
saveTv.setOnClickListener(v -> handleSaveAction());
- setBackgroundResource(R.drawable.uxsdk_background_black_rectangle);
+ // setBackgroundResource(R.drawable.uxsdk_background_black_rectangle);
}
@Override
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/compass/CompassWidgetModel.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/compass/CompassWidgetModel.kt
index fa31fb13..589a15d3 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/compass/CompassWidgetModel.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/compass/CompassWidgetModel.kt
@@ -108,25 +108,35 @@ class CompassWidgetModel(
//region Lifecycle
override fun inSetup() {
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyAircraftAttitude), aircraftAttitudeProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyAircraftAttitude), aircraftAttitudeProcessor)
// Set the home location when changed and update the various calculations
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyHomeLocation), homeLocationProcessor) {
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyHomeLocation), homeLocationProcessor) {
updateCalculations()
}
// Update the aircraft's location
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyAircraftLocation), aircraftLocationProcessor) {
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyAircraftLocation), aircraftLocationProcessor) {
calculateAircraftAngleAndDistanceFromCenterLocation()
}
// Update the RC's location
- bindDataProcessor(KeyTools.createKey(RemoteControllerKey.KeyRcGPSInfo), rcGPSDataProcessor) {
+ bindDataProcessor(
+ KeyTools.createKey(
+ RemoteControllerKey.KeyRcGPSInfo), rcGPSDataProcessor) {
updateGPSData(it)
}
// Update the gimbal heading
- bindDataProcessor(KeyTools.createKey(GimbalKey.KeyYawRelativeToAircraftHeading, gimbalIndex), gimbalYawProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ GimbalKey.KeyYawRelativeToAircraftHeading, gimbalIndex), gimbalYawProcessor)
registerMobileDeviceSensorListener()
// Start mobile device's location updates if available
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/distancehome/DistanceHomeWidgetModel.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/distancehome/DistanceHomeWidgetModel.kt
index 0be0d297..e715449c 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/distancehome/DistanceHomeWidgetModel.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/distancehome/DistanceHomeWidgetModel.kt
@@ -61,8 +61,12 @@ class DistanceHomeWidgetModel(
override fun inSetup() {
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyHomeLocation), homeLocationProcessor)
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyAircraftLocation), aircraftLocationProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyHomeLocation), homeLocationProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyAircraftLocation), aircraftLocationProcessor)
val unitTypeKey = GlobalPreferenceKeys.create(GlobalPreferenceKeys.UNIT_TYPE)
bindDataProcessor(unitTypeKey, unitTypeDataProcessor)
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/distancerc/DistanceRCWidgetModel.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/distancerc/DistanceRCWidgetModel.kt
index b35c733d..5b4fec4d 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/distancerc/DistanceRCWidgetModel.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/distancerc/DistanceRCWidgetModel.kt
@@ -63,8 +63,12 @@ class DistanceRCWidgetModel(
get() = distanceRCStateProcessor.toFlowable()
override fun inSetup() {
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyAircraftLocation), aircraftLocationProcessor)
- bindDataProcessor(KeyTools.createKey(RemoteControllerKey.KeyRcGPSInfo), rcGPSDataProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyAircraftLocation), aircraftLocationProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ RemoteControllerKey.KeyRcGPSInfo), rcGPSDataProcessor)
bindDataProcessor(GlobalPreferenceKeys.create(GlobalPreferenceKeys.UNIT_TYPE), unitTypeDataProcessor)
preferencesManager?.setUpListener()
preferencesManager?.let { unitTypeDataProcessor.onNext(it.unitType) }
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/flightmode/FlightModeWidgetModel.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/flightmode/FlightModeWidgetModel.kt
index 05cad9a6..9d63b9dd 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/flightmode/FlightModeWidgetModel.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/flightmode/FlightModeWidgetModel.kt
@@ -58,7 +58,9 @@ class FlightModeWidgetModel(
//region Lifecycle
override fun inSetup() {
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyFlightModeString), flightModeStringProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyFlightModeString), flightModeStringProcessor)
}
override fun inCleanup() {
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/fpv/FPVWidget.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/fpv/FPVWidget.kt
index 0bdb1157..6335a755 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/fpv/FPVWidget.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/fpv/FPVWidget.kt
@@ -27,6 +27,7 @@ import android.content.Context
import android.content.res.ColorStateList
import android.graphics.drawable.Drawable
import android.util.AttributeSet
+import android.view.Surface
import android.view.SurfaceHolder
import android.view.SurfaceView
import android.view.View
@@ -39,7 +40,6 @@ import androidx.constraintlayout.widget.Guideline
import androidx.core.content.res.use
import dji.v5.common.video.channel.VideoChannelType
import dji.v5.common.video.decoder.DecoderOutputMode
-import dji.v5.common.video.decoder.DecoderState
import dji.v5.common.video.decoder.VideoDecoder
import dji.v5.common.video.interfaces.IVideoDecoder
import dji.v5.common.video.stream.PhysicalDevicePosition
@@ -291,8 +291,6 @@ open class FPVWidget @JvmOverloads constructor(
if (!isInEditMode) {
widgetModel.cleanup()
}
- videoDecoder?.destroy()
- videoDecoder = null
super.onDetachedFromWindow()
}
@@ -309,41 +307,31 @@ open class FPVWidget @JvmOverloads constructor(
}
override fun surfaceCreated(holder: SurfaceHolder) {
- LogUtils.i(logTag, "surfaceCreated", videoChannelType, videoDecoder == null)
- if (videoDecoder == null) {
- videoDecoder = VideoDecoder(
- context,
- videoChannelType,
- DecoderOutputMode.SURFACE_MODE,
- fpvSurfaceView.holder,
- fpvSurfaceView.width,
- fpvSurfaceView.height,
- true
- )
- } else if (videoDecoder?.decoderStatus == DecoderState.PAUSED) {
- videoDecoder?.onResume()
- }
+ // do nothing
}
override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) {
- if (videoDecoder == null) {
+ updateVideoDecoder(holder.surface, width, height)
+ }
+
+ override fun surfaceDestroyed(holder: SurfaceHolder) {
+ updateVideoDecoder(null, 0, 0)
+ }
+
+ private fun updateVideoDecoder(surface: Surface?, width: Int, height: Int) {
+ videoDecoder?.destroy()
+ if (surface != null && width > 0 && height > 0) {
videoDecoder = VideoDecoder(
context,
videoChannelType,
DecoderOutputMode.SURFACE_MODE,
fpvSurfaceView.holder,
- fpvSurfaceView.width,
- fpvSurfaceView.height,
+ width,
+ height,
true
)
- } else if (videoDecoder?.decoderStatus == DecoderState.PAUSED) {
- videoDecoder?.onResume()
+ videoDecoder!!.onResume()
}
- LogUtils.i(logTag, "surfaceChanged", videoChannelType, videoDecoder?.videoWidth, videoDecoder?.videoHeight)
- }
-
- override fun surfaceDestroyed(holder: SurfaceHolder) {
- videoDecoder?.onPause()
}
override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
@@ -367,20 +355,15 @@ open class FPVWidget @JvmOverloads constructor(
fun updateVideoSource(source: StreamSource, channelType: VideoChannelType) {
LogUtils.i(logTag, "updateVideoSource", JsonUtil.toJson(source), channelType)
widgetModel.streamSource = source
- if (videoChannelType != channelType) {
- changeVideoDecoder(channelType)
+ if (videoChannelType!=channelType){
+ videoChannelType = channelType
+ videoDecoder?.videoChannelType = channelType
+ fpvSurfaceView.invalidate()
}
- videoChannelType = channelType
}
fun getStreamSource() = widgetModel.streamSource
- private fun changeVideoDecoder(channel: VideoChannelType) {
- LogUtils.i(logTag, "changeVideoDecoder", channel)
- videoDecoder?.videoChannelType = channel
- fpvSurfaceView.invalidate()
- }
-
fun setOnFPVStreamSourceListener(listener: FPVStreamSourceListener) {
widgetModel.streamSourceListener = listener
}
@@ -473,7 +456,8 @@ open class FPVWidget @JvmOverloads constructor(
private fun updateGridLineVisibility() {
gridLineView.visibility = if (isGridLinesEnabled
- && widgetModel.streamSource?.physicalDevicePosition == PhysicalDevicePosition.NOSE) View.VISIBLE else View.GONE
+ && widgetModel.streamSource?.physicalDevicePosition == PhysicalDevicePosition.NOSE
+ ) View.VISIBLE else View.GONE
}
//endregion
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/fpv/FPVWidgetModel.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/fpv/FPVWidgetModel.kt
index 676a10d0..d5b8e569 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/fpv/FPVWidgetModel.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/fpv/FPVWidgetModel.kt
@@ -23,14 +23,11 @@
package dji.v5.ux.core.widget.fpv
import dji.sdk.keyvalue.key.CameraKey
-import dji.sdk.keyvalue.key.KeyTools
import dji.sdk.keyvalue.value.camera.CameraOrientation
import dji.sdk.keyvalue.value.camera.CameraVideoStreamSourceType
import dji.sdk.keyvalue.value.camera.VideoResolutionFrameRate
import dji.sdk.keyvalue.value.common.CameraLensType
import dji.sdk.keyvalue.value.common.ComponentIndexType
-import dji.v5.common.callback.CommonCallbacks
-import dji.v5.common.error.IDJIError
import dji.v5.common.video.channel.VideoChannelType
import dji.v5.common.video.interfaces.IVideoChannel
import dji.v5.common.video.stream.StreamSource
@@ -47,7 +44,6 @@ import dji.v5.ux.core.module.FlatCameraModule
import dji.v5.ux.core.util.CameraUtil
import dji.v5.ux.core.util.DataProcessor
import dji.v5.ux.core.util.RxUtil
-import io.reactivex.rxjava3.core.Completable
import io.reactivex.rxjava3.core.Flowable
/**
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/gpssignal/GPSSignalWidgetModel.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/gpssignal/GPSSignalWidgetModel.kt
index 30f71237..e198f78f 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/gpssignal/GPSSignalWidgetModel.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/gpssignal/GPSSignalWidgetModel.kt
@@ -104,7 +104,9 @@ class GpsSignalWidgetModel(
override fun inSetup() {
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyGPSSatelliteCount), gpsSatelliteCountProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyGPSSatelliteCount), gpsSatelliteCountProcessor)
rtkCenter.addRTKSystemStateListener(rtkSystemStateListener)
rtkCenter.rtkStationManager.addRTKStationConnectStatusListener(connectStatusListener)
rtkCenter.qxrtkManager.addNetworkRTKServiceInfoListener(networkServiceInfoListener)
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/hd/BandWidthSelectWidget.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/hd/BandWidthSelectWidget.java
index 0d223427..8fb9d6d0 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/hd/BandWidthSelectWidget.java
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/hd/BandWidthSelectWidget.java
@@ -54,6 +54,7 @@ protected void onAttachedToWindow() {
initBandwidthItems();
initBandwidthItemsUI();
+ setVisibility(GONE);
}
@Override
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/hd/InfoWidget.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/hd/InfoWidget.java
index 630aa326..f6af7b18 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/hd/InfoWidget.java
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/hd/InfoWidget.java
@@ -2,6 +2,7 @@
import android.content.Context;
import android.util.AttributeSet;
+import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -47,6 +48,7 @@ public class InfoWidget extends ConstraintLayoutWidget {
private boolean fcConnected = false;
private SignalLevel mSignalLevel = SignalLevel.LEVEL_0;
private TextCell sdrInfoTextCell;
+ private TextView summaryText ;
private InfoWidgetModel widgetModel = new InfoWidgetModel(DJISDKModel.getInstance(), ObservableInMemoryKeyedStore.getInstance());
public InfoWidget(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
@@ -81,19 +83,20 @@ public void onDetachedFromWindow() {
protected void initView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
inflate(context, R.layout.uxsdk_setting_menu_sdr_info_text_layout, this);
sdrInfoTextCell = findViewById(R.id.tc_setting_menu_sdr_info_text);
+ summaryText = findViewById(R.id.summaryText);
}
@Override
protected void reactToModelChanges() {
addReaction(widgetModel.getBandwidth().subscribe(value -> {
mSdrSignal.bandwidth = value;
- sdrInfoTextCell.setSummary(mSdrSignal.toString());
+ summaryText.setText(mSdrSignal.toString());
}));
addReaction(widgetModel.getFrequencyInterfaceInfoList().subscribe(value -> {
mRssis = value;
updateAverageValue();
- sdrInfoTextCell.setSummary(mSdrSignal.toString());
+ summaryText.setText(mSdrSignal.toString());
}));
addReaction(widgetModel.getFrequencyPointIndexRange().subscribe(value -> {
@@ -101,25 +104,25 @@ protected void reactToModelChanges() {
mValidRanges[0] = value.getMin();
mValidRanges[1] = value.getMax();
onValidRangeChanged();
- sdrInfoTextCell.setSummary(mSdrSignal.toString());
+ summaryText.setText(mSdrSignal.toString());
}));
addReaction(widgetModel.getSdrHdOffsetParamsData().subscribe(value -> {
mOffsetParams = value;
updateAverageValue();
- sdrInfoTextCell.setSummary(mSdrSignal.toString());
+ summaryText.setText(mSdrSignal.toString());
}));
addReaction(widgetModel.getDynamicDataRate().subscribe(value -> {
mSdrSignal.dataRate = value.floatValue();
- sdrInfoTextCell.setSummary(mSdrSignal.toString());
+ summaryText.setText(mSdrSignal.toString());
}));
addReaction(widgetModel.getFrequencyPointIndex().subscribe(value -> {
mCurNfIndex = value;
mLeftNfIndex = (float)mCurNfIndex - mRangeSize;
updateAverageValue();
- sdrInfoTextCell.setSummary(mSdrSignal.toString());
+ summaryText.setText(mSdrSignal.toString());
}));
addReaction(widgetModel.getDownLinkQuality().subscribe(value -> {
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/horizontalvelocity/HorizontalVelocityWidgetModel.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/horizontalvelocity/HorizontalVelocityWidgetModel.kt
index 6e68fa63..7dbb85ac 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/horizontalvelocity/HorizontalVelocityWidgetModel.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/horizontalvelocity/HorizontalVelocityWidgetModel.kt
@@ -62,7 +62,9 @@ class HorizontalVelocityWidgetModel(
get() = horizontalVelocityStateProcessor.toFlowable()
override fun inSetup() {
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyAircraftVelocity), aircraftVelocityProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyAircraftVelocity), aircraftVelocityProcessor)
bindDataProcessor(GlobalPreferenceKeys.create(GlobalPreferenceKeys.UNIT_TYPE), unitTypeDataProcessor)
preferencesManager?.setUpListener()
preferencesManager?.let { unitTypeDataProcessor.onNext(it.unitType) }
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/hsi/AttitudeDisplayModel.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/hsi/AttitudeDisplayModel.kt
index 50e9119b..c8fc8b5b 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/hsi/AttitudeDisplayModel.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/hsi/AttitudeDisplayModel.kt
@@ -3,12 +3,7 @@ package dji.v5.ux.core.widget.hsi
import dji.sdk.keyvalue.key.*
import dji.sdk.keyvalue.value.common.LocationCoordinate2D
import dji.sdk.keyvalue.value.common.Velocity3D
-import dji.sdk.keyvalue.value.flightassistant.PerceptionInformation
-import dji.sdk.keyvalue.value.flightassistant.PerceptionPushOmnidirectionalRadarStatus
import dji.sdk.keyvalue.value.rtkmobilestation.RTKTakeoffAltitudeInfo
-import dji.sdk.keyvalue.value.flightassistant.OmnidirectionalObstacleAvoidanceStatus
-import dji.sdk.keyvalue.value.product.ProductType
-import dji.sdk.wpmz.value.mission.WaylineWaylinesParseInfo
import dji.v5.manager.KeyManager
import dji.v5.manager.aircraft.perception.PerceptionManager
import dji.v5.manager.aircraft.perception.data.ObstacleData
@@ -17,11 +12,6 @@ import dji.v5.manager.aircraft.perception.listener.ObstacleDataListener
import dji.v5.manager.aircraft.perception.listener.PerceptionInformationListener
import dji.v5.manager.aircraft.perception.radar.RadarInformation
import dji.v5.manager.aircraft.perception.radar.RadarInformationListener
-import dji.v5.manager.aircraft.waypoint3.WPMZParserManager
-import dji.v5.manager.aircraft.waypoint3.WPMZParserManager.getCurrentKmzInfo
-import dji.v5.manager.aircraft.waypoint3.WaypointMissionExecuteStateListener
-import dji.v5.manager.aircraft.waypoint3.WaypointMissionManager
-import dji.v5.utils.common.LogUtils
import dji.v5.ux.core.base.DJISDKModel
import dji.v5.ux.core.base.WidgetModel
import dji.v5.ux.core.communication.ObservableInMemoryKeyedStore
@@ -70,13 +60,25 @@ open class AttitudeDisplayModel constructor(
override fun inSetup() {
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyAircraftVelocity), velocityProcessor)
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyAltitude), altitudeProcessor)
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyGoHomeHeight), goHomeHeightProcessor)
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyHeightLimit), limitMaxFlightHeightInMeterProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyAircraftVelocity), velocityProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyAltitude), altitudeProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyGoHomeHeight), goHomeHeightProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyHeightLimit), limitMaxFlightHeightInMeterProcessor)
- bindDataProcessor(KeyTools.createKey(RtkMobileStationKey.KeyRTKTakeoffAltitudeInfo), rtkTakeoffAltitudeInfoProcessor)
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyAircraftLocation), aircraftLocationDataProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ RtkMobileStationKey.KeyRTKTakeoffAltitudeInfo), rtkTakeoffAltitudeInfoProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyAircraftLocation), aircraftLocationDataProcessor)
perceptionManager.addPerceptionInformationListener(perceptionInformationListener)
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/hsi/PrimaryFlightDisplayModel.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/hsi/PrimaryFlightDisplayModel.kt
index 0446c71c..d608131b 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/hsi/PrimaryFlightDisplayModel.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/hsi/PrimaryFlightDisplayModel.kt
@@ -27,8 +27,12 @@ open class PrimaryFlightDisplayModel constructor(
val aircraftAttitudeProcessor: DataProcessor = DataProcessor.create(Attitude())
override fun inSetup() {
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyAircraftVelocity), velocityProcessor)
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyAircraftAttitude), aircraftAttitudeProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyAircraftVelocity), velocityProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyAircraftAttitude), aircraftAttitudeProcessor)
}
override fun inCleanup() {
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/hsi/SpeedDisplayModel.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/hsi/SpeedDisplayModel.kt
index 89dcda02..95dabbf8 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/hsi/SpeedDisplayModel.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/hsi/SpeedDisplayModel.kt
@@ -33,12 +33,22 @@ open class SpeedDisplayModel constructor(
val windWarningProcessor = DataProcessor.create(WindWarning.UNKNOWN)
override fun inSetup() {
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyAircraftVelocity), velocityProcessor)
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyAircraftAttitude), aircraftAttitudeProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyAircraftVelocity), velocityProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyAircraftAttitude), aircraftAttitudeProcessor)
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyWindSpeed), windSpeedProcessor)
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyWindDirection), windDirectionProcessor)
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyWindWarning), windWarningProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyWindSpeed), windSpeedProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyWindDirection), windDirectionProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyWindWarning), windWarningProcessor)
}
override fun inCleanup() {
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/hsi/SpeedDisplayWidget.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/hsi/SpeedDisplayWidget.kt
index a37f7a3e..24cc92fd 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/hsi/SpeedDisplayWidget.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/hsi/SpeedDisplayWidget.kt
@@ -22,7 +22,6 @@ import android.util.AttributeSet
import dji.sdk.keyvalue.value.common.Attitude
import dji.sdk.keyvalue.value.flightcontroller.WindDirection
import dji.sdk.keyvalue.value.flightcontroller.WindWarning
-import dji.v5.utils.common.LogUtils
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
import java.util.*
@@ -102,8 +101,6 @@ open class SpeedDisplayWidget @JvmOverloads constructor(context: Context, attrs:
}
private fun updateWindStatus(windSpeed: Float, fcWindDirectionStatus: WindDirection, fcWindWarning: WindWarning, aircraftDegree: Float) {
- LogUtils.d(TAG, "windSpeed :" + windSpeed + " Direction:" + fcWindDirectionStatus.name + " waring:" + fcWindWarning.name + " " +
- "aircraftDegree:" + aircraftDegree)
val value = UnitUtils.transFormSpeedIntoDifferentUnit(windSpeed)
val textStr = String.format(Locale.ENGLISH, "WS %04.1f %s", value, getWindDirectionText(fcWindDirectionStatus, aircraftDegree))
if (textStr != mTvWsValue?.text.toString()) {
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/location/LocationWidgetModel.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/location/LocationWidgetModel.kt
index 29a0ee04..c857e781 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/location/LocationWidgetModel.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/location/LocationWidgetModel.kt
@@ -53,7 +53,9 @@ class LocationWidgetModel(
get() = locationStateProcessor.toFlowable()
override fun inSetup() {
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyAircraftLocation), aircraftLocationProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyAircraftLocation), aircraftLocationProcessor)
}
override fun updateStates() {
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/remainingflighttime/RemainingFlightTimeWidgetModel.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/remainingflighttime/RemainingFlightTimeWidgetModel.kt
index c9d0844b..ff88a87a 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/remainingflighttime/RemainingFlightTimeWidgetModel.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/remainingflighttime/RemainingFlightTimeWidgetModel.kt
@@ -65,21 +65,31 @@ class RemainingFlightTimeWidgetModel(
override fun inSetup() {
// For total percentage and flight time
- bindDataProcessor(KeyTools.createKey(BatteryKey.KeyChargeRemainingInPercent), chargeRemainingProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ BatteryKey.KeyChargeRemainingInPercent), chargeRemainingProcessor)
// For red bar batteryPercentNeededToLand
// For H image and yellow bar batteryPercentNeededToGoHome
// For flight time text remainingFlightTime
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyLowBatteryRTHInfo), goHomeAssessmentProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyLowBatteryRTHInfo), goHomeAssessmentProcessor)
// For white dot on the left
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeySeriousLowBatteryWarningThreshold), seriousLowBatteryThresholdProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeySeriousLowBatteryWarningThreshold), seriousLowBatteryThresholdProcessor)
// For white dot on the right
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyLowBatteryWarningThreshold), lowBatteryThresholdProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyLowBatteryWarningThreshold), lowBatteryThresholdProcessor)
// To check if aircraft is flying
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyIsFlying), isAircraftFlyingDataProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyIsFlying), isAircraftFlyingDataProcessor)
}
override fun inCleanup() { // No Clean up required
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/remotecontrollersignal/RemoteControllerSignalWidgetModel.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/remotecontrollersignal/RemoteControllerSignalWidgetModel.kt
index 87e69ca8..c6bacc9c 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/remotecontrollersignal/RemoteControllerSignalWidgetModel.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/remotecontrollersignal/RemoteControllerSignalWidgetModel.kt
@@ -52,7 +52,9 @@ class RemoteControllerSignalWidgetModel(
//region Lifecycle
override fun inSetup() {
- bindDataProcessor(KeyTools.createKey(AirLinkKey.KeyUpLinkQualityRaw), upLinkQualityRawProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ AirLinkKey.KeyUpLinkQualityRaw), upLinkQualityRawProcessor)
}
override fun inCleanup() {
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/setting/SettingPanelWidget.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/setting/SettingPanelWidget.java
index badb3db6..a4dbe563 100755
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/setting/SettingPanelWidget.java
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/setting/SettingPanelWidget.java
@@ -21,7 +21,9 @@
import dji.v5.utils.common.LogUtils;
import dji.v5.ux.R;
import dji.v5.ux.accessory.RTKStartServiceHelper;
+import dji.v5.ux.core.base.DJISDKModel;
import dji.v5.ux.core.base.widget.ConstraintLayoutWidget;
+import dji.v5.ux.core.communication.ObservableInMemoryKeyedStore;
import dji.v5.ux.core.ui.setting.SettingFragmentPagerAdapter;
import dji.v5.ux.core.ui.setting.data.MenuBean;
import dji.v5.ux.core.ui.setting.taplayout.TabViewPager;
@@ -46,12 +48,10 @@
public class SettingPanelWidget extends ConstraintLayoutWidget {
private final String tag = LogUtils.getTag(this);
- private ProductType mProductType;
- private ProductType mPrevProductType;
+ private ProductType mProductType = ProductType.UNKNOWN;
+ private ProductType mPrevProductType = ProductType.UNKNOWN;
private boolean mProductConnected;
- private boolean mSearchlightConnected;
- private RCMode mCurrentRcMode = RCMode.NORMAL;
-
+ private RCMode mCurrentRcMode = RCMode.CHANNEL_A;
private FragmentManager fm;
private TabViewPager viewPager;
@@ -62,7 +62,7 @@ public class SettingPanelWidget extends ConstraintLayoutWidget {
private Disposable mRestartDispose;
private CompositeDisposable mCompositeDisposable = new CompositeDisposable();
- private SettingPanelWidgetModel widgetModel;
+ private SettingPanelWidgetModel widgetModel = new SettingPanelWidgetModel(DJISDKModel.getInstance(), ObservableInMemoryKeyedStore.getInstance());
public SettingPanelWidget(Context context) {
this(context, null);
@@ -76,14 +76,11 @@ public SettingPanelWidget(Context context, AttributeSet attrs, int defStyleAttr)
super(context, attrs, defStyleAttr);
initializeView();
showWidgets();
- }
-
- public void setWidgetModel(SettingPanelWidgetModel settingPanelWidgetModel) {
- this.widgetModel = settingPanelWidgetModel;
prepareData();
}
+
protected void initializeView() {
LayoutInflater.from(getContext()).inflate(R.layout.uxsdk_panel_layout_setting, this, true);
setDescendantFocusability(FOCUS_AFTER_DESCENDANTS);
@@ -93,57 +90,58 @@ protected void initializeView() {
}
+ @Override
+ protected void onAttachedToWindow() {
+ super.onAttachedToWindow();
+ if (!isInEditMode()) {
+ widgetModel.setup();
+ }
+ }
+
protected void prepareData() {
- mCompositeDisposable.add(widgetModel.getRcModeProcessor().toFlowable().subscribe(rcMode -> {
- if (rcMode != mCurrentRcMode) {
+ mCompositeDisposable.add(widgetModel.getRcModeProcessor().toFlowableOnUI().distinctUntilChanged().subscribe(rcMode -> {
+ if (rcMode != RCMode.UNKNOWN && rcMode != mCurrentRcMode) {
mCurrentRcMode = rcMode;
updateData(rcMode);
}
}));
+ mPrevProductType = widgetModel.getProduceType();
+ mCompositeDisposable.add(widgetModel.getProductTypeProcessor().toFlowableOnUI().distinctUntilChanged().subscribe(productType -> mProductType = productType));
- mCompositeDisposable.add(widgetModel.getProductTypeProcessor().toFlowable().subscribe(productType -> mProductType = productType));
-
- mCompositeDisposable.add(widgetModel.getFlightControllerConnectProcessor().toFlowable().subscribe(connection -> {
+ mProductConnected = widgetModel.getFlightControllerConnectStatus();
+ mCompositeDisposable.add(widgetModel.getFlightControllerConnectProcessor().toFlowableOnUI().distinctUntilChanged().subscribe(connection -> {
if (connection != mProductConnected) {
mProductConnected = connection;
- if (mProductConnected && mPrevProductType != mProductType) {
+ if (mProductConnected && mProductType != ProductType.UNKNOWN && mPrevProductType != mProductType) {
delayRestartPanel();
+ mPrevProductType = mProductType;
}
- mPrevProductType = mProductType;
}
}));
- addRTKRtkModuleAvailableListener();
- addPayloadConnectListener();
-
-
- }
-
- private void addRTKRtkModuleAvailableListener() {
- mCompositeDisposable.add(RTKStartServiceHelper.INSTANCE.getRtkModuleAvailable().subscribe(aBoolean -> {
+ mCompositeDisposable.add(RTKStartServiceHelper.INSTANCE.getRtkModuleAvailable().distinctUntilChanged().observeOn(AndroidSchedulers.mainThread()).subscribe(aBoolean -> {
if (isSupportAdvRtk(aBoolean)) {
mAdapter.addRTKPanel();
} else {
mAdapter.removeRTKPanel();
}
}));
- }
- private void addPayloadConnectListener() {
- mCompositeDisposable.add(widgetModel.getPayloadConnectedProcessor().toFlowable().distinctUntilChanged().subscribe(aBoolean -> {
- if (aBoolean) {
- mAdapter.addPayloadPanel();
- } else {
+ mCompositeDisposable.add(widgetModel.getPayloadConnectedStatusMapProcessor().toFlowableOnUI().subscribe(payloadIndexTypeBooleanHashMap -> {
+ if (payloadIndexTypeBooleanHashMap.isEmpty()) {
mAdapter.removePayloadPanel();
+ } else {
+ mAdapter.addPayloadPanel();
}
+
}));
}
+
protected void showWidgets() {
- LogUtils.d(tag, "showWidgets");
fm = ((FragmentActivity) getContext()).getSupportFragmentManager();
if (isSlaverRcMode(mCurrentRcMode)) {
createSlaverFragments();
@@ -152,7 +150,6 @@ protected void showWidgets() {
}
mAdapter = new SettingFragmentPagerAdapter(fm, menus, mFragments);
viewPager.setAdapter(mAdapter);
- // mAdapter.notifyDataSetChanged();
mTabLayout.setupWithViewPager(viewPager);
@@ -177,6 +174,9 @@ protected void showWidgets() {
protected void onDetachedFromWindow() {
destroy();
super.onDetachedFromWindow();
+ if (!isInEditMode()) {
+ widgetModel.cleanup();
+ }
}
private void destroy() {
@@ -208,9 +208,7 @@ private void destroy() {
private void setMasterFragmentData() {
- LogUtils.d(tag, "setMasterFragmentData");
createMasterFragments();
- // mAdapter.notifyDataSetChanged();
if (!TextUtils.isEmpty(getCurrentItemFlag())) {
setCurrentItem(getCurrentItemFlag());
} else {
@@ -245,10 +243,6 @@ private void createMasterFragments() {
mFragments.add(SettingMenuFragment.newInstance(MenuFragmentFactory.FRAGMENT_TAG_GIMBAL));
- if (mSearchlightConnected) {
- menus.add(new MenuBean(R.drawable.uxsdk_ic_setting_psdk_active, R.drawable.uxsdk_ic_setting_psdk));
- mFragments.add(SettingMenuFragment.newInstance(MenuFragmentFactory.FRAGMENT_TAG_SEARCHLIGHT_ACCESSORY));
- }
if (isSupportAdvRtk(false)) {
menus.add(new MenuBean(R.drawable.uxsdk_ic_setting_rtk_active, R.drawable.uxsdk_ic_setting_rtk));
mFragments.add(SettingMenuFragment.newInstance(MenuFragmentFactory.FRAGMENT_TAG_RTK));
@@ -260,7 +254,6 @@ private void createMasterFragments() {
private void setSlaverFragmentData() {
createSlaverFragments();
- // mAdapter.notifyDataSetChanged();
setCurrentItem(MenuFragmentFactory.FRAGMENT_TAG_RC);
mAdapter.notifyDataSetChanged();
}
@@ -283,7 +276,7 @@ private void createSlaverFragments() {
public void setCurrentItem(String flag) {
if (mAdapter == null) {
- LogUtils.d(tag, "SettingPanel is not ready!");
+ LogUtils.e(tag, "SettingPanel is not ready!");
return;
}
int result = mAdapter.getSelectIndex(flag);
@@ -306,9 +299,6 @@ private void delayRestartPanel() {
.delay(1, TimeUnit.SECONDS)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(aBoolean -> {
- menus.clear();
- mFragments.clear();
- mAdapter.notifyDataSetChanged();
if (isSlaverRcMode(mCurrentRcMode)) {
setSlaverFragmentData();
} else {
@@ -318,7 +308,6 @@ private void delayRestartPanel() {
}
private void updateData(RCMode rcMode) {
- LogUtils.d(tag, "rcMode=" + rcMode);
if (isSlaverRcMode(rcMode)) {
setSlaverFragmentData();
} else {
@@ -327,7 +316,6 @@ private void updateData(RCMode rcMode) {
}
private boolean isSlaverRcMode(RCMode mode) {
-
if (mode != null) {
return mode == RCMode.SLAVE || mode == RCMode.SLAVE_SUB;
}
@@ -337,7 +325,7 @@ private boolean isSlaverRcMode(RCMode mode) {
//辅控不支持RTK
private boolean isSupportAdvRtk(Boolean isRTKModuleAvailable) {
- return !isSlaverRcMode(mCurrentRcMode) && isRTKModuleAvailable || ProductUtil.isM300Product() || ProductUtil.isM30Product()||ProductUtil.isM3EProduct();
+ return !isSlaverRcMode(mCurrentRcMode) && isRTKModuleAvailable || ProductUtil.isM300Product() || ProductUtil.isM30Product() || ProductUtil.isM350Product();
}
@Override
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/setting/SettingPanelWidgetModel.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/setting/SettingPanelWidgetModel.kt
index e1af152a..d92c3259 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/setting/SettingPanelWidgetModel.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/setting/SettingPanelWidgetModel.kt
@@ -3,9 +3,11 @@ package dji.v5.ux.core.widget.setting
import dji.sdk.keyvalue.key.*
import dji.sdk.keyvalue.value.product.ProductType
import dji.sdk.keyvalue.value.remotecontroller.RCMode
+import dji.v5.et.create
+import dji.v5.et.get
import dji.v5.manager.KeyManager
import dji.v5.manager.aircraft.payload.PayloadCenter
-import dji.v5.manager.aircraft.payload.listener.PayloadBasicInfoListener
+import dji.v5.manager.aircraft.payload.PayloadIndexType
import dji.v5.ux.core.base.DJISDKModel
import dji.v5.ux.core.base.WidgetModel
import dji.v5.ux.core.communication.ObservableInMemoryKeyedStore
@@ -23,25 +25,48 @@ class SettingPanelWidgetModel(
djiSdkModel: DJISDKModel,
keyedStore: ObservableInMemoryKeyedStore,
) : WidgetModel(djiSdkModel, keyedStore) {
-
+ private val payloadConnectStatusMap = HashMap()
val productTypeProcessor = DataProcessor.create(ProductType.UNKNOWN)
val flightControllerConnectProcessor = DataProcessor.create(false)
val rcModeProcessor = DataProcessor.create(RCMode.UNKNOWN)
- val payloadConnectedProcessor = DataProcessor.create(false)
- val payloadBasicInfoListener = PayloadBasicInfoListener {
- payloadConnectedProcessor.onNext(it.isConnected)
- }
+ val payloadConnectedStatusMapProcessor = DataProcessor.create(payloadConnectStatusMap)
+
override fun inSetup() {
- bindDataProcessor(KeyTools.createKey(ProductKey.KeyProductType), productTypeProcessor)
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyConnection), flightControllerConnectProcessor)
- bindDataProcessor(KeyTools.createKey(RemoteControllerKey.KeyRcMachineMode), rcModeProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ ProductKey.KeyProductType), productTypeProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyConnection), flightControllerConnectProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ RemoteControllerKey.KeyRcMachineMode), rcModeProcessor)
+
PayloadCenter.getInstance().payloadManager.forEach {
- it.value.addPayloadBasicInfoListener { payloadBasicInfoListener }
+ it.value.addPayloadBasicInfoListener { payloadBasicInfo ->
+ run {
+ if (payloadBasicInfo.isConnected) {
+ payloadConnectStatusMap[it.key] = true
+ } else {
+ payloadConnectStatusMap.remove(it.key)
+ }
+ payloadConnectedStatusMapProcessor.onNext(payloadConnectStatusMap)
+
+ }
+ }
}
}
override fun inCleanup() {
KeyManager.getInstance().cancelListen(this)
}
+
+ fun getFlightControllerConnectStatus(): Boolean {
+ return FlightControllerKey.KeyConnection.create().get(false)
+ }
+
+ fun getProduceType(): ProductType {
+ return ProductKey.KeyProductType.create().get(ProductType.UNKNOWN)
+ }
}
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/simulator/SimulatorIndicatorWidgetModel.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/simulator/SimulatorIndicatorWidgetModel.kt
index c2f701b4..487edf74 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/simulator/SimulatorIndicatorWidgetModel.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/simulator/SimulatorIndicatorWidgetModel.kt
@@ -52,7 +52,9 @@ class SimulatorIndicatorWidgetModel(
get() = isSimulatorStartedProcessor.toFlowable()
override fun inSetup() {
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyIsSimulatorStarted), isSimulatorStartedProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyIsSimulatorStarted), isSimulatorStartedProcessor)
}
override fun inCleanup() {
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/systemstatus/SystemStatusWidget.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/systemstatus/SystemStatusWidget.kt
index 29c16381..6bb5d481 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/systemstatus/SystemStatusWidget.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/systemstatus/SystemStatusWidget.kt
@@ -28,7 +28,6 @@ import android.content.Context
import android.graphics.drawable.Drawable
import android.util.AttributeSet
import android.util.Pair
-import android.view.View
import android.view.animation.Animation
import android.view.animation.AnimationUtils
import android.widget.ImageView
@@ -40,7 +39,6 @@ import androidx.core.content.res.use
import dji.v5.manager.diagnostic.DJIDeviceStatus
import dji.v5.manager.diagnostic.WarningLevel
import dji.v5.utils.common.DisplayUtil
-import dji.v5.utils.common.LogUtils
import io.reactivex.rxjava3.core.Flowable
import io.reactivex.rxjava3.disposables.Disposable
import io.reactivex.rxjava3.functions.Consumer
@@ -52,7 +50,6 @@ import dji.v5.ux.core.base.WidgetSizeDescription
import dji.v5.ux.core.base.widget.ConstraintLayoutWidget
import dji.v5.ux.core.communication.GlobalPreferencesManager
import dji.v5.ux.core.communication.ObservableInMemoryKeyedStore
-import dji.v5.ux.core.communication.OnStateChangeCallback
import dji.v5.ux.core.extension.*
import dji.v5.ux.core.util.RxUtil
import dji.v5.ux.core.util.UnitConversionUtil
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/systemstatus/SystemStatusWidgetModel.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/systemstatus/SystemStatusWidgetModel.kt
index 41ee31f3..213975f0 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/systemstatus/SystemStatusWidgetModel.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/systemstatus/SystemStatusWidgetModel.kt
@@ -48,7 +48,8 @@ class SystemStatusWidgetModel(
) : WidgetModel(djiSdkModel, keyedStore) {
//region Fields
- private val systemStatusProcessor: DataProcessor = DataProcessor.create(DJIDeviceStatus.NORMAL)
+ private val systemStatusProcessor: DataProcessor = DataProcessor.create(
+ DJIDeviceStatus.NORMAL)
private val areMotorsOnDataProcessor: DataProcessor = DataProcessor.create(false)
private val maxHeightProcessor: DataProcessor = DataProcessor.create(0)
private val unitTypeProcessor: DataProcessor = DataProcessor.create(UnitConversionUtil.UnitType.METRIC)
@@ -96,8 +97,12 @@ class SystemStatusWidgetModel(
//region LifeCycle
override fun inSetup() {
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyAreMotorsOn), areMotorsOnDataProcessor)
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyFlightLimitHeight), maxHeightProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyAreMotorsOn), areMotorsOnDataProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyFlightLimitHeight), maxHeightProcessor)
val unitKey = UXKeys.create(GlobalPreferenceKeys.UNIT_TYPE)
bindDataProcessor(unitKey, unitTypeProcessor)
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/verticalvelocity/VerticalVelocityWidgetModel.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/verticalvelocity/VerticalVelocityWidgetModel.kt
index b8dbb5e0..08ffcc40 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/verticalvelocity/VerticalVelocityWidgetModel.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/verticalvelocity/VerticalVelocityWidgetModel.kt
@@ -59,7 +59,9 @@ class VerticalVelocityWidgetModel(
get() = verticalVelocityStateProcessor.toFlowable()
override fun inSetup() {
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyAircraftVelocity), velocityProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyAircraftVelocity), velocityProcessor)
bindDataProcessor(GlobalPreferenceKeys.create(GlobalPreferenceKeys.UNIT_TYPE), unitTypeDataProcessor)
preferencesManager?.setUpListener()
preferencesManager?.let { unitTypeDataProcessor.onNext(it.unitType) }
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/videosignal/VideoSignalWidgetModel.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/videosignal/VideoSignalWidgetModel.kt
index 9251ebaa..26c8f822 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/videosignal/VideoSignalWidgetModel.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/videosignal/VideoSignalWidgetModel.kt
@@ -66,9 +66,15 @@ class VideoSignalWidgetModel(
//region Lifecycle
override fun inSetup() {
- bindDataProcessor(KeyTools.createKey(AirLinkKey.KeyFrequencyPoint), ocuFrequencyPointIndexProcessor)
- bindDataProcessor(KeyTools.createKey(AirLinkKey.KeyDownLinkQualityRaw), videoSignalQualityProcessor)
- bindDataProcessor(KeyTools.createKey(AirLinkKey.KeyFrequencyBand), airlinkFrequencyBandProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ AirLinkKey.KeyFrequencyPoint), ocuFrequencyPointIndexProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ AirLinkKey.KeyDownLinkQualityRaw), videoSignalQualityProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ AirLinkKey.KeyFrequencyBand), airlinkFrequencyBandProcessor)
}
override fun inCleanup() {
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/vps/VPSWidgetModel.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/vps/VPSWidgetModel.kt
index dfc4045b..ef508648 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/vps/VPSWidgetModel.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/core/widget/vps/VPSWidgetModel.kt
@@ -59,9 +59,15 @@ class VPSWidgetModel(
get() = vpsStateProcessor.toFlowable()
override fun inSetup() {
- bindDataProcessor(KeyTools.createKey(FlightAssistantKey.KeyVisionPositioningEnabled), visionPositioningEnabledProcessor)
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyIsUltrasonicUsed), ultrasonicBeingUsedProcessor)
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyUltrasonicHeight), rawUltrasonicHeightProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightAssistantKey.KeyVisionPositioningEnabled), visionPositioningEnabledProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyIsUltrasonicUsed), ultrasonicBeingUsedProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyUltrasonicHeight), rawUltrasonicHeightProcessor)
val unitTypeKey = GlobalPreferenceKeys.create(GlobalPreferenceKeys.UNIT_TYPE)
bindDataProcessor(unitTypeKey, unitTypeDataProcessor)
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/flightparam/DistanceLimitWidget.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/flightparam/DistanceLimitWidget.java
index 12b23ec5..6e265e9f 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/flightparam/DistanceLimitWidget.java
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/flightparam/DistanceLimitWidget.java
@@ -1,17 +1,21 @@
package dji.v5.ux.flight.flightparam;
+import static dji.sdk.keyvalue.value.flightcontroller.GoHomePathMode.HEIGHT_FIXED;
+import static dji.sdk.keyvalue.value.flightcontroller.GoHomePathMode.UNKNOWN;
import static dji.v5.ux.core.base.SchedulerProvider.ui;
import android.content.Context;
import android.util.AttributeSet;
import android.view.View;
+import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import dji.sdk.keyvalue.value.flightcontroller.FailsafeAction;
+import dji.sdk.keyvalue.value.flightcontroller.GoHomePathMode;
import dji.v5.ux.R;
import dji.v5.ux.accessory.DescSpinnerCell;
import dji.v5.ux.core.base.DJISDKModel;
@@ -34,7 +38,10 @@ public class DistanceLimitWidget extends ConstraintLayoutWidget implemen
private EditorCell mMaxHeightEditCell;
private EditorCell mMaxRadiusEditorCell;
private SwitcherCell mMaxRadiusCell;
+ private TextView mRTHTipTv;
private int maxHeight = 500;
+ private static final int ALARM_HEIGHT = 120;
+ private static final int CONFIRM_ALARM_HEIGHT = 500;
public DistanceLimitWidget(@NonNull Context context) {
super(context);
}
@@ -57,6 +64,7 @@ protected void initView(@NonNull Context context, @Nullable AttributeSet attrs,
mMaxRadiusEditorCell = findViewById(R.id.setting_menu_aircraft_maxRadius);
mMaxRadiusEditorCell.setOnValueChangedListener(this);
mMaxRadiusCell = findViewById(R.id.setting_menu_aircraft_maxRadius_switch);
+ mRTHTipTv = findViewById(R.id.setting_menu_aircraft_go_home_mode_desc);
mMaxRadiusCell.setOnCheckedChangedListener((cell, isChecked) -> {
widgetModel.setDistanceLimitEnabled(isChecked).subscribe();
@@ -77,6 +85,16 @@ protected void reactToModelChanges() {
addReaction(widgetModel.getHomeLimitHeight().observeOn(ui()).subscribe(this::updateHeightLimit));
addReaction(widgetModel.getDistanceLimit().observeOn(ui()).subscribe(this::updateDistanceLimit));
addReaction(widgetModel.getDistanceLimitEnabled().observeOn(ui()).subscribe(this::updateDistanceLimitEnable));
+ addReaction(widgetModel.getGoHomePathMode().observeOn(ui()).subscribe(this::updateGoHomeMode));
+ }
+
+ private void updateGoHomeMode(GoHomePathMode goHomePathMode) {
+ // 别的飞机可能没有智能返航功能，如果是UNKNOWN的话，认为是旧的设定高度返航模式，提示设定高度返航的文案
+ if (goHomePathMode == HEIGHT_FIXED || goHomePathMode == UNKNOWN) {
+ mRTHTipTv.setText(R.string.uxsdk_setting_menu_flyc_smart_rth_set_altitude);
+ } else {
+ mRTHTipTv.setText(R.string.uxsdk_setting_menu_flyc_smart_rth_smart_altitude);
+ }
}
private void updateDistanceLimitEnable(Boolean isChecked) {
@@ -132,6 +150,7 @@ public void onValueChanged(EditorCell cell, int inputValue, int validValue) {
}
widgetModel.setGoHomeHeight( inputValue).observeOn(ui()).subscribe(getFinishObserve());
} else if(cell.getId() == R.id.setting_menu_aircraft_maxHeight) {
+ checkMaxFlightHeight(inputValue);
widgetModel.setHeightLimit( inputValue).observeOn(ui()).subscribe(getFinishObserve());
} else if(cell.getId() == R.id.setting_menu_aircraft_maxRadius){
widgetModel.setDistanceLimit(inputValue).observeOn(ui()).subscribe(getFinishObserve());
@@ -139,7 +158,17 @@ public void onValueChanged(EditorCell cell, int inputValue, int validValue) {
}
- private CompletableObserver getFinishObserve(){
+ private void checkMaxFlightHeight(int inputValue) {
+ if(inputValue <= CONFIRM_ALARM_HEIGHT && inputValue > ALARM_HEIGHT){
+ ViewUtil.showToast(getContext() , getContext().getString(R.string.uxsdk_setting_menu_flyc_limit_high_notice) , Toast.LENGTH_LONG);
+ }else if (inputValue > CONFIRM_ALARM_HEIGHT){
+ ViewUtil.showToast(getContext() , getContext().getString(R.string.uxsdk_setting_menu_flyc_limit_high_notice_above_500) , Toast.LENGTH_LONG);
+ }
+
+
+ }
+
+ private CompletableObserver getFinishObserve(){
return new CompletableObserver() {
@Override
public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) {
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/flightparam/DistanceLimitWidgetModel.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/flightparam/DistanceLimitWidgetModel.java
index 411079d8..4315b8cb 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/flightparam/DistanceLimitWidgetModel.java
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/flightparam/DistanceLimitWidgetModel.java
@@ -1,21 +1,13 @@
package dji.v5.ux.flight.flightparam;
-import android.content.Context;
-import android.util.AttributeSet;
-
import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import dji.sdk.keyvalue.key.FlightControllerKey;
import dji.sdk.keyvalue.key.KeyTools;
-import dji.sdk.keyvalue.value.flightcontroller.FailsafeAction;
-import dji.v5.ux.R;
+import dji.sdk.keyvalue.value.flightcontroller.GoHomePathMode;
import dji.v5.ux.core.base.DJISDKModel;
-import dji.v5.ux.core.base.EditorCell;
-import dji.v5.ux.core.base.SwitcherCell;
import dji.v5.ux.core.base.WidgetModel;
-import dji.v5.ux.core.base.widget.ConstraintLayoutWidget;
import dji.v5.ux.core.communication.ObservableInMemoryKeyedStore;
import dji.v5.ux.core.util.DataProcessor;
import io.reactivex.rxjava3.core.Completable;
@@ -27,6 +19,7 @@ public class DistanceLimitWidgetModel extends WidgetModel {
private final DataProcessor heightLimitDataProcessor = DataProcessor.create(500);
private final DataProcessor distanceLimitDataProcessor = DataProcessor.create(5000);
private final DataProcessor distanceLimitEnableDataProcessor = DataProcessor.create(false);
+ private final DataProcessor goHomePathModeProcessor = DataProcessor.create(GoHomePathMode.UNKNOWN);
protected DistanceLimitWidgetModel(@NonNull DJISDKModel djiSdkModel, @NonNull ObservableInMemoryKeyedStore uxKeyManager) {
super(djiSdkModel, uxKeyManager);
@@ -38,6 +31,7 @@ protected void inSetup() {
bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyHeightLimit), heightLimitDataProcessor);
bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyDistanceLimit) , distanceLimitDataProcessor);
bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyDistanceLimitEnabled) , distanceLimitEnableDataProcessor);
+ bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyGoHomePathMode) , goHomePathModeProcessor);
}
@Override
@@ -45,6 +39,9 @@ protected void inCleanup() {
//do nothing
}
+ public Flowable getGoHomePathMode(){
+ return goHomePathModeProcessor.toFlowable();
+ }
public Flowable getGoHomeHeight(){
return goHomeHeightDataProcessor.toFlowable();
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/flightparam/FpaView.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/flightparam/FpaView.java
index 666e80b1..b68678a8 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/flightparam/FpaView.java
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/flightparam/FpaView.java
@@ -6,6 +6,7 @@
import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
+import android.widget.Toast;
import androidx.annotation.NonNull;
@@ -81,9 +82,9 @@ protected void onAttachedToWindow() {
KeyManager.getInstance().listen(KeyTools.createKey(FlightControllerKey.KeyMultipleFlightModeEnabled), this, (oldValue, open) -> {
LogUtils.d( TAG, "MultipleFlightModeEnabled = " + open);
mSwitcherCell.setOnCheckedChangedListener(null);
- mSwitcherCell.setChecked(open);
+ mSwitcherCell.setChecked(Boolean.TRUE.equals(open));
mSwitcherCell.setOnCheckedChangedListener(FpaView.this);
- updateView(open);
+ updateView(Boolean.TRUE.equals(open));
});
}
@@ -204,6 +205,7 @@ private void showAttiFlycModeDialog(int oldIndex) {
KeyManager.getInstance().setValue(KeyTools.createKey(FlightControllerKey.KeyCustomFunctionMode), ControlChannelMapping.ATTITUDE_NORMAL, new CommonCallbacks.CompletionCallback() {
@Override
public void onSuccess() {
+ ViewUtil.showToast(getContext() , R.string.uxsdk_setting_menu_desc_omni_perception_downwards , Toast.LENGTH_SHORT);
updateFlycModeDescView(1);
}
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/flightparam/GoHomeModeWidgetModel.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/flightparam/GoHomeModeWidgetModel.java
index 673ea803..e90bfdc1 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/flightparam/GoHomeModeWidgetModel.java
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/flightparam/GoHomeModeWidgetModel.java
@@ -2,15 +2,11 @@
import androidx.annotation.NonNull;
-import dji.sdk.keyvalue.key.CameraKey;
-import dji.sdk.keyvalue.key.DJIKey;
import dji.sdk.keyvalue.key.FlightControllerKey;
-import dji.sdk.keyvalue.key.GimbalKey;
import dji.sdk.keyvalue.key.KeyTools;
import dji.sdk.keyvalue.key.ProductKey;
import dji.sdk.keyvalue.value.flightcontroller.GoHomePathMode;
import dji.sdk.keyvalue.value.product.ProductType;
-import dji.v5.common.utils.RxUtil;
import dji.v5.ux.core.base.DJISDKModel;
import dji.v5.ux.core.base.WidgetModel;
import dji.v5.ux.core.communication.ObservableInMemoryKeyedStore;
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/flightparam/HomePointWidget.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/flightparam/HomePointWidget.java
index 86d1242c..0564de00 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/flightparam/HomePointWidget.java
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/flightparam/HomePointWidget.java
@@ -13,13 +13,12 @@
import androidx.annotation.Nullable;
import dji.sdk.keyvalue.value.common.LocationCoordinate2D;
-import dji.sdk.keyvalue.value.flightcontroller.FailsafeAction;
import dji.sdk.keyvalue.value.remotecontroller.RCMode;
import dji.sdk.keyvalue.value.remotecontroller.RcGPSInfo;
import dji.v5.common.utils.GpsUtils;
import dji.v5.utils.common.LocationUtil;
+import dji.v5.utils.common.LogUtils;
import dji.v5.ux.R;
-import dji.v5.ux.accessory.DescSpinnerCell;
import dji.v5.ux.core.base.DJISDKModel;
import dji.v5.ux.core.base.SchedulerProvider;
import dji.v5.ux.core.base.widget.ConstraintLayoutWidget;
@@ -165,6 +164,7 @@ private void setRcHome(Location location, boolean isCurrentRc) {
if (location == null) {
return;
}
+ LogUtils.i("RcHome" , "isCurrentRc keep " + isCurrentRc);
LocationCoordinate2D location2D = new LocationCoordinate2D(location.getLatitude(), location.getLongitude());
if (!GpsUtils.isValid(location2D.getLatitude() , location2D.getLongitude())) {
ViewUtil.showToast(getContext(),R.string.uxsdk_fpv_toast_homepoint_setting_failed , Toast.LENGTH_SHORT);
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/flightparam/HomeSetWidgetModel.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/flightparam/HomeSetWidgetModel.java
index 35f66320..33cc2afb 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/flightparam/HomeSetWidgetModel.java
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/flightparam/HomeSetWidgetModel.java
@@ -6,20 +6,15 @@
import androidx.annotation.NonNull;
-import java.security.Key;
-
import dji.sdk.keyvalue.key.FlightControllerKey;
import dji.sdk.keyvalue.key.KeyTools;
import dji.sdk.keyvalue.key.ProductKey;
import dji.sdk.keyvalue.key.RemoteControllerKey;
-import dji.sdk.keyvalue.value.common.EmptyMsg;
import dji.sdk.keyvalue.value.common.LocationCoordinate2D;
-import dji.sdk.keyvalue.value.flightcontroller.FailsafeAction;
import dji.sdk.keyvalue.value.product.ProductType;
import dji.sdk.keyvalue.value.remotecontroller.RCMode;
import dji.sdk.keyvalue.value.remotecontroller.RcGPSInfo;
import dji.v5.common.utils.GpsUtils;
-import dji.v5.common.utils.RxUtil;
import dji.v5.manager.KeyManager;
import dji.v5.utils.common.LocationUtil;
import dji.v5.ux.core.base.DJISDKModel;
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/flightparam/LedWidget.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/flightparam/LedWidget.java
new file mode 100644
index 00000000..6caf4a6d
--- /dev/null
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/flightparam/LedWidget.java
@@ -0,0 +1,49 @@
+package dji.v5.ux.flight.flightparam;
+
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import dji.v5.ux.R;
+import dji.v5.ux.core.base.widget.ConstraintLayoutWidget;
+
+public class LedWidget extends ConstraintLayoutWidget {
+
+ public LedWidget(@NonNull Context context) {
+ super(context);
+ }
+
+ public LedWidget(@NonNull Context context, @Nullable AttributeSet attrs) {
+ super(context, attrs);
+ }
+
+ public LedWidget(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+ super(context, attrs, defStyleAttr);
+ }
+
+ @Override
+ protected void initView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+ inflate(context, R.layout.uxsdk_widget_common_led, this);
+
+ }
+
+ @Override
+ protected void reactToModelChanges() {
+ //add log
+ }
+
+ @Override
+ protected void onAttachedToWindow() {
+ super.onAttachedToWindow();
+ }
+
+ @Override
+ protected void onDetachedFromWindow() {
+ super.onDetachedFromWindow();
+ }
+
+
+}
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/flightparam/LostActionWidgetModel.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/flightparam/LostActionWidgetModel.java
index 4e5df890..b9677a2a 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/flightparam/LostActionWidgetModel.java
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/flightparam/LostActionWidgetModel.java
@@ -4,10 +4,7 @@
import dji.sdk.keyvalue.key.FlightControllerKey;
import dji.sdk.keyvalue.key.KeyTools;
-import dji.sdk.keyvalue.key.ProductKey;
import dji.sdk.keyvalue.value.flightcontroller.FailsafeAction;
-import dji.sdk.keyvalue.value.flightcontroller.GoHomePathMode;
-import dji.sdk.keyvalue.value.product.ProductType;
import dji.v5.ux.core.base.DJISDKModel;
import dji.v5.ux.core.base.WidgetModel;
import dji.v5.ux.core.communication.ObservableInMemoryKeyedStore;
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/returnhome/ReturnHomeWidgetModel.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/returnhome/ReturnHomeWidgetModel.kt
index 20aece40..e79332e8 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/returnhome/ReturnHomeWidgetModel.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/returnhome/ReturnHomeWidgetModel.kt
@@ -79,10 +79,14 @@ class ReturnHomeWidgetModel(
*/
val distanceToHome: ReturnHomeDistance
get() {
- val goHomeHeightKey: DJIKey = KeyTools.createKey(FlightControllerKey.KeyGoHomeHeight)
- val homeLocationKey: DJIKey = KeyTools.createKey(FlightControllerKey.KeyHomeLocation)
- val currentHeightKey: DJIKey = KeyTools.createKey(FlightControllerKey.KeyAltitude)
- val aircraftLocationKey: DJIKey = KeyTools.createKey(FlightControllerKey.KeyAircraftLocation)
+ val goHomeHeightKey: DJIKey = KeyTools.createKey(
+ FlightControllerKey.KeyGoHomeHeight)
+ val homeLocationKey: DJIKey = KeyTools.createKey(
+ FlightControllerKey.KeyHomeLocation)
+ val currentHeightKey: DJIKey = KeyTools.createKey(
+ FlightControllerKey.KeyAltitude)
+ val aircraftLocationKey: DJIKey = KeyTools.createKey(
+ FlightControllerKey.KeyAircraftLocation)
var currentHeight = 0f
var goHomeHeight = 0f
var homeLatitude = Double.NaN
@@ -150,30 +154,46 @@ class ReturnHomeWidgetModel(
* Performs return to home action
*/
fun performReturnHomeAction(): Completable {
- return djiSdkModel.performActionWithOutResult(KeyTools.createKey(FlightControllerKey.KeyStartGoHome))
+ return djiSdkModel.performActionWithOutResult(
+ KeyTools.createKey(
+ FlightControllerKey.KeyStartGoHome))
}
/**
* Performs cancel return to home action
*/
fun performCancelReturnHomeAction(): Completable {
- return djiSdkModel.performActionWithOutResult(KeyTools.createKey(FlightControllerKey.KeyStopGoHome))
+ return djiSdkModel.performActionWithOutResult(
+ KeyTools.createKey(
+ FlightControllerKey.KeyStopGoHome))
}
//endregion
//region Lifecycle
override fun inSetup() {
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyIsFlying), isFlyingDataProcessor)
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyIsInLandingMode), isAutoLandingDataProcessor)
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyAreMotorsOn), areMotorsOnDataProcessor)
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyFCFlightMode), flightModeProcessor) {
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyIsFlying), isFlyingDataProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyIsInLandingMode), isAutoLandingDataProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyAreMotorsOn), areMotorsOnDataProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyFCFlightMode), flightModeProcessor) {
isGoingHomeDataProcessor.onNext(it == FCFlightMode.GO_HOME || it == FCFlightMode.AUTO_LANDING)
}
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyAutoRTHReason), autoRTHReasonProcessor){
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyAutoRTHReason), autoRTHReasonProcessor){
isCancelReturnToHomeDisabledProcessor.onNext(it == FCAutoRTHReason.MC_PROTECT_GOHOME)
}
- bindDataProcessor(KeyTools.createKey(RemoteControllerKey.KeyRcMachineMode), rcModeDataProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ RemoteControllerKey.KeyRcMachineMode), rcModeDataProcessor)
// val flyZoneReturnToHomeState: DJIKey = FlightControllerKey.create(FlightControllerKey.RETURN_TO_HOME_STATE)
// bindDataProcessor(flyZoneReturnToHomeState, flyZoneReturnToHomeStateProcessor)
val unitKey = UXKeys.create(GlobalPreferenceKeys.UNIT_TYPE)
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/takeoff/TakeOffWidget.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/takeoff/TakeOffWidget.kt
index 8c33e90a..f92bb4b8 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/takeoff/TakeOffWidget.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/takeoff/TakeOffWidget.kt
@@ -660,6 +660,9 @@ open class TakeOffWidget @JvmOverloads constructor(
TakeOffLandingState.WAITING_FOR_LANDING_CONFIRMATION -> showLandingConfirmationDialog()
TakeOffLandingState.READY_TO_TAKE_OFF,
TakeOffLandingState.TAKE_OFF_DISABLED -> slidingDialog?.dismiss()
+ else -> {
+ //do nothing
+ }
}
}
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/takeoff/TakeOffWidgetModel.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/takeoff/TakeOffWidgetModel.kt
index 110597ab..70aa2dd7 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/takeoff/TakeOffWidgetModel.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/flight/takeoff/TakeOffWidgetModel.kt
@@ -125,7 +125,9 @@ class TakeOffWidgetModel(
* Performs take off action
*/
fun performTakeOffAction(): Completable {
- return djiSdkModel.performActionWithOutResult(KeyTools.createKey(FlightControllerKey.KeyStartTakeoff))
+ return djiSdkModel.performActionWithOutResult(
+ KeyTools.createKey(
+ FlightControllerKey.KeyStartTakeoff))
.onErrorResumeNext { error: Throwable ->
if (areMotorsOnDataProcessor.value) {
return@onErrorResumeNext Completable.complete()
@@ -139,8 +141,9 @@ class TakeOffWidgetModel(
* Performs precision take off action
*/
fun performPrecisionTakeOffAction(): Completable {
- //TODO KeyPrecisionStartTakeoff存在问题，csdk那边修复时间未知，这里先换成takeoff
- return djiSdkModel.performActionWithOutResult(KeyTools.createKey(FlightControllerKey.KeyStartTakeoff))
+ return djiSdkModel.performActionWithOutResult(
+ KeyTools.createKey(
+ FlightControllerKey.KeyStartTakeoff))
.onErrorResumeNext { error: Throwable? ->
if (areMotorsOnDataProcessor.value) {
return@onErrorResumeNext Completable.complete()
@@ -154,14 +157,18 @@ class TakeOffWidgetModel(
* Performs landing action
*/
fun performLandingAction(): Completable {
- return djiSdkModel.performActionWithOutResult(KeyTools.createKey(FlightControllerKey.KeyStartAutoLanding))
+ return djiSdkModel.performActionWithOutResult(
+ KeyTools.createKey(
+ FlightControllerKey.KeyStartAutoLanding))
}
/**
* Performs cancel landing action
*/
fun performCancelLandingAction(): Completable {
- return djiSdkModel.performActionWithOutResult(KeyTools.createKey(FlightControllerKey.KeyStopAutoLanding))
+ return djiSdkModel.performActionWithOutResult(
+ KeyTools.createKey(
+ FlightControllerKey.KeyStopAutoLanding))
}
/**
@@ -169,25 +176,43 @@ class TakeOffWidgetModel(
* landing confirmation is received.
*/
fun performLandingConfirmationAction(): Completable {
- return djiSdkModel.performActionWithOutResult(KeyTools.createKey(FlightControllerKey.KeyConfirmLanding))
+ return djiSdkModel.performActionWithOutResult(
+ KeyTools.createKey(
+ FlightControllerKey.KeyConfirmLanding))
}
//endregion
//region Lifecycle
override fun inSetup() {
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyIsFlying), isFlyingDataProcessor)
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyIsInLandingMode), isAutoLandingDataProcessor)
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyIsLandingConfirmationNeeded), isLandingConfNeededDataProcessor)
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyTouchDownConfirmLimitHeight), forceLandingHeightDataProcessor)
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyFlightModeString), flightModeStringDataProcessor) { value: Any ->
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyIsFlying), isFlyingDataProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyIsInLandingMode), isAutoLandingDataProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyIsLandingConfirmationNeeded), isLandingConfNeededDataProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyTouchDownConfirmLimitHeight), forceLandingHeightDataProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyFlightModeString), flightModeStringDataProcessor) { value: Any ->
isInAttiModeDataProcessor.onNext((value as String).contains("atti", ignoreCase = true))
}
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyAreMotorsOn), areMotorsOnDataProcessor)
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyFCFlightMode), flightModeProcessor) {
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyAreMotorsOn), areMotorsOnDataProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyFCFlightMode), flightModeProcessor) {
isGoingHomeDataProcessor.onNext(it == FCFlightMode.GO_HOME || it == FCFlightMode.AUTO_LANDING)
}
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyAutoRTHReason), autoRTHReasonProcessor) {
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyAutoRTHReason), autoRTHReasonProcessor) {
isCancelAutoLandingDisabledProcessor.onNext(
it == FCAutoRTHReason.WARNING_POWER_LANDING
|| it == FCAutoRTHReason.SMART_POWER_LANDING
@@ -197,11 +222,17 @@ class TakeOffWidgetModel(
|| it == FCAutoRTHReason.BATTERY_FORCE_LANDING
)
}
- bindDataProcessor(KeyTools.createKey(RemoteControllerKey.KeyRcMachineMode), rcModeDataProcessor)
- bindDataProcessor(KeyTools.createKey(ProductKey.KeyProductType), productModelProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ RemoteControllerKey.KeyRcMachineMode), rcModeDataProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ ProductKey.KeyProductType), productModelProcessor)
val unitKey = UXKeys.create(GlobalPreferenceKeys.UNIT_TYPE)
bindDataProcessor(unitKey, unitTypeProcessor)
- bindDataProcessor(KeyTools.createKey(FlightAssistantKey.KeyLandingProtectionState), landingProtectionStateDataProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightAssistantKey.KeyLandingProtectionState), landingProtectionStateDataProcessor)
preferencesManager?.setUpListener()
}
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/gimbal/GimbalFineTuneWidget.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/gimbal/GimbalFineTuneWidget.kt
index abe9d085..cd9c885a 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/gimbal/GimbalFineTuneWidget.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/gimbal/GimbalFineTuneWidget.kt
@@ -49,7 +49,7 @@ open class GimbalFineTuneWidget @JvmOverloads constructor(
var rollDegree: Double = 0.0
var pitchDegree: Double = 0.0
var yawDegree: Double = 0.0
- var currentAxis: PostureFineTuneAxis = PostureFineTuneAxis.ROLL_AXIS
+ var currentAxis: PostureFineTuneAxis = PostureFineTuneAxis.PITCH_AXIS
override fun initView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) {
inflate(context, R.layout.uxsdk_gimbal_fine_tune, this)
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/gimbal/GimbalFineTuneWidgetModel.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/gimbal/GimbalFineTuneWidgetModel.kt
index ee2e0822..4db5c918 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/gimbal/GimbalFineTuneWidgetModel.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/gimbal/GimbalFineTuneWidgetModel.kt
@@ -25,9 +25,15 @@ open class GimbalFineTuneWidgetModel constructor(
private val pitchAdjustDegreeProcessor = DataProcessor.create(0.0)
override fun inSetup() {
- bindDataProcessor(KeyTools.createKey(GimbalKey.KeyFineTuneRollTotalDegree, gimbalIndex.index), rollAdjustDegreeProcessor)
- bindDataProcessor(KeyTools.createKey(GimbalKey.KeyFineTuneYawTotalDegree, gimbalIndex.index), yawAdjustDegreeProcessor)
- bindDataProcessor(KeyTools.createKey(GimbalKey.KeyFineTunePitchTotalDegree, gimbalIndex.index), pitchAdjustDegreeProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ GimbalKey.KeyFineTuneRollTotalDegree, gimbalIndex.index), rollAdjustDegreeProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ GimbalKey.KeyFineTuneYawTotalDegree, gimbalIndex.index), yawAdjustDegreeProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ GimbalKey.KeyFineTunePitchTotalDegree, gimbalIndex.index), pitchAdjustDegreeProcessor)
}
override fun inCleanup() {
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/gimbal/GimbalSettingWidget.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/gimbal/GimbalSettingWidget.kt
index 4d3a1b8e..08679108 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/gimbal/GimbalSettingWidget.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/gimbal/GimbalSettingWidget.kt
@@ -43,13 +43,13 @@ open class GimbalSettingWidget @JvmOverloads constructor(
val btnReset = findViewById(R.id.setting_menu_gimbal_reset_param)
val btnCalibration = findViewById(R.id.setting_menu_gimbal_calibration)
- val gimbalFineTuneWidget = findViewById(R.id.setting_menu_gimbal_fine_tune)
+ val setting_menu_gimbal_adjust = findViewById(R.id.setting_menu_gimbal_adjust)
+
btnReset.setOnClickListener(this)
btnCalibration.setOnClickListener(this)
- gimbalFineTuneWidget.background = null
+ setting_menu_gimbal_adjust.setOnClickListener(this)
- setBackgroundResource(R.drawable.uxsdk_background_black_rectangle)
}
override fun reactToModelChanges() {
@@ -103,8 +103,12 @@ open class GimbalSettingWidget @JvmOverloads constructor(
ViewUtil.showToast(context, R.string.uxsdk_setting_ui_gimbal_calibration_tip, Toast.LENGTH_SHORT)
return
}
+ ViewUtil.showToast(context, R.string.uxsdk_setting_ui_gimbal_auto_calibration_tip, Toast.LENGTH_SHORT)
widgetModel.calibrateGimbal().subscribe()
}
+ else if (v.id ==R.id.setting_menu_gimbal_adjust) {
+ widgetModel.setGimbalClicked()
+ }
}
override fun getGimbalIndex(): GimbalIndex {
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/gimbal/GimbalSettingWidgetModel.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/gimbal/GimbalSettingWidgetModel.kt
index 5c1e025d..04e5e515 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/gimbal/GimbalSettingWidgetModel.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/gimbal/GimbalSettingWidgetModel.kt
@@ -9,7 +9,10 @@ import dji.sdk.keyvalue.value.gimbal.GimbalCalibrationStatusInfo
import dji.v5.ux.core.base.DJISDKModel
import dji.v5.ux.core.base.IGimbalIndex
import dji.v5.ux.core.base.WidgetModel
+import dji.v5.ux.core.communication.GlobalPreferenceKeys
import dji.v5.ux.core.communication.ObservableInMemoryKeyedStore
+import dji.v5.ux.core.communication.UXKey
+import dji.v5.ux.core.communication.UXKeys
import dji.v5.ux.core.util.DataProcessor
import dji.v5.ux.core.util.SettingDefinitions.GimbalIndex
import io.reactivex.rxjava3.core.Completable
@@ -25,11 +28,17 @@ open class GimbalSettingWidgetModel constructor(
private val calibrationStatusProcessor: DataProcessor =
DataProcessor.create(GimbalCalibrationStatusInfo(GimbalCalibrationState.IDLE, 0))
+ val gimbalAdjust : UXKey = UXKeys.create(GlobalPreferenceKeys.GIMBAL_ADJUST_CLICKED)
+
private val areMotorsOnProcessor: DataProcessor = DataProcessor.create(false)
override fun inSetup() {
- bindDataProcessor(KeyTools.createKey(GimbalKey.KeyGimbalCalibrationStatus, gimbalIndex.index), calibrationStatusProcessor)
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyAreMotorsOn), areMotorsOnProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ GimbalKey.KeyGimbalCalibrationStatus, gimbalIndex.index), calibrationStatusProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyAreMotorsOn), areMotorsOnProcessor)
}
override fun inCleanup() {
@@ -58,6 +67,11 @@ open class GimbalSettingWidgetModel constructor(
return areMotorsOnProcessor.toFlowableOnUI()
}
+
+ fun setGimbalClicked(){
+ ObservableInMemoryKeyedStore.getInstance().setValue(gimbalAdjust , true).subscribe()
+ }
+
override fun getGimbalIndex(): GimbalIndex {
return gimbalIndex
}
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/map/MapWidgetModel.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/map/MapWidgetModel.java
index 8d9c062c..7ec40358 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/map/MapWidgetModel.java
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/map/MapWidgetModel.java
@@ -76,12 +76,14 @@ public void onWarningNotificationUpdate(@NonNull FlySafeWarningInformation info)
@Override
public void onSeriousWarningNotificationUpdate(@NonNull FlySafeSeriousWarningInformation info) {
- // No code
+ flyZoneInformationDataProcessor.onNext(info.getFlyZoneInformation());
+
}
@Override
public void onReturnToHomeNotificationUpdate(@NonNull FlySafeReturnToHomeInformation info) {
// No code
+
}
@Override
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/obstacle/AvoidanceShortcutWidgetModel.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/obstacle/AvoidanceShortcutWidgetModel.kt
index c44d1b63..7af8339b 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/obstacle/AvoidanceShortcutWidgetModel.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/obstacle/AvoidanceShortcutWidgetModel.kt
@@ -41,8 +41,12 @@ class AvoidanceShortcutWidgetModel(
}
override fun inSetup() {
- bindDataProcessor(KeyTools.createKey(ProductKey.KeyProductType),productTypeProcessor)
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyFCFlightMode),flightModeProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ ProductKey.KeyProductType),productTypeProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyFCFlightMode),flightModeProcessor)
perceptionManager.addPerceptionInformationListener(perceptionInformationListener)
}
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/obstacle/SwitchStateListener.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/obstacle/SwitchStateListener.kt
new file mode 100644
index 00000000..e72cae1c
--- /dev/null
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/obstacle/SwitchStateListener.kt
@@ -0,0 +1,13 @@
+package dji.v5.ux.obstacle
+
+/**
+ * Description :
+ *
+ * @author: Byte.Cai
+ * date : 2023/9/19
+ *
+ * Copyright (c) 2022, DJI All Rights Reserved.
+ */
+interface SwitchStateListener {
+ fun onUpdate(check:Boolean)
+}
\ No newline at end of file
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/obstacle/VisionPositionWidget.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/obstacle/VisionPositionWidget.kt
index b5420c02..117d93c8 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/obstacle/VisionPositionWidget.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/obstacle/VisionPositionWidget.kt
@@ -30,6 +30,8 @@ class VisionPositionWidget @JvmOverloads constructor(
attrs: AttributeSet? = null,
defStyleAttr: Int = 0,
) : ConstraintLayoutWidget(context, attrs, defStyleAttr), SwitcherCell.OnCheckedChangedListener {
+ private var listener: SwitchStateListener? = null
+
private val widgetModel by lazy {
VisionPositionWidgetModel(DJISDKModel.getInstance(), ObservableInMemoryKeyedStore.getInstance())
}
@@ -86,6 +88,7 @@ class VisionPositionWidget @JvmOverloads constructor(
//do nothing
LogUtils.e(TAG, "setVisionPositioningEnabled onError:$e")
updateVisionSwitchCell(!isChecked)
+
}
})
@@ -101,8 +104,14 @@ class VisionPositionWidget @JvmOverloads constructor(
omni_common_downwards_switcher_cell.setOnCheckedChangedListener(null)
omni_common_downwards_switcher_cell.isChecked = enable
omni_common_downwards_switcher_cell.setOnCheckedChangedListener(this)
+ listener?.onUpdate(enable)
}
+ fun setSwitchStateListener(listener: SwitchStateListener) {
+ this.listener = listener
+ }
+
+
sealed class ModelState
}
\ No newline at end of file
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/remotecontroller/RCPairingWidget.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/remotecontroller/RCPairingWidget.kt
index ccaa3b2e..318b1ef7 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/remotecontroller/RCPairingWidget.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/remotecontroller/RCPairingWidget.kt
@@ -35,6 +35,8 @@ class RCPairingWidget @JvmOverloads constructor(
private var connect = false
private var isMotorOn = false
private var pairingState = PairingState.UNKNOWN
+ private var isStartPairing = false
+ private var isStopPairing = false
private val widgetModel by lazy {
RcCheckFrequencyWidgetModel(DJISDKModel.getInstance(), ObservableInMemoryKeyedStore.getInstance())
@@ -44,7 +46,6 @@ class RCPairingWidget @JvmOverloads constructor(
override fun initView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) {
inflate(context, R.layout.uxsdk_widget_rc_check_frequency_layout, this)
- updateCheckFrequencyText(StringUtils.getResStr(R.string.uxsdk_setting_menu_title_rc_check_frequency))
}
override fun reactToModelChanges() {
@@ -54,18 +55,22 @@ class RCPairingWidget @JvmOverloads constructor(
addReaction(widgetModel.isMotorOnProcessor.toFlowable()
.subscribe { isMotorOn = it })
- addReaction(widgetModel.pairingStateProcessor.toFlowable()
+ addReaction(widgetModel.pairingStateProcessor.toFlowableOnUI()
.subscribe {
- if (pairingState == it) {
+ if (pairingState == it || it == PairingState.UNKNOWN) {
return@subscribe
}
- LogUtils.i(TAG, "pairingState=$it")
- if (pairingState == PairingState.UNPAIRED && PairingState.PAIRING == it) {
- updateCheckFrequencyText(StringUtils.getResStr(R.string.uxsdk_setting_ui_rc_stop_pair))
+ if ((pairingState == PairingState.UNPAIRED) && PairingState.PAIRING == it) {
ViewUtil.showToast(context, StringUtils.getResStr(R.string.uxsdk_setting_ui_rc_start_pair))
} else if (pairingState == PairingState.PAIRING && PairingState.UNPAIRED == it) {
- updateCheckFrequencyText(StringUtils.getResStr(R.string.uxsdk_setting_menu_title_rc_check_frequency))
- ViewUtil.showToast(context, StringUtils.getResStr(R.string.uxsdk_setting_ui_rc_stop_pair))
+ if (isStopPairing) {
+ ViewUtil.showToast(context, StringUtils.getResStr(R.string.uxsdk_setting_ui_rc_stop_pair))
+ } else {
+ ViewUtil.showToast(context, StringUtils.getResStr(R.string.uxsdk_setting_ui_rc_pairing_finish))
+ }
+ } else if (pairingState == PairingState.PAIRING && PairingState.PAIRED == it) {
+ ViewUtil.showToast(context, StringUtils.getResStr(R.string.uxsdk_setting_ui_rc_pairing_finish))
+
}
pairingState = it
@@ -76,6 +81,7 @@ class RCPairingWidget @JvmOverloads constructor(
if (isMotorOn && connect) {
ViewUtil.showToast(context, R.string.uxsdk_dialog_message_rc_cannot_frequency_motorup, Toast.LENGTH_SHORT)
} else if (pairingState == PairingState.PAIRING) {
+ isStopPairing = true
widgetModel.stopPairing().subscribe(object : CompletableObserver {
override fun onSubscribe(d: Disposable?) {
//do nothing
@@ -113,15 +119,6 @@ class RCPairingWidget @JvmOverloads constructor(
}
- private fun updateCheckFrequencyText(content: String) {
- if (TextUtils.isEmpty(content)) {
- return
- }
-
- AndroidSchedulers.mainThread().scheduleDirect {
- setting_menu_rc_check_frequency.text = content
- }
- }
override fun onAttachedToWindow() {
super.onAttachedToWindow()
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/remotecontroller/RcCheckFrequencyWidgetModel.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/remotecontroller/RcCheckFrequencyWidgetModel.kt
index eff66f86..0c6506ff 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/remotecontroller/RcCheckFrequencyWidgetModel.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/remotecontroller/RcCheckFrequencyWidgetModel.kt
@@ -30,9 +30,15 @@ class RcCheckFrequencyWidgetModel(
override fun inSetup() {
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyAreMotorsOn), isMotorOnProcessor)
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyConnection), connectionProcessor)
- bindDataProcessor(KeyTools.createKey(RemoteControllerKey.KeyPairingStatus), pairingStateProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyAreMotorsOn), isMotorOnProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyConnection), connectionProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ RemoteControllerKey.KeyPairingStatus), pairingStateProcessor)
}
@@ -42,11 +48,15 @@ class RcCheckFrequencyWidgetModel(
}
fun startPairing(): Completable {
- return RxUtil.performActionWithOutResult(KeyTools.createKey(RemoteControllerKey.KeyRequestPairing))
+ return RxUtil.performActionWithOutResult(
+ KeyTools.createKey(
+ RemoteControllerKey.KeyRequestPairing))
}
fun stopPairing(): Completable {
- return RxUtil.performActionWithOutResult(KeyTools.createKey(RemoteControllerKey.KeyStopPairing))
+ return RxUtil.performActionWithOutResult(
+ KeyTools.createKey(
+ RemoteControllerKey.KeyStopPairing))
}
}
\ No newline at end of file
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/sample/showcase/defaultlayout/DefaultLayoutActivity.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/sample/showcase/defaultlayout/DefaultLayoutActivity.java
index f6227870..64e94e49 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/sample/showcase/defaultlayout/DefaultLayoutActivity.java
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/sample/showcase/defaultlayout/DefaultLayoutActivity.java
@@ -23,10 +23,11 @@
package dji.v5.ux.sample.showcase.defaultlayout;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
+import android.widget.TextView;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -34,6 +35,8 @@
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
import dji.sdk.keyvalue.value.common.CameraLensType;
import dji.sdk.keyvalue.value.common.ComponentIndexType;
@@ -44,9 +47,12 @@
import dji.v5.common.video.stream.PhysicalDevicePosition;
import dji.v5.common.video.stream.StreamSource;
import dji.v5.manager.datacenter.MediaDataCenter;
+import dji.v5.network.DJINetworkManager;
+import dji.v5.network.IDJINetworkStatusListener;
import dji.v5.utils.common.JsonUtil;
import dji.v5.utils.common.LogUtils;
import dji.v5.ux.R;
+import dji.v5.ux.accessory.RTKStartServiceHelper;
import dji.v5.ux.cameracore.widget.autoexposurelock.AutoExposureLockWidget;
import dji.v5.ux.cameracore.widget.cameracontrols.CameraControlsWidget;
import dji.v5.ux.cameracore.widget.cameracontrols.exposuresettings.ExposureSettingsPanel;
@@ -55,6 +61,10 @@
import dji.v5.ux.cameracore.widget.focusmode.FocusModeWidget;
import dji.v5.ux.cameracore.widget.fpvinteraction.FPVInteractionWidget;
import dji.v5.ux.core.base.SchedulerProvider;
+import dji.v5.ux.core.communication.BroadcastValues;
+import dji.v5.ux.core.communication.GlobalPreferenceKeys;
+import dji.v5.ux.core.communication.ObservableInMemoryKeyedStore;
+import dji.v5.ux.core.communication.UXKeys;
import dji.v5.ux.core.extension.ViewExtensions;
import dji.v5.ux.core.panel.systemstatus.SystemStatusListPanelWidget;
import dji.v5.ux.core.panel.topbar.TopBarPanelWidget;
@@ -68,6 +78,7 @@
import dji.v5.ux.core.widget.setting.SettingWidget;
import dji.v5.ux.core.widget.simulator.SimulatorIndicatorWidget;
import dji.v5.ux.core.widget.systemstatus.SystemStatusWidget;
+import dji.v5.ux.gimbal.GimbalFineTuneWidget;
import dji.v5.ux.map.MapWidget;
import dji.v5.ux.mapkit.core.maps.DJIUiSettings;
import dji.v5.ux.training.simulatorcontrol.SimulatorControlWidget;
@@ -105,8 +116,9 @@ public class DefaultLayoutActivity extends AppCompatActivity {
protected MapWidget mapWidget;
protected TopBarPanelWidget topBarPanel;
protected ConstraintLayout fpvParentView;
-// private SettingPanelWidget mSettingPanelWidget;
-// private DrawerLayout mDrawerLayout;
+ private DrawerLayout mDrawerLayout;
+ private TextView gimbalAdjustDone;
+ private GimbalFineTuneWidget gimbalFineTuneWidget;
private CompositeDisposable compositeDisposable;
@@ -114,6 +126,13 @@ public class DefaultLayoutActivity extends AppCompatActivity {
CameraLensType.UNKNOWN));
private VideoChannelStateChangeListener primaryChannelStateListener = null;
private VideoChannelStateChangeListener secondaryChannelStateListener = null;
+ private final IDJINetworkStatusListener networkStatusListener = isNetworkAvailable -> {
+ if (isNetworkAvailable) {
+ LogUtils.d(TAG, "isNetworkAvailable=" + true);
+ RTKStartServiceHelper.INSTANCE.startRtkService(false);
+ }
+ };
+
//endregion
//region Lifecycle
@@ -122,10 +141,9 @@ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.uxsdk_activity_default_layout);
fpvParentView = findViewById(R.id.fpv_holder);
- ViewExtensions.disableHardwareAccelerated(fpvParentView);
-// mDrawerLayout = findViewById(R.id.root_view);
+ mDrawerLayout = findViewById(R.id.root_view);
topBarPanel = findViewById(R.id.panel_top_bar);
-// settingWidget = topBarPanel.getSettingWidget();
+ settingWidget = topBarPanel.getSettingWidget();
primaryFpvWidget = findViewById(R.id.widget_primary_fpv);
fpvInteractionWidget = findViewById(R.id.widget_fpv_interaction);
secondaryFPVWidget = findViewById(R.id.widget_secondary_fpv);
@@ -142,15 +160,11 @@ protected void onCreate(Bundle savedInstanceState) {
focalZoomWidget = findViewById(R.id.widget_focal_zoom);
cameraControlsWidget = findViewById(R.id.widget_camera_controls);
horizontalSituationIndicatorWidget = findViewById(R.id.widget_horizontal_situation_indicator);
-
+ gimbalAdjustDone = findViewById(R.id.fpv_gimbal_ok_btn);
+ gimbalFineTuneWidget = findViewById(R.id.setting_menu_gimbal_fine_tune);
mapWidget = findViewById(R.id.widget_map);
cameraControlsWidget.getExposureSettingsIndicatorWidget().setStateChangeResourceId(R.id.panel_camera_controls_exposure_settings);
-// ViewStub stub = findViewById(R.id.manual_right_nav_setting_stub);
-// if (stub != null) {
-// mSettingPanelWidget = (SettingPanelWidget) stub.inflate();
-// }
-
initClickListener();
MediaDataCenter.getInstance().getVideoStreamManager().addStreamSourcesListener(sources -> runOnUiThread(() -> updateFPVWidgetSource(sources)));
primaryFpvWidget.setOnFPVStreamSourceListener((devicePosition, lensType) -> {
@@ -169,6 +183,21 @@ protected void onCreate(Bundle savedInstanceState) {
}
});
mapWidget.onCreate(savedInstanceState);
+ getWindow().setBackgroundDrawable(new ColorDrawable(Color.BLACK));
+
+ //实现RTK监测网络，并自动重连机制
+ DJINetworkManager.getInstance().addNetworkStatusListener(networkStatusListener);
+
+ }
+
+ private void isGimableAdjustClicked(BroadcastValues broadcastValues) {
+ if (mDrawerLayout.isDrawerOpen(GravityCompat.END)) {
+ mDrawerLayout.closeDrawers();
+ }
+ horizontalSituationIndicatorWidget.setVisibility(View.GONE);
+ if (gimbalFineTuneWidget != null) {
+ gimbalFineTuneWidget.setVisibility(View.VISIBLE);
+ }
}
private void initClickListener() {
@@ -189,10 +218,17 @@ private void initClickListener() {
if (simulatorIndicatorWidget != null) {
simulatorIndicatorWidget.setOnClickListener(v -> ViewExtensions.toggleVisibility(simulatorControlWidget));
}
+ gimbalAdjustDone.setOnClickListener(view -> {
+ horizontalSituationIndicatorWidget.setVisibility(View.VISIBLE);
+ if (gimbalFineTuneWidget != null) {
+ gimbalFineTuneWidget.setVisibility(View.GONE);
+ }
+
+ });
}
private void toggleRightDrawer() {
-// mDrawerLayout.openDrawer(GravityCompat.END);
+ mDrawerLayout.openDrawer(GravityCompat.END);
}
@@ -202,6 +238,8 @@ protected void onDestroy() {
mapWidget.onDestroy();
MediaDataCenter.getInstance().getVideoStreamManager().clearAllStreamSourcesListeners();
removeChannelStateListener();
+ DJINetworkManager.getInstance().removeNetworkStatusListener(networkStatusListener);
+
}
@Override
@@ -231,6 +269,10 @@ protected void onResume() {
.subscribeOn(SchedulerProvider.io())
.subscribe(result -> runOnUiThread(() -> onCameraSourceUpdated(result.devicePosition, result.lensType)))
);
+ compositeDisposable.add(ObservableInMemoryKeyedStore.getInstance()
+ .addObserver(UXKeys.create(GlobalPreferenceKeys.GIMBAL_ADJUST_CLICKED))
+ .observeOn(SchedulerProvider.ui())
+ .subscribe(this::isGimableAdjustClicked));
ViewUtil.setKeepScreen(this, true);
}
@@ -415,13 +457,13 @@ public CameraSource(PhysicalDevicePosition devicePosition, CameraLensType lensTy
this.lensType = lensType;
}
}
-//
-// @Override
-// public void onBackPressed() {
-// if (mDrawerLayout.isDrawerOpen(GravityCompat.END)) {
-// mDrawerLayout.closeDrawers();
-// } else {
-// super.onBackPressed();
-// }
-// }
+
+ @Override
+ public void onBackPressed() {
+ if (mDrawerLayout.isDrawerOpen(GravityCompat.END)) {
+ mDrawerLayout.closeDrawers();
+ } else {
+ super.onBackPressed();
+ }
+ }
}
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/sample/showcase/widgetlist/WidgetsActivity.java b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/sample/showcase/widgetlist/WidgetsActivity.java
index 2c724f42..766c7a5c 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/sample/showcase/widgetlist/WidgetsActivity.java
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/sample/showcase/widgetlist/WidgetsActivity.java
@@ -101,6 +101,7 @@
import dji.v5.ux.core.widget.vps.VPSWidget;
import dji.v5.ux.flight.flightparam.DistanceLimitWidget;
import dji.v5.ux.flight.flightparam.FlightModeWidget;
+import dji.v5.ux.flight.flightparam.LedWidget;
import dji.v5.ux.flight.flightparam.ReturnHomeModeWidget;
import dji.v5.ux.flight.flightparam.HomePointWidget;
import dji.v5.ux.flight.flightparam.LostActionWidget;
@@ -131,13 +132,6 @@
public class WidgetsActivity extends AppCompatActivity implements WidgetListFragment.OnWidgetItemSelectedListener {
public static final String TAG = LogUtils.getTag("WidgetsActivity");
protected ArrayList widgetListItems;
- private final IDJINetworkStatusListener networkStatusListener = isNetworkAvailable -> {
- if (isNetworkAvailable) {
- LogUtils.d(TAG, "isNetworkAvailable=" + true);
- RTKStartServiceHelper.INSTANCE.startRtkService();
- }
- };
-
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -148,14 +142,11 @@ protected void onCreate(Bundle savedInstanceState) {
decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY | View.SYSTEM_UI_FLAG_FULLSCREEN |
View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
- decorView.setOnSystemUiVisibilityChangeListener(new View.OnSystemUiVisibilityChangeListener() {
- @Override
- public void onSystemUiVisibilityChange(int i) {
- if ((i & View.SYSTEM_UI_FLAG_FULLSCREEN )== 0 ){
- decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
- | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_IMMERSIVE
- | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
- }
+ decorView.setOnSystemUiVisibilityChangeListener(i -> {
+ if ((i & View.SYSTEM_UI_FLAG_FULLSCREEN )== 0 ){
+ decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+ | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_IMMERSIVE
+ | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
}
});
// 防止系统UI获取焦点后进入到非全屏状态
@@ -168,16 +159,9 @@ public void onSystemUiVisibilityChange(int i) {
.add(R.id.fragment_container, listFragment)
.commit();
-
- //实现RTK监测网络，并自动重连机制
- DJINetworkManager.getInstance().addNetworkStatusListener(networkStatusListener);
}
- @Override
- protected void onDestroy() {
- super.onDestroy();
- DJINetworkManager.getInstance().removeNetworkStatusListener(networkStatusListener);
- }
+
private void populateList() {
widgetListItems = new ArrayList<>();
@@ -300,12 +284,7 @@ private void populateList() {
widgetListItems.add(new WidgetListItem(R.string.uxsdk_flyc_imu_state_widget_title, new WidgetViewHolder<>(ImuStatusWidget.class, 420, ViewGroup.LayoutParams.WRAP_CONTENT)));
widgetListItems.add(new WidgetListItem(R.string.uxsdk_flyc_compass_state_widget_title, new WidgetViewHolder<>(CompassStatusWidget.class, 420, 320)));
widgetListItems.add(new WidgetListItem(R.string.uxsdk_flyc_fpa_widget_title, new WidgetViewHolder<>(FlightModeWidget.class, 420, ViewGroup.LayoutParams.WRAP_CONTENT)));
-
widgetListItems.add(new WidgetListItem(R.string.uxsdk_gimbal_setting_widget_title, new WidgetViewHolder<>(GimbalSettingWidget.class, 350, ViewGroup.LayoutParams.WRAP_CONTENT)));
- widgetListItems.add(new WidgetListItem(R.string.uxsdk_battery_info_widget_title, new WidgetViewHolder<>(BatteryInfoWidget.class, 380, ViewGroup.LayoutParams.WRAP_CONTENT)));
- widgetListItems.add(new WidgetListItem(R.string.uxsdk_battery_alert_widget_title, new WidgetViewHolder<>(BatteryAlertWidget.class, 350, ViewGroup.LayoutParams.WRAP_CONTENT)));
- widgetListItems.add(new WidgetListItem(R.string.uxsdk_battery_setting_widget_title, new WidgetViewHolder<>(BatterySettingWidget.class, 400, ViewGroup.LayoutParams.MATCH_PARENT)));
-
widgetListItems.add(new WidgetListItem(R.string.uxsdk_battery_info_widget_title, new WidgetViewHolder<>(BatteryInfoWidget.class, 450, ViewGroup.LayoutParams.WRAP_CONTENT)));
widgetListItems.add(new WidgetListItem(R.string.uxsdk_battery_alert_widget_title, new WidgetViewHolder<>(BatteryAlertWidget.class, 450, ViewGroup.LayoutParams.WRAP_CONTENT)));
widgetListItems.add(new WidgetListItem(R.string.uxsdk_battery_setting_widget_title, new WidgetViewHolder<>(BatterySettingWidget.class, 450, ViewGroup.LayoutParams.MATCH_PARENT)));
@@ -314,6 +293,7 @@ private void populateList() {
widgetListItems.add(new WidgetListItem(R.string.uxsdk_avoidance_precision_landing_widget_title, new WidgetViewHolder<>(PrecisionLandingWidget.class,450, ViewGroup.LayoutParams.WRAP_CONTENT)));
widgetListItems.add(new WidgetListItem(R.string.uxsdk_common_about_widget_title, new WidgetViewHolder<>(CommonAboutWidget.class,450, ViewGroup.LayoutParams.WRAP_CONTENT)));
widgetListItems.add(new WidgetListItem(R.string.uxsdk_common_device_name_widget_title, new WidgetViewHolder<>(CommonDeviceNameWidget.class,450, ViewGroup.LayoutParams.WRAP_CONTENT)));
+ widgetListItems.add(new WidgetListItem(R.string.uxsdk_common_led_widget_title, new WidgetViewHolder<>(LedWidget.class,450, ViewGroup.LayoutParams.WRAP_CONTENT)));
widgetListItems.add(new WidgetListItem(R.string.uxsdk_frequency_setting_widget_title, new WidgetViewHolder<>(FrequencyTabSelectWidget.class, 350, ViewGroup.LayoutParams.WRAP_CONTENT)));
widgetListItems.add(new WidgetListItem(R.string.uxsdk_sdr_info_widget_title, new WidgetViewHolder<>(InfoWidget.class, 350, ViewGroup.LayoutParams.WRAP_CONTENT)));
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/training/simulatorcontrol/SimulatorControlWidgetModel.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/training/simulatorcontrol/SimulatorControlWidgetModel.kt
index c094ee55..533cdb74 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/training/simulatorcontrol/SimulatorControlWidgetModel.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/training/simulatorcontrol/SimulatorControlWidgetModel.kt
@@ -54,10 +54,16 @@ class SimulatorControlWidgetModel(
//private val simulatorWindDataKey: DJIKey = FlightControllerKey.create(FlightControllerKey.SIMULATOR_WIND_DATA)
override fun inSetup() {
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeySimulatorState), simulatorStateDataProcessor)
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyGPSSatelliteCount), satelliteCountDataProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeySimulatorState), simulatorStateDataProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyGPSSatelliteCount), satelliteCountDataProcessor)
//bindDataProcessor(simulatorWindDataKey, simulatorWindDataProcessor)
- bindDataProcessor(KeyTools.createKey(FlightControllerKey.KeyIsSimulatorStarted), simulatorActiveDataProcessor)
+ bindDataProcessor(
+ KeyTools.createKey(
+ FlightControllerKey.KeyIsSimulatorStarted), simulatorActiveDataProcessor)
}
override fun inCleanup() { // No clean up needed
@@ -75,7 +81,9 @@ class SimulatorControlWidgetModel(
* @return Completable to determine status of the action
*/
fun startSimulator(initializationData: SimulatorInitializationSettings): Completable {
- return djiSdkModel.performActionWithOutResult(KeyTools.createKey(FlightControllerKey.KeyStartSimulator), initializationData)
+ return djiSdkModel.performActionWithOutResult(
+ KeyTools.createKey(
+ FlightControllerKey.KeyStartSimulator), initializationData)
}
/**
@@ -84,7 +92,9 @@ class SimulatorControlWidgetModel(
* @return Completable to determine status of the action
*/
fun stopSimulator(): Completable {
- return djiSdkModel.performActionWithOutResult(KeyTools.createKey(FlightControllerKey.KeyStopSimulator))
+ return djiSdkModel.performActionWithOutResult(
+ KeyTools.createKey(
+ FlightControllerKey.KeyStopSimulator))
}
/**
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/visualcamera/ndvi/NDVIStreamSelectionPanelWidgetModel.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/visualcamera/ndvi/NDVIStreamSelectionPanelWidgetModel.kt
index 6d037b6b..5ee89369 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/visualcamera/ndvi/NDVIStreamSelectionPanelWidgetModel.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/visualcamera/ndvi/NDVIStreamSelectionPanelWidgetModel.kt
@@ -28,9 +28,12 @@ class NDVIStreamSelectionPanelWidgetModel constructor(
//窄带
val narrowBandModelList = StreamPanelUtil.NARROW_BAND_MODEL_LIST
- val cameraVideoStreamSourceProcessor: DataProcessor = DataProcessor.create(CameraVideoStreamSourceType.UNKNOWN)
- val currentNarrowBandModelProcessor: DataProcessor = DataProcessor.create(StreamPanelUtil.NarrowBandModel(CameraVideoStreamSourceType.UNKNOWN, "UNKNOWN", -1))
- val cameraModeDataProcessor: DataProcessor = DataProcessor.create(CameraMode.UNKNOWN)
+ val cameraVideoStreamSourceProcessor: DataProcessor = DataProcessor.create(
+ CameraVideoStreamSourceType.UNKNOWN)
+ val currentNarrowBandModelProcessor: DataProcessor = DataProcessor.create(StreamPanelUtil.NarrowBandModel(
+ CameraVideoStreamSourceType.UNKNOWN, "UNKNOWN", -1))
+ val cameraModeDataProcessor: DataProcessor = DataProcessor.create(
+ CameraMode.UNKNOWN)
val visibleNarrowBandModeProcessor: DataProcessor = DataProcessor.create(false)
//绿植
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/visualcamera/ndvi/NDVIStreamSelectorWidget.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/visualcamera/ndvi/NDVIStreamSelectorWidget.kt
index bb3ce3ea..a21eda0f 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/visualcamera/ndvi/NDVIStreamSelectorWidget.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/visualcamera/ndvi/NDVIStreamSelectorWidget.kt
@@ -7,16 +7,13 @@ import dji.sdk.keyvalue.value.camera.CameraVideoStreamSourceType
import dji.sdk.keyvalue.value.camera.MultiSpectralFusionType
import dji.sdk.keyvalue.value.common.CameraLensType
import dji.sdk.keyvalue.value.common.ComponentIndexType
-import dji.v5.utils.common.AndUtil
import dji.v5.ux.R
import dji.v5.ux.core.base.DJISDKModel
import dji.v5.ux.core.base.ICameraIndex
import dji.v5.ux.core.base.SchedulerProvider
import dji.v5.ux.core.base.widget.FrameLayoutWidget
import dji.v5.ux.core.communication.ObservableInMemoryKeyedStore
-import dji.v5.ux.core.extension.getString
import dji.v5.ux.core.popover.PopoverHelper
-import dji.v5.ux.core.widget.gpssignal.GpsSignalPopoverView
import kotlinx.android.synthetic.main.uxsdk_camera_status_action_item_content.view.*
open class NDVIStreamSelectorWidget @JvmOverloads constructor(
diff --git a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/visualcamera/ndvi/NDVIStreamSelectorWidgetModel.kt b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/visualcamera/ndvi/NDVIStreamSelectorWidgetModel.kt
index 1912f273..3e2598af 100644
--- a/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/visualcamera/ndvi/NDVIStreamSelectorWidgetModel.kt
+++ b/SampleCode-V5/android-sdk-v5-uxsdk/src/main/java/dji/v5/ux/visualcamera/ndvi/NDVIStreamSelectorWidgetModel.kt
@@ -1,29 +1,24 @@
package dji.v5.ux.visualcamera.ndvi
import dji.sdk.keyvalue.key.CameraKey
-import dji.sdk.keyvalue.key.KeyTools
import dji.sdk.keyvalue.value.camera.CameraVideoStreamSourceType
import dji.sdk.keyvalue.value.camera.MultiSpectralFusionType
-import dji.sdk.keyvalue.value.camera.ThermalDisplayMode
-import dji.sdk.keyvalue.value.camera.ThermalPIPPosition
import dji.sdk.keyvalue.value.common.CameraLensType
import dji.sdk.keyvalue.value.common.ComponentIndexType
import dji.v5.et.create
import dji.v5.et.createCamera
-import dji.v5.et.set
-import dji.v5.utils.common.LogUtils
import dji.v5.ux.core.base.CameraWidgetModel
import dji.v5.ux.core.base.DJISDKModel
import dji.v5.ux.core.communication.ObservableInMemoryKeyedStore
import dji.v5.ux.core.util.DataProcessor
-import io.reactivex.rxjava3.core.Completable
class NDVIStreamSelectorWidgetModel constructor(
djiSdkModel: DJISDKModel,
keyedStore: ObservableInMemoryKeyedStore,
) : CameraWidgetModel(djiSdkModel, keyedStore) {
- val cameraVideoStreamSourceProcessor: DataProcessor = DataProcessor.create(CameraVideoStreamSourceType.UNKNOWN)
+ val cameraVideoStreamSourceProcessor: DataProcessor