resolved conflicts

android-example/app/src/main/java/net/irext/ircontrol/ui/fragment/ControlFragment.java

@@ -200,6 +200,7 @@ public class ControlFragment extends Fragment implements View.OnClickListener {
             acStatus.setAcTemp(Constants.ACTemperature.TEMP_24.getValue());
             acStatus.setAcWindSpeed(Constants.ACWindSpeed.SPEED_AUTO.getValue());
             acStatus.setAcWindDir(Constants.ACSwing.SWING_ON.getValue());
+            acStatus.setChangeWindDir(0);
             acStatus.setAcDisplay(0);
             acStatus.setAcTimer(0);
             acStatus.setAcSleep(0);
@@ -245,11 +246,6 @@ public class ControlFragment extends Fragment implements View.OnClickListener {
         /* translate key code for AC according to the mapping above */
         /* ac status is useless for decoding devices other than AC, it's an optional parameter */
         /* change wind dir is an optional parameter, set to 0 as default */
-        if (mIRSocketEmitter.getConnectionStatus() == IRSocketEmitter.EMITTER_CONNECTED) {
-            decodeOnBoard(inputKeyCode, acStatus, 0);
-        } else {
-            decodeInApp(inputKeyCode, acStatus, 0);
-        }
         return mIRDecode.decodeBinary(inputKeyCode, acStatus, 0);
     }