Fix N_SE-35877 issue and modify battery level to fit the home screen battery level bar

Change-Id: I0581af7f311557b49637cbbb1b4ccfbdb49310ea
Signed-off-by: TaeHo Choi <thanks.choi@samsung.com>

diff --git a/inc/CmTypes.h b/inc/CmTypes.h
index a5ae846..fba8498 100644 (file)
--- a/inc/CmTypes.h
+++ b/inc/CmTypes.h
@@ -56,6 +56,31 @@ enum AppLaunchType
        APP_LAUNCH_TYPE_UNKNOWN = 2,
 };
 
+enum BattLevelValue
+{
+       BATT_LEVEL_VALUE_100 = 100,
+       BATT_LEVEL_VALUE_95 = 95,
+       BATT_LEVEL_VALUE_90 = 90,
+       BATT_LEVEL_VALUE_85 = 85,
+       BATT_LEVEL_VALUE_80 = 80,
+       BATT_LEVEL_VALUE_75 = 75,
+       BATT_LEVEL_VALUE_70 = 70,
+       BATT_LEVEL_VALUE_65 = 65,
+       BATT_LEVEL_VALUE_60 = 60,
+       BATT_LEVEL_VALUE_55 = 55,
+       BATT_LEVEL_VALUE_50 = 50,
+       BATT_LEVEL_VALUE_45 = 45,
+       BATT_LEVEL_VALUE_40 = 40,
+       BATT_LEVEL_VALUE_35 = 35,
+       BATT_LEVEL_VALUE_30 = 30,
+       BATT_LEVEL_VALUE_25 = 25,
+       BATT_LEVEL_VALUE_20 = 20,
+       BATT_LEVEL_VALUE_15 = 15,
+       BATT_LEVEL_VALUE_10 = 10,
+       BATT_LEVEL_VALUE_05 = 05,
+       BATT_LEVEL_VALUE_00 = 00,
+};
+
 extern const unsigned int COLOR_SETTING_MENU_TITLE;
 extern const unsigned int COLOR_SETTING_MENU_VAULE;
 extern const unsigned int COLOR_SETTING_MENU_VALUE_DISABLE;
@@ -103,28 +128,6 @@ extern const int APP_CONTROL_TYPE_REQUESET;
 extern const int FLASH_TYPE_OFF;
 extern const int FLASH_TYPE_ON;
 
-extern const int BATT_LEVEL_FULL;
-extern const int BATT_LEVEL_19;
-extern const int BATT_LEVEL_18;
-extern const int BATT_LEVEL_17;
-extern const int BATT_LEVEL_16;
-extern const int BATT_LEVEL_15;
-extern const int BATT_LEVEL_14;
-extern const int BATT_LEVEL_13;
-extern const int BATT_LEVEL_12;
-extern const int BATT_LEVEL_11;
-extern const int BATT_LEVEL_10;
-extern const int BATT_LEVEL_9;
-extern const int BATT_LEVEL_8;
-extern const int BATT_LEVEL_7;
-extern const int BATT_LEVEL_6;
-extern const int BATT_LEVEL_5;
-extern const int BATT_LEVEL_4;
-extern const int BATT_LEVEL_3;
-extern const int BATT_LEVEL_2;
-extern const int BATT_LEVEL_1;
-extern const int BATT_LEVEL_EMPTY;
-
 extern const int EXPOSURE_DEFAULT_VALUE;
 extern const int BRIGHTNESS_DEFAULT_VALUE;
 

diff --git a/src/CmCamcorderForm.cpp b/src/CmCamcorderForm.cpp
index 17f5906..0238030 100644 (file)
--- a/src/CmCamcorderForm.cpp
+++ b/src/CmCamcorderForm.cpp
@@ -824,7 +824,8 @@ CamcorderForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 
                                                pAppResource->GetString(L"IDS_COM_BODY_LOW_BATTERY", tmpString);
 
-                                               msgBox.Construct(L"", tmpString, MSGBOX_STYLE_NONE, MESSAGEBOX_DISPLAY_TIME_2_SEC);
+                                               r = msgBox.Construct(L"", tmpString, MSGBOX_STYLE_NONE, MESSAGEBOX_DISPLAY_TIME_2_SEC);
+                                               TryReturnVoid(r == E_SUCCESS, "msgBox::Construct() failed by [%s]", GetErrorMessage(r));
                                                msgBox.ShowAndWait(result);
                                        }
                                        else
@@ -936,6 +937,12 @@ CamcorderForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        result r = E_SUCCESS;
                        int cameraCount = 0;
 
+                       if (__pCamcorderPresentationModel->GetCameraState() != CAMERA_STATE_PREVIEW)
+                       {
+                               AppLogDebug("Camera Preview is not");
+                               return;
+                       }
+
                        r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_COUNT, cameraCount);
                        AppLogDebug("GetMediaCapability [%s]", GetErrorMessage(r));
                        if (cameraCount < SUPPORTED_CAMERA_NUM)
@@ -1091,7 +1098,7 @@ CamcorderForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                                return;
                        }
 
-                       AppLogDebug("RecorderState = %d", __pCamcorderPresentationModel->GetRecorderState());   
+                       AppLogDebug("RecorderState = %d", __pCamcorderPresentationModel->GetRecorderState());
                        if (__pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_RECORDING || __isRecording == true)
                        {
                                if (__pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_STARTING)
@@ -1099,7 +1106,7 @@ CamcorderForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                                        AppLogDebug("No RECORDER_STATE_RECORDING AND PAUSE");
                                        return;
                                }
-                       
+
                                if (__pCancelPopup == null)
                                {
                                        r = InitializePopup();
@@ -1113,8 +1120,8 @@ CamcorderForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                                        __pCancelPopup->SetShowState(true);
                                        __pCancelPopup->Show();
                                }
-                               
-                               r = PauseRecord();                              
+
+                               r = PauseRecord();
                                TryReturnVoid(r == E_SUCCESS, "PauseRecord fail[%s]", GetErrorMessage(r));
                        }
                        else
@@ -1124,7 +1131,7 @@ CamcorderForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                                        AppLogDebug("No RECORDER_STATE_RECORDING and __isRecording = true >> DO NOT APP TERMINATE");
                                        return;
                                }
-                       
+
                                if (__pCameraInfoPanel->GetDrawExposure() == true)
                                {
                                        __closeTimerValue = 0;
@@ -1998,94 +2005,94 @@ CamcorderBatteryState
 CamcorderForm::GetCurrentBatteryState(void)
 {
        AppLogDebug("ENTER");
-       int battState = BATT_LEVEL_EMPTY;
-       bool isCharging = false;
+       int batteryLevel = 0;
        CamcorderBatteryState batteryStatus = CAMCORDER_BATTERY_STATE_0;
 
-       Battery::IsCharging(isCharging);
-       Battery::GetCurrentLevelInPercentage(battState);
+       Battery::GetCurrentLevelInPercentage(batteryLevel);
+
+       AppLogDebug("batteryLevel = %d", batteryLevel);
 
-       if (battState == BATT_LEVEL_FULL)
+       if (batteryLevel > BATT_LEVEL_VALUE_95 && batteryLevel <= BATT_LEVEL_VALUE_100)
        {
                batteryStatus = CAMCORDER_BATTERY_STATE_FULL;
        }
-       else if (battState >= BATT_LEVEL_19 && battState < BATT_LEVEL_FULL)
+       else if (batteryLevel > BATT_LEVEL_VALUE_90 && batteryLevel <= BATT_LEVEL_VALUE_95)
        {
                batteryStatus = CAMCORDER_BATTERY_STATE_19;
        }
-       else if (battState >= BATT_LEVEL_18 && battState < BATT_LEVEL_19)
+       else if (batteryLevel > BATT_LEVEL_VALUE_85 && batteryLevel <= BATT_LEVEL_VALUE_90)
        {
                batteryStatus = CAMCORDER_BATTERY_STATE_18;
        }
-       else if (battState >= BATT_LEVEL_17 && battState < BATT_LEVEL_18)
+       else if (batteryLevel > BATT_LEVEL_VALUE_80 && batteryLevel <= BATT_LEVEL_VALUE_85)
        {
                batteryStatus = CAMCORDER_BATTERY_STATE_17;
        }
-       else if (battState >= BATT_LEVEL_16 && battState < BATT_LEVEL_17)
+       else if (batteryLevel > BATT_LEVEL_VALUE_75 && batteryLevel <= BATT_LEVEL_VALUE_80)
        {
                batteryStatus = CAMCORDER_BATTERY_STATE_16;
        }
-       else if (battState >= BATT_LEVEL_15 && battState < BATT_LEVEL_16)
+       else if (batteryLevel > BATT_LEVEL_VALUE_70 && batteryLevel <= BATT_LEVEL_VALUE_75)
        {
                batteryStatus = CAMCORDER_BATTERY_STATE_15;
        }
-       else if (battState >= BATT_LEVEL_14 && battState < BATT_LEVEL_15)
+       else if (batteryLevel > BATT_LEVEL_VALUE_65 && batteryLevel <= BATT_LEVEL_VALUE_70)
        {
                batteryStatus = CAMCORDER_BATTERY_STATE_14;
        }
-       else if (battState >= BATT_LEVEL_13 && battState < BATT_LEVEL_14)
+       else if (batteryLevel > BATT_LEVEL_VALUE_60 && batteryLevel <= BATT_LEVEL_VALUE_65)
        {
                batteryStatus = CAMCORDER_BATTERY_STATE_13;
        }
-       else if (battState >= BATT_LEVEL_12 && battState < BATT_LEVEL_13)
+       else if (batteryLevel > BATT_LEVEL_VALUE_55 && batteryLevel <= BATT_LEVEL_VALUE_60)
        {
                batteryStatus = CAMCORDER_BATTERY_STATE_12;
        }
-       else if (battState >= BATT_LEVEL_11 && battState < BATT_LEVEL_12)
+       else if (batteryLevel > BATT_LEVEL_VALUE_50 && batteryLevel <= BATT_LEVEL_VALUE_55)
        {
                batteryStatus = CAMCORDER_BATTERY_STATE_11;
        }
-       else if (battState >= BATT_LEVEL_10 && battState < BATT_LEVEL_11)
+       else if (batteryLevel > BATT_LEVEL_VALUE_45 && batteryLevel <= BATT_LEVEL_VALUE_50)
        {
                batteryStatus = CAMCORDER_BATTERY_STATE_10;
        }
-       else if (battState >= BATT_LEVEL_9 && battState < BATT_LEVEL_10)
+       else if (batteryLevel > BATT_LEVEL_VALUE_40 && batteryLevel <= BATT_LEVEL_VALUE_45)
        {
                batteryStatus = CAMCORDER_BATTERY_STATE_9;
        }
-       else if (battState >= BATT_LEVEL_8 && battState < BATT_LEVEL_9)
+       else if (batteryLevel > BATT_LEVEL_VALUE_35 && batteryLevel <= BATT_LEVEL_VALUE_40)
        {
                batteryStatus = CAMCORDER_BATTERY_STATE_8;
        }
-       else if (battState >= BATT_LEVEL_7 && battState < BATT_LEVEL_8)
+       else if (batteryLevel > BATT_LEVEL_VALUE_30 && batteryLevel <= BATT_LEVEL_VALUE_35)
        {
                batteryStatus = CAMCORDER_BATTERY_STATE_7;
        }
-       else if (battState >= BATT_LEVEL_6 && battState < BATT_LEVEL_7)
+       else if (batteryLevel > BATT_LEVEL_VALUE_25 && batteryLevel <= BATT_LEVEL_VALUE_30)
        {
                batteryStatus = CAMCORDER_BATTERY_STATE_6;
        }
-       else if (battState >= BATT_LEVEL_5 && battState < BATT_LEVEL_6)
+       else if (batteryLevel > BATT_LEVEL_VALUE_20 && batteryLevel <= BATT_LEVEL_VALUE_25)
        {
                batteryStatus = CAMCORDER_BATTERY_STATE_5;
        }
-       else if (battState >= BATT_LEVEL_4 && battState < BATT_LEVEL_5)
+       else if (batteryLevel > BATT_LEVEL_VALUE_15 && batteryLevel <= BATT_LEVEL_VALUE_20)
        {
                batteryStatus = CAMCORDER_BATTERY_STATE_4;
        }
-       else if (battState >= BATT_LEVEL_3 && battState < BATT_LEVEL_4)
+       else if (batteryLevel > BATT_LEVEL_VALUE_10 && batteryLevel <= BATT_LEVEL_VALUE_15)
        {
                batteryStatus = CAMCORDER_BATTERY_STATE_3;
        }
-       else if (battState >= BATT_LEVEL_2 && battState < BATT_LEVEL_3)
+       else if (batteryLevel > BATT_LEVEL_VALUE_05 && batteryLevel <= BATT_LEVEL_VALUE_10)
        {
                batteryStatus = CAMCORDER_BATTERY_STATE_2;
        }
-       else if (battState >= BATT_LEVEL_1 && battState < BATT_LEVEL_2)
+       else if (batteryLevel > BATT_LEVEL_VALUE_00 && batteryLevel <= BATT_LEVEL_VALUE_05)
        {
                batteryStatus = CAMCORDER_BATTERY_STATE_1;
        }
-       else if (battState >= BATT_LEVEL_EMPTY && battState < BATT_LEVEL_1)
+       else if (batteryLevel == BATT_LEVEL_VALUE_00)
        {
                batteryStatus = CAMCORDER_BATTERY_STATE_0;
        }
@@ -2398,7 +2405,8 @@ CamcorderForm::OnCameraActionPerformed(CameraActionEvent event)
 
                                        pAppResource->GetString(L"IDS_CAM_POP_CAMERA_FAILED", tmpString);
 
-                                       msgBox.Construct(L"", tmpString, MSGBOX_STYLE_NONE, MESSAGEBOX_DISPLAY_TIME_2_SEC);
+                                       r = msgBox.Construct(L"", tmpString, MSGBOX_STYLE_NONE, MESSAGEBOX_DISPLAY_TIME_2_SEC);
+                                       TryReturnVoid(r == E_SUCCESS, "msgBox::Construct() failed by [%s]", GetErrorMessage(r));
                                        msgBox.ShowAndWait(modalResult);
 
                                        switch (modalResult)
@@ -3971,8 +3979,8 @@ CamcorderForm::OnChargingTimerExpired(void)
        Bitmap* pBitmap = null;
        result r = E_SUCCESS;
        int maxChargingCnt = 0;
-       int battState = BATT_LEVEL_EMPTY;
-       Battery::GetCurrentLevelInPercentage(battState);
+       int batteryLevel = 0;
+       Battery::GetCurrentLevelInPercentage(batteryLevel);
 
        TryCatch(__pBatteryState != null, r = E_SYSTEM, "__pBattery is null");
 
@@ -3985,7 +3993,7 @@ CamcorderForm::OnChargingTimerExpired(void)
                __pBatteryState->SetPosition(X_INDICATOR_BATTERY_LANDSCAPE, Y_INDICATOR_BATTERY_LANDSCAPE);
        }
 
-       AppLogDebug("BATT_LEVEL_%d", battState);
+       AppLogDebug("batteryLevel = %d", batteryLevel);
 
        __chargingCount++;
 
@@ -6902,13 +6910,13 @@ CamcorderForm::SetRecordPauseButton(bool start)
        return r;
 
 CATCH:
-       AppLogDebug("CATCH - EXIT");
-
        if (pBitmap != null)
        {
                delete pBitmap;
                pBitmap = null;
        }
+
+       AppLogDebug("EXIT - CATCH");
        return r;
 }
 
@@ -6963,13 +6971,13 @@ CamcorderForm::SetRecordButton(bool start)
        return r;
 
 CATCH:
-       AppLogDebug("CATCH - EXIT");
        if (pBitmap != null)
        {
                delete pBitmap;
                pBitmap = null;
        }
-       
+
+       AppLogDebug("EXIT - CATCH");
        return r;
 }
 
@@ -7987,7 +7995,8 @@ CamcorderForm::ShowMessageBox(const String& text, MessageBoxStyle style, const S
        int selfPortraitEnable = 0;
        int guideLineEnable = 0;
 
-       messageBox.Construct(title, text, style, DURATION_TIMEOUT_ZERO);
+       r = messageBox.Construct(title, text, style, DURATION_TIMEOUT_ZERO);
+       TryReturnVoid(r == E_SUCCESS, "msgBox::Construct() failed by [%s]", GetErrorMessage(r));
        r = messageBox.ShowAndWait(result);
        TryReturnVoid(r == E_SUCCESS, "ShowAndWait() fail(%s)", GetErrorMessage(r));
 
@@ -8617,13 +8626,14 @@ CamcorderForm::CheckStorageInfo(void)
                {
                        __lowMemoryCapacity = true;
                        __isMemoryFull = false;
-                       messageBox.Construct(L"", L"Low Memory Left. You may take some photo depending on the subject", MSGBOX_STYLE_OK, MESSAGEBOX_DISPLAY_TIME_3_SEC);
+                       r = messageBox.Construct(L"", L"Low Memory Left. You may take some photo depending on the subject", MSGBOX_STYLE_OK, MESSAGEBOX_DISPLAY_TIME_3_SEC);
                }
                else if (__lowMemoryCapacity == true)
                {
                        __isMemoryFull = true;
-                       messageBox.Construct(L"", L"Memory Full", MSGBOX_STYLE_OK, MESSAGEBOX_DISPLAY_TIME_3_SEC);
+                       r = messageBox.Construct(L"", L"Memory Full", MSGBOX_STYLE_OK, MESSAGEBOX_DISPLAY_TIME_3_SEC);
                }
+               TryReturnVoid(r == E_SUCCESS, "msgBox::Construct() failed by [%s]", GetErrorMessage(r));
 
                r = messageBox.ShowAndWait(result);
                TryReturnVoid(r == E_SUCCESS, "ShowAndWait() fail(%s)", GetErrorMessage(r));
@@ -9351,7 +9361,7 @@ CamcorderForm::PauseRecord(void)
        return r;
 
 CATCH:
-       AppLogDebug("CATCH - EXIT");
+       AppLogDebug("EXIT - CATCH");
        return r;       
 }
 
@@ -11760,11 +11770,13 @@ CamcorderForm::CheckBatteryStatus(void)
        AppLogDebug("ENTER");
        Bitmap* pBitmap = null;
        result r = E_SUCCESS;
-       int battState = BATT_LEVEL_EMPTY;
+       int batteryLevel = 0;
        bool isCharging = false;
 
        Battery::IsCharging(isCharging);
-       Battery::GetCurrentLevelInPercentage(battState);
+       Battery::GetCurrentLevelInPercentage(batteryLevel);
+
+       AppLogDebug("batteryLevel = %d", batteryLevel);
 
        TryCatch(__pBatteryState != null, r = E_FAILURE, "__pBatteryState is null");
 
@@ -11793,127 +11805,127 @@ CamcorderForm::CheckBatteryStatus(void)
        }
        else
        {
-               if (battState == BATT_LEVEL_FULL)
+               if (batteryLevel > BATT_LEVEL_VALUE_95 && batteryLevel <= BATT_LEVEL_VALUE_100)
                {
                        __batteryStatus = CAMCORDER_BATTERY_STATE_FULL;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_20);
                }
-               else if (battState >= BATT_LEVEL_19 && battState < BATT_LEVEL_FULL)
+               else if (batteryLevel > BATT_LEVEL_VALUE_90 && batteryLevel <= BATT_LEVEL_VALUE_95)
                {
                        __batteryStatus = CAMCORDER_BATTERY_STATE_19;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_19);
                }
-               else if (battState >= BATT_LEVEL_18 && battState < BATT_LEVEL_19)
+               else if (batteryLevel > BATT_LEVEL_VALUE_85 && batteryLevel <= BATT_LEVEL_VALUE_90)
                {
                        __batteryStatus = CAMCORDER_BATTERY_STATE_18;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_18);
                }
-               else if (battState >= BATT_LEVEL_17 && battState < BATT_LEVEL_18)
+               else if (batteryLevel > BATT_LEVEL_VALUE_80 && batteryLevel <= BATT_LEVEL_VALUE_85)
                {
                        __batteryStatus = CAMCORDER_BATTERY_STATE_17;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_17);
                }
-               else if (battState >= BATT_LEVEL_16 && battState < BATT_LEVEL_17)
+               else if (batteryLevel > BATT_LEVEL_VALUE_75 && batteryLevel <= BATT_LEVEL_VALUE_80)
                {
                        __batteryStatus = CAMCORDER_BATTERY_STATE_16;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_16);
                }
-               else if (battState >= BATT_LEVEL_15 && battState < BATT_LEVEL_16)
+               else if (batteryLevel > BATT_LEVEL_VALUE_70 && batteryLevel <= BATT_LEVEL_VALUE_75)
                {
                        __batteryStatus = CAMCORDER_BATTERY_STATE_15;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_15);
                }
-               else if (battState >= BATT_LEVEL_14 && battState < BATT_LEVEL_15)
+               else if (batteryLevel > BATT_LEVEL_VALUE_65 && batteryLevel <= BATT_LEVEL_VALUE_70)
                {
                        __batteryStatus = CAMCORDER_BATTERY_STATE_14;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_14);
                }
-               else if (battState >= BATT_LEVEL_13 && battState < BATT_LEVEL_14)
+               else if (batteryLevel > BATT_LEVEL_VALUE_60 && batteryLevel <= BATT_LEVEL_VALUE_65)
                {
                        __batteryStatus = CAMCORDER_BATTERY_STATE_13;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_13);
                }
-               else if (battState >= BATT_LEVEL_12 && battState < BATT_LEVEL_13)
+               else if (batteryLevel > BATT_LEVEL_VALUE_55 && batteryLevel <= BATT_LEVEL_VALUE_60)
                {
                        __batteryStatus = CAMCORDER_BATTERY_STATE_12;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_12);
                }
-               else if (battState >= BATT_LEVEL_11 && battState < BATT_LEVEL_12)
+               else if (batteryLevel > BATT_LEVEL_VALUE_50 && batteryLevel <= BATT_LEVEL_VALUE_55)
                {
                        __batteryStatus = CAMCORDER_BATTERY_STATE_11;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_11);
                }
-               else if (battState >= BATT_LEVEL_10 && battState < BATT_LEVEL_11)
+               else if (batteryLevel > BATT_LEVEL_VALUE_45 && batteryLevel <= BATT_LEVEL_VALUE_50)
                {
                        __batteryStatus = CAMCORDER_BATTERY_STATE_10;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_10);
                }
-               else if (battState >= BATT_LEVEL_9 && battState < BATT_LEVEL_10)
+               else if (batteryLevel > BATT_LEVEL_VALUE_40 && batteryLevel <= BATT_LEVEL_VALUE_45)
                {
                        __batteryStatus = CAMCORDER_BATTERY_STATE_9;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_09);
                }
-               else if (battState >= BATT_LEVEL_8 && battState < BATT_LEVEL_9)
+               else if (batteryLevel > BATT_LEVEL_VALUE_35 && batteryLevel <= BATT_LEVEL_VALUE_40)
                {
                        __batteryStatus = CAMCORDER_BATTERY_STATE_8;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_08);
                }
-               else if (battState >= BATT_LEVEL_7 && battState < BATT_LEVEL_8)
+               else if (batteryLevel > BATT_LEVEL_VALUE_30 && batteryLevel <= BATT_LEVEL_VALUE_35)
                {
                        __batteryStatus = CAMCORDER_BATTERY_STATE_7;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_07);
                }
-               else if (battState >= BATT_LEVEL_6 && battState < BATT_LEVEL_7)
+               else if (batteryLevel > BATT_LEVEL_VALUE_25 && batteryLevel <= BATT_LEVEL_VALUE_30)
                {
                        __batteryStatus = CAMCORDER_BATTERY_STATE_6;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_06);
                }
-               else if (battState >= BATT_LEVEL_5 && battState < BATT_LEVEL_6)
+               else if (batteryLevel > BATT_LEVEL_VALUE_20 && batteryLevel <= BATT_LEVEL_VALUE_25)
                {
                        __batteryStatus = CAMCORDER_BATTERY_STATE_5;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_05);
                }
-               else if (battState >= BATT_LEVEL_4 && battState < BATT_LEVEL_5)
+               else if (batteryLevel > BATT_LEVEL_VALUE_15 && batteryLevel <= BATT_LEVEL_VALUE_20)
                {
                        __batteryStatus = CAMCORDER_BATTERY_STATE_4;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_04);
                }
-               else if (battState >= BATT_LEVEL_3 && battState < BATT_LEVEL_4)
+               else if (batteryLevel > BATT_LEVEL_VALUE_10 && batteryLevel <= BATT_LEVEL_VALUE_15)
                {
                        __batteryStatus = CAMCORDER_BATTERY_STATE_3;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_03);
                }
-               else if (battState >= BATT_LEVEL_2 && battState < BATT_LEVEL_3)
+               else if (batteryLevel > BATT_LEVEL_VALUE_05 && batteryLevel <= BATT_LEVEL_VALUE_10)
                {
                        __batteryStatus = CAMCORDER_BATTERY_STATE_2;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_02);
                }
-               else if (battState >= BATT_LEVEL_1 && battState < BATT_LEVEL_2)
+               else if (batteryLevel > BATT_LEVEL_VALUE_00 && batteryLevel <= BATT_LEVEL_VALUE_05)
                {
                        __batteryStatus = CAMCORDER_BATTERY_STATE_1;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_01);
                }
-               else if (battState >= BATT_LEVEL_EMPTY && battState < BATT_LEVEL_1)
+               else if (batteryLevel == BATT_LEVEL_VALUE_00)
                {
                        __batteryStatus = CAMCORDER_BATTERY_STATE_0;
 

diff --git a/src/CmCameraForm.cpp b/src/CmCameraForm.cpp
index 003fb0e..f4eedb7 100644 (file)
--- a/src/CmCameraForm.cpp
+++ b/src/CmCameraForm.cpp
@@ -1104,94 +1104,94 @@ CameraBatteryState
 CameraForm::GetCurrentBatteryState(void)
 {
        AppLogDebug("ENTER");
-       int battState = BATT_LEVEL_EMPTY;
-       bool isCharging = false;
+       int batteryLevel = 0;
        CameraBatteryState batteryStatus = CAMERA_BATTERY_STATE_FULL;
 
-       Battery::IsCharging(isCharging);
-       Battery::GetCurrentLevelInPercentage(battState);
+       Battery::GetCurrentLevelInPercentage(batteryLevel);
+
+       AppLogDebug("batteryLevel = %d", batteryLevel);
 
-       if (battState == BATT_LEVEL_FULL)
+       if (batteryLevel > BATT_LEVEL_VALUE_95 && batteryLevel <= BATT_LEVEL_VALUE_100)
        {
                batteryStatus = CAMERA_BATTERY_STATE_FULL;
        }
-       else if (battState >= BATT_LEVEL_19 && battState < BATT_LEVEL_FULL)
+       else if (batteryLevel > BATT_LEVEL_VALUE_90 && batteryLevel <= BATT_LEVEL_VALUE_95)
        {
                batteryStatus = CAMERA_BATTERY_STATE_19;
        }
-       else if (battState >= BATT_LEVEL_18 && battState < BATT_LEVEL_19)
+       else if (batteryLevel > BATT_LEVEL_VALUE_85 && batteryLevel <= BATT_LEVEL_VALUE_90)
        {
                batteryStatus = CAMERA_BATTERY_STATE_18;
        }
-       else if (battState >= BATT_LEVEL_17 && battState < BATT_LEVEL_18)
+       else if (batteryLevel > BATT_LEVEL_VALUE_80 && batteryLevel <= BATT_LEVEL_VALUE_85)
        {
                batteryStatus = CAMERA_BATTERY_STATE_17;
        }
-       else if (battState >= BATT_LEVEL_16 && battState < BATT_LEVEL_17)
+       else if (batteryLevel > BATT_LEVEL_VALUE_75 && batteryLevel <= BATT_LEVEL_VALUE_80)
        {
                batteryStatus = CAMERA_BATTERY_STATE_16;
        }
-       else if (battState >= BATT_LEVEL_15 && battState < BATT_LEVEL_16)
+       else if (batteryLevel > BATT_LEVEL_VALUE_70 && batteryLevel <= BATT_LEVEL_VALUE_75)
        {
                batteryStatus = CAMERA_BATTERY_STATE_15;
        }
-       else if (battState >= BATT_LEVEL_14 && battState < BATT_LEVEL_15)
+       else if (batteryLevel > BATT_LEVEL_VALUE_65 && batteryLevel <= BATT_LEVEL_VALUE_70)
        {
                batteryStatus = CAMERA_BATTERY_STATE_14;
        }
-       else if (battState >= BATT_LEVEL_13 && battState < BATT_LEVEL_14)
+       else if (batteryLevel > BATT_LEVEL_VALUE_60 && batteryLevel <= BATT_LEVEL_VALUE_65)
        {
                batteryStatus = CAMERA_BATTERY_STATE_13;
        }
-       else if (battState >= BATT_LEVEL_12 && battState < BATT_LEVEL_13)
+       else if (batteryLevel > BATT_LEVEL_VALUE_55 && batteryLevel <= BATT_LEVEL_VALUE_60)
        {
                batteryStatus = CAMERA_BATTERY_STATE_12;
        }
-       else if (battState >= BATT_LEVEL_11 && battState < BATT_LEVEL_12)
+       else if (batteryLevel > BATT_LEVEL_VALUE_50 && batteryLevel <= BATT_LEVEL_VALUE_55)
        {
                batteryStatus = CAMERA_BATTERY_STATE_11;
        }
-       else if (battState >= BATT_LEVEL_10 && battState < BATT_LEVEL_11)
+       else if (batteryLevel > BATT_LEVEL_VALUE_45 && batteryLevel <= BATT_LEVEL_VALUE_50)
        {
                batteryStatus = CAMERA_BATTERY_STATE_10;
        }
-       else if (battState >= BATT_LEVEL_9 && battState < BATT_LEVEL_10)
+       else if (batteryLevel > BATT_LEVEL_VALUE_40 && batteryLevel <= BATT_LEVEL_VALUE_45)
        {
                batteryStatus = CAMERA_BATTERY_STATE_9;
        }
-       else if (battState >= BATT_LEVEL_8 && battState < BATT_LEVEL_9)
+       else if (batteryLevel > BATT_LEVEL_VALUE_35 && batteryLevel <= BATT_LEVEL_VALUE_40)
        {
                batteryStatus = CAMERA_BATTERY_STATE_8;
        }
-       else if (battState >= BATT_LEVEL_7 && battState < BATT_LEVEL_8)
+       else if (batteryLevel > BATT_LEVEL_VALUE_30 && batteryLevel <= BATT_LEVEL_VALUE_35)
        {
                batteryStatus = CAMERA_BATTERY_STATE_7;
        }
-       else if (battState >= BATT_LEVEL_6 && battState < BATT_LEVEL_7)
+       else if (batteryLevel > BATT_LEVEL_VALUE_25 && batteryLevel <= BATT_LEVEL_VALUE_30)
        {
                batteryStatus = CAMERA_BATTERY_STATE_6;
        }
-       else if (battState >= BATT_LEVEL_5 && battState < BATT_LEVEL_6)
+       else if (batteryLevel > BATT_LEVEL_VALUE_20 && batteryLevel <= BATT_LEVEL_VALUE_25)
        {
                batteryStatus = CAMERA_BATTERY_STATE_5;
        }
-       else if (battState >= BATT_LEVEL_4 && battState < BATT_LEVEL_5)
+       else if (batteryLevel > BATT_LEVEL_VALUE_15 && batteryLevel <= BATT_LEVEL_VALUE_20)
        {
                batteryStatus = CAMERA_BATTERY_STATE_4;
        }
-       else if (battState >= BATT_LEVEL_3 && battState < BATT_LEVEL_4)
+       else if (batteryLevel > BATT_LEVEL_VALUE_10 && batteryLevel <= BATT_LEVEL_VALUE_15)
        {
                batteryStatus = CAMERA_BATTERY_STATE_3;
        }
-       else if (battState >= BATT_LEVEL_2 && battState < BATT_LEVEL_3)
+       else if (batteryLevel > BATT_LEVEL_VALUE_05 && batteryLevel <= BATT_LEVEL_VALUE_10)
        {
                batteryStatus = CAMERA_BATTERY_STATE_2;
        }
-       else if (battState >= BATT_LEVEL_1 && battState < BATT_LEVEL_2)
+       else if (batteryLevel > BATT_LEVEL_VALUE_00 && batteryLevel <= BATT_LEVEL_VALUE_05)
        {
                batteryStatus = CAMERA_BATTERY_STATE_1;
        }
-       else if (battState >= BATT_LEVEL_EMPTY && battState < BATT_LEVEL_1)
+       else if (batteryLevel == BATT_LEVEL_VALUE_00)
        {
                batteryStatus = CAMERA_BATTERY_STATE_0;
        }
@@ -2331,8 +2331,8 @@ CameraForm::OnChargingTimerExpired(void)
        Bitmap* pBitmap = null;
        result r = E_SUCCESS;
        int maxChargingCnt = 0;
-       int battState = BATT_LEVEL_EMPTY;
-       Battery::GetCurrentLevelInPercentage(battState);
+       int batteryLevel = 0;
+       Battery::GetCurrentLevelInPercentage(batteryLevel);
 
        TryCatch(__pBatteryState != null, r = E_SYSTEM, "__pBattery is null");
 
@@ -2345,7 +2345,7 @@ CameraForm::OnChargingTimerExpired(void)
                __pBatteryState->SetPosition(X_INDICATOR_BATTERY_LANDSCAPE, Y_INDICATOR_BATTERY_LANDSCAPE);
        }
 
-       AppLogDebug("BATT_LEVEL_%d", battState);
+       AppLogDebug("batteryLevel = %d", batteryLevel);
 
        __chargingCount++;
 
@@ -3605,7 +3605,8 @@ CameraForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 
                                                pAppResource->GetString(L"IDS_COM_BODY_LOW_BATTERY", tmpString);
 
-                                               msgBox.Construct(L"", tmpString, MSGBOX_STYLE_NONE, MESSAGEBOX_DISPLAY_TIME_2_SEC);
+                                               r = msgBox.Construct(L"", tmpString, MSGBOX_STYLE_NONE, MESSAGEBOX_DISPLAY_TIME_2_SEC);
+                                               TryReturnVoid(r == E_SUCCESS, "msgBox::Construct() failed by [%s]", GetErrorMessage(r));
                                                msgBox.ShowAndWait(result);
                                        }
                                        else
@@ -3628,6 +3629,12 @@ CameraForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        bool value = false;
                        int cameraCount = 0;
 
+                       if (__pCameraPresentationModel->GetCameraState() != CAMERA_STATE_PREVIEW)
+                       {
+                               AppLogDebug("Camera Preview is not");
+                               return;
+                       }
+
                        r = __pCameraPresentationModel->GetMediaCapability(CAMERA_COUNT, cameraCount);
                        AppLogDebug("GetMediaCapability [%s]", GetErrorMessage(r));
 
@@ -7322,7 +7329,8 @@ CameraForm::ShowMessageBox(const String& text, MessageBoxStyle style, const Stri
        int selfPortraitEnable = 0;
        int guideLineEnable = 0;
 
-       messageBox.Construct(title, text, style, DURATION_TIMEOUT_ZERO);
+       r = messageBox.Construct(title, text, style, DURATION_TIMEOUT_ZERO);
+       TryReturnVoid(r == E_SUCCESS, "msgBox::Construct() failed by [%s]", GetErrorMessage(r));
        r = messageBox.ShowAndWait(result);
        TryReturnVoid(r == E_SUCCESS, "ShowAndWait() fail(%s)", GetErrorMessage(r));
 
@@ -7944,13 +7952,14 @@ CameraForm::CheckStorageInfo(void)
                {
                        __lowMemoryCapacity = true;
                        __isMemoryFull = false;
-                       messageBox.Construct(L"", L"Low Memory Left. You may take some photo depending on the subject", MSGBOX_STYLE_OK, MESSAGEBOX_DISPLAY_TIME_3_SEC);
+                       r = messageBox.Construct(L"", L"Low Memory Left. You may take some photo depending on the subject", MSGBOX_STYLE_OK, MESSAGEBOX_DISPLAY_TIME_3_SEC);
                }
                else if (__lowMemoryCapacity == true)
                {
                        __isMemoryFull = true;
-                       messageBox.Construct(L"", L"Memory Full", MSGBOX_STYLE_OK, MESSAGEBOX_DISPLAY_TIME_3_SEC);
+                       r = messageBox.Construct(L"", L"Memory Full", MSGBOX_STYLE_OK, MESSAGEBOX_DISPLAY_TIME_3_SEC);
                }
+               TryReturnVoid(r == E_SUCCESS, "msgBox::Construct() failed by [%s]", GetErrorMessage(r));
 
                r = messageBox.ShowAndWait(result);
                TryReturnVoid(r == E_SUCCESS, "ShowAndWait() fail(%s)", GetErrorMessage(r));
@@ -10039,7 +10048,8 @@ CameraForm::ShowCameraFailPopup(void)
 
        pAppResource->GetString(L"IDS_CAM_POP_CAMERA_FAILED", tmpString);
 
-       msgBox.Construct(L"", tmpString, MSGBOX_STYLE_NONE, MESSAGEBOX_DISPLAY_TIME_2_SEC);
+       r = msgBox.Construct(L"", tmpString, MSGBOX_STYLE_NONE, MESSAGEBOX_DISPLAY_TIME_2_SEC);
+       TryReturnVoid(r == E_SUCCESS, "msgBox::Construct() failed by [%s]", GetErrorMessage(r));
        msgBox.ShowAndWait(modalResult);
 
        switch (modalResult)
@@ -10077,7 +10087,8 @@ CameraForm::ShowUnlaunchPopup(void)
 
        pAppResource->GetString(L"IDS_CAM_POP_UNABLE_TO_START_CAMERA_DURING_CALL", tmpString);
 
-       msgBox.Construct(L"", tmpString, MSGBOX_STYLE_NONE, MESSAGEBOX_DISPLAY_TIME_3_SEC);
+       r = msgBox.Construct(L"", tmpString, MSGBOX_STYLE_NONE, MESSAGEBOX_DISPLAY_TIME_3_SEC);
+       TryReturnVoid(r == E_SUCCESS, "msgBox::Construct() failed by [%s]", GetErrorMessage(r));
        msgBox.ShowAndWait(modalResult);
 
        switch (modalResult)
@@ -10167,7 +10178,8 @@ CameraForm::ShowLowBatteryPopup(void)
 
        pAppResource->GetString(L"IDS_COM_BODY_LOW_BATTERY", tmpString);
 
-       msgBox.Construct(L"", tmpString, MSGBOX_STYLE_NONE, MESSAGEBOX_DISPLAY_TIME_3_SEC);
+       r = msgBox.Construct(L"", tmpString, MSGBOX_STYLE_NONE, MESSAGEBOX_DISPLAY_TIME_3_SEC);
+       TryReturnVoid(r == E_SUCCESS, "msgBox::Construct() failed by [%s]", GetErrorMessage(r));
        msgBox.ShowAndWait(modalResult);
 
        switch (modalResult)
@@ -10631,14 +10643,14 @@ CameraForm::CheckBatteryStatus(void)
        AppLogDebug("ENTER");
        Bitmap* pBitmap = null;
        result r = E_SUCCESS;
-       int battState = BATT_LEVEL_EMPTY;
+       int batteryLevel = 0;
        bool isCharging = false;
 
        Battery::IsCharging(isCharging);
-       Battery::GetCurrentLevelInPercentage(battState);
+       Battery::GetCurrentLevelInPercentage(batteryLevel);
 
        AppLogDebug("isCharging = %d", isCharging);
-       AppLogDebug("battState = %d", battState);
+       AppLogDebug("batteryLevel = %d", batteryLevel);
 
        TryCatch(__pBatteryState != null, r = E_FAILURE, "__pBatteryState is null");
 
@@ -10667,134 +10679,133 @@ CameraForm::CheckBatteryStatus(void)
        }
        else
        {
-               if (battState == BATT_LEVEL_FULL)
+               if (batteryLevel > BATT_LEVEL_VALUE_95 && batteryLevel <= BATT_LEVEL_VALUE_100)
                {
                        __batteryStatus = CAMERA_BATTERY_STATE_FULL;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_20);
                }
-               else if (battState >= BATT_LEVEL_19 && battState < BATT_LEVEL_FULL)
+               else if (batteryLevel > BATT_LEVEL_VALUE_90 && batteryLevel <= BATT_LEVEL_VALUE_95)
                {
                        __batteryStatus = CAMERA_BATTERY_STATE_19;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_19);
                }
-               else if (battState >= BATT_LEVEL_18 && battState < BATT_LEVEL_19)
+               else if (batteryLevel > BATT_LEVEL_VALUE_85 && batteryLevel <= BATT_LEVEL_VALUE_90)
                {
                        __batteryStatus = CAMERA_BATTERY_STATE_18;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_18);
                }
-               else if (battState >= BATT_LEVEL_17 && battState < BATT_LEVEL_18)
+               else if (batteryLevel > BATT_LEVEL_VALUE_80 && batteryLevel <= BATT_LEVEL_VALUE_85)
                {
                        __batteryStatus = CAMERA_BATTERY_STATE_17;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_17);
                }
-               else if (battState >= BATT_LEVEL_16 && battState < BATT_LEVEL_17)
+               else if (batteryLevel > BATT_LEVEL_VALUE_75 && batteryLevel <= BATT_LEVEL_VALUE_80)
                {
                        __batteryStatus = CAMERA_BATTERY_STATE_16;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_16);
                }
-               else if (battState >= BATT_LEVEL_15 && battState < BATT_LEVEL_16)
+               else if (batteryLevel > BATT_LEVEL_VALUE_70 && batteryLevel <= BATT_LEVEL_VALUE_75)
                {
                        __batteryStatus = CAMERA_BATTERY_STATE_15;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_15);
                }
-               else if (battState >= BATT_LEVEL_14 && battState < BATT_LEVEL_15)
+               else if (batteryLevel > BATT_LEVEL_VALUE_65 && batteryLevel <= BATT_LEVEL_VALUE_70)
                {
                        __batteryStatus = CAMERA_BATTERY_STATE_14;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_14);
                }
-               else if (battState >= BATT_LEVEL_13 && battState < BATT_LEVEL_14)
+               else if (batteryLevel > BATT_LEVEL_VALUE_60 && batteryLevel <= BATT_LEVEL_VALUE_65)
                {
                        __batteryStatus = CAMERA_BATTERY_STATE_13;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_13);
                }
-               else if (battState >= BATT_LEVEL_12 && battState < BATT_LEVEL_13)
+               else if (batteryLevel > BATT_LEVEL_VALUE_55 && batteryLevel <= BATT_LEVEL_VALUE_60)
                {
                        __batteryStatus = CAMERA_BATTERY_STATE_12;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_12);
                }
-               else if (battState >= BATT_LEVEL_11 && battState < BATT_LEVEL_12)
+               else if (batteryLevel > BATT_LEVEL_VALUE_50 && batteryLevel <= BATT_LEVEL_VALUE_55)
                {
                        __batteryStatus = CAMERA_BATTERY_STATE_11;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_11);
                }
-               else if (battState >= BATT_LEVEL_10 && battState < BATT_LEVEL_11)
+               else if (batteryLevel > BATT_LEVEL_VALUE_45 && batteryLevel <= BATT_LEVEL_VALUE_50)
                {
                        __batteryStatus = CAMERA_BATTERY_STATE_10;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_10);
                }
-               else if (battState >= BATT_LEVEL_9 && battState < BATT_LEVEL_10)
+               else if (batteryLevel > BATT_LEVEL_VALUE_40 && batteryLevel <= BATT_LEVEL_VALUE_45)
                {
                        __batteryStatus = CAMERA_BATTERY_STATE_9;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_09);
                }
-               else if (battState >= BATT_LEVEL_8 && battState < BATT_LEVEL_9)
+               else if (batteryLevel > BATT_LEVEL_VALUE_35 && batteryLevel <= BATT_LEVEL_VALUE_40)
                {
                        __batteryStatus = CAMERA_BATTERY_STATE_8;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_08);
                }
-               else if (battState >= BATT_LEVEL_7 && battState < BATT_LEVEL_8)
+               else if (batteryLevel > BATT_LEVEL_VALUE_30 && batteryLevel <= BATT_LEVEL_VALUE_35)
                {
                        __batteryStatus = CAMERA_BATTERY_STATE_7;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_07);
                }
-               else if (battState >= BATT_LEVEL_6 && battState < BATT_LEVEL_7)
+               else if (batteryLevel > BATT_LEVEL_VALUE_25 && batteryLevel <= BATT_LEVEL_VALUE_30)
                {
                        __batteryStatus = CAMERA_BATTERY_STATE_6;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_06);
                }
-               else if (battState >= BATT_LEVEL_5 && battState < BATT_LEVEL_6)
+               else if (batteryLevel > BATT_LEVEL_VALUE_20 && batteryLevel <= BATT_LEVEL_VALUE_25)
                {
                        __batteryStatus = CAMERA_BATTERY_STATE_5;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_05);
                }
-               else if (battState >= BATT_LEVEL_4 && battState < BATT_LEVEL_5)
+               else if (batteryLevel > BATT_LEVEL_VALUE_15 && batteryLevel <= BATT_LEVEL_VALUE_20)
                {
                        __batteryStatus = CAMERA_BATTERY_STATE_4;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_04);
                }
-               else if (battState >= BATT_LEVEL_3 && battState < BATT_LEVEL_4)
+               else if (batteryLevel > BATT_LEVEL_VALUE_10 && batteryLevel <= BATT_LEVEL_VALUE_15)
                {
                        __batteryStatus = CAMERA_BATTERY_STATE_3;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_03);
                }
-               else if (battState >= BATT_LEVEL_2 && battState < BATT_LEVEL_3)
+               else if (batteryLevel > BATT_LEVEL_VALUE_05 && batteryLevel <= BATT_LEVEL_VALUE_10)
                {
                        __batteryStatus = CAMERA_BATTERY_STATE_2;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_02);
                }
-               else if (battState >= BATT_LEVEL_1 && battState < BATT_LEVEL_2)
+               else if (batteryLevel > BATT_LEVEL_VALUE_00 && batteryLevel <= BATT_LEVEL_VALUE_05)
                {
                        __batteryStatus = CAMERA_BATTERY_STATE_1;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_01);
                }
-               else if (battState >= BATT_LEVEL_EMPTY && battState < BATT_LEVEL_1)
+               else if (batteryLevel == BATT_LEVEL_VALUE_00)
                {
                        __batteryStatus = CAMERA_BATTERY_STATE_0;
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_00);
                }
        }
-
        TryCatch(pBitmap != null, r = E_FAILURE, "pBitmap is null");
 
        AppLogDebug("__batteryStatus = %d", __batteryStatus);

diff --git a/src/CmTypes.cpp b/src/CmTypes.cpp
index 7b9fd6b..ae02f2e 100644 (file)
--- a/src/CmTypes.cpp
+++ b/src/CmTypes.cpp
@@ -67,28 +67,6 @@ const int APP_CONTROL_TYPE_REQUESET = 1;
 const int FLASH_TYPE_OFF = 0;
 const int FLASH_TYPE_ON = 1;
 
-const int BATT_LEVEL_FULL = 100;
-const int BATT_LEVEL_19 = 96;
-const int BATT_LEVEL_18 = 92;
-const int BATT_LEVEL_17 = 88;
-const int BATT_LEVEL_16 = 84;
-const int BATT_LEVEL_15 = 80;
-const int BATT_LEVEL_14 = 76;
-const int BATT_LEVEL_13 = 72;
-const int BATT_LEVEL_12 = 68;
-const int BATT_LEVEL_11 = 64;
-const int BATT_LEVEL_10 = 60;
-const int BATT_LEVEL_9 = 56;
-const int BATT_LEVEL_8 = 52;
-const int BATT_LEVEL_7 = 48;
-const int BATT_LEVEL_6 = 44;
-const int BATT_LEVEL_5 = 40;
-const int BATT_LEVEL_4 = 36;
-const int BATT_LEVEL_3 = 25;
-const int BATT_LEVEL_2 = 20;
-const int BATT_LEVEL_1 = 6;
-const int BATT_LEVEL_EMPTY = 0;
-
 const int EXPOSURE_DEFAULT_VALUE = 4;
 const int BRIGHTNESS_DEFAULT_VALUE = 4;