Commit 9bfc22db authored by shigemi miura's avatar shigemi miura

Warning mode不具合修正

parent ff925d88
...@@ -1361,7 +1361,7 @@ ...@@ -1361,7 +1361,7 @@
CODE_SIGN_ENTITLEMENTS = Sailassist/Sailassist.entitlements; CODE_SIGN_ENTITLEMENTS = Sailassist/Sailassist.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 64; CURRENT_PROJECT_VERSION = 66;
DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\"";
DEVELOPMENT_TEAM = D2DC7QNNJ8; DEVELOPMENT_TEAM = D2DC7QNNJ8;
ENABLE_PREVIEWS = YES; ENABLE_PREVIEWS = YES;
...@@ -1410,7 +1410,7 @@ ...@@ -1410,7 +1410,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = Sailassist/Sailassist.entitlements; CODE_SIGN_ENTITLEMENTS = Sailassist/Sailassist.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 64; CURRENT_PROJECT_VERSION = 66;
DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\"";
DEVELOPMENT_TEAM = D2DC7QNNJ8; DEVELOPMENT_TEAM = D2DC7QNNJ8;
ENABLE_PREVIEWS = YES; ENABLE_PREVIEWS = YES;
...@@ -1596,7 +1596,7 @@ ...@@ -1596,7 +1596,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = Sailassist/Sailassist.entitlements; CODE_SIGN_ENTITLEMENTS = Sailassist/Sailassist.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 64; CURRENT_PROJECT_VERSION = 66;
DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\"";
DEVELOPMENT_TEAM = D2DC7QNNJ8; DEVELOPMENT_TEAM = D2DC7QNNJ8;
ENABLE_PREVIEWS = YES; ENABLE_PREVIEWS = YES;
......
...@@ -241,14 +241,18 @@ class AppDelegate: NSObject, UIApplicationDelegate ,MSNotificationHubDelegate, M ...@@ -241,14 +241,18 @@ class AppDelegate: NSObject, UIApplicationDelegate ,MSNotificationHubDelegate, M
private func handleChatMode(message: ResChatMode) { private func handleChatMode(message: ResChatMode) {
print(debug: "called") print(debug: "called")
let befMode = self.msg.mode
if message.mode == ChatMode.warningProgress.rawValue { if message.mode == ChatMode.warningProgress.rawValue {
self.msg.mode = true self.msg.mode = true
} else { } else {
self.msg.mode = false self.msg.mode = false
} }
let ownMsg = ChatMessage(shipId: message.shipId, messageId: UUID().uuidString, type: 3, time: DateTextLib.Date2ISO8601Text(Date()), location: message.location, from: nil, fromId: nil, mode: message.mode, message: nil, stampId: 0, viewer: []) // print(debug: "befMode:\(befMode) / mode:\(self.msg.mode)")
self.msg.messages.append(ownMsg) if self.msg.mode != befMode {
let ownMsg = ChatMessage(shipId: message.shipId, messageId: UUID().uuidString, type: 3, time: DateTextLib.Date2ISO8601Text(Date()), location: message.location, from: nil, fromId: nil, mode: message.mode, message: nil, stampId: 0, viewer: [])
self.msg.messages.append(ownMsg)
}
} }
//MARK: - Signal-R再接続 //MARK: - Signal-R再接続
......
...@@ -364,9 +364,9 @@ class SharingData{ ...@@ -364,9 +364,9 @@ class SharingData{
@Published var viewCnt: Int = 0 //未読数 @Published var viewCnt: Int = 0 //未読数
@Published var sendInf: Bool = false //送信状態 @Published var sendInf: Bool = false //送信状態
func changeMode(){ // func changeMode(){
self.mode.toggle() // self.mode.toggle()
} // }
} }
static var information = Information() static var information = Information()
......
...@@ -101,7 +101,7 @@ struct CustomTabBar: View { ...@@ -101,7 +101,7 @@ struct CustomTabBar: View {
print(debug: "Error chat:\(e)") print(debug: "Error chat:\(e)")
viewModel.isModeAlert = true viewModel.isModeAlert = true
} else { } else {
message.changeMode() // message.changeMode()
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment