revise wifi actions(changedCB)

diff --git a/wifi/WifiAction.h b/wifi/WifiAction.h
index e9c35a1ec929c7554b4f5252fb23f738c7c763b9..8b9bc9a30e45563c7ab3873bb5e90747f2f8f140 100644 (file)
--- a/wifi/WifiAction.h
+++ b/wifi/WifiAction.h
@@ -25,7 +25,7 @@ MODES_NAMESPACE_BEGIN
 class WifiAction : public PluginAction {
 public:
        WifiAction(const std::string &name);
-       virtual ~WifiAction();
+       ~WifiAction();
 
        virtual int set(bool val) = 0;
 protected:

diff --git a/wifi/WifiActionPower.cpp b/wifi/WifiActionPower.cpp
index c75ae82a9dcf09fa1af22e933cdcedab3066d9ea..62af0d41b760f6240a937dd33e4b248ec6c46074 100644 (file)
--- a/wifi/WifiActionPower.cpp
+++ b/wifi/WifiActionPower.cpp
@@ -24,7 +24,7 @@ MODES_NAMESPACE_USE;
 const std::string WifiActionPower::NAME = "power";
 
 WifiActionPower::WifiActionPower()
-       : WifiAction(NAME), cb(NULL), cbData(NULL), oldVal(false), requestVal(false)
+       : WifiAction(NAME), requestVal(false), oldVal(false), cb(nullptr), cbData(nullptr)
 {
 }
 
@@ -89,9 +89,9 @@ int WifiActionPower::setChangedCallback(valueChangedCB callback, void *userData)
        cb = callback;
        cbData = userData;
 
-       DBG("WifiActionPower setChangedCallback() Success");
        return MODES_ERROR_NONE;
 }
+
 void WifiActionPower::unSetChangedCallback(valueChangedCB callback, void *userData)
 {
        RET_IF(NULL == callback);
@@ -104,8 +104,6 @@ void WifiActionPower::unSetChangedCallback(valueChangedCB callback, void *userDa
 
        cb = NULL;
        cbData = NULL;
-
-       DBG("WifiActionPower unSetChangedCallback() Success");
 }
 
 void WifiActionPower::activateCB(wifi_manager_error_e result, void *user_data)
@@ -116,7 +114,7 @@ void WifiActionPower::activateCB(wifi_manager_error_e result, void *user_data)
        }
 }
 
-void WifiActionPower::deactivateCB(wifi_manager_error_e result, void *user_data)
+void WifiActionPower::deactivateCB(wifi_manager_error_e result, void *userData)
 {
        INFO("wifi Deactivated");
        if (WIFI_MANAGER_ERROR_NONE != result) {
@@ -124,11 +122,11 @@ void WifiActionPower::deactivateCB(wifi_manager_error_e result, void *user_data)
        }
 }
 
-void WifiActionPower::wifiStateChangedCB(wifi_manager_device_state_e state, void *user_data)
+void WifiActionPower::wifiStateChangedCB(wifi_manager_device_state_e state, void *userData)
 {
-       WifiActionPower *action = (WifiActionPower*)user_data;
+       WifiActionPower *action = (WifiActionPower*)userData;
 
-       RET_IF(NULL == user_data);
+       RET_IF(NULL == userData);
 
        bool changedVal = action->requestVal;
        if (state == WIFI_MANAGER_DEVICE_STATE_ACTIVATED)
@@ -140,6 +138,6 @@ void WifiActionPower::wifiStateChangedCB(wifi_manager_device_state_e state, void
 
        INFO("state:%d", state);
 
-       if (changedVal != action->requestVal)
+       if (action->cb && changedVal != action->requestVal)
                action->cb(action->cbData);
 }

diff --git a/wifi/WifiActionPower.h b/wifi/WifiActionPower.h
index 7b3d36b4691cdca0940565a0b8c26b55adbcabe0..04da7715021e8be6fa3e3e48f5712d457e9b4ed6 100644 (file)
--- a/wifi/WifiActionPower.h
+++ b/wifi/WifiActionPower.h
@@ -22,7 +22,6 @@ MODES_NAMESPACE_BEGIN
 
 class WifiActionPower : public WifiAction {
 public:
-       static const std::string NAME;
        WifiActionPower();
 
        int set(bool val) override;
@@ -31,14 +30,17 @@ public:
        int parse(const std::string &archive) override;
        int setChangedCallback(valueChangedCB callback, void *userData) override;
        void unSetChangedCallback(valueChangedCB callback, void *userData) override;
+
+       static const std::string NAME;
 private:
        static void activateCB(wifi_manager_error_e result, void *user_data);
        static void deactivateCB(wifi_manager_error_e result, void *user_data);
        static void wifiStateChangedCB(wifi_manager_device_state_e state, void * user_data);
+
+       bool requestVal;
+       bool oldVal;
        valueChangedCB cb;
        void *cbData;
-       bool oldVal;
-       bool requestVal;
 };
 
 MODES_NAMESPACE_END

diff --git a/wifi/WifiFactory.cpp b/wifi/WifiFactory.cpp
index 297643c7c73e6bfa5ef6d753cbfae794435f868f..a8589f35c9d1840e79788c5565797248ad2c523c 100644 (file)
--- a/wifi/WifiFactory.cpp
+++ b/wifi/WifiFactory.cpp
@@ -29,7 +29,7 @@ WifiFactory::WifiFactory()
 WifiAction* WifiFactory::createAction(const std::string &key)
 {
        auto search = actionMap.find(key);
-       if (search == actionMap.end()) {
+       if (actionMap.end() == search) {
                ERR("No WifiAction(%s)", key.c_str());
                return nullptr;
        }