fmk
/
huixiang_app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

im 修改

wr_202303
zsw 4 months ago
parent
6817afca8b
commit
0da7957230
19 changed files with 804 additions and 610 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      android/app/build.gradle
  2. 4
      android/build.gradle
  3. 4
      android/gradle.properties
  4. 29
      lib/im/SocketClient.dart
  5. 179
      lib/im/chat_details_page.dart
  6. 125
      lib/im/database/hx_database.dart
  7. 290
      lib/im/database/hx_database.g.dart
  8. 24
      lib/im/database/message.dart
  9. 34
      lib/im/database/message_dao.dart
  10. 41
      lib/im/database/migration.dart
  11. 31
      lib/im/im_view/im_page.dart
  12. 16
      lib/im/out/auth.pb.dart
  13. 8
      lib/im/out/auth.pbjson.dart
  14. 16
      lib/im/out/message.pb.dart
  15. 6
      lib/im/out/message.pbjson.dart
  16. 5
      lib/main.dart
  17. 1
      lib/mine/edit_signature.dart
  18. 42
      pubspec.lock
  19. 3
      pubspec.yaml

6
android/app/build.gradle
Unescape View File

@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
apply plugin: 'com.mob.sdk' apply plugin: 'com.mob.sdk'
apply plugin: 'com.huawei.agconnect' //apply plugin: 'com.huawei.agconnect'
MobSDK { MobSDK {
appKey "m33ee7650da86a" appKey "m33ee7650da86a"
@ -203,7 +203,7 @@ dependencies {
implementation 'com.tencent.tpns:xiaomi:1.2.7.1-release' implementation 'com.tencent.tpns:xiaomi:1.2.7.1-release'
implementation 'com.tencent.tpns:huawei:1.2.6.0-release' // implementation 'com.tencent.tpns:huawei:1.2.6.0-release'
// HMS Core Push 模块依赖包 // HMS Core Push 模块依赖包
implementation 'com.huawei.hms:push:5.3.0.304' // implementation 'com.huawei.hms:push:5.3.0.304'
} }

4
android/build.gradle
Unescape View File

@ -1,5 +1,5 @@
buildscript { buildscript {
ext.kotlin_version = '1.7.10' ext.kotlin_version = '1.8.10'
repositories { repositories {
maven { url "https://www.jitpack.io" } maven { url "https://www.jitpack.io" }
maven {url 'https://developer.huawei.com/repo/'} maven {url 'https://developer.huawei.com/repo/'}
@ -24,7 +24,7 @@ buildscript {
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:7.4.2' classpath 'com.android.tools.build:gradle:7.4.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.huawei.agconnect:agcp:1.4.1.300' // classpath 'com.huawei.agconnect:agcp:1.4.1.300'
classpath 'com.mob.sdk:MobSDK:+' classpath 'com.mob.sdk:MobSDK:+'
classpath fileTree(include:['*.jar'], dir:'libs') classpath fileTree(include:['*.jar'], dir:'libs')
classpath 'com.umeng.umsdk:common:9.4.7' classpath 'com.umeng.umsdk:common:9.4.7'

4
android/gradle.properties
Unescape View File

@ -1,5 +1,5 @@
org.gradle.jvmargs=-Xmx1536M #org.gradle.jvmargs=-Xmx1536M
#org.gradle.jvmargs=-Xmx4096m org.gradle.jvmargs=-Xmx4096m
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
MobSDK.mobEnv=x MobSDK.mobEnv=x

29
lib/im/SocketClient.dart
Unescape View File

@ -27,11 +27,10 @@ class SocketClient {
print(data); print(data);
print("socket-listen"); print("socket-listen");
Proto proto = Proto.fromBytes(data); Proto proto = Proto.fromBytes(data);
print("socket-listen: $proto");
MsgData data1 = MsgData.fromBuffer(proto.body); MsgData data1 = MsgData.fromBuffer(proto.body);
print('收到来自:${data1.from},消息内容: ${utf8.decode(data1.data)} '); print('收到来自:${data1.from},消息内容: ${utf8.decode(data1.data)} ');
hxDatabase.messageDao.insertMessage(createMessage(mobile, utf8.decode(data1.data), userId: data1.from)); hxDatabase.insert(createMessage(userId, utf8.decode(data1.data), msgType: data1.type.value, userId: data1.from));
callbacks.forEach((callback) { callbacks.forEach((callback) {
callback.call(data1); callback.call(data1);
@ -67,7 +66,7 @@ class SocketClient {
return; return;
} }
final authReq = AuthReq() final authReq = AuthReq()
..uid = mobile ..uid = userId
..token = token; ..token = token;
final authReqBytes = authReq.writeToBuffer(); final authReqBytes = authReq.writeToBuffer();
final proto = Proto(1, 1, authReqBytes); // 假设 operation 和 seqId 为 1 final proto = Proto(1, 1, authReqBytes); // 假设 operation 和 seqId 为 1
@ -75,18 +74,26 @@ class SocketClient {
_socket.add(protoBytes); _socket.add(protoBytes);
} }
sendMessage(int toId, String content) { Future<Message> sendMessage(String toId, String content) async {
Map message = createMessage(toId, content, userId: userId);
int id = await hxDatabase.insert(message).catchError((error) {
debugPrint("insertMessage: $error");
});
if (!checkSocket()) { if (!checkSocket()) {
return; hxDatabase.update({"id": id, "state": 3}).catchError((error) {
debugPrint("insertMessage: $error");
});
message["id"] = id;
message["state"] = 3;
return Message.fromJson(message);
} }
message["id"] = id;
Uint8List data = utf8.encode(content); Uint8List data = utf8.encode(content);
MsgData msgData = MsgData(to: toId, from: mobile, type: MsgType.SINGLE_TEXT,data: data); MsgData msgData = MsgData(to: toId, from: userId, type: MsgType.SINGLE_TEXT, data: data);
final proto2 = Proto(5, 1, msgData.writeToBuffer()); final proto2 = Proto(5, 1, msgData.writeToBuffer());
_socket.add(proto2.toBytes()); _socket.add(proto2.toBytes());
hxDatabase.messageDao.insertMessage(createMessage(toId, content, userId: mobile)).catchError((error) { debugPrint("sendMessage: ${message["id"]}");
debugPrint("insertMessage: $error"); return Message.fromJson(message);
});
debugPrint("insertMessage: end");
} }
checkSocket() { checkSocket() {
@ -97,7 +104,7 @@ class SocketClient {
return true; return true;
} }
get mobile => 123456; get userId => shared.getString("userId");
} }

179
lib/im/chat_details_page.dart
Unescape View File

@ -7,11 +7,13 @@ import 'package:flutter/rendering.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:huixiang/im/database/message.dart';
import 'package:huixiang/main.dart'; import 'package:huixiang/main.dart';
import 'package:huixiang/retrofit/retrofit_api.dart'; import 'package:huixiang/retrofit/retrofit_api.dart';
import 'package:huixiang/view_widget/my_appbar.dart'; import 'package:huixiang/view_widget/my_appbar.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:image_pickers/image_pickers.dart'; import 'package:image_pickers/image_pickers.dart';
import 'package:shared_preferences/shared_preferences.dart';
import '../../community/release_dynamic.dart'; import '../../community/release_dynamic.dart';
import '../../generated/l10n.dart'; import '../../generated/l10n.dart';
import '../../utils/font_weight.dart'; import '../../utils/font_weight.dart';
@ -58,6 +60,19 @@ class _ChatDetailsPage extends State<ChatDetailsPage>
// SmartDialog.showToast("聊天 $txt", alignment: Alignment.center); // SmartDialog.showToast("聊天 $txt", alignment: Alignment.center);
} }
List<Message> messages = [];
loadMessageList() async {
selfUserId = (await SharedPreferences.getInstance()).getString("userId");
toUserId = widget.arguments["toId"];
messages = await hxDatabase.queryUList(toUserId);
if (mounted) setState(() {});
}
String selfUserId = "";
String toUserId = "";
@override @override
void initState() { void initState() {
super.initState(); super.initState();
@ -65,20 +80,21 @@ class _ChatDetailsPage extends State<ChatDetailsPage>
WidgetsBinding.instance.addObserver(this); WidgetsBinding.instance.addObserver(this);
commentFocus.addListener(_focusNodeListener); commentFocus.addListener(_focusNodeListener);
loadMessageList();
Future.delayed(Duration.zero, () { Future.delayed(Duration.zero, () {
jumpToBottom(); jumpToBottom();
}); });
} }
void jumpToBottom() { void jumpToBottom() {
scrollController.position scrollController.position.jumpTo(scrollController.position.maxScrollExtent);
.jumpTo(scrollController.position.maxScrollExtent);
} }
void didChangeMetrics() { void didChangeMetrics() {
WidgetsBinding.instance.addPostFrameCallback((_) { WidgetsBinding.instance.addPostFrameCallback((_) {
isKeyBoardShow = MediaQuery.of(context).viewInsets.bottom > 0;
if (!mounted) return; if (!mounted) return;
isKeyBoardShow = MediaQuery.of(context).viewInsets.bottom > 0;
if (MediaQuery.of(context).viewInsets.bottom == 0) { if (MediaQuery.of(context).viewInsets.bottom == 0) {
if (isKeyBoardShow) { if (isKeyBoardShow) {
FocusScope.of(context).requestFocus(FocusNode()); FocusScope.of(context).requestFocus(FocusNode());
@ -241,7 +257,8 @@ class _ChatDetailsPage extends State<ChatDetailsPage>
color: Colors.black, color: Colors.black,
size: 30, size: 30,
), ),
)), ),
),
), ),
body: Container( body: Container(
child: Column( child: Column(
@ -263,7 +280,8 @@ class _ChatDetailsPage extends State<ChatDetailsPage>
FocusScope.of(context).requestFocus(FocusNode()); FocusScope.of(context).requestFocus(FocusNode());
}); });
}, },
child: chatDetailsList()), child: chatDetailsList(),
),
], ],
), ),
), ),
@ -281,8 +299,9 @@ class _ChatDetailsPage extends State<ChatDetailsPage>
return Container( return Container(
margin: EdgeInsets.only(bottom: 48.h), margin: EdgeInsets.only(bottom: 48.h),
child: ListView.builder( child: ListView.builder(
itemCount: 10, itemCount: messages.length,
shrinkWrap: true, shrinkWrap: true,
reverse: true,
physics: NeverScrollableScrollPhysics(), physics: NeverScrollableScrollPhysics(),
itemBuilder: (context, position) { itemBuilder: (context, position) {
return GestureDetector( return GestureDetector(
@ -292,15 +311,20 @@ class _ChatDetailsPage extends State<ChatDetailsPage>
copyIndex = 0; copyIndex = 0;
}); });
}, },
child: chatDetailsItem(), child: chatDetailsItem(messages[position]),
); );
}), },
),
); );
} }
Widget chatDetailsItem() { Widget chatDetailsItem(Message message) {
bool isSelf = message.fromId == selfUserId;
bool isText = message.msgType == 0;
return Container( return Container(
padding: EdgeInsets.only(top: 32.h,), padding: EdgeInsets.only(
top: 32.h,
),
child: Column( child: Column(
children: [ children: [
Text( Text(
@ -312,6 +336,7 @@ class _ChatDetailsPage extends State<ChatDetailsPage>
fontWeight: MyFontWeight.regular, fontWeight: MyFontWeight.regular,
), ),
), ),
if (messages.indexOf(message) == (messages.length - 1))
Padding( Padding(
padding: EdgeInsets.only(top: 10.h, bottom: 24.h), padding: EdgeInsets.only(top: 10.h, bottom: 24.h),
child: Text( child: Text(
@ -324,6 +349,7 @@ class _ChatDetailsPage extends State<ChatDetailsPage>
), ),
), ),
), ),
if (messages.indexOf(message) == (messages.length - 1))
SizedBox( SizedBox(
height: 16.h, height: 16.h,
), ),
@ -339,7 +365,9 @@ class _ChatDetailsPage extends State<ChatDetailsPage>
color: Color(0xFF2A2A2A), color: Color(0xFF2A2A2A),
borderRadius: BorderRadius.circular(6), borderRadius: BorderRadius.circular(6),
), ),
padding: EdgeInsets.symmetric(horizontal: 32.w,vertical: 7.5.h), padding: EdgeInsets.symmetric(
horizontal: 32.w, vertical: 7.5.h,
),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
@ -358,7 +386,9 @@ class _ChatDetailsPage extends State<ChatDetailsPage>
height: 16, height: 16,
width: 16, width: 16,
), ),
SizedBox(height: 2.h,), SizedBox(
height: 2.h,
),
Text( Text(
"复制", "复制",
textAlign: TextAlign.center, textAlign: TextAlign.center,
@ -380,7 +410,9 @@ class _ChatDetailsPage extends State<ChatDetailsPage>
height: 16, height: 16,
width: 16, width: 16,
), ),
SizedBox(height: 2.h,), SizedBox(
height: 2.h,
),
Text( Text(
S.of(context).shanchu, S.of(context).shanchu,
textAlign: TextAlign.center, textAlign: TextAlign.center,
@ -404,7 +436,11 @@ class _ChatDetailsPage extends State<ChatDetailsPage>
), ),
], ],
), ),
Padding(padding:EdgeInsets.only(left: 17.w,right: 39.w),
/// not self
if (!isSelf && isText)
Padding(
padding: EdgeInsets.only(left: 17.w, right: 39.w),
child: Row( child: Row(
children: [ children: [
// MImage( // MImage(
@ -438,16 +474,16 @@ class _ChatDetailsPage extends State<ChatDetailsPage>
) )
], ],
), ),
padding: EdgeInsets.symmetric(vertical: 8.h, horizontal: 12.w), padding: EdgeInsets.symmetric(
vertical: 8.h, horizontal: 12.w),
child: GestureDetector( child: GestureDetector(
onLongPress: () { onLongPress: () {
setState(() { setState(() {
copyIndex = 1; copyIndex = 1;
}); });
}, },
child: child: Text(
Text( tex = message.content,
tex = "上次你在我这里买的水果钱是不是忘记付了？一共18块钱做点生意也是真的不容易啊。",
textAlign: TextAlign.left, textAlign: TextAlign.left,
style: TextStyle( style: TextStyle(
height: 1.2.h, height: 1.2.h,
@ -456,11 +492,14 @@ class _ChatDetailsPage extends State<ChatDetailsPage>
fontWeight: MyFontWeight.medium, fontWeight: MyFontWeight.medium,
), ),
), ),
) ))),
)),
], ],
),), ),
SizedBox(height: 40.h,), ),
if (!isSelf && isText)
SizedBox(
height: 40.h,
),
if (copyIndex == 1) if (copyIndex == 1)
Stack( Stack(
alignment: Alignment.bottomCenter, alignment: Alignment.bottomCenter,
@ -473,7 +512,8 @@ class _ChatDetailsPage extends State<ChatDetailsPage>
color: Color(0xFF2A2A2A), color: Color(0xFF2A2A2A),
borderRadius: BorderRadius.circular(6), borderRadius: BorderRadius.circular(6),
), ),
padding: EdgeInsets.symmetric(horizontal: 32.w,vertical: 7.5.h), padding:
EdgeInsets.symmetric(horizontal: 32.w, vertical: 7.5.h),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
@ -492,7 +532,9 @@ class _ChatDetailsPage extends State<ChatDetailsPage>
height: 16, height: 16,
width: 16, width: 16,
), ),
SizedBox(height: 2.h,), SizedBox(
height: 2.h,
),
Text( Text(
"复制", "复制",
textAlign: TextAlign.center, textAlign: TextAlign.center,
@ -514,7 +556,9 @@ class _ChatDetailsPage extends State<ChatDetailsPage>
height: 16, height: 16,
width: 16, width: 16,
), ),
SizedBox(height: 2.h,), SizedBox(
height: 2.h,
),
Text( Text(
S.of(context).shanchu, S.of(context).shanchu,
textAlign: TextAlign.center, textAlign: TextAlign.center,
@ -538,9 +582,14 @@ class _ChatDetailsPage extends State<ChatDetailsPage>
), ),
], ],
), ),
Padding(padding:EdgeInsets.only(left:36.w,right: 16.w),
/// self
if (isSelf && isText)
Padding(
padding: EdgeInsets.only(left: 36.w, right: 16.w),
child: Row( child: Row(
children: [ children: [
if (message.state == 3)
Container( Container(
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(100), borderRadius: BorderRadius.circular(100),
@ -559,25 +608,28 @@ class _ChatDetailsPage extends State<ChatDetailsPage>
), ),
), ),
), ),
if (message.state == 3)
SizedBox( SizedBox(
width: 12.w, width: 12.w,
), ),
Expanded( Expanded(
child: Container(
alignment: Alignment.centerRight,
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(6), borderRadius: BorderRadius.circular(6),
color: Color(0xFF32A060), color: Color(0xFF32A060),
), ),
padding: EdgeInsets.symmetric(vertical: 8.h, horizontal: 12.w), padding:
EdgeInsets.symmetric(vertical: 8.h, horizontal: 12.w),
child: GestureDetector( child: GestureDetector(
onLongPress: () { onLongPress: () {
setState(() { setState(() {
copyIndex = 1; copyIndex = 1;
}); });
}, },
child: child: Text(
Text( tex = message.content,
tex = "凭本事买的为啥要给你钱啊伙计",
textAlign: TextAlign.left, textAlign: TextAlign.left,
style: TextStyle( style: TextStyle(
height: 1.2.h, height: 1.2.h,
@ -587,7 +639,9 @@ class _ChatDetailsPage extends State<ChatDetailsPage>
), ),
), ),
), ),
)), ),
),
),
SizedBox( SizedBox(
width: 12.w, width: 12.w,
), ),
@ -606,8 +660,13 @@ class _ChatDetailsPage extends State<ChatDetailsPage>
width: 44, width: 44,
), ),
], ],
)), ),
Padding(padding:EdgeInsets.only(left: 17.w,right: 39.w,top: 20.h), ),
/// not self image
if (!isSelf && !isText)
Padding(
padding: EdgeInsets.only(left: 17.w, right: 39.w, top: 20.h),
child: Row( child: Row(
children: [ children: [
// MImage( // MImage(
@ -644,8 +703,7 @@ class _ChatDetailsPage extends State<ChatDetailsPage>
), ),
child: GestureDetector( child: GestureDetector(
onLongPress: () { onLongPress: () {
setState((){ setState(() {});
});
}, },
child: Image.asset( child: Image.asset(
"assets/image/icon_guide_4.webp", "assets/image/icon_guide_4.webp",
@ -653,11 +711,17 @@ class _ChatDetailsPage extends State<ChatDetailsPage>
height: 200.h, height: 200.h,
fit: BoxFit.fill, fit: BoxFit.fill,
), ),
))),
Expanded(
flex: 1,
child: Container(),
) )
)),
Expanded(flex:1,child: Container(),)
], ],
),), ),
),
/// no reply long time
if (messages.indexOf(message) == 0)
Padding( Padding(
padding: EdgeInsets.only(left: 17.w, right: 17.w, top: 24.h), padding: EdgeInsets.only(left: 17.w, right: 17.w, top: 24.h),
child: Text( child: Text(
@ -709,6 +773,13 @@ class _ChatDetailsPage extends State<ChatDetailsPage>
if (commentText.trim() == "") { if (commentText.trim() == "") {
return; return;
} }
socketClient.sendMessage(toUserId, commentText).then((value) {
Message message = value;
messages.insert(0, message);
chatController.clear();
if (mounted)
setState(() {});
});
// widget.queryMemberComment(commentText); // widget.queryMemberComment(commentText);
}, },
maxLines: 8, maxLines: 8,
@ -850,13 +921,17 @@ class _ChatDetailsPage extends State<ChatDetailsPage>
width: 24, width: 24,
), ),
), ),
Padding(padding:EdgeInsets.only(top: 8.h), Padding(
padding: EdgeInsets.only(top: 8.h),
child: Text( child: Text(
"拍照", "拍照",
style: TextStyle( style: TextStyle(
fontSize:12.sp, color: Color(0xFFA29E9E), fontSize: 12.sp,
fontWeight: MyFontWeight.regular,), color: Color(0xFFA29E9E),
),), fontWeight: MyFontWeight.regular,
),
),
),
], ],
), ),
), ),
@ -887,16 +962,19 @@ class _ChatDetailsPage extends State<ChatDetailsPage>
width: 24, width: 24,
), ),
), ),
Padding(padding:EdgeInsets.only(top: 8.h), Padding(
padding: EdgeInsets.only(top: 8.h),
child: Text( child: Text(
"相册", "相册",
style: TextStyle( style: TextStyle(
fontSize:12.sp, color: Color(0xFFA29E9E), fontSize: 12.sp,
fontWeight: MyFontWeight.regular,), color: Color(0xFFA29E9E),
),), fontWeight: MyFontWeight.regular,
], ),
)
), ),
),
],
)),
], ],
) )
], ],
@ -915,7 +993,10 @@ class _ChatDetailsPage extends State<ChatDetailsPage>
return new AlertDialog( return new AlertDialog(
backgroundColor: Color(0xFF2A2A2A), backgroundColor: Color(0xFF2A2A2A),
elevation: 0, elevation: 0,
contentPadding:EdgeInsets.only(top: 8.h,bottom: 5.h,), contentPadding: EdgeInsets.only(
top: 8.h,
bottom: 5.h,
),
content: Container( content: Container(
height: 40.h, height: 40.h,
// width:20.w, // width:20.w,

125
lib/im/database/hx_database.dart
Unescape View File

@ -1,18 +1,123 @@
import 'dart:async';
import 'package:floor/floor.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:huixiang/im/database/message_dao.dart';
import 'package:huixiang/im/database/message.dart'; import 'package:huixiang/im/database/message.dart';
import 'package:sqflite/sqflite.dart' as sqflite; import 'package:huixiang/im/database/migration.dart';
import 'package:sqflite/sqflite.dart';
class HxDatabase {
Database db;
void open() async {
// _migrations.add(Migration(1, 2, (Database database) async {
// database.execute('ALTER TABLE `Message` ADD COLUMN `replyId` VARCHAR(20) DEFAULT NULL AFTER `toId`');
// }));
await openDatabase(
'hx.db',
version: 2,
onCreate: (Database db, int version) async {
db.execute('CREATE TABLE IF NOT EXISTS `Message` (`id` INTEGER, `fromId` VARCHAR(20), `toId` VARCHAR(20), `replyId` VARCHAR(20), `content` TEXT, `attach` TEXT, `msgType` INTEGER, `time` VARCHAR(20), `state` INTEGER, `isDelete` INTEGER, PRIMARY KEY (`id`))');
},
onConfigure: (database) async {
await database.execute('PRAGMA foreign_keys = ON');
},
onUpgrade: (database, startVersion, endVersion) async {
await runMigrations(database, startVersion, endVersion, _migrations);
},
onOpen: (Database db) {
this.db = db;
}
);
}
part 'hx_database.g.dart'; void close() {
db.close();
}
@Database(version: 1, entities: [Message]) Future<List<Message>> queryList(userId) {
abstract class HxDatabase extends FloorDatabase { if (db == null) {
return Future.value(<Message>[]);
}
String sql = 'SELECT * FROM Message WHERE toId = ? OR fromId = ? GROUP BY toId,fromId ORDER BY time DESC';
return db.rawQuery(sql, [userId, userId]).then((value) {
return value.map((e) {
debugPrint("Message: ${e}");
return Message.fromJson(e);
}).toList();
}, onError: (error) {
debugPrint("Messageerror: $error");
});
}
MessageDao get messageDao; Future<List<Message>> queryUList(userId) {
if (db == null) {
return Future.value(<Message>[]);
}
String sql = 'SELECT * FROM Message WHERE toId = ? OR fromId = ? ORDER BY time DESC';
return db.rawQuery(sql, [userId, userId]).then((value) {
return value.map((e) => Message.fromJson(e)).toList();
}, onError: (error) {
debugPrint("Messageerror: $error");
});
}
Future<List<Map>> queryListAll() {
if (db == null) {
return Future.value();
}
String sql = 'SELECT * FROM Message ORDER BY time DESC';
return db.rawQuery(sql);
}
Future<int> deleteAll() async {
return db.delete("Message");
}
update(Map<dynamic, dynamic> message) {
}
Future<int> insert(Map message) async {
if (db == null) {
return Future.value(0);
}
debugPrint("Messageinsert: ${message}");
return db.insert("Message", message);
}
final List<Migration> _migrations = [];
addMigrations(List<Migration> migrations) {
_migrations.addAll(migrations);
return this;
}
Future<void> runMigrations(
final Database migrationDatabase,
final int startVersion,
final int endVersion,
final List<Migration> migrations,
) async {
final relevantMigrations = migrations
.where((migration) => migration.startVersion >= startVersion)
.toList()
..sort(
(first, second) => first.startVersion.compareTo(second.startVersion));
if (relevantMigrations.isEmpty ||
relevantMigrations.last.endVersion != endVersion) {
throw StateError(
'There is no migration supplied to update the database to the current version.'
' Aborting the migration.',
);
}
for (final migration in relevantMigrations) {
await migration.migrate(migrationDatabase);
}
}
} }

290
lib/im/database/hx_database.g.dart
Unescape View File

@ -1,144 +1,146 @@
// GENERATED CODE - DO NOT MODIFY BY HAND // // GENERATED CODE - DO NOT MODIFY BY HAND
//
part of 'hx_database.dart'; // part of 'hx_database.dart';
//
// ************************************************************************** // // **************************************************************************
// FloorGenerator // // FloorGenerator
// ************************************************************************** // // **************************************************************************
//
// ignore: avoid_classes_with_only_static_members // // ignore: avoid_classes_with_only_static_members
class $FloorHxDatabase { // import 'package:floor/floor.dart';
/// Creates a database builder for a persistent database. //
/// Once a database is built, you should keep a reference to it and re-use it. // class $FloorHxDatabase {
static _$HxDatabaseBuilder databaseBuilder(String name) => // /// Creates a database builder for a persistent database.
_$HxDatabaseBuilder(name); // /// Once a database is built, you should keep a reference to it and re-use it.
// static _$HxDatabaseBuilder databaseBuilder(String name) =>
/// Creates a database builder for an in memory database. // _$HxDatabaseBuilder(name);
/// Information stored in an in memory database disappears when the process is killed. //
/// Once a database is built, you should keep a reference to it and re-use it. // /// Creates a database builder for an in memory database.
static _$HxDatabaseBuilder inMemoryDatabaseBuilder() => // /// Information stored in an in memory database disappears when the process is killed.
_$HxDatabaseBuilder(null); // /// Once a database is built, you should keep a reference to it and re-use it.
} // static _$HxDatabaseBuilder inMemoryDatabaseBuilder() =>
// _$HxDatabaseBuilder(null);
class _$HxDatabaseBuilder { // }
_$HxDatabaseBuilder(this.name); //
// class _$HxDatabaseBuilder {
final String name; // _$HxDatabaseBuilder(this.name);
//
final List<Migration> _migrations = []; // final String name;
//
Callback _callback; // final List<Migration> _migrations = [];
//
/// Adds migrations to the builder. // Callback _callback;
_$HxDatabaseBuilder addMigrations(List<Migration> migrations) { //
_migrations.addAll(migrations); // /// Adds migrations to the builder.
return this; // _$HxDatabaseBuilder addMigrations(List<Migration> migrations) {
} // _migrations.addAll(migrations);
// return this;
/// Adds a database [Callback] to the builder. // }
_$HxDatabaseBuilder addCallback(Callback callback) { //
_callback = callback; // /// Adds a database [Callback] to the builder.
return this; // _$HxDatabaseBuilder addCallback(Callback callback) {
} // _callback = callback;
// return this;
/// Creates the database and initializes it. // }
Future<HxDatabase> build() async { //
final path = name != null // /// Creates the database and initializes it.
? await sqfliteDatabaseFactory.getDatabasePath(name) // Future<HxDatabase> build() async {
: ':memory:'; // final path = name != null
final database = _$HxDatabase(); // ? await sqfliteDatabaseFactory.getDatabasePath(name)
database.database = await database.open( // : ':memory:';
path, // final database = _$HxDatabase();
_migrations, // database.database = await database.open(
_callback, // path,
); // _migrations,
return database; // _callback,
} // );
} // return database;
// }
class _$HxDatabase extends HxDatabase { // }
_$HxDatabase([StreamController<String> listener]) { //
changeListener = listener ?? StreamController<String>.broadcast(); // class _$HxDatabase extends HxDatabase {
} // _$HxDatabase([StreamController<String> listener]) {
// changeListener = listener ?? StreamController<String>.broadcast();
MessageDao _messageDaoInstance; // }
//
Future<sqflite.Database> open( // MessageDao _messageDaoInstance;
String path, //
List<Migration> migrations, [ // Future<sqflite.Database> open(
Callback callback, // String path,
]) async { // List<Migration> migrations, [
final databaseOptions = sqflite.OpenDatabaseOptions( // Callback callback,
version: 1, // ]) async {
onConfigure: (database) async { // final databaseOptions = sqflite.OpenDatabaseOptions(
await database.execute('PRAGMA foreign_keys = ON'); // version: 1,
await callback?.onConfigure?.call(database); // onConfigure: (database) async {
}, // await database.execute('PRAGMA foreign_keys = ON');
onOpen: (database) async { // await callback?.onConfigure?.call(database);
await callback?.onOpen?.call(database); // },
}, // onOpen: (database) async {
onUpgrade: (database, startVersion, endVersion) async { // await callback?.onOpen?.call(database);
await MigrationAdapter.runMigrations( // },
database, startVersion, endVersion, migrations); // onUpgrade: (database, startVersion, endVersion) async {
// await MigrationAdapter.runMigrations(
await callback?.onUpgrade?.call(database, startVersion, endVersion); // database, startVersion, endVersion, migrations);
}, //
onCreate: (database, version) async { // await callback?.onUpgrade?.call(database, startVersion, endVersion);
await database.execute( // },
'CREATE TABLE IF NOT EXISTS `Message` (`id` INTEGER, `fromId` INTEGER, `toId` INTEGER, `content` TEXT, `attach` TEXT, `msgType` INTEGER, `time` INTEGER, `state` INTEGER, `isDelete` INTEGER, PRIMARY KEY (`id`))'); // onCreate: (database, version) async {
// await database.execute(
await callback?.onCreate?.call(database, version); // 'CREATE TABLE IF NOT EXISTS `Message` (`id` INTEGER, `fromId` INTEGER, `toId` INTEGER, `content` TEXT, `attach` TEXT, `msgType` INTEGER, `time` INTEGER, `state` INTEGER, `isDelete` INTEGER, PRIMARY KEY (`id`))');
}, //
); // await callback?.onCreate?.call(database, version);
return sqfliteDatabaseFactory.openDatabase(path, options: databaseOptions); // },
} // );
// return sqfliteDatabaseFactory.openDatabase(path, options: databaseOptions);
@override // }
MessageDao get messageDao { //
return _messageDaoInstance ??= _$MessageDao(database, changeListener); // @override
} // MessageDao get messageDao {
} // return _messageDaoInstance ??= _$MessageDao(database, changeListener);
// }
class _$MessageDao extends MessageDao { // }
_$MessageDao( //
this.database, // class _$MessageDao extends MessageDao {
this.changeListener, // _$MessageDao(
) : _queryAdapter = QueryAdapter(database, changeListener), // this.database,
_messageInsertionAdapter = InsertionAdapter( // this.changeListener,
database, // ) : _queryAdapter = QueryAdapter(database, changeListener),
'Message', // _messageInsertionAdapter = InsertionAdapter(
(Message item) => item.toJson(), // database,
changeListener); // 'Message',
// (Message item) => item.toJson(),
final sqflite.DatabaseExecutor database; // changeListener);
//
final StreamController<String> changeListener; // final sqflite.DatabaseExecutor database;
//
final QueryAdapter _queryAdapter; // final StreamController<String> changeListener;
//
final InsertionAdapter<Message> _messageInsertionAdapter; // final QueryAdapter _queryAdapter;
//
@override // final InsertionAdapter<Message> _messageInsertionAdapter;
Stream<List<Message>> findMessageByToId(int toId) { //
return _queryAdapter.queryListStream( // @override
'SELECT * FROM Message WHERE toId = ?1', // Stream<List<Message>> findMessageByToId(int toId) {
mapper: (Map<String, Object> row) => Message.fromJson(row), // return _queryAdapter.queryListStream(
arguments: [toId], // 'SELECT * FROM Message WHERE toId = ?1',
queryableName: 'Message', // mapper: (Map<String, Object> row) => Message.fromJson(row),
isView: false); // arguments: [toId],
} // queryableName: 'Message',
// isView: false);
@override // }
Future<List<Message>> findMessageByGroup(int userId) { //
debugPrint("findMessageByGroup: $userId"); // @override
return _queryAdapter.queryList( // Future<List<Message>> findMessageByGroup(int userId) {
'SELECT * FROM Message WHERE toId = ?1 OR fromId = ?2 GROUP BY toId,fromId ORDER BY time DESC', // debugPrint("findMessageByGroup: $userId");
mapper: (Map<String, Object> row) => Message.fromJson(row), // return _queryAdapter.queryList(
arguments: [userId, userId]); // 'SELECT * FROM Message WHERE toId = ?1 OR fromId = ?2 GROUP BY toId,fromId ORDER BY time DESC',
} // mapper: (Map<String, Object> row) => Message.fromJson(row),
// arguments: [userId, userId]);
@override // }
Future<void> insertMessage(Message message) async { //
await _messageInsertionAdapter.insert(message, OnConflictStrategy.abort); // @override
} // Future<void> insertMessage(Message message) async {
} // await _messageInsertionAdapter.insert(message, OnConflictStrategy.abort);
// }
// }

24
lib/im/database/message.dart
Unescape View File

@ -1,13 +1,12 @@
import 'package:floor/floor.dart';
@entity
class Message { class Message {
@primaryKey
int id; int id;
int fromId; String fromId;
int toId; String toId;
String replyId;
String content; String content;
@ -15,18 +14,19 @@ class Message {
int msgType; int msgType;
int time; String time;
int state; int state;
int isDelete; int isDelete;
Message(id, fromId, toId, content, attach, msgType, time, state, isDelete); Message(this.id, this.fromId, this.toId, this.replyId, this.content, this.attach, this.msgType, this.time, this.state, this.isDelete);
factory Message.fromJson(Map<String, dynamic> json) => Message( factory Message.fromJson(Map<String, dynamic> json) => Message(
json["id"], json["id"],
json["fromId"], json["fromId"],
json["toId"], json["toId"],
json["replyId"],
json["content"], json["content"],
json["attach"], json["attach"],
json["msgType"], json["msgType"],
@ -38,6 +38,7 @@ class Message {
"id": id, "id": id,
"fromId": fromId, "fromId": fromId,
"toId": toId, "toId": toId,
"replyId": replyId,
"content": content, "content": content,
"attach": attach, "attach": attach,
"msgType": msgType, "msgType": msgType,
@ -47,15 +48,16 @@ class Message {
}; };
} }
createMessage(var toId, String content, {String attach, int msgType, userId}) { createMessage(var toId, String content, {String attach, int msgType, userId, replyId}) {
return Message.fromJson(<String, dynamic>{ return <String, dynamic>{
"fromId": userId, "fromId": userId,
"toId": toId, "toId": toId,
"replyId": replyId,
"content": content, "content": content,
"attach": attach, "attach": attach,
"msgType": msgType ?? 0, "msgType": msgType ?? 0,
"time": DateTime.now().millisecondsSinceEpoch, "time": "${DateTime.now().millisecondsSinceEpoch}",
"state": 0, "state": 0,
"isDelete": 0 "isDelete": 0
}); };
} }

34
lib/im/database/message_dao.dart
Unescape View File

@ -1,17 +1,17 @@
import 'package:floor/floor.dart'; // import 'package:floor/floor.dart';
import 'package:huixiang/im/database/message.dart'; // import 'package:huixiang/im/database/message.dart';
//
//
@dao // @dao
abstract class MessageDao { // abstract class MessageDao {
//
@Query('SELECT * FROM Message WHERE toId = :toId') // @Query('SELECT * FROM Message WHERE toId = :toId')
Stream<List<Message>> findMessageByToId(int toId); // Stream<List<Message>> findMessageByToId(int toId);
//
@insert // @insert
Future<void> insertMessage(Message message); // Future<void> insertMessage(Message message);
//
@Query('SELECT * FROM Message WHERE toId = :userId OR fromId = :userId GROUP BY toId,fromId ORDER BY time DESC') // @Query('SELECT * FROM Message WHERE toId = :userId OR fromId = :userId GROUP BY toId,fromId ORDER BY time DESC')
Future<List<Message>> findMessageByGroup(int userId); // Future<List<Message>> findMessageByGroup(int userId);
//
} // }

41
lib/im/database/migration.dart
Unescape View File

@ -0,0 +1,41 @@
import 'package:sqflite/sqflite.dart' as sqflite;
/// Base class for a database migration.
///
/// Each migration can move between 2 versions that are defined by
/// [startVersion] and [endVersion].
class Migration {
/// The start version of the database.
final int startVersion;
/// The start version of the database.
final int endVersion;
/// Function that performs the migration.
final Future<void> Function(sqflite.Database database) migrate;
/// Creates a new migration between [startVersion] and [endVersion].
/// [migrate] will be called by the database and performs the actual
/// migration.
Migration(this.startVersion, this.endVersion, this.migrate)
: assert(startVersion > 0),
assert(startVersion < endVersion);
@override
bool operator ==(Object other) =>
identical(this, other) ||
other is Migration &&
runtimeType == other.runtimeType &&
startVersion == other.startVersion &&
endVersion == other.endVersion &&
migrate == other.migrate;
@override
int get hashCode =>
startVersion.hashCode ^ endVersion.hashCode ^ migrate.hashCode;
@override
String toString() {
return 'Migration{startVersion: $startVersion, endVersion: $endVersion, migrate: $migrate}';
}
}

31
lib/im/im_view/im_page.dart
Unescape View File

@ -74,29 +74,20 @@ class _IMPage extends State<IMPage> implements OnChatMessage {
queryMsgStats(); queryMsgStats();
} }
List<int> userIds = []; List<String> userIds = [];
Stream streamSubscription ; Stream streamSubscription ;
loadMessageList() async { loadMessageList() async {
int userId = 123456; SharedPreferences shared = await SharedPreferences.getInstance();
String userId = shared.getString("userId");
hxDatabase.changeListener.stream.listen((event) { messages = await hxDatabase.queryList(userId);
debugPrint("messages: 1111");
}, onError: (Object error, stackTrace) {
debugPrint("messages: 3333");
});
hxDatabase.changeListener.onListen = () {
debugPrint("messages: 2222");
};
messages = await hxDatabase.messageDao.findMessageByGroup(userId);
messages.forEach((element) { messages.forEach((element) {
debugPrint("messages: $element"); debugPrint("messages: ${element.toJson()}");
}); });
userIds = messages userIds = messages
.map((e) => e.toId != userId ? e.toId : e.fromId) .map((e) => e.toId != userId ? e.toId : e.fromId)
.toSet() .toSet().where((element) => element != userId)
.toList(); .toList();
if (mounted) { if (mounted) {
setState(() {}); setState(() {});
@ -289,7 +280,6 @@ class _IMPage extends State<IMPage> implements OnChatMessage {
child: TextField( child: TextField(
textInputAction: TextInputAction.search, textInputAction: TextInputAction.search,
onEditingComplete: () { onEditingComplete: () {
socketClient.sendMessage(654321, "hello~");
FocusScope.of(context).requestFocus(FocusNode()); FocusScope.of(context).requestFocus(FocusNode());
}, },
controller: imEditingController, controller: imEditingController,
@ -331,7 +321,12 @@ class _IMPage extends State<IMPage> implements OnChatMessage {
return GestureDetector( return GestureDetector(
behavior: HitTestBehavior.opaque, behavior: HitTestBehavior.opaque,
onTap: () { onTap: () {
Navigator.of(context).pushNamed('/router/chat_details_page'); Navigator.of(context).pushNamed(
'/router/chat_details_page',
arguments: {
"toId": userIds[position],
},
);
}, },
child: chatItem(userIds[position]), child: chatItem(userIds[position]),
); );
@ -371,7 +366,7 @@ class _IMPage extends State<IMPage> implements OnChatMessage {
Expanded( Expanded(
child: Text( child: Text(
"喽哈 $userId", "喽哈 $userId",
overflow: TextOverflow.ellipsis, overflow: TextOverflow.fade,
maxLines: 1, maxLines: 1,
style: TextStyle( style: TextStyle(
fontSize: 16.sp, fontSize: 16.sp,

16
lib/im/out/auth.pb.dart
Unescape View File

@ -15,7 +15,7 @@ import 'package:protobuf/protobuf.dart' as $pb;
class AuthReq extends $pb.GeneratedMessage { class AuthReq extends $pb.GeneratedMessage {
factory AuthReq({ factory AuthReq({
$core.int? uid, $core.String? uid,
$core.String? token, $core.String? token,
}) { }) {
final $result = create(); final $result = create();
@ -32,7 +32,7 @@ class AuthReq extends $pb.GeneratedMessage {
factory AuthReq.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); factory AuthReq.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AuthReq', createEmptyInstance: create) static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AuthReq', createEmptyInstance: create)
..a<$core.int>(1, _omitFieldNames ? '' : 'uid', $pb.PbFieldType.OU3) ..aOS(1, _omitFieldNames ? '' : 'uid')
..aOS(2, _omitFieldNames ? '' : 'token') ..aOS(2, _omitFieldNames ? '' : 'token')
..hasRequiredFields = false ..hasRequiredFields = false
; ;
@ -59,9 +59,9 @@ class AuthReq extends $pb.GeneratedMessage {
static AuthReq? _defaultInstance; static AuthReq? _defaultInstance;
@$pb.TagNumber(1) @$pb.TagNumber(1)
$core.int get uid => $_getIZ(0); $core.String get uid => $_getSZ(0);
@$pb.TagNumber(1) @$pb.TagNumber(1)
set uid($core.int v) { $_setUnsignedInt32(0, v); } set uid($core.String v) { $_setString(0, v); }
@$pb.TagNumber(1) @$pb.TagNumber(1)
$core.bool hasUid() => $_has(0); $core.bool hasUid() => $_has(0);
@$pb.TagNumber(1) @$pb.TagNumber(1)
@ -79,7 +79,7 @@ class AuthReq extends $pb.GeneratedMessage {
class AuthResp extends $pb.GeneratedMessage { class AuthResp extends $pb.GeneratedMessage {
factory AuthResp({ factory AuthResp({
$core.int? uid, $core.String? uid,
$core.int? code, $core.int? code,
$core.String? message, $core.String? message,
}) { }) {
@ -100,7 +100,7 @@ class AuthResp extends $pb.GeneratedMessage {
factory AuthResp.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); factory AuthResp.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AuthResp', createEmptyInstance: create) static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AuthResp', createEmptyInstance: create)
..a<$core.int>(1, _omitFieldNames ? '' : 'uid', $pb.PbFieldType.OU3) ..aOS(1, _omitFieldNames ? '' : 'uid')
..a<$core.int>(2, _omitFieldNames ? '' : 'code', $pb.PbFieldType.OU3) ..a<$core.int>(2, _omitFieldNames ? '' : 'code', $pb.PbFieldType.OU3)
..aOS(3, _omitFieldNames ? '' : 'message') ..aOS(3, _omitFieldNames ? '' : 'message')
..hasRequiredFields = false ..hasRequiredFields = false
@ -128,9 +128,9 @@ class AuthResp extends $pb.GeneratedMessage {
static AuthResp? _defaultInstance; static AuthResp? _defaultInstance;
@$pb.TagNumber(1) @$pb.TagNumber(1)
$core.int get uid => $_getIZ(0); $core.String get uid => $_getSZ(0);
@$pb.TagNumber(1) @$pb.TagNumber(1)
set uid($core.int v) { $_setUnsignedInt32(0, v); } set uid($core.String v) { $_setString(0, v); }
@$pb.TagNumber(1) @$pb.TagNumber(1)
$core.bool hasUid() => $_has(0); $core.bool hasUid() => $_has(0);
@$pb.TagNumber(1) @$pb.TagNumber(1)

8
lib/im/out/auth.pbjson.dart
Unescape View File

@ -17,20 +17,20 @@ import 'dart:typed_data' as $typed_data;
const AuthReq$json = { const AuthReq$json = {
'1': 'AuthReq', '1': 'AuthReq',
'2': [ '2': [
{'1': 'uid', '3': 1, '4': 1, '5': 13, '10': 'uid'}, {'1': 'uid', '3': 1, '4': 1, '5': 9, '10': 'uid'},
{'1': 'token', '3': 2, '4': 1, '5': 9, '10': 'token'}, {'1': 'token', '3': 2, '4': 1, '5': 9, '10': 'token'},
], ],
}; };
/// Descriptor for `AuthReq`. Decode as a `google.protobuf.DescriptorProto`. /// Descriptor for `AuthReq`. Decode as a `google.protobuf.DescriptorProto`.
final $typed_data.Uint8List authReqDescriptor = $convert.base64Decode( final $typed_data.Uint8List authReqDescriptor = $convert.base64Decode(
'CgdBdXRoUmVxEhAKA3VpZBgBIAEoDVIDdWlkEhQKBXRva2VuGAIgASgJUgV0b2tlbg=='); 'CgdBdXRoUmVxEhAKA3VpZBgBIAEoCVIDdWlkEhQKBXRva2VuGAIgASgJUgV0b2tlbg==');
@$core.Deprecated('Use authRespDescriptor instead') @$core.Deprecated('Use authRespDescriptor instead')
const AuthResp$json = { const AuthResp$json = {
'1': 'AuthResp', '1': 'AuthResp',
'2': [ '2': [
{'1': 'uid', '3': 1, '4': 1, '5': 13, '10': 'uid'}, {'1': 'uid', '3': 1, '4': 1, '5': 9, '10': 'uid'},
{'1': 'code', '3': 2, '4': 1, '5': 13, '10': 'code'}, {'1': 'code', '3': 2, '4': 1, '5': 13, '10': 'code'},
{'1': 'message', '3': 3, '4': 1, '5': 9, '10': 'message'}, {'1': 'message', '3': 3, '4': 1, '5': 9, '10': 'message'},
], ],
@ -38,6 +38,6 @@ const AuthResp$json = {
/// Descriptor for `AuthResp`. Decode as a `google.protobuf.DescriptorProto`. /// Descriptor for `AuthResp`. Decode as a `google.protobuf.DescriptorProto`.
final $typed_data.Uint8List authRespDescriptor = $convert.base64Decode( final $typed_data.Uint8List authRespDescriptor = $convert.base64Decode(
'CghBdXRoUmVzcBIQCgN1aWQYASABKA1SA3VpZBISCgRjb2RlGAIgASgNUgRjb2RlEhgKB21lc3' 'CghBdXRoUmVzcBIQCgN1aWQYASABKAlSA3VpZBISCgRjb2RlGAIgASgNUgRjb2RlEhgKB21lc3'
'NhZ2UYAyABKAlSB21lc3NhZ2U='); 'NhZ2UYAyABKAlSB21lc3NhZ2U=');

16
lib/im/out/message.pb.dart
Unescape View File

@ -19,8 +19,8 @@ export 'message.pbenum.dart';
class MsgData extends $pb.GeneratedMessage { class MsgData extends $pb.GeneratedMessage {
factory MsgData({ factory MsgData({
$core.int? to, $core.String? to,
$core.int? from, $core.String? from,
$core.int? ctime, $core.int? ctime,
MsgType? type, MsgType? type,
$core.List<$core.int>? data, $core.List<$core.int>? data,
@ -48,8 +48,8 @@ class MsgData extends $pb.GeneratedMessage {
factory MsgData.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); factory MsgData.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'MsgData', createEmptyInstance: create) static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'MsgData', createEmptyInstance: create)
..a<$core.int>(1, _omitFieldNames ? '' : 'to', $pb.PbFieldType.OU3) ..aOS(1, _omitFieldNames ? '' : 'to')
..a<$core.int>(2, _omitFieldNames ? '' : 'from', $pb.PbFieldType.OU3) ..aOS(2, _omitFieldNames ? '' : 'from')
..a<$core.int>(3, _omitFieldNames ? '' : 'ctime', $pb.PbFieldType.OU3) ..a<$core.int>(3, _omitFieldNames ? '' : 'ctime', $pb.PbFieldType.OU3)
..e<MsgType>(4, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE, defaultOrMaker: MsgType.SINGLE_TEXT, valueOf: MsgType.valueOf, enumValues: MsgType.values) ..e<MsgType>(4, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE, defaultOrMaker: MsgType.SINGLE_TEXT, valueOf: MsgType.valueOf, enumValues: MsgType.values)
..a<$core.List<$core.int>>(5, _omitFieldNames ? '' : 'data', $pb.PbFieldType.OY) ..a<$core.List<$core.int>>(5, _omitFieldNames ? '' : 'data', $pb.PbFieldType.OY)
@ -78,18 +78,18 @@ class MsgData extends $pb.GeneratedMessage {
static MsgData? _defaultInstance; static MsgData? _defaultInstance;
@$pb.TagNumber(1) @$pb.TagNumber(1)
$core.int get to => $_getIZ(0); $core.String get to => $_getSZ(0);
@$pb.TagNumber(1) @$pb.TagNumber(1)
set to($core.int v) { $_setUnsignedInt32(0, v); } set to($core.String v) { $_setString(0, v); }
@$pb.TagNumber(1) @$pb.TagNumber(1)
$core.bool hasTo() => $_has(0); $core.bool hasTo() => $_has(0);
@$pb.TagNumber(1) @$pb.TagNumber(1)
void clearTo() => clearField(1); void clearTo() => clearField(1);
@$pb.TagNumber(2) @$pb.TagNumber(2)
$core.int get from => $_getIZ(1); $core.String get from => $_getSZ(1);
@$pb.TagNumber(2) @$pb.TagNumber(2)
set from($core.int v) { $_setUnsignedInt32(1, v); } set from($core.String v) { $_setString(1, v); }
@$pb.TagNumber(2) @$pb.TagNumber(2)
$core.bool hasFrom() => $_has(1); $core.bool hasFrom() => $_has(1);
@$pb.TagNumber(2) @$pb.TagNumber(2)

6
lib/im/out/message.pbjson.dart
Unescape View File

@ -33,8 +33,8 @@ final $typed_data.Uint8List msgTypeDescriptor = $convert.base64Decode(
const MsgData$json = { const MsgData$json = {
'1': 'MsgData', '1': 'MsgData',
'2': [ '2': [
{'1': 'to', '3': 1, '4': 1, '5': 13, '10': 'to'}, {'1': 'to', '3': 1, '4': 1, '5': 9, '10': 'to'},
{'1': 'from', '3': 2, '4': 1, '5': 13, '10': 'from'}, {'1': 'from', '3': 2, '4': 1, '5': 9, '10': 'from'},
{'1': 'ctime', '3': 3, '4': 1, '5': 13, '10': 'ctime'}, {'1': 'ctime', '3': 3, '4': 1, '5': 13, '10': 'ctime'},
{'1': 'type', '3': 4, '4': 1, '5': 14, '6': '.MsgType', '10': 'type'}, {'1': 'type', '3': 4, '4': 1, '5': 14, '6': '.MsgType', '10': 'type'},
{'1': 'data', '3': 5, '4': 1, '5': 12, '10': 'data'}, {'1': 'data', '3': 5, '4': 1, '5': 12, '10': 'data'},
@ -43,7 +43,7 @@ const MsgData$json = {
/// Descriptor for `MsgData`. Decode as a `google.protobuf.DescriptorProto`. /// Descriptor for `MsgData`. Decode as a `google.protobuf.DescriptorProto`.
final $typed_data.Uint8List msgDataDescriptor = $convert.base64Decode( final $typed_data.Uint8List msgDataDescriptor = $convert.base64Decode(
'CgdNc2dEYXRhEg4KAnRvGAEgASgNUgJ0bxISCgRmcm9tGAIgASgNUgRmcm9tEhQKBWN0aW1lGA' 'CgdNc2dEYXRhEg4KAnRvGAEgASgJUgJ0bxISCgRmcm9tGAIgASgJUgRmcm9tEhQKBWN0aW1lGA'
'MgASgNUgVjdGltZRIcCgR0eXBlGAQgASgOMgguTXNnVHlwZVIEdHlwZRISCgRkYXRhGAUgASgM' 'MgASgNUgVjdGltZRIcCgR0eXBlGAQgASgOMgguTXNnVHlwZVIEdHlwZRISCgRkYXRhGAUgASgM'
'UgRkYXRh'); 'UgRkYXRh');

5
lib/main.dart
Unescape View File

@ -221,7 +221,8 @@ void main() async {
HxDatabase hxDatabase; HxDatabase hxDatabase;
initDatabase() async { initDatabase() async {
hxDatabase = await $FloorHxDatabase.databaseBuilder('huixiang_database.db').build(); hxDatabase = HxDatabase();
await hxDatabase.open();
} }
final SocketClient socketClient = new SocketClient(); final SocketClient socketClient = new SocketClient();
@ -505,7 +506,7 @@ Map<String, WidgetBuilder> routers = <String, WidgetBuilder>{
'/router/contacts_share': (context, {arguments}) => '/router/contacts_share': (context, {arguments}) =>
ContactsShare(arguments:arguments), ContactsShare(arguments:arguments),
'/router/chat_details_page': (context, {arguments}) => '/router/chat_details_page': (context, {arguments}) =>
ChatDetailsPage(), ChatDetailsPage(arguments: arguments),
'/router/chat_setting': (context, {arguments}) => '/router/chat_setting': (context, {arguments}) =>
ChatSetting(), ChatSetting(),
'/router/chat_friend_group': (context, {arguments}) => '/router/chat_friend_group': (context, {arguments}) =>

1
lib/mine/edit_signature.dart
Unescape View File

@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/generated/l10n.dart';
import 'package:huixiang/utils/font_weight.dart';
import 'package:huixiang/view_widget/my_appbar.dart'; import 'package:huixiang/view_widget/my_appbar.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';

42
pubspec.lock
Unescape View File

@ -265,22 +265,6 @@ packages:
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "3.0.2" version: "3.0.2"
floor:
dependency: "direct main"
description:
name: floor
sha256: "52a8eac2c8d274e7c0c54251226f59786bb5b749365a2d8537d8095aa5132d92"
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.4.2"
floor_annotation:
dependency: transitive
description:
name: floor_annotation
sha256: fa3fa4f198cdd1d922a69ceb06e54663fe59256bf1cb3c036eff206b445a6960
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.4.2"
flutter: flutter:
dependency: "direct main" dependency: "direct main"
description: flutter description: flutter
@ -955,7 +939,7 @@ packages:
source: hosted source: hosted
version: "1.9.1" version: "1.9.1"
sqflite: sqflite:
dependency: transitive dependency: "direct main"
description: description:
name: sqflite name: sqflite
sha256: b4d6710e1200e96845747e37338ea8a819a12b51689a3bcf31eff0003b37a0b9 sha256: b4d6710e1200e96845747e37338ea8a819a12b51689a3bcf31eff0003b37a0b9
@ -970,30 +954,6 @@ packages:
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.4.5+1" version: "2.4.5+1"
sqflite_common_ffi:
dependency: transitive
description:
name: sqflite_common_ffi
sha256: f86de82d37403af491b21920a696b19f01465b596f545d1acd4d29a0a72418ad
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.2.5"
sqlite3:
dependency: transitive
description:
name: sqlite3
sha256: "281b672749af2edf259fc801f0fcba092257425bcd32a0ce1c8237130bc934c7"
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.11.2"
sqlparser:
dependency: transitive
description:
name: sqlparser
sha256: "91f47610aa54d8abf9d795a7b4e49b2a788f65d7493d5a68fbf180c3cbcc6f38"
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.27.0"
stack_trace: stack_trace:
dependency: transitive dependency: transitive
description: description:

3
pubspec.yaml
Unescape View File

@ -123,7 +123,8 @@ dependencies:
flutter_datetime_picker: ^1.5.1 flutter_datetime_picker: ^1.5.1
widgetpicker: ^0.1.1 widgetpicker: ^0.1.1
floor: ^1.4.2 # floor: ^1.4.2
sqflite: ^2.2.2
syncfusion_flutter_datepicker: ^19.4.38 syncfusion_flutter_datepicker: ^19.4.38
protobuf: ^3.1.0 protobuf: ^3.1.0

Write Preview
Loading…
Cancel
Save