4
2
Fork 0

fix: idk fixes very random things

pull/45/head
Sudharshan S. 2019-04-03 08:45:09 +08:00
parent 8bdf5f7adc
commit 7b4920fb3d
Signed by: sudharshan
GPG Key ID: C861C97AAF3D9559
9 changed files with 31 additions and 25 deletions

View File

@ -4,4 +4,4 @@ final String baseUrlCore = "http://localhost/core";
final String baseUrlSignaling = "http://localhost/signal";
final String baseUrlHeartbeat = "http://localhost/heartbeat";
final String baseUrlLogin = "http://localhost:1837";
final String globalUserId = "u-fb91825f564a3cc110f11836fedea6f4";
// final String globalUserId = "u-fb91825f564a3cc110f11836fedea6f4";

View File

@ -34,11 +34,13 @@ class HeartbeatReceiverBloc {
client: client)
.then((es) {
es.listen((Event event) {
print(event.data);
Ping ping = Ping.fromJson(jsonDecode(event.data));
lastSeen = DateTime.fromMillisecondsSinceEpoch(ping.timestamp);
status = ping.status;
print(ping.timestamp);
// lastSeen = DateTime.fromMillisecondsSinceEpoch(ping.timestamp);
// status = ping.status;
});
print("GOT SEND");
final oneMinute = Duration(minutes: 1);
final timeoutDuration = Duration(minutes: 30);
new Timer.periodic(oneMinute, (Timer t) {

View File

@ -4,15 +4,11 @@ part "ping_model.g.dart";
@JsonSerializable()
class Ping {
@JsonKey(name: "timestamp")
final int timestamp;
@JsonKey(name: "status")
final String status;
Ping(this.timestamp, this.status);
factory Ping.fromJson(Map<String, dynamic> json) =>
_$PingFromJson(json);
factory Ping.fromJson(Map<String, dynamic> json) => _$PingFromJson(json);
Map<String, dynamic> toJson() => _$PingToJson(this);
}

View File

@ -1,21 +1,19 @@
import "dart:async";
import "dart:io";
import 'dart:convert';
import "package:http/http.dart" as http;
import "../../settings.dart";
import "../services/login_manager.dart";
class HeartbeatApiProvider {
LoginManager loginManager = LoginManager();
Future<void> ping({ String status = "" }) async {
final jwt = loginManager.getToken();
Future<void> ping({String status = ""}) async {
final jwt = await loginManager.getToken();
print("GOT JWT: $jwt");
await http.post("$baseUrlHeartbeat/ping",
headers: {
HttpHeaders.authorizationHeader: "Bearer $jwt"
},
body: status
);
headers: {HttpHeaders.authorizationHeader: "Bearer $jwt"},
body: jsonEncode({"status": status}));
}
}

View File

@ -9,10 +9,13 @@ class HeartbeatSendManager {
String status;
HeartbeatSendManager() {
status = "";
status = "a";
heartbeatApiProvider = HeartbeatApiProvider();
const oneMinute = const Duration(minutes: 1);
new Timer.periodic(oneMinute, (Timer t) => heartbeatApiProvider.ping(status:this.status));
new Timer.periodic(oneMinute, (Timer t) {
heartbeatApiProvider.ping(status: this.status);
print("SEND");
});
}
void setStatus(String status) {

View File

@ -2,7 +2,6 @@ import "dart:async";
import "../resources/login_api_provider.dart";
import "../models/user_model.dart";
import "../resources/user_api_provider.dart";
import "../../settings.dart";
import 'package:shared_preferences/shared_preferences.dart';
@ -41,9 +40,9 @@ class LoginManager {
}
}
Future<String> loginTest() async {
Future<String> loginTest(String userId) async {
try {
final jwt = await loginApiProvider.loginTest(globalUserId, "1");
final jwt = await loginApiProvider.loginTest(userId, "1");
SharedPreferences prefs = await SharedPreferences.getInstance();
await prefs.setString("token", jwt);
return jwt;

View File

@ -1,6 +1,7 @@
import "package:flutter/material.dart";
import "../../blocs/bottom_bus_bloc.dart";
import "../../services/heartbeat_manager.dart";
import "widgets/conversation_inactive_view.dart";
import "widgets/conversation_active_view.dart";
@ -13,6 +14,7 @@ class BottomBar extends StatefulWidget {
class _BottomBarState extends State<BottomBar> {
final bloc = bottomBusBloc;
final heartbeatSendManager = HeartbeatSendManager();
@override
void dispose() {

View File

@ -54,7 +54,8 @@ class _LoginPageState extends State<LoginPage> {
TextButton(
text: "Continue",
onClickCallback: () {
widget.loginManager.loginTest();
print(controller.text);
widget.loginManager.loginTest(controller.text);
Navigator.pushNamed(context, 'welcome/otp');
}),
]));

View File

@ -24,6 +24,7 @@ class _UserAvatarState extends State<UserAvatar> {
@override
void initState() {
print(widget.user.id);
super.initState();
bloc = HeartbeatReceiverBloc(widget.user.id);
}
@ -36,14 +37,18 @@ class _UserAvatarState extends State<UserAvatar> {
@override
Widget build(BuildContext context) {
String firstName =
(widget.user.firstName.isEmpty) ? '' : widget.user.firstName[0];
String lastName =
(widget.user.lastName.isEmpty) ? '' : widget.user.lastName[0];
return Padding(
padding: widget.padding,
child: Stack(alignment: Alignment.bottomRight, children: <Widget>[
CircleAvatar(
backgroundColor: _stringToColor(widget.user.lastName),
child: Text(
widget.user.firstName[0].toUpperCase() +
widget.user.lastName[0].toUpperCase(),
firstName.toUpperCase() + lastName.toUpperCase(),
style: Theme.of(context).accentTextTheme.title,
),
radius: widget.radius),