Merge branch 'develop' into alert-banner-disabled
This commit is contained in:
commit
fddaf79791
|
@ -43,7 +43,6 @@ class StatusModule(private val reactContext: ReactApplicationContext, private va
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun handleSignal(jsonEventString: String) {
|
override fun handleSignal(jsonEventString: String) {
|
||||||
Log.d(TAG, "Signal event")
|
|
||||||
val params = Arguments.createMap()
|
val params = Arguments.createMap()
|
||||||
params.putString("jsonEvent", jsonEventString)
|
params.putString("jsonEvent", jsonEventString)
|
||||||
reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java).emit("gethEvent", params)
|
reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java).emit("gethEvent", params)
|
||||||
|
|
|
@ -38,9 +38,6 @@ static RCTBridge *bridge;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if DEBUG
|
|
||||||
NSLog(@"[handleSignal] Received an event from Status-Go: %@", signal);
|
|
||||||
#endif
|
|
||||||
[bridge.eventDispatcher sendAppEventWithName:@"gethEvent"
|
[bridge.eventDispatcher sendAppEventWithName:@"gethEvent"
|
||||||
body:@{@"jsonEvent": signal}];
|
body:@{@"jsonEvent": signal}];
|
||||||
|
|
||||||
|
|
|
@ -1128,8 +1128,6 @@ Persistent<Function> r_call;
|
||||||
std::queue<std::string> q;
|
std::queue<std::string> q;
|
||||||
|
|
||||||
void run(char *json) {
|
void run(char *json) {
|
||||||
printf("signal received %s\n", json);
|
|
||||||
|
|
||||||
std::string str(json);
|
std::string str(json);
|
||||||
q.push(str);
|
q.push(str);
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,6 +35,7 @@
|
||||||
(let [^js data (.parse js/JSON event-str)
|
(let [^js data (.parse js/JSON event-str)
|
||||||
^js event-js (.-event data)
|
^js event-js (.-event data)
|
||||||
type (.-type data)]
|
type (.-type data)]
|
||||||
|
(log/debug "Signal received" event-str)
|
||||||
(case type
|
(case type
|
||||||
"node.login" {:fx [[:dispatch
|
"node.login" {:fx [[:dispatch
|
||||||
[:profile.login/login-node-signal
|
[:profile.login/login-node-signal
|
||||||
|
|
Loading…
Reference in New Issue