From 37bb7a06bc503223e50110fed5bdfdc0728f315b Mon Sep 17 00:00:00 2001 From: yangjiejie12308 <38904385+yangjiejie12308@users.noreply.github.com> Date: Mon, 17 Jul 2023 09:32:34 +0800 Subject: [PATCH] =?UTF-8?q?flutter=20sdk=20=E9=95=BF=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BF=A1=E6=81=AF=20=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E7=BC=BA=E7=9C=81=E5=8F=82=E6=95=B0=20=E5=8F=AF=E8=87=AA?= =?UTF-8?q?=E8=A1=8C=E5=A1=AB=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.flutter-plugins-dependencies | 2 +- .../cim_flutter_sdk/CHANGELOG.md | 4 +- .../cim-flutter-sdk/cim_flutter_sdk/README.md | 10 ++- .../cim_flutter_sdk/example/.metadata | 2 +- .../cim_flutter_sdk/example/lib/main.dart | 11 +-- .../cim_flutter_sdk/example/pubspec.lock | 2 +- .../cim_flutter_sdk/lib/cim_socket.dart | 49 ++++++++++--- .../cim_flutter_sdk/pubspec.yaml | 2 +- .../.flutter-plugins-dependencies | 2 +- .../cim_flutter_websocket_sdk/CHANGELOG.md | 4 +- .../cim_flutter_websocket_sdk/README.md | 11 ++- .../example/lib/main.dart | 9 ++- .../example/pubspec.lock | 2 +- .../lib/socket_io_connect.dart | 70 +++++++++++++++---- .../cim_flutter_websocket_sdk/pubspec.yaml | 2 +- 15 files changed, 140 insertions(+), 42 deletions(-) diff --git a/cim-client-sdk/cim-flutter-sdk/cim_flutter_sdk/.flutter-plugins-dependencies b/cim-client-sdk/cim-flutter-sdk/cim_flutter_sdk/.flutter-plugins-dependencies index 955ba2d..743a6c2 100644 --- a/cim-client-sdk/cim-flutter-sdk/cim_flutter_sdk/.flutter-plugins-dependencies +++ b/cim-client-sdk/cim-flutter-sdk/cim_flutter_sdk/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"device_info_plus","path":"C:\\\\Users\\\\smeb\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\device_info_plus-8.2.2\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"device_info_plus","path":"C:\\\\Users\\\\smeb\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\device_info_plus-8.2.2\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"device_info_plus","path":"C:\\\\Users\\\\smeb\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\device_info_plus-8.2.2\\\\","native_build":true,"dependencies":[]}],"linux":[{"name":"device_info_plus","path":"C:\\\\Users\\\\smeb\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\device_info_plus-8.2.2\\\\","native_build":false,"dependencies":[]}],"windows":[{"name":"device_info_plus","path":"C:\\\\Users\\\\smeb\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\device_info_plus-8.2.2\\\\","native_build":false,"dependencies":[]}],"web":[{"name":"device_info_plus","path":"C:\\\\Users\\\\smeb\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\device_info_plus-8.2.2\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"device_info_plus","dependencies":[]}],"date_created":"2023-07-14 10:36:34.428685","version":"3.7.7"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"device_info_plus","path":"C:\\\\Users\\\\smeb\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\device_info_plus-8.2.2\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"device_info_plus","path":"C:\\\\Users\\\\smeb\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\device_info_plus-8.2.2\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"device_info_plus","path":"C:\\\\Users\\\\smeb\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\device_info_plus-8.2.2\\\\","native_build":true,"dependencies":[]}],"linux":[{"name":"device_info_plus","path":"C:\\\\Users\\\\smeb\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\device_info_plus-8.2.2\\\\","native_build":false,"dependencies":[]}],"windows":[{"name":"device_info_plus","path":"C:\\\\Users\\\\smeb\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\device_info_plus-8.2.2\\\\","native_build":false,"dependencies":[]}],"web":[{"name":"device_info_plus","path":"C:\\\\Users\\\\smeb\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\device_info_plus-8.2.2\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"device_info_plus","dependencies":[]}],"date_created":"2023-07-17 09:14:10.336893","version":"3.7.7"} \ No newline at end of file diff --git a/cim-client-sdk/cim-flutter-sdk/cim_flutter_sdk/CHANGELOG.md b/cim-client-sdk/cim-flutter-sdk/cim_flutter_sdk/CHANGELOG.md index 34cfda1..143cf82 100644 --- a/cim-client-sdk/cim-flutter-sdk/cim_flutter_sdk/CHANGELOG.md +++ b/cim-client-sdk/cim-flutter-sdk/cim_flutter_sdk/CHANGELOG.md @@ -1,3 +1,3 @@ -## 1.0.5 +## 1.0.6 -* allow connect string uid type are string. update readme.md +* allow Custom login parameters. diff --git a/cim-client-sdk/cim-flutter-sdk/cim_flutter_sdk/README.md b/cim-client-sdk/cim-flutter-sdk/cim_flutter_sdk/README.md index ffc5859..702b06b 100644 --- a/cim-client-sdk/cim-flutter-sdk/cim_flutter_sdk/README.md +++ b/cim-client-sdk/cim-flutter-sdk/cim_flutter_sdk/README.md @@ -14,7 +14,7 @@ ``` dependencies: - cim_flutter_sdk: ^1.0.5 + cim_flutter_sdk: ^1.0.6 ``` @@ -43,7 +43,13 @@ import 'package:cim_flutter_sdk/cim_socket.dart'; }); }); cimSocket!.init('127.0.0.1', 34567, '16501516154949'); - cimSocket!.connect(); + cimSocket!.connect( + devicename: "Windows 10 Pro", + appVersion: "2.1.0", + osVersion: "10.0.19042.1165", + packageName: "com.farsunset.flutter", + deviceid: "asd52d1d0a6s1f6sdf1", + language: "zh_CN"); } ... diff --git a/cim-client-sdk/cim-flutter-sdk/cim_flutter_sdk/example/.metadata b/cim-client-sdk/cim-flutter-sdk/cim_flutter_sdk/example/.metadata index 8245e38..b1fefbe 100644 --- a/cim-client-sdk/cim-flutter-sdk/cim_flutter_sdk/example/.metadata +++ b/cim-client-sdk/cim-flutter-sdk/cim_flutter_sdk/example/.metadata @@ -15,7 +15,7 @@ migration: - platform: root create_revision: 2ad6cd72c040113b47ee9055e722606a490ef0da base_revision: 2ad6cd72c040113b47ee9055e722606a490ef0da - - platform: web + - platform: windows create_revision: 2ad6cd72c040113b47ee9055e722606a490ef0da base_revision: 2ad6cd72c040113b47ee9055e722606a490ef0da diff --git a/cim-client-sdk/cim-flutter-sdk/cim_flutter_sdk/example/lib/main.dart b/cim-client-sdk/cim-flutter-sdk/cim_flutter_sdk/example/lib/main.dart index a67cbba..9ad42e0 100644 --- a/cim-client-sdk/cim-flutter-sdk/cim_flutter_sdk/example/lib/main.dart +++ b/cim-client-sdk/cim-flutter-sdk/cim_flutter_sdk/example/lib/main.dart @@ -1,8 +1,5 @@ import 'package:cim_flutter_sdk/cim_socket.dart'; import 'package:flutter/material.dart'; -import 'dart:async'; - -import 'package:flutter/services.dart'; void main() { runApp(const MyApp()); @@ -35,7 +32,13 @@ class _MyAppState extends State { }); }); cimSocket!.init('api.hoxin.farsunset.com', 34567, '16501516154949'); - cimSocket!.connect(); + cimSocket!.connect( + devicename: "Windows 10 Pro", + appVersion: "2.1.0", + osVersion: "10.0.19042.1165", + packageName: "com.farsunset.flutter", + deviceid: "asd52d1d0a6s1f6sdf1", + language: "zh_CN"); } @override diff --git a/cim-client-sdk/cim-flutter-sdk/cim_flutter_sdk/example/pubspec.lock b/cim-client-sdk/cim-flutter-sdk/cim_flutter_sdk/example/pubspec.lock index eede5ce..ada1e8b 100644 --- a/cim-client-sdk/cim-flutter-sdk/cim_flutter_sdk/example/pubspec.lock +++ b/cim-client-sdk/cim-flutter-sdk/cim_flutter_sdk/example/pubspec.lock @@ -31,7 +31,7 @@ packages: path: ".." relative: true source: path - version: "1.0.5" + version: "1.0.6" clock: dependency: transitive description: diff --git a/cim-client-sdk/cim-flutter-sdk/cim_flutter_sdk/lib/cim_socket.dart b/cim-client-sdk/cim-flutter-sdk/cim_flutter_sdk/lib/cim_socket.dart index 1df90c0..6018c97 100644 --- a/cim-client-sdk/cim-flutter-sdk/cim_flutter_sdk/lib/cim_socket.dart +++ b/cim-client-sdk/cim-flutter-sdk/cim_flutter_sdk/lib/cim_socket.dart @@ -59,6 +59,20 @@ class CIMSocket { } }); + late String? devicename; + + late String? appVersion; + + late String? osVersion; + + late String? packageName; + + late String? deviceid; + + late String? language; + + late String? channelName; + Future init(String uri, int port, String uid) async { this.uri = uri; this.port = port; @@ -66,7 +80,22 @@ class CIMSocket { } //登录 - Future connect() async { + Future connect( + {String? devicename, + String? appVersion, + String? osVersion, + String? packageName, + String? deviceid, + String? language, + String? channelName}) async { + this.devicename = devicename; + this.appVersion = appVersion; + this.osVersion = osVersion; + this.packageName = packageName; + this.deviceid = deviceid; + this.language = language; + this.channelName = channelName; + if (uri == null || port == null || uid == null) { throw IOException; } @@ -124,23 +153,25 @@ class CIMSocket { Future sendLoginMsg() async { SystemInfo systemInfo = SystemInfo(); await systemInfo.init(); - String deviceName = systemInfo.deviceName; + String deviceName = devicename ?? systemInfo.deviceName; // DeviceInfoPlugin deviceInfoPlugin = DeviceInfoPlugin(); - String channel = systemInfo.deviceName; - String systemVersion = systemInfo.version; - String deviceId = hex.encode( - md5.convert(const Utf8Encoder().convert(systemInfo.deviceId)).bytes); + String channel = channelName ?? systemInfo.deviceName; + String systemVersion = osVersion ?? systemInfo.version; + String deviceId = deviceid ?? + hex.encode(md5 + .convert(const Utf8Encoder().convert(systemInfo.deviceId)) + .bytes); Map map = { "uid": uid!, //主id "channel": channel, - "appVersion": sOCKETAPPVERSION, + "appVersion": appVersion ?? sOCKETAPPVERSION, "osVersion": systemVersion, - "packageName": "cn.asihe.cim", + "packageName": packageName ?? "cn.asihe.cim", "deviceId": deviceId, // (await PlatformDeviceId.getDeviceId)!.replaceAll("-", ""), //应用id "deviceName": '$deviceName ${systemInfo.model}', - "language": "zh-CN", + "language": language ?? "zh-CN", }; int time = DateTime.now().millisecondsSinceEpoch; Int64 timeStamp = Int64.parseInt(time.toString()); diff --git a/cim-client-sdk/cim-flutter-sdk/cim_flutter_sdk/pubspec.yaml b/cim-client-sdk/cim-flutter-sdk/cim_flutter_sdk/pubspec.yaml index 89ab1c4..2f36074 100644 --- a/cim-client-sdk/cim-flutter-sdk/cim_flutter_sdk/pubspec.yaml +++ b/cim-client-sdk/cim-flutter-sdk/cim_flutter_sdk/pubspec.yaml @@ -1,7 +1,7 @@ name: cim_flutter_sdk description: a flutter sdk for cim. cim is a livechat framework use java netty, support user connect server by tcp or websocket. repository: https://gitee.com/farsunset/cim -version: 1.0.5 +version: 1.0.6 homepage: https://farsunset.com/ environment: diff --git a/cim-client-sdk/cim-flutter-sdk/cim_flutter_websocket_sdk/.flutter-plugins-dependencies b/cim-client-sdk/cim-flutter-sdk/cim_flutter_websocket_sdk/.flutter-plugins-dependencies index b6983dc..9686087 100644 --- a/cim-client-sdk/cim-flutter-sdk/cim_flutter_websocket_sdk/.flutter-plugins-dependencies +++ b/cim-client-sdk/cim-flutter-sdk/cim_flutter_websocket_sdk/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"device_info_plus","path":"C:\\\\Users\\\\smeb\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\device_info_plus-8.2.2\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"device_info_plus","path":"C:\\\\Users\\\\smeb\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\device_info_plus-8.2.2\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"device_info_plus","path":"C:\\\\Users\\\\smeb\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\device_info_plus-8.2.2\\\\","native_build":true,"dependencies":[]}],"linux":[{"name":"device_info_plus","path":"C:\\\\Users\\\\smeb\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\device_info_plus-8.2.2\\\\","native_build":false,"dependencies":[]}],"windows":[{"name":"device_info_plus","path":"C:\\\\Users\\\\smeb\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\device_info_plus-8.2.2\\\\","native_build":false,"dependencies":[]}],"web":[{"name":"device_info_plus","path":"C:\\\\Users\\\\smeb\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\device_info_plus-8.2.2\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"device_info_plus","dependencies":[]}],"date_created":"2023-07-14 10:21:28.864244","version":"3.7.7"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"device_info_plus","path":"C:\\\\Users\\\\smeb\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\device_info_plus-8.2.2\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"device_info_plus","path":"C:\\\\Users\\\\smeb\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\device_info_plus-8.2.2\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"device_info_plus","path":"C:\\\\Users\\\\smeb\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\device_info_plus-8.2.2\\\\","native_build":true,"dependencies":[]}],"linux":[{"name":"device_info_plus","path":"C:\\\\Users\\\\smeb\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\device_info_plus-8.2.2\\\\","native_build":false,"dependencies":[]}],"windows":[{"name":"device_info_plus","path":"C:\\\\Users\\\\smeb\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\device_info_plus-8.2.2\\\\","native_build":false,"dependencies":[]}],"web":[{"name":"device_info_plus","path":"C:\\\\Users\\\\smeb\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\device_info_plus-8.2.2\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"device_info_plus","dependencies":[]}],"date_created":"2023-07-17 09:27:39.500003","version":"3.7.7"} \ No newline at end of file diff --git a/cim-client-sdk/cim-flutter-sdk/cim_flutter_websocket_sdk/CHANGELOG.md b/cim-client-sdk/cim-flutter-sdk/cim_flutter_websocket_sdk/CHANGELOG.md index d3a61b9..6249f3c 100644 --- a/cim-client-sdk/cim-flutter-sdk/cim_flutter_websocket_sdk/CHANGELOG.md +++ b/cim-client-sdk/cim-flutter-sdk/cim_flutter_websocket_sdk/CHANGELOG.md @@ -1,3 +1,3 @@ -## 1.0.0 +## 1.0.1 -* TODO: release a primary version. only support websocket +* allow Custom login parameters. diff --git a/cim-client-sdk/cim-flutter-sdk/cim_flutter_websocket_sdk/README.md b/cim-client-sdk/cim-flutter-sdk/cim_flutter_websocket_sdk/README.md index ede011a..35a42b3 100644 --- a/cim-client-sdk/cim-flutter-sdk/cim_flutter_websocket_sdk/README.md +++ b/cim-client-sdk/cim-flutter-sdk/cim_flutter_websocket_sdk/README.md @@ -14,7 +14,7 @@ ``` dependencies: - cim_flutter_websocket_sdk: ^1.0.0 + cim_flutter_websocket_sdk: ^1.0.1 ``` @@ -43,7 +43,14 @@ import 'package:cim_flutter_sdk/cim_socket.dart'; }); }); cimSocket!.init('127.0.0.1', 45678, '16501516154949', true); - cimSocket!.connect(); + cimSocket!.connect( + devicename: "Windows 10 Pro", + appVersion: "1.0.0", + osVersion: "10.0.19042", + packageName: "com.farsunset.cim", + deviceid: "16501516154949", + language: "zh-CN", + channelName: "web"); } ... diff --git a/cim-client-sdk/cim-flutter-sdk/cim_flutter_websocket_sdk/example/lib/main.dart b/cim-client-sdk/cim-flutter-sdk/cim_flutter_websocket_sdk/example/lib/main.dart index d863544..6209637 100644 --- a/cim-client-sdk/cim-flutter-sdk/cim_flutter_websocket_sdk/example/lib/main.dart +++ b/cim-client-sdk/cim-flutter-sdk/cim_flutter_websocket_sdk/example/lib/main.dart @@ -32,7 +32,14 @@ class _MyAppState extends State { }); }); cimSocket!.init('wss.hoxin.farsunset.com', 443, '16501516154949', true); - cimSocket!.connect(); + cimSocket!.connect( + devicename: "Windows 10 Pro", + appVersion: "1.0.0", + osVersion: "10.0.19042", + packageName: "com.farsunset.cim", + deviceid: "16501516154949", + language: "zh-CN", + channelName: "web"); } @override diff --git a/cim-client-sdk/cim-flutter-sdk/cim_flutter_websocket_sdk/example/pubspec.lock b/cim-client-sdk/cim-flutter-sdk/cim_flutter_websocket_sdk/example/pubspec.lock index 9c6e17c..c437ab0 100644 --- a/cim-client-sdk/cim-flutter-sdk/cim_flutter_websocket_sdk/example/pubspec.lock +++ b/cim-client-sdk/cim-flutter-sdk/cim_flutter_websocket_sdk/example/pubspec.lock @@ -31,7 +31,7 @@ packages: path: ".." relative: true source: path - version: "1.0.0" + version: "1.0.1" clock: dependency: transitive description: diff --git a/cim-client-sdk/cim-flutter-sdk/cim_flutter_websocket_sdk/lib/socket_io_connect.dart b/cim-client-sdk/cim-flutter-sdk/cim_flutter_websocket_sdk/lib/socket_io_connect.dart index 6226e94..52d21ea 100644 --- a/cim-client-sdk/cim-flutter-sdk/cim_flutter_websocket_sdk/lib/socket_io_connect.dart +++ b/cim-client-sdk/cim-flutter-sdk/cim_flutter_websocket_sdk/lib/socket_io_connect.dart @@ -69,6 +69,27 @@ class CIMSocket { /// 连接状态回调 final ValueChanged onConnectionStatusChanged; + /// 设备名 + late String? devicename; + + /// app版本 + late String? appVersion; + + /// 系统版本 + late String? osVersion; + + /// 包名 + late String? packageName; + + /// 设备id + late String? deviceid; + + /// 语言 + late String? language; + + /// + late String? channelName; + /// /// [uri] 地址 /// [port] 端口 @@ -81,12 +102,35 @@ class CIMSocket { this.useSsl = useSsl; } - //登录 - Future connect() async { + /// 连接 + /// [devicename] 设备名 + /// [appVersion] app版本 + /// [osVersion] 系统版本 + /// [packageName] 包名 + /// [deviceid] 设备id + /// [language] 语言 + /// [channelName] 渠道名 + Future connect({ + String? devicename, + String? appVersion, + String? osVersion, + String? packageName, + String? deviceid, + String? language, + String? channelName, + }) async { if (uri == null || port == null || uid == null) { throw IOException; } + this.devicename = devicename; + this.appVersion = appVersion; + this.osVersion = osVersion; + this.packageName = packageName; + this.deviceid = deviceid; + this.language = language; + this.channelName = channelName; + channel = WebSocket(Uri.parse('${useSsl ? 'wss' : 'ws'}://$uri:$port'), backoff: ConstantBackoff(Duration(seconds: 10)), binaryType: 'arraybuffer'); @@ -109,12 +153,10 @@ class CIMSocket { var message = data.sublist(1, data.length); replybody.Model info = replybody.Model(); info.mergeFromBuffer(message); - print(info.toProto3Json().toString()); } else if (data[0] == Message_TYPE) { var message = data.sublist(1, data.length); messages.Model model = messages.Model(); model.mergeFromBuffer(message); - print(model.toProto3Json().toString()); onMessageReceived(model); } }, onError: (error, StackTrace trace) { @@ -138,23 +180,25 @@ class CIMSocket { Future sendLoginMsg() async { SystemInfo systemInfo = SystemInfo(); await systemInfo.init(); - String deviceName = systemInfo.deviceName; + String deviceName = devicename ?? systemInfo.deviceName; // DeviceInfoPlugin deviceInfoPlugin = DeviceInfoPlugin(); - String channelName = systemInfo.deviceName; - String systemVersion = systemInfo.version; - String deviceId = hex.encode( - md5.convert(const Utf8Encoder().convert(systemInfo.deviceId)).bytes); + String channelN = channelName ?? systemInfo.deviceName; + String systemVersion = osVersion ?? systemInfo.version; + String deviceId = deviceid ?? + hex.encode(md5 + .convert(const Utf8Encoder().convert(systemInfo.deviceId)) + .bytes); Map map = { "uid": uid!, //主id - "channel": channelName, + "channel": channelN, "appVersion": sOCKETAPPVERSION, "osVersion": systemVersion, - "packageName": "cn.asihe.cim", + "packageName": packageName ?? "cn.asihe.cim", "deviceId": deviceId, // (await PlatformDeviceId.getDeviceId)!.replaceAll("-", ""), //应用id - "deviceName": '$deviceName ${systemInfo.model}', - "language": "zh-CN", + "deviceName": '$deviceName', + "language": language ?? "zh-CN", }; int time = DateTime.now().millisecondsSinceEpoch; Int64 timeStamp = Int64.parseInt(time.toString()); diff --git a/cim-client-sdk/cim-flutter-sdk/cim_flutter_websocket_sdk/pubspec.yaml b/cim-client-sdk/cim-flutter-sdk/cim_flutter_websocket_sdk/pubspec.yaml index 2e6d1ee..4e50449 100644 --- a/cim-client-sdk/cim-flutter-sdk/cim_flutter_websocket_sdk/pubspec.yaml +++ b/cim-client-sdk/cim-flutter-sdk/cim_flutter_websocket_sdk/pubspec.yaml @@ -1,6 +1,6 @@ name: cim_flutter_websocket_sdk description: A flutter websocket sdk for cim. Cim is a websocket based instant messaging protocol,support websocket protocol and socket protocol. -version: 1.0.0 +version: 1.0.1 homepage: http://farsunset.com/ environment: