Explorar o código

修复状态灯逻辑错误的问题

vothin hai 3 meses
pai
achega
e5ed0e45a9
Modificáronse 31 ficheiros con 5 adicións e 5 borrados
  1. BIN=BIN
      Release/libzkgui.so
  2. BIN=BIN
      Release/src/activity/callActivity.o
  3. BIN=BIN
      Release/src/activity/countdownActivity.o
  4. BIN=BIN
      Release/src/activity/customerAffairActivity.o
  5. BIN=BIN
      Release/src/activity/deviceInfoActivity.o
  6. BIN=BIN
      Release/src/activity/functionActivity.o
  7. BIN=BIN
      Release/src/activity/interactionActivity.o
  8. BIN=BIN
      Release/src/activity/mainActivity.o
  9. BIN=BIN
      Release/src/activity/moreActivity.o
  10. BIN=BIN
      Release/src/activity/navibar.o
  11. BIN=BIN
      Release/src/activity/settingActivity.o
  12. BIN=BIN
      Release/src/activity/sipTestActivity.o
  13. BIN=BIN
      Release/src/activity/softapsettingActivity.o
  14. BIN=BIN
      Release/src/activity/startActivity.o
  15. BIN=BIN
      Release/src/activity/statusbar.o
  16. BIN=BIN
      Release/src/activity/updateActivity.o
  17. BIN=BIN
      Release/src/activity/wifisettingActivity.o
  18. BIN=BIN
      Release/src/core/update_assistant.o
  19. BIN=BIN
      Release/src/net/tcp_client.o
  20. BIN=BIN
      Release/src/net/tcp_client5084.o
  21. BIN=BIN
      Release/src/net/tcp_client5089.o
  22. BIN=BIN
      Release/src/net/tcp_model.o
  23. BIN=BIN
      Release/src/net/tcp_util.o
  24. BIN=BIN
      Release/src/net/udp_client.o
  25. BIN=BIN
      Release/src/server/http_server.o
  26. BIN=BIN
      Release/src/service/BusinessConfig.o
  27. BIN=BIN
      Release/src/service/time.o
  28. BIN=BIN
      Release/src/uart/ProtocolSender.o
  29. BIN=BIN
      Release/src/uart/UartContext.o
  30. 3 3
      src/logic/statusbar.cc
  31. 2 2
      src/service/BusinessConfig.h

BIN=BIN
Release/libzkgui.so


BIN=BIN
Release/src/activity/callActivity.o


BIN=BIN
Release/src/activity/countdownActivity.o


BIN=BIN
Release/src/activity/customerAffairActivity.o


BIN=BIN
Release/src/activity/deviceInfoActivity.o


BIN=BIN
Release/src/activity/functionActivity.o


BIN=BIN
Release/src/activity/interactionActivity.o


BIN=BIN
Release/src/activity/mainActivity.o


BIN=BIN
Release/src/activity/moreActivity.o


BIN=BIN
Release/src/activity/navibar.o


BIN=BIN
Release/src/activity/settingActivity.o


BIN=BIN
Release/src/activity/sipTestActivity.o


BIN=BIN
Release/src/activity/softapsettingActivity.o


BIN=BIN
Release/src/activity/startActivity.o


BIN=BIN
Release/src/activity/statusbar.o


BIN=BIN
Release/src/activity/updateActivity.o


BIN=BIN
Release/src/activity/wifisettingActivity.o


BIN=BIN
Release/src/core/update_assistant.o


BIN=BIN
Release/src/net/tcp_client.o


BIN=BIN
Release/src/net/tcp_client5084.o


BIN=BIN
Release/src/net/tcp_client5089.o


BIN=BIN
Release/src/net/tcp_model.o


BIN=BIN
Release/src/net/tcp_util.o


BIN=BIN
Release/src/net/udp_client.o


BIN=BIN
Release/src/server/http_server.o


BIN=BIN
Release/src/service/BusinessConfig.o


BIN=BIN
Release/src/service/time.o


BIN=BIN
Release/src/uart/ProtocolSender.o


BIN=BIN
Release/src/uart/UartContext.o


+ 3 - 3
src/logic/statusbar.cc

@@ -116,12 +116,12 @@ void statusLight(std::string light, std::string status) {
 
 	if (status == StatusLightType::COMMON) {
 		if (callLedEnable == 2) {
-			// 不用灯光
-			lightControl("CALLLED", "000F");
+			commonLight = "000F";
 		}
 		else {
-			lightControl("CALLLED", light);
+			commonLight = light;
 		}
+		lightControl("CALLLED", commonLight);
 	}
 	else if (status == StatusLightType::LOCK) {
 		if (!isStatusLightLock) {

+ 2 - 2
src/service/BusinessConfig.h

@@ -97,8 +97,8 @@ static uint32_t defaultYellow = 0xFFE68024;
 static uint32_t defaultBlack = 0xFF000000;
 static uint32_t defaultWhite = 0xFFFFFFFF;
 
-static std::string versionCode = "v2.0.35";
-static int versionNo = 143;
+static std::string versionCode = "v2.0.36";
+static int versionNo = 144;
 static std::string versionType = "fenji";
 static std::unordered_set<std::string> versionTypePool = {
     "fenji",