diff --git a/android/app/build.gradle b/android/app/build.gradle
index 6d85456..a71c1be 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -25,27 +25,40 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android {
- compileSdkVersion 31
+ compileSdkVersion 33
lintOptions {
disable 'InvalidPackage'
}
defaultConfig {
- // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.example.wechat_flutter"
minSdkVersion 23
- targetSdkVersion 31
+ targetSdkVersion 33
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
}
+// signingConfigs {
+// release {
+// keyAlias 'android.keystore'
+// keyPassword '123456'
+// storeFile file('android.keystore')
+// storePassword '123456'
+// }
+// }
+
buildTypes {
release {
minifyEnabled false //删除无用代码
shrinkResources false //删除无用资源
signingConfig signingConfigs.debug
}
+ debug {
+ minifyEnabled false //删除无用代码
+ shrinkResources false //删除无用资源
+ signingConfig signingConfigs.debug
+ }
}
configurations.all {
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 9f303eb..4fc5b09 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -7,6 +7,11 @@
additional functionality it is fine to subclass or reimplement
FlutterApplication and put your custom class here. -->
+ <!-- Remove READ_MEDIA_IMAGES if you don't need to take photos. -->
+ <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" tools:node="remove" />
+ <!-- Remove READ_MEDIA_VIDEO if you don't need to take videos. -->
+ <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" tools:node="remove" />
+
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.WRITE_CONTACTS" />
@@ -28,10 +33,11 @@
<application
android:icon="@mipmap/ic_launcher"
- android:usesCleartextTraffic="true">
+ android:usesCleartextTraffic="true"
+ android:requestLegacyExternalStorage="true">
<activity
- android:exported="true"
android:name=".MainActivity"
+ android:exported="true"
android:launchMode="singleTop"
android:label="wechat_flutter"
android:theme="@style/LaunchTheme"
diff --git a/android/app/src/main/res/mipmap-ldpi/ic_launcher.png b/android/app/src/main/res/mipmap-ldpi/ic_launcher.png
new file mode 100644
index 0000000..ff82956
Binary files /dev/null and b/android/app/src/main/res/mipmap-ldpi/ic_launcher.png differ
diff --git a/android/build.gradle b/android/build.gradle
index 1d48421..c83a93a 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -2,19 +2,36 @@ buildscript {
ext.kotlin_version = '1.6.10' // Change here
repositories {
+ // 原生
google()
jcenter()
+
+ // 阿里镜像
+ maven { url 'https://maven.aliyun.com/repository/public/' }
+ maven { url 'https://maven.aliyun.com/repository/google/' }
+ maven { url 'https://maven.aliyun.com/repository/jcenter/' }
+ maven { url 'https://maven.aliyun.com/repository/central/' }
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.0.1'
+// classpath 'com.android.tools.build:gradle:7.0.2'
+// classpath 'com.android.tools.build:gradle:4.1.0'
+ classpath 'com.android.tools.build:gradle:7.1.3'
+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
allprojects {
repositories {
+ // 原生
google()
jcenter()
+
+ // 阿里镜像
+ maven { url 'https://maven.aliyun.com/repository/public/' }
+ maven { url 'https://maven.aliyun.com/repository/google/' }
+ maven { url 'https://maven.aliyun.com/repository/jcenter/' }
+ maven { url 'https://maven.aliyun.com/repository/central/' }
}
}
diff --git a/android/gradle.properties b/android/gradle.properties
index 38c8d45..298eabf 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,4 +1,7 @@
org.gradle.jvmargs=-Xmx1536M
-android.enableR8=true
+#android.enableR8=true
android.useAndroidX=true
android.enableJetifier=true
+#?????????10.3?
+#android.jetifier.blacklist=bcprov-jdk15on
+https.protocols=TLSv1.2,TLSv1.3
\ No newline at end of file
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 493072b..595fb86 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
diff --git a/assets/images/3.0x/ic_chat_play_icon.png b/assets/images/3.0x/ic_chat_play_icon.png
new file mode 100644
index 0000000..8963ca1
Binary files /dev/null and b/assets/images/3.0x/ic_chat_play_icon.png differ
diff --git a/assets/images/3.0x/loading.gif b/assets/images/3.0x/loading.gif
new file mode 100644
index 0000000..c8f6ee9
Binary files /dev/null and b/assets/images/3.0x/loading.gif differ
diff --git a/assets/images/contact/3.0x/ic_search_long.png b/assets/images/contact/3.0x/ic_search_long.png
new file mode 100644
index 0000000..919b014
Binary files /dev/null and b/assets/images/contact/3.0x/ic_search_long.png differ
diff --git a/assets/images/live/live_accept.png b/assets/images/live/live_accept.png
new file mode 100644
index 0000000..f460c6c
Binary files /dev/null and b/assets/images/live/live_accept.png differ
diff --git a/assets/images/live/live_audio_windwo_bg.png b/assets/images/live/live_audio_windwo_bg.png
new file mode 100644
index 0000000..bea3117
Binary files /dev/null and b/assets/images/live/live_audio_windwo_bg.png differ
diff --git a/assets/images/live/live_avatar_close_microphone.png b/assets/images/live/live_avatar_close_microphone.png
new file mode 100644
index 0000000..4431c19
Binary files /dev/null and b/assets/images/live/live_avatar_close_microphone.png differ
diff --git a/assets/images/live/live_avatar_open_microphone.png b/assets/images/live/live_avatar_open_microphone.png
new file mode 100644
index 0000000..b451605
Binary files /dev/null and b/assets/images/live/live_avatar_open_microphone.png differ
diff --git a/assets/images/live/live_camera_close.png b/assets/images/live/live_camera_close.png
new file mode 100644
index 0000000..24b260a
Binary files /dev/null and b/assets/images/live/live_camera_close.png differ
diff --git a/assets/images/live/live_camera_open.png b/assets/images/live/live_camera_open.png
new file mode 100644
index 0000000..b72b7dd
Binary files /dev/null and b/assets/images/live/live_camera_open.png differ
diff --git a/assets/images/live/live_cancel.png b/assets/images/live/live_cancel.png
new file mode 100644
index 0000000..b8ee0f1
Binary files /dev/null and b/assets/images/live/live_cancel.png differ
diff --git a/assets/images/live/live_change_to_voice.png b/assets/images/live/live_change_to_voice.png
new file mode 100644
index 0000000..b31c42a
Binary files /dev/null and b/assets/images/live/live_change_to_voice.png differ
diff --git a/assets/images/live/live_group_audio_arrow_down.png b/assets/images/live/live_group_audio_arrow_down.png
new file mode 100644
index 0000000..47b0020
Binary files /dev/null and b/assets/images/live/live_group_audio_arrow_down.png differ
diff --git a/assets/images/live/live_microphone_close.png b/assets/images/live/live_microphone_close.png
new file mode 100644
index 0000000..329ab4c
Binary files /dev/null and b/assets/images/live/live_microphone_close.png differ
diff --git a/assets/images/live/live_microphone_open.png b/assets/images/live/live_microphone_open.png
new file mode 100644
index 0000000..5a5f827
Binary files /dev/null and b/assets/images/live/live_microphone_open.png differ
diff --git a/assets/images/live/live_scale.png b/assets/images/live/live_scale.png
new file mode 100644
index 0000000..16329e5
Binary files /dev/null and b/assets/images/live/live_scale.png differ
diff --git a/assets/images/live/live_speakers_close.png b/assets/images/live/live_speakers_close.png
new file mode 100644
index 0000000..6c8fe1c
Binary files /dev/null and b/assets/images/live/live_speakers_close.png differ
diff --git a/assets/images/live/live_speakers_open.png b/assets/images/live/live_speakers_open.png
new file mode 100644
index 0000000..989d4c2
Binary files /dev/null and b/assets/images/live/live_speakers_open.png differ
diff --git a/assets/images/live/live_switch.png b/assets/images/live/live_switch.png
new file mode 100644
index 0000000..05bb525
Binary files /dev/null and b/assets/images/live/live_switch.png differ
diff --git a/assets/images/live/live_video_accept.png b/assets/images/live/live_video_accept.png
new file mode 100644
index 0000000..e07bef8
Binary files /dev/null and b/assets/images/live/live_video_accept.png differ
diff --git a/buildApk.sh b/buildApk.sh
new file mode 100644
index 0000000..43d6a14
--- /dev/null
+++ b/buildApk.sh
@@ -0,0 +1,10 @@
+flutter build apk
+mkdir androidApk
+mv build/app/outputs/flutter-apk/app-release.apk androidApk/app-release.apk
+curl -F "file=@./androidApk/app-release.apk" \
+-F "uKey=01e0da7cc9905550619d14e458688472" \
+-F "_api_key=1bff420ce07bc9687cd3a5ca4629b7ec" \
+https://www.pgyer.com/apiv1/app/upload
+echo "";
+echo "Android包地址：https://www.pgyer.com/bVyU";
+echo "";
diff --git a/buildIos.sh b/buildIos.sh
new file mode 100644
index 0000000..e377bad
--- /dev/null
+++ b/buildIos.sh
@@ -0,0 +1,14 @@
+cd ios
+pod install
+cd ..
+flutter build ios
+cd ios
+xcodebuild -workspace Runner.xcworkspace -scheme Runner -configuration Release -archivePath ./archive archive
+xcodebuild -exportArchive -archivePath ./archive.xcarchive -exportPath ./export -exportOptionsPlist ./config/ExportOptions.plist
+#curl -F "file=@./export/wechat_flutter.ipa" \
+#-F "uKey=01e0da7cc9905550619d14e458688472" \
+#-F "_api_key=1bff420ce07bc9687cd3a5ca4629b7ec" \
+#https://www.pgyer.com/apiv1/app/upload
+#echo "";
+#echo "IOS包地址：https://www.pgyer.com/86BC";
+#echo "";
diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist
index 8d4492f..9625e10 100644
--- a/ios/Flutter/AppFrameworkInfo.plist
+++ b/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
- <string>9.0</string>
+ <string>11.0</string>
</dict>
</plist>
diff --git a/ios/Podfile b/ios/Podfile
index 1e8c3c9..5ce1ad5 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -1,5 +1,7 @@
# Uncomment this line to define a global platform for your project
-# platform :ios, '9.0'
+platform :ios, '11.0'
+
+source 'https://github.com/CocoaPods/Specs.git'
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
deleted file mode 100644
index 00437a6..0000000
--- a/ios/Podfile.lock
+++ /dev/null
@@ -1,169 +0,0 @@
-PODS:
- - audioplayers (0.0.1):
- - Flutter
- - camera (0.0.1):
- - Flutter
- - connectivity (0.0.1):
- - Flutter
- - Reachability
- - dim (0.2.7):
- - Flutter
- - TXIMSDK_iOS
- - YYModel
- - Flutter (1.0.0)
- - flutter_image_compress (0.0.1):
- - Flutter
- - Mantle
- - SDWebImage
- - SDWebImageWebPCoder
- - flutter_sound (0.0.1):
- - Flutter
- - FMDB (2.7.5):
- - FMDB/standard (= 2.7.5)
- - FMDB/standard (2.7.5)
- - image_picker (0.0.1):
- - Flutter
- - libwebp (1.2.0):
- - libwebp/demux (= 1.2.0)
- - libwebp/mux (= 1.2.0)
- - libwebp/webp (= 1.2.0)
- - libwebp/demux (1.2.0):
- - libwebp/webp
- - libwebp/mux (1.2.0):
- - libwebp/demux
- - libwebp/webp (1.2.0)
- - Mantle (2.1.6):
- - Mantle/extobjc (= 2.1.6)
- - Mantle/extobjc (2.1.6)
- - open_file (0.0.1):
- - Flutter
- - package_info_plus (0.4.5):
- - Flutter
- - path_provider (0.0.1):
- - Flutter
- - permission_handler (3.1.0):
- - Flutter
- - photo_manager (1.0.0):
- - Flutter
- - FlutterMacOS
- - Reachability (3.2)
- - SDWebImage (5.11.0):
- - SDWebImage/Core (= 5.11.0)
- - SDWebImage/Core (5.11.0)
- - SDWebImageWebPCoder (0.8.3):
- - libwebp (~> 1.0)
- - SDWebImage/Core (~> 5.10)
- - shared_preferences (0.0.1):
- - Flutter
- - sqflite (0.0.2):
- - Flutter
- - FMDB (>= 2.7.5)
- - TXIMSDK_iOS (5.1.60)
- - url_launcher (0.0.1):
- - Flutter
- - video_player_avfoundation (0.0.1):
- - Flutter
- - webview_flutter (0.0.1):
- - Flutter
- - YYModel (1.0.4)
-
-DEPENDENCIES:
- - audioplayers (from `.symlinks/plugins/audioplayers/ios`)
- - camera (from `.symlinks/plugins/camera/ios`)
- - connectivity (from `.symlinks/plugins/connectivity/ios`)
- - dim (from `.symlinks/plugins/dim/ios`)
- - Flutter (from `Flutter`)
- - flutter_image_compress (from `.symlinks/plugins/flutter_image_compress/ios`)
- - flutter_sound (from `.symlinks/plugins/flutter_sound/ios`)
- - image_picker (from `.symlinks/plugins/image_picker/ios`)
- - open_file (from `.symlinks/plugins/open_file/ios`)
- - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
- - path_provider (from `.symlinks/plugins/path_provider/ios`)
- - permission_handler (from `.symlinks/plugins/permission_handler/ios`)
- - photo_manager (from `.symlinks/plugins/photo_manager/ios`)
- - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
- - sqflite (from `.symlinks/plugins/sqflite/ios`)
- - url_launcher (from `.symlinks/plugins/url_launcher/ios`)
- - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/ios`)
- - webview_flutter (from `.symlinks/plugins/webview_flutter/ios`)
-
-SPEC REPOS:
- trunk:
- - FMDB
- - libwebp
- - Mantle
- - Reachability
- - SDWebImage
- - SDWebImageWebPCoder
- - TXIMSDK_iOS
- - YYModel
-
-EXTERNAL SOURCES:
- audioplayers:
- :path: ".symlinks/plugins/audioplayers/ios"
- camera:
- :path: ".symlinks/plugins/camera/ios"
- connectivity:
- :path: ".symlinks/plugins/connectivity/ios"
- dim:
- :path: ".symlinks/plugins/dim/ios"
- Flutter:
- :path: Flutter
- flutter_image_compress:
- :path: ".symlinks/plugins/flutter_image_compress/ios"
- flutter_sound:
- :path: ".symlinks/plugins/flutter_sound/ios"
- image_picker:
- :path: ".symlinks/plugins/image_picker/ios"
- open_file:
- :path: ".symlinks/plugins/open_file/ios"
- package_info_plus:
- :path: ".symlinks/plugins/package_info_plus/ios"
- path_provider:
- :path: ".symlinks/plugins/path_provider/ios"
- permission_handler:
- :path: ".symlinks/plugins/permission_handler/ios"
- photo_manager:
- :path: ".symlinks/plugins/photo_manager/ios"
- shared_preferences:
- :path: ".symlinks/plugins/shared_preferences/ios"
- sqflite:
- :path: ".symlinks/plugins/sqflite/ios"
- url_launcher:
- :path: ".symlinks/plugins/url_launcher/ios"
- video_player_avfoundation:
- :path: ".symlinks/plugins/video_player_avfoundation/ios"
- webview_flutter:
- :path: ".symlinks/plugins/webview_flutter/ios"
-
-SPEC CHECKSUMS:
- audioplayers: 455322b54050b30ea4b1af7cd9e9d105f74efa8c
- camera: 38cc83ae9a5667bb5a71c7d9edaf60a91920fd4e
- connectivity: 6e94255659cc86dcbef1d452ad3e0491bb1b3e75
- dim: fa3014799fdbbbf47d5d507a85385c8e00f1c706
- Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
- flutter_image_compress: fd2b476345226e1a10ea352fa306af95704642c1
- flutter_sound: 0e8163ceac1e00eb6d894e2ae4641ba726a2c479
- FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
- image_picker: 16e5fec1fbc87fd3b297c53e4048521eaf17cd06
- libwebp: 6bac0a99ba5a6bb7449a951ff22c484201985f68
- Mantle: 4c0ed6ce47c96eccc4dc3bb071deb3def0e2c3be
- open_file: 02eb5cb6b21264bd3a696876f5afbfb7ca4f4b7d
- package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
- path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
- permission_handler: fa6b0d784b1a43cb96b468a5b8365cb130b1956a
- photo_manager: 84fa94fbeb82e607333ea9a13c43b58e0903a463
- Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
- SDWebImage: 7acbb57630ac7db4a495547fb73916ff3e432f6b
- SDWebImageWebPCoder: bbf46e29fb8d1980a78ad3d5e9b4123c77f10ebc
- shared_preferences: 5033afbb22d372e15aff8ff766df9021b845f273
- sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
- TXIMSDK_iOS: 015557374d46a549ec63f298e76d1aaf38611284
- url_launcher: a1c0cc845906122c4784c542523d8cacbded5626
- video_player_avfoundation: e489aac24ef5cf7af82702979ed16f2a5ef84cff
- webview_flutter: d2b4d6c66968ad042ad94cbb791f5b72b4678a96
- YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30
-
-PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
-
-COCOAPODS: 1.11.3
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index be26232..a932fb9 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -10,6 +10,7 @@
0ABAC79EF25A80894462FBFA /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21464391FB279AF1FBCDA50A /* Pods_Runner.framework */; };
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
+ 734ADB2B28F2D11A005514E6 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 734ADB2A28F2D11A005514E6 /* libc++.tbd */; };
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
@@ -35,6 +36,7 @@
21464391FB279AF1FBCDA50A /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
652DF3F8D463965CEBE736F1 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+ 734ADB2A28F2D11A005514E6 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
@@ -54,6 +56,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ 734ADB2B28F2D11A005514E6 /* libc++.tbd in Frameworks */,
0ABAC79EF25A80894462FBFA /* Pods_Runner.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -119,6 +122,7 @@
EC8CEF73B5A011ACBEE1279F /* Frameworks */ = {
isa = PBXGroup;
children = (
+ 734ADB2A28F2D11A005514E6 /* libc++.tbd */,
21464391FB279AF1FBCDA50A /* Pods_Runner.framework */,
);
name = Frameworks;
@@ -139,6 +143,7 @@
9705A1C41CF9048500538489 /* Embed Frameworks */,
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
7ED6F49BB9F84677AF2F5E98 /* [CP] Embed Pods Frameworks */,
+ 5D7084DFDEAC5EA91F8FEB9A /* [CP] Copy Pods Resources */,
);
buildRules = (
);
@@ -211,6 +216,23 @@
shellPath = /bin/sh;
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
};
+ 5D7084DFDEAC5EA91F8FEB9A /* [CP] Copy Pods Resources */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputFileListPaths = (
+ "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
+ );
+ name = "[CP] Copy Pods Resources";
+ outputFileListPaths = (
+ "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+ showEnvVarsInLog = 0;
+ };
626EB2F5058E1FF4B121E56C /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@@ -339,7 +361,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
@@ -354,16 +376,20 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
+ CODE_SIGN_IDENTITY = "Apple Development";
+ CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
- DEVELOPMENT_TEAM = 4RL34F2S97;
+ DEVELOPMENT_TEAM = 55ARJ7966Y;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
+ INFOPLIST_KEY_CFBundleDisplayName = KIM;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = com.example.wechatFlutter;
+ PRODUCT_BUNDLE_IDENTIFIER = com.yfzhu.kim.ios;
PRODUCT_NAME = "$(TARGET_NAME)";
+ PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
@@ -417,7 +443,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
@@ -466,7 +492,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
@@ -483,16 +509,20 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
+ CODE_SIGN_IDENTITY = "Apple Development";
+ CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
- DEVELOPMENT_TEAM = 4RL34F2S97;
+ DEVELOPMENT_TEAM = 55ARJ7966Y;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
+ INFOPLIST_KEY_CFBundleDisplayName = KIM;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = com.example.wechatFlutter;
+ PRODUCT_BUNDLE_IDENTIFIER = com.yfzhu.kim.ios;
PRODUCT_NAME = "$(TARGET_NAME)";
+ PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
@@ -506,16 +536,20 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
+ CODE_SIGN_IDENTITY = "Apple Development";
+ CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
- DEVELOPMENT_TEAM = 4RL34F2S97;
+ DEVELOPMENT_TEAM = 55ARJ7966Y;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
+ INFOPLIST_KEY_CFBundleDisplayName = KIM;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = com.example.wechatFlutter;
+ PRODUCT_BUNDLE_IDENTIFIER = com.yfzhu.kim.ios;
PRODUCT_NAME = "$(TARGET_NAME)";
+ PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
diff --git a/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
deleted file mode 100644
index f9b0d7c..0000000
--- a/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>PreviewsEnabled</key>
- <false/>
-</dict>
-</plist>
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-1024.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-1024.png
new file mode 100644
index 0000000..1f26b9c
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-1024.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20-ipad.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20-ipad.png
new file mode 100644
index 0000000..4b32c81
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20-ipad.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@2x-ipad.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@2x-ipad.png
new file mode 100644
index 0000000..cc6844e
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@2x-ipad.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png
new file mode 100644
index 0000000..cc6844e
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png
new file mode 100644
index 0000000..b348af6
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29-ipad.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29-ipad.png
new file mode 100644
index 0000000..c663171
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29-ipad.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29.png
new file mode 100644
index 0000000..c663171
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@2x-ipad.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@2x-ipad.png
new file mode 100644
index 0000000..7bb9874
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@2x-ipad.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png
new file mode 100644
index 0000000..7bb9874
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png
new file mode 100644
index 0000000..e65f3d8
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40.png
new file mode 100644
index 0000000..cc6844e
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png
new file mode 100644
index 0000000..f303656
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png
new file mode 100644
index 0000000..4acbffb
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png
new file mode 100644
index 0000000..4acbffb
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png
new file mode 100644
index 0000000..54ada04
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-76.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-76.png
new file mode 100644
index 0000000..6173e11
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-76.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png
new file mode 100644
index 0000000..b1f1af3
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png
new file mode 100644
index 0000000..3a46b05
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
deleted file mode 100644
index 159a0e7..0000000
--- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "filename" : "launch_image的副本.jpg",
- "scale" : "1x"
- },
- {
- "idiom" : "universal",
- "filename" : "launch_image的副本-1.jpg",
- "scale" : "2x"
- },
- {
- "idiom" : "universal",
- "filename" : "launch_image的副本-2.jpg",
- "scale" : "3x"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
deleted file mode 100644
index 9da19ea..0000000
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
deleted file mode 100644
index 9da19ea..0000000
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
deleted file mode 100644
index 9da19ea..0000000
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
deleted file mode 100644
index 89c2725..0000000
--- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Launch Screen Assets
-
-You can customize the launch screen with your own desired assets by replacing the image files in this directory.
-
-You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images.
\ No newline at end of file
diff --git "a/ios/Runner/Assets.xcassets/LaunchImage.imageset/launch_image\347\232\204\345\211\257\346\234\254-1.jpg" "b/ios/Runner/Assets.xcassets/LaunchImage.imageset/launch_image\347\232\204\345\211\257\346\234\254-1.jpg"
deleted file mode 100644
index 69a557b..0000000
Binary files "a/ios/Runner/Assets.xcassets/LaunchImage.imageset/launch_image\347\232\204\345\211\257\346\234\254-1.jpg" and /dev/null differ
diff --git "a/ios/Runner/Assets.xcassets/LaunchImage.imageset/launch_image\347\232\204\345\211\257\346\234\254-2.jpg" "b/ios/Runner/Assets.xcassets/LaunchImage.imageset/launch_image\347\232\204\345\211\257\346\234\254-2.jpg"
deleted file mode 100644
index 69a557b..0000000
Binary files "a/ios/Runner/Assets.xcassets/LaunchImage.imageset/launch_image\347\232\204\345\211\257\346\234\254-2.jpg" and /dev/null differ
diff --git "a/ios/Runner/Assets.xcassets/LaunchImage.imageset/launch_image\347\232\204\345\211\257\346\234\254.jpg" "b/ios/Runner/Assets.xcassets/LaunchImage.imageset/launch_image\347\232\204\345\211\257\346\234\254.jpg"
deleted file mode 100644
index 69a557b..0000000
Binary files "a/ios/Runner/Assets.xcassets/LaunchImage.imageset/launch_image\347\232\204\345\211\257\346\234\254.jpg" and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Contents.json b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Contents.json
new file mode 100644
index 0000000..c2a20da
--- /dev/null
+++ b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Contents.json
@@ -0,0 +1,216 @@
+{
+ "images": [
+ {
+ "extent": "full-screen",
+ "idiom": "iphone",
+ "subtype": "2688h",
+ "filename": "Default-2688h.png",
+ "minimum-system-version": "12.0",
+ "orientation": "portrait",
+ "scale": "3x"
+ },
+ {
+ "extent": "full-screen",
+ "idiom": "iphone",
+ "subtype": "2688h",
+ "filename": "Default-Landscape-2688h.png",
+ "minimum-system-version": "12.0",
+ "orientation": "landscape",
+ "scale": "3x"
+ },
+ {
+ "extent": "full-screen",
+ "idiom": "iphone",
+ "subtype": "1792h",
+ "filename": "Default-1792h.png",
+ "minimum-system-version": "12.0",
+ "orientation": "portrait",
+ "scale": "2x"
+ },
+ {
+ "extent": "full-screen",
+ "idiom": "iphone",
+ "subtype": "1792h",
+ "filename": "Default-Landscape-1792h.png",
+ "minimum-system-version": "12.0",
+ "orientation": "landscape",
+ "scale": "2x"
+ },
+ {
+ "extent": "full-screen",
+ "idiom": "iphone",
+ "subtype": "2436h",
+ "filename": "Default-2436h.png",
+ "minimum-system-version": "11.0",
+ "orientation": "portrait",
+ "scale": "3x"
+ },
+ {
+ "extent": "full-screen",
+ "idiom": "iphone",
+ "subtype": "2436h",
+ "filename": "Default-Landscape-2436h.png",
+ "minimum-system-version": "11.0",
+ "orientation": "landscape",
+ "scale": "3x"
+ },
+ {
+ "extent": "full-screen",
+ "idiom": "iphone",
+ "subtype": "736h",
+ "filename": "Default-736h.png",
+ "minimum-system-version": "8.0",
+ "orientation": "portrait",
+ "scale": "3x"
+ },
+ {
+ "extent": "full-screen",
+ "idiom": "iphone",
+ "subtype": "736h",
+ "filename": "Default-Landscape-736h.png",
+ "minimum-system-version": "8.0",
+ "orientation": "landscape",
+ "scale": "3x"
+ },
+ {
+ "extent": "full-screen",
+ "idiom": "iphone",
+ "subtype": "667h",
+ "filename": "Default-667h.png",
+ "minimum-system-version": "8.0",
+ "orientation": "portrait",
+ "scale": "2x"
+ },
+ {
+ "orientation": "portrait",
+ "idiom": "iphone",
+ "filename": "Default@2x~iphone.png",
+ "extent": "full-screen",
+ "minimum-system-version": "7.0",
+ "scale": "2x"
+ },
+ {
+ "extent": "full-screen",
+ "idiom": "iphone",
+ "subtype": "retina4",
+ "filename": "Default-568h@2x~iphone.png",
+ "minimum-system-version": "7.0",
+ "orientation": "portrait",
+ "scale": "2x"
+ },
+ {
+ "orientation": "portrait",
+ "idiom": "ipad",
+ "filename": "Default-Portrait~ipad.png",
+ "extent": "full-screen",
+ "minimum-system-version": "7.0",
+ "scale": "1x"
+ },
+ {
+ "orientation": "landscape",
+ "idiom": "ipad",
+ "filename": "Default-Landscape~ipad.png",
+ "extent": "full-screen",
+ "minimum-system-version": "7.0",
+ "scale": "1x"
+ },
+ {
+ "orientation": "portrait",
+ "idiom": "ipad",
+ "filename": "Default-Portrait@2x~ipad.png",
+ "extent": "full-screen",
+ "minimum-system-version": "7.0",
+ "scale": "2x"
+ },
+ {
+ "orientation": "landscape",
+ "idiom": "ipad",
+ "filename": "Default-Landscape@2x~ipad.png",
+ "extent": "full-screen",
+ "minimum-system-version": "7.0",
+ "scale": "2x"
+ },
+ {
+ "orientation": "portrait",
+ "idiom": "iphone",
+ "filename": "Default~iphone.png",
+ "extent": "full-screen",
+ "scale": "1x"
+ },
+ {
+ "orientation": "portrait",
+ "idiom": "iphone",
+ "filename": "Default@2x~iphone.png",
+ "extent": "full-screen",
+ "scale": "2x"
+ },
+ {
+ "orientation": "portrait",
+ "idiom": "iphone",
+ "filename": "Default-568h@2x~iphone.png",
+ "extent": "full-screen",
+ "subtype": "retina4",
+ "scale": "2x"
+ },
+ {
+ "orientation": "portrait",
+ "idiom": "ipad",
+ "filename": "Default-No-StatusBar~ipad.png",
+ "extent": "to-status-bar",
+ "scale": "1x"
+ },
+ {
+ "orientation": "portrait",
+ "idiom": "ipad",
+ "filename": "Default-Portrait~ipad.png",
+ "extent": "full-screen",
+ "scale": "1x"
+ },
+ {
+ "orientation": "landscape",
+ "idiom": "ipad",
+ "filename": "Default-Landscape-No-StatusBar~ipad.png",
+ "extent": "to-status-bar",
+ "scale": "1x"
+ },
+ {
+ "orientation": "landscape",
+ "idiom": "ipad",
+ "filename": "Default-Landscape~ipad.png",
+ "extent": "full-screen",
+ "scale": "1x"
+ },
+ {
+ "orientation": "portrait",
+ "idiom": "ipad",
+ "filename": "Default-No-StatusBar@2x~ipad.png",
+ "extent": "to-status-bar",
+ "scale": "2x"
+ },
+ {
+ "orientation": "portrait",
+ "idiom": "ipad",
+ "filename": "Default-Portrait@2x~ipad.png",
+ "extent": "full-screen",
+ "scale": "2x"
+ },
+ {
+ "orientation": "landscape",
+ "idiom": "ipad",
+ "filename": "Default-Landscape-No-StatusBar@2x~ipad.png",
+ "extent": "to-status-bar",
+ "scale": "2x"
+ },
+ {
+ "orientation": "landscape",
+ "idiom": "ipad",
+ "filename": "Default-Landscape@2x~ipad.png",
+ "extent": "full-screen",
+ "scale": "2x"
+ }
+ ],
+ "info": {
+ "version": 1,
+ "author": "https://icon.wuruihong.com"
+ }
+}
\ No newline at end of file
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-1792h.png b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-1792h.png
new file mode 100644
index 0000000..573d275
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-1792h.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-2436h.png b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-2436h.png
new file mode 100644
index 0000000..8dc61bf
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-2436h.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-2688h.png b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-2688h.png
new file mode 100644
index 0000000..3a9e8e7
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-2688h.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-568h@2x~iphone.png b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-568h@2x~iphone.png
new file mode 100644
index 0000000..9fd5750
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-568h@2x~iphone.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-667h.png b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-667h.png
new file mode 100644
index 0000000..819eec0
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-667h.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-736h.png b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-736h.png
new file mode 100644
index 0000000..f6421aa
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-736h.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-1792h.png b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-1792h.png
new file mode 100644
index 0000000..45522e6
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-1792h.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-2436h.png b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-2436h.png
new file mode 100644
index 0000000..5a78a9f
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-2436h.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-2688h.png b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-2688h.png
new file mode 100644
index 0000000..36f2b59
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-2688h.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-736h.png b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-736h.png
new file mode 100644
index 0000000..78a38c6
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-736h.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-No-StatusBar@2x~ipad.png b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-No-StatusBar@2x~ipad.png
new file mode 100644
index 0000000..9854c47
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-No-StatusBar@2x~ipad.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-No-StatusBar~ipad.png b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-No-StatusBar~ipad.png
new file mode 100644
index 0000000..3124ae8
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-No-StatusBar~ipad.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-Landscape@2x~ipad.png b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-Landscape@2x~ipad.png
new file mode 100644
index 0000000..dcfb81a
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-Landscape@2x~ipad.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-Landscape~ipad.png b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-Landscape~ipad.png
new file mode 100644
index 0000000..88a1af2
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-Landscape~ipad.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-No-StatusBar@2x~ipad.png b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-No-StatusBar@2x~ipad.png
new file mode 100644
index 0000000..499b967
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-No-StatusBar@2x~ipad.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-No-StatusBar~ipad.png b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-No-StatusBar~ipad.png
new file mode 100644
index 0000000..563f519
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-No-StatusBar~ipad.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-Portrait@2x~ipad.png b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-Portrait@2x~ipad.png
new file mode 100644
index 0000000..435b1d9
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-Portrait@2x~ipad.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-Portrait~ipad.png b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-Portrait~ipad.png
new file mode 100644
index 0000000..f165c0d
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default-Portrait~ipad.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default@2x~iphone.png b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default@2x~iphone.png
new file mode 100644
index 0000000..a2f06b8
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default@2x~iphone.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default~iphone.png b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default~iphone.png
new file mode 100644
index 0000000..d27b784
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.launchimage/Default~iphone.png differ
diff --git a/ios/Runner/Base.lproj/LaunchScreen.storyboard b/ios/Runner/Base.lproj/LaunchScreen.storyboard
index f2e259c..cf6097a 100644
--- a/ios/Runner/Base.lproj/LaunchScreen.storyboard
+++ b/ios/Runner/Base.lproj/LaunchScreen.storyboard
@@ -1,8 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21223" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+ <device id="retina6_0" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21204"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
@@ -14,12 +16,14 @@
<viewControllerLayoutGuide type="bottom" id="xbc-2k-c8Z"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+ <rect key="frame" x="0.0" y="0.0" width="390" height="844"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
+ <rect key="frame" x="111" y="329.66666666666669" width="168" height="185.00000000000006"/>
</imageView>
</subviews>
- <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="YRO-k0-Ey4" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="1a2-6s-vTC"/>
<constraint firstItem="YRO-k0-Ey4" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="4X2-HB-R7a"/>
@@ -28,9 +32,10 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="53" y="375"/>
+ <point key="canvasLocation" x="81.538461538461533" y="266.58767772511845"/>
</scene>
</scenes>
+ <color key="tintColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<resources>
<image name="LaunchImage" width="168" height="185"/>
</resources>
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index d87fb0f..87aa1f6 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -2,6 +2,8 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
+ <key>CADisableMinimumFrameDurationOnPhone</key>
+ <true/>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
@@ -22,8 +24,27 @@
<string>$(FLUTTER_BUILD_NUMBER)</string>
<key>LSRequiresIPhoneOS</key>
<true/>
- <key>io.flutter.embedded_views_preview</key>
- <string>YES</string>
+ <key>NSAppTransportSecurity</key>
+ <dict>
+ <key>NSAllowsArbitraryLoads</key>
+ <true/>
+ </dict>
+ <key>NSAppleMusicUsageDescription</key>
+ <string>App需要您的同意,才能访问媒体资料库</string>
+ <key>NSCameraUsageDescription</key>
+ <string>Take a photo for display</string>
+ <key>NSContactsUsageDescription</key>
+ <string>App需要您的同意，才能访问联系人</string>
+ <key>NSLocationWhenInUseUsageDescription</key>
+ <string>App需要您的同意,才能在使用期间访问位置</string>
+ <key>NSMicrophoneUsageDescription</key>
+ <string>Take a video for display</string>
+ <key>NSPhotoLibraryAddUsageDescription</key>
+ <string>请允许APP保存图片到相册</string>
+ <key>NSPhotoLibraryUsageDescription</key>
+ <string>Replace with your permission description.</string>
+ <key>NSSpeechRecognitionUsageDescription</key>
+ <string>App需要您的同意,才能语音转文字</string>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
@@ -43,12 +64,7 @@
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
- <key>NSAppTransportSecurity</key>
- <dict>
- <key>NSAllowsArbitraryLoads</key>
- <true/>
- </dict>
- <key>NSPhotoLibraryUsageDescription</key>
- <string>Replace with your permission description.</string>
+ <key>io.flutter.embedded_views_preview</key>
+ <string>YES</string>
</dict>
</plist>
diff --git a/ios/config/ExportOptions.plist b/ios/config/ExportOptions.plist
new file mode 100644
index 0000000..23991ae
--- /dev/null
+++ b/ios/config/ExportOptions.plist
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>compileBitcode</key>
+ <true/>
+ <key>destination</key>
+ <string>export</string>
+ <key>method</key>
+ <string>ad-hoc</string>
+ <key>provisioningProfiles</key>
+ <dict>
+ <key>com.yfzhu.kim</key>
+ <string>com.yfzhu.kim</string>
+ </dict>
+ <key>signingCertificate</key>
+ <string>Apple Distribution</string>
+ <key>signingStyle</key>
+ <string>manual</string>
+ <key>stripSwiftSymbols</key>
+ <true/>
+ <key>teamID</key>
+ <string>4RL34F2S97</string>
+ <key>thinning</key>
+ <string><none></string>
+</dict>
+</plist>
diff --git a/plugin/camera/ios/Assets/.gitkeep b/ios/config/provisioningProfiles.mobileprovision
old mode 100755
new mode 100644
similarity index 100%
rename from plugin/camera/ios/Assets/.gitkeep
rename to ios/config/provisioningProfiles.mobileprovision
diff --git a/key.md b/key.md
new file mode 100644
index 0000000..1daaf5f
--- /dev/null
+++ b/key.md
@@ -0,0 +1,51 @@
+# 签名信息
+keytool -genkey -alias android.keystore -keyalg RSA -keysize 2048 -validity 36500 -keystore android.keystore
+密码123456
+
+# 查看详情
+keytool -list -v -keystore android.keystore
+
+```agsl
+Keystore type: jks
+Keystore provider: SUN
+
+Your keystore contains 1 entry
+
+Alias name: android.keystore
+Creation date: Oct 15, 2022
+Entry type: PrivateKeyEntry
+Certificate chain length: 1
+Certificate[1]:
+Owner: CN=a, OU=a, O=good, L=guangzhou, ST=china, C=cn
+Issuer: CN=a, OU=a, O=good, L=guangzhou, ST=china, C=cn
+Serial number: 67d0efee
+Valid from: Sat Oct 15 18:33:25 CST 2022 until: Mon Sep 21 18:33:25 CST 2122
+Certificate fingerprints:
+ MD5: 29:3F:F2:48:1A:F8:0A:C7:C6:86:CB:D1:D0:6C:18:74
+ SHA1: 1C:65:9D:43:06:09:01:67:BC:72:93:38:DA:F1:A8:A7:35:E5:87:37
+ SHA256: C3:97:37:64:61:CE:BB:35:B2:15:AB:5C:63:C8:C2:9E:CB:22:BC:D8:40:80:35:12:82:70:B4:9C:13:B2:46:33
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+
+Extensions:
+
+#1: ObjectId: 2.5.29.14 Criticality=false
+SubjectKeyIdentifier [
+KeyIdentifier [
+0000: 8E 44 A7 0E DF 2F 17 05 8D AB CB 7C 16 8D CC 79 .D.../.........y
+0010: A0 C4 C5 7E ....
+]
+]
+
+
+
+*******************************************
+*******************************************
+
+
+
+Warning:
+The JKS keystore uses a proprietary format. It is recommended to migrate to PKCS12 which is an industry standard format using "keytool -importkeystore -srckeystore android.keystore -destkeystore android.keystore -deststoretype pkcs12".
+ q1@q1deMacBook-Pro ~/Documents/git/wechat_flutter_inner/android/app main ±✚
+```
\ No newline at end of file
diff --git a/lib/app.dart b/lib/app.dart
index 911cfe5..5aaa96c 100755
--- a/lib/app.dart
+++ b/lib/app.dart
@@ -1,42 +1,95 @@
-import 'package:dim/commom/route.dart';
import 'package:flutter/material.dart';
-import 'package:flutter/cupertino.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:oktoast/oktoast.dart';
import 'package:provider/provider.dart';
-import 'package:wechat_flutter/config/storage_manager.dart';
-import 'package:wechat_flutter/pages/login/login_begin_page.dart';
-import 'package:wechat_flutter/pages/root/root_page.dart';
-import 'package:wechat_flutter/provider/global_model.dart';
+import 'package:wechat_flutter/pages/common/login/login_begin_page.dart';
+import 'package:wechat_flutter/pages/root/root/root_logic.dart';
+import 'package:wechat_flutter/pages/root/root/root_view.dart';
+import 'package:wechat_flutter/tools/core/global_controller.dart';
+import 'package:wechat_flutter/tools/provider/global_model.dart';
+import 'package:wechat_flutter/tools/provider/im/im_event.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
class MyApp extends StatelessWidget {
@override
Widget build(BuildContext context) {
- final model = Provider.of<GlobalModel>(context)..setContext(context);
-
- return new MaterialApp(
- navigatorKey: navGK,
- title: model.appName,
- theme: ThemeData(
- scaffoldBackgroundColor: bgColor,
- hintColor: Colors.grey.withOpacity(0.3),
- splashColor: Colors.transparent,
- canvasColor: Colors.transparent,
+ return OKToast(
+ dismissOtherOnShow: true,
+ child: MultiProvider(
+ providers: [
+ ChangeNotifierProvider(create: (_) => IMEvent()),
+ ],
+ child: new GetMaterialApp(
+ title: AppConfig.appName,
+ theme: ThemeData(
+ scaffoldBackgroundColor: bgColor,
+ hintColor: Colors.grey.withOpacity(0.3),
+ splashColor: Colors.transparent,
+ canvasColor: Colors.transparent,
+ primaryColor: MyTheme.themeColor(),
+ primarySwatch: MyTheme.primarySwatch(),
+ textTheme: TextTheme(
+ bodyText1: TextStyle(color: Colors.red),
+ ),
+ ),
+ debugShowCheckedModeBanner: false,
+ localizationsDelegates: [
+ GlobalCupertinoLocalizations.delegate,
+ GlobalMaterialLocalizations.delegate,
+ GlobalWidgetsLocalizations.delegate
+ ],
+ getPages: AppPages.routes,
+ initialBinding: InitBinding(),
+ initialRoute: RouteConfig.startPage,
+ ),
),
- debugShowCheckedModeBanner: false,
- localizationsDelegates: [
- S.delegate,
- GlobalCupertinoLocalizations.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate
- ],
- supportedLocales: S.delegate.supportedLocales,
- locale: model.currentLocale,
- routes: {
- '/': (context) {
- return model.goToLogin ? new LoginBeginPage() : new RootPage();
- }
- },
);
}
}
+
+class InitBinding extends Bindings {
+ @override
+ void dependencies() {
+ Get.put<GlobalController>(GlobalController());
+ Get.put<RootLogic>(RootLogic());
+ }
+}
+
+class StartPage extends StatefulWidget {
+ @override
+ State<StartPage> createState() => _StartPageState();
+}
+
+class _StartPageState extends State<StartPage> {
+ bool isInitOk = false;
+
+ @override
+ void initState() {
+ super.initState();
+ init();
+ }
+
+/*
+* 初始化
+* */
+ Future init() async {
+ /// 这个方法里面有检测登录
+ await ImApi.init(context);
+ isInitOk = true;
+ setState(() {});
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ GlobalModel globalModel = Provider.of<GlobalModel>(context)
+ ..setContext(context);
+
+ if (!isInitOk) {
+ return Material(
+ color: Colors.white,
+ child: Center(child: Text('加载中')),
+ );
+ }
+ return globalModel.goToLogin ? new LoginBeginPage() : new RootPage();
+ }
+}
diff --git a/lib/config/api.dart b/lib/config/api.dart
deleted file mode 100644
index c87afe8..0000000
--- a/lib/config/api.dart
+++ /dev/null
@@ -1,8 +0,0 @@
-class API {
- static const nameUrl = 'https://www.apiopen.top/femaleNameApi';
- static const avatarUrl = 'http://www.lorempixel.com/200/200/';
- static const cat = 'https://api.thecatapi.com/v1/images/search';
- static const upImg = "http://111.230.251.115/oldchen/fUser/oneDaySuggestion";
- static const update = 'http://www.flutterj.com/api/update.json';
- static const uploadImg = 'http://www.flutterj.com/upload/avatar';
-}
diff --git a/lib/config/storage_manager.dart b/lib/config/storage_manager.dart
deleted file mode 100755
index 75482ff..0000000
--- a/lib/config/storage_manager.dart
+++ /dev/null
@@ -1,50 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:wechat_flutter/tools/wechat_flutter.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-
-class StorageManager {
- /// app全局配置
- static SharedPreferences sp;
-
- /// 网络连接
- var connect;
-
- /// 必备数据的初始化操作
- static init() async {
- // async 异步操作
- // sync 同步操作
- sp = await SharedPreferences.getInstance();
-
- if (Platform.isAndroid) {
- StorageManager().initAutoLogin();
- } else {
- debugPrint('IOS自动登陆开发中');
- }
- }
-
-
- initAutoLogin() async {
- try {
- // 监测网络变化
- connect = Connectivity()
- .onConnectivityChanged
- .listen((ConnectivityResult result) async {
- if (result != ConnectivityResult.mobile &&
- result != ConnectivityResult.wifi) {
- await SharedUtil.instance.saveBoolean(Keys.brokenNetwork, true);
- } else {
- await SharedUtil.instance.saveBoolean(Keys.brokenNetwork, false);
- final hasLogged =
- await SharedUtil.instance.getBoolean(Keys.hasLogged);
- final currentUser = await im.getCurrentLoginUser();
- if (hasLogged) if (currentUser == '' || currentUser == null) {
- final account = await SharedUtil.instance.getString(Keys.account);
- im.imAutoLogin(account);
- }
- }
- });
- } on PlatformException {
- print('你已登录或者其他错误');
- }
- }
-}
diff --git a/lib/generated/i18n.dart b/lib/generated/i18n.dart
deleted file mode 100755
index 0f5ef48..0000000
--- a/lib/generated/i18n.dart
+++ /dev/null
@@ -1,255 +0,0 @@
-import 'dart:async';
-
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: camel_case_types
-// ignore_for_file: prefer_single_quotes
-
-// This file is automatically generated. DO NOT EDIT, all your changes would be lost.
-class S implements WidgetsLocalizations {
- const S();
-
- static S current;
-
- static const GeneratedLocalizationsDelegate delegate =
- GeneratedLocalizationsDelegate();
-
- static S of(BuildContext context) => Localizations.of<S>(context, S);
-
- @override
- TextDirection get textDirection => TextDirection.ltr;
-
- String get appName => "WeChat";
- String get australia => "Australia";
- String get canada => "Canada";
- String get chinaMainland => "China Mainland";
- String get contacts => "Contacts";
- String get discover => "Discover";
- String get emergencyFreeze => "freeze";
- String get exampleName => "For example: Chen Chen";
- String get hongKong => "Hong Kong";
- String get label => "test";
- String get language => "Language";
- String get languageTitle => "Change Language";
- String get login => "Login";
- String get macao => "Macao";
- String get me => "Me";
- String get mobileNumberLogin => "Mobile number login";
- String get multiLanguage => "Multi-Language";
- String get nextStep => "Next step";
- String get nickName => "nickname";
- String get notOpen => "Not yet open";
- String get numberRegister => "Mobile number registration";
- String get passWord => "passWord";
- String get phoneCity => "Country";
- String get phoneNumber => "Phone";
- String get phoneNumberHint => "Please fill in your phone number";
- String get protocolName => "[ WeChat protocol ]";
- String get protocolTitle => "WeChat Software License and Service Agreement";
- String get protocolUrl => "https://weixin.qq.com/cgi-bin/readtemplate?lang=en&t=weixin_agreement&s=default&cc=CN";
- String get pwTip => "Fill in the password";
- String get readAgree => "ReadAgree ";
- String get register => "Register";
- String get retrievePW => "Retrieve";
- String get selectCountry => "Select country or region";
- String get singapore => "Singapore";
- String get taiwan => "Taiwan";
- String get uS => "United States";
- String get userLoginTip => "WeChat number / QQ number / email";
- String get weChat => "WeChat";
- String get weChatSecurityCenter => "Security";
-}
-
-class $en extends S {
- const $en();
-}
-
-class $zh_CN extends S {
- const $zh_CN();
-
- @override
- TextDirection get textDirection => TextDirection.ltr;
-
- @override
- String get passWord => "密码";
- @override
- String get readAgree => "已阅读并同意 ";
- @override
- String get weChatSecurityCenter => "微信安全中心";
- @override
- String get numberRegister => "手机号注册";
- @override
- String get emergencyFreeze => "紧急冻结";
- @override
- String get multiLanguage => "多语言";
- @override
- String get language => "语言";
- @override
- String get login => "登录";
- @override
- String get selectCountry => "选择国家或地区";
- @override
- String get macao => "澳门";
- @override
- String get protocolName => "《微信软件许可及服务协议》";
- @override
- String get userLoginTip => "用微信号/QQ号/邮箱登录";
- @override
- String get me => "我";
- @override
- String get phoneNumberHint => "请填写手机号";
- @override
- String get phoneCity => "国家/地区";
- @override
- String get chinaMainland => "中国大陆";
- @override
- String get discover => "发现";
- @override
- String get notOpen => "暂未开启";
- @override
- String get mobileNumberLogin => "手机号登录";
- @override
- String get appName => "微信";
- @override
- String get nickName => "昵称";
- @override
- String get australia => "澳大利亚";
- @override
- String get label => "测试";
- @override
- String get languageTitle => "切换语言";
- @override
- String get hongKong => "香港";
- @override
- String get protocolTitle => "微信软件许可及服务协议";
- @override
- String get singapore => "新加坡";
- @override
- String get taiwan => "台湾";
- @override
- String get phoneNumber => "手机号";
- @override
- String get canada => "加拿大";
- @override
- String get retrievePW => "找回密码";
- @override
- String get pwTip => "填写密码";
- @override
- String get nextStep => "下一步";
- @override
- String get weChat => "微信";
- @override
- String get exampleName => "例如: 陈晨";
- @override
- String get uS => "美国";
- @override
- String get protocolUrl => "https://weixin.qq.com/agreement?lang=zh_CN";
- @override
- String get contacts => "通讯录";
- @override
- String get register => "注册";
-}
-
-class GeneratedLocalizationsDelegate extends LocalizationsDelegate<S> {
- const GeneratedLocalizationsDelegate();
-
- List<Locale> get supportedLocales {
- return const <Locale>[
- Locale("en", ""),
- Locale("zh", "CN"),
- ];
- }
-
- LocaleListResolutionCallback listResolution({Locale fallback, bool withCountry = true}) {
- return (List<Locale> locales, Iterable<Locale> supported) {
- if (locales == null || locales.isEmpty) {
- return fallback ?? supported.first;
- } else {
- return _resolve(locales.first, fallback, supported, withCountry);
- }
- };
- }
-
- LocaleResolutionCallback resolution({Locale fallback, bool withCountry = true}) {
- return (Locale locale, Iterable<Locale> supported) {
- return _resolve(locale, fallback, supported, withCountry);
- };
- }
-
- @override
- Future<S> load(Locale locale) {
- final String lang = getLang(locale);
- if (lang != null) {
- switch (lang) {
- case "en":
- S.current = const $en();
- return SynchronousFuture<S>(S.current);
- case "zh_CN":
- S.current = const $zh_CN();
- return SynchronousFuture<S>(S.current);
- default:
- // NO-OP.
- }
- }
- S.current = const S();
- return SynchronousFuture<S>(S.current);
- }
-
- @override
- bool isSupported(Locale locale) => _isSupported(locale, true);
-
- @override
- bool shouldReload(GeneratedLocalizationsDelegate old) => false;
-
- ///
- /// Internal method to resolve a locale from a list of locales.
- ///
- Locale _resolve(Locale locale, Locale fallback, Iterable<Locale> supported, bool withCountry) {
- if (locale == null || !_isSupported(locale, withCountry)) {
- return fallback ?? supported.first;
- }
-
- final Locale languageLocale = Locale(locale.languageCode, "");
- if (supported.contains(locale)) {
- return locale;
- } else if (supported.contains(languageLocale)) {
- return languageLocale;
- } else {
- final Locale fallbackLocale = fallback ?? supported.first;
- return fallbackLocale;
- }
- }
-
- ///
- /// Returns true if the specified locale is supported, false otherwise.
- ///
- bool _isSupported(Locale locale, bool withCountry) {
- if (locale != null) {
- for (Locale supportedLocale in supportedLocales) {
- // Language must always match both locales.
- if (supportedLocale.languageCode != locale.languageCode) {
- continue;
- }
-
- // If country code matches, return this locale.
- if (supportedLocale.countryCode == locale.countryCode) {
- return true;
- }
-
- // If no country requirement is requested, check if this locale has no country.
- if (true != withCountry && (supportedLocale.countryCode == null || supportedLocale.countryCode.isEmpty)) {
- return true;
- }
- }
- }
- return false;
- }
-}
-
-String getLang(Locale l) => l == null
- ? null
- : l.countryCode != null && l.countryCode.isEmpty
- ? l.languageCode
- : l.toString();
diff --git a/lib/generated_plugin_registrant.dart b/lib/generated_plugin_registrant.dart
index e5fe64d..29c81ed 100644
--- a/lib/generated_plugin_registrant.dart
+++ b/lib/generated_plugin_registrant.dart
@@ -5,22 +5,22 @@
// ignore_for_file: directives_ordering
// ignore_for_file: lines_longer_than_80_chars
-import 'package:audioplayers/web/audioplayers_web.dart';
-import 'package:flutter_sound_web/flutter_sound_web.dart';
+import 'package:connectivity_plus_web/connectivity_plus_web.dart';
import 'package:image_picker_for_web/image_picker_for_web.dart';
import 'package:package_info_plus_web/package_info_plus_web.dart';
import 'package:shared_preferences_web/shared_preferences_web.dart';
+import 'package:url_launcher_web/url_launcher_web.dart';
import 'package:video_player_web/video_player_web.dart';
import 'package:flutter_web_plugins/flutter_web_plugins.dart';
// ignore: public_member_api_docs
void registerPlugins(Registrar registrar) {
- AudioplayersPlugin.registerWith(registrar);
- FlutterSoundPlugin.registerWith(registrar);
+ ConnectivityPlusPlugin.registerWith(registrar);
ImagePickerPlugin.registerWith(registrar);
PackageInfoPlugin.registerWith(registrar);
SharedPreferencesPlugin.registerWith(registrar);
+ UrlLauncherPlugin.registerWith(registrar);
VideoPlayerPlugin.registerWith(registrar);
registrar.registerMessageHandler();
}
diff --git a/lib/http/req.dart b/lib/http/req.dart
deleted file mode 100644
index 8c748ad..0000000
--- a/lib/http/req.dart
+++ /dev/null
@@ -1,164 +0,0 @@
-import 'package:dio/dio.dart';
-import 'package:wechat_flutter/tools/wechat_flutter.dart';
-
-var _id = 0;
-
-typedef OnData(t);
-typedef OnError(String msg, int code);
-
-enum RequestType { GET, POST }
-
-class Req {
- static Req _instance;
-
- ///连接超时时间为5秒
- static const int connectTimeOut = 5 * 1000;
-
- ///响应超时时间为7秒
- static const int receiveTimeOut = 7 * 1000;
-
- Dio _client;
-
- static Req getInstance() {
- if (_instance == null) {
- _instance = Req._internal();
- }
- return _instance;
- }
-
- Req._internal() {
- if (_client == null) {
- BaseOptions options = new BaseOptions();
- options.connectTimeout = connectTimeOut;
- options.receiveTimeout = receiveTimeOut;
- _client = new Dio(options);
- }
- }
-
- Dio get client => _client;
-
- ///get请求
- void get(
- String url,
- OnData callBack, {
- Map<String, String> params,
- OnError errorCallBack,
- CancelToken token,
- }) async {
- this._request(
- url,
- callBack,
- method: RequestType.GET,
- params: params,
- errorCallBack: errorCallBack,
- token: token,
- );
- }
-
- //post请求
- void post(
- String url,
- OnData callBack, {
- Map<String, String> params,
- OnError errorCallBack,
- CancelToken token,
- }) async {
- this._request(
- url,
- callBack,
- method: RequestType.POST,
- params: params,
- errorCallBack: errorCallBack,
- token: token,
- );
- }
-
- //post请求
- void postUpload(
- String url,
- OnData callBack,
- ProgressCallback progressCallBack, {
- FormData formData,
- OnError errorCallBack,
- CancelToken token,
- }) async {
- this._request(
- url,
- callBack,
- method: RequestType.POST,
- formData: formData,
- errorCallBack: errorCallBack,
- progressCallBack: progressCallBack,
- token: token,
- );
- }
-
- void _request(
- String url,
- OnData callBack, {
- RequestType method,
- Map<String, String> params,
- FormData formData,
- OnError errorCallBack,
- ProgressCallback progressCallBack,
- CancelToken token,
- }) async {
- final id = _id++;
- int statusCode;
- try {
- Response response;
- if (method == RequestType.GET) {
- ///组合GET请求的参数
- if (mapNoEmpty(params)) {
- response = await _client.get(url,
- queryParameters: params, cancelToken: token);
- } else {
- response = await _client.get(url, cancelToken: token);
- }
- } else {
- if (mapNoEmpty(params) || formData != null) {
- response = await _client.post(
- url,
- data: formData ?? params,
- onSendProgress: progressCallBack,
- cancelToken: token,
- );
- } else {
- response = await _client.post(url, cancelToken: token);
- }
- }
-
- statusCode = response.statusCode;
-
- if (response != null) {
- if (response.data is List) {
- Map data = response.data[0];
- callBack(data);
- } else {
- Map data = response.data;
- callBack(data);
- }
- print('HTTP_REQUEST_URL::[$id]::$url');
- print('HTTP_REQUEST_BODY::[$id]::${params ?? ' no'}');
- print('HTTP_RESPONSE_BODY::[$id]::${response.data}');
- }
-
- ///处理错误部分
- if (statusCode < 0) {
- _handError(errorCallBack, statusCode);
- return;
- }
- } catch (e) {
- _handError(errorCallBack, statusCode);
- }
- }
-
- ///处理异常
- static void _handError(OnError errorCallback, int statusCode) {
- String errorMsg = 'Network request error';
- if (errorCallback != null) {
- errorCallback(errorMsg, statusCode);
- }
- print("HTTP_RESPONSE_ERROR::$errorMsg code:$statusCode");
- }
-}
diff --git a/lib/im/all_im.dart b/lib/im/all_im.dart
deleted file mode 100755
index e87c9da..0000000
--- a/lib/im/all_im.dart
+++ /dev/null
@@ -1,6 +0,0 @@
-export 'login_handle.dart';
-export 'search_handle.dart';
-export 'friend_handle.dart';
-export 'message_handle.dart';
-export 'search_handle.dart';
-export 'search_handle.dart';
\ No newline at end of file
diff --git a/lib/im/conversation_handle.dart b/lib/im/conversation_handle.dart
deleted file mode 100644
index ca5eed3..0000000
--- a/lib/im/conversation_handle.dart
+++ /dev/null
@@ -1,54 +0,0 @@
-import 'dart:convert';
-
-import 'package:flutter/material.dart';
-import 'package:wechat_flutter/tools/wechat_flutter.dart';
-
-Future<dynamic> getConversationsListData({Callback callback}) async {
- try {
- var result = await im.getConversations();
- String strData = result.toString().replaceAll("'", '"');
- return strData;
- } on PlatformException {
- debugPrint('获取会话列表失败');
- }
-}
-
-Future<dynamic> deleteConversationAndLocalMsgModel(int type, String id,
- {Callback callback}) async {
- try {
- var result = await im.deleteConversationAndLocalMsg(type, id);
- callback(result);
- } on PlatformException {
- print("删除会话和聊天记录失败");
- }
-}
-
-Future<dynamic> delConversationModel(String identifier, int type,
- {Callback callback}) async {
- try {
- var result = await im.delConversation(identifier, type);
- callback(result);
- } on PlatformException {
- print("删除会话失败");
- }
-}
-
-Future<dynamic> getUnreadMessageNumModel(int type, String id,
- {Callback callback}) async {
- try {
- var result = await im.getUnreadMessageNum(type, id);
- callback(result);
- } on PlatformException {
- print("获取未读消息数量失败");
- }
-}
-
-Future<dynamic> setReadMessageModel(int type, String id,
- {Callback callback}) async {
- try {
- var result = await im.setReadMessage(type, id);
- callback(result);
- } on PlatformException {
- print("设置消息为已读失败");
- }
-}
\ No newline at end of file
diff --git a/lib/im/entity/chat_list_entity.dart b/lib/im/entity/chat_list_entity.dart
deleted file mode 100644
index 971b616..0000000
--- a/lib/im/entity/chat_list_entity.dart
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-* 实体类 - 聊天会话列表
-* @param mConversation 会话
-* @param peer 回话ID
-* @param type 会话类型
-* */
-class ChatListEntity {
- ChatListMconversation mConversation;
- String peer;
- dynamic type;
-
- ChatListEntity({this.mConversation, this.peer, this.type});
-
- ChatListEntity.fromJson(Map<String, dynamic> json) {
- mConversation = json['mConversation'] != null
- ? new ChatListMconversation.fromJson(json['mConversation'])
- : null;
- peer = json['peer'];
- type = json['type'];
- }
-
- Map<String, dynamic> toJson() {
- final Map<String, dynamic> data = new Map<String, dynamic>();
- if (this.mConversation != null) {
- data['mConversation'] = this.mConversation.toJson();
- }
- data['peer'] = this.peer;
- data['type'] = this.type;
- return data;
- }
-}
-
-class ChatListMconversation {
- ChatListMconversation.fromJson(Map<String, dynamic> json);
-
- Map<String, dynamic> toJson() {
- final Map<String, dynamic> data = new Map<String, dynamic>();
- return data;
- }
-}
diff --git a/lib/im/entity/i_chat_person_entity.dart b/lib/im/entity/i_chat_person_entity.dart
deleted file mode 100644
index dd5a37a..0000000
--- a/lib/im/entity/i_chat_person_entity.dart
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-* 实体类 - 会话个人信息（IOS）
-* @param birthday 生日
-* @param faceURL 头像URL
-* @param identifier ID
-* @param role 角色
-* @param gender 性别
-* @param level 等级
-* @param nickname 昵称
-* @param language 语言
-* @param customInfo 习俗信息
-* @param allowType 添加为好友方式
-*
-* */
-class IChatPersonEntity {
- int birthday;
- String faceURL;
- String identifier;
- int role;
- int gender;
- int level;
- String nickname;
- int language;
- IChatPersonCustominfo customInfo;
- dynamic allowType;
-
- IChatPersonEntity(
- {this.birthday,
- this.faceURL,
- this.identifier,
- this.role,
- this.gender,
- this.level,
- this.nickname,
- this.language,
- this.customInfo,
- this.allowType});
-
- IChatPersonEntity.fromJson(Map<String, dynamic> json) {
- birthday = json['birthday'];
- faceURL = json['faceURL'];
- identifier = json['identifier'];
- role = json['role'];
- gender = json['gender'];
- level = json['level'];
- nickname = json['nickname'];
- language = json['language'];
- customInfo = json['customInfo'] != null
- ? new IChatPersonCustominfo.fromJson(json['customInfo'])
- : null;
- allowType = json['allowType'];
- }
-
- Map<String, dynamic> toJson() {
- final Map<String, dynamic> data = new Map<String, dynamic>();
- data['birthday'] = this.birthday;
- data['faceURL'] = this.faceURL;
- data['identifier'] = this.identifier;
- data['role'] = this.role;
- data['gender'] = this.gender;
- data['level'] = this.level;
- data['nickname'] = this.nickname;
- data['language'] = this.language;
- if (this.customInfo != null) {
- data['customInfo'] = this.customInfo.toJson();
- }
- data['allowType'] = this.allowType;
- return data;
- }
-}
-
-class IChatPersonCustominfo {
- IChatPersonCustominfo.fromJson(Map<String, dynamic> json);
-
- Map<String, dynamic> toJson() {
- final Map<String, dynamic> data = new Map<String, dynamic>();
- return data;
- }
-}
diff --git a/lib/im/entity/i_contact_info_entity.dart b/lib/im/entity/i_contact_info_entity.dart
deleted file mode 100644
index ab7d2d7..0000000
--- a/lib/im/entity/i_contact_info_entity.dart
+++ /dev/null
@@ -1,131 +0,0 @@
-class IContactInfoEntity {
- String identifier;
- int addTime;
- String addSource;
- String addWording;
- IContactInfoProfile profile;
- List<Null> groups;
- String remark;
- IContactInfoCustominfo customInfo;
-
- IContactInfoEntity(
- {this.identifier,
- this.addTime,
- this.addSource,
- this.addWording,
- this.profile,
- this.groups,
- this.remark,
- this.customInfo});
-
- IContactInfoEntity.fromJson(Map<String, dynamic> json) {
- identifier = json['identifier'];
- addTime = json['addTime'];
- addSource = json['addSource'];
- addWording = json['addWording'];
- profile = json['profile'] != null
- ? new IContactInfoProfile.fromJson(json['profile'])
- : null;
- if (json['groups'] != null) {
- groups = new List<Null>();
- }
- remark = json['remark'];
- customInfo = json['customInfo'] != null
- ? new IContactInfoCustominfo.fromJson(json['customInfo'])
- : null;
- }
-
- Map<String, dynamic> toJson() {
- final Map<String, dynamic> data = new Map<String, dynamic>();
- data['identifier'] = this.identifier;
- data['addTime'] = this.addTime;
- data['addSource'] = this.addSource;
- data['addWording'] = this.addWording;
- if (this.profile != null) {
- data['profile'] = this.profile.toJson();
- }
- if (this.groups != null) {
- data['groups'] = [];
- }
- data['remark'] = this.remark;
- if (this.customInfo != null) {
- data['customInfo'] = this.customInfo.toJson();
- }
- return data;
- }
-}
-
-class IContactInfoProfile {
- int birthday;
- String faceURL;
- String identifier;
- int role;
- int gender;
- int level;
- String nickname;
- int language;
- IContactInfoProfileCustominfo customInfo;
- int allowType;
-
- IContactInfoProfile(
- {this.birthday,
- this.faceURL,
- this.identifier,
- this.role,
- this.gender,
- this.level,
- this.nickname,
- this.language,
- this.customInfo,
- this.allowType});
-
- IContactInfoProfile.fromJson(Map<String, dynamic> json) {
- birthday = json['birthday'];
- faceURL = json['faceURL'];
- identifier = json['identifier'];
- role = json['role'];
- gender = json['gender'];
- level = json['level'];
- nickname = json['nickname'];
- language = json['language'];
- customInfo = json['customInfo'] != null
- ? new IContactInfoProfileCustominfo.fromJson(json['customInfo'])
- : null;
- allowType = json['allowType'];
- }
-
- Map<String, dynamic> toJson() {
- final Map<String, dynamic> data = new Map<String, dynamic>();
- data['birthday'] = this.birthday;
- data['faceURL'] = this.faceURL;
- data['identifier'] = this.identifier;
- data['role'] = this.role;
- data['gender'] = this.gender;
- data['level'] = this.level;
- data['nickname'] = this.nickname;
- data['language'] = this.language;
- if (this.customInfo != null) {
- data['customInfo'] = this.customInfo.toJson();
- }
- data['allowType'] = this.allowType;
- return data;
- }
-}
-
-class IContactInfoProfileCustominfo {
- IContactInfoProfileCustominfo.fromJson(Map<String, dynamic> json);
-
- Map<String, dynamic> toJson() {
- final Map<String, dynamic> data = new Map<String, dynamic>();
- return data;
- }
-}
-
-class IContactInfoCustominfo {
- IContactInfoCustominfo.fromJson(Map<String, dynamic> json);
-
- Map<String, dynamic> toJson() {
- final Map<String, dynamic> data = new Map<String, dynamic>();
- return data;
- }
-}
diff --git a/lib/im/entity/i_person_info_entity.dart b/lib/im/entity/i_person_info_entity.dart
deleted file mode 100644
index 5989c55..0000000
--- a/lib/im/entity/i_person_info_entity.dart
+++ /dev/null
@@ -1,65 +0,0 @@
-class IPersonInfoEntity {
- int birthday;
- String faceURL;
- String identifier;
- int role;
- int gender;
- int level;
- String nickname;
- int language;
- IPersonInfoCustominfo customInfo;
- int allowType;
-
- IPersonInfoEntity(
- {this.birthday,
- this.faceURL,
- this.identifier,
- this.role,
- this.gender,
- this.level,
- this.nickname,
- this.language,
- this.customInfo,
- this.allowType});
-
- IPersonInfoEntity.fromJson(Map<String, dynamic> json) {
- birthday = json['birthday'];
- faceURL = json['faceURL'];
- identifier = json['identifier'];
- role = json['role'];
- gender = json['gender'];
- level = json['level'];
- nickname = json['nickname'];
- language = json['language'];
- customInfo = json['customInfo'] != null
- ? new IPersonInfoCustominfo.fromJson(json['customInfo'])
- : null;
- allowType = json['allowType'];
- }
-
- Map<String, dynamic> toJson() {
- final Map<String, dynamic> data = new Map<String, dynamic>();
- data['birthday'] = this.birthday;
- data['faceURL'] = this.faceURL;
- data['identifier'] = this.identifier;
- data['role'] = this.role;
- data['gender'] = this.gender;
- data['level'] = this.level;
- data['nickname'] = this.nickname;
- data['language'] = this.language;
- if (this.customInfo != null) {
- data['customInfo'] = this.customInfo.toJson();
- }
- data['allowType'] = this.allowType;
- return data;
- }
-}
-
-class IPersonInfoCustominfo {
- IPersonInfoCustominfo.fromJson(Map<String, dynamic> json);
-
- Map<String, dynamic> toJson() {
- final Map<String, dynamic> data = new Map<String, dynamic>();
- return data;
- }
-}
diff --git a/lib/im/entity/i_sound_msg_entity.dart b/lib/im/entity/i_sound_msg_entity.dart
deleted file mode 100644
index 9d11266..0000000
--- a/lib/im/entity/i_sound_msg_entity.dart
+++ /dev/null
@@ -1,36 +0,0 @@
-class ISoundMsgEntity {
- int downloadFlag;
- String path;
- int businessId;
- int dataSize;
- List<String> soundUrls;
- String uuid;
- int taskId;
- int second;
-
- ISoundMsgEntity({this.downloadFlag, this.path, this.businessId, this.dataSize, this.soundUrls, this.uuid, this.taskId, this.second});
-
- ISoundMsgEntity.fromJson(Map<String, dynamic> json) {
- downloadFlag = json['downloadFlag'];
- path = json['path'];
- businessId = json['businessId'];
- dataSize = json['dataSize'];
- soundUrls = json['soundUrls']?.cast<String>();
- uuid = json['uuid'];
- taskId = json['taskId'];
- second = json['second'];
- }
-
- Map<String, dynamic> toJson() {
- final Map<String, dynamic> data = new Map<String, dynamic>();
- data['downloadFlag'] = this.downloadFlag;
- data['path'] = this.path;
- data['businessId'] = this.businessId;
- data['dataSize'] = this.dataSize;
- data['soundUrls'] = this.soundUrls;
- data['uuid'] = this.uuid;
- data['taskId'] = this.taskId;
- data['second'] = this.second;
- return data;
- }
-}
diff --git a/lib/im/entity/message_entity.dart b/lib/im/entity/message_entity.dart
deleted file mode 100644
index a3930a5..0000000
--- a/lib/im/entity/message_entity.dart
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-*
-* 实体类 - 消息
-* @param senderProfile 发送人资料
-* @param remark 备注
-* @param time 发送时间
-* @param message 消息
-* @param timConversation 会话信息
-* @param status 发送状态
-*
-* */
-import 'package:wechat_flutter/im/entity/person_info_entity.dart';
-
-import 'chat_list_entity.dart';
-
-class MessageEntity {
- PersonInfoEntity senderProfile;
- String remark;
- int time;
- MessageMessage message;
- ChatListEntity timConversation;
- String status;
-
- MessageEntity(
- {this.senderProfile,
- this.remark,
- this.time,
- this.message,
- this.timConversation,
- this.status});
-
- MessageEntity.fromJson(Map<String, dynamic> json) {
- senderProfile = json['senderProfile'] != null
- ? new PersonInfoEntity.fromJson(json['senderProfile'])
- : null;
- remark = json['remark'];
- time = json['time'];
- message = json['message'] != null
- ? new MessageMessage.fromJson(json['message'])
- : null;
- timConversation = json['timConversation'] != null
- ? new ChatListEntity.fromJson(json['timConversation'])
- : null;
- status = json['status'];
- }
-
- Map<String, dynamic> toJson() {
- final Map<String, dynamic> data = new Map<String, dynamic>();
- if (this.senderProfile != null) {
- data['senderProfile'] = this.senderProfile.toJson();
- }
- data['remark'] = this.remark;
- data['time'] = this.time;
- if (this.message != null) {
- data['message'] = this.message.toJson();
- }
- if (this.timConversation != null) {
- data['timConversation'] = this.timConversation.toJson();
- }
- data['status'] = this.status;
- return data;
- }
-}
-
-/*
-* 实体类 - 消息内容（文本）
-* @param text 文字消息内容
-* @param type 消息类型
-*
-* */
-class MessageMessage {
- String text;
- String type;
-
- MessageMessage({this.text, this.type});
-
- MessageMessage.fromJson(Map<String, dynamic> json) {
- text = json['text'];
- type = json['type'];
- }
-
- Map<String, dynamic> toJson() {
- final Map<String, dynamic> data = new Map<String, dynamic>();
- data['text'] = this.text;
- data['type'] = this.type;
- return data;
- }
-}
-
-class MessageTimconversationMconversation {
- MessageTimconversationMconversation.fromJson(Map<String, dynamic> json);
-
- Map<String, dynamic> toJson() {
- final Map<String, dynamic> data = new Map<String, dynamic>();
- return data;
- }
-}
diff --git a/lib/im/entity/person_info_entity.dart b/lib/im/entity/person_info_entity.dart
deleted file mode 100644
index d11b97f..0000000
--- a/lib/im/entity/person_info_entity.dart
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-* 实体类 - 个人信息
-* @param birthday 生日
-* @param identifier 用户ID
-* @param role 角色
-* @param gender 性别
-* @param level 等级
-* @param nickName 昵称
-* @param language 语言
-* @param customInfo 习俗信息
-* @param selfSignature 自己的签名
-* @param allowType 添加我的方式
-* @param faceUrl 头像
-* @param location 位置
-* @param customInfoUint 自定义信息单元
-*
-* */
-class PersonInfoEntity {
- int birthday;
- String identifier;
- int role;
- int gender;
- int level;
- String nickName;
- int language;
- PersonInfoCustominfo customInfo;
- String selfSignature;
- dynamic allowType;
- String faceUrl;
- String location;
- PersonInfoCustominfouint customInfoUint;
-
- PersonInfoEntity(
- {this.birthday,
- this.identifier,
- this.role,
- this.gender,
- this.level,
- this.nickName,
- this.language,
- this.customInfo,
- this.selfSignature,
- this.allowType,
- this.faceUrl,
- this.location,
- this.customInfoUint});
-
- PersonInfoEntity.fromJson(Map<String, dynamic> json) {
- birthday = json['birthday'];
- identifier = json['identifier'];
- role = json['role'];
- gender = json['gender'];
- level = json['level'];
- nickName = json['nickName'];
- language = json['language'];
- customInfo = json['customInfo'] != null
- ? new PersonInfoCustominfo.fromJson(json['customInfo'])
- : null;
- selfSignature = json['selfSignature'];
- allowType = json['allowType'];
- faceUrl = json['faceUrl'];
- location = json['location'];
- customInfoUint = json['customInfoUint'] != null
- ? new PersonInfoCustominfouint.fromJson(json['customInfoUint'])
- : null;
- }
-
- Map<String, dynamic> toJson() {
- final Map<String, dynamic> data = new Map<String, dynamic>();
- data['birthday'] = this.birthday;
- data['identifier'] = this.identifier;
- data['role'] = this.role;
- data['gender'] = this.gender;
- data['level'] = this.level;
- data['nickName'] = this.nickName;
- data['language'] = this.language;
- if (this.customInfo != null) {
- data['customInfo'] = this.customInfo.toJson();
- }
- data['selfSignature'] = this.selfSignature;
- data['allowType'] = this.allowType;
- data['faceUrl'] = this.faceUrl;
- data['location'] = this.location;
- if (this.customInfoUint != null) {
- data['customInfoUint'] = this.customInfoUint.toJson();
- }
- return data;
- }
-}
-
-class PersonInfoCustominfo {
- PersonInfoCustominfo.fromJson(Map<String, dynamic> json) ;
-
- Map<String, dynamic> toJson() {
- final Map<String, dynamic> data = new Map<String, dynamic>();
- return data;
- }
-}
-
-class PersonInfoCustominfouint {
- PersonInfoCustominfouint.fromJson(Map<String, dynamic> json);
-
- Map<String, dynamic> toJson() {
- final Map<String, dynamic> data = new Map<String, dynamic>();
- return data;
- }
-}
diff --git a/lib/im/entity/sound_msg_entity.dart b/lib/im/entity/sound_msg_entity.dart
deleted file mode 100644
index c354bec..0000000
--- a/lib/im/entity/sound_msg_entity.dart
+++ /dev/null
@@ -1,39 +0,0 @@
-class SoundMsgEntity {
- int downloadFlag;
- int duration;
- String path;
- List<String> urls;
- int businessId;
- int dataSize;
- String type;
- String uuid;
- int taskId;
-
- SoundMsgEntity({this.downloadFlag, this.duration, this.path, this.urls, this.businessId, this.dataSize, this.type, this.uuid, this.taskId});
-
- SoundMsgEntity.fromJson(Map<String, dynamic> json) {
- downloadFlag = json['downloadFlag'];
- duration = json['duration'];
- path = json['path'];
- urls = json['urls']?.cast<String>();
- businessId = json['businessId'];
- dataSize = json['dataSize'];
- type = json['type'];
- uuid = json['uuid'];
- taskId = json['taskId'];
- }
-
- Map<String, dynamic> toJson() {
- final Map<String, dynamic> data = new Map<String, dynamic>();
- data['downloadFlag'] = this.downloadFlag;
- data['duration'] = this.duration;
- data['path'] = this.path;
- data['urls'] = this.urls;
- data['businessId'] = this.businessId;
- data['dataSize'] = this.dataSize;
- data['type'] = this.type;
- data['uuid'] = this.uuid;
- data['taskId'] = this.taskId;
- return data;
- }
-}
diff --git a/lib/im/friend/fun_dim_friend.dart b/lib/im/friend/fun_dim_friend.dart
deleted file mode 100644
index e631f4b..0000000
--- a/lib/im/friend/fun_dim_friend.dart
+++ /dev/null
@@ -1,136 +0,0 @@
-import 'package:wechat_flutter/tools/wechat_flutter.dart';
-
-Dim dim = new Dim();
-
-class DimFriend {
- static Future<dynamic> getFriends(String userName, Callback callback) async {
- try {
- var result = await dim.listFriends(userName);
- callback(result);
- } on PlatformException {
- print('获取好友 失败');
- }
- }
-
- static Future<dynamic> addFriend(String userName, Callback callback) async {
- try {
- var result = await dim.addFriend(userName);
- callback(result);
- } on PlatformException {
- print('添加好友 失败');
- }
- }
-
- static Future<dynamic> setUsersProfile(
- String userName, Callback callback) async {
- try {
- var result = await dim.setUsersProfile(0, '133',
- 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1566381537639&di=7fa7af026fada06b215fc4be94d8ca1b&imgtype=0&src=http%3A%2F%2Fb-ssl.duitang.com%2Fuploads%2Fitem%2F201810%2F31%2F20181031092120_G5eBk.thumb.700_0.jpeg');
- callback(result);
- } on PlatformException {
- print('设置用户信息 失败');
- }
- }
-
- static Future<dynamic> getUsersProfile(String userName, Callback callback,
- {List<String> userS}) async {
- try {
- List<String> ls = new List();
- ls.add(userName);
- var result = await dim.getUsersProfile(listNoEmpty(userS) ? userS : ls);
- callback(result);
- } on PlatformException {
- print('获取用户信息 失败');
- }
- }
-
- static Future<dynamic> delFriend(String userName, Callback callback) async {
- try {
- var result = await dim.delFriend(userName);
- callback(result);
- } on PlatformException {
- print('删除用户 失败');
- }
- }
-
- static Future<dynamic> createGroupChat(List<String> personList,
- {String name, Callback callback}) async {
- try {
- var result =
- await dim.createGroupChat(name: name, personList: personList);
- callback(result);
- } on PlatformException {
- print('创建群组 失败');
- }
- }
-
- static Future<dynamic> editFriendNotesModel(String id, String remarks,
- {Callback callback}) async {
- try {
- var result = await dim.editFriendNotes(id, remarks);
- callback(result);
- } on PlatformException {
- print('修改备注失败');
- }
- }
-
- static Future<dynamic> getRemarkModel(String id, {Callback callback}) async {
- try {
- var result = await dim.getRemark(id);
- callback(result);
- return result;
- } on PlatformException {
- print('获取备注失败');
- return '';
- }
- }
-//
-// static Future<dynamic> deleteFriendModel(String id,
-// {Callback callback}) async {
-// try {
-// var result = await dim.deleteFriend(id);
-// callback(result);
-// } on PlatformException {
-// print('删除好友失败');
-// }
-// }
-
-// static Future<dynamic> addBlack(String mId, {Callback callback}) async {
-// try {
-// var result = await dim.addBlack(mId);
-// callback(result ?? '');
-// } on PlatformException {
-// print('好友移动至黑名单失败');
-// }
-// }
-//
-// static Future<dynamic> deleteBlackListModel(String mId,
-// {Callback callback}) async {
-// try {
-// var result = await dim.deleteBlackList(mId);
-// callback(result);
-// } on PlatformException {
-// print('好友移出黑名单失败');
-// }
-// }
-//
-// static Future<dynamic> getBlackList(Callback callback) async {
-// try {
-// var result = await dim.getBlackList();
-// callback(result);
-// } on PlatformException {
-// print('获取黑名单列表失败');
-// }
-// }
-
- // 处理好友请求
- static Future<dynamic> opFriend(
- String identifier, String opTypeStr, Callback callback) async {
- try {
- var result = await dim.opFriend(identifier, opTypeStr);
- callback(result);
- } on PlatformException {
- print('同意好友请求 失败');
- }
- }
-}
diff --git a/lib/im/friend_handle.dart b/lib/im/friend_handle.dart
deleted file mode 100644
index a974c47..0000000
--- a/lib/im/friend_handle.dart
+++ /dev/null
@@ -1,70 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:wechat_flutter/tools/wechat_flutter.dart';
-
-typedef OnSuCc = void Function(bool v);
-
-Future<dynamic> addFriend(String userName, BuildContext context,
- {OnSuCc suCc}) async {
- try {
- var result = await im.addFriend(userName);
- if (result.toString().contains('Friend_Exist')) {
- showToast(context, '朋友已存在');
- } else if (result.toString().contains('30014')) {
- showToast(context, '对方好友人数上限');
- return;
- } else if (result.toString().contains('30003')) {
- showToast(context, '添加的这个账号不存在');
- return;
- } else {
- showToast(context, '添加成功');
- }
- if (suCc == null) {
- popToHomePage();
- } else {
- suCc(true);
- }
- } on PlatformException {
- debugPrint('Dim添加好友 失败');
- }
-}
-
-Future<dynamic> delFriend(String userName, BuildContext context,
- {OnSuCc suCc}) async {
- try {
- var result = await im.delFriend(userName);
- if (result.toString().contains('ucc')) {
- showToast(context, '删除成功');
- } else {
- showToast(context, result);
- }
-
- if (suCc == null) {
- popToHomePage();
- } else {
- suCc(true);
- }
-
- return result;
- } on PlatformException {
- debugPrint('删除好友 失败');
- }
-}
-
-Future<dynamic> getContactsFriends(String userName) async {
- try {
- var result = await im.listFriends(userName);
- return result;
- } on PlatformException {
- debugPrint('获取好友列表 失败');
- }
-}
-
-Future<dynamic> createGroupChat(List<String> personList,
- {String name, Callback callback}) async {
- try {
- var result = await im.createGroupChat(name: name, personList: personList);
- callback(result);
- } on PlatformException {
- print('创建群组 失败');
- }
-}
diff --git a/lib/im/fun_dim_group_model.dart b/lib/im/fun_dim_group_model.dart
deleted file mode 100644
index 409df9f..0000000
--- a/lib/im/fun_dim_group_model.dart
+++ /dev/null
@@ -1,141 +0,0 @@
-import 'dart:convert';
-
-import 'package:wechat_flutter/tools/wechat_flutter.dart';
-
-Dim dim = new Dim();
-
-class DimGroup {
- static Future<dynamic> inviteGroupMember(List list, String groupId,
- {Callback callback}) async {
- try {
- var result = await dim.inviteGroupMember(list, groupId);
- callback(result);
- } on PlatformException {
- print('邀请好友进群 失败');
- }
- }
-
- static Future<dynamic> quitGroupModel(String groupId,
- {Callback callback}) async {
- try {
- var result = await dim.quitGroup(groupId);
- callback(result);
- } on PlatformException {
- print('退出群聊 失败');
- callback('退出群聊 失败');
- }
- }
-
- static Future<dynamic> deleteGroupMemberModel(String groupId, List deleteList,
- {Callback callback}) async {
- try {
- var result = await dim.deleteGroupMember(groupId, deleteList);
- callback(result);
- } on PlatformException {
- print('删除群成员 失败');
- }
- }
-
- static Future<dynamic> getGroupMembersListModel(String groupId,
- {Callback callback}) async {
- try {
- var result = await dim.getGroupMembersList(groupId);
- callback(result);
- } on PlatformException {
- print('获取群成员 失败');
- }
- }
-
- static Future<dynamic> getGroupMembersListModelLIST(String groupId,
- {Callback callback}) async {
- try {
- var result = await dim.getGroupMembersList(groupId);
- List memberList = json.decode(result.toString().replaceAll("'", '"'));
- if (listNoEmpty(memberList)) {
- for (int i = 0; i < memberList.length; i++) {
- List<String> ls = new List();
-
- ls.add(memberList[i]['user']);
- }
- }
- callback(result);
- } on PlatformException {
- print('获取群成员 失败');
- }
- }
-
- static Future<dynamic> getGroupListModel(Callback callback) async {
- try {
- var result = await dim.getGroupList();
- callback(result);
- } on PlatformException {
- print('获取群列表 失败');
- }
- }
-
- static Future<dynamic> getGroupInfoListModel(List<String> groupID,
- {Callback callback}) async {
- try {
- var result = await dim.getGroupInfoList(groupID);
- callback(result);
- return result;
- } on PlatformException {
- print('获取群资料 失败');
- }
- }
-
- static Future<dynamic> deleteGroupModel(String groupId,
- {Callback callback}) async {
- try {
- var result = await dim.deleteGroup(groupId);
- callback(result);
- } on PlatformException {
- print('解散群 失败');
- }
- }
-
- static Future<dynamic> modifyGroupNameModel(
- String groupId, String setGroupName,
- {Callback callback}) async {
- try {
- var result = await dim.modifyGroupName(groupId, setGroupName);
- callback(result);
- } on PlatformException {
- print('修改群名称 失败');
- }
- }
-
- static Future<dynamic> modifyGroupIntroductionModel(
- String groupId, String setIntroduction,
- {Callback callback}) async {
- try {
- var result = await dim.modifyGroupIntroduction(groupId, setIntroduction);
- callback(result);
- } on PlatformException {
- print('修改群简介 失败');
- }
- }
-
- static Future<dynamic> modifyGroupNotificationModel(
- String groupId, String notification, String time,
- {Callback callback}) async {
- try {
- var result =
- await dim.modifyGroupNotification(groupId, notification, time);
- if (callback != null) callback(result);
- } on PlatformException {
- print('修改群公告 失败');
- }
- }
-
- static Future<dynamic> setReceiveMessageOptionModel(
- String groupId, String identifier, int type,
- {Callback callback}) async {
- try {
- var result = await dim.setReceiveMessageOption(groupId, identifier, type);
- callback(result);
- } on PlatformException {
- print('修改群消息提醒选项 失败');
- }
- }
-}
diff --git a/lib/im/group/fun_dim_group_model.dart b/lib/im/group/fun_dim_group_model.dart
deleted file mode 100644
index 6513770..0000000
--- a/lib/im/group/fun_dim_group_model.dart
+++ /dev/null
@@ -1,138 +0,0 @@
-import 'dart:convert';
-
-import 'package:wechat_flutter/tools/wechat_flutter.dart';
-
-Dim dim = new Dim();
-
-class DimGroup {
-// static Future<dynamic> inviteGroupMember(List list, String groupId,
-// {Callback callback}) async {
-// try {
-// var result = await dim.inviteGroupMember(list, groupId);
-// callback(result);
-// } on PlatformException {
-// print('邀请好友进群 失败');
-// }
-// }
-//
-// static Future<dynamic> quitGroupModel(String groupId,
-// {Callback callback}) async {
-// try {
-// var result = await dim.quitGroup(groupId);
-// callback(result);
-// } on PlatformException {
-// print('退出群聊 失败');
-// callback('退出群聊 失败');
-// }
-// }
-//
-// static Future<dynamic> deleteGroupMemberModel(String groupId, List deleteList,
-// {Callback callback}) async {
-// try {
-// var result = await dim.deleteGroupMember(groupId, deleteList);
-// callback(result);
-// } on PlatformException {
-// print('删除群成员 失败');
-// }
-// }
-//
-// static Future<dynamic> getGroupMembersListModel(String groupId,
-// {Callback callback}) async {
-// try {
-// var result = await dim.getGroupMembersList(groupId);
-// callback(result);
-// } on PlatformException {
-// print('获取群成员 失败');
-// }
-// }
-//
-// static Future<dynamic> getGroupMembersListModelLIST(String groupId,
-// {Callback callback}) async {
-// try {
-// var result = await dim.getGroupMembersList(groupId);
-// var resultMembers;
-// print('获取群成员 getGroupMembersListModel >>>> $result');
-// List memberList = json.decode(result.toString().replaceAll("'", '"'));
-// if (listNoEmpty(memberList)) {
-// for (int i = 0; i < memberList.length; i++) {
-// List<String> ls = new List();
-//
-// ls.add(memberList[i]['user']);
-// resultMembers = await dim.getUsersProfile(ls);
-// }
-// }
-// callback(result);
-//// callback("[{'member':" +
-//// result.toString().replaceAll('[', '').replaceAll(']', '') +
-//// "," +
-//// "'info':" +
-//// resultMembers +
-//// "}]");
-// } on PlatformException {
-// print('获取群成员 失败');
-// }
-// }
-
- static Future<dynamic> getGroupListModel(Callback callback) async {
- try {
- var result = await dim.getGroupList();
- callback(result);
- } on PlatformException {
- print('获取群列表 失败');
- }
- }
-
- static Future<dynamic> getGroupInfoListModel(List<String> groupID,
- {Callback callback}) async {
- try {
- var result = await dim.getGroupInfoList(groupID);
- callback(result);
- return result;
- } on PlatformException {
- print('获取群资料 失败');
- }
- }
-
- static Future<dynamic> deleteGroupModel(String groupId,
- {Callback callback}) async {
- try {
- var result = await dim.deleteGroup(groupId);
- callback(result);
- } on PlatformException {
- print('解散群 失败');
- }
- }
-
- static Future<dynamic> modifyGroupNameModel(
- String groupId, String setGroupName,
- {Callback callback}) async {
- try {
- var result = await dim.modifyGroupName(groupId, setGroupName);
- callback(result);
- } on PlatformException {
- print('修改群名称 失败');
- }
- }
-
- static Future<dynamic> modifyGroupIntroductionModel(
- String groupId, String setIntroduction,
- {Callback callback}) async {
- try {
- var result = await dim.modifyGroupIntroduction(groupId, setIntroduction);
- callback(result);
- } on PlatformException {
- print('修改群简介 失败');
- }
- }
-
- static Future<dynamic> setReceiveMessageOptionModel(
- String groupId, String identifier, int type,
- {Callback callback}) async {
- try {
- var result = await dim.setReceiveMessageOption(groupId, identifier, type);
- callback(result);
- } on PlatformException {
- print('修改群消息提醒选项 失败');
- }
- }
-}
diff --git a/lib/im/group/fun_dim_info.dart b/lib/im/group/fun_dim_info.dart
deleted file mode 100644
index dd0a44f..0000000
--- a/lib/im/group/fun_dim_info.dart
+++ /dev/null
@@ -1,62 +0,0 @@
-import 'package:wechat_flutter/tools/wechat_flutter.dart';
-
-Dim im = Dim();
-
-class InfoModel {
- static getSelfProfileModel({Callback callback}) async {
- try {
- var result = await im.getSelfProfile();
- callback(result);
- return result;
- } on PlatformException {
- print("获取网络保存的自己资料失败");
- }
- }
-
- static setAddMyWayModel(int type, {Callback callback}) async {
- try {
- var result = await im.setAddMyWay(type);
- callback(result);
- } on PlatformException {
- print("设置添加我的方式失败");
- }
- }
-
- static checkFriendsModel(List<String> users, {Callback callback}) async {
- try {
- var result = await im.checkFriends(users);
- callback(result);
- } on PlatformException {
- print("校验好友 失败");
- }
- }
-
- static getSelfGroupNameCardModel(String groupId, {Callback callback}) async {
- try {
- var result = await im.getSelfGroupNameCard(groupId);
- callback(result);
- } on PlatformException {
- print("获取群内自己的名片 失败");
- }
- }
-
- static setGroupNameCardModel(String groupId, String identifier, String name,
- {Callback callback}) async {
- try {
- var result = await im.setGroupNameCard(groupId, identifier, name);
- callback(result);
- } on PlatformException {
- print("修改群名片 失败");
- }
- }
-
- static getGroupMembersInfoModel(String groupId, List<String> userIDs,
- {Callback callback}) async {
- try {
- var result = await im.getGroupMembersInfo(groupId, userIDs);
- callback(result);
- } on PlatformException {
- print("获取群内指定会员资料 失败");
- }
- }
-}
diff --git a/lib/im/group/group_members.dart b/lib/im/group/group_members.dart
deleted file mode 100644
index 1d38185..0000000
--- a/lib/im/group/group_members.dart
+++ /dev/null
@@ -1,52 +0,0 @@
-import 'dart:convert';
-
-import 'package:flutter/material.dart';
-import 'package:wechat_flutter/im/fun_dim_group_model.dart';
-import 'package:wechat_flutter/tools/wechat_flutter.dart';
-
-/*
-*
-*
-* */
-
-class GMember {
- GMember(
- {@required this.groupId,
- @required this.groupName,
- @required this.getFaceUrl});
-
- final String groupId;
- final String groupName;
- final String getFaceUrl;
-}
-
-class GroupMemberData {
- getGMembers(Callback callback) {
- List<GMember> gMembers = new List<GMember>();
- String groupId;
- String groupName;
- String getFaceUrl;
-
- DimGroup.getGroupListModel((result) {
- List<dynamic> dataMap =
- json.decode(result.toString().replaceAll("'", '"'));
- int len = dataMap.length;
- for (int i = 0; i < len; i++) {
- groupId = dataMap[i]['groupId'];
- groupName = dataMap[i]['groupName'];
- getFaceUrl = dataMap[i]['getFaceUrl'];
-
- gMembers.insert(
- 0,
- GMember(
- groupId: groupId,
- groupName: groupName,
- getFaceUrl: getFaceUrl == null || getFaceUrl == ''
- ? 'http://www.flutterj.com/content/uploadfile/zidingyi/g.png'
- : getFaceUrl,
- ));
- }
- callback(gMembers);
- });
- }
-}
diff --git a/lib/im/group_handle.dart b/lib/im/group_handle.dart
deleted file mode 100644
index ddb5399..0000000
--- a/lib/im/group_handle.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-import 'package:wechat_flutter/tools/wechat_flutter.dart';
-
-Future<dynamic> getGroupInfoListModel(List<String> groupID,
- {Callback callback}) async {
- try {
- var result = await im.getGroupInfoList(groupID);
- callback(result);
- return result;
- } on PlatformException {
- print('获取群资料 失败');
- }
-}
diff --git a/lib/im/im_handle/GenerateTestUserSig.dart b/lib/im/im_handle/GenerateTestUserSig.dart
new file mode 100644
index 0000000..c0643a7
--- /dev/null
+++ b/lib/im/im_handle/GenerateTestUserSig.dart
@@ -0,0 +1,72 @@
+// for flutter 2.0+
+
+import 'dart:convert';
+
+import 'package:archive/archive.dart';
+import 'package:archive/archive_io.dart';
+// import 'dart:io';
+
+import 'package:crypto/crypto.dart';
+import 'package:flutter/cupertino.dart';
+
+///生成腾讯云即时通信测试用userSig
+///
+class GenerateTestUserSig {
+ GenerateTestUserSig({required this.sdkappid, required this.key});
+ int sdkappid;
+ String key;
+
+ ///生成UserSig
+ String genSig({
+ required String identifier,
+ required int expire,
+ }) {
+ int currTime = _getCurrentTime();
+ String sig = '';
+ Map<String, dynamic> sigDoc = new Map<String, dynamic>();
+ sigDoc.addAll({
+ "TLS.ver": "2.0",
+ "TLS.identifier": identifier,
+ "TLS.sdkappid": this.sdkappid,
+ "TLS.expire": expire,
+ "TLS.time": currTime,
+ });
+
+ sig = _hmacsha256(
+ identifier: identifier,
+ currTime: currTime,
+ expire: expire,
+ );
+ sigDoc['TLS.sig'] = sig;
+ String jsonStr = json.encode(sigDoc);
+ List<int> compress = ZLibEncoder().encode(utf8.encode(jsonStr));
+ return _escape(content: base64.encode(compress));
+ }
+
+ int _getCurrentTime() {
+ return (new DateTime.now().millisecondsSinceEpoch / 1000).floor();
+ }
+
+ String _hmacsha256({
+ required String identifier,
+ required int currTime,
+ int expire = 30 * 24 * 60 * 60,
+ }) {
+ int sdkappid = this.sdkappid;
+ String contentToBeSigned =
+ "TLS.identifier:$identifier\nTLS.sdkappid:$sdkappid\nTLS.time:$currTime\nTLS.expire:$expire\n";
+ Hmac hmacSha256 = new Hmac(sha256, utf8.encode(this.key));
+ Digest hmacSha256Digest =
+ hmacSha256.convert(utf8.encode(contentToBeSigned));
+ return base64.encode(hmacSha256Digest.bytes);
+ }
+
+ String _escape({
+ required String content,
+ }) {
+ return content
+ .replaceAll('\+', '*')
+ .replaceAll('\/', '-')
+ .replaceAll('=', '_');
+ }
+}
diff --git a/lib/im/im_handle/Im_api.dart b/lib/im/im_handle/Im_api.dart
new file mode 100644
index 0000000..8cfcb7e
--- /dev/null
+++ b/lib/im/im_handle/Im_api.dart
@@ -0,0 +1,395 @@
+import 'dart:convert';
+
+import 'package:flutter/cupertino.dart';
+import 'package:provider/provider.dart';
+import 'package:tencent_im_sdk_plugin/enum/V2TimAdvancedMsgListener.dart';
+import 'package:tencent_im_sdk_plugin/enum/V2TimConversationListener.dart';
+import 'package:tencent_im_sdk_plugin/enum/V2TimFriendshipListener.dart';
+import 'package:tencent_im_sdk_plugin/enum/V2TimGroupListener.dart';
+import 'package:tencent_im_sdk_plugin/enum/V2TimSDKListener.dart';
+import 'package:tencent_im_sdk_plugin/enum/V2TimSignalingListener.dart';
+import 'package:tencent_im_sdk_plugin/enum/V2TimSimpleMsgListener.dart';
+import 'package:tencent_im_sdk_plugin/enum/log_level_enum.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_callback.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_user_full_info.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_value_callback.dart';
+import 'package:tencent_im_sdk_plugin/tencent_im_sdk_plugin.dart';
+import 'package:wechat_flutter/im/im_handle/GenerateTestUserSig.dart';
+import 'package:wechat_flutter/tools/http/api_v2.dart';
+import 'package:wechat_flutter/im/login_handle.dart';
+import 'package:wechat_flutter/tools/provider/im/im_event.dart';
+import 'package:wechat_flutter/tools/config/app_config.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+/// IM基础功能模块Api
+class ImApi {
+ static String printHead = "[IM]";
+
+ static V2TimSimpleMsgListener? simpleMsgListener;
+ static V2TimAdvancedMsgListener? advancedMsgListener;
+ static V2TimSignalingListener? signalingListener;
+
+ /*
+ * im打印
+ * */
+ static void imPrint(Map jsonData, [String? title]) {
+ debugPrint("$printHead:-------------${title ?? "imPrint"}-----------");
+ debugPrint("$printHead:${json.encode(jsonData)}");
+ debugPrint("");
+ }
+
+ static Future init(BuildContext context) async {
+ V2TimValueCallback<bool> res =
+ await TencentImSDKPlugin.v2TIMManager.initSDK(
+ sdkAppID: AppConfig.IMSdkAppID,
+ loglevel: LogLevelEnum.V2TIM_LOG_DEBUG,
+ listener: new V2TimSDKListener(
+ onConnectFailed:
+ Provider.of<IMEvent>(context, listen: false).onConnectFailed,
+ onConnectSuccess:
+ Provider.of<IMEvent>(context, listen: false).onConnectSuccess,
+ onConnecting:
+ Provider.of<IMEvent>(context, listen: false).onConnectSuccess,
+ onKickedOffline:
+ Provider.of<IMEvent>(context, listen: false).onKickedOffline,
+ onSelfInfoUpdated:
+ Provider.of<IMEvent>(context, listen: false).onSelfInfoUpdated,
+ onUserSigExpired:
+ Provider.of<IMEvent>(context, listen: false).onUserSigExpired,
+ ),
+ );
+ imPrint(res.toJson(), "初始化");
+
+ // 如果初始化成功
+ addIMEventListener(context);
+
+ // 检测登录
+ await checkLogin(context);
+ }
+
+ /*
+ * 添加事件监听
+ * */
+ static void addIMEventListener(BuildContext context) async {
+ simpleMsgListener = new V2TimSimpleMsgListener(
+ onRecvC2CCustomMessage:
+ Provider.of<IMEvent>(context, listen: false).onRecvC2CCustomMessage,
+ onRecvC2CTextMessage:
+ Provider.of<IMEvent>(context, listen: false).onRecvC2CTextMessage,
+ onRecvGroupCustomMessage:
+ Provider.of<IMEvent>(context, listen: false).onRecvGroupCustomMessage,
+ onRecvGroupTextMessage:
+ Provider.of<IMEvent>(context, listen: false).onRecvGroupTextMessage,
+ );
+
+ advancedMsgListener = new V2TimAdvancedMsgListener(
+ onRecvC2CReadReceipt:
+ Provider.of<IMEvent>(context, listen: false).onRecvC2CReadReceipt,
+ onRecvMessageRevoked:
+ Provider.of<IMEvent>(context, listen: false).onRecvMessageRevoked,
+ onRecvNewMessage:
+ Provider.of<IMEvent>(context, listen: false).onRecvNewMessage,
+ onSendMessageProgress:
+ Provider.of<IMEvent>(context, listen: false).onSendMessageProgress,
+ );
+
+ signalingListener = new V2TimSignalingListener(
+ onInvitationCancelled:
+ Provider.of<IMEvent>(context, listen: false).onInvitationCancelled,
+ onInvitationTimeout:
+ Provider.of<IMEvent>(context, listen: false).onInvitationTimeout,
+ onInviteeAccepted:
+ Provider.of<IMEvent>(context, listen: false).onInviteeAccepted,
+ onInviteeRejected:
+ Provider.of<IMEvent>(context, listen: false).onInviteeRejected,
+ onReceiveNewInvitation:
+ Provider.of<IMEvent>(context, listen: false).onReceiveNewInvitation,
+ );
+ //注册简单消息监听器
+ // ignore: deprecated_member_use
+ await TencentImSDKPlugin.v2TIMManager.addSimpleMsgListener(
+ listener: simpleMsgListener!,
+ );
+ //注册群组消息监听器
+ await TencentImSDKPlugin.v2TIMManager.setGroupListener(
+ listener: new V2TimGroupListener(
+ onApplicationProcessed:
+ Provider.of<IMEvent>(context, listen: false).onApplicationProcessed,
+ onGrantAdministrator:
+ Provider.of<IMEvent>(context, listen: false).onGrantAdministrator,
+ onGroupAttributeChanged: Provider.of<IMEvent>(context, listen: false)
+ .onGroupAttributeChanged,
+ onGroupCreated:
+ Provider.of<IMEvent>(context, listen: false).onGroupCreated,
+ onGroupDismissed:
+ Provider.of<IMEvent>(context, listen: false).onGroupDismissed,
+ onGroupInfoChanged:
+ Provider.of<IMEvent>(context, listen: false).onGroupInfoChanged,
+ onGroupRecycled:
+ Provider.of<IMEvent>(context, listen: false).onGroupRecycled,
+ onMemberEnter:
+ Provider.of<IMEvent>(context, listen: false).onMemberEnter,
+ onMemberInfoChanged:
+ Provider.of<IMEvent>(context, listen: false).onMemberInfoChanged,
+ onMemberInvited:
+ Provider.of<IMEvent>(context, listen: false).onMemberInvited,
+ onMemberKicked:
+ Provider.of<IMEvent>(context, listen: false).onMemberKicked,
+ onMemberLeave:
+ Provider.of<IMEvent>(context, listen: false).onMemberLeave,
+ onQuitFromGroup:
+ Provider.of<IMEvent>(context, listen: false).onQuitFromGroup,
+ onReceiveJoinApplication: Provider.of<IMEvent>(context, listen: false)
+ .onReceiveJoinApplication,
+ onReceiveRESTCustomData: Provider.of<IMEvent>(context, listen: false)
+ .onReceiveRESTCustomData,
+ onRevokeAdministrator:
+ Provider.of<IMEvent>(context, listen: false).onRevokeAdministrator,
+ ),
+ );
+ //注册高级消息监听器
+ await TencentImSDKPlugin.v2TIMManager
+ .getMessageManager()
+ .addAdvancedMsgListener(
+ listener: advancedMsgListener!,
+ );
+ //注册信令消息监听器
+ await TencentImSDKPlugin.v2TIMManager
+ .getSignalingManager()
+ .addSignalingListener(
+ listener: signalingListener!,
+ );
+ //注册会话监听器
+ await TencentImSDKPlugin.v2TIMManager
+ .getConversationManager()
+ .setConversationListener(
+ listener: new V2TimConversationListener(
+ onConversationChanged: Provider.of<IMEvent>(context, listen: false)
+ .onConversationChanged,
+ onNewConversation:
+ Provider.of<IMEvent>(context, listen: false).onNewConversation,
+ onSyncServerFailed:
+ Provider.of<IMEvent>(context, listen: false).onSyncServerFailed,
+ onSyncServerFinish:
+ Provider.of<IMEvent>(context, listen: false).onSyncServerFinish,
+ onSyncServerStart:
+ Provider.of<IMEvent>(context, listen: false).onSyncServerStart,
+ ),
+ );
+ //注册关系链监听器
+ await TencentImSDKPlugin.v2TIMManager
+ .getFriendshipManager()
+ .setFriendListener(
+ listener: new V2TimFriendshipListener(),
+ );
+ }
+
+ /*
+ * 注销advanceMsgListener
+ * */
+ removeAdvanceMsgListener() async {
+ await TencentImSDKPlugin.v2TIMManager
+ .getMessageManager()
+ .removeAdvancedMsgListener(listener: advancedMsgListener);
+ }
+
+ /*
+ * 注销所有advanceMsgListener
+ * */
+ removeAllAdvanceMsgListener() async {
+ await TencentImSDKPlugin.v2TIMManager
+ .getMessageManager()
+ .removeAdvancedMsgListener();
+ }
+
+ /*
+ * 注销signalingListener
+ * */
+ removeSignalingListener() async {
+ await TencentImSDKPlugin.v2TIMManager
+ .getSignalingManager()
+ .removeSignalingListener(listener: signalingListener);
+ }
+
+ /*
+ * 注销所有signalingListener
+ * */
+ removeAllSignalingListener() async {
+ await TencentImSDKPlugin.v2TIMManager
+ .getSignalingManager()
+ .removeSignalingListener();
+ }
+
+ /*
+ * 获取服务端时间
+ * */
+ static void getServerTime() async {
+ V2TimValueCallback<int> res =
+ await TencentImSDKPlugin.v2TIMManager.getServerTime();
+ imPrint(res.toJson(), "获取服务端时间");
+ }
+
+ /// 检测登录
+ static Future checkLogin(BuildContext context) async {
+ // 获取登录状态
+ final int? loginStatus = await getLoginStatus();
+
+ // 获取用户id
+ final String userId = Q1Data.user();
+
+ // 登录状态
+ // V2TIM_STATUS_LOGINED 已登录1
+ // V2TIM_STATUS_LOGINING 登录中2
+ // V2TIM_STATUS_LOGOUT 无登录3
+ if (loginStatus == 1) {
+ // 已登录
+
+ // 判断登录的是否当前用户
+ final String? _getLoginUser = await getLoginUser();
+ LogUtil.d("是否是当前登录的用户::${_getLoginUser == userId}");
+ if (_getLoginUser == userId) {
+ // 是当前用户不再继续执行
+ return;
+ }
+
+ // 不是的话退出登录；
+ await logout();
+ }
+
+ // 没有登录
+ // 获取token
+ // final String accessToken = Q1Data.token;
+ // if (!strNoEmpty(accessToken)) {
+ // // token为空，实际未登录
+ // return;
+ // }
+
+ if (!strNoEmpty(userId)) {
+ // 用户Id为空，实际也没有登录
+ return;
+ }
+
+ // 登录
+ await login(userId);
+ }
+
+ /*
+ * 登录
+ * */
+ static Future<V2TimCallback?> login(String userID) async {
+ // 正式环境请在服务端计算userSIg
+ String userSig = new GenerateTestUserSig(
+ sdkappid: AppConfig.IMSdkAppID,
+ key: AppConfig.ImSdkSign,
+ ).genSig(
+ identifier: userID,
+ expire: 7 * 24 * 60 * 1000, // userSIg有效期
+ );
+
+ Q1Data.userSig = userSig;
+ await SharedUtil.instance!.saveString(Keys.userSig, userSig);
+
+ V2TimCallback res = await TencentImSDKPlugin.v2TIMManager.login(
+ userID: userID,
+ userSig: userSig,
+ );
+ imPrint(res.toJson(), "登录");
+
+ final userInfoList = await getUsersInfo([userID]);
+
+ /// 获取用户信息失败了
+ if (!listNoEmpty(userInfoList)) {
+ return res;
+ }
+
+ /// 如果昵称不为空则直接返回
+ /// 如果昵称为空去设置信息
+ if (strNoEmpty(userInfoList![0].nickName)) {
+ return res;
+ }
+
+ setSelfInfo(
+ nickname: "u" + (userID.length > 5 ? userID.substring(0, 4) : userID));
+ return res;
+ }
+
+ /*
+ * 登出【退出登录】
+ * */
+ static Future<V2TimCallback> logout() async {
+ final V2TimCallback res = await TencentImSDKPlugin.v2TIMManager.logout();
+ imPrint(res.toJson(), "登出【退出登录】");
+ return res;
+ }
+
+ /*
+ * 获取sdk版本
+ * */
+ static Future getVersion() async {
+ V2TimValueCallback<String> res =
+ await TencentImSDKPlugin.v2TIMManager.getVersion();
+ imPrint(res.toJson(), "获取sdk版本");
+ }
+
+ /*
+ * 获取当前登录用户
+ * */
+ static Future<String?> getLoginUser() async {
+ V2TimValueCallback<String> res =
+ await TencentImSDKPlugin.v2TIMManager.getLoginUser();
+ imPrint(res.toJson(), "获取当前登录用户");
+
+ return res.data;
+ }
+
+ /*
+ * 获取当前登录状态
+ * */
+ static Future<int?> getLoginStatus() async {
+ V2TimValueCallback<int> res =
+ await TencentImSDKPlugin.v2TIMManager.getLoginStatus();
+ imPrint(res.toJson(), "获取当前登录状态");
+
+ print("获取当前登录状态::${res.data.toString()}");
+ return res.data;
+ }
+
+ /*
+ * 获取用户信息
+ * */
+ static Future<List<V2TimUserFullInfo>?> getUsersInfo(
+ List<String> users) async {
+ V2TimValueCallback<List<V2TimUserFullInfo>> res =
+ await TencentImSDKPlugin.v2TIMManager.getUsersInfo(
+ userIDList: users,
+ );
+ imPrint(res.toJson(), "获取用户信息");
+ return res.data;
+ }
+
+ /*
+ * 设置个人信息
+ * */
+ static Future<V2TimCallback> setSelfInfo({
+ String? nickname,
+ String? faceUrl,
+ String? selfSignature,
+ String? gender,
+ int? allowType,
+ String? customInfo,
+ }) async {
+ // todo 设置基本信息只需填某个，未填的传原本的，或者不传
+ V2TimCallback res = await TencentImSDKPlugin.v2TIMManager.setSelfInfo(
+ userFullInfo: V2TimUserFullInfo.fromJson({
+ "nickName": nickname,
+ "faceUrl": faceUrl,
+ "selfSignature": selfSignature,
+ "gender": gender,
+ "allowType": allowType,
+ "customInfo": customInfo,
+ }),
+ );
+ imPrint(res.toJson(), "设置个人信息");
+ return res;
+ }
+}
diff --git a/lib/im/im_handle/im_conversation_api.dart b/lib/im/im_handle/im_conversation_api.dart
new file mode 100644
index 0000000..15699cc
--- /dev/null
+++ b/lib/im/im_handle/im_conversation_api.dart
@@ -0,0 +1,103 @@
+import 'package:tencent_im_sdk_plugin/models/v2_tim_callback.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_conversation.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_conversation_result.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_value_callback.dart';
+import 'package:tencent_im_sdk_plugin/tencent_im_sdk_plugin.dart';
+import 'package:wechat_flutter/im/im_handle/Im_api.dart';
+import 'package:wechat_flutter/tools/config/app_config.dart';
+
+/// IM会话模块Api
+class IMConversationApi {
+ /*
+ * 获取会话列表
+ *
+ * @param nextSeq 默认传0
+ * */
+ static Future<V2TimConversationResult?> getConversationList(
+ String nextSeq) async {
+ V2TimValueCallback<V2TimConversationResult> res = await TencentImSDKPlugin
+ .v2TIMManager
+ .getConversationManager()
+ .getConversationList(nextSeq: nextSeq, count: AppConfig.cvsPageCount);
+
+ ImApi.imPrint(res.toJson(), "获取会话列表");
+ return res.data;
+ }
+
+ /*
+ * 获取会话详情【列表】
+ * */
+ static Future getConversationDetList(List<String> conversationIDList) async {
+ V2TimValueCallback<List<V2TimConversation>> res = await TencentImSDKPlugin
+ .v2TIMManager
+ .getConversationManager()
+ .getConversationListByConversaionIds(
+ conversationIDList: conversationIDList,
+ );
+ ImApi.imPrint(res.toJson(), "获取会话详情【列表】");
+ }
+
+ /*
+ * 获取会话详情【单个】
+ * */
+ static Future<V2TimValueCallback<V2TimConversation>> getConversation(
+ String conversationID) async {
+ V2TimValueCallback<V2TimConversation> res = await TencentImSDKPlugin
+ .v2TIMManager
+ .getConversationManager()
+ .getConversation(
+ conversationID: conversationID,
+ );
+ ImApi.imPrint(res.toJson(), "获取会话详情【单个】");
+ return res;
+ }
+
+ /*
+ * 删除会话
+ * */
+ static Future deleteConversation(String conversationID) async {
+ V2TimCallback res = await TencentImSDKPlugin.v2TIMManager
+ .getConversationManager()
+ .deleteConversation(
+ conversationID: conversationID,
+ );
+ ImApi.imPrint(res.toJson(), "删除会话");
+ }
+
+ /*
+ * 设置草稿/取消草稿
+ * */
+ static Future setConversationDraft(
+ String conversationID,
+ // 草稿内容，null为取消
+ String draftText,
+ ) async {
+ V2TimCallback res = await TencentImSDKPlugin.v2TIMManager
+ .getConversationManager()
+ .setConversationDraft(
+ conversationID: conversationID,
+ draftText: draftText,
+ );
+ ImApi.imPrint(res.toJson(), "设置草稿/取消草稿");
+ }
+
+ /*
+ * 会话置顶/取消置顶
+ * */
+ static Future pinConversation(String conversationID, bool isPinned) async {
+ V2TimCallback res = await TencentImSDKPlugin.v2TIMManager
+ .getConversationManager()
+ .pinConversation(conversationID: conversationID, isPinned: isPinned);
+ ImApi.imPrint(res.toJson(), "会话置顶/取消置顶");
+ }
+
+ /*
+ * 获取会话未读总数
+ * */
+ static Future getTotalUnreadMessageCount() async {
+ V2TimValueCallback<int> res = await TencentImSDKPlugin.v2TIMManager
+ .getConversationManager()
+ .getTotalUnreadMessageCount();
+ ImApi.imPrint(res.toJson(), "获取会话未读总数");
+ }
+}
diff --git a/lib/im/im_handle/im_friend_api.dart b/lib/im/im_handle/im_friend_api.dart
new file mode 100644
index 0000000..320a228
--- /dev/null
+++ b/lib/im/im_handle/im_friend_api.dart
@@ -0,0 +1,218 @@
+import 'package:tencent_im_sdk_plugin/enum/friend_application_type_enum.dart';
+import 'package:tencent_im_sdk_plugin/enum/friend_response_type_enum.dart';
+import 'package:tencent_im_sdk_plugin/enum/friend_type_enum.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_callback.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_friend_application.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_friend_application_result.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_friend_check_result.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_friend_info.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_friend_info_result.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_friend_operation_result.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_friend_search_param.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_value_callback.dart';
+import 'package:tencent_im_sdk_plugin/tencent_im_sdk_plugin.dart';
+import 'package:wechat_flutter/im/im_handle/Im_api.dart';
+import 'package:wechat_flutter/tools/config/app_config.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+/// IM好友模块Api
+class ImFriendApi {
+ /*
+ * 获取好友列表
+ * */
+ static Future<List<V2TimFriendInfo>?> getFriendList() async {
+ V2TimValueCallback<List<V2TimFriendInfo>> res = await TencentImSDKPlugin
+ .v2TIMManager
+ .getFriendshipManager()
+ .getFriendList();
+ ImApi.imPrint(res.toJson(), "获取好友列表");
+ return res.data;
+ }
+
+ /*
+ * 获取好友信息
+ * */
+ static Future getFriendsInfo(List<String> users) async {
+ V2TimValueCallback<List<V2TimFriendInfoResult>> res =
+ await TencentImSDKPlugin.v2TIMManager
+ .getFriendshipManager()
+ .getFriendsInfo(
+ userIDList: users,
+ );
+ ImApi.imPrint(res.toJson(), "获取好友信息");
+ }
+
+ /*
+ * 添加好友
+ * */
+ static Future<V2TimFriendOperationResult?> addFriend(String? userID) async {
+ if (userID == Q1Data.user() && !AppConfig.isArrowAddSelf) {
+ return V2TimFriendOperationResult(
+ userID: userID, resultCode: -1, resultInfo: "不能申请添加自己为好友");
+ }
+
+ V2TimValueCallback<V2TimFriendOperationResult> res =
+ await TencentImSDKPlugin.v2TIMManager.getFriendshipManager().addFriend(
+ userID: userID!,
+ addType: FriendTypeEnum.V2TIM_FRIEND_TYPE_BOTH,
+ );
+ ImApi.imPrint(res.toJson(), "添加好友");
+ return res.data;
+ }
+
+ /*
+ * 设置好友信息
+ * */
+ static Future setFriendInfo(String userID, String friendRemark) async {
+ V2TimCallback res = await TencentImSDKPlugin.v2TIMManager
+ .getFriendshipManager()
+ .setFriendInfo(friendRemark: friendRemark, userID: userID);
+ ImApi.imPrint(res.toJson(), "设置好友信息");
+ }
+
+ /*
+ * 删除好友
+ * */
+ static Future<List<V2TimFriendOperationResult>?> deleteFromFriendList(
+ List<String> userIDList) async {
+ V2TimValueCallback<List<V2TimFriendOperationResult>> res =
+ await TencentImSDKPlugin.v2TIMManager
+ .getFriendshipManager()
+ .deleteFromFriendList(
+ userIDList: userIDList,
+ deleteType: FriendTypeEnum.V2TIM_FRIEND_TYPE_BOTH,
+ );
+
+ ImApi.imPrint(res.toJson(), "删除好友");
+ return res.data;
+ }
+
+ /*
+ * 检测好友
+ *
+ * element.resultType;//与查询用户的关系类型 0:不是好友 1:对方在我的好友列表中 2:我在对方的好友列表中 3:互为好友
+ * */
+ static Future<List<V2TimFriendCheckResult>?> checkFriend(
+ List<String> userIDList) async {
+ V2TimValueCallback<List<V2TimFriendCheckResult>> res =
+ await TencentImSDKPlugin.v2TIMManager
+ .getFriendshipManager()
+ .checkFriend(
+ userIDList: userIDList,
+ checkType: FriendTypeEnum.V2TIM_FRIEND_TYPE_BOTH,
+ );
+
+ ImApi.imPrint(res.toJson(), "检测好友");
+ return res.data;
+ }
+
+ /*
+ * 获取好友申请列表
+ *
+ * 关于type可能是。
+ *
+ * enum FriendApplicationTypeEnum {
+ V2TIM_FRIEND_APPLICATION_NULL, // dart 不支持枚举初始值，所以这里加一个null
+ // 别人发给我的加好友请求
+ V2TIM_FRIEND_APPLICATION_COME_IN,
+ //我发给别人的加好友请求
+ V2TIM_FRIEND_APPLICATION_SEND_OUT,
+ // 别人发给我的和我发给别人的加好友请求。仅在拉取时有效。
+ V2TIM_FRIEND_APPLICATION_BOTH,
+}
+ * */
+ static Future<List<V2TimFriendApplication?>?> getFriendApplicationList() async {
+ V2TimValueCallback<V2TimFriendApplicationResult> res =
+ await TencentImSDKPlugin.v2TIMManager
+ .getFriendshipManager()
+ .getFriendApplicationList();
+ ImApi.imPrint(res.toJson(), "获取好友申请列表");
+ return res.data!.friendApplicationList;
+ // flutter: [IM]:-------------获取好友申请列表-----------
+ // flutter: [IM]:{"code":0,"desc":"ok","data":{"unreadCount":1,"friendApplicationList":[{"userID":"165","nickname":"u165","faceUrl":null,"addTime":1665300529,"addSource":"AddSource_Type_Unknow","addWording":null,"type":1}]}}
+ }
+
+ /*
+ * 同意好友申请
+ * */
+ static Future<V2TimValueCallback<V2TimFriendOperationResult>>
+ acceptFriendApplication(String userID) async {
+ V2TimValueCallback<V2TimFriendOperationResult> res =
+ await TencentImSDKPlugin.v2TIMManager
+ .getFriendshipManager()
+ .acceptFriendApplication(
+ userID: userID,
+ responseType:
+ FriendResponseTypeEnum.V2TIM_FRIEND_ACCEPT_AGREE_AND_ADD,
+ type: FriendApplicationTypeEnum.V2TIM_FRIEND_APPLICATION_BOTH);
+
+ ImApi.imPrint(res.toJson(), "同意好友申请,userID:$userID");
+ return res;
+ }
+
+ /*
+ * 拒绝好友申请
+ * */
+ static Future refuseFriendApplication(String userID) async {
+ V2TimValueCallback<V2TimFriendOperationResult> res =
+ await TencentImSDKPlugin.v2TIMManager
+ .getFriendshipManager()
+ .refuseFriendApplication(
+ userID: userID,
+ type: FriendApplicationTypeEnum.V2TIM_FRIEND_APPLICATION_BOTH);
+
+ ImApi.imPrint(res.toJson(), "拒绝好友申请");
+ }
+
+ /*
+ * 获取黑名单列表
+ * */
+ static Future getBlackList() async {
+ V2TimValueCallback<List<V2TimFriendInfo>> res = await TencentImSDKPlugin
+ .v2TIMManager
+ .getFriendshipManager()
+ .getBlackList();
+ ImApi.imPrint(res.toJson(), "获取黑名单列表");
+ }
+
+ /*
+ * 添加到黑名单
+ * */
+ static Future addToBlackList(List<String> userIDList) async {
+ V2TimValueCallback<List<V2TimFriendOperationResult>> res =
+ await TencentImSDKPlugin.v2TIMManager
+ .getFriendshipManager()
+ .addToBlackList(
+ userIDList: userIDList,
+ );
+ ImApi.imPrint(res.toJson(), "添加到黑名单");
+ }
+
+ /*
+ * 从黑名单移除
+ * */
+ static Future deleteFromBlackList(List<String> userIDList) async {
+ V2TimValueCallback<List<V2TimFriendOperationResult>> res =
+ await TencentImSDKPlugin.v2TIMManager
+ .getFriendshipManager()
+ .deleteFromBlackList(
+ userIDList: userIDList,
+ );
+ ImApi.imPrint(res.toJson(), "从黑名单移除");
+ }
+
+ /*
+ * 搜索好友
+ * */
+ static Future searchFriends(String keyword) async {
+ V2TimFriendSearchParam searchParam = new V2TimFriendSearchParam(
+ keywordList: [keyword],
+ isSearchUserID: true,
+ isSearchNickName: true,
+ isSearchRemark: true);
+ var res = await TencentImSDKPlugin.v2TIMManager
+ .getFriendshipManager()
+ .searchFriends(searchParam: searchParam);
+ ImApi.imPrint(res.toJson(), "搜索好友");
+ }
+}
diff --git a/lib/im/im_handle/im_group_api.dart b/lib/im/im_handle/im_group_api.dart
new file mode 100644
index 0000000..5bc3999
--- /dev/null
+++ b/lib/im/im_handle/im_group_api.dart
@@ -0,0 +1,301 @@
+import 'package:tencent_im_sdk_plugin/enum/group_member_filter_enum.dart';
+import 'package:tencent_im_sdk_plugin/enum/group_member_role_enum.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_callback.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_group_info.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_group_info_result.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_group_member.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_group_member_full_info.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_group_member_info_result.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_group_member_operation_result.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_group_member_search_param.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_group_search_param.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_value_callback.dart';
+import 'package:tencent_im_sdk_plugin/tencent_im_sdk_plugin.dart';
+import 'package:wechat_flutter/im/im_handle/im_msg_api.dart';
+import 'package:wechat_flutter/tools/eventbus/msg_bus.dart';
+
+import 'Im_api.dart';
+
+/// IM群组模块Api
+class ImGroupApi {
+ /*
+ * 高级创建群
+ * */
+ static Future<V2TimValueCallback<String>> createGroupV2(
+ String groupName, {
+ String? groupID,
+ List<V2TimGroupMember>? memberList,
+ // Work 工作群
+ // Public 公开群
+ // Meeting 会议群
+ // AVChatRoom 直播群
+ String groupType = "Public",
+ }) async {
+ V2TimValueCallback<String> res =
+ await TencentImSDKPlugin.v2TIMManager.getGroupManager().createGroup(
+ groupType: groupType,
+ groupName: groupName,
+ groupID: groupID,
+ memberList: memberList,
+ );
+ ImApi.imPrint(res.toJson(), "创建群");
+
+ await ImMsgApi.sendTextMessage("欢迎大家加入本群。",
+ groupID: res.data!, receiver: '');
+
+ /// 事件总线发送，让其他地方同步消息
+ msgBus.fire(MsgBusModel(res.data));
+
+ return res;
+ }
+
+ /*
+ * 获取加群列表
+ * */
+ static Future<List<V2TimGroupInfo>?> getJoinedGroupList() async {
+ V2TimValueCallback<List<V2TimGroupInfo>> res = await TencentImSDKPlugin
+ .v2TIMManager
+ .getGroupManager()
+ .getJoinedGroupList();
+ ImApi.imPrint(res.toJson(), "获取加群列表");
+ return res.data;
+ }
+
+ /*
+ * 获取群组信息
+ * */
+ static Future<List<V2TimGroupInfoResult>?> getGroupsInfo(
+ List<String> groupIDList) async {
+ V2TimValueCallback<List<V2TimGroupInfoResult>> res =
+ await TencentImSDKPlugin.v2TIMManager
+ .getGroupManager()
+ .getGroupsInfo(groupIDList: groupIDList);
+ ImApi.imPrint(res.toJson(), "获取群组信息");
+ return res.data;
+ }
+
+ /*
+ * 设置群信息
+ * */
+ static Future setGroupInfo(
+ String groupID, {
+ String? groupName,
+ String? groupType,
+ String? notification,
+ String? introduction,
+ String? faceUrl,
+ String? isAllMuted,
+ String? addOpt,
+ String? customInfo,
+ }) async {
+ V2TimCallback res =
+ await TencentImSDKPlugin.v2TIMManager.getGroupManager().setGroupInfo(
+ info: V2TimGroupInfo.fromJson(
+ {
+ "groupID": groupID,
+ "groupName": groupName,
+ "groupType": groupType,
+ "notification": notification,
+ "introduction": introduction,
+ "faceUrl": faceUrl,
+ "isAllMuted": isAllMuted,
+ "addOpt": addOpt,
+ "customInfo": customInfo,
+ },
+ ),
+ );
+ ImApi.imPrint(res.toJson(), "设置群信息");
+ }
+
+ /*
+ * 获取群在线人数
+ * */
+ static Future getGroupOnlineMemberCount(String groupID) async {
+ V2TimValueCallback<int> res = await TencentImSDKPlugin.v2TIMManager
+ .getGroupManager()
+ .getGroupOnlineMemberCount(
+ groupID: groupID,
+ );
+ ImApi.imPrint(res.toJson(), "获取群在线人数");
+ }
+
+ /*
+ * 获取群成员列表
+ * */
+ static Future<V2TimGroupMemberInfoResult?> getGroupMemberList(
+ String groupID, {
+ GroupMemberFilterTypeEnum filter =
+ GroupMemberFilterTypeEnum.V2TIM_GROUP_MEMBER_FILTER_ALL,
+ String nextSeq = "0",
+ }) async {
+ V2TimValueCallback<V2TimGroupMemberInfoResult> res =
+ await TencentImSDKPlugin.v2TIMManager
+ .getGroupManager()
+ .getGroupMemberList(
+ groupID: groupID,
+ filter: filter,
+ nextSeq: nextSeq,
+ );
+ ImApi.imPrint(res.toJson(), "获取群成员列表");
+ return res.data;
+ }
+
+ /*
+ * 获取指定的群成员资料
+ * */
+ static Future getGroupMembersInfo(String groupID, memberId) async {
+ V2TimValueCallback<List<V2TimGroupMemberFullInfo>> res =
+ await TencentImSDKPlugin.v2TIMManager
+ .getGroupManager()
+ .getGroupMembersInfo(
+ groupID: groupID,
+ memberList: [memberId],
+ );
+ ImApi.imPrint(res.toJson(), "获取指定的群成员资料");
+ }
+
+ /*
+ * 设置群成员信息
+ * */
+ static Future setGroupMemberInfo(String groupID, String userID,
+ {String? nameCard}) async {
+ V2TimCallback res = await TencentImSDKPlugin.v2TIMManager
+ .getGroupManager()
+ .setGroupMemberInfo(
+ groupID: groupID,
+ userID: userID,
+ nameCard: nameCard,
+ );
+ ImApi.imPrint(res.toJson(), "设置群成员信息");
+ }
+
+ /*
+ * 禁言群成员
+ * */
+ static Future muteGroupMember(
+ String groupID, String userID, int seconds) async {
+ V2TimCallback res = await TencentImSDKPlugin.v2TIMManager
+ .getGroupManager()
+ .muteGroupMember(groupID: groupID, userID: userID, seconds: seconds);
+ ImApi.imPrint(res.toJson(), "禁言群成员");
+ }
+
+ /*
+ * 邀请好友进群
+ * */
+ static Future inviteUserToGroup(String groupID, List<String> userList) async {
+ V2TimValueCallback<List<V2TimGroupMemberOperationResult>> res =
+ await TencentImSDKPlugin.v2TIMManager
+ .getGroupManager()
+ .inviteUserToGroup(
+ groupID: groupID,
+ userList: userList,
+ );
+ ImApi.imPrint(res.toJson(), "邀请好友进群");
+ }
+
+ /*
+ * 踢人出群
+ * */
+ static Future kickGroupMember(String groupID, List<String> userList) async {
+ V2TimCallback res =
+ await TencentImSDKPlugin.v2TIMManager.getGroupManager().kickGroupMember(
+ groupID: groupID,
+ memberList: userList,
+ reason: "t",
+ );
+ ImApi.imPrint(res.toJson(), "踢人出群");
+ }
+
+ /*
+ * 设置群角色
+ * */
+ static Future setGroupMemberRole(
+ String groupID, String userID, GroupMemberRoleTypeEnum role) async {
+ V2TimCallback res = await TencentImSDKPlugin.v2TIMManager
+ .getGroupManager()
+ .setGroupMemberRole(
+ groupID: groupID,
+ userID: userID, //注意：选择器没做单选，所以这里选第一个
+ role: role,
+ );
+ ImApi.imPrint(res.toJson(), "设置群角色");
+ }
+
+ /*
+ * 转移群主
+ * */
+ static Future transferGroupOwner(String groupID, String userID) async {
+ V2TimCallback res = await TencentImSDKPlugin.v2TIMManager
+ .getGroupManager()
+ .transferGroupOwner(
+ groupID: groupID,
+ userID: userID,
+ );
+ ImApi.imPrint(res.toJson(), "转移群主");
+ }
+
+ /*
+ * 搜索群列表
+ * */
+ static Future sendTextMessage(String text) async {
+ V2TimGroupSearchParam searchParam = new V2TimGroupSearchParam(
+ keywordList: [text], isSearchGroupID: true, isSearchGroupName: true);
+
+ V2TimValueCallback<List<V2TimGroupInfo>> res = await TencentImSDKPlugin
+ .v2TIMManager
+ .getGroupManager()
+ .searchGroups(searchParam: searchParam);
+ ImApi.imPrint(res.toJson(), "搜索群列表");
+ }
+
+ /*
+ * 搜索群成员
+ * */
+ static Future searchGroupMembers(String groupID, String text) async {
+ V2TimGroupMemberSearchParam searchGroupMembers =
+ new V2TimGroupMemberSearchParam(
+ groupIDList: [groupID],
+ keywordList: [text],
+ );
+ var res = await TencentImSDKPlugin.v2TIMManager
+ .getGroupManager()
+ .searchGroupMembers(param: searchGroupMembers);
+ ImApi.imPrint(res.toJson(), "搜索群成员");
+ }
+
+ /*
+ * 加入群组-加入群聊
+ * */
+ static Future<V2TimCallback> joinGroup(String groupID,
+ [String message = "申请加入群聊"]) async {
+ V2TimCallback res = await TencentImSDKPlugin.v2TIMManager.joinGroup(
+ groupID: groupID,
+ message: message,
+ );
+ ImApi.imPrint(res.toJson(), "加入群组-加入群聊");
+ return res;
+ }
+
+ /*
+ * 退出群聊
+ * */
+ static Future<bool> quitGroup(String groupID) async {
+ V2TimCallback res = await TencentImSDKPlugin.v2TIMManager.quitGroup(
+ groupID: groupID,
+ );
+ ImApi.imPrint(res.toJson(), "退出群聊");
+ return res.code == 0;
+ }
+
+ /*
+ * 解散群聊
+ * */
+ static Future<bool> dismissGroup(String groupID) async {
+ V2TimCallback res = await TencentImSDKPlugin.v2TIMManager.dismissGroup(
+ groupID: groupID,
+ );
+ ImApi.imPrint(res.toJson(), "解散群聊");
+ return res.code == 0;
+ }
+}
diff --git a/lib/im/im_handle/im_msg_api.dart b/lib/im/im_handle/im_msg_api.dart
new file mode 100644
index 0000000..0323d90
--- /dev/null
+++ b/lib/im/im_handle/im_msg_api.dart
@@ -0,0 +1,457 @@
+import 'package:path_provider/path_provider.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_callback.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_conversation.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_message.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_message_search_param.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_message_search_result.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_message_search_result_item.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_msg_create_info_result.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_value_callback.dart';
+import 'package:tencent_im_sdk_plugin/tencent_im_sdk_plugin.dart';
+import 'package:video_thumbnail/video_thumbnail.dart';
+import 'package:wechat_flutter/im/im_handle/im_conversation_api.dart';
+import 'package:wechat_flutter/tools/commom/check.dart';
+import 'package:wechat_flutter/tools/utils/file_util.dart';
+import 'package:wechat_flutter/tools/utils/video_util.dart';
+
+import 'Im_api.dart';
+
+/// IM消息模块Api
+class ImMsgApi {
+ /*
+ * 发送文本消息
+ * */
+ static Future<V2TimMessage?> sendTextMessage(
+ String text, {
+ required String receiver,
+ required String groupID,
+ }) async {
+ V2TimValueCallback<V2TimMsgCreateInfoResult> createMessage =
+ await TencentImSDKPlugin.v2TIMManager
+ .getMessageManager()
+ .createTextMessage(text: text);
+ String id = createMessage.data!.id!;
+
+ V2TimValueCallback<V2TimMessage> res = await TencentImSDKPlugin.v2TIMManager
+ .getMessageManager()
+ .sendMessage(
+ id: id,
+ receiver: receiver,
+ groupID: groupID,
+ localCustomData: "自定义localCustomData");
+ ImApi.imPrint(res.toJson(), "发送文本消息");
+ return res.data;
+ }
+
+ /*
+ * 发送图片消息
+ * */
+ static Future<V2TimMessage?> sendImageMessage(
+ String imagePath, {
+ required String receiver,
+ required String groupID,
+ }) async {
+ V2TimValueCallback<V2TimMsgCreateInfoResult> createMessage =
+ await TencentImSDKPlugin.v2TIMManager
+ .getMessageManager()
+ .createImageMessage(imagePath: imagePath);
+ String id = createMessage.data!.id!;
+
+ V2TimValueCallback<V2TimMessage> res = await TencentImSDKPlugin.v2TIMManager
+ .getMessageManager()
+ .sendMessage(
+ id: id,
+ receiver: receiver,
+ groupID: groupID,
+ localCustomData: "自定义localCustomData");
+ ImApi.imPrint(res.toJson(), "发送图片消息");
+ return res.data;
+ }
+
+ /*
+ * 发送视频消息
+ * */
+ static Future<V2TimMessage?> sendVideoMessage(
+ String videoPath, {
+ String? receiver,
+ String? groupID,
+ }) async {
+ final snapshotBasePath = (await getTemporaryDirectory()).path;
+ final fileName = await VideoThumbnail.thumbnailFile(
+ video: videoPath,
+ thumbnailPath: snapshotBasePath,
+ imageFormat: ImageFormat.PNG,
+ quality: 75,
+ );
+
+ final String? snapshotPath = fileName;
+
+ final VideoUtilModel videoUtilModel =
+ await VideoUtil.getVideoDuration(videoPath);
+
+ if (!strNoEmpty(snapshotPath)) {
+ print("视频封面为空");
+ return null;
+ }
+
+ print("封面整:$snapshotPath");
+
+ V2TimValueCallback<V2TimMsgCreateInfoResult> createMessage =
+ await TencentImSDKPlugin.v2TIMManager
+ .getMessageManager()
+ .createVideoMessage(
+ duration: videoUtilModel.duration,
+ snapshotPath: snapshotPath!,
+ // snapshotPath: videoUtilModel.coverPath,
+ type: FileUtil.getInstance()!.videoTypeOfPath(videoPath),
+ videoFilePath: videoPath,
+ );
+ String id = createMessage.data!.id!;
+
+ V2TimValueCallback<V2TimMessage> res = await TencentImSDKPlugin.v2TIMManager
+ .getMessageManager()
+ .sendMessage(
+ id: id,
+ receiver: receiver!,
+ groupID: groupID!,
+ localCustomData: "自定义localCustomData");
+ ImApi.imPrint(res.toJson(), "发送视频消息");
+ return res.data;
+ }
+
+ /*
+ * 发送自定义消息
+ * */
+ static Future sendCustomMessage(
+ String data, {
+ required String receiver,
+ required String groupID,
+ }) async {
+ V2TimValueCallback<V2TimMsgCreateInfoResult> createMessage =
+ await TencentImSDKPlugin.v2TIMManager
+ .getMessageManager()
+ .createCustomMessage(data: data);
+ String id = createMessage.data!.id!;
+ V2TimValueCallback<V2TimMessage> res =
+ await TencentImSDKPlugin.v2TIMManager.getMessageManager().sendMessage(
+ id: id,
+ receiver: receiver,
+ groupID: groupID,
+ );
+
+ ImApi.imPrint(res.toJson(), "发送自定义消息");
+ }
+
+ /*
+ * 发送文本At消息
+ * */
+ static Future sendTextAtMessage(
+ String text,
+ List<String> atUserList, {
+ required String receiver,
+ required String groupID,
+ }) async {
+ V2TimValueCallback<V2TimMsgCreateInfoResult> createMessage =
+ await TencentImSDKPlugin.v2TIMManager
+ .getMessageManager()
+ .createTextAtMessage(text: text, atUserList: atUserList);
+ String id = createMessage.data!.id!;
+ V2TimValueCallback<V2TimMessage> res = await TencentImSDKPlugin.v2TIMManager
+ .getMessageManager()
+ .sendMessage(
+ id: id,
+ receiver: receiver,
+ groupID: groupID,
+ localCustomData: "自定义localCustomData");
+ ImApi.imPrint(res.toJson(), "发送文本At消息");
+ }
+
+ /*
+ * 发送表情消息
+ * */
+ static Future sendFaceMessage(
+ int index,
+ String data, {
+ required String receiver,
+ required String groupID,
+ }) async {
+ V2TimValueCallback<V2TimMsgCreateInfoResult> createMessage =
+ await TencentImSDKPlugin.v2TIMManager
+ .getMessageManager()
+ .createFaceMessage(
+ index: index,
+ data: data,
+ );
+ String id = createMessage.data!.id!;
+
+ V2TimValueCallback<V2TimMessage> res =
+ await TencentImSDKPlugin.v2TIMManager.getMessageManager().sendMessage(
+ id: id,
+ receiver: receiver,
+ groupID: groupID,
+ );
+
+ ImApi.imPrint(res.toJson(), "发送表情消息");
+ }
+
+ /*
+ * 获取C2C历史消息
+ * */
+ static Future<List<V2TimMessage>?> getC2CHistoryMessageList(
+ String userID, String? lastMsgID) async {
+ V2TimValueCallback<List<V2TimMessage>> res = await TencentImSDKPlugin
+ .v2TIMManager
+ .getMessageManager()
+ .getC2CHistoryMessageList(
+ userID: userID,
+ count: 20,
+ lastMsgID: lastMsgID,
+ );
+ ImApi.imPrint(res.toJson(), "获取C2C历史消息");
+ return res.data;
+ }
+
+ /*
+ * 获取Group历史消息
+ * */
+ static Future<V2TimValueCallback<List<V2TimMessage>>>
+ getGroupHistoryMessageList(String groupID,
+ {String? lastMsgID, int count = 20}) async {
+ V2TimValueCallback<List<V2TimMessage>> res = await TencentImSDKPlugin
+ .v2TIMManager
+ .getMessageManager()
+ .getGroupHistoryMessageList(
+ groupID: groupID,
+ count: count,
+ lastMsgID: lastMsgID,
+ );
+ ImApi.imPrint(res.toJson(), "获取Group历史消息");
+ return res;
+ }
+
+ /*
+ * 获取历史消息高级接口
+ * */
+ static Future<List<V2TimMessage>?> getHistoryMessageList(
+ {String? userID, String? groupID, String? lastMsgID}) async {
+ V2TimValueCallback<List<V2TimMessage>> res = await TencentImSDKPlugin
+ .v2TIMManager
+ .getMessageManager()
+ .getHistoryMessageList(
+ userID: userID, groupID: groupID, count: 20, lastMsgID: lastMsgID);
+ ImApi.imPrint(res.toJson(), "获取历史消息高级接口");
+ return res.data;
+ }
+
+ /*
+ * 撤回消息
+ * */
+ static Future revokeMessage(String msgID) async {
+ // 注意：web中webMessageInstatnce 为必填写
+ V2TimCallback res =
+ await TencentImSDKPlugin.v2TIMManager.getMessageManager().revokeMessage(
+ msgID: msgID,
+ );
+ ImApi.imPrint(res.toJson(), "撤回消息");
+ }
+
+ /*
+ * 标记c2c会话已读
+ * */
+ static Future markC2CMessageAsRead(String userId) async {
+ V2TimCallback res = await TencentImSDKPlugin.v2TIMManager
+ .getMessageManager()
+ .markC2CMessageAsRead(
+ userID: userId,
+ );
+ ImApi.imPrint(res.toJson(), "标记c2c会话已读");
+ }
+
+ /*
+ * 标记group会话已读
+ * */
+ static Future markGroupMessageAsRead(String groupID) async {
+ V2TimCallback res = await TencentImSDKPlugin.v2TIMManager
+ .getMessageManager()
+ .markGroupMessageAsRead(
+ groupID: groupID,
+ );
+ ImApi.imPrint(res.toJson(), "标记group会话已读");
+ }
+
+ /*
+ * 标记所有消息为已读
+ * */
+ static Future markAllMessageAsRead() async {
+ V2TimCallback res = await TencentImSDKPlugin.v2TIMManager
+ .getMessageManager()
+ .markAllMessageAsRead();
+ ImApi.imPrint(res.toJson(), "标记所有消息为已读");
+ }
+
+ /*
+ * 删除本地消息
+ * */
+ static Future deleteMessageFromLocalStorage(String msgID) async {
+ V2TimCallback res = await TencentImSDKPlugin.v2TIMManager
+ .getMessageManager()
+ .deleteMessageFromLocalStorage(
+ msgID: msgID,
+ );
+ ImApi.imPrint(res.toJson(), "删除本地消息");
+ }
+
+ /*
+ * 删除消息
+ * */
+ static Future deleteMessages(List<String> msgIDs) async {
+ V2TimCallback res = await TencentImSDKPlugin.v2TIMManager
+ .getMessageManager()
+ .deleteMessages(
+ msgIDs: msgIDs,
+ );
+ ImApi.imPrint(res.toJson(), "删除消息");
+ }
+
+ /*
+ * 向group中插入一条本地消息
+ * */
+ static Future insertGroupMessageToLocalStorage({
+ required String groupID,
+ required String data,
+ required String sender,
+ }) async {
+ V2TimValueCallback<V2TimMessage> res = await TencentImSDKPlugin.v2TIMManager
+ .getMessageManager()
+ .insertGroupMessageToLocalStorage(
+ groupID: groupID,
+ data: data,
+ sender: sender,
+ );
+ ImApi.imPrint(res.toJson(), "向group中插入一条本地消息");
+ }
+
+ /*
+ * 向c2c会话中插入一条本地消息
+ * */
+ static Future insertC2CMessageToLocalStorage({
+ required String userID,
+ required String data,
+ required String sender,
+ }) async {
+ V2TimValueCallback<V2TimMessage> res = await TencentImSDKPlugin.v2TIMManager
+ .getMessageManager()
+ .insertC2CMessageToLocalStorage(
+ userID: userID,
+ data: data,
+ sender: sender,
+ );
+ ImApi.imPrint(res.toJson(), "向c2c会话中插入一条本地消息");
+ }
+
+ /*
+ * 清空单聊本地及云端的消息（不删除会话）
+ * */
+ static Future clearMessage(String userID) async {
+ var res = await TencentImSDKPlugin.v2TIMManager
+ .getMessageManager()
+ .clearC2CHistoryMessage(
+ userID: userID,
+ );
+ ImApi.imPrint(res.toJson(), "清空单聊本地及云端的消息（不删除会话）");
+ }
+
+ /*
+ * 查询针对某个用户的 C2C 消息接收选项（免打扰状态）
+ * */
+ static Future getC2CReceiveMessageOpt(List<String> userIDList) async {
+ V2TimValueCallback res = await TencentImSDKPlugin.v2TIMManager
+ .getMessageManager()
+ .getC2CReceiveMessageOpt(userIDList: userIDList);
+ ImApi.imPrint(res.toJson(), "查询针对某个用户的 C2C 消息接收选项（免打扰状态）");
+ }
+
+ /*
+ * 清空群组单聊本地及云端的消息
+ * */
+ static Future getGroupsInfo(String groupID) async {
+ var res = await TencentImSDKPlugin.v2TIMManager
+ .getMessageManager()
+ .clearGroupHistoryMessage(
+ groupID: groupID,
+ );
+ ImApi.imPrint(res.toJson(), "清空群组单聊本地及云端的消息");
+ }
+
+ /*
+ * 搜索本地消息
+ * */
+ static Future<V2TimValueCallback<V2TimMessageSearchResult>?>
+ searchLocaltMessage(String keyword, String conversationID) async {
+ if (keyword == '') return null;
+ V2TimMessageSearchParam searchParam = V2TimMessageSearchParam(
+ keywordList: [keyword],
+ type: 1,
+ // 对应 keywordListMatchType.KEYWORD_LIST_MATCH_TYPE_AND sdk层处理 代表 或 与关系
+ pageSize: 50,
+ // size 写死
+ pageIndex: 0,
+ // index写死
+ // conversationID: conversationID, // 不传代表指定所有会话,而且不会返回messageList
+ );
+ V2TimValueCallback<V2TimMessageSearchResult> res = await TencentImSDKPlugin
+ .v2TIMManager
+ .getMessageManager()
+ .searchLocalMessages(searchParam: searchParam);
+ ImApi.imPrint(res.toJson(), "搜索本地消息");
+ return res;
+ }
+
+ /*
+ * 搜索本地消息【根据群】
+ * */
+ static Future<List<V2TimMessage>?> searchLocaltMessageOfGroup(
+ String keyword, String groupId) async {
+ if (keyword == '') return null;
+ V2TimMessageSearchParam searchParam = V2TimMessageSearchParam(
+ keywordList: [keyword],
+ type: 1,
+ // 对应 keywordListMatchType.KEYWORD_LIST_MATCH_TYPE_AND sdk层处理 代表 或 与关系
+ pageSize: 50,
+ // size 写死
+ pageIndex: 0,
+ // index写死
+ // conversationID: conversationID, // 不传代表指定所有会话,而且不会返回messageList
+ );
+ V2TimValueCallback<V2TimMessageSearchResult> res = await TencentImSDKPlugin
+ .v2TIMManager
+ .getMessageManager()
+ .searchLocalMessages(searchParam: searchParam);
+ ImApi.imPrint(res.toJson(), "搜索本地消息");
+ if (res.data!.totalCount == 0) {
+ return [];
+ }
+ for (V2TimMessageSearchResultItem item
+ in res.data!.messageSearchResultItems!) {
+ V2TimValueCallback<V2TimConversation> cov =
+ await IMConversationApi.getConversation(item.conversationID!);
+
+ final bool covSuccess = cov.code == 0 || cov.code == 200;
+ if (covSuccess && groupId == cov.data!.groupID) {
+ return item.messageList;
+ }
+ }
+ return [];
+ }
+
+ /*
+ * 查询指定会话中的本地消息
+ * */
+ static Future findeMessages(List<String> messageIDList) async {
+ var res =
+ await TencentImSDKPlugin.v2TIMManager.getMessageManager().findMessages(
+ messageIDList: messageIDList,
+ );
+ ImApi.imPrint(res.toJson(), "查询指定会话中的本地消息");
+ }
+}
diff --git a/lib/im/info_handle.dart b/lib/im/info_handle.dart
deleted file mode 100644
index 3ba10ad..0000000
--- a/lib/im/info_handle.dart
+++ /dev/null
@@ -1,49 +0,0 @@
-import 'package:provider/provider.dart';
-import 'package:wechat_flutter/provider/global_model.dart';
-import 'package:wechat_flutter/tools/wechat_flutter.dart';
-
-import 'package:flutter/material.dart';
-
-Future<dynamic> getRemarkMethod(String id, {Callback callback}) async {
- try {
- var result = await im.getRemark(id);
- callback(result);
- return result;
- } on PlatformException {
- print('获取备注失败');
- } on MissingPluginException {
- print('插件内这个功能IOS版还在开发中');
- }
-}
-
-Future<dynamic> setUsersProfileMethod(
- BuildContext context, {
- Callback callback,
- String nickNameStr = '',
- String avatarStr = '',
-}) async {
- final model = Provider.of<GlobalModel>(context, listen: false);
-
- try {
- var result = await im.setUsersProfile(0, nickNameStr, avatarStr);
- if (result.toString().contains('succ')) {
- if (strNoEmpty(nickNameStr)) model.nickName = nickNameStr;
- if (strNoEmpty(avatarStr)) model.avatar = avatarStr;
- }
- callback(result);
- return result;
- } on PlatformException {
- print('设置个人信息 失败');
- }
-}
-
-Future<dynamic> getUsersProfile(List<String> users, {Callback callback}) async {
- try {
- var result = await im.getUsersProfile(users);
- return result;
- } on PlatformException {
- print('获取用户信息 失败');
- } on MissingPluginException {
- print('插件功能出错');
- }
-}
diff --git a/lib/im/login_handle.dart b/lib/im/login_handle.dart
index c306fb7..cfc4bfd 100755
--- a/lib/im/login_handle.dart
+++ b/lib/im/login_handle.dart
@@ -1,59 +1,97 @@
-import 'package:provider/provider.dart';
-import 'package:wechat_flutter/pages/login/login_begin_page.dart';
-import 'package:wechat_flutter/pages/root/root_page.dart';
-import 'package:wechat_flutter/provider/global_model.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
-
+import 'package:get/get.dart';
+import 'package:provider/provider.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_callback.dart';
+import 'package:wechat_flutter/im/im_handle/Im_api.dart';
+import 'package:wechat_flutter/pages/common/login/login_begin_page.dart';
+import 'package:wechat_flutter/pages/root/root/root_view.dart';
+import 'package:wechat_flutter/tools/config/keys.dart';
+import 'package:wechat_flutter/tools/data/data.dart';
+import 'package:wechat_flutter/tools/provider/global_model.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
-Future<void> init(BuildContext context) async {
- try {
- var result = await im.init(appId);
- debugPrint('初始化结果 ======> ${result.toString()}');
- } on PlatformException {
- showToast(context, "初始化失败");
- }
-}
-
-Future<void> login(String userName, BuildContext context) async {
+Future<void> login(BuildContext context, String userId) async {
final model = Provider.of<GlobalModel>(context, listen: false);
try {
- var result = await im.imLogin(userName, null);
- if (result.toString().contains('ucc')) {
- model.account = userName;
- model.goToLogin = false;
- await SharedUtil.instance.saveString(Keys.account, userName);
- await SharedUtil.instance.saveBoolean(Keys.hasLogged, true);
+ V2TimCallback? result = await ImApi.login(userId);
+ if (result == null) {
+ q1Toast( '出现错误');
+ return;
+ }
+ if (result.code == 0) {
+ /// 数据初始化
+ await Q1Data.initData();
+
+ model.setAccount(userId);
+ model.setGoToLogin(false);
+ await SharedUtil.instance!.saveString(Keys.account, userId);
+ await SharedUtil.instance!.saveBoolean(Keys.hasLogged, true);
model.refresh();
- await routePushAndRemove(new RootPage());
+ Get.offAll(new RootPage());
} else {
print('error::' + result.toString());
}
} on PlatformException {
- showToast(context, '你已登录或者其他错误');
+ q1Toast( '你已登录或者其他错误');
}
}
-Future<void> loginOut(BuildContext context) async {
- final model = Provider.of<GlobalModel>(context, listen: false);
+Map a = {
+ "id": "feb76057-619b-4536-bc6e-8147047ec19c",
+ "first_name": "",
+ "last_name": "",
+ "email": "13244766725@13244766725.com",
+ "password": "**********",
+ "location": "",
+ "title": "",
+ "description": "",
+ "tags": [],
+ "avatar": "",
+ "language": "",
+ "theme": "auto",
+ "tfa_secret": "",
+ "status": "active",
+ "role": "84f7dc59-dea9-42ee-9d47-e678f1aff0ec",
+ "token": "",
+ "last_access": "2022-10-11T20:34:49.000Z",
+ "last_page": "",
+ "provider": "default",
+ "external_identifier": "",
+ "auth_data": "",
+ "email_notifications": true,
+ "kid": "10005",
+ "mobile": "13244766725",
+ "nickname": ""
+};
+Future<void> loginOut(BuildContext? context, {String? tip}) async {
+ GlobalModel? model;
+ if (context?.owner != null) {
+ model = Provider.of<GlobalModel>(context!, listen: false);
+ }
+ print("调用退出登录，tip:$tip");
try {
- var result = await im.imLogout();
- if (result.toString().contains('ucc')) {
- showToast(context, '登出成功');
+ V2TimCallback result = await ImApi.logout();
+ if (result.code == 0) {
+ if (context != null) q1Toast( tip ?? '登出成功');
} else {
print('error::' + result.toString());
}
- model.goToLogin = true;
- model.refresh();
- await SharedUtil.instance.saveBoolean(Keys.hasLogged, false);
- await routePushAndRemove(new LoginBeginPage());
- } on PlatformException {
- model.goToLogin = true;
- model.refresh();
- await SharedUtil.instance.saveBoolean(Keys.hasLogged, false);
- await routePushAndRemove(new LoginBeginPage());
+ } catch (e) {
+ print("退出登录出现错误");
+ if (!strNoEmpty(tip)) {
+ if (context != null) q1Toast( tip ?? '登出失败');
+ }
}
+ model?.setGoToLogin(true);
+ model?.refresh();
+ await SharedUtil.instance!.saveBoolean(Keys.hasLogged, false);
+ await SharedUtil.instance!.saveString(Keys.account, "");
+
+ /// 数据清除
+ await Q1Data.clearData();
+
+ await Get.offAll(new LoginBeginPage());
}
diff --git a/lib/im/message_handle.dart b/lib/im/message_handle.dart
deleted file mode 100644
index 3585d89..0000000
--- a/lib/im/message_handle.dart
+++ /dev/null
@@ -1,45 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:image_picker/image_picker.dart';
-import 'package:wechat_flutter/tools/commom.dart';
-
-import 'package:wechat_flutter/tools/wechat_flutter.dart';
-
-Future<dynamic> getDimMessages(String id,
- {int type, Callback callback, int num = 50}) async {
- try {
- var result = await im.getMessages(id, num, type ?? 1);
- return result;
- } on PlatformException {
- debugPrint('获取失败');
- }
-}
-
-Future<void> sendImageMsg(String userName, int type,
- {Callback callback, ImageSource source, File file}) async {
- XFile image;
- if (file.existsSync()) {
- image = XFile(file.path);
- } else {
- image = await ImagePicker().pickImage(source: source);
- }
- if (image == null) return;
- File compressImg = await singleCompressFile(File(image.path));
-
- try {
- await im.sendImageMessages(userName, compressImg.path, type: type);
- callback(compressImg.path);
- } on PlatformException {
- debugPrint("发送图片消息失败");
- }
-}
-
-Future<dynamic> sendSoundMessages(String id, String soundPath, int duration,
- int type, Callback callback) async {
- try {
- var result = await im.sendSoundMessages(id, soundPath, type, duration);
- callback(result);
- } on PlatformException {
- debugPrint('发送语音 失败');
- }
-}
diff --git a/lib/im/model/chat_data.dart b/lib/im/model/chat_data.dart
deleted file mode 100644
index 99a16e8..0000000
--- a/lib/im/model/chat_data.dart
+++ /dev/null
@@ -1,68 +0,0 @@
-import 'dart:convert';
-
-import 'package:wechat_flutter/im/entity/i_chat_person_entity.dart';
-import 'package:wechat_flutter/im/entity/i_person_info_entity.dart';
-import 'package:wechat_flutter/im/entity/person_info_entity.dart';
-import 'package:wechat_flutter/im/info_handle.dart';
-import 'package:wechat_flutter/tools/wechat_flutter.dart';
-import 'package:flutter/material.dart';
-import 'package:wechat_flutter/im/all_im.dart';
-
-class ChatData {
- final Map msg;
- final String id;
- final int time;
- final String nickName;
- final String avatar;
-
- ChatData({
- @required this.msg,
- this.avatar,
- this.time,
- this.nickName,
- this.id,
- });
-}
-
-class ChatDataRep {
- repData(String id, int type) async {
- List<ChatData> chatData = new List<ChatData>();
- final chatMsgData = await getDimMessages(id, type: type);
- if (Platform.isAndroid) {
- List chatMsgDataList = json.decode(chatMsgData);
- for (int i = 0; i < chatMsgDataList.length; i++) {
- PersonInfoEntity model =
- PersonInfoEntity.fromJson(chatMsgDataList[i]['senderProfile']);
-
- chatData.insert(
- 0,
- new ChatData(
- msg: chatMsgDataList[i]['message'],
- avatar: model.faceUrl,
- time: chatMsgDataList[i]['timeStamp'],
- nickName: model.nickName,
- id: model.identifier,
- ),
- );
- }
- } else {
- List chatMsgDataList = json.decode(chatMsgData);
- for (int i = 0; i < chatMsgDataList.length; i++) {
- final info = await getUsersProfile([chatMsgDataList[i]['sender']]);
- List infoList = json.decode(info);
- IPersonInfoEntity model = IPersonInfoEntity.fromJson(infoList[0]);
- chatData.insert(
- 0,
- new ChatData(
- msg: chatMsgDataList[i]['message'],
- avatar: model.faceURL,
- time: chatMsgDataList[i]['timeStamp'],
- nickName: model.nickname,
- id: chatMsgDataList[i]['sender'],
- ),
- );
- }
- }
- return chatData;
- }
-}
diff --git a/lib/im/model/chat_list.dart b/lib/im/model/chat_list.dart
deleted file mode 100644
index 5f7e85c..0000000
--- a/lib/im/model/chat_list.dart
+++ /dev/null
@@ -1,117 +0,0 @@
-import 'dart:convert';
-
-import 'package:wechat_flutter/im/entity/chat_list_entity.dart';
-import 'package:wechat_flutter/im/entity/i_person_info_entity.dart';
-import 'package:wechat_flutter/im/entity/message_entity.dart';
-import 'package:wechat_flutter/im/entity/person_info_entity.dart';
-import 'package:flutter/material.dart';
-import 'package:wechat_flutter/im/conversation_handle.dart';
-import 'package:wechat_flutter/im/info_handle.dart';
-import 'package:wechat_flutter/im/message_handle.dart';
-import 'package:wechat_flutter/tools/wechat_flutter.dart';
-
-class ChatList {
- ChatList({
- @required this.avatar,
- @required this.name,
- @required this.identifier,
- @required this.content,
- @required this.time,
- @required this.type,
- @required this.msgType,
- });
-
- final String avatar;
- final String name;
- final int time;
- final Map content;
- final String identifier;
- final dynamic type;
- final String msgType;
-}
-
-class ChatListData {
- Future<bool> isNull() async {
- final str = await getConversationsListData();
- List<dynamic> data = json.decode(str);
- return !listNoEmpty(data);
- }
-
- chatListData() async {
- List<ChatList> chatList = new List<ChatList>();
- String avatar;
- String name;
- int time;
- String identifier;
- dynamic type;
- String msgType;
-
- String str = await getConversationsListData();
- String nullMap = '{"mConversation":{},"peer":"","type":"System"}';
- str = str.replaceAll(',' + nullMap, '').replaceAll(nullMap + ',', '');
- if (strNoEmpty(str) && str != '[]') {
- List<dynamic> data = json.decode(str);
- for (int i = 0; i < data.length; i++) {
- ChatListEntity model = ChatListEntity.fromJson(data[i]);
- type = model?.type ?? 'C2C';
- identifier = model?.peer ?? '';
- try {
- final profile = await getUsersProfile([model.peer]);
- List<dynamic> profileData = json.decode(profile);
- for (int i = 0; i < profileData.length; i++) {
- if (Platform.isIOS) {
- IPersonInfoEntity info =
- IPersonInfoEntity.fromJson(profileData[i]);
-
- if (strNoEmpty(info?.faceURL) && info?.faceURL != '[]') {
- avatar = info?.faceURL ?? defIcon;
- } else {
- avatar = defIcon;
- }
- name = strNoEmpty(info?.nickname)
- ? info?.nickname
- : identifier ?? '未知';
- } else {
- PersonInfoEntity info = PersonInfoEntity.fromJson(profileData[i]);
- if (strNoEmpty(info?.faceUrl) && info?.faceUrl != '[]') {
- avatar = info?.faceUrl ?? defIcon;
- } else {
- avatar = defIcon;
- }
- name = strNoEmpty(info?.nickName)
- ? info?.nickName
- : identifier ?? '未知';
- }
- }
- } catch (e) {}
-
- final message = await getDimMessages(identifier,
- num: 1, type: type == 'C2C' ? 1 : 2);
- List<dynamic> messageData = new List();
-
- if (strNoEmpty(message) && !message.toString().contains('failed')) {
- messageData = json.decode(message);
- }
- if (listNoEmpty(messageData)) {
- MessageEntity messageModel = MessageEntity.fromJson(messageData[0]);
- time = messageModel?.time ?? 0;
- msgType = messageModel?.message?.type ?? '1';
- }
- if (type == 'Group') avatar = defGroupAvatar;
- chatList.insert(
- 0,
- new ChatList(
- type: type,
- identifier: identifier,
- avatar: avatar,
- name: name ?? '未知',
- time: time ?? 0,
- content: listNoEmpty(messageData) ? messageData[0] : null,
- msgType: msgType ?? '1',
- ),
- );
- }
- }
- return chatList;
- }
-}
diff --git a/lib/im/model/contacts.dart b/lib/im/model/contacts.dart
index e1b5439..a5b1b9b 100644
--- a/lib/im/model/contacts.dart
+++ b/lib/im/model/contacts.dart
@@ -1,104 +1,25 @@
-import 'package:wechat_flutter/im/entity/i_contact_info_entity.dart';
-import 'package:wechat_flutter/im/entity/person_info_entity.dart';
-import 'package:flutter/material.dart';
-import 'package:wechat_flutter/im/friend_handle.dart';
-import 'package:wechat_flutter/im/info_handle.dart';
-import 'dart:convert';
-
-import 'package:wechat_flutter/tools/wechat_flutter.dart';
-import 'package:dim/pinyin/pinyin_helper.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_friend_info.dart';
class Contact {
Contact({
- @required this.avatar,
- @required this.name,
- @required this.nameIndex,
- @required this.identifier,
+ required this.nameIndex,
+ required this.showName,
+ required this.info,
});
- final String avatar;
- final String name;
final String nameIndex;
- final String identifier;
-}
+ final String? showName;
+ final V2TimFriendInfo info;
-class ContactsPageData {
- Future<bool> contactIsNull() async {
- final user = await SharedUtil.instance.getString(Keys.account);
- final result = await getContactsFriends(user);
- List<dynamic> data = json.decode(result);
- return !listNoEmpty(data);
+ String? get avatar {
+ return info.userProfile?.faceUrl;
}
- listFriend() async {
- List<Contact> contacts = new List<Contact>();
- String avatar;
- String nickName;
- String identifier;
- String remark;
-
- final contactsData = await SharedUtil.instance.getString(Keys.contacts);
- final user = await SharedUtil.instance.getString(Keys.account);
- var result = await getContactsFriends(user);
-
- getMethod(result) async {
- if (!listNoEmpty(result)) return contacts;
- List<dynamic> dataMap = json.decode(jsonEncode(result));
- int dLength = dataMap.length;
- for (int i = 0; i < dLength; i++) {
- if (Platform.isIOS) {
- IContactInfoEntity model = IContactInfoEntity.fromJson(dataMap[i]);
- avatar = model.profile.faceURL;
- identifier = model.identifier;
- remark = await getRemarkMethod(model.identifier, callback: (_) {});
- nickName = model.profile.nickname;
- nickName = !strNoEmpty(nickName) ? model.identifier : nickName;
- contacts.insert(
- 0,
- new Contact(
- avatar: !strNoEmpty(avatar) ? defIcon : avatar,
- name: !strNoEmpty(remark) ? nickName : remark,
- nameIndex:
- PinyinHelper.getFirstWordPinyin(nickName)[0].toUpperCase(),
- identifier: identifier,
- ),
- );
- } else {
- PersonInfoEntity model = PersonInfoEntity.fromJson(dataMap[i]);
- avatar = model.faceUrl;
- identifier = model.identifier;
- remark = await getRemarkMethod(model.identifier, callback: (_) {});
- nickName = model.nickName;
- nickName = !strNoEmpty(nickName) ? model.identifier : nickName;
- contacts.insert(
- 0,
- new Contact(
- avatar: !strNoEmpty(avatar) ? defIcon : avatar,
- name: !strNoEmpty(remark) ? nickName : remark,
- nameIndex:
- PinyinHelper.getFirstWordPinyin(nickName)[0].toUpperCase(),
- identifier: identifier,
- ),
- );
- }
- }
- return contacts;
- }
-
- if (result is String) {
- result = json.decode(result);
- }
+ String? get identifier {
+ return info.userProfile?.userID;
+ }
- if (strNoEmpty(contactsData) || contactsData != '[]') {
- if (result != contactsData) {
- await SharedUtil.instance.saveString(Keys.contacts, result.toString());
- return await getMethod(result);
- } else {
- return await getMethod(contactsData);
- }
- } else {
- await SharedUtil.instance.saveString(Keys.contacts, result.toString());
- return await getMethod(result);
- }
+ String? get name {
+ return showName;
}
}
diff --git a/lib/im/model/user_data.dart b/lib/im/model/user_data.dart
index 09ab17b..8c724f9 100644
--- a/lib/im/model/user_data.dart
+++ b/lib/im/model/user_data.dart
@@ -1,20 +1,10 @@
-import 'package:wechat_flutter/im/entity/i_contact_info_entity.dart';
-import 'package:wechat_flutter/im/entity/i_person_info_entity.dart';
-import 'package:wechat_flutter/im/entity/person_info_entity.dart';
-import 'package:flutter/material.dart';
-import 'package:wechat_flutter/im/friend_handle.dart';
-import 'package:wechat_flutter/im/info_handle.dart';
-import 'dart:convert';
-
-import 'package:wechat_flutter/tools/wechat_flutter.dart';
-import 'package:dim/pinyin/pinyin_helper.dart';
class UserData {
UserData({
- @required this.avatar,
- @required this.name,
- @required this.identifier,
- @required this.isAdd,
+ required this.avatar,
+ required this.name,
+ required this.identifier,
+ required this.isAdd,
});
final String avatar;
@@ -64,51 +54,4 @@ class UserDataPageGet {
'134',
'139',
];
-
- listUserData() async {
- List<UserData> userData = new List<UserData>();
- for (int i = 0; i < ids.length; i++) {
- final profile = await getUsersProfile([ids[i]]);
- List<dynamic> profileData = json.decode(profile);
- for (int i = 0; i < profileData.length; i++) {
- String avatar;
- String name;
- String identifier;
- if (Platform.isIOS) {
- IPersonInfoEntity info = IPersonInfoEntity.fromJson(profileData[i]);
- identifier = info.identifier;
- if (strNoEmpty(info?.faceURL) && info?.faceURL != '[]') {
- avatar = info?.faceURL ?? defIcon;
- } else {
- avatar = defIcon;
- }
- name =
- strNoEmpty(info?.nickname) ? info?.nickname : identifier ?? '未知';
- } else {
- PersonInfoEntity info = PersonInfoEntity.fromJson(profileData[i]);
- identifier = info.identifier;
- if (strNoEmpty(info?.faceUrl) && info?.faceUrl != '[]') {
- avatar = info?.faceUrl ?? defIcon;
- } else {
- avatar = defIcon;
- }
- name =
- strNoEmpty(info?.nickName) ? info?.nickName : identifier ?? '未知';
- }
-
- final user = await SharedUtil.instance.getString(Keys.account);
- final result = await getContactsFriends(user);
- userData.insert(
- 0,
- new UserData(
- avatar: avatar,
- name: name,
- identifier: identifier,
- isAdd: result.toString().contains(identifier),
- ),
- );
- }
- }
- return userData;
- }
}
diff --git a/lib/im/search_handle.dart b/lib/im/search_handle.dart
deleted file mode 100644
index 8b13789..0000000
--- a/lib/im/search_handle.dart
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/lib/im/send_handle.dart b/lib/im/send_handle.dart
deleted file mode 100644
index 4f59e0f..0000000
--- a/lib/im/send_handle.dart
+++ /dev/null
@@ -1,13 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-
-import 'package:wechat_flutter/tools/wechat_flutter.dart';
-
-Future<void> sendTextMsg(String id, int type, String context) async {
- try {
- var result = await im.sendTextMessages(id, context, type: type);
- debugPrint('发送消息结果 ===> $result');
- } on PlatformException {
- debugPrint("发送消息失败");
- }
-}
diff --git a/lib/im/util/im_response_tip_util.dart b/lib/im/util/im_response_tip_util.dart
new file mode 100644
index 0000000..82128b8
--- /dev/null
+++ b/lib/im/util/im_response_tip_util.dart
@@ -0,0 +1,26 @@
+import 'package:wechat_flutter/tools/commom/check.dart';
+
+class ImResponseTipUtil {
+ /// 使用返回代码拿到提示结果
+ static String getInfoOResultCode(int? code, [String? desc]) {
+ print("ImResponseTipUtil::getInfoOResultCode::$code");
+ if (code == 30001) {
+ return "对方已经是好友了";
+ } else if (code == 30014) {
+ return "对方的好友数已达系统上限";
+ } else if (code == 30539) {
+ return "等待对方通过好友申请";
+ } else if (code == 10015) {
+ return "群组不存在或已经被解散。";
+ } else if (code == 30010) {
+ return "自己的好友数已达系统上限。";
+ } else if (code == 10013) {
+ return "你已经是群成员啦。";
+ } else {
+ if (strNoEmpty(desc)) {
+ return desc!;
+ }
+ return "出现错误";
+ }
+ }
+}
diff --git a/lib/main.dart b/lib/main.dart
index b768c45..7a3954f 100755
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,29 +1,38 @@
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
-import 'package:wechat_flutter/config/provider_config.dart';
+import 'package:logging/logging.dart';
+import 'package:wechat_flutter/tools/config/provider_config.dart';
import 'package:wechat_flutter/app.dart';
import 'package:wechat_flutter/tools/data/data.dart';
+import 'package:wechat_flutter/tools/test/live_log_page.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+import 'package:wechat_flutter/video/other/sp_util.dart';
-import 'config/storage_manager.dart';
+import 'tools/config/storage_manager.dart';
+
+Logger get q1Logger => Logger.root;
void main() async {
/// 确保初始化
WidgetsFlutterBinding.ensureInitialized();
- /// 数据初始化
- await Data.initData();
-
/// 配置初始化
await StorageManager.init();
- /// APP入口并配置Provider
- runApp(ProviderConfig.getInstance().getGlobal(MyApp()));
+ /// sp初始化
+ await SpUtil.perInit();
+
+ /// 数据初始化
+ await Q1Data.initData();
/// 自定义报错页面
ErrorWidget.builder = (FlutterErrorDetails flutterErrorDetails) {
debugPrint(flutterErrorDetails.toString());
- return new Center(child: new Text("App错误，快去反馈给作者!"));
+ return Material(
+ type: MaterialType.transparency,
+ child: new Center(child: new Text("App错误，快去反馈给作者!")),
+ );
};
/// Android状态栏透明
@@ -32,4 +41,17 @@ void main() async {
SystemUiOverlayStyle(statusBarColor: Colors.transparent);
SystemChrome.setSystemUIOverlayStyle(systemUiOverlayStyle);
}
+
+ Logger.root.level = Level.ALL; // defaults to Level.INFO
+ Logger.root.onRecord.listen((record) {
+ final String str =
+ '${strNoEmpty(record.message) ? ": " : ""}${record.message}';
+ LogUtil.vPrint(str);
+ LiveLogPageData.writeData(str);
+ LiveLogPageData.writeData("\n");
+ });
+
+
+ /// APP入口并配置Provider
+ runApp(ProviderConfig.getInstance()!.getGlobal(MyApp()));
}
diff --git a/lib/pages/chat/chat_info_page.dart b/lib/pages/chat/chat_info_page.dart
deleted file mode 100644
index 2ccff7b..0000000
--- a/lib/pages/chat/chat_info_page.dart
+++ /dev/null
@@ -1,121 +0,0 @@
-import 'dart:convert';
-
-import 'package:wechat_flutter/im/entity/i_person_info_entity.dart';
-import 'package:wechat_flutter/im/entity/person_info_entity.dart';
-import 'package:wechat_flutter/im/info_handle.dart';
-import 'package:wechat_flutter/pages/home/search_page.dart';
-import 'package:wechat_flutter/pages/settings/chat_background_page.dart';
-import 'package:wechat_flutter/ui/dialog/confirm_alert.dart';
-import 'package:wechat_flutter/ui/item/chat_mamber.dart';
-import 'package:wechat_flutter/ui/orther/label_row.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/cupertino.dart';
-
-import 'package:wechat_flutter/tools/wechat_flutter.dart';
-
-class ChatInfoPage extends StatefulWidget {
- final String id;
-
- ChatInfoPage(this.id);
-
- @override
- _ChatInfoPageState createState() => _ChatInfoPageState();
-}
-
-class _ChatInfoPageState extends State<ChatInfoPage> {
- var model;
-
- bool isRemind = false;
- bool isTop = false;
- bool isDoNotDisturb = true;
-
- Widget buildSwitch(item) {
- return new LabelRow(
- label: item['label'],
- margin: item['label'] == '消息免打扰' ? EdgeInsets.only(top: 10.0) : null,
- isLine: item['label'] != '强提醒',
- isRight: false,
- rightW: new SizedBox(
- height: 25.0,
- child: new CupertinoSwitch(
- value: item['value'],
- onChanged: (v) {},
- ),
- ),
- onPressed: () {},
- );
- }
-
- List<Widget> body() {
- List switchItems = [
- {"label": '消息免打扰', 'value': isDoNotDisturb},
- {"label": '置顶聊天', 'value': isTop},
- {"label": '强提醒', 'value': isRemind},
- ];
-
- return [
- new ChatMamBer(model: model),
- new LabelRow(
- label: '查找聊天记录',
- margin: EdgeInsets.only(top: 10.0),
- onPressed: () => routePush(new SearchPage()),
- ),
- new Column(
- children: switchItems.map(buildSwitch).toList(),
- ),
- new LabelRow(
- label: '设置当前聊天背景',
- margin: EdgeInsets.only(top: 10.0),
- onPressed: () => routePush(new ChatBackgroundPage()),
- ),
- new LabelRow(
- label: '清空聊天记录',
- margin: EdgeInsets.only(top: 10.0),
- onPressed: () {
- confirmAlert(
- context,
- (isOK) {
- if (isOK) showToast(context, '敬请期待');
- },
- tips: '确定删除群的聊天记录吗？',
- okBtn: '清空',
- );
- },
- ),
- new LabelRow(
- label: '投诉',
- margin: EdgeInsets.only(top: 10.0),
- onPressed: () => routePush(new WebViewPage(helpUrl, '投诉')),
- ),
- ];
- }
-
- @override
- void initState() {
- super.initState();
- getInfo();
- }
-
- getInfo() async {
- final info = await getUsersProfile([widget.id]);
- List infoList = json.decode(info);
- setState(() {
- if (Platform.isIOS) {
- model = IPersonInfoEntity.fromJson(infoList[0]);
- } else {
- model = PersonInfoEntity.fromJson(infoList[0]);
- }
- });
- }
-
- @override
- Widget build(BuildContext context) {
- return new Scaffold(
- backgroundColor: chatBg,
- appBar: new ComMomBar(title: '聊天信息'),
- body: new SingleChildScrollView(
- child: new Column(children: body()),
- ),
- );
- }
-}
diff --git a/lib/pages/chat/chat_more_page.dart b/lib/pages/chat/chat_more_page.dart
deleted file mode 100644
index b612f61..0000000
--- a/lib/pages/chat/chat_more_page.dart
+++ /dev/null
@@ -1,115 +0,0 @@
-import 'package:camera/camera.dart';
-import 'package:wechat_assets_picker/wechat_assets_picker.dart';
-import 'package:wechat_flutter/im/message_handle.dart';
-import 'package:wechat_flutter/im/send_handle.dart';
-import 'package:wechat_flutter/pages/chat/shoot_page.dart';
-import 'package:wechat_flutter/tools/utils/handle_util.dart';
-import 'package:wechat_flutter/tools/wechat_flutter.dart';
-import 'package:wechat_flutter/ui/card/more_item_card.dart';
-import 'package:flutter/material.dart';
-import 'package:image_picker/image_picker.dart';
-import 'package:photo_manager/photo_manager.dart';
-
-class ChatMorePage extends StatefulWidget {
- final int index;
- final String id;
- final int type;
- final double keyboardHeight;
-
- ChatMorePage({this.index = 0, this.id, this.type, this.keyboardHeight});
-
- @override
- _ChatMorePageState createState() => _ChatMorePageState();
-}
-
-class _ChatMorePageState extends State<ChatMorePage> {
- List data = [
- {"name": "相册", "icon": "assets/images/chat/ic_details_photo.webp"},
- {"name": "拍摄", "icon": "assets/images/chat/ic_details_camera.webp"},
- {"name": "视频通话", "icon": "assets/images/chat/ic_details_media.webp"},
- {"name": "位置", "icon": "assets/images/chat/ic_details_localtion.webp"},
- {"name": "红包", "icon": "assets/images/chat/ic_details_red.webp"},
- {"name": "转账", "icon": "assets/images/chat/ic_details_transfer.webp"},
- {"name": "语音输入", "icon": "assets/images/chat/ic_chat_voice.webp"},
- {"name": "我的收藏", "icon": "assets/images/chat/ic_details_favorite.webp"},
- ];
-
- List dataS = [
- {"name": "名片", "icon": "assets/images/chat/ic_details_card.webp"},
- {"name": "文件", "icon": "assets/images/chat/ic_details_file.webp"},
- ];
-
- List<AssetEntity> assets = <AssetEntity>[];
-
- action(String name) async {
- if (name == '相册') {
- AssetPicker.pickAssets(
- context,
- maxAssets: 9,
- pageSize: 320,
- pathThumbSize: 80,
- gridCount: 4,
- selectedAssets: assets,
- themeColor: Colors.green,
- // textDelegate: DefaultAssetsPickerTextDelegate(),
- routeCurve: Curves.easeIn,
- routeDuration: const Duration(milliseconds: 500),
- ).then((List<AssetEntity> result) {
- result.forEach((AssetEntity element) async {
- sendImageMsg(widget.id, widget.type, file: await element.file,
- callback: (v) {
- if (v == null) return;
- Notice.send(WeChatActions.msg(), v ?? '');
- });
- element.file;
- });
- });
- } else if (name == '拍摄') {
- try {
- List<CameraDescription> cameras;
-
- WidgetsFlutterBinding.ensureInitialized();
- cameras = await availableCameras();
-
- routePush(new ShootPage(cameras));
- } on CameraException catch (e) {
- logError(e.code, e.description);
- }
- } else if (name == '红包') {
- showToast(context, '测试发送红包消息');
- await sendTextMsg('${widget?.id}', widget.type, "测试发送红包消息");
- } else {
- showToast(context, '敬请期待$name');
- }
- }
-
- itemBuild(data) {
- return new Container(
- margin: EdgeInsets.all(20.0),
- padding: EdgeInsets.only(bottom: 20.0),
- child: new Wrap(
- runSpacing: 10.0,
- spacing: 10,
- children: List.generate(data.length, (index) {
- String name = data[index]['name'];
- String icon = data[index]['icon'];
- return new MoreItemCard(
- name: name,
- icon: icon,
- keyboardHeight: widget.keyboardHeight,
- onPressed: () => action(name),
- );
- }),
- ),
- );
- }
-
- @override
- Widget build(BuildContext context) {
- if (widget.index == 0) {
- return itemBuild(data);
- } else {
- return itemBuild(dataS);
- }
- }
-}
diff --git a/lib/pages/chat/chat_page.dart b/lib/pages/chat/chat_page.dart
deleted file mode 100644
index 8431a6c..0000000
--- a/lib/pages/chat/chat_page.dart
+++ /dev/null
@@ -1,284 +0,0 @@
-import 'package:wechat_flutter/im/model/chat_data.dart';
-import 'package:wechat_flutter/pages/chat/chat_more_page.dart';
-import 'package:wechat_flutter/pages/group/group_details_page.dart';
-import 'package:wechat_flutter/ui/chat/chat_details_body.dart';
-import 'package:wechat_flutter/ui/chat/chat_details_row.dart';
-import 'package:wechat_flutter/ui/item/chat_more_icon.dart';
-import 'package:wechat_flutter/ui/view/indicator_page_view.dart';
-
-import 'package:extended_text_field/extended_text_field.dart';
-import 'package:flutter/material.dart';
-import 'package:wechat_flutter/im/send_handle.dart';
-import 'package:wechat_flutter/tools/wechat_flutter.dart';
-import 'package:wechat_flutter/ui/edit/text_span_builder.dart';
-import 'package:wechat_flutter/ui/edit/emoji_text.dart';
-import 'chat_info_page.dart';
-
-enum ButtonType { voice, more }
-
-class ChatPage extends StatefulWidget {
- final String title;
- final int type;
- final String id;
-
- ChatPage({this.id, this.title, this.type = 1});
-
- @override
- _ChatPageState createState() => _ChatPageState();
-}
-
-class _ChatPageState extends State<ChatPage> {
- List<ChatData> chatData = [];
- StreamSubscription<dynamic> _msgStreamSubs;
- bool _isVoice = false;
- bool _isMore = false;
- double keyboardHeight = 270.0;
- bool _emojiState = false;
- String newGroupName;
-
- TextEditingController _textController = TextEditingController();
- FocusNode _focusNode = new FocusNode();
- ScrollController _sC = ScrollController();
- PageController pageC = new PageController();
-
- @override
- void initState() {
- super.initState();
- getChatMsgData();
-
- _sC.addListener(() => FocusScope.of(context).requestFocus(new FocusNode()));
- initPlatformState();
- Notice.addListener(WeChatActions.msg(), (v) => getChatMsgData());
- if (widget.type == 2) {
- Notice.addListener(WeChatActions.groupName(), (v) {
- setState(() => newGroupName = v);
- });
- }
- _focusNode.addListener(() {
- if (_focusNode.hasFocus) _emojiState = false;
- });
- }
-
- Future getChatMsgData() async {
- final str =
- await ChatDataRep().repData(widget?.id ?? widget.title, widget.type);
- List<ChatData> listChat = str;
- chatData.clear();
- chatData..addAll(listChat.reversed);
- if (mounted) setState(() {});
- }
-
- void insertText(String text) {
- var value = _textController.value;
- var start = value.selection.baseOffset;
- var end = value.selection.extentOffset;
- if (value.selection.isValid) {
- String newText = '';
- if (value.selection.isCollapsed) {
- if (end > 0) {
- newText += value.text.substring(0, end);
- }
- newText += text;
- if (value.text.length > end) {
- newText += value.text.substring(end, value.text.length);
- }
- } else {
- newText = value.text.replaceRange(start, end, text);
- end = start;
- }
-
- _textController.value = value.copyWith(
- text: newText,
- selection: value.selection.copyWith(
- baseOffset: end + text.length, extentOffset: end + text.length));
- } else {
- _textController.value = TextEditingValue(
- text: text,
- selection:
- TextSelection.fromPosition(TextPosition(offset: text.length)));
- }
- }
-
- void canCelListener() {
- if (_msgStreamSubs != null) _msgStreamSubs.cancel();
- }
-
- Future<void> initPlatformState() async {
- if (!mounted) return;
-
- if (_msgStreamSubs == null) {
- _msgStreamSubs =
- im.onMessage.listen((dynamic onData) => getChatMsgData());
- }
- }
-
- _handleSubmittedData(String text) async {
- _textController.clear();
- chatData.insert(0, new ChatData(msg: {"text": text}));
- await sendTextMsg('${widget?.id ?? widget.title}', widget.type, text);
- }
-
- onTapHandle(ButtonType type) {
- setState(() {
- if (type == ButtonType.voice) {
- _focusNode.unfocus();
- _isMore = false;
- _isVoice = !_isVoice;
- } else {
- _isVoice = false;
- if (_focusNode.hasFocus) {
- _focusNode.unfocus();
- _isMore = true;
- } else {
- _isMore = !_isMore;
- }
- }
- _emojiState = false;
- });
- }
-
- Widget edit(context, size) {
- // 计算当前的文本需要占用的行数
- TextSpan _text =
- TextSpan(text: _textController.text, style: AppStyles.ChatBoxTextStyle);
-
- TextPainter _tp = TextPainter(
- text: _text,
- textDirection: TextDirection.ltr,
- textAlign: TextAlign.left);
- _tp.layout(maxWidth: size.maxWidth);
-
- return ExtendedTextField(
- specialTextSpanBuilder: TextSpanBuilder(showAtBackground: true),
- onTap: () => setState(() {
- if (_focusNode.hasFocus) _emojiState = false;
- }),
- onChanged: (v) => setState(() {}),
- decoration: InputDecoration(
- border: InputBorder.none, contentPadding: const EdgeInsets.all(5.0)),
- controller: _textController,
- focusNode: _focusNode,
- maxLines: 99,
- cursorColor: const Color(AppColors.ChatBoxCursorColor),
- style: AppStyles.ChatBoxTextStyle,
- );
- }
-
- @override
- Widget build(BuildContext context) {
- if (keyboardHeight == 270.0 &&
- MediaQuery.of(context).viewInsets.bottom != 0) {
- keyboardHeight = MediaQuery.of(context).viewInsets.bottom;
- }
- var body = [
- chatData != null
- ? new ChatDetailsBody(sC: _sC, chatData: chatData)
- : new Spacer(),
- new ChatDetailsRow(
- voiceOnTap: () => onTapHandle(ButtonType.voice),
- onEmojio: () {
- if (_isMore) {
- _emojiState = true;
- } else {
- _emojiState = !_emojiState;
- }
- if (_emojiState) {
- FocusScope.of(context).requestFocus(new FocusNode());
- _isMore = false;
- }
- setState(() {});
- },
- isVoice: _isVoice,
- edit: edit,
- more: new ChatMoreIcon(
- value: _textController.text,
- onTap: () => _handleSubmittedData(_textController.text),
- moreTap: () => onTapHandle(ButtonType.more),
- ),
- id: widget.id,
- type: widget.type,
- ),
- new Visibility(
- visible: _emojiState,
- child: emojiWidget(),
- ),
- new Container(
- height: _isMore && !_focusNode.hasFocus ? keyboardHeight : 0.0,
- width: winWidth(context),
- color: Color(AppColors.ChatBoxBg),
- child: new IndicatorPageView(
- pageC: pageC,
- pages: List.generate(2, (index) {
- return new ChatMorePage(
- index: index,
- id: widget.id,
- type: widget.type,
- keyboardHeight: keyboardHeight,
- );
- }),
- ),
- ),
- ];
-
- var rWidget = [
- new InkWell(
- child: new Image.asset('assets/images/right_more.png'),
- onTap: () => routePush(widget.type == 2
- ? new GroupDetailsPage(
- widget?.id ?? widget.title,
- callBack: (v) {},
- )
- : new ChatInfoPage(widget.id)),
- )
- ];
-
- return Scaffold(
- appBar: new ComMomBar(
- title: newGroupName ?? widget.title, rightDMActions: rWidget),
- body: new MainInputBody(
- onTap: () => setState(
- () {
- _isMore = false;
- _emojiState = false;
- },
- ),
- decoration: BoxDecoration(color: chatBg),
- child: new Column(children: body),
- ),
- );
- }
-
- Widget emojiWidget() {
- return new GestureDetector(
- child: new SizedBox(
- height: _emojiState ? keyboardHeight : 0,
- child: GridView.builder(
- gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
- crossAxisCount: 7, crossAxisSpacing: 10.0, mainAxisSpacing: 10.0),
- scrollDirection: Axis.horizontal,
- itemBuilder: (context, index) {
- return GestureDetector(
- child: Image.asset(EmojiUitl.instance.emojiMap["[${index + 1}]"]),
- behavior: HitTestBehavior.translucent,
- onTap: () {
- insertText("[${index + 1}]");
- },
- );
- },
- itemCount: EmojiUitl.instance.emojiMap.length,
- padding: EdgeInsets.all(5.0),
- ),
- ),
- onTap: () {},
- );
- }
-
- @override
- void dispose() {
- super.dispose();
- canCelListener();
- Notice.removeListenerByEvent(WeChatActions.msg());
- Notice.removeListenerByEvent(WeChatActions.groupName());
- _sC.dispose();
- }
-}
diff --git a/lib/pages/common/chat/chat_info_page.dart b/lib/pages/common/chat/chat_info_page.dart
new file mode 100644
index 0000000..303b603
--- /dev/null
+++ b/lib/pages/common/chat/chat_info_page.dart
@@ -0,0 +1,112 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_user_full_info.dart';
+import 'package:wechat_flutter/im/im_handle/Im_api.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+import 'package:wechat_flutter/ui/item/chat_mamber.dart';
+import 'package:wechat_flutter/ui/orther/label_row.dart';
+
+class ChatInfoPage extends StatefulWidget {
+ final String? id;
+
+ ChatInfoPage(this.id);
+
+ @override
+ _ChatInfoPageState createState() => _ChatInfoPageState();
+}
+
+class _ChatInfoPageState extends State<ChatInfoPage> {
+ bool isRemind = false;
+ bool isTop = false;
+ bool isDoNotDisturb = true;
+
+ V2TimUserFullInfo? info;
+
+ @override
+ void initState() {
+ super.initState();
+ getInfo();
+ }
+
+ /// 获取基本信息
+ Future getInfo() async {
+ info = (await ImApi.getUsersInfo([widget.id!]))![0];
+ setState(() {});
+ }
+
+ Widget buildSwitch(item) {
+ return new LabelRow(
+ label: item['label'],
+ margin: item['label'] == '消息免打扰' ? EdgeInsets.only(top: 10.0) : null,
+ isLine: item['label'] != '强提醒',
+ isRight: false,
+ rightW: new SizedBox(
+ height: 25.0,
+ child: new CupertinoSwitch(
+ value: item['value'],
+ onChanged: (v) {},
+ ),
+ ),
+ onPressed: () {},
+ );
+ }
+
+ List<Widget> body() {
+ List switchItems = [
+ // {"label": '消息免打扰', 'value': isDoNotDisturb},
+ // {"label": '置顶聊天', 'value': isTop},
+ // {"label": '强提醒', 'value': isRemind},
+ ];
+
+ if (info == null) {
+ return [];
+ }
+
+ return [
+ new ChatMamBer(info),
+ // new LabelRow(
+ // label: '查找聊天记录',
+ // margin: EdgeInsets.only(top: 10.0),
+ // onPressed: () => Get.to(new SearchPage()),
+ // ),
+ new Column(
+ children: switchItems.map(buildSwitch).toList(),
+ ),
+ // new LabelRow(
+ // label: '设置当前聊天背景',
+ // margin: EdgeInsets.only(top: 10.0),
+ // onPressed: () => Get.to(new ChatBackgroundPage()),
+ // ),
+ // new LabelRow(
+ // label: '清空聊天记录',
+ // margin: EdgeInsets.only(top: 10.0),
+ // onPressed: () {
+ // confirmAlert(
+ // context,
+ // (isOK) {
+ // if (isOK) q1Toast( '敬请期待');
+ // },
+ // tips: '确定删除群的聊天记录吗？',
+ // okBtn: '清空',
+ // );
+ // },
+ // ),
+ // new LabelRow(
+ // label: '投诉',
+ // margin: EdgeInsets.only(top: 10.0),
+ // onPressed: () => Get.to(new WebViewPage(helpUrl, '投诉')),
+ // ),
+ ];
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return new Scaffold(
+ backgroundColor: chatBg,
+ appBar: new ComMomBar(title: '聊天信息'),
+ body: new SingleChildScrollView(
+ child: new Column(children: body()),
+ ),
+ );
+ }
+}
diff --git a/lib/pages/common/chat/chat_more_page.dart b/lib/pages/common/chat/chat_more_page.dart
new file mode 100644
index 0000000..c22eeff
--- /dev/null
+++ b/lib/pages/common/chat/chat_more_page.dart
@@ -0,0 +1,235 @@
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+import 'package:photo_manager/photo_manager.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_message.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_user_full_info.dart';
+import 'package:wechat_assets_picker/wechat_assets_picker.dart';
+import 'package:wechat_flutter/im/im_handle/im_msg_api.dart';
+import 'package:wechat_flutter/tools/eventbus/msg_bus.dart';
+import 'package:wechat_flutter/tools/utils/file_util.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+import 'package:wechat_flutter/ui/call/select_call_type_dialog.dart';
+import 'package:wechat_flutter/ui/card/more_item_card.dart';
+import 'package:wechat_camera_picker/wechat_camera_picker.dart';
+import 'package:wechat_flutter/video/float/float_view/view.dart';
+import 'package:wechat_flutter/video/impl/live_util.dart';
+import 'package:wechat_flutter/video/model/channel_entity.dart';
+import 'package:wechat_flutter/video/msg/chat_msg_mixin.dart';
+import 'package:wechat_flutter/video/msg/live_msg_event.dart';
+
+class ChatMorePage extends StatefulWidget {
+ final int index;
+ final String? id;
+ final int? type;
+ final double? keyboardHeight;
+
+ ChatMorePage({this.index = 0, this.id, this.type, this.keyboardHeight});
+
+ @override
+ _ChatMorePageState createState() => _ChatMorePageState();
+}
+
+class _ChatMorePageState extends State<ChatMorePage> {
+ int channelId = 0;
+
+ List data = [
+ {"name": "相册", "icon": "assets/images/chat/ic_details_photo.webp"},
+ {"name": "拍摄", "icon": "assets/images/chat/ic_details_camera.webp"},
+ {"name": "视频通话", "icon": "assets/images/chat/ic_details_media.webp"},
+ {"name": "位置", "icon": "assets/images/chat/ic_details_localtion.webp"},
+ {"name": "红包", "icon": "assets/images/chat/ic_details_red.webp"},
+ {"name": "转账", "icon": "assets/images/chat/ic_details_transfer.webp"},
+ {"name": "语音输入", "icon": "assets/images/chat/ic_chat_voice.webp"},
+ {"name": "我的收藏", "icon": "assets/images/chat/ic_details_favorite.webp"},
+ ];
+
+ List dataS = [
+ {"name": "名片", "icon": "assets/images/chat/ic_details_card.webp"},
+ {"name": "文件", "icon": "assets/images/chat/ic_details_file.webp"},
+ ];
+
+ List<AssetEntity> assets = <AssetEntity>[];
+
+ itemBuild(data) {
+ return new Container(
+ margin: EdgeInsets.symmetric(horizontal: 20),
+ padding: EdgeInsets.only(bottom: 20.0),
+ child: new Wrap(
+ runSpacing: 10.0,
+ spacing: 10,
+ children: List.generate(data.length, (index) {
+ String? name = data[index]['name'];
+ String? icon = data[index]['icon'];
+ return new MoreItemCard(
+ name: name,
+ icon: icon,
+ keyboardHeight: widget.keyboardHeight,
+ onPressed: () => action(name),
+ );
+ }),
+ ),
+ );
+ }
+
+ action(String? name) async {
+ if (name == '相册') {
+ AssetPicker.pickAssets(
+ context,
+ pickerConfig: AssetPickerConfig(
+ maxAssets: 9,
+ pageSize: 320,
+ gridCount: 4,
+ selectedAssets: assets,
+ themeColor: MyTheme.themeColor(),
+ textDelegate: AssetPickerTextDelegate(),
+ ),
+ ).then((List<AssetEntity>? result) {
+ /// 没有选择文件
+ if (result == null) {
+ return;
+ }
+ result.forEach((AssetEntity element) async {
+ /// 媒体文件类型，1=图片；2=视频；
+ final int mediaType = FileUtil.getInstance()!
+ .mediaTypeOfPath((await element.file)!.path);
+
+ V2TimMessage? v;
+
+ /// 判断是图片还是视频
+ if (mediaType == 1) {
+ v = await ImMsgApi.sendImageMessage(
+ (await element.file)!.path,
+ receiver: widget.type == 1 ? widget.id! : "",
+ groupID: widget.type != 1 ? widget.id! : "",
+ );
+ } else {
+ v = await ImMsgApi.sendVideoMessage(
+ (await element.file)!.path,
+ receiver: widget.type == 1 ? widget.id : null,
+ groupID: widget.type != 1 ? widget.id : null,
+ );
+ }
+ if (v == null) return;
+ Notice.send(WeChatActions.msg(), '');
+
+ /// 事件总线发送，让其他地方同步消息
+ msgBus.fire(MsgBusModel(widget.id));
+ });
+ });
+ } else if (name == '拍摄') {
+ final AssetEntity? assetEntity = await CameraPicker.pickFromCamera(
+ context,
+ pickerConfig: const CameraPickerConfig(enableRecording: true),
+ );
+
+ if (assetEntity == null || !strNoEmpty((await assetEntity.file)!.path)) {
+ return;
+ }
+
+ V2TimMessage? v;
+
+ /// 判断是图片还是视频
+ if (assetEntity.type == AssetType.image) {
+ v = await ImMsgApi.sendImageMessage(
+ (await assetEntity.file)!.path,
+ receiver: widget.type == 1 ? widget.id! : "",
+ groupID: widget.type != 1 ? widget.id! : "",
+ );
+ } else {
+ v = await ImMsgApi.sendVideoMessage(
+ (await assetEntity.file)!.path,
+ receiver: widget.type == 1 ? widget.id : null,
+ groupID: widget.type != 1 ? widget.id : null,
+ );
+ }
+
+ if (v == null) return;
+ Notice.send(WeChatActions.msg(), '');
+
+ /// 事件总线发送，让其他地方同步消息
+ msgBus.fire(MsgBusModel(widget.id));
+ } else if (name == '视频通话') {
+ final value = await selectCallTypeDialog(context);
+ if (value == null) {
+ return;
+ }
+
+ /// value为0跳转视频通话，否则音频通话
+ String routeName = value == 0
+ ? RouteConfig.videoSinglePage
+ : RouteConfig.audioSinglePage;
+ LiveUtil.checkPermissionThen(
+ () async {
+ Get.toNamed(
+ routeName,
+ arguments: {
+ "call": (callChannelId) {
+ sendVideoChat(callChannelId);
+ },
+ "content": await getLiveMsgUserInfo(),
+ "channelId": "", //一定要传, 否则Get获取参数导致停止
+ },
+ );
+ },
+ );
+ } else if (name == '红包') {
+ q1Toast('测试发送红包消息');
+ // await sendTextMsg('${widget?.id}', widget.type, "测试发送红包消息");
+ } else {
+ q1Toast('敬请期待$name');
+ }
+ }
+
+ /*
+ * 获取直播用户信息
+ * */
+ Future<String> getLiveMsgUserInfo() async {
+ final V2TimUserFullInfo? selfInfo =
+ (await ImApi.getUsersInfo([Q1Data.user()]))?.first;
+ final V2TimUserFullInfo? targetInfo =
+ (await ImApi.getUsersInfo([widget.id!]))?.first;
+
+ // String userAccountSp = await SpUtil().get(KeyConstant.agoraAccount);
+ ChannelEntity channelEntity = ChannelEntity(
+ channelId: channelId,
+ mediaType: "Single",
+ toChatId: widget.id!,
+ toChatName: targetInfo?.nickName ?? '',
+ toAvatar: targetInfo?.faceUrl ?? "",
+ sendChatId: selfInfo?.userID ?? "",
+ sendChatName: selfInfo?.nickName ?? '',
+ sendAvatarUrl: selfInfo?.faceUrl ?? '',
+ sendAgoraUid: Q1Data.user(),
+ groupId: "",
+ );
+ return json.encode(channelEntity);
+ }
+
+ void sendVoiceChat(int channelIdValue) async {
+ channelId = channelIdValue;
+ if (channelId == 0) return;
+
+ /// 发送隐藏消息【单人音频】
+ ChatMsgUtil.sendHideMsg(channelIdValue, LiveMsgEventSingleHide.senderSend,
+ LivePageType.singleAudio, widget.id!, false);
+ }
+
+ void sendVideoChat(int channelIdValue) async {
+ channelId = channelIdValue;
+ if (channelId == 0) return;
+
+ /// 发送隐藏消息【单人视频】
+ ChatMsgUtil.sendHideMsg(channelIdValue, LiveMsgEventSingleHide.senderSend,
+ LivePageType.singleVideo, widget.id!, false);
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ if (widget.index == 0) {
+ return itemBuild(data);
+ } else {
+ return itemBuild(dataS);
+ }
+ }
+}
diff --git a/lib/pages/common/chat/chat_page/chat_binding.dart b/lib/pages/common/chat/chat_page/chat_binding.dart
new file mode 100644
index 0000000..5d4ad3d
--- /dev/null
+++ b/lib/pages/common/chat/chat_page/chat_binding.dart
@@ -0,0 +1,10 @@
+import 'package:get/get.dart';
+
+import 'chat_logic.dart';
+
+class ChatBinding extends Bindings {
+ @override
+ void dependencies() {
+ Get.lazyPut(() => ChatLogic());
+ }
+}
diff --git a/lib/pages/common/chat/chat_page/chat_logic.dart b/lib/pages/common/chat/chat_page/chat_logic.dart
new file mode 100644
index 0000000..77550b0
--- /dev/null
+++ b/lib/pages/common/chat/chat_page/chat_logic.dart
@@ -0,0 +1,219 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:provider/provider.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_text_elem.dart';
+import 'package:wechat_flutter/im/util/im_response_tip_util.dart';
+import 'package:wechat_flutter/tools/chat/chat_memory.dart';
+import 'package:wechat_flutter/tools/provider/global_model.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+enum ButtonType { voice, more }
+
+class ChatLogic extends GetxController {
+ String? title;
+ int? type = 1;
+ String? id;
+
+ List<V2TimMessage>? chatData = [];
+ StreamSubscription<dynamic>? _msgStreamSubs;
+ bool isVoice = false;
+ bool isMore = false;
+ bool emojiState = false;
+ String? newGroupName;
+
+ /// 最新消息id【可空】
+ String? lastMsgID;
+
+ TextEditingController textController = TextEditingController();
+ FocusNode focusNode = new FocusNode();
+ ScrollController sC = ScrollController();
+ PageController pageC = new PageController();
+
+ @override
+ void onInit() {
+ super.onInit();
+ title = Get.arguments['title'];
+ type = Get.arguments['type'];
+ id = Get.arguments['id'];
+ if (ChatMemory.chatData.containsKey(id)) {
+ chatData = ChatMemory.chatData[id];
+ }
+ }
+
+ @override
+ void onReady() {
+ super.onReady();
+
+ getChatMsgData();
+
+ /// 需要使用手势方式写，这种方式太卡了
+ // sC.addListener(() => FocusScope.of(context).requestFocus(new FocusNode()));
+ initPlatformState();
+ Notice.addListener(WeChatActions.msg(), (v) {
+ lastMsgID = null;
+ getChatMsgData();
+ });
+ if (type == 2) {
+ Notice.addListener(WeChatActions.groupName(), (v) {
+ newGroupName = v;
+ update();
+ });
+ }
+ focusNode.addListener(() {
+ if (focusNode.hasFocus) emojiState = false;
+ });
+ }
+
+ Future getChatMsgData() async {
+ if (type == 1) {
+ chatData =
+ (await ImMsgApi.getC2CHistoryMessageList(id!, lastMsgID)) ?? [];
+ if (listNoEmpty(chatData)) {
+ lastMsgID = chatData!.last.msgID;
+ }
+ } else {
+ V2TimValueCallback<List<V2TimMessage>> result =
+ await ImMsgApi.getGroupHistoryMessageList(id ?? title!);
+
+ if (result.code != 200 && result.code != 0) {
+ q1Toast(ImResponseTipUtil.getInfoOResultCode(result.code));
+ return;
+ }
+
+ chatData = result.data;
+ if (listNoEmpty(chatData)) {
+ lastMsgID = chatData!.last.msgID;
+ }
+ }
+ ChatMemory.chatData[id!] = chatData;
+ update();
+ }
+
+ void insertText(String text) {
+ var value = textController.value;
+ var start = value.selection.baseOffset;
+ var end = value.selection.extentOffset;
+ if (value.selection.isValid) {
+ String newText = '';
+ if (value.selection.isCollapsed) {
+ if (end > 0) {
+ newText += value.text.substring(0, end);
+ }
+ newText += text;
+ if (value.text.length > end) {
+ newText += value.text.substring(end, value.text.length);
+ }
+ } else {
+ newText = value.text.replaceRange(start, end, text);
+ end = start;
+ }
+
+ textController.value = value.copyWith(
+ text: newText,
+ selection: value.selection.copyWith(
+ baseOffset: end + text.length, extentOffset: end + text.length));
+ } else {
+ textController.value = TextEditingValue(
+ text: text,
+ selection:
+ TextSelection.fromPosition(TextPosition(offset: text.length)));
+ }
+
+ /// 这里的SetState仅仅为了能显示和隐藏表情发送按钮
+ update();
+ }
+
+ /// 删除表情等
+ void deleteText() {
+ var value = textController.value;
+ var end = value.selection.extentOffset;
+
+ if (value.selection.isValid) {
+ String text = textController.value.text.endsWith("]") &&
+ textController.value.text.contains("[")
+ ? "[" + textController.value.text.split('[').last
+ : textController.value.text.substring(
+ textController.value.text.length - 1,
+ textController.value.text.length);
+
+ textController.value = value.copyWith(
+ text: textController.value.text
+ .substring(0, textController.value.text.length - text.length),
+ selection: value.selection.copyWith(
+ baseOffset: end - text.length, extentOffset: end - text.length));
+ }
+
+ /// 这里的SetState仅仅为了能显示和隐藏表情发送按钮
+ update();
+ }
+
+ void canCelListener() {
+ if (_msgStreamSubs != null) _msgStreamSubs!.cancel();
+ }
+
+ Future<void> initPlatformState() async {
+ // if (!mounted) return;
+
+ if (_msgStreamSubs == null) {
+ // _msgStreamSubs =
+ // im.onMessage.listen((dynamic onData) => getChatMsgData());
+ }
+ }
+
+ handleSubmittedData(BuildContext context) async {
+ String text = textController.text;
+ final model = Provider.of<GlobalModel>(context, listen: false);
+ textController.clear();
+ chatData!.insert(
+ 0,
+ new V2TimMessage(
+ textElem: V2TimTextElem(text: text),
+ sender: strNoEmpty(Q1Data.user())
+ ? Q1Data.user()
+ : (await SharedUtil.instance!.getString(Keys.account)),
+ id: '1',
+ faceUrl: model.avatar,
+ elemType: 9),
+ );
+ String senToUserId = '${id ?? title}';
+ await ImMsgApi.sendTextMessage(
+ text,
+ receiver: type == 1 ? senToUserId : "",
+ groupID: type != 1 ? senToUserId : "",
+ );
+ update();
+
+ /// 事件总线发送，让其他地方同步消息
+ Future.delayed(Duration(milliseconds: 1000)).then((value) {
+ msgBus.fire(MsgBusModel(id));
+ });
+ }
+
+ onTapHandle(ButtonType type) {
+ if (type == ButtonType.voice) {
+ focusNode.unfocus();
+ isMore = false;
+ isVoice = !isVoice;
+ } else {
+ isVoice = false;
+ if (focusNode.hasFocus) {
+ focusNode.unfocus();
+ isMore = true;
+ } else {
+ isMore = !isMore;
+ }
+ }
+ emojiState = false;
+ update();
+ }
+
+ @override
+ void onClose() {
+ super.onClose();
+
+ canCelListener();
+ Notice.removeListenerByEvent(WeChatActions.msg());
+ Notice.removeListenerByEvent(WeChatActions.groupName());
+ sC.dispose();
+ }
+}
diff --git a/lib/pages/common/chat/chat_page/chat_view.dart b/lib/pages/common/chat/chat_page/chat_view.dart
new file mode 100644
index 0000000..dbcdcd2
--- /dev/null
+++ b/lib/pages/common/chat/chat_page/chat_view.dart
@@ -0,0 +1,250 @@
+import 'package:extended_text_field/extended_text_field.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:wechat_flutter/pages/common/chat/chat_info_page.dart';
+import 'package:wechat_flutter/pages/common/chat/chat_more_page.dart';
+import 'package:wechat_flutter/pages/common/group/group_details_page.dart';
+import 'package:wechat_flutter/tools/config/q1_config.dart';
+import 'package:wechat_flutter/tools/func/func.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+import 'package:wechat_flutter/ui/chat/chat_details_body.dart';
+import 'package:wechat_flutter/ui/chat/chat_details_row.dart';
+import 'package:wechat_flutter/ui/edit/emoji_text.dart';
+import 'package:wechat_flutter/ui/edit/text_span_builder.dart';
+import 'package:wechat_flutter/ui/item/chat_more_icon.dart';
+import 'package:wechat_flutter/ui/view/indicator_page_view.dart';
+import 'package:wechat_flutter/ui_commom/bt/small_button.dart';
+
+import 'chat_logic.dart';
+
+class ChatPage extends StatelessWidget {
+ final logic = Get.find<ChatLogic>();
+
+ Widget edit(context, size) {
+ // 计算当前的文本需要占用的行数
+ TextSpan _text = TextSpan(
+ text: logic.textController.text, style: AppStyles.ChatBoxTextStyle);
+
+ TextPainter _tp = TextPainter(
+ text: _text,
+ textDirection: TextDirection.ltr,
+ textAlign: TextAlign.left);
+ _tp.layout(maxWidth: size.maxWidth);
+
+ return ExtendedTextField(
+ specialTextSpanBuilder: TextSpanBuilder(showAtBackground: true),
+ onTap: () {
+ if (logic.focusNode.hasFocus) logic.emojiState = false;
+ logic.update();
+ },
+ onChanged: (v) => logic.update(),
+ decoration: InputDecoration(
+ border: InputBorder.none, contentPadding: const EdgeInsets.all(5.0)),
+ controller: logic.textController,
+ focusNode: logic.focusNode,
+ maxLines: 99,
+ cursorColor: const Color(AppColors.ChatBoxCursorColor),
+ style: AppStyles.ChatBoxTextStyle,
+ );
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ Widget emojiWidget() {
+ return Stack(
+ children: [
+ new GestureDetector(
+ child: new Container(
+ height: logic.emojiState ? AppConfig.keyboardHeight - 10 : 0,
+ child: GridView.builder(
+ padding:
+ EdgeInsets.only(bottom: 20, left: 20, right: 20, top: 10),
+ gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+ crossAxisCount: 8),
+ scrollDirection: Axis.vertical,
+ itemBuilder: (context, index) {
+ return MyInkWell(
+ child: Padding(
+ padding: EdgeInsets.symmetric(horizontal: 7.5),
+ child: Image.asset(
+ EmojiUitl.instance!.emojiMap["[${index + 1}]"]!),
+ ),
+ onTap: () {
+ logic.insertText("[${index + 1}]");
+ },
+ );
+ },
+ itemCount: EmojiUitl.instance!.emojiMap.length,
+ ),
+ ),
+ onTap: () {},
+ ),
+ Positioned(
+ bottom: 0,
+ right: 0,
+ child: Container(
+ margin: EdgeInsets.only(bottom: 30),
+ decoration: BoxDecoration(
+ color: Color(AppColors.ChatBoxBg),
+ boxShadow: [
+ BoxShadow(
+ color: Color(AppColors.ChatBoxBg),
+ blurRadius: 25,
+ spreadRadius: 30,
+ ),
+ ],
+ ),
+ child: () {
+ bool canClick = strNoEmpty(logic.textController.text);
+ return ButtonBar(
+ children: [
+ SmallButton(
+ margin: EdgeInsets.all(0),
+ padding: EdgeInsets.all(0),
+ width: 60,
+ isCanMultipleClick: true,
+ onPressed: () {
+ if (!canClick) {
+ return;
+ }
+ logic.deleteText();
+ },
+ color: Colors.white,
+ child: Icon(
+ Icons.delete_forever_rounded,
+ color: canClick
+ ? Colors.black
+ : Colors.black.withOpacity(0.2),
+ ),
+ ),
+ Space(
+ width: 5,
+ ),
+ SmallButton(
+ margin: EdgeInsets.all(0),
+ padding: EdgeInsets.all(0),
+ width: 60,
+ color: canClick ? null : Colors.white,
+ onPressed: () {
+ if (!canClick) {
+ return;
+ }
+ logic.handleSubmittedData(context);
+ },
+ child: Text(
+ '发送',
+ style: TextStyle(
+ color: canClick
+ ? Colors.white
+ : Colors.black.withOpacity(0.2)),
+ ),
+ ),
+ ],
+ );
+ }(),
+ ),
+ )
+ ],
+ );
+ }
+
+ return Scaffold(
+ appBar: new ComMomBar(
+ title: logic.newGroupName ?? logic.title,
+ rightDMActions: [
+ new InkWell(
+ child: new Image.asset('assets/images/right_more.png'),
+ onTap: () => Get.to(logic.type == 2
+ ? new GroupDetailsPage(
+ logic.id ?? logic.title,
+ callBack: (v) {},
+ )
+ : new ChatInfoPage(logic.id)),
+ )
+ ],
+ ),
+ body: GetBuilder<ChatLogic>(
+ builder: (logic) {
+ return new MainInputBody(
+ onTap: () {
+ logic.isMore = false;
+ logic.emojiState = false;
+ logic.update();
+ },
+ decoration: BoxDecoration(color: chatBg),
+ child: new Column(
+ children: [
+ logic.chatData != null
+ ? new ChatDetailsBody(
+ sC: logic.sC, chatData: logic.chatData)
+ : new Spacer(),
+ Container(
+ color: Color(AppColors.ChatBoxBg),
+ child: SafeArea(
+ bottom: !logic.emojiState,
+ child: Column(
+ children: [
+ new ChatDetailsRow(
+ voiceOnTap: () => logic.onTapHandle(ButtonType.voice),
+ onEmojio: () {
+ if (logic.isMore) {
+ logic.emojiState = true;
+ } else {
+ logic.emojiState = !logic.emojiState;
+ }
+ if (logic.emojiState) {
+ FocusScope.of(context)
+ .requestFocus(new FocusNode());
+ logic.isMore = false;
+ }
+ logic.update();
+ },
+ isVoice: logic.isVoice,
+ edit: edit,
+ more: new ChatMoreIcon(
+ value: logic.textController.text,
+ onTap: () => logic.handleSubmittedData(context),
+ moreTap: () => logic.onTapHandle(ButtonType.more),
+ isEmoji: logic.emojiState,
+ ),
+ id: logic.id,
+ type: logic.type,
+ ),
+ new Visibility(
+ visible: logic.emojiState,
+ child: emojiWidget(),
+ ),
+ new Container(
+ height: logic.isMore &&
+ !logic.focusNode.hasFocus &&
+ !logic.emojiState
+ ? AppConfig.keyboardHeight -
+ Q1Config.chatRowHeight -
+ 30
+ : 0.0,
+ width: FrameSize.winWidth(),
+ color: Color(AppColors.ChatBoxBg),
+ child: new IndicatorPageView(
+ pageC: logic.pageC,
+ pages: List.generate(2, (index) {
+ return new ChatMorePage(
+ index: index,
+ id: logic.id,
+ type: logic.type,
+ keyboardHeight: AppConfig.keyboardHeight,
+ );
+ }),
+ ),
+ ),
+ ],
+ ),
+ ),
+ ),
+ ],
+ ),
+ );
+ },
+ ),
+ );
+ }
+}
diff --git a/lib/pages/chat/more_info_page.dart b/lib/pages/common/chat/more_info_page.dart
similarity index 100%
rename from lib/pages/chat/more_info_page.dart
rename to lib/pages/common/chat/more_info_page.dart
diff --git a/lib/pages/common/chat/search_record_page.dart b/lib/pages/common/chat/search_record_page.dart
new file mode 100644
index 0000000..f8cd4cb
--- /dev/null
+++ b/lib/pages/common/chat/search_record_page.dart
@@ -0,0 +1,120 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_message.dart';
+import 'package:wechat_flutter/im/im_handle/im_msg_api.dart';
+import 'package:wechat_flutter/pages/common/chat/search_record_result_page.dart';
+
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+class SearchRecordPage extends StatefulWidget {
+ final bool isGroup;
+ final String id;
+
+ SearchRecordPage(this.isGroup, this.id);
+
+ @override
+ _SearchRecordPageState createState() => _SearchRecordPageState();
+}
+
+class _SearchRecordPageState extends State<SearchRecordPage> {
+ TextEditingController _searchC = new TextEditingController();
+
+ List words = ['群成员', '日期', '图片及视频', '文件', '链接', '音乐', '交易', '小程序'];
+
+ RxList<V2TimMessage> data = <V2TimMessage>[].obs;
+
+ @override
+ void initState() {
+ super.initState();
+ print("isGroup:${widget.isGroup}，id:${widget.id}");
+ }
+
+ /// 开始搜索
+ Future search() async {
+ final List<V2TimMessage>? searResult =
+ await ImMsgApi.searchLocaltMessageOfGroup(_searchC.text, widget.id);
+ if (searResult == null || searResult.length < 1) {
+ q1Toast( "未找到数据");
+ return;
+ }
+ print("搜索结果::${searResult.length}");
+ data.value = searResult;
+ }
+
+ Widget wordView(item) {
+ return new InkWell(
+ child: new Container(
+ width: FrameSize.winWidth() / 3,
+ alignment: Alignment.center,
+ margin: EdgeInsets.symmetric(vertical: 15.0),
+ child: new Text(
+ item,
+ style: TextStyle(color: tipColor),
+ ),
+ ),
+ onTap: () => q1Toast( '$item功能小编正在开发'),
+ );
+ }
+
+ Widget body() {
+ return Obx(() {
+ if (listNoEmpty(data)) {
+ return SearchRecordResultPage(data);
+ } else {
+ return new Column(
+ crossAxisAlignment: CrossAxisAlignment.center,
+ children: <Widget>[
+ new Padding(
+ padding: EdgeInsets.symmetric(vertical: 10.0),
+ child: new Text(
+ '搜索指定内容',
+ style: TextStyle(color: mainTextColor),
+ ),
+ ),
+ new Wrap(
+ children: words.map(wordView).toList(),
+ ),
+ ],
+ );
+ }
+ });
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ var searchView = new Row(
+ children: <Widget>[
+ new Expanded(
+ child: new TextField(
+ controller: _searchC,
+ style: TextStyle(textBaseline: TextBaseline.alphabetic),
+ decoration: InputDecoration(
+ border: InputBorder.none,
+ hintText: '搜索',
+ ),
+ onSubmitted: (v) {
+ search();
+ },
+ onChanged: (text) {
+ setState(() {});
+ },
+ ),
+ ),
+ strNoEmpty(_searchC.text)
+ ? new InkWell(
+ child: new Image.asset('assets/images/ic_delete.webp'),
+ onTap: () {
+ _searchC.text = '';
+ setState(() {});
+ },
+ )
+ : new Container()
+ ],
+ );
+ return new Scaffold(
+ backgroundColor: appBarColor,
+ appBar: new ComMomBar(titleW: searchView),
+ body: new SizedBox(width: FrameSize.winWidth(), child: body()),
+ );
+ }
+}
diff --git a/lib/pages/common/chat/search_record_result_page.dart b/lib/pages/common/chat/search_record_result_page.dart
new file mode 100644
index 0000000..6237cc5
--- /dev/null
+++ b/lib/pages/common/chat/search_record_result_page.dart
@@ -0,0 +1,32 @@
+import 'package:flutter/material.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_message.dart';
+import 'package:wechat_flutter/tools/commom/check.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+class SearchRecordResultPage extends StatefulWidget {
+ List<V2TimMessage> messageSearchResultItems;
+
+ SearchRecordResultPage(this.messageSearchResultItems);
+
+ @override
+ State<SearchRecordResultPage> createState() => _SearchRecordResultPageState();
+}
+
+class _SearchRecordResultPageState extends State<SearchRecordResultPage> {
+ @override
+ Widget build(BuildContext context) {
+ List<V2TimMessage> msgList = widget.messageSearchResultItems;
+ return ListView.builder(
+ itemCount: msgList.length,
+ itemBuilder: (context, index) {
+ V2TimMessage model = msgList[index];
+ return ListTile(
+ title: Text(
+ strNoEmpty(model.nameCard) ? model.nameCard! : model.nickName!),
+ leading: ImageView(img: model.faceUrl),
+ subtitle: Text(model.textElem != null ? model.textElem!.text! : ""),
+ );
+ },
+ );
+ }
+}
diff --git a/lib/pages/chat/set_remark_page.dart b/lib/pages/common/chat/set_remark_page.dart
similarity index 94%
rename from lib/pages/chat/set_remark_page.dart
rename to lib/pages/common/chat/set_remark_page.dart
index 2f85c6a..847a358 100644
--- a/lib/pages/chat/set_remark_page.dart
+++ b/lib/pages/common/chat/set_remark_page.dart
@@ -12,7 +12,7 @@ class _SetRemarkPageState extends State<SetRemarkPage> {
TextEditingController _tc = new TextEditingController();
FocusNode _f = new FocusNode();
- String initContent;
+ String? initContent;
Widget body() {
return new SingleChildScrollView(
@@ -40,7 +40,7 @@ class _SetRemarkPageState extends State<SetRemarkPage> {
radius: 4.0,
onTap: () {
if (!strNoEmpty(_tc.text)) {
- showToast(context, '输入的内容不能为空');
+ q1Toast( '输入的内容不能为空');
return;
}
},
diff --git a/lib/pages/chat/shoot_page.dart b/lib/pages/common/chat/shoot_page.dart
similarity index 50%
rename from lib/pages/chat/shoot_page.dart
rename to lib/pages/common/chat/shoot_page.dart
index 8c07099..4af36b8 100644
--- a/lib/pages/chat/shoot_page.dart
+++ b/lib/pages/common/chat/shoot_page.dart
@@ -1,60 +1,56 @@
-import 'package:camera/camera.dart';
-import 'package:wechat_flutter/tools/utils/handle_util.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
import 'package:video_player/video_player.dart';
-import 'package:path_provider/path_provider.dart';
-
class ShootPage extends StatefulWidget {
- final List<CameraDescription> cameras;
+ // final List<CameraDescription> cameras;
- ShootPage(this.cameras);
+ // ShootPage(this.cameras);
@override
_ShootPageState createState() => _ShootPageState();
}
class _ShootPageState extends State<ShootPage> with WidgetsBindingObserver {
- Timer _timer;
+ Timer? _timer;
int _timing = 0;
- CameraController controller;
- String imagePath;
- String videoPath;
- VideoPlayerController videoController;
- VoidCallback videoPlayerListener;
+ // CameraController controller;
+ String? imagePath;
+ late String videoPath;
+ VideoPlayerController? videoController;
+ late VoidCallback videoPlayerListener;
bool isReverse = false;
bool isOnPress = false;
- CameraDescription cameraDescription;
+ // CameraDescription cameraDescription;
@override
void initState() {
super.initState();
WidgetsBinding.instance.addObserver(this);
- if (widget.cameras.isNotEmpty) {
- cameraDescription = widget.cameras[!isReverse ? 0 : 1];
- onNewCameraSelected(cameraDescription);
- }
+ // if (widget.cameras.isNotEmpty) {
+ // cameraDescription = widget.cameras[!isReverse ? 0 : 1];
+ // onNewCameraSelected(cameraDescription);
+ // }
}
@override
void didChangeAppLifecycleState(AppLifecycleState state) {
- if (controller == null || !controller.value.isInitialized) {
- return;
- }
- if (state == AppLifecycleState.inactive) {
- controller?.dispose();
- } else if (state == AppLifecycleState.resumed) {
- if (controller != null) {
- onNewCameraSelected(controller.description);
- }
- }
+ // if (controller == null || !controller.value.isInitialized) {
+ // return;
+ // }
+ // if (state == AppLifecycleState.inactive) {
+ // controller?.dispose();
+ // } else if (state == AppLifecycleState.resumed) {
+ // if (controller != null) {
+ // onNewCameraSelected(controller.description);
+ // }
+ // }
}
void startTimer() {
@@ -66,7 +62,7 @@ class _ShootPageState extends State<ShootPage> with WidgetsBindingObserver {
isOnPress = false;
onStopButtonPressed();
if (_timer != null) {
- _timer.cancel();
+ _timer!.cancel();
}
} else {
_timing = _timing + 1;
@@ -131,7 +127,7 @@ class _ShootPageState extends State<ShootPage> with WidgetsBindingObserver {
),
)
: new Text(
- '计时: ${_timing ?? 0}',
+ '计时: ${_timing}',
style: TextStyle(color: Colors.white),
),
new Listener(
@@ -170,16 +166,16 @@ class _ShootPageState extends State<ShootPage> with WidgetsBindingObserver {
if (!isOnPress) return;
isOnPress = false;
if (_timing < 2) {
- showToast(context, '录制时间过短');
+ q1Toast('录制时间过短');
stopVideoRecording();
if (_timer != null) {
- _timer.cancel();
+ _timer!.cancel();
}
return;
}
onStopButtonPressed();
if (_timer != null) {
- _timer.cancel();
+ _timer!.cancel();
}
});
},
@@ -202,40 +198,42 @@ class _ShootPageState extends State<ShootPage> with WidgetsBindingObserver {
}
Widget checkWidget() {
- if (widget.cameras.isEmpty) return const Text('No camera found');
-
- cameraDescription = widget.cameras[isReverse ? 0 : 1];
- return new InkWell(
- child: new Container(
- alignment: Alignment.topRight,
- width: 60.0,
- padding: EdgeInsets.symmetric(horizontal: 20.0),
- child: new Image.asset('assets/images/chat/flip_camera_icon_nor.webp',
- fit: BoxFit.cover),
- ),
- onTap: () {
- isReverse = !isReverse;
- onNewCameraSelected(cameraDescription);
- },
- );
+ return Container();
+ // if (widget.cameras.isEmpty) return const Text('No camera found');
+ //
+ // cameraDescription = widget.cameras[isReverse ? 0 : 1];
+ // return new InkWell(
+ // child: new Container(
+ // alignment: Alignment.topRight,
+ // width: 60.0,
+ // padding: EdgeInsets.symmetric(horizontal: 20.0),
+ // child: new Image.asset('assets/images/chat/flip_camera_icon_nor.webp',
+ // fit: BoxFit.cover),
+ // ),
+ // onTap: () {
+ // isReverse = !isReverse;
+ // onNewCameraSelected(cameraDescription);
+ // },
+ // );
}
Widget _cameraPreviewWidget() {
- if (controller == null || !controller.value.isInitialized) {
- return const Text(
- '使用相机',
- style: TextStyle(
- color: Colors.white,
- fontSize: 24.0,
- fontWeight: FontWeight.w900,
- ),
- );
- } else {
- return new AspectRatio(
- aspectRatio: controller.value.aspectRatio,
- child: new CameraPreview(controller),
- );
- }
+ return Container();
+ // if (controller == null || !controller.value.isInitialized) {
+ // return const Text(
+ // '使用相机',
+ // style: TextStyle(
+ // color: Colors.white,
+ // fontSize: 24.0,
+ // fontWeight: FontWeight.w900,
+ // ),
+ // );
+ // } else {
+ // return new AspectRatio(
+ // aspectRatio: controller.value.aspectRatio,
+ // // child: new CameraPreview(controller),
+ // );
+ // }
}
Widget _thumbnailWidget() {
@@ -248,17 +246,17 @@ class _ShootPageState extends State<ShootPage> with WidgetsBindingObserver {
? new Container()
: SizedBox(
child: (videoController == null)
- ? Image.file(File(imagePath))
+ ? Image.file(File(imagePath!))
: Container(
alignment: Alignment.center,
decoration: BoxDecoration(
border: Border.all(color: Colors.red, width: 1.5),
),
child: AspectRatio(
- aspectRatio: videoController.value.size != null
- ? videoController.value.aspectRatio
+ aspectRatio: videoController!.value.size != null
+ ? videoController!.value.aspectRatio
: 1.0,
- child: VideoPlayer(videoController),
+ child: VideoPlayer(videoController!),
),
),
width: 64.0,
@@ -270,10 +268,12 @@ class _ShootPageState extends State<ShootPage> with WidgetsBindingObserver {
margin: EdgeInsets.only(top: 10.0),
width: 60.0,
height: 25.0,
- child: new FlatButton(
+ child: new TextButton(
onPressed: () {},
- color: Colors.white,
- padding: EdgeInsets.all(0),
+ style: ButtonStyle(
+ backgroundColor: MaterialStateProperty.all(Colors.white),
+ padding: MaterialStateProperty.all(EdgeInsets.all(0)),
+ ),
child: new Text(
'发送',
style: TextStyle(fontSize: 11.0),
@@ -286,85 +286,85 @@ class _ShootPageState extends State<ShootPage> with WidgetsBindingObserver {
}
/// Display the control bar with buttons to take pictures and record videos.
- Widget _captureControlRowWidget() {
- return Row(
- mainAxisAlignment: MainAxisAlignment.spaceEvenly,
- mainAxisSize: MainAxisSize.max,
- children: <Widget>[
- IconButton(
- icon: const Icon(Icons.camera_alt),
- color: Colors.blue,
- onPressed: controller != null &&
- controller.value.isInitialized &&
- !controller.value.isRecordingVideo
- ? onTakePictureButtonPressed
- : null,
- ),
- IconButton(
- icon: const Icon(Icons.videocam),
- color: Colors.blue,
- onPressed: controller != null &&
- controller.value.isInitialized &&
- !controller.value.isRecordingVideo
- ? onVideoRecordButtonPressed
- : null,
- ),
- IconButton(
- icon: controller != null && controller.value.isRecordingPaused
- ? Icon(Icons.play_arrow)
- : Icon(Icons.pause),
- color: Colors.blue,
- onPressed: controller != null &&
- controller.value.isInitialized &&
- controller.value.isRecordingVideo
- ? (controller != null && controller.value.isRecordingPaused
- ? onResumeButtonPressed
- : onPauseButtonPressed)
- : null,
- ),
- IconButton(
- icon: const Icon(Icons.stop),
- color: Colors.red,
- onPressed: controller != null &&
- controller.value.isInitialized &&
- controller.value.isRecordingVideo
- ? onStopButtonPressed
- : null,
- )
- ],
- );
- }
+ // Widget _captureControlRowWidget() {
+ // return Row(
+ // mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+ // mainAxisSize: MainAxisSize.max,
+ // children: <Widget>[
+ // IconButton(
+ // icon: const Icon(Icons.camera_alt),
+ // color: Colors.blue,
+ // onPressed: controller != null &&
+ // controller.value.isInitialized &&
+ // !controller.value.isRecordingVideo
+ // ? onTakePictureButtonPressed
+ // : null,
+ // ),
+ // IconButton(
+ // icon: const Icon(Icons.videocam),
+ // color: Colors.blue,
+ // onPressed: controller != null &&
+ // controller.value.isInitialized &&
+ // !controller.value.isRecordingVideo
+ // ? onVideoRecordButtonPressed
+ // : null,
+ // ),
+ // IconButton(
+ // icon: controller != null && controller.value.isRecordingPaused
+ // ? Icon(Icons.play_arrow)
+ // : Icon(Icons.pause),
+ // color: Colors.blue,
+ // onPressed: controller != null &&
+ // controller.value.isInitialized &&
+ // controller.value.isRecordingVideo
+ // ? (controller != null && controller.value.isRecordingPaused
+ // ? onResumeButtonPressed
+ // : onPauseButtonPressed)
+ // : null,
+ // ),
+ // IconButton(
+ // icon: const Icon(Icons.stop),
+ // color: Colors.red,
+ // onPressed: controller != null &&
+ // controller.value.isInitialized &&
+ // controller.value.isRecordingVideo
+ // ? onStopButtonPressed
+ // : null,
+ // )
+ // ],
+ // );
+ // }
String timestamp() => DateTime.now().millisecondsSinceEpoch.toString();
- void onNewCameraSelected(CameraDescription cameraDescription) async {
- if (controller != null) {
- await controller.dispose();
- }
- controller = CameraController(
- cameraDescription,
- ResolutionPreset.max,
- enableAudio: true,
- );
-
- // If the controller is updated then update the UI.
- controller.addListener(() {
- if (mounted) setState(() {});
- if (controller.value.hasError) {
- showToast(context, 'Camera error ${controller.value.errorDescription}');
- }
- });
-
- try {
- await controller.initialize();
- } on CameraException catch (e) {
- _showCameraException(e);
- }
-
- if (mounted) {
- setState(() {});
- }
- }
+ // void onNewCameraSelected(CameraDescription cameraDescription) async {
+ // if (controller != null) {
+ // await controller.dispose();
+ // }
+ // controller = CameraController(
+ // cameraDescription,
+ // ResolutionPreset.max,
+ // enableAudio: true,
+ // );
+ //
+ // // If the controller is updated then update the UI.
+ // controller.addListener(() {
+ // if (mounted) setState(() {});
+ // if (controller.value.hasError) {
+ // q1Toast( 'Camera error ${controller.value.errorDescription}');
+ // }
+ // });
+ //
+ // try {
+ // await controller.initialize();
+ // } on CameraException catch (e) {
+ // _showCameraException(e);
+ // }
+ //
+ // if (mounted) {
+ // setState(() {});
+ // }
+ // }
void onTakePictureButtonPressed() {
takePicture().then((String filePath) {
@@ -374,114 +374,114 @@ class _ShootPageState extends State<ShootPage> with WidgetsBindingObserver {
videoController?.dispose();
videoController = null;
});
- if (filePath != null) showToast(context, '图片保存到$filePath');
+ if (filePath != null) q1Toast('图片保存到$filePath');
}
});
}
void onVideoRecordButtonPressed() {
- startVideoRecording().then((String filePath) {
- if (mounted) setState(() {});
- if (filePath != null) showToast(context, '开始录制');
- });
+ // startVideoRecording().then((String filePath) {
+ // if (mounted) setState(() {});
+ // if (filePath != null) q1Toast( '开始录制');
+ // });
}
void onStopButtonPressed() {
stopVideoRecording().then((_) {
if (mounted) setState(() {});
- showToast(context, '视频记录到$videoPath');
+ q1Toast('视频记录到$videoPath');
});
}
void onPauseButtonPressed() {
pauseVideoRecording().then((_) {
if (mounted) setState(() {});
- showToast(context, '录制视频暂停');
+ q1Toast('录制视频暂停');
});
}
void onResumeButtonPressed() {
resumeVideoRecording().then((_) {
if (mounted) setState(() {});
- showToast(context, '录制视频恢复');
+ q1Toast('录制视频恢复');
});
}
- Future<String> startVideoRecording() async {
- if (!controller.value.isInitialized) {
- showToast(context, '异常: 首先选择一个相机');
- return null;
- }
-
- final Directory extDir = await getApplicationDocumentsDirectory();
- final String dirPath = '${extDir.path}/Movies/flutter_test';
- await Directory(dirPath).create(recursive: true);
- final String filePath = '$dirPath/${timestamp()}.mp4';
-
- if (controller.value.isRecordingVideo) {
- // A recording is already started, do nothing.
- return null;
- }
-
- try {
- videoPath = filePath;
- await controller.startVideoRecording(filePath);
- } on CameraException catch (e) {
- _showCameraException(e);
- return null;
- }
- return filePath;
- }
+ // Future<String> startVideoRecording() async {
+ // if (!controller.value.isInitialized) {
+ // q1Toast( '异常: 首先选择一个相机');
+ // return null;
+ // }
+ //
+ // final Directory extDir = await getApplicationDocumentsDirectory();
+ // final String dirPath = '${extDir.path}/Movies/flutter_test';
+ // await Directory(dirPath).create(recursive: true);
+ // final String filePath = '$dirPath/${timestamp()}.mp4';
+ //
+ // if (controller.value.isRecordingVideo) {
+ // // A recording is already started, do nothing.
+ // return null;
+ // }
+ //
+ // try {
+ // videoPath = filePath;
+ // await controller.startVideoRecording(filePath);
+ // } on CameraException catch (e) {
+ // _showCameraException(e);
+ // return null;
+ // }
+ // return filePath;
+ // }
Future<void> stopVideoRecording() async {
- if (!controller.value.isRecordingVideo) {
- return null;
- }
-
- try {
- await controller.stopVideoRecording();
- } on CameraException catch (e) {
- _showCameraException(e);
- return null;
- }
-
- await _startVideoPlayer();
+ // if (!controller.value.isRecordingVideo) {
+ // return null;
+ // }
+ //
+ // try {
+ // await controller.stopVideoRecording();
+ // } on CameraException catch (e) {
+ // _showCameraException(e);
+ // return null;
+ // }
+ //
+ // await _startVideoPlayer();
}
Future<void> pauseVideoRecording() async {
- if (!controller.value.isRecordingVideo) {
- return null;
- }
-
- try {
- await controller.pauseVideoRecording();
- } on CameraException catch (e) {
- _showCameraException(e);
- rethrow;
- }
+ // if (!controller.value.isRecordingVideo) {
+ // return null;
+ // }
+ //
+ // try {
+ // await controller.pauseVideoRecording();
+ // } on CameraException catch (e) {
+ // _showCameraException(e);
+ // rethrow;
+ // }
}
Future<void> resumeVideoRecording() async {
- if (!controller.value.isRecordingVideo) {
- return null;
- }
-
- try {
- await controller.resumeVideoRecording();
- } on CameraException catch (e) {
- _showCameraException(e);
- rethrow;
- }
+ // if (!controller.value.isRecordingVideo) {
+ // return null;
+ // }
+ //
+ // try {
+ // await controller.resumeVideoRecording();
+ // } on CameraException catch (e) {
+ // _showCameraException(e);
+ // rethrow;
+ // }
}
Future<void> _startVideoPlayer() async {
final VideoPlayerController vcontroller =
VideoPlayerController.file(File(videoPath));
videoPlayerListener = () {
- if (videoController != null && videoController.value.size != null) {
+ if (videoController != null && videoController!.value.size != null) {
// Refreshing the state to update video player with the correct ratio.
if (mounted) setState(() {});
- videoController.removeListener(videoPlayerListener);
+ videoController!.removeListener(videoPlayerListener);
}
};
vcontroller.addListener(videoPlayerListener);
@@ -498,40 +498,41 @@ class _ShootPageState extends State<ShootPage> with WidgetsBindingObserver {
}
Future<String> takePicture() async {
- if (!controller.value.isInitialized) {
- showToast(context, '异常: 首先选择一个相机');
- return null;
- }
- final Directory extDir = await getApplicationDocumentsDirectory();
- final String dirPath = '${extDir.path}/Pictures/flutter_test';
- await Directory(dirPath).create(recursive: true);
- final String filePath = '$dirPath/${timestamp()}.jpg';
-
- if (controller.value.isTakingPicture) {
- // A capture is already pending, do nothing.
- return null;
- }
-
- try {
- await controller.takePicture(filePath);
- } on CameraException catch (e) {
- _showCameraException(e);
- return null;
- }
- return filePath;
+ return "";
+ // if (!controller.value.isInitialized) {
+ // q1Toast( '异常: 首先选择一个相机');
+ // return null;
+ // }
+ // final Directory extDir = await getApplicationDocumentsDirectory();
+ // final String dirPath = '${extDir.path}/Pictures/flutter_test';
+ // await Directory(dirPath).create(recursive: true);
+ // final String filePath = '$dirPath/${timestamp()}.jpg';
+ //
+ // if (controller.value.isTakingPicture) {
+ // // A capture is already pending, do nothing.
+ // return null;
+ // }
+
+ // try {
+ // await controller.takePicture(filePath);
+ // } on CameraException catch (e) {
+ // _showCameraException(e);
+ // return null;
+ // }
+ // return filePath;
}
- void _showCameraException(CameraException e) {
- logError(e.code, e.description);
- showToast(context, 'Error: ${e.code}\n${e.description}');
- }
+ // void _showCameraException(CameraException e) {
+ // logError(e.code, e.description);
+ // q1Toast( 'Error: ${e.code}\n${e.description}');
+ // }
@override
void dispose() {
super.dispose();
WidgetsBinding.instance.removeObserver(this);
if (_timer != null) {
- _timer.cancel();
+ _timer!.cancel();
}
}
}
diff --git a/lib/pages/common/chat/video_play_page.dart b/lib/pages/common/chat/video_play_page.dart
new file mode 100644
index 0000000..54b9769
--- /dev/null
+++ b/lib/pages/common/chat/video_play_page.dart
@@ -0,0 +1,85 @@
+import 'package:fijkplayer/fijkplayer.dart';
+import 'package:flutter/material.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+class VideoPlayPage extends StatefulWidget {
+ final String? url;
+
+ VideoPlayPage(this.url);
+
+ @override
+ State<VideoPlayPage> createState() => _VideoPlayPageState();
+}
+
+class _VideoPlayPageState extends State<VideoPlayPage> {
+ final FijkPlayer player = FijkPlayer();
+
+ @override
+ void initState() {
+ super.initState();
+ player.setOption(FijkOption.hostCategory, "enable-snapshot", 1);
+ player.setOption(FijkOption.playerCategory, "mediacodec-all-videos", 1);
+ startPlay();
+ }
+
+ void startPlay() async {
+ print("widget.url:::${widget.url}");
+ await player.setOption(FijkOption.hostCategory, "request-screen-on", 1);
+ await player.setOption(FijkOption.hostCategory, "request-audio-focus", 1);
+ await player.setDataSource(widget.url!, autoPlay: true).catchError((e) {
+ print("setDataSource error: $e");
+ });
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return Scaffold(
+ backgroundColor: Colors.black,
+ body: Stack(
+ children: [
+ /// 视频播放器位置
+ SizedBox(
+ width: FrameSize.winWidth(),
+ height: FrameSize.winHeight(),
+ child: Center(
+ child: FijkView(
+ player: player,
+ panelBuilder: fijkPanel2Builder(snapShot: true),
+ color: Colors.black,
+ fsFit: FijkFit.fill,
+ // panelBuilder: simplestUI,
+ // panelBuilder: (FijkPlayer player, BuildContext context,
+ // Size viewSize, Rect texturePos) {
+ // return CustomFijkPanel(
+ // player: player,
+ // buildContext: context,
+ // viewSize: viewSize,
+ // texturePos: texturePos);
+ // },
+ ),
+ ),
+ ),
+
+ /// 控件位置
+ Positioned(
+ top: 0,
+ child: SizedBox(
+ height: FrameSize.topBarHeight(),
+ width: FrameSize.winWidth(),
+ child: ComMomBar(
+ backgroundColor: Colors.transparent,
+ mainColor: Colors.white,
+ ),
+ ),
+ )
+ ],
+ ),
+ );
+ }
+
+ @override
+ void dispose() {
+ super.dispose();
+ player.release();
+ }
+}
diff --git a/lib/pages/common/contacts/agree_friend_page.dart b/lib/pages/common/contacts/agree_friend_page.dart
new file mode 100644
index 0000000..4d6ea4a
--- /dev/null
+++ b/lib/pages/common/contacts/agree_friend_page.dart
@@ -0,0 +1,76 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:oktoast/oktoast.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_friend_application.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_friend_operation_result.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_value_callback.dart';
+import 'package:wechat_flutter/im/im_handle/im_friend_api.dart';
+import 'package:wechat_flutter/im/util/im_response_tip_util.dart';
+import 'package:wechat_flutter/tools/eventbus/contacts_bus.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+import 'package:wechat_flutter/ui/orther/verify_input.dart';
+import 'package:wechat_flutter/ui/orther/verify_switch.dart';
+import 'package:wechat_flutter/ui_commom/bt/small_button.dart';
+
+class AgreeFriendPage extends StatefulWidget {
+ /// friendModel 不为空表示从【新的朋友页面进入】
+ final V2TimFriendApplication? friendModel;
+
+ AgreeFriendPage(this.friendModel);
+
+ @override
+ State<AgreeFriendPage> createState() => _AgreeFriendPageState();
+}
+
+class _AgreeFriendPageState extends State<AgreeFriendPage> {
+ TextEditingController remarksC = new TextEditingController();
+ FocusNode remarksF = new FocusNode();
+
+ /*
+ * 同意添加好友
+ * */
+ Future agree() async {
+ final V2TimValueCallback<V2TimFriendOperationResult> result =
+ await ImFriendApi.acceptFriendApplication(widget.friendModel!.userID);
+ if (result.code == 0 || result.code == 200) {
+ /// 刷新通讯录
+ contactsBus.fire(ContactsModel());
+
+ /// 路由返回
+ Get.back();
+ } else {
+ showToast(ImResponseTipUtil.getInfoOResultCode(result.code, result.desc));
+ }
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return Scaffold(
+ appBar: ComMomBar(title: "通过好友验证"),
+ backgroundColor: appBarColor,
+ body: ListView(
+ children: [
+ new Padding(
+ padding: EdgeInsets.symmetric(vertical: mainSpace),
+ child: new VerifyInput(
+ title: '为朋友设置备注',
+ defStr: widget.friendModel?.nickname ?? 'flutterj.com',
+ controller: remarksC,
+ focusNode: remarksF,
+ ),
+ ),
+ new VerifySwitch(title: '设置朋友圈和视频动态权限'),
+ Space(height: 60),
+ SmallButton(
+ borderRadius: BorderRadius.all(Radius.circular(10)),
+ margin: EdgeInsets.symmetric(horizontal: 100),
+ onPressed: () {
+ agree();
+ },
+ child: Text('完成'),
+ )
+ ],
+ ),
+ );
+ }
+}
diff --git a/lib/pages/contacts/all_label_page.dart b/lib/pages/common/contacts/all_label_page.dart
similarity index 100%
rename from lib/pages/contacts/all_label_page.dart
rename to lib/pages/common/contacts/all_label_page.dart
diff --git a/lib/pages/common/contacts/contact_system_page.dart b/lib/pages/common/contacts/contact_system_page.dart
new file mode 100644
index 0000000..dd11bf0
--- /dev/null
+++ b/lib/pages/common/contacts/contact_system_page.dart
@@ -0,0 +1,361 @@
+import 'dart:convert';
+
+import 'package:azlistview/azlistview.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_contacts/flutter_contacts.dart';
+import 'package:get/get.dart';
+import 'package:lpinyin/lpinyin.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_user_full_info.dart';
+import 'package:wechat_flutter/im/im_handle/Im_api.dart';
+import 'package:wechat_flutter/pages/common/contacts/contacts_details_page.dart';
+import 'package:wechat_flutter/pages/common/contacts/new_friend_page.dart';
+import 'package:wechat_flutter/tools/config/app_config.dart';
+import 'package:wechat_flutter/tools/theme/my_theme.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+import 'package:wechat_flutter/ui/item/build_sus_widget.dart';
+import 'package:wechat_flutter/ui/item/circle_item_widget.dart';
+import 'package:wechat_flutter/ui_commom/app/my_scaffold.dart';
+import 'package:wechat_flutter/ui_commom/dialog/confirm_sw_dialog.dart';
+
+class ContactSystemModel extends ISuspensionBean {
+ final String displayName;
+ final String phone;
+ final bool isRegister;
+ final V2TimUserFullInfo? info;
+
+ String tagIndex;
+ String namePinyin;
+
+ @override
+ String getSuspensionTag() => tagIndex;
+
+ ContactSystemModel(this.displayName, this.phone, this.isRegister, this.info,
+ this.tagIndex, this.namePinyin);
+}
+
+// 系统手机通讯录页面
+// 通讯录朋友页面
+class ContactSystemPage extends StatefulWidget {
+ const ContactSystemPage({Key? key}) : super(key: key);
+
+ @override
+ State<ContactSystemPage> createState() => _ContactSystemPageState();
+}
+
+class _ContactSystemPageState extends State<ContactSystemPage> {
+ List<Contact> _contacts = [];
+ bool _permissionDenied = false;
+ bool isLoadOk = false;
+ bool isShowSearchResult = false;
+
+ /// 实际显示的数据
+ List<ContactSystemModel> allData = [];
+ List<ContactSystemModel> searchData = [];
+
+ String deniedText =
+ "目前无法访问你的通讯录，无法帮你添加朋友。请在系统设置[手机系统的设置]-隐私-通讯录里允许${AppConfig.appName}访问你的通讯录。";
+
+ String checkText =
+ "无数据或无权限，请在系统设置[手机系统的设置]-隐私-通讯录里检查是否允许${AppConfig.appName}访问你的通讯录。";
+
+ TextEditingController searchC = TextEditingController();
+
+ @override
+ void initState() {
+ super.initState();
+ _fetchContacts();
+ }
+
+ /*
+ * 设置加载完毕
+ * */
+ void setLoadOk() {
+ isLoadOk = true;
+ if (mounted) setState(() {});
+ }
+
+ /*
+ * 取通讯录
+ * */
+ Future _fetchContacts() async {
+ if (await FlutterContacts.requestPermission(readonly: true)) {
+ _permissionDenied = true;
+ }
+
+ final contacts = await FlutterContacts.getContacts();
+ _contacts = contacts;
+
+ if (!listNoEmpty(_contacts)) {
+ if (_permissionDenied) {
+ WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+ confirmSwDialog(
+ context,
+ text: deniedText,
+ isHaveCancel: false,
+ );
+ });
+ }
+ setLoadOk();
+ return;
+ }
+
+ List<List<String>> _nameAndPhone = await getNameAndPhone(contacts);
+
+ final List<String> userIds = _nameAndPhone.map((e) => e[1]).toList();
+
+ List<V2TimUserFullInfo>? userInfoList = await ImApi.getUsersInfo(userIds);
+ if (!listNoEmpty(userInfoList)) {
+ /// 全部未注册
+ allData = _nameAndPhone.map<ContactSystemModel>((e) {
+ String pinyin = PinyinHelper.getPinyinE(e[0]);
+ String tag = pinyin.substring(0, 1).toUpperCase();
+
+ return ContactSystemModel(e[0], e[1], false, null, tag, pinyin);
+ }).toList();
+
+ _handleList(allData);
+ return;
+ }
+
+ /// 标识是否注册
+ userInfoList!.forEach((iElement) {
+ _nameAndPhone.forEach((nElement) {
+ if (iElement.userID == nElement[1]) {
+ nElement[0] = iElement.nickName! + "(${nElement[0]})";
+
+ /// 表示已注册
+ nElement[2] = json.encode(iElement);
+ }
+ });
+ });
+
+ /// 处理数据
+ allData = _nameAndPhone.map<ContactSystemModel>((e) {
+ final bool _isRegisterValue = strNoEmpty(e[2]);
+
+ String pinyin = PinyinHelper.getPinyinE(e[0]);
+ String tag = pinyin.substring(0, 1).toUpperCase();
+
+ return ContactSystemModel(
+ e[0],
+ e[1],
+ _isRegisterValue,
+ _isRegisterValue ? V2TimUserFullInfo.fromJson(json.decode(e[2])) : null,
+ tag,
+ pinyin,
+ );
+ }).toList();
+
+ _handleList(allData);
+ }
+
+ /*
+ * 处理数据列表
+ * */
+ void _handleList(List<ContactSystemModel> list) {
+ if (list.isEmpty) return;
+ for (int i = 0, length = list.length; i < length; i++) {
+ String pinyin = PinyinHelper.getPinyinE(list[i].displayName);
+ String tag = pinyin.substring(0, 1).toUpperCase();
+ list[i].namePinyin = pinyin;
+ if (RegExp("[A-Z]").hasMatch(tag)) {
+ list[i].tagIndex = tag;
+ } else {
+ list[i].tagIndex = "#";
+ }
+ }
+ // A-Z sort.
+ SuspensionUtil.sortListBySuspensionTag(allData);
+
+ // show sus tag.
+ SuspensionUtil.setShowSuspensionStatus(allData);
+
+ setLoadOk();
+ }
+
+ /*
+ * 获取名字和手机号
+ *
+ * 二维数组的第一个是名字，第二个手机号
+ * */
+ Future<List<List<String>>> getNameAndPhone(List<Contact> contacts) async {
+ List<List<String>> nameAndPhones = [];
+
+ for (Contact e in contacts) {
+ final Contact? contact = await (FlutterContacts.getContact(e.id));
+ if (contact != null) {
+ final String number = contact.phones.isNotEmpty
+ ? contact.phones.first.number.replaceAll(" ", "")
+ : '(none)';
+ nameAndPhones.add([contact.displayName, number, ""]);
+ }
+ }
+
+ return nameAndPhones;
+ }
+
+ /*
+ * 搜索
+ * */
+ void onSearch(String searchValue) {
+ searchData = [];
+
+ if (!strNoEmpty(searchValue.trim())) {
+ if (mounted) setState(() {});
+ return;
+ }
+
+ allData.forEach((element) {
+ if (element.displayName.contains(searchValue)) {
+ searchData.add(element);
+ }
+ });
+ if (mounted) setState(() {});
+ }
+
+ Widget showTipText(String text) {
+ return Padding(
+ padding: EdgeInsets.all(20),
+ child: Center(child: Text(text)),
+ );
+ }
+
+ Widget _buildSusWidget(String susTag) {
+ return BuildSubWidget(susTag);
+ }
+
+ Widget _circleItemWidget(ContactSystemModel systemModel) {
+ final String avatar = systemModel.info?.faceUrl ?? AppConfig.mockCover;
+
+ return CircleItemWidget(
+ type: 1,
+ imageUrl: avatar,
+ title: systemModel.displayName,
+ onTap: () async {
+ FocusScope.of(context).requestFocus(FocusNode());
+
+ if (!systemModel.isRegister) {
+ q1Toast("此用户未注册，请先邀请对方注册此app吧～");
+ return;
+ }
+
+ Get.to(ContactsDetailsPage(
+ id: systemModel.info?.userID ?? systemModel.phone,
+ title: systemModel.info?.nickName ?? systemModel.displayName,
+ avatar: avatar));
+ },
+ des: !systemModel.isRegister
+ ? systemModel.phone
+ : (systemModel.info?.selfSignature ?? "暂无"),
+ rSpace: 30,
+ endWidget: !systemModel.isRegister
+ ? Text(
+ "未注册",
+ style: TextStyle(color: Colors.grey),
+ )
+ : Container(
+ padding: EdgeInsets.symmetric(horizontal: 7, vertical: 3.5),
+ alignment: Alignment.center,
+ decoration: BoxDecoration(
+ color: MyTheme.themeColor(),
+ borderRadius: BorderRadius.all(Radius.circular(2)),
+ ),
+ child: Text(
+ '查看',
+ style: TextStyle(color: Colors.white),
+ ),
+ ),
+ );
+ }
+
+ Widget _buildListItem(ContactSystemModel systemModel) {
+ String susTag = systemModel.getSuspensionTag();
+
+ return Column(
+ children: <Widget>[
+ Offstage(
+ offstage: systemModel.isShowSuspension != true,
+ child: _buildSusWidget(susTag),
+ ),
+ _circleItemWidget(systemModel),
+ ],
+ );
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return MyScaffold(
+ backgroundColor: appBarColor,
+ appBar: ComMomBar(
+ title: '通讯录朋友',
+ mainColor: Colors.black,
+ backgroundColor: appBarColor,
+ ),
+ body: (_permissionDenied && !listNoEmpty(_contacts))
+ ? showTipText(deniedText)
+ : isLoadOk && !listNoEmpty(_contacts)
+ ? showTipText(checkText)
+ : Column(
+ children: [
+ SearchMainViewNew(
+ controller: searchC,
+ onCallFocus: (bool hasFocus) {
+ isShowSearchResult = hasFocus;
+ if (mounted) setState(() {});
+ },
+ onChanged: onSearch,
+ onSubmitted: onSearch,
+ ),
+ Expanded(
+ child: isShowSearchResult
+ ? ListView.builder(
+ itemBuilder: (context, index) {
+ ContactSystemModel model = searchData[index];
+ return _circleItemWidget(model);
+ },
+ itemCount: searchData.length,
+ )
+ : AzListView(
+ padding: EdgeInsets.symmetric(vertical: 10),
+ data: allData,
+ itemCount: allData.length,
+ itemBuilder: (BuildContext context, int index) {
+ ContactSystemModel model = allData[index];
+ return _buildListItem(model);
+ },
+ indexBarData:
+ SuspensionUtil.getTagIndexList(allData),
+ indexHintBuilder: (context, hint) {
+ return Container(
+ alignment: Alignment.center,
+ width: 60.0,
+ height: 60.0,
+ decoration: BoxDecoration(
+ color: Colors.blue[700]!.withAlpha(200),
+ shape: BoxShape.circle,
+ ),
+ child: Text(
+ hint,
+ style: TextStyle(
+ color: Colors.white,
+ fontSize: 30.0,
+ fontWeight: MyTheme.fontWeight(),
+ ),
+ ),
+ );
+ },
+ indexBarMargin: EdgeInsets.all(10),
+ indexBarOptions: IndexBarOptions(
+ needRebuild: true,
+ decoration: MyTheme.getIndexBarDecoration(
+ Colors.grey[50]),
+ downDecoration: MyTheme.getIndexBarDecoration(
+ Colors.grey[200]),
+ ),
+ ),
+ ),
+ ],
+ ),
+ );
+ }
+}
diff --git a/lib/pages/common/contacts/contacts_details_page.dart b/lib/pages/common/contacts/contacts_details_page.dart
new file mode 100644
index 0000000..016508a
--- /dev/null
+++ b/lib/pages/common/contacts/contacts_details_page.dart
@@ -0,0 +1,150 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:provider/provider.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_friend_application.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_friend_check_result.dart';
+import 'package:wechat_flutter/im/im_handle/im_friend_api.dart';
+import 'package:wechat_flutter/pages/common/chat/more_info_page.dart';
+import 'package:wechat_flutter/pages/common/contacts/agree_friend_page.dart';
+import 'package:wechat_flutter/tools/provider/global_model.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+import 'package:wechat_flutter/ui/dialog/friend_item_dialog.dart';
+import 'package:wechat_flutter/ui/item/contact_card.dart';
+import 'package:wechat_flutter/ui/orther/button_row.dart';
+import 'package:wechat_flutter/ui/orther/label_row.dart';
+
+class ContactsDetailsPage extends StatefulWidget {
+ final String? avatar, title, id;
+
+ /// friendModel 不为空表示从【新的朋友页面进入】
+ final V2TimFriendApplication? friendModel;
+
+ ContactsDetailsPage({this.avatar, this.title, this.id, this.friendModel});
+
+ @override
+ _ContactsDetailsPageState createState() => _ContactsDetailsPageState();
+}
+
+class _ContactsDetailsPageState extends State<ContactsDetailsPage> {
+ RxBool isFriend = true.obs;
+
+ @override
+ void initState() {
+ super.initState();
+ getData();
+ }
+
+ Future getData() async {
+ if (widget.friendModel == null) {
+ return;
+ }
+
+ /// 检测对方是否为好友
+ final V2TimFriendCheckResult type =
+ (await ImFriendApi.checkFriend([widget.friendModel!.userID]))![0];
+
+ // element.resultType;//与查询用户的关系类型 0:不是好友 1:对方在我的好友列表中 2:我在对方的好友列表中 3:互为好友
+ isFriend.value = type.resultType == 1 || type.resultType == 3;
+ print("检测是否为好友:L:${isFriend.value}");
+ }
+
+ List<Widget> body(bool isSelf) {
+ return [
+ new ContactCard(
+ img: widget.avatar,
+ id: widget.id ?? widget.title!,
+ title: widget.title,
+ nickName: widget.title,
+ area: '北京 海淀',
+ isBorder: true,
+ ),
+ // new Visibility(
+ // visible: !isSelf,
+ // child: new LabelRow(
+ // label: '设置备注和标签',
+ // onPressed: () => Get.to(new SetRemarkPage()),
+ // ),
+ // ),
+ new Space(),
+ // new LabelRow(
+ // label: '朋友圈',
+ // isLine: true,
+ // lineWidth: 0.3,
+ // onPressed: () => Get.to(new WeChatFriendsCircle()),
+ // ),
+ new LabelRow(
+ label: '更多信息',
+ onPressed: () => Get.to(new MoreInfoPage()),
+ ),
+ Obx(() {
+ if (isFriend.value) {
+ return new ButtonRow(
+ margin: EdgeInsets.only(top: 10.0),
+ text: '发消息',
+ isBorder: true,
+ onPressed: () {
+ Get.offNamed(RouteConfig.chatPage, arguments: {
+ "title": widget.title,
+ "type": 1,
+ "id": widget.id,
+ });
+ },
+ );
+ } else {
+ return new ButtonRow(
+ margin: EdgeInsets.only(top: 10.0),
+ text: '前往验证',
+ isBorder: false,
+ onPressed: () async {
+ await Get.to(new AgreeFriendPage(widget.friendModel));
+ getData();
+ },
+ );
+ }
+ }),
+ // Obx(() {
+ // if (isFriend.value) {
+ // return new Visibility(
+ // visible: !isSelf,
+ // child: new ButtonRow(
+ // text: '音视频通话',
+ // onPressed: () => q1Toast( '敬请期待'),
+ // ),
+ // );
+ // } else {
+ // return Container();
+ // }
+ // }),
+ ];
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ final globalModel = Provider.of<GlobalModel>(context);
+ bool isSelf = globalModel.account == widget.id;
+
+ var rWidget = [
+ new SizedBox(
+ width: 60,
+ child: new TextButton(
+ style: ButtonStyle(
+ padding: MaterialStateProperty.all(EdgeInsets.all(0)),
+ ),
+ onPressed: () => friendItemDialog(context, userId: widget.id),
+ child: new Image.asset(contactAssets + 'ic_contacts_details.png'),
+ ),
+ )
+ ];
+
+ return new Scaffold(
+ backgroundColor: chatBg,
+ appBar: new ComMomBar(
+ title: '',
+ backgroundColor: Colors.white,
+ rightDMActions: isSelf ? [] : rWidget),
+ body: new SingleChildScrollView(
+ child: new Column(children: body(isSelf)),
+ ),
+ );
+ }
+}
diff --git a/lib/pages/contacts/contacts_page.dart b/lib/pages/common/contacts/contacts_page.dart
similarity index 77%
rename from lib/pages/contacts/contacts_page.dart
rename to lib/pages/common/contacts/contacts_page.dart
index 38b752a..1b69135 100644
--- a/lib/pages/contacts/contacts_page.dart
+++ b/lib/pages/common/contacts/contacts_page.dart
@@ -1,9 +1,13 @@
-import 'package:wechat_flutter/config/dictionary.dart';
-import 'package:wechat_flutter/im/model/contacts.dart';
-import 'package:wechat_flutter/ui/item/contact_view.dart';
import 'package:flutter/material.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_friend_info.dart';
+import 'package:wechat_flutter/im/im_handle/im_friend_api.dart';
+import 'package:wechat_flutter/im/model/contacts.dart';
+import 'package:wechat_flutter/tools/config/dictionary.dart';
+import 'package:wechat_flutter/tools/eventbus/contacts_bus.dart';
+import 'package:wechat_flutter/tools/im/im_info_util.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
import 'package:wechat_flutter/ui/item/contact_item.dart';
+import 'package:wechat_flutter/ui/item/contact_view.dart';
class ContactsPage extends StatefulWidget {
_ContactsPageState createState() => _ContactsPageState();
@@ -12,27 +16,26 @@ class ContactsPage extends StatefulWidget {
class _ContactsPageState extends State<ContactsPage>
with AutomaticKeepAliveClientMixin {
var indexBarBg = Colors.transparent;
- var currentLetter = '';
+ String? currentLetter = '';
var isNull = false;
- ScrollController sC;
+ ScrollController? sC;
List<Contact> _contacts = [];
- StreamSubscription<dynamic> _messageStreamSubscription;
+ StreamSubscription<dynamic>? _messageStreamSubscription;
List<ContactItem> _functionButtons = [
new ContactItem(
avatar: contactAssets + 'ic_new_friend.webp', title: '新的朋友'),
new ContactItem(avatar: contactAssets + 'ic_group.webp', title: '群聊'),
- new ContactItem(avatar: contactAssets + 'ic_tag.webp', title: '标签'),
- new ContactItem(avatar: contactAssets + 'ic_no_public.webp', title: '公众号'),
+ // new ContactItem(avatar: contactAssets + 'ic_tag.webp', title: '标签'),
+ // new ContactItem(avatar: contactAssets + 'ic_no_public.webp', title: '公众号'),
];
final Map _letterPosMap = {INDEX_BAR_WORDS[0]: 0.0};
Future getContacts() async {
- final str = await ContactsPageData().listFriend();
- isNull = await ContactsPageData().contactIsNull();
-
- List<Contact> listContact = str;
+ List<V2TimFriendInfo>? listFriendInfo = await ImFriendApi.getFriendList();
+ List<Contact> listContact =
+ ImInfoUtil.friendListToContactList(listFriendInfo);
_contacts.clear();
_contacts..addAll(listContact);
_contacts
@@ -61,23 +64,27 @@ class _ContactsPageState extends State<ContactsPage>
@override
void dispose() {
super.dispose();
- if (sC != null) sC.dispose();
+ if (sC != null) sC!.dispose();
canCelListener();
}
String _getLetter(BuildContext context, double tileHeight, Offset globalPos) {
- RenderBox _box = context.findRenderObject();
+ RenderBox _box = context.findRenderObject() as RenderBox;
var local = _box.globalToLocal(globalPos);
int index = (local.dy ~/ tileHeight).clamp(0, INDEX_BAR_WORDS.length - 1);
return INDEX_BAR_WORDS[index];
}
- void _jumpToIndex(String letter) {
+ void _jumpToIndex(String? letter) {
if (_letterPosMap.isNotEmpty) {
final _pos = _letterPosMap[letter];
- if (_pos != null)
- sC.animateTo(_pos,
+ if (_pos != null) {
+ sC!.animateTo(_pos,
+ curve: Curves.easeOut, duration: Duration(milliseconds: 200));
+ } else {
+ sC!.animateTo(FrameSize.winHeight(),
curve: Curves.easeOut, duration: Duration(milliseconds: 200));
+ }
}
}
@@ -119,14 +126,16 @@ class _ContactsPageState extends State<ContactsPage>
}
void canCelListener() {
- if (_messageStreamSubscription != null) _messageStreamSubscription.cancel();
+ if (_messageStreamSubscription != null) _messageStreamSubscription!.cancel();
}
Future<void> initPlatformState() async {
if (!mounted) return;
if (_messageStreamSubscription == null) {
_messageStreamSubscription =
- im.onMessage.listen((dynamic onData) => getContacts());
+ contactsBus.on<ContactsModel>().listen((event) {
+ getContacts();
+ });
}
}
@@ -151,7 +160,7 @@ class _ContactsPageState extends State<ContactsPage>
if (isNull) body.add(new HomeNullView(str: '无联系人'));
- if (currentLetter != null && currentLetter.isNotEmpty) {
+ if (currentLetter != null && currentLetter!.isNotEmpty) {
var row = [
new Container(
width: Constants.IndexLetterBoxSize,
@@ -162,15 +171,15 @@ class _ContactsPageState extends State<ContactsPage>
borderRadius: BorderRadius.all(
Radius.circular(Constants.IndexLetterBoxSize / 2)),
),
- child: new Text(currentLetter,
+ child: new Text(currentLetter!,
style: AppStyles.IndexLetterBoxTextStyle)),
new Icon(Icons.arrow_right),
new Space(width: mainSpace * 5),
];
body.add(
new Container(
- width: winWidth(context),
- height: winHeight(context),
+ width: FrameSize.winWidth(),
+ height: FrameSize.winHeight(),
child:
new Row(mainAxisAlignment: MainAxisAlignment.end, children: row),
),
diff --git a/lib/pages/contacts/group_launch_page.dart b/lib/pages/common/contacts/group_launch_page.dart
similarity index 70%
rename from lib/pages/contacts/group_launch_page.dart
rename to lib/pages/common/contacts/group_launch_page.dart
index a1367ca..2e6bd47 100644
--- a/lib/pages/contacts/group_launch_page.dart
+++ b/lib/pages/common/contacts/group_launch_page.dart
@@ -1,15 +1,21 @@
-import 'package:wechat_flutter/config/dictionary.dart';
-import 'package:wechat_flutter/im/friend_handle.dart';
+import 'package:get/get.dart';
+import 'package:tencent_im_sdk_plugin/enum/group_member_role_enum.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_friend_info.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_group_member.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_user_full_info.dart';
+import 'package:wechat_flutter/tools/config/dictionary.dart';
+import 'package:wechat_flutter/im/im_handle/Im_api.dart';
+import 'package:wechat_flutter/im/im_handle/im_friend_api.dart';
+import 'package:wechat_flutter/im/im_handle/im_group_api.dart';
import 'package:wechat_flutter/im/model/contacts.dart';
+import 'package:wechat_flutter/tools/im/im_info_util.dart';
import 'package:wechat_flutter/ui/item/contact_item.dart';
import 'package:wechat_flutter/ui/item/contact_view.dart';
import 'package:wechat_flutter/ui/item/launch_group.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
-import 'dart:convert';
-import 'package:wechat_flutter/im/info_handle.dart';
-import 'package:wechat_flutter/pages/more/add_friend_details.dart';
+import 'package:wechat_flutter/pages/common/more/add_friend_details.dart';
class GroupLaunchPage extends StatefulWidget {
@override
@@ -27,7 +33,7 @@ class _GroupLaunchPageState extends State<GroupLaunchPage> {
FocusNode searchF = new FocusNode();
TextEditingController searchC = new TextEditingController();
- ScrollController sC;
+ ScrollController? sC;
final Map _letterPosMap = {INDEX_BAR_WORDS[0]: 0.0};
@@ -57,9 +63,10 @@ class _GroupLaunchPageState extends State<GroupLaunchPage> {
}
Future getContacts() async {
- final str = await ContactsPageData().listFriend();
-
- List<Contact> listContact = str;
+ final List<V2TimFriendInfo>? listFriendInfo =
+ await ImFriendApi.getFriendList();
+ List<Contact> listContact =
+ ImInfoUtil.friendListToContactList(listFriendInfo);
_contacts.clear();
_contacts..addAll(listContact);
_contacts
@@ -83,17 +90,16 @@ class _GroupLaunchPageState extends State<GroupLaunchPage> {
// 搜索好友
Future search(String userName) async {
- final data = await getUsersProfile([userName]);
- List<dynamic> dataMap = json.decode(data);
- if (strNoEmpty(dataMap[0]['allowType'])) {
- routePush(
- new AddFriendsDetails(
- 'search',
- dataMap[0]['identifier'],
- dataMap[0]['faceUrl'],
- dataMap[0]['nickName'],
- dataMap[0]['gender'],
- ),
+ final List<V2TimUserFullInfo>? data = await ImApi.getUsersInfo([userName]);
+ if (!listNoEmpty(data)) {
+ q1Toast("未找到用户");
+ return;
+ }
+ V2TimUserFullInfo model = data![0];
+ if (strNoEmpty("${model.allowType ?? ""}")) {
+ Get.to(
+ new AddFriendsDetails('search', model.userID, model.faceUrl,
+ model.nickName, model.gender),
);
} else {
isResult = true;
@@ -131,21 +137,23 @@ class _GroupLaunchPageState extends State<GroupLaunchPage> {
width: 45.0,
margin: EdgeInsets.all(10.0),
radius: 4.0,
- onTap: () {
- if (Platform.isIOS) {
- showToast(context, 'IOS暂不支持发起群聊');
- return;
- }
- createGroupChat(selectData, name: selectData.join(),
- callback: (callBack) {
- if (callBack.toString().contains('succ')) {
- showToast(context, '创建群组成功');
- if (Navigator.of(context).canPop()) {
- Navigator.of(context).pop();
- }
+ onTap: () async {
+ final callBack = await ImGroupApi.createGroupV2(selectData.join(),
+ memberList: selectData.map((e) {
+ GroupMemberRoleTypeEnum role = e == Q1Data.user()
+ ? GroupMemberRoleTypeEnum.V2TIM_GROUP_MEMBER_ROLE_OWNER
+ : GroupMemberRoleTypeEnum.V2TIM_GROUP_MEMBER_ROLE_MEMBER;
+ return V2TimGroupMember(role: role, userID: e);
+ }).toList());
+
+ if (callBack.code == 0) {
+ q1Toast('创建群组成功');
+ if (Navigator.of(context).canPop()) {
+ Navigator.of(context).pop();
}
- });
- showToast(context, '当前ID：${selectData.toString()}');
+ } else {
+ q1Toast(callBack.desc);
+ }
},
);
@@ -172,7 +180,7 @@ class _GroupLaunchPageState extends State<GroupLaunchPage> {
color: isSearch ? Colors.green : lineColor, width: 0.3),
),
),
- width: winWidth(context),
+ width: FrameSize.winWidth(),
alignment: Alignment.center,
height: 50.0,
padding: EdgeInsets.symmetric(horizontal: 10.0),
@@ -198,13 +206,13 @@ class _GroupLaunchPageState extends State<GroupLaunchPage> {
],
),
),
- onWillPop: () {
+ onWillPop: () async {
if (isSearch) {
unFocusMethod();
} else {
Navigator.pop(context);
}
- return;
+ return false;
},
);
}
diff --git a/lib/pages/contacts/group_list_page.dart b/lib/pages/common/contacts/group_list_page.dart
similarity index 70%
rename from lib/pages/contacts/group_list_page.dart
rename to lib/pages/common/contacts/group_list_page.dart
index ac3b1bb..23ec33e 100644
--- a/lib/pages/contacts/group_list_page.dart
+++ b/lib/pages/common/contacts/group_list_page.dart
@@ -1,10 +1,9 @@
-import 'dart:convert';
-
import 'package:flutter/material.dart';
-import 'package:wechat_flutter/im/fun_dim_group_model.dart';
-import 'package:wechat_flutter/pages/chat/chat_page.dart';
-import 'package:wechat_flutter/pages/contacts/group_launch_page.dart';
-import 'package:wechat_flutter/pages/home/search_page.dart';
+import 'package:get/get.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_group_info.dart';
+import 'package:wechat_flutter/im/im_handle/im_group_api.dart';
+import 'package:wechat_flutter/pages/common/contacts/group_launch_page.dart';
+import 'package:wechat_flutter/pages/common/home/search_page.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
@@ -14,7 +13,7 @@ class GroupListPage extends StatefulWidget {
}
class _GroupListPageState extends State<GroupListPage> {
- List _groupList = new List();
+ List<V2TimGroupInfo>? _groupList = [];
@override
void initState() {
@@ -27,22 +26,20 @@ class _GroupListPageState extends State<GroupListPage> {
// 获取群聊列表
Future _getGroupListModel() async {
- await DimGroup.getGroupListModel((result) {
- setState(() =>
- _groupList = json.decode(result.toString().replaceAll("'", '"')));
- });
+ final List<V2TimGroupInfo>? result = await ImGroupApi.getJoinedGroupList();
+ _groupList = result;
+ setState(() {});
}
Widget groupItem(BuildContext context, String gName, String gId,
String gFaceURL, String title) {
- return FlatButton(
+ return TextButton(
onPressed: () {
- routePush(ChatPage(
- title: gName,
- type: 2,
- id: gId,
-// returnType: 1,
- ));
+ Get.toNamed(RouteConfig.chatPage, arguments: {
+ "title": gName,
+ "type": 2,
+ "id": gId,
+ });
},
child: Column(
children: <Widget>[
@@ -63,7 +60,10 @@ class _GroupListPageState extends State<GroupListPage> {
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
- Text(gName),
+ Text(
+ gName,
+ style: TextStyle(color: Colors.black),
+ ),
// 群聊Id
// Text(
// gId,
@@ -75,7 +75,7 @@ class _GroupListPageState extends State<GroupListPage> {
),
Container(
height: 1.0,
- width: winWidth(context),
+ width: FrameSize.winWidth(),
color: mainBGColor,
)
],
@@ -91,7 +91,7 @@ class _GroupListPageState extends State<GroupListPage> {
width: 60.0,
child: new Image.asset('assets/images/search_black.webp'),
),
- onTap: () => routePush(new SearchPage()),
+ onTap: () => Get.to(new SearchPage()),
),
new InkWell(
child: new Container(
@@ -99,7 +99,7 @@ class _GroupListPageState extends State<GroupListPage> {
child: new Image.asset('assets/images/contact/ic_contact_add.webp',
color: Colors.black, width: 22.0, fit: BoxFit.fitWidth),
),
- onTap: () => routePush(new GroupLaunchPage()),
+ onTap: () => Get.to(new GroupLaunchPage()),
),
];
@@ -107,19 +107,19 @@ class _GroupListPageState extends State<GroupListPage> {
appBar: new ComMomBar(title: '群聊', rightDMActions: rWidget),
body: listNoEmpty(_groupList)
? ListView.builder(
- itemCount: _groupList.length,
+ itemCount: _groupList!.length,
itemBuilder: (context, index) {
return Column(
children: <Widget>[
- _groupList.length > 0
+ _groupList!.length > 0
? groupItem(
context,
- _groupList[index]['groupName'] ?? '',
- _groupList[index]['groupId'] ?? '',
- !strNoEmpty(_groupList[index]['getFaceUrl'])
+ _groupList![index].groupName ?? '',
+ _groupList![index].groupID,
+ !strNoEmpty(_groupList![index].faceUrl)
? defGroupAvatar
- : _groupList[index]['getFaceUrl'],
- _groupList[index]['groupId'] ?? '',
+ : _groupList![index].faceUrl!,
+ _groupList![index].groupID,
)
: SizedBox(height: 1),
],
diff --git a/lib/pages/contacts/group_select_page.dart b/lib/pages/common/contacts/group_select_page.dart
similarity index 100%
rename from lib/pages/contacts/group_select_page.dart
rename to lib/pages/common/contacts/group_select_page.dart
diff --git a/lib/pages/common/contacts/new_friend_page.dart b/lib/pages/common/contacts/new_friend_page.dart
new file mode 100644
index 0000000..7d8a6cd
--- /dev/null
+++ b/lib/pages/common/contacts/new_friend_page.dart
@@ -0,0 +1,467 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_friend_application.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_friend_check_result.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_user_full_info.dart';
+import 'package:wechat_flutter/im/im_handle/Im_api.dart';
+import 'package:wechat_flutter/im/im_handle/im_friend_api.dart';
+import 'package:wechat_flutter/pages/common/contacts/contact_system_page.dart';
+import 'package:wechat_flutter/pages/common/contacts/contacts_details_page.dart';
+import 'package:wechat_flutter/pages/common/more/add_friend_details.dart';
+import 'package:wechat_flutter/tools/config/app_config.dart';
+import 'package:wechat_flutter/tools/theme/my_theme.dart';
+import 'package:wechat_flutter/tools/func/func.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+import 'package:wechat_flutter/ui/item/circle_item_widget.dart';
+import 'package:wechat_flutter/ui/orther/label_row.dart';
+import 'package:wechat_flutter/ui/view/list_tile_view.dart';
+import 'package:wechat_flutter/ui/view/search_main_view.dart';
+import 'package:wechat_flutter/ui/view/search_tile_view.dart';
+import 'package:wechat_flutter/ui_commom/image/sw_image.dart';
+
+class NewFriendPage extends StatefulWidget {
+ @override
+ _NewFriendPageState createState() => new _NewFriendPageState();
+}
+
+class _NewFriendPageState extends State<NewFriendPage> {
+ bool isSearch = false;
+ bool showBtn = false;
+ bool isResult = false;
+
+ String? currentUser;
+
+ List<V2TimFriendApplication?>? allData = [];
+
+ /// 是否是好友数据 key=用户id
+ Map<String, bool> isFriendData = {};
+ bool isLoadOk = false;
+
+ FocusNode searchF = new FocusNode();
+ TextEditingController searchC = new TextEditingController();
+
+ @override
+ void initState() {
+ super.initState();
+ getData();
+ }
+
+ Future getData() async {
+ allData = await ImFriendApi.getFriendApplicationList();
+
+ List<String> userIdList = [];
+
+ /// 处理数据
+ if (listNoEmpty(allData)) {
+ for (int i = 0; i < allData!.length; i++) {
+ userIdList.add(allData![i]!.userID);
+
+ final int addTime = allData![i]!.addTime!;
+ bool isNeedInsert = addTime <=
+ DateTime.now().subtract(Duration(days: 3)).millisecondsSinceEpoch ~/
+ 1000;
+ if (isNeedInsert) {
+ allData!.insert(
+ i, V2TimFriendApplication(userID: 'Three days ago', type: -1));
+ break;
+ }
+ }
+
+ allData!.insert(
+ 0, V2TimFriendApplication(userID: 'Nearly three days', type: -1));
+ }
+
+ List<V2TimFriendCheckResult> checkFriend =
+ (await ImFriendApi.checkFriend(userIdList)) ?? [];
+ for (V2TimFriendCheckResult result in checkFriend) {
+ /// result.resultType = 3 表示双向好友
+ isFriendData[result.userID] = result.resultType == 3;
+ print("新数据::${isFriendData.toString()}");
+ }
+
+ isLoadOk = true;
+ if (mounted) setState(() {});
+ }
+
+ Widget buildItem(item) {
+ return new ListTileView(
+ border: item['title'] == '雷达加朋友'
+ ? null
+ : Border(top: BorderSide(color: lineColor, width: 0.2)),
+ title: item['title'],
+ label: item['label'],
+ );
+ }
+
+ Widget titleWidget(String title) {
+ return Container(
+ width: FrameSize.winWidth(),
+ padding: EdgeInsets.symmetric(horizontal: 15, vertical: 10),
+ color: Colors.grey.withOpacity(0.2),
+ child: Text(title),
+ );
+ }
+
+ Widget body() {
+ var content = [
+ new SearchMainView(
+ text: '${AppConfig.appName}号/手机号',
+ isBorder: true,
+ onTap: () {
+ isSearch = true;
+ setState(() {});
+ searchF.requestFocus();
+ },
+ ),
+ new LabelRow(
+ headW: new Padding(
+ padding: EdgeInsets.only(right: 15.0),
+ child: new Image.asset('assets/images/contact/ic_voice.png',
+ width: 25, fit: BoxFit.cover),
+ ),
+ label: '添加手机联系人',
+ onPressed: () {
+ Get.to(ContactSystemPage());
+ },
+ ),
+
+ /// 不需要显示暂无数据模式
+ // if (!listNoEmpty(allData) && isLoadOk) NoDataView(),
+ ...List.generate(allData!.length, (index) {
+ V2TimFriendApplication friendModel = allData![index]!;
+ if (friendModel.userID == "Nearly three days" &&
+ friendModel.type == -1) {
+ return titleWidget("近三天");
+ } else if (friendModel.userID == "Three days ago" &&
+ friendModel.type == -1) {
+ return titleWidget("三天前");
+ } else {
+ return CircleItemWidget(
+ type: 2,
+ imageUrl: friendModel.faceUrl ?? AppConfig.mockCover,
+ title: friendModel.nickname ?? "",
+ des: friendModel.addWording ?? "",
+ onTap: () {
+ Get.to(
+ ContactsDetailsPage(
+ id: friendModel.userID,
+ title: friendModel.nickname ?? "",
+ avatar: friendModel.faceUrl ?? AppConfig.mockCover,
+ friendModel: friendModel,
+ ),
+ );
+ },
+ endWidget: isFriendData[friendModel.userID]!
+ ? Text("已添加")
+ : Container(
+ alignment: Alignment.center,
+ width: 45,
+ padding: EdgeInsets.symmetric(vertical: 5),
+ decoration: BoxDecoration(
+ color: MyTheme.themeColor()[200],
+ borderRadius: BorderRadius.all(Radius.circular(3)),
+ ),
+ child: Text(
+ '查看',
+ style: TextStyle(color: MyTheme.themeColor()),
+ ),
+ ),
+ );
+ }
+ })
+ ];
+
+ return new Column(children: content);
+ }
+
+ List<Widget> searchBody() {
+ if (isResult) {
+ return [
+ new Container(
+ color: Colors.white,
+ width: FrameSize.winWidth(),
+ height: 110.0,
+ alignment: Alignment.center,
+ child: new Text(
+ '该用户不存在',
+ style: TextStyle(color: mainTextColor),
+ ),
+ ),
+ new Space(height: mainSpace),
+ new SearchTileView(searchC.text, type: 1),
+ new Container(
+ color: Colors.white,
+ width: FrameSize.winWidth(),
+ height: (FrameSize.winHeight() - 185 * 1.38),
+ )
+ ];
+ } else {
+ return [
+ new SearchTileView(
+ searchC.text,
+ onPressed: () => search(searchC.text),
+ ),
+ new Container(
+ color: strNoEmpty(searchC.text) ? Colors.white : appBarColor,
+ width: FrameSize.winWidth(),
+ height: strNoEmpty(searchC.text)
+ ? (FrameSize.winHeight() - 65 * 2.1) -
+ FrameSize.winKeyHeight(context)
+ : FrameSize.winHeight(),
+ )
+ ];
+ }
+ }
+
+ unFocusMethod() {
+ searchF.unfocus();
+ isSearch = false;
+ if (isResult) isResult = !isResult;
+ setState(() {});
+ }
+
+ /// 搜索好友
+ Future search(String userName) async {
+ final List<V2TimUserFullInfo>? data = await ImApi.getUsersInfo([userName]);
+ if (!listNoEmpty(data)) {
+ q1Toast("未找到用户");
+ return;
+ }
+ V2TimUserFullInfo model = data![0];
+ if (strNoEmpty("${model.allowType ?? ''}")) {
+ Get.to(new AddFriendsDetails(
+ 'search', model.userID, model.faceUrl, model.nickName, model.gender));
+ } else {
+ isResult = true;
+ setState(() {});
+ }
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ var leading = new InkWell(
+ child: new Container(
+ width: 15,
+ height: 28,
+ child: new Icon(CupertinoIcons.back, color: Colors.black),
+ ),
+ onTap: () => unFocusMethod(),
+ );
+
+ // ignore: unused_element
+ List<Widget> searchView() {
+ return [
+ new Expanded(
+ child: new TextField(
+ style: TextStyle(textBaseline: TextBaseline.alphabetic),
+ focusNode: searchF,
+ controller: searchC,
+ decoration: InputDecoration(
+ hintText: '${AppConfig.appName}号/手机号',
+ border: InputBorder.none),
+ onChanged: (txt) {
+ if (strNoEmpty(searchC.text))
+ showBtn = true;
+ else
+ showBtn = false;
+ if (isResult) isResult = false;
+
+ setState(() {});
+ },
+ textInputAction: TextInputAction.search,
+ onSubmitted: (txt) => search(txt),
+ ),
+ ),
+ strNoEmpty(searchC.text)
+ ? new InkWell(
+ child: new Image.asset('assets/images/ic_delete.webp'),
+ onTap: () {
+ searchC.text = '';
+ setState(() {});
+ },
+ )
+ : new Container()
+ ];
+ }
+
+ var bodyView = new SingleChildScrollView(
+ child: isSearch
+ ? new GestureDetector(
+ child: new Column(children: searchBody()),
+ onTap: () => unFocusMethod(),
+ )
+ : body(),
+ );
+
+ var rWidget = new TextButton(
+ onPressed: () => Get.toNamed(RouteConfig.addFriendPage),
+ child: new Text('添加朋友'),
+ );
+
+ return WillPopScope(
+ child: new Scaffold(
+ backgroundColor: appBarColor,
+ appBar: new ComMomBar(
+ leadingW: isSearch ? leading : null,
+ title: '新的朋友',
+ titleW: isSearch ? new Row(children: searchView()) : null,
+ rightDMActions: !isSearch ? [rWidget] : [],
+ ),
+ body: bodyView,
+ ),
+ onWillPop: () async {
+ if (isSearch) {
+ unFocusMethod();
+ } else {
+ Navigator.pop(context);
+ }
+ return false;
+ },
+ );
+ }
+}
+
+class SearchMainViewNew extends StatefulWidget {
+ final TextEditingController controller;
+ final Function(bool hasFocus) onCallFocus;
+ final ValueChanged<String> onChanged;
+ final Color? color;
+ final GestureTapCallback? onTap;
+ final String? hintText;
+ final ValueChanged<String>? onSubmitted;
+
+ const SearchMainViewNew(
+ {required this.controller,
+ required this.onCallFocus,
+ required this.onChanged,
+ this.onSubmitted,
+ this.color,
+ this.onTap,
+ this.hintText,
+ Key? key})
+ : super(key: key);
+
+ @override
+ State<SearchMainViewNew> createState() => _SearchMainViewNewState();
+}
+
+class _SearchMainViewNewState extends State<SearchMainViewNew> {
+ bool isSearch = false;
+
+ FocusNode focusNode = FocusNode();
+
+ @override
+ void initState() {
+ super.initState();
+
+ focusNode.addListener(() {
+ if (!focusNode.hasFocus) {
+ isSearch = false;
+ setState(() {});
+ } else {
+ if (!isSearch) {
+ isSearch = true;
+ setState(() {});
+ }
+ }
+ widget.onCallFocus.call(focusNode.hasFocus);
+ });
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ TextStyle hintStyle = TextStyle(color: Colors.grey, fontSize: 15);
+ String hintText = widget.hintText ?? "搜索";
+ return MyInkWell(
+ child: Row(
+ children: [
+ Expanded(
+ child: Container(
+ margin: EdgeInsets.symmetric(horizontal: 10, vertical: 5),
+ height: 35,
+ decoration: BoxDecoration(
+ color: widget.color == null ? Colors.white : widget.color,
+ borderRadius: BorderRadius.all(Radius.circular(5))),
+ alignment: Alignment.center,
+ child: Row(
+ mainAxisAlignment: MainAxisAlignment.center,
+ crossAxisAlignment: CrossAxisAlignment.center,
+ children: [
+ Space(width: 5),
+ SwImage(
+ 'assets/images/contact/ic_search_long.png',
+ color: Colors.grey,
+ width: 20,
+ ),
+ Space(width: 5),
+ if (isSearch)
+ Expanded(
+ child: TextField(
+ autofocus: true,
+ expands: true,
+ maxLines: null,
+ focusNode: focusNode,
+ controller: widget.controller,
+ textInputAction: TextInputAction.search,
+ onSubmitted: widget.onSubmitted,
+ decoration: InputDecoration(
+ hintStyle: hintStyle,
+ hintText: hintText,
+ border: InputBorder.none,
+ contentPadding: EdgeInsets.symmetric(vertical: 5),
+ ),
+ onChanged: (value) {
+ if (mounted) setState(() {});
+ widget.onChanged(value);
+ },
+ ),
+ )
+ else
+ Text(
+ hintText,
+ style: hintStyle,
+ ),
+ () {
+ if (!strNoEmpty(widget.controller.text) || !isSearch) {
+ return Container();
+ }
+ return SwImage(
+ 'images/main/ic_delete.webp',
+ width: 15,
+ margin: EdgeInsets.symmetric(horizontal: 10, vertical: 3),
+ onTap: () {
+ widget.controller.text = "";
+ setState(() {});
+
+ widget.onChanged("");
+ },
+ );
+ }()
+ ],
+ ),
+ ),
+ ),
+ if (isSearch)
+ TextButton(
+ style: ButtonStyle(
+ shadowColor: MaterialStateProperty.all(Colors.transparent),
+ overlayColor: MaterialStateProperty.all(Colors.transparent),
+ backgroundColor: MaterialStateProperty.all(Colors.transparent),
+ ),
+ onPressed: () {
+ focusNode.unfocus();
+ },
+ child: Text('取消'),
+ )
+ ],
+ ),
+ onTap: widget.onTap ??
+ () {
+ isSearch = true;
+ focusNode.requestFocus();
+ setState(() {});
+ },
+ );
+ }
+}
diff --git a/lib/pages/contacts/public_page.dart b/lib/pages/common/contacts/public_page.dart
similarity index 100%
rename from lib/pages/contacts/public_page.dart
rename to lib/pages/common/contacts/public_page.dart
diff --git a/lib/pages/discover/discover_page.dart b/lib/pages/common/discover/discover_page.dart
similarity index 66%
rename from lib/pages/discover/discover_page.dart
rename to lib/pages/common/discover/discover_page.dart
index 0477e09..8d3a0ea 100644
--- a/lib/pages/discover/discover_page.dart
+++ b/lib/pages/common/discover/discover_page.dart
@@ -1,5 +1,6 @@
-import 'package:wechat_flutter/pages/settings/language_page.dart';
-import 'package:wechat_flutter/pages/wechat_friends/page/wechat_friends_circle.dart';
+import 'package:get/get.dart';
+import 'package:wechat_flutter/pages/common/tools/scan_page.dart';
+import 'package:wechat_flutter/pages/common/wechat_friends/page/wechat_friends_circle.dart';
import 'package:wechat_flutter/ui/view/indicator_page_view.dart';
import 'package:flutter/material.dart';
@@ -12,12 +13,28 @@ class DiscoverPage extends StatefulWidget {
}
class _DiscoverPageState extends State<DiscoverPage> {
+ action(String? value) {
+ switch (value) {
+ case "朋友圈":
+ Get.to(new WeChatFriendsCircle());
+ break;
+ case "扫一扫":
+ Get.to(new ScanPage());
+ break;
+ default:
+ q1Toast( "开发中");
+ break;
+ }
+ }
+
Widget buildContent(item) {
bool isShow() {
if (item['name'] == '朋友圈' ||
+ item['name'] == '社交圈' ||
item['name'] == '摇一摇' ||
item['name'] == '搜一搜' ||
item['name'] == '附近的餐厅' ||
+ item['name'] == '购物' ||
item['name'] == '游戏' ||
item['name'] == '小程序') {
return true;
@@ -37,11 +54,7 @@ class _DiscoverPageState extends State<DiscoverPage> {
icon: item['icon'],
margin: EdgeInsets.only(bottom: isShow() ? 10.0 : 0.0),
onPressed: () {
- if (item['name'] == '朋友圈') {
- routePush(new WeChatFriendsCircle());
- } else {
- routePush(new LanguagePage());
- }
+ action(item['name']);
},
);
}
@@ -49,17 +62,10 @@ class _DiscoverPageState extends State<DiscoverPage> {
@override
Widget build(BuildContext context) {
List data = [
- {'icon': 'assets/images/discover/ff_Icon_album.webp', 'name': '朋友圈'},
+ {'icon': 'assets/images/discover/ff_Icon_album.webp', 'name': '社交圈'},
{'icon': 'assets/images/discover/ff_Icon_qr_code.webp', 'name': '扫一扫'},
- {'icon': 'assets/images/discover/ff_Icon_shake.webp', 'name': '摇一摇'},
- {'icon': 'assets/images/discover/ff_Icon_browse.webp', 'name': '看一看'},
- {'icon': 'assets/images/discover/ff_Icon_search.webp', 'name': '搜一搜'},
- {'icon': 'assets/images/discover/ff_Icon_nearby.webp', 'name': '附近的人'},
- {'icon': 'assets/images/discover/ff_Icon_bottle.webp', 'name': '漂流瓶'},
- {'icon': 'assets/images/discover/ff_Icon_qr_code.webp', 'name': '附近的餐厅'},
{'icon': 'assets/images/discover/ff_Icon_qr_code.webp', 'name': '购物'},
{'icon': 'assets/images/discover/game_center_h5.webp', 'name': '游戏'},
- {'icon': 'assets/images/discover/mini_program.webp', 'name': '小程序'},
];
return new Scaffold(
diff --git a/lib/pages/group/group_billboard_page.dart b/lib/pages/common/group/group_billboard_page.dart
similarity index 69%
rename from lib/pages/group/group_billboard_page.dart
rename to lib/pages/common/group/group_billboard_page.dart
index 4b6433e..6c28670 100644
--- a/lib/pages/group/group_billboard_page.dart
+++ b/lib/pages/common/group/group_billboard_page.dart
@@ -1,16 +1,14 @@
import 'package:flutter/material.dart';
-import 'package:wechat_flutter/im/fun_dim_group_model.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
class GroupBillBoardPage extends StatefulWidget {
- final String groupOwner;
- final String groupNotice;
- final String groupId;
- final String time;
- final Callback callback;
+ final String? groupOwner;
+ final String? groupNotice;
+ final String? groupId;
+ final Callback? callback;
GroupBillBoardPage(this.groupOwner, this.groupNotice,
- {this.groupId, this.time, this.callback});
+ {this.groupId, this.callback});
@override
_GroupBillBoardPageState createState() => _GroupBillBoardPageState();
@@ -20,7 +18,7 @@ class _GroupBillBoardPageState extends State<GroupBillBoardPage> {
bool inputState = false;
FocusNode _focusNode = FocusNode();
TextEditingController _textController = new TextEditingController();
- String _publishTime;
+ String? _publishTime;
TextStyle styleLabel =
TextStyle(fontSize: 12.0, color: Colors.black.withOpacity(0.8));
@@ -28,20 +26,11 @@ class _GroupBillBoardPageState extends State<GroupBillBoardPage> {
@override
void initState() {
super.initState();
- _textController.text = widget.groupNotice;
+ _textController.text = widget.groupNotice!;
}
onChange() {
if (inputState) {
- _publishTime = '${DateTime.now().year}-' +
- '${DateTime.now().month}-' +
- '${DateTime.now().day} ' +
- '${DateTime.now().hour}:' +
- '${DateTime.now().minute}';
- debugPrint('发布时间>>>>> $_publishTime');
- DimGroup.modifyGroupNotificationModel(
- widget.groupId, _textController.text, _publishTime);
- widget.callback(_publishTime);
Navigator.pop(context, _textController.text);
inputState = false;
} else {
diff --git a/lib/pages/group/group_details_page.dart b/lib/pages/common/group/group_details_page.dart
similarity index 53%
rename from lib/pages/group/group_details_page.dart
rename to lib/pages/common/group/group_details_page.dart
index 85f5951..9b562bb 100644
--- a/lib/pages/group/group_details_page.dart
+++ b/lib/pages/common/group/group_details_page.dart
@@ -1,26 +1,26 @@
-import 'dart:convert';
-
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
-import 'package:wechat_flutter/im/friend/fun_dim_friend.dart';
-import 'package:wechat_flutter/im/fun_dim_group_model.dart';
-import 'package:wechat_flutter/im/group/fun_dim_info.dart';
-import 'package:wechat_flutter/pages/group/group_billboard_page.dart';
-import 'package:wechat_flutter/pages/group/group_member_details.dart';
-import 'package:wechat_flutter/pages/group/group_members_page.dart';
-import 'package:wechat_flutter/pages/group/group_remarks_page.dart';
-import 'package:wechat_flutter/pages/group/select_members_page.dart';
-import 'package:wechat_flutter/pages/home/search_page.dart';
-import 'package:wechat_flutter/pages/mine/code_page.dart';
-import 'package:wechat_flutter/pages/settings/chat_background_page.dart';
-import 'package:wechat_flutter/tools/commom.dart';
+import 'package:get/get.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_group_info.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_group_member_full_info.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_group_member_info_result.dart';
+import 'package:wechat_flutter/im/im_handle/im_group_api.dart';
+import 'package:wechat_flutter/pages/common/chat/search_record_page.dart';
+import 'package:wechat_flutter/pages/common/group/group_billboard_page.dart';
+import 'package:wechat_flutter/pages/common/group/group_member_details.dart';
+import 'package:wechat_flutter/pages/common/group/group_members_page.dart';
+import 'package:wechat_flutter/pages/common/group/group_remarks_page.dart';
+import 'package:wechat_flutter/pages/common/group/select_members_page.dart';
+import 'package:wechat_flutter/pages/common/mine/code_page.dart';
+import 'package:wechat_flutter/pages/common/settings/chat_background_page.dart';
+import 'package:wechat_flutter/tools/func/commom.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
import 'package:wechat_flutter/ui/dialog/confirm_alert.dart';
import 'package:wechat_flutter/ui/view/indicator_page_view.dart';
class GroupDetailsPage extends StatefulWidget {
- final String peer;
- final Callback callBack;
+ final String? peer;
+ final Callback? callBack;
GroupDetailsPage(this.peer, {this.callBack});
@@ -41,153 +41,142 @@ class _GroupDetailsPageState extends State<GroupDetailsPage> {
/// 是否免打扰
bool _dnd = false;
- String groupName;
- String groupNotification;
- String time;
String cardName = '默认';
- /// 是否群的创建者
- bool isGroupOwner = false;
-
/// 成员列表数据
- List memberList = [
- {'user': '+'},
-// {'user': '-'}
+ List<V2TimGroupMemberFullInfo> memberList = [
+ V2TimGroupMemberFullInfo(userID: '+'),
+ // V2TimGroupMemberFullInfo(userID: '-'),
];
- List dataGroup;
+ V2TimGroupInfo? dataGroupInfo;
+
+ String get groupNotification {
+ return strNoEmpty(dataGroupInfo!.notification.toString())
+ ? dataGroupInfo!.notification.toString()
+ : '暂无公告';
+ }
@override
void initState() {
super.initState();
- _getGroupMembers();
- _getGroupInfo();
+ try {
+ _getGroupMembers();
+ _getGroupInfo();
+ } catch (e) {
+ print("出现错误::${e.toString()}");
+ q1Toast("群聊异常");
+ }
getCardName();
}
getCardName() async {
- await InfoModel.getSelfGroupNameCardModel(widget.peer, callback: (str) {
- cardName = str.toString();
- setState(() {});
- });
+ // await InfoModel.getSelfGroupNameCardModel(widget.peer, callback: (str) {
+ // cardName = str.toString();
+ // setState(() {});
+ // });
}
// 获取群组信息
- _getGroupInfo() {
- DimGroup.getGroupInfoListModel([widget.peer], callback: (result) async {
- dataGroup = json.decode(result.toString().replaceAll("'", '"'));
- final user = await SharedUtil.instance.getString(Keys.account);
- isGroupOwner = dataGroup[0]['groupOwner'] == user;
- groupName = dataGroup[0]['groupName'].toString();
- String notice = strNoEmpty(dataGroup[0]['groupNotification'].toString())
- ? dataGroup[0]['groupNotification'].toString()
- : '暂无公告';
- groupNotification = notice;
- time = dataGroup[0]['groupIntroduction'].toString();
- setState(() {});
- });
+ _getGroupInfo() async {
+ dataGroupInfo =
+ (await ImGroupApi.getGroupsInfo([widget.peer!]))![0].groupInfo;
+ setState(() {});
}
// 获取群成员列表
_getGroupMembers() async {
- await DimGroup.getGroupMembersListModelLIST(widget.peer,
- callback: (result) {
- memberList.insertAll(
- 0, json.decode(result.toString().replaceAll("'", '"')));
- setState(() {});
- });
+ final V2TimGroupMemberInfoResult? result =
+ await (ImGroupApi.getGroupMemberList(widget.peer!));
+ if (result == null) {
+ LogUtil.d("获取群成员失败");
+ return;
+ }
+
+ memberList.insertAll(
+ 0, result.memberInfoList as Iterable<V2TimGroupMemberFullInfo>);
+ setState(() {});
}
/// 成员item的UI序列渲染
- Widget memberItem(item) {
- List<dynamic> userInfo;
- String uId;
- String uFace = '';
- String nickName;
-
+ Widget memberItem(V2TimGroupMemberFullInfo item) {
/// "+" 和 "-"
- if (item['user'] == "+" || item['user'] == '-') {
+ if (item.userID == "+" || item.userID == '-') {
return new InkWell(
child: new SizedBox(
- width: (winWidth(context) - 60) / 5,
+ width: (FrameSize.winWidth() - 60) / 5,
child: Image.asset(
- 'assets/images/group/${item['user']}.png',
+ 'assets/images/group/${item.userID}.png',
height: 48.0,
width: 48.0,
),
),
/// "+" 和 "-" 点击之后
- onTap: () => routePush(new SelectMembersPage()),
+ onTap: () => Get.to(new SelectMembersPage()),
);
}
- return new FutureBuilder(
- future: DimFriend.getUsersProfile(item['user'], (cb) {
- userInfo = json.decode(cb.toString());
- uId = userInfo[0]['identifier'];
- uFace = userInfo[0]['faceUrl'];
- nickName = userInfo[0]['nickName'];
- }),
- builder: (context, snap) {
- return new SizedBox(
- width: (winWidth(context) - 60) / 5,
- child: FlatButton(
- onPressed: () =>
- routePush(GroupMemberDetails(Data.user() == uId, uId)),
- padding: EdgeInsets.all(0),
- highlightColor: Colors.transparent,
- child: Column(
- children: <Widget>[
- ClipRRect(
- borderRadius: BorderRadius.all(Radius.circular(5)),
- child: !strNoEmpty(uFace)
- ? new Image.asset(
- defIcon,
- height: 48.0,
- width: 48.0,
- fit: BoxFit.cover,
- )
- : CachedNetworkImage(
- imageUrl: uFace,
- height: 48.0,
- width: 48.0,
- cacheManager: cacheManager,
- fit: BoxFit.cover,
- ),
- ),
- SizedBox(height: 2),
- Container(
- alignment: Alignment.center,
- height: 20.0,
- width: 50,
- child: Text(
- '${!strNoEmpty(nickName) ? uId : nickName.length > 4 ? '${nickName.substring(0, 3)}...' : nickName}',
- style: TextStyle(fontSize: 12.0),
- ),
- ),
- ],
+
+ return new SizedBox(
+ width: (FrameSize.winWidth() - 60) / 5,
+ child: TextButton(
+ onPressed: () => Get.to(
+ GroupMemberDetails(Q1Data.user() == item.userID, item.userID)),
+ style: ButtonStyle(
+ backgroundColor: MaterialStateProperty.all(Colors.white),
+ padding: MaterialStateProperty.all(EdgeInsets.all(0)),
+ overlayColor: MaterialStateProperty.all(Colors.transparent),
+ ),
+ child: Column(
+ children: <Widget>[
+ ClipRRect(
+ borderRadius: BorderRadius.all(Radius.circular(5)),
+ child: !strNoEmpty(item.faceUrl)
+ ? new Image.asset(
+ defIcon,
+ height: 48.0,
+ width: 48.0,
+ fit: BoxFit.cover,
+ )
+ : CachedNetworkImage(
+ imageUrl: item.faceUrl!,
+ height: 48.0,
+ width: 48.0,
+ cacheManager: cacheManager,
+ fit: BoxFit.cover,
+ ),
),
- ),
- );
- },
+ SizedBox(height: 2),
+ Container(
+ alignment: Alignment.center,
+ height: 20.0,
+ width: 50,
+ child: Text(
+ '${!strNoEmpty(item.nickName) ? item.userID : item.nickName!.length > 4 ? '${item.nickName!.substring(0, 3)}...' : item.nickName}',
+ style: TextStyle(fontSize: 12.0),
+ ),
+ ),
+ ],
+ ),
+ ),
);
}
// 设置消息免打扰
_setDND(int type) {
- DimGroup.setReceiveMessageOptionModel(widget.peer, Data.user(), type,
- callback: (_) {});
+ // DimGroup.setReceiveMessageOptionModel(widget.peer, Q1Data.user(), type,
+ // callback: (_) {});
}
@override
Widget build(BuildContext context) {
SizeConfig().init(context);
- if (!listNoEmpty(dataGroup)) {
+ if (dataGroupInfo == null) {
return new Container(color: Colors.white);
}
return Scaffold(
backgroundColor: Color(0xffEDEDED),
- appBar: new ComMomBar(title: '聊天信息 (${dataGroup[0]['memberNum']})'),
+ appBar: new ComMomBar(title: '聊天信息 (${dataGroupInfo!.memberCount})'),
body: new ScrollConfiguration(
behavior: MyBehavior(),
child: new ListView(
@@ -195,7 +184,7 @@ class _GroupDetailsPageState extends State<GroupDetailsPage> {
new Container(
color: Colors.white,
padding: EdgeInsets.only(top: 10.0, bottom: 10),
- width: winWidth(context),
+ width: FrameSize.winWidth(),
child: Wrap(
runSpacing: 20.0,
spacing: 10,
@@ -204,22 +193,24 @@ class _GroupDetailsPageState extends State<GroupDetailsPage> {
),
new Visibility(
visible: memberList.length > 20,
- child: new FlatButton(
- padding: EdgeInsets.only(top: 15.0, bottom: 20.0),
- color: Colors.white,
+ child: new TextButton(
+ style: ButtonStyle(
+ backgroundColor: MaterialStateProperty.all(Colors.white),
+ padding: MaterialStateProperty.all(EdgeInsets.only(top: 15.0, bottom: 20.0)),
+ ),
child: new Text(
'查看全部群成员',
style: TextStyle(fontSize: 14.0, color: Colors.black54),
),
- onPressed: () => routePush(new GroupMembersPage(widget.peer)),
+ onPressed: () => Get.to(new GroupMembersPage(widget.peer)),
),
),
SizedBox(height: 10.0),
functionBtn(
'群聊名称',
- detail: groupName.toString().length > 7
- ? '${groupName.toString().substring(0, 6)}...'
- : groupName.toString(),
+ detail: dataGroupInfo!.groupName.toString().length > 7
+ ? '${dataGroupInfo!.groupName.toString().substring(0, 6)}...'
+ : dataGroupInfo!.groupName.toString(),
),
functionBtn(
'群二维码',
@@ -231,7 +222,7 @@ class _GroupDetailsPageState extends State<GroupDetailsPage> {
detail: groupNotification.toString(),
),
new Visibility(
- visible: isGroupOwner,
+ visible: dataGroupInfo!.owner == Q1Data.user(),
child: functionBtn('群管理'),
),
functionBtn('备注'),
@@ -282,38 +273,40 @@ class _GroupDetailsPageState extends State<GroupDetailsPage> {
new Space(),
functionBtn('清空聊天记录'),
new Space(),
- FlatButton(
- padding: EdgeInsets.symmetric(vertical: 15.0, horizontal: 20.0),
- color: Colors.white,
+ TextButton(
+ style: ButtonStyle(
+ backgroundColor: MaterialStateProperty.all(Colors.white),
+ padding: MaterialStateProperty.all(EdgeInsets.symmetric(vertical: 15.0, horizontal: 20.0)),
+ ),
onPressed: () {
if (widget.peer == '') return;
confirmAlert(context, (isOK) {
if (isOK) {
- DimGroup.quitGroupModel(widget.peer, callback: (str) {
- if (str.toString().contains('失败')) {
- print('失败了，开始执行解散');
- DimGroup.deleteGroupModel(widget.peer,
- callback: (data) {
- if (str.toString().contains('成功')) {
- Navigator.of(context).pop();
- Navigator.of(context).pop();
- if (Navigator.canPop(context)) {
- Navigator.of(context).pop();
- }
- print('解散群聊成功');
- showToast(context, '解散群聊成功');
- }
- });
- } else if (str.toString().contains('succ')) {
- Navigator.of(context).pop();
- Navigator.of(context).pop();
- if (Navigator.canPop(context)) {
- Navigator.of(context).pop();
- }
- print('退出成功');
- showToast(context, '退出成功');
- }
- });
+ // DimGroup.quitGroupModel(widget.peer, callback: (str) {
+ // if (str.toString().contains('失败')) {
+ // print('失败了，开始执行解散');
+ // DimGroup.deleteGroupModel(widget.peer,
+ // callback: (data) {
+ // if (str.toString().contains('成功')) {
+ // Navigator.of(context).pop();
+ // Navigator.of(context).pop();
+ // if (Navigator.canPop(context)) {
+ // Navigator.of(context).pop();
+ // }
+ // print('解散群聊成功');
+ // q1Toast( '解散群聊成功');
+ // }
+ // });
+ // } else if (str.toString().contains('succ')) {
+ // Navigator.of(context).pop();
+ // Navigator.of(context).pop();
+ // if (Navigator.canPop(context)) {
+ // Navigator.of(context).pop();
+ // }
+ // print('退出成功');
+ // q1Toast( '退出成功');
+ // }
+ // });
}
}, tips: '确定要退出本群吗？');
},
@@ -338,38 +331,44 @@ class _GroupDetailsPageState extends State<GroupDetailsPage> {
handle(String title) {
switch (title) {
case '备注':
- routePush(new GroupRemarksPage());
+ Get.to(new GroupRemarksPage());
break;
case '群聊名称':
- routePush(
+ Get.to(
new GroupRemarksPage(
groupInfoType: GroupInfoType.name,
- text: groupName,
+ text: dataGroupInfo!.groupName,
groupId: widget.peer,
),
- ).then((data) {
- groupName = data ?? groupName;
- Notice.send(WeChatActions.groupName(), groupName);
+ )!
+ .then((data) {
+ dataGroupInfo!.groupName = data ?? dataGroupInfo!.groupName;
+ Notice.send(WeChatActions.groupName(), dataGroupInfo!.groupName);
});
break;
case '群二维码':
- routePush(new CodePage(true));
+ Get.to(
+ new CodePage(
+ isGroup: true,
+ id: dataGroupInfo!.groupID,
+ dataGroupInfo: dataGroupInfo,
+ ),
+ );
break;
case '群公告':
- routePush(
+ Get.to(
new GroupBillBoardPage(
- dataGroup[0]['groupOwner'],
- groupNotification,
+ dataGroupInfo!.owner,
+ dataGroupInfo!.notification,
groupId: widget.peer,
- time: time,
- callback: (timeData) => time = timeData,
),
- ).then((data) {
- groupNotification = data ?? groupNotification;
+ )!
+ .then((data) {
+ dataGroupInfo!.notification = data ?? dataGroupInfo!.notification;
});
break;
case '查找聊天记录':
- routePush(new SearchPage());
+ Get.to(new SearchRecordPage(true, dataGroupInfo!.groupID));
break;
case '消息免打扰':
_dnd = !_dnd;
@@ -381,27 +380,28 @@ class _GroupDetailsPageState extends State<GroupDetailsPage> {
_top ? _setTop(1) : _setTop(2);
break;
case '设置当前聊天背景':
- routePush(new ChatBackgroundPage());
+ Get.to(new ChatBackgroundPage());
break;
case '我在群里的昵称':
- routePush(
+ Get.to(
new GroupRemarksPage(
groupInfoType: GroupInfoType.cardName,
text: cardName,
groupId: widget.peer,
),
- ).then((data) {
+ )!
+ .then((data) {
cardName = data ?? cardName;
});
break;
case '投诉':
- routePush(new WebViewPage(helpUrl, '投诉'));
+ Get.to(new WebViewPage(helpUrl, '投诉'));
break;
case '清空聊天记录':
confirmAlert(
context,
(isOK) {
- if (isOK) showToast(context, '敬请期待');
+ if (isOK) q1Toast('敬请期待');
},
tips: '确定删除群的聊天记录吗？',
okBtn: '清空',
@@ -417,8 +417,8 @@ class _GroupDetailsPageState extends State<GroupDetailsPage> {
* */
functionBtn(
title, {
- final String detail,
- final Widget right,
+ final String? detail,
+ final Widget? right,
}) {
return GroupItem(
detail: detail,
@@ -430,10 +430,10 @@ class _GroupDetailsPageState extends State<GroupDetailsPage> {
}
class GroupItem extends StatelessWidget {
- final String detail;
- final String title;
- final VoidCallback onPressed;
- final Widget right;
+ final String? detail;
+ final String? title;
+ final VoidCallback? onPressed;
+ final Widget? right;
GroupItem({
this.detail,
@@ -447,9 +447,9 @@ class GroupItem extends StatelessWidget {
if (detail == null && detail == '') {
return new Container();
}
- double widthT() {
+ double? widthT() {
if (detail != null) {
- return detail.length > 35 ? SizeConfig.blockSizeHorizontal * 60 : null;
+ return detail!.length > 35 ? SizeConfig.blockSizeHorizontal * 60 : null;
} else {
return null;
}
@@ -466,10 +466,12 @@ class GroupItem extends StatelessWidget {
title == '投诉' ||
title == '清空聊天记录';
- return FlatButton(
- padding: EdgeInsets.only(left: 15, right: 15.0),
- color: Colors.white,
- onPressed: () => onPressed(),
+ return TextButton(
+ style: ButtonStyle(
+ backgroundColor: MaterialStateProperty.all(Colors.white),
+ padding: MaterialStateProperty.all(EdgeInsets.only(left: 15, right: 15.0)),
+ ),
+ onPressed: () => onPressed!(),
child: new Container(
padding: EdgeInsets.only(
top: isSwitch ? 10 : 15.0,
@@ -486,7 +488,7 @@ class GroupItem extends StatelessWidget {
new Row(
children: <Widget>[
new Expanded(
- child: Text(title),
+ child: Text(title!),
),
new Visibility(
visible: title != '群公告',
@@ -499,7 +501,7 @@ class GroupItem extends StatelessWidget {
),
),
),
- right != null ? right : new Container(),
+ right != null ? right! : new Container(),
new Space(width: 10.0),
isSwitch
? Container()
diff --git a/lib/pages/common/group/group_join_page.dart b/lib/pages/common/group/group_join_page.dart
new file mode 100644
index 0000000..59977d5
--- /dev/null
+++ b/lib/pages/common/group/group_join_page.dart
@@ -0,0 +1,86 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_callback.dart';
+import 'package:wechat_flutter/im/im_handle/im_group_api.dart';
+import 'package:wechat_flutter/im/util/im_response_tip_util.dart';
+import 'package:wechat_flutter/tools/config/app_config.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+import 'package:wechat_flutter/ui_commom/bt/small_button.dart';
+import 'package:wechat_flutter/ui_commom/image/sw_image.dart';
+
+class GroupJoinPage extends StatefulWidget {
+ final String groupId;
+
+ const GroupJoinPage({required this.groupId, Key? key}) : super(key: key);
+
+ @override
+ State<GroupJoinPage> createState() => _GroupJoinPageState();
+}
+
+class _GroupJoinPageState extends State<GroupJoinPage> {
+ TextStyle tipStyle =
+ TextStyle(color: Colors.black.withOpacity(0.6), fontSize: 14);
+
+ /// 加入群聊
+ Future join() async {
+ final V2TimCallback result = await ImGroupApi.joinGroup(widget.groupId);
+ if (result.code == 200 || result.code == 0) {
+ Get.offNamed(RouteConfig.chatPage,
+ arguments: {"id": widget.groupId, "type": 2});
+ } else {
+ q1Toast(ImResponseTipUtil.getInfoOResultCode(result.code));
+ }
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return Scaffold(
+ backgroundColor: Colors.white,
+ appBar: ComMomBar(
+ backgroundColor: Colors.white,
+ ),
+ body: ListView(
+ padding: EdgeInsets.symmetric(horizontal: 20),
+ children: [
+ Space(height: 60),
+ SwImage(
+ defGroupAvatar,
+ width: 80,
+ height: 80,
+ ),
+ Space(height: 20),
+ Center(
+ child: Text(
+ '扩列xxx(110)',
+ style: TextStyle(
+ color: Colors.black,
+ fontSize: 18,
+ fontWeight: FontWeight.w500,
+ ),
+ ),
+ ),
+ Space(height: 60),
+ HorizontalLine(),
+ Space(height: 40),
+ Padding(
+ padding: EdgeInsets.symmetric(horizontal: 20),
+ child: Text('•你需要实名验证后才能扫码进群，可绑定银行卡进行验证。', style: tipStyle),
+ ),
+ Space(height: 10),
+ Padding(
+ padding: EdgeInsets.symmetric(horizontal: 20),
+ child: Text('•为维护${AppConfig.appName}平台绿色网络环境，请勿在群内传播违法违规内容。',
+ style: tipStyle),
+ ),
+ Space(height: 190),
+ SmallButton(
+ onPressed: () => join(),
+ margin: EdgeInsets.symmetric(horizontal: 80),
+ borderRadius: BorderRadius.all(Radius.circular(10)),
+ child: Text('加入群聊'),
+ )
+ ],
+ ),
+ );
+ }
+}
diff --git a/lib/pages/group/group_member_details.dart b/lib/pages/common/group/group_member_details.dart
similarity index 100%
rename from lib/pages/group/group_member_details.dart
rename to lib/pages/common/group/group_member_details.dart
diff --git a/lib/pages/common/group/group_members_page.dart b/lib/pages/common/group/group_members_page.dart
new file mode 100644
index 0000000..54d34f8
--- /dev/null
+++ b/lib/pages/common/group/group_members_page.dart
@@ -0,0 +1,159 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:wechat_flutter/pages/common/group/select_members_page.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+class GroupMembersPage extends StatefulWidget {
+ final String? groupId;
+
+ GroupMembersPage(this.groupId);
+
+ @override
+ _GroupMembersPageState createState() => _GroupMembersPageState();
+}
+
+class _GroupMembersPageState extends State<GroupMembersPage> {
+ Future? _futureBuilderFuture;
+ List memberList = [
+ {'user': '+'},
+// {'user': '-'}
+ ];
+
+ @override
+ void initState() {
+ super.initState();
+ _futureBuilderFuture = _gerData();
+ }
+
+ handle(String? uId) {
+ if (!strNoEmpty(uId)) {
+ Get.to(new SelectMembersPage());
+// Get.to(CreateGroupChat(
+// 'invite',
+// groupId: widget.groupId,
+// callBack: (data) {
+// if (data.toString().contains('suc')) {
+// setState(() {});
+// }
+// print('邀请好友进群callback >>>> $data');
+// },
+// ));
+// } else {
+// Get.to(ConversationDetailPage(
+// title: uId,
+// type: 1,
+// ));
+ } else {
+ q1Toast( '敬请期待');
+ }
+ }
+
+ Widget memberItem(item) {
+ List userInfo;
+ String? uId;
+ String? uFace;
+ String? nickName;
+
+ if (item['user'] == "+" || item['user'] == '-') {
+ return new InkWell(
+ child: new SizedBox(
+ width: (FrameSize.winWidth() - 60) / 5,
+ child: Image.asset(
+ 'assets/images/group/${item['user']}.png',
+ height: 48.0,
+ width: 48.0,
+ ),
+ ),
+ onTap: () => handle(null),
+ );
+ }
+
+ return new SizedBox(
+ width: (FrameSize.winWidth() - 60) / 5,
+ child: TextButton(
+ onPressed: () => handle(uId),
+ style: ButtonStyle(
+ padding: MaterialStateProperty.all(EdgeInsets.all(0)),
+ overlayColor: MaterialStateProperty.all(Colors.transparent)
+ ),
+ child: Column(
+ children: <Widget>[
+ ClipRRect(
+ borderRadius: BorderRadius.all(Radius.circular(5)),
+ child: !strNoEmpty(uFace)
+ ? new Image.asset(
+ defIcon,
+ height: 48.0,
+ width: 48.0,
+ fit: BoxFit.cover,
+ )
+ : CachedNetworkImage(
+ imageUrl: uFace!,
+ height: 48.0,
+ width: 48.0,
+ cacheManager: cacheManager,
+ fit: BoxFit.cover,
+ ),
+ ),
+ SizedBox(height: 2),
+ Container(
+ alignment: Alignment.center,
+ height: 20.0,
+ width: 50,
+ child: Text(
+ nickName == null || nickName == ''
+ ? '默认昵称'
+ : nickName.length > 5
+ ? '${nickName.substring(0, 3)}...'
+ : nickName,
+ style: TextStyle(fontSize: 12.0),
+ ),
+ ),
+ ],
+ ),
+ ),
+ );
+ }
+
+ Future _gerData() async {
+ ck:
+ setState(() {
+ memberList.insertAll(0, []);
+ });
+ }
+
+ Widget titleWidget() {
+ return FutureBuilder(
+ future: _futureBuilderFuture,
+ builder: (context, snap) {
+ return new Text(
+ '聊天成员(${memberList.length != null ? memberList.length - 1 : 0})',
+ style: new TextStyle(
+ color: Colors.black, fontSize: 17.0, fontWeight: FontWeight.w600),
+ );
+ },
+ );
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ if (!listNoEmpty(memberList)) {
+ return Container();
+ }
+
+ return new Scaffold(
+ appBar: new ComMomBar(titleW: titleWidget()),
+ body: new ListView(
+ padding: EdgeInsets.all(10),
+ children: <Widget>[
+ new Wrap(
+ alignment: WrapAlignment.start,
+ children: memberList.map(memberItem).toList(),
+ runSpacing: 20.0,
+ spacing: 10,
+ ),
+ ],
+ ),
+ );
+ }
+}
diff --git a/lib/pages/group/group_remarks_page.dart b/lib/pages/common/group/group_remarks_page.dart
similarity index 90%
rename from lib/pages/group/group_remarks_page.dart
rename to lib/pages/common/group/group_remarks_page.dart
index 74b31a5..741a5b6 100644
--- a/lib/pages/group/group_remarks_page.dart
+++ b/lib/pages/common/group/group_remarks_page.dart
@@ -1,14 +1,12 @@
import 'package:flutter/material.dart';
-import 'package:wechat_flutter/im/fun_dim_group_model.dart';
-
import 'package:wechat_flutter/tools/wechat_flutter.dart';
enum GroupInfoType { remark, name, cardName }
class GroupRemarksPage extends StatefulWidget {
final GroupInfoType groupInfoType;
- final String text;
- final String groupId;
+ final String? text;
+ final String? groupId;
GroupRemarksPage({
this.groupInfoType = GroupInfoType.remark,
@@ -25,22 +23,20 @@ class _GroupRemarksPageState extends State<GroupRemarksPage> {
handle() {
if (!strNoEmpty(_textController.text)) {
- showToast(context, '请输入内容');
+ q1Toast( '请输入内容');
return;
}
if (widget.groupInfoType == GroupInfoType.name) {
- DimGroup.modifyGroupNameModel(widget.groupId, _textController.text,
- callback: (_) {});
Navigator.pop(context, _textController.text);
} else {
- showToast(context, '敬请期待');
+ q1Toast( '敬请期待');
}
}
@override
void initState() {
super.initState();
- _textController.text = widget.text;
+ _textController.text = widget.text!;
}
String get label {
@@ -142,9 +138,9 @@ class _GroupRemarksPageState extends State<GroupRemarksPage> {
new ComMomButton(
text: '完成',
onTap: () => handle(),
- width: winWidth(context) / 2,
+ width: FrameSize.winWidth() / 2,
),
- new Space(height: winKeyHeight(context) > 1 ? 15 : 50),
+ new Space(height: FrameSize.winKeyHeight(context) > 1 ? 15 : 50),
],
),
),
diff --git a/lib/pages/group/select_members_page.dart b/lib/pages/common/group/select_members_page.dart
similarity index 65%
rename from lib/pages/group/select_members_page.dart
rename to lib/pages/common/group/select_members_page.dart
index 6af8210..eadc800 100644
--- a/lib/pages/group/select_members_page.dart
+++ b/lib/pages/common/group/select_members_page.dart
@@ -1,7 +1,6 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'dart:convert';
-import 'package:flutter/services.dart';
import 'package:azlistview/azlistview.dart';
import 'package:lpinyin/lpinyin.dart';
@@ -15,7 +14,7 @@ class SelectMembersPage extends StatefulWidget {
}
class _SelectMembersPageState extends State<SelectMembersPage> {
- List<ContactInfoModel> _contacts = List();
+ List<ContactInfoModel> _contacts = [];
int _suspensionHeight = 30;
int _itemHeight = 60;
@@ -44,7 +43,7 @@ class _SelectMembersPageState extends State<SelectMembersPage> {
void _handleList(List<ContactInfoModel> list) {
if (list == null || list.isEmpty) return;
for (int i = 0, length = list.length; i < length; i++) {
- String pinyin = PinyinHelper.getPinyinE(list[i].name);
+ String pinyin = PinyinHelper.getPinyinE(list[i].name!);
String tag = pinyin.substring(0, 1).toUpperCase();
list[i].namePinyin = pinyin;
if (RegExp("[A-Z]").hasMatch(tag)) {
@@ -93,10 +92,10 @@ class _SelectMembersPageState extends State<SelectMembersPage> {
new Padding(
padding: EdgeInsets.symmetric(horizontal: mainSpace * 1.5),
child: new Icon(
- model.isSelect
+ model.isSelect!
? CupertinoIcons.check_mark_circled_solid
: CupertinoIcons.check_mark_circled,
- color: model.isSelect ? Colors.green : Colors.grey,
+ color: model.isSelect! ? Colors.green : Colors.grey,
),
),
new ClipRRect(
@@ -129,7 +128,7 @@ class _SelectMembersPageState extends State<SelectMembersPage> {
: null,
),
child: new Text(
- model.name,
+ model.name!,
style: TextStyle(fontSize: 14.0),
),
),
@@ -137,8 +136,8 @@ class _SelectMembersPageState extends State<SelectMembersPage> {
],
),
onTap: () {
- model.isSelect = !model.isSelect;
- if (model.isSelect) {
+ model.isSelect = !model.isSelect!;
+ if (model.isSelect!) {
selects.insert(0, model);
} else {
selects.remove(model);
@@ -161,7 +160,7 @@ class _SelectMembersPageState extends State<SelectMembersPage> {
margin: EdgeInsets.symmetric(vertical: 7, horizontal: 5),
onTap: () {
if (!listNoEmpty(selects)) {
- showToast(context, '请选择要添加的成员');
+ q1Toast( '请选择要添加的成员');
}
},
text: '确定',
@@ -171,69 +170,72 @@ class _SelectMembersPageState extends State<SelectMembersPage> {
backgroundColor: Colors.white,
body: AzListView(
data: _contacts,
- itemBuilder: (context, model) => _buildListItem(model),
- isUseRealIndex: true,
- itemHeight: _itemHeight,
- suspensionHeight: _suspensionHeight,
- header: AzListViewHeader(
- height: _headHeight.toInt(),
- builder: (context) {
- String uFace = '';
-
- if (!listNoEmpty(selects)) {
- return new Container(
- padding: EdgeInsets.symmetric(horizontal: 15),
- child: new Row(
- children: <Widget>[
- new Icon(
- CupertinoIcons.search,
- color: Colors.grey,
- ),
- new Space(),
- ],
- ),
- );
- }
- return new ListView(
- scrollDirection: Axis.horizontal,
- children: selects.map((item) {
- return new UnconstrainedBox(
- child: new Container(
- margin: EdgeInsets.only(left: 10),
- padding: EdgeInsets.symmetric(horizontal: 4),
- child: new ClipRRect(
- borderRadius: BorderRadius.all(Radius.circular(5)),
- child: !strNoEmpty(uFace)
- ? new Image.asset(
- defIcon,
- height: 48.0,
- width: 48.0,
- fit: BoxFit.cover,
- )
- : CachedNetworkImage(
- imageUrl: uFace,
- height: 48.0,
- width: 48.0,
- cacheManager: cacheManager,
- fit: BoxFit.cover,
- ),
- ),
- ),
- );
- }).toList(),
- );
- },
- ),
+ itemBuilder: (context, index) {
+ return _buildListItem(_contacts[index]);
+ },
+ // isUseRealIndex: true,
+ // itemHeight: _itemHeight,
+ // suspensionHeight: _suspensionHeight,
+ // indexHintBuilder: AzListViewHeader(
+ // height: _headHeight.toInt(),
+ // builder: (context) {
+ // String uFace = '';
+ //
+ // if (!listNoEmpty(selects)) {
+ // return new Container(
+ // padding: EdgeInsets.symmetric(horizontal: 15),
+ // child: new Row(
+ // children: <Widget>[
+ // new Icon(
+ // CupertinoIcons.search,
+ // color: Colors.grey,
+ // ),
+ // new Space(),
+ // ],
+ // ),
+ // );
+ // }
+ // return new ListView(
+ // scrollDirection: Axis.horizontal,
+ // children: selects.map((item) {
+ // return new UnconstrainedBox(
+ // child: new Container(
+ // margin: EdgeInsets.only(left: 10),
+ // padding: EdgeInsets.symmetric(horizontal: 4),
+ // child: new ClipRRect(
+ // borderRadius: BorderRadius.all(Radius.circular(5)),
+ // child: !strNoEmpty(uFace)
+ // ? new Image.asset(
+ // defIcon,
+ // height: 48.0,
+ // width: 48.0,
+ // fit: BoxFit.cover,
+ // )
+ // : CachedNetworkImage(
+ // imageUrl: uFace,
+ // height: 48.0,
+ // width: 48.0,
+ // cacheManager: cacheManager,
+ // fit: BoxFit.cover,
+ // ),
+ // ),
+ // ),
+ // );
+ // }).toList(),
+ // );
+ // },
+ // ),
+ itemCount: _contacts.length,
),
);
}
}
class ContactInfoModel extends ISuspensionBean {
- String name;
- String tagIndex;
- String namePinyin;
- bool isSelect;
+ String? name;
+ String? tagIndex;
+ String? namePinyin;
+ bool? isSelect;
ContactInfoModel({
this.name = 'aTest',
@@ -254,8 +256,8 @@ class ContactInfoModel extends ISuspensionBean {
};
@override
- String getSuspensionTag() => tagIndex;
+ String getSuspensionTag() => tagIndex!;
@override
- String toString() => "CityBean {" + " \"name\":\"" + name + "\"" + '}';
+ String toString() => "CityBean {" + " \"name\":\"" + name! + "\"" + '}';
}
diff --git a/lib/pages/common/home/home_page.dart b/lib/pages/common/home/home_page.dart
new file mode 100755
index 0000000..a1674c9
--- /dev/null
+++ b/lib/pages/common/home/home_page.dart
@@ -0,0 +1,224 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_conversation.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_conversation_result.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_friend_info.dart';
+import 'package:wechat_flutter/im/im_handle/im_conversation_api.dart';
+import 'package:wechat_flutter/im/im_handle/im_friend_api.dart';
+import 'package:wechat_flutter/im/im_handle/im_msg_api.dart';
+import 'package:wechat_flutter/tools/config/app_config.dart';
+import 'package:wechat_flutter/tools/eventbus/msg_bus.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+import 'package:wechat_flutter/ui/chat/my_conversation_view.dart';
+import 'package:wechat_flutter/ui/view/indicator_page_view.dart';
+import 'package:wechat_flutter/ui/view/pop_view.dart';
+
+class HomePage extends StatefulWidget {
+ @override
+ _HomePageState createState() => _HomePageState();
+}
+
+class _HomePageState extends State<HomePage>
+ with AutomaticKeepAliveClientMixin {
+ GlobalKey key = new GlobalKey();
+
+ List<V2TimConversation?>? _chatData = [];
+
+ late var tapPos;
+ StreamSubscription<dynamic>? _messageStreamSubscription;
+
+ /// 下一页请求标识码
+ String nextSeq = "0";
+
+ @override
+ void initState() {
+ super.initState();
+ initPlatformState();
+ getChatData(notDataCall: () {
+ /// 如果当前没有消息，且没有添加自己和微信团队
+ /// 自动添加自己和微信团队且发送一条消息
+ addMsg();
+ });
+ }
+
+/*
+* 获取会话列表数据
+* */
+ Future getChatData({VoidCallback? notDataCall}) async {
+ final V2TimConversationResult? cvsResult =
+ await IMConversationApi.getConversationList(nextSeq);
+ if (cvsResult == null) {
+ return;
+ }
+ nextSeq = cvsResult.nextSeq ?? "0";
+ if (!listNoEmpty(cvsResult.conversationList)) {
+ if (notDataCall != null) notDataCall();
+ return;
+ }
+
+ _chatData = cvsResult.conversationList;
+ if (mounted) setState(() {});
+ }
+
+ /// 如果当前没有消息则添加"微信团队"然后发送一条消息
+ Future addMsg() async {
+ List<V2TimFriendInfo>? friends = await ImFriendApi.getFriendList();
+ bool isHaveMySelf = false;
+ bool isHaveWxTeam = false;
+ // 获取失败了
+ if (!listNoEmpty(friends)) {
+ return;
+ }
+ for (V2TimFriendInfo element in friends!) {
+ if (element.userID == Q1Data.user()) {
+ isHaveMySelf = true;
+ } else if (element.userID == AppConfig.wxTeamUserId) {
+ isHaveWxTeam = true;
+ }
+ }
+ if (!isHaveMySelf) {
+ ImFriendApi.addFriend(Q1Data.user());
+ ImMsgApi.sendTextMessage("我们已经是好友了，现在开始聊天吧",
+ receiver: Q1Data.user(), groupID: '');
+ }
+ if (!isHaveWxTeam) {
+ ImFriendApi.addFriend(AppConfig.wxTeamUserId);
+ ImMsgApi.sendTextMessage("我们已经是好友了，现在开始聊天吧",
+ receiver: AppConfig.wxTeamUserId, groupID: '');
+ }
+ getChatData();
+ }
+
+ _showMenu(BuildContext context, Offset tapPos, int? type, String? id) {
+ final RenderBox overlay =
+ Overlay.of(context)!.context.findRenderObject() as RenderBox;
+ final RelativeRect position = RelativeRect.fromLTRB(tapPos.dx, tapPos.dy,
+ overlay.size.width - tapPos.dx, overlay.size.height - tapPos.dy);
+ showMenu<String>(
+ context: context,
+ position: position,
+ items: <MyPopupMenuItem<String>>[
+ new MyPopupMenuItem(child: Text('标为已读'), value: '标为已读'),
+ new MyPopupMenuItem(child: Text('置顶聊天'), value: '置顶聊天'),
+ new MyPopupMenuItem(child: Text('删除该聊天'), value: '删除该聊天'),
+ // ignore: missing_return
+ ]).then<String>((String? selected) {
+ switch (selected) {
+ case '删除该聊天':
+ getChatData();
+ break;
+ case '标为已读':
+ break;
+ }
+ return "";
+ });
+ }
+
+ void canCelListener() {
+ if (_messageStreamSubscription != null) {
+ _messageStreamSubscription!.cancel();
+ }
+ }
+
+ Future<void> initPlatformState() async {
+ if (!mounted) return;
+
+ if (_messageStreamSubscription == null) {
+ _messageStreamSubscription = msgBus.on<MsgBusModel>().listen((event) {
+ print("收到新消息，发送给${event.toUserId}");
+
+ onRefresh();
+ });
+ }
+ }
+
+ /// 刷新
+ void onRefresh() {
+ /// 表示从第一个消息开始读取
+ nextSeq = '0';
+ getChatData();
+ }
+
+ @override
+ bool get wantKeepAlive => true;
+
+ Widget timeView(int time) {
+ DateTime dateTime = DateTime.fromMillisecondsSinceEpoch(time * 1000);
+
+ String hourParse = "0${dateTime.hour}";
+ String minuteParse = "0${dateTime.minute}";
+
+ String hour = dateTime.hour.toString().length == 1
+ ? hourParse
+ : dateTime.hour.toString();
+ String minute = dateTime.minute.toString().length == 1
+ ? minuteParse
+ : dateTime.minute.toString();
+
+ String timeStr = '$hour:$minute';
+
+ return new Text(
+ timeStr,
+ maxLines: 1,
+ overflow: TextOverflow.ellipsis,
+ style: TextStyle(color: mainTextColor, fontSize: 14.0),
+ );
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ super.build(context);
+ if (!listNoEmpty(_chatData)) return new HomeNullView();
+ return Stack(
+ children: [
+ new Container(
+ color: Color(AppColors.BackgroundColor),
+ child: new ScrollConfiguration(
+ behavior: MyBehavior(),
+ child: new ListView.builder(
+ itemBuilder: (BuildContext context, int index) {
+ V2TimConversation model = _chatData![index]!;
+
+ final String? id =
+ model.type == 2 ? model.groupID : model.userID;
+ return InkWell(
+ onTap: () {
+ Get.toNamed(RouteConfig.chatPage, arguments: {
+ "title": model.showName,
+ "type": model.type,
+ "id": id,
+ });
+ },
+ onTapDown: (TapDownDetails details) {
+ tapPos = details.globalPosition;
+ },
+ onLongPress: () {
+ if (Platform.isAndroid) {
+ _showMenu(context, tapPos, model.type, id);
+ } else {
+ debugPrint("IOS聊天是左右滑动切换的");
+ }
+ },
+ child: new MyConversationView(
+ imageUrl: model.type == 2 ? defGroupAvatar : model.faceUrl,
+ title: model.showName ?? '',
+ content: model.lastMessage,
+ time: timeView(model.lastMessage?.timestamp ?? 0),
+ isBorder: model.showName != id,
+ ),
+ );
+ },
+ itemCount: _chatData?.length ?? 1,
+ ),
+ ),
+ ),
+ ],
+ );
+ }
+
+ @override
+ void dispose() {
+ super.dispose();
+ canCelListener();
+ }
+}
diff --git a/lib/pages/home/search_page.dart b/lib/pages/common/home/search_page.dart
similarity index 92%
rename from lib/pages/home/search_page.dart
rename to lib/pages/common/home/search_page.dart
index 6fd75ef..12964cb 100644
--- a/lib/pages/home/search_page.dart
+++ b/lib/pages/common/home/search_page.dart
@@ -15,7 +15,7 @@ class _SearchPageState extends State<SearchPage> {
Widget wordView(item) {
return new InkWell(
child: new Container(
- width: winWidth(context) / 3,
+ width: FrameSize.winWidth() / 3,
alignment: Alignment.center,
margin: EdgeInsets.symmetric(vertical: 15.0),
child: new Text(
@@ -23,7 +23,7 @@ class _SearchPageState extends State<SearchPage> {
style: TextStyle(color: tipColor),
),
),
- onTap: () => showToast(context, '$item功能小编正在开发'),
+ onTap: () => q1Toast( '$item功能小编正在开发'),
);
}
@@ -76,7 +76,7 @@ class _SearchPageState extends State<SearchPage> {
return new Scaffold(
backgroundColor: appBarColor,
appBar: new ComMomBar(titleW: searchView),
- body: new SizedBox(width: winWidth(context), child: body()),
+ body: new SizedBox(width: FrameSize.winWidth(), child: body()),
);
}
}
diff --git a/lib/pages/login/login_begin_page.dart b/lib/pages/common/login/login_begin_page.dart
similarity index 70%
rename from lib/pages/login/login_begin_page.dart
rename to lib/pages/common/login/login_begin_page.dart
index 3c46f61..236f837 100755
--- a/lib/pages/login/login_begin_page.dart
+++ b/lib/pages/common/login/login_begin_page.dart
@@ -1,11 +1,10 @@
import 'package:flutter/material.dart';
+import 'package:get/get.dart';
import 'package:provider/provider.dart';
-import 'package:wechat_flutter/config/provider_config.dart';
-import 'package:wechat_flutter/im/login_handle.dart';
-import 'package:wechat_flutter/pages/login/register_page.dart';
-import 'package:wechat_flutter/pages/settings/language_page.dart';
-import 'package:wechat_flutter/provider/global_model.dart';
-
+import 'package:wechat_flutter/tools/config/provider_config.dart';
+import 'package:wechat_flutter/pages/common/login/register_page.dart';
+import 'package:wechat_flutter/pages/common/settings/language_page.dart';
+import 'package:wechat_flutter/tools/provider/global_model.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
import 'login_page.dart';
@@ -19,20 +18,20 @@ class _LoginBeginPageState extends State<LoginBeginPage> {
Widget body(GlobalModel model) {
var buttons = [
new ComMomButton(
- text: S.of(context).login,
+ text: "登录",
margin: EdgeInsets.only(left: 10.0),
width: 100.0,
- onTap: () => routePush(
- ProviderConfig.getInstance().getLoginPage(new LoginPage())),
+ onTap: () =>
+ Get.to(ProviderConfig.getInstance()!.getLoginPage(new LoginPage())),
),
new ComMomButton(
- text: S.of(context).register,
+ text: "注册",
color: bgColor,
style:
TextStyle(fontSize: 15.0, color: Color.fromRGBO(8, 191, 98, 1.0)),
margin: EdgeInsets.only(right: 10.0),
- onTap: () => routePush(
- ProviderConfig.getInstance().getLoginPage(new RegisterPage())),
+ onTap: () => Get.to(
+ ProviderConfig.getInstance()!.getLoginPage(new RegisterPage())),
width: 100.0),
];
@@ -44,10 +43,10 @@ class _LoginBeginPageState extends State<LoginBeginPage> {
child: new InkWell(
child: new Padding(
padding: EdgeInsets.all(10.0),
- child: new Text(S.of(context).language,
+ child: new Text("语言",
style: TextStyle(color: Colors.white)),
),
- onTap: () => routePush(new LanguagePage()),
+ onTap: () => Get.to(new LanguagePage()),
),
),
new Row(
@@ -61,7 +60,6 @@ class _LoginBeginPageState extends State<LoginBeginPage> {
@override
void initState() {
super.initState();
- init(context);
}
@override
diff --git a/lib/pages/login/login_page.dart b/lib/pages/common/login/login_page.dart
similarity index 73%
rename from lib/pages/login/login_page.dart
rename to lib/pages/common/login/login_page.dart
index f28c9cb..5b4ff1d 100755
--- a/lib/pages/login/login_page.dart
+++ b/lib/pages/common/login/login_page.dart
@@ -1,13 +1,12 @@
-import 'dart:ui';
+import 'dart:convert';
-import 'package:dim/commom/win_media.dart';
-import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
import 'package:provider/provider.dart';
+import 'package:wechat_flutter/tools/entity/api_entity.dart';
+import 'package:wechat_flutter/tools/http/api_v2.dart';
import 'package:wechat_flutter/im/login_handle.dart';
-import 'package:wechat_flutter/pages/login/select_location_page.dart';
-import 'package:wechat_flutter/provider/login_model.dart';
+import 'package:wechat_flutter/pages/common/login/select_location_page.dart';
+import 'package:wechat_flutter/tools/provider/login_model.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
class LoginPage extends StatefulWidget {
@@ -16,7 +15,8 @@ class LoginPage extends StatefulWidget {
}
class _LoginPageState extends State<LoginPage> {
- TextEditingController _tC = new TextEditingController();
+ TextEditingController _tC =
+ new TextEditingController(text: AppConfig.mockPhone);
@override
void initState() {
@@ -25,8 +25,10 @@ class _LoginPageState extends State<LoginPage> {
}
initEdit() async {
- final user = await SharedUtil.instance.getString(Keys.account);
- _tC.text = user ?? '';
+ final user = await SharedUtil.instance!.getString(Keys.account);
+ if (strNoEmpty(user)) {
+ _tC.text = user!;
+ }
}
Widget bottomItem(item) {
@@ -35,10 +37,10 @@ class _LoginPageState extends State<LoginPage> {
new InkWell(
child: new Text(item, style: TextStyle(color: tipColor)),
onTap: () {
- showToast(context, S.of(context).notOpen + item);
+ q1Toast("暂未开启" + item);
},
),
- item == S.of(context).weChatSecurityCenter
+ item == "微信安全中心"
? new Container()
: new Padding(
padding: EdgeInsets.symmetric(horizontal: 5.0),
@@ -55,18 +57,17 @@ class _LoginPageState extends State<LoginPage> {
new Padding(
padding: EdgeInsets.only(
left: 20.0, top: mainSpace * 3, bottom: mainSpace * 2),
- child: new Text(S.of(context).mobileNumberLogin,
- style: TextStyle(fontSize: 25.0)),
+ child: new Text("手机号登录", style: TextStyle(fontSize: 25.0)),
),
- new FlatButton(
+ new TextButton(
child: new Padding(
padding: EdgeInsets.symmetric(horizontal: 10.0),
child: new Row(
children: <Widget>[
new Container(
- width: winWidth(context) * 0.25,
+ width: FrameSize.winWidth() * 0.25,
alignment: Alignment.centerLeft,
- child: new Text(S.of(context).phoneCity,
+ child: new Text("国家/地区",
style: TextStyle(
fontSize: 16.0, fontWeight: FontWeight.w400)),
),
@@ -83,11 +84,11 @@ class _LoginPageState extends State<LoginPage> {
),
),
onPressed: () async {
- final result = await routePush(new SelectLocationPage());
+ final result = await Get.to(new SelectLocationPage());
if (result == null) return;
model.area = result;
model.refresh();
- SharedUtil.instance.saveString(Keys.area, result);
+ SharedUtil.instance!.saveString(Keys.area, result);
},
),
new Container(
@@ -98,11 +99,11 @@ class _LoginPageState extends State<LoginPage> {
child: new Row(
children: <Widget>[
new Container(
- width: winWidth(context) * 0.25,
+ width: FrameSize.winWidth() * 0.25,
alignment: Alignment.centerLeft,
margin: EdgeInsets.only(left: 25.0),
child: new Text(
- S.of(context).phoneNumber,
+ "手机号",
style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.w400),
),
),
@@ -116,8 +117,7 @@ class _LoginPageState extends State<LoginPage> {
FilteringTextInputFormatter(new RegExp(r'[0-9]'), allow: true)
],
decoration: InputDecoration(
- hintText: S.of(context).phoneNumberHint,
- border: InputBorder.none),
+ hintText: "请填写手机号", border: InputBorder.none),
onChanged: (text) {
setState(() {});
},
@@ -129,15 +129,15 @@ class _LoginPageState extends State<LoginPage> {
padding: EdgeInsets.symmetric(horizontal: 20.0, vertical: 15.0),
child: new InkWell(
child: new Text(
- S.of(context).userLoginTip,
+ "用微信号/QQ号/邮箱登录",
style: TextStyle(color: tipColor),
),
- onTap: () => showToast(context, S.of(context).notOpen),
+ onTap: () => q1Toast("暂未开启"),
),
),
new Space(height: mainSpace * 2.5),
new ComMomButton(
- text: S.of(context).nextStep,
+ text: "下一步",
style: TextStyle(
color:
_tC.text == '' ? Colors.grey.withOpacity(0.8) : Colors.white),
@@ -146,13 +146,7 @@ class _LoginPageState extends State<LoginPage> {
? Color.fromRGBO(226, 226, 226, 1.0)
: Color.fromRGBO(8, 191, 98, 1.0),
onTap: () {
- if (_tC.text == '') {
- showToast(context, '随便输入三位或以上');
- } else if (_tC.text.length >= 3) {
- login(_tC.text, context);
- } else {
- showToast(context, '请输入三位或以上');
- }
+ login(context, _tC.text);
},
),
],
@@ -164,15 +158,16 @@ class _LoginPageState extends State<LoginPage> {
final model = Provider.of<LoginModel>(context);
List btItem = [
- S.of(context).retrievePW,
- S.of(context).emergencyFreeze,
- S.of(context).weChatSecurityCenter,
+ "找回密码",
+ "紧急冻结",
+ "微信安全中心",
];
return new Scaffold(
appBar:
new ComMomBar(title: '', leadingImg: 'assets/images/bar_close.png'),
- body: new MainInputBody(
+ body: new Container(
+ height: FrameSize.winHeight(),
color: appBarColor,
child: new Stack(
children: <Widget>[
diff --git a/lib/pages/login/register_page.dart b/lib/pages/common/login/register_page.dart
similarity index 63%
rename from lib/pages/login/register_page.dart
rename to lib/pages/common/login/register_page.dart
index ebc915b..44110a1 100644
--- a/lib/pages/login/register_page.dart
+++ b/lib/pages/common/login/register_page.dart
@@ -1,13 +1,16 @@
import 'dart:io';
import 'package:flutter/material.dart';
+import 'package:get/get.dart';
import 'package:image_picker/image_picker.dart';
import 'package:provider/provider.dart';
-import 'package:wechat_flutter/pages/login/login_begin_page.dart';
-import 'package:wechat_flutter/provider/login_model.dart';
+import 'package:wechat_flutter/tools/entity/api_entity.dart';
+import 'package:wechat_flutter/tools/http/api_v2.dart';
+import 'package:wechat_flutter/tools/provider/login_model.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
import 'package:wechat_flutter/ui/view/edit_view.dart';
+import 'package:wechat_flutter/ui_commom/bt/small_button.dart';
import 'select_location_page.dart';
@@ -25,11 +28,17 @@ class _RegisterPageState extends State<RegisterPage> {
TextEditingController phoneC = new TextEditingController();
FocusNode pWF = new FocusNode();
TextEditingController pWC = new TextEditingController();
+ FocusNode codeF = new FocusNode();
+ TextEditingController codeC = new TextEditingController();
+
+ Timer? timer;
+ RxInt count = 0.obs;
String localAvatarImgPath = '';
+ String? codeToken = "";
_openGallery() async {
- XFile img = await ImagePicker().pickImage(source: ImageSource.gallery);
+ XFile? img = await ImagePicker().pickImage(source: ImageSource.gallery);
if (img != null) {
localAvatarImgPath = img.path;
@@ -44,15 +53,15 @@ class _RegisterPageState extends State<RegisterPage> {
new Padding(
padding: EdgeInsets.only(
left: 5.0, top: mainSpace * 3, bottom: mainSpace * 2),
- child: new Text(S.of(context).numberRegister,
+ child: new Text("手机号注册",
style: TextStyle(fontSize: 25.0)),
),
new Row(
children: <Widget>[
new Expanded(
child: new EditView(
- label: S.of(context).nickName,
- hint: S.of(context).exampleName,
+ label: "昵称",
+ hint: "例如: 陈晨",
bottomLineColor:
nickF.hasFocus ? Colors.green : lineColor.withOpacity(0.5),
focusNode: nickF,
@@ -79,9 +88,9 @@ class _RegisterPageState extends State<RegisterPage> {
child: new Row(
children: <Widget>[
new Container(
- width: winWidth(context) * 0.25,
+ width: FrameSize.winWidth() * 0.25,
alignment: Alignment.centerLeft,
- child: new Text(S.of(context).phoneCity,
+ child: new Text("国家/地区",
style:
TextStyle(fontSize: 16.0, fontWeight: FontWeight.w400)),
),
@@ -99,25 +108,49 @@ class _RegisterPageState extends State<RegisterPage> {
),
),
onTap: () async {
- final result = await routePush(new SelectLocationPage());
+ final result = await Get.to(new SelectLocationPage());
if (result == null) return;
model.area = result;
model.refresh();
- SharedUtil.instance.saveString(Keys.area, result);
+ SharedUtil.instance!.saveString(Keys.area, result);
},
),
new EditView(
- label: S.of(context).phoneNumber,
- hint: S.of(context).phoneNumberHint,
+ label: "手机号",
+ hint: "请填写手机号",
controller: phoneC,
focusNode: phoneF,
+ keyboardType: TextInputType.number,
+ onTap: () => setState(() {}),
+ ),
+ new EditView(
+ label: '验证码',
+ hint: '输入验证码',
+ controller: codeC,
+ focusNode: codeF,
+ bottomLineColor:
+ codeF.hasFocus ? Colors.green : lineColor.withOpacity(0.5),
onTap: () => setState(() {}),
+ onChanged: (str) {
+ setState(() {});
+ },
+ rWidget: Obx(() {
+ return SmallButton(
+ color: count.value == 0 ? null : Colors.grey,
+ margin: EdgeInsets.all(0),
+ onPressed: () => sendCode(),
+ padding: EdgeInsets.all(0),
+ minWidth: 80,
+ child: Text(count.value == 0 ? '发送' : "${count.value}"),
+ );
+ }),
),
new EditView(
- label: S.of(context).passWord,
- hint: S.of(context).pwTip,
+ label: "密码",
+ hint: "填写密码",
controller: pWC,
focusNode: pWF,
+ obscureText: true,
bottomLineColor:
pWF.hasFocus ? Colors.green : lineColor.withOpacity(0.5),
onTap: () => setState(() {}),
@@ -144,22 +177,22 @@ class _RegisterPageState extends State<RegisterPage> {
new Padding(
padding: EdgeInsets.only(left: mainSpace / 2),
child: new Text(
- S.of(context).readAgree,
+ "已阅读并同意",
style: TextStyle(color: Colors.grey),
),
),
new InkWell(
child: new Text(
- S.of(context).protocolName,
+ "《微信软件许可及服务协议》",
style: TextStyle(color: tipColor),
),
- onTap: () => routePush(new WebViewPage(
- S.of(context).protocolUrl, S.of(context).protocolTitle)),
+ onTap: () => Get.to(new WebViewPage(
+ "https://weixin.qq.com/agreement?lang=zh_CN", "微信软件许可及服务协议")),
),
],
),
new ComMomButton(
- text: S.of(context).register,
+ text: "注册",
style: TextStyle(
color:
pWC.text == '' ? Colors.grey.withOpacity(0.8) : Colors.white),
@@ -170,11 +203,10 @@ class _RegisterPageState extends State<RegisterPage> {
onTap: () {
if (!strNoEmpty(pWC.text)) return;
if (!isMobilePhoneNumber(phoneC.text)) {
- showToast(context, '请输入正确的手机号');
+ q1Toast( '请输入正确的手机号');
return;
}
- showToast(context, '注册成功');
- popToRootPage();
+ registerHandle();
},
),
];
@@ -200,4 +232,57 @@ class _RegisterPageState extends State<RegisterPage> {
),
);
}
+
+ Future registerHandle() async {
+ final bool rsp = await ApiV2.register(context,
+ phone: phoneC.text,
+ password: pWC.text,
+ code: codeC.text,
+ token: codeToken);
+ if (!rsp) {
+ return;
+ }
+ q1Toast( '注册成功');
+ Get.offNamedUntil('/', (route) => false);
+ }
+
+ void cancelTimer() {
+ timer?.cancel();
+ timer = null;
+ }
+
+ Future sendCode() async {
+ if (count.value != 0) {
+ return;
+ }
+ cancelTimer();
+
+ final CodeRspEntity? codeRspEntity =
+ await ApiV2.smsGet(context, phone: phoneC.text);
+ if (codeRspEntity == null) {
+ return;
+ }
+
+ codeToken = codeRspEntity.token;
+
+ if (strNoEmpty(codeRspEntity.code)) {
+ codeC.text = codeRspEntity.code!;
+ setState(() {});
+ }
+
+ count.value = 60;
+ timer = Timer.periodic(Duration(seconds: 1), (timer) {
+ count.value--;
+ if (count.value <= 0) {
+ cancelTimer();
+ return;
+ }
+ });
+ }
+
+ @override
+ void dispose() {
+ super.dispose();
+ cancelTimer();
+ }
}
diff --git a/lib/pages/login/select_location_page.dart b/lib/pages/common/login/select_location_page.dart
similarity index 72%
rename from lib/pages/login/select_location_page.dart
rename to lib/pages/common/login/select_location_page.dart
index 26ddc42..a574d6e 100755
--- a/lib/pages/login/select_location_page.dart
+++ b/lib/pages/common/login/select_location_page.dart
@@ -8,7 +8,7 @@ class SelectLocationPage extends StatefulWidget {
}
class _SelectLocationPageState extends State<SelectLocationPage> {
- List state;
+ late List state;
Widget buildState(context, index) {
var item = state[index];
@@ -46,18 +46,18 @@ class _SelectLocationPageState extends State<SelectLocationPage> {
@override
Widget build(BuildContext context) {
state = [
- {'name': S.of(context).australia, 'code': '+61'},
- {'name': S.of(context).macao, 'code': '+853'},
- {'name': S.of(context).canada, 'code': '+001'},
- {'name': S.of(context).uS, 'code': '+001'},
- {'name': S.of(context).taiwan, 'code': '+886'},
- {'name': S.of(context).hongKong, 'code': '+852'},
- {'name': S.of(context).singapore, 'code': '+65'},
- {'name': S.of(context).chinaMainland, 'code': '+86'},
+ {'name': "澳大利亚", 'code': '+61'},
+ {'name': "澳门", 'code': '+853'},
+ {'name': "加拿大", 'code': '+001'},
+ {'name': "美国", 'code': '+001'},
+ {'name': "台湾", 'code': '+886'},
+ {'name': "香港", 'code': '+852'},
+ {'name': "新加坡", 'code': '+65'},
+ {'name': "中国大陆", 'code': '+86'},
];
return new Scaffold(
- appBar: new ComMomBar(title: S.of(context).selectCountry),
+ appBar: new ComMomBar(title: "选择国家或地区"),
body: new ListView.builder(
itemBuilder: buildState, itemCount: state.length),
);
diff --git a/lib/pages/mine/change_name_page.dart b/lib/pages/common/mine/change_name_page.dart
similarity index 63%
rename from lib/pages/mine/change_name_page.dart
rename to lib/pages/common/mine/change_name_page.dart
index 5da9dcb..0e8ba98 100644
--- a/lib/pages/mine/change_name_page.dart
+++ b/lib/pages/common/mine/change_name_page.dart
@@ -1,13 +1,14 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
-import 'package:wechat_flutter/im/info_handle.dart';
-import 'package:wechat_flutter/provider/global_model.dart';
-
+import 'package:tencent_im_sdk_plugin/models/v2_tim_callback.dart';
+import 'package:wechat_flutter/tools/http/api_v2.dart';
+import 'package:wechat_flutter/im/im_handle/Im_api.dart';
+import 'package:wechat_flutter/tools/provider/global_model.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
import 'package:wechat_flutter/ui/orther/tip_verify_Input.dart';
class ChangeNamePage extends StatefulWidget {
- final String name;
+ final String? name;
ChangeNamePage(this.name);
@@ -19,31 +20,37 @@ class _ChangeNamePageState extends State<ChangeNamePage> {
TextEditingController _tc = new TextEditingController();
FocusNode _f = new FocusNode();
- String initContent;
+ String? initContent;
- void setInfoMethod(GlobalModel model) {
+ Future setInfoMethod(GlobalModel model) async {
if (!strNoEmpty(_tc.text)) {
- showToast(context, '输入的内容不能为空');
+ q1Toast( '输入的内容不能为空');
return;
}
if (_tc.text.length > 12) {
- showToast(context, '输入的内容太长了');
+ q1Toast( '输入的内容太长了');
return;
}
- setUsersProfileMethod(
- context,
- nickNameStr: _tc.text,
- avatarStr: model.avatar,
- callback: (data) {
- if (data.toString().contains('succ')) {
- showToast(context, '设置名字成功');
- model.refresh();
- Navigator.of(context).pop();
- } else
- showToast(context, '设置名字失败');
- },
+ final V2TimCallback result = await ImApi.setSelfInfo(
+ nickname: _tc.text,
+ faceUrl: model.avatar,
);
+
+ if (result.code == 200 || result.code == 0) {
+ /// 【用户资料更新同时通知服务api】服务api更新昵称
+ ApiV2.updateUserInfo(
+ null,
+ Q1Data.userInfoRspEntity!.id!,
+ nickname: _tc.text,
+ );
+
+ q1Toast( '设置名字成功');
+ model.refresh();
+ Navigator.of(context).pop();
+ } else {
+ q1Toast( '设置名字失败');
+ }
}
Widget body() {
diff --git a/lib/pages/common/mine/code_page.dart b/lib/pages/common/mine/code_page.dart
new file mode 100644
index 0000000..4c7e357
--- /dev/null
+++ b/lib/pages/common/mine/code_page.dart
@@ -0,0 +1,230 @@
+import 'dart:convert';
+import 'dart:typed_data';
+import 'dart:ui' as ui;
+import 'package:flutter/rendering.dart';
+import 'package:image_gallery_saver/image_gallery_saver.dart';
+import 'package:permission_handler/permission_handler.dart';
+import 'package:provider/provider.dart';
+import 'package:qr_flutter/qr_flutter.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_group_info.dart';
+import 'package:wechat_flutter/tools/provider/global_model.dart';
+import 'package:wechat_flutter/tools/config/app_config.dart';
+import 'package:wechat_flutter/tools/data/qr_data.dart';
+import 'package:wechat_flutter/ui/dialog/code_dialog.dart';
+import 'package:flutter/material.dart';
+
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+class CodePage extends StatefulWidget {
+ final bool isGroup;
+ final String id;
+ final V2TimGroupInfo? dataGroupInfo;
+
+ CodePage({
+ this.isGroup = false,
+ required this.id,
+ this.dataGroupInfo,
+ });
+
+ @override
+ _CodePageState createState() => _CodePageState();
+}
+
+class _CodePageState extends State<CodePage> {
+ List data = ['换个样式', '保存到手机', '扫描二维码', '重置二维码'];
+ List groupData = ['保存到手机', '扫描二维码'];
+
+ GlobalKey rootWidgetKey = GlobalKey();
+
+ @override
+ void initState() {
+ super.initState();
+ _requestPermission();
+ }
+
+ Future<void> _capturePng() async {
+ try {
+ RenderRepaintBoundary boundary = rootWidgetKey.currentContext!
+ .findRenderObject() as RenderRepaintBoundary;
+ ui.Image image = await boundary.toImage();
+ ByteData? byteData =
+ await (image.toByteData(format: ui.ImageByteFormat.png));
+ if (byteData != null) {
+ final result = await ImageGallerySaver.saveImage(
+ byteData.buffer.asUint8List(),
+ isReturnImagePathOfIOS: false,
+ quality: 100,
+ );
+ print("ImageGallerySaver.saveImage::" + json.encode(result));
+ if (result['isSuccess']) {
+ q1Toast(
+ Platform.isAndroid ? '保存图片成功,路径${result['filePath']}' : "保存图片成功");
+ } else {
+ q1Toast( '保存图片失败');
+ }
+ }
+ } catch (e) {
+ print("_capturePng::error::" + e.toString());
+ q1Toast( '保存图片失败');
+ }
+ return null;
+ }
+
+ Future action(String item) async {
+ switch (item) {
+ case "保存到手机":
+ _capturePng();
+ break;
+ default:
+ q1Toast( "敬请期待");
+ break;
+ }
+ }
+
+ Future _requestPermission() async {
+ Map<Permission, PermissionStatus> statuses = await [
+ Permission.storage,
+ ].request();
+
+ final info = statuses[Permission.storage].toString();
+ print("Permission.storage::$info");
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ final model = Provider.of<GlobalModel>(context);
+
+ DateTime dt = DateTime.now().add(Duration(days: 7));
+ final String dtStr = "${dt.month}月${dt.day}";
+
+ var rWidget = [
+ new SizedBox(
+ width: 60,
+ child: new TextButton(
+ style: ButtonStyle(
+ padding: MaterialStateProperty.all(EdgeInsets.all(0)),
+ ),
+ onPressed: () async {
+ final value = await codeDialog(
+ context,
+ widget.isGroup ? groupData : data,
+ );
+ if (value == null) {
+ return;
+ }
+ action(value);
+ },
+ child: new Image.asset(contactAssets + 'ic_contacts_details.png'),
+ ),
+ )
+ ];
+
+ return new Scaffold(
+ backgroundColor: chatBg,
+ appBar: new ComMomBar(
+ title: '${widget.isGroup ? '群' : ''}二维码名片', rightDMActions: rWidget),
+ body: new SingleChildScrollView(
+ child: RepaintBoundary(
+ key: rootWidgetKey,
+ child: new Container(
+ margin: EdgeInsets.only(
+ left: 20.0, right: 20.0, top: FrameSize.winHeight() / 10),
+ decoration: BoxDecoration(
+ color: Colors.white,
+ borderRadius: BorderRadius.all(Radius.circular(4.0)),
+ ),
+ child: new Padding(
+ padding: EdgeInsets.symmetric(vertical: 20.0),
+ child: new Column(
+ children: <Widget>[
+ new Container(
+ padding: EdgeInsets.symmetric(horizontal: 20.0),
+ width: FrameSize.winWidth() - 40.0,
+ child: new CardPerson(
+ name: model.nickName,
+ area: '北京 海淀',
+ icon: 'assets/images/Contact_Male.webp',
+ avatar: widget.isGroup ? defGroupAvatar : model.avatar,
+ groupName: widget.isGroup
+ ? widget.dataGroupInfo!.groupName ?? widget.id
+ : null,
+ ),
+ ),
+ new Container(
+ padding: EdgeInsets.symmetric(
+ horizontal: 20,
+ vertical: 20,
+ ),
+ alignment: Alignment.center,
+ child: QrImage(
+ data: QrData.generateData(widget.isGroup, widget.id),
+ version: QrVersions.auto,
+ size: FrameSize.winWidth() - 110,
+ ),
+ ),
+ new Text(
+ '${widget.isGroup ? '该二维码7天内($dtStr前)有效，重新进入将更新' : '扫一扫上面的二维码图案，加我${AppConfig.appName}'}',
+ style: TextStyle(color: mainTextColor),
+ ),
+ ],
+ ),
+ ),
+ ),
+ ),
+ ),
+ );
+ }
+}
+
+class CardPerson extends StatelessWidget {
+ final String? name, icon, area, groupName, avatar;
+
+ CardPerson({this.name, this.icon, this.area, this.groupName, this.avatar});
+
+ @override
+ Widget build(BuildContext context) {
+ return new Row(
+ children: <Widget>[
+ new Padding(
+ padding: EdgeInsets.only(right: 15.0),
+ child: new ImageView(
+ img: avatar,
+ width: 45,
+ height: 45,
+ fit: BoxFit.cover,
+ ),
+ ),
+ strNoEmpty(groupName)
+ ? new Text(
+ groupName ?? '',
+ style: TextStyle(fontSize: 17.0, fontWeight: FontWeight.w600),
+ )
+ : new Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: <Widget>[
+ new Row(
+ children: <Widget>[
+ new Text(
+ name ?? '',
+ style: TextStyle(
+ fontSize: 17.0, fontWeight: FontWeight.w600),
+ ),
+ new Space(width: mainSpace / 2),
+ new Image.asset(
+ icon ?? '',
+ width: 18.0,
+ fit: BoxFit.cover,
+ ),
+ ],
+ ),
+ new Space(height: mainSpace / 3),
+ new Text(
+ area ?? '',
+ style: TextStyle(fontSize: 14.0, color: mainTextColor),
+ ),
+ ],
+ )
+ ],
+ );
+ }
+}
diff --git a/lib/pages/mine/mine_page.dart b/lib/pages/common/mine/mine_page.dart
similarity index 83%
rename from lib/pages/mine/mine_page.dart
rename to lib/pages/common/mine/mine_page.dart
index 366d8fa..dd55bed 100644
--- a/lib/pages/mine/mine_page.dart
+++ b/lib/pages/common/mine/mine_page.dart
@@ -1,13 +1,13 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
+import 'package:get/get.dart';
import 'package:provider/provider.dart';
-import 'package:wechat_flutter/im/all_im.dart';
-import 'package:wechat_flutter/pages/mine/personal_info_page.dart';
-import 'package:wechat_flutter/pages/settings/language_page.dart';
-import 'package:wechat_flutter/pages/wallet/pay_home_page.dart';
-import 'package:wechat_flutter/provider/global_model.dart';
-
+import 'package:wechat_flutter/pages/common/mine/personal_info_page.dart';
+import 'package:wechat_flutter/pages/common/settings/language_page.dart';
+import 'package:wechat_flutter/pages/common/settings/set_page.dart';
+import 'package:wechat_flutter/pages/common/wallet/pay_home_page.dart';
+import 'package:wechat_flutter/tools/provider/global_model.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
import 'package:wechat_flutter/ui/view/list_tile_view.dart';
@@ -20,13 +20,13 @@ class _MinePageState extends State<MinePage> {
void action(name) {
switch (name) {
case '设置':
- loginOut(context);
+ Get.to(new SetPage());
break;
case '支付':
- routePush(new PayHomePage());
+ Get.to(new PayHomePage());
break;
default:
- routePush(new LanguagePage());
+ Get.to(new LanguagePage());
break;
}
}
@@ -34,8 +34,8 @@ class _MinePageState extends State<MinePage> {
Widget buildContent(item) {
return new ListTileView(
border: item['label'] == '支付' ||
- item['label'] == '设置' ||
- item['label'] == '表情'
+ item['label'] == '设置' ||
+ item['label'] == '表情'
? null
: Border(bottom: BorderSide(color: lineColor, width: 0.2)),
title: item['label'],
@@ -45,7 +45,7 @@ class _MinePageState extends State<MinePage> {
icon: item['icon'],
margin: EdgeInsets.symmetric(
vertical:
- item['label'] == '支付' || item['label'] == '设置' ? 10.0 : 0.0),
+ item['label'] == '支付' || item['label'] == '设置' ? 10.0 : 0.0),
onPressed: () => action(item['label']),
width: 25.0,
fit: BoxFit.cover,
@@ -119,12 +119,12 @@ class _MinePageState extends State<MinePage> {
new InkWell(
child: new Container(
color: Colors.white,
- height: (topBarHeight(context) * 2.5) - 10,
+ height: (FrameSize.topBarHeight() * 2.5) - 10,
padding: EdgeInsets.only(left: 20.0, right: 20.0, top: 40.0),
child: new Row(
crossAxisAlignment: CrossAxisAlignment.center, children: row),
),
- onTap: () => routePush(new PersonalInfoPage()),
+ onTap: () => Get.to(new PersonalInfoPage()),
),
new Column(children: data.map(buildContent).toList()),
],
diff --git a/lib/pages/common/mine/personal_info_page.dart b/lib/pages/common/mine/personal_info_page.dart
new file mode 100644
index 0000000..2429a2a
--- /dev/null
+++ b/lib/pages/common/mine/personal_info_page.dart
@@ -0,0 +1,189 @@
+import 'package:get/get.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_callback.dart';
+import 'package:wechat_assets_picker/wechat_assets_picker.dart' as wxp;
+import 'package:wechat_flutter/tools/http/api_v2.dart';
+import 'package:wechat_flutter/im/im_handle/Im_api.dart';
+import 'package:wechat_flutter/im/util/im_response_tip_util.dart';
+import 'package:wechat_flutter/pages/common/mine/code_page.dart';
+import 'package:wechat_flutter/tools/config/app_config.dart';
+import 'package:wechat_flutter/tools/func/commom.dart';
+import 'package:wechat_flutter/tools/theme/my_theme.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+import 'package:flutter/material.dart';
+import 'package:image_picker/image_picker.dart';
+import 'package:provider/provider.dart';
+import 'package:wechat_flutter/pages/common/mine/change_name_page.dart';
+import 'package:wechat_flutter/tools/provider/global_model.dart';
+
+import 'package:wechat_flutter/ui/orther/label_row.dart';
+
+class PersonalInfoPage extends StatefulWidget {
+ @override
+ _PersonalInfoPageState createState() => _PersonalInfoPageState();
+}
+
+class _PersonalInfoPageState extends State<PersonalInfoPage> {
+ @override
+ void initState() {
+ super.initState();
+ }
+
+ action(v) {
+ if (v == '二维码名片') {
+ Get.to(new CodePage(id: Q1Data.user()));
+ } else if (v == '${AppConfig.appName}号') {
+ } else {
+ q1Toast("开发中");
+ print(v);
+ }
+ }
+
+ _openGallery({type = ImageSource.gallery}) async {
+ final model = Provider.of<GlobalModel>(context, listen: false);
+
+ wxp.AssetPicker.pickAssets(
+ context,
+ pickerConfig: wxp.AssetPickerConfig(
+ maxAssets: 1,
+ pageSize: 320,
+ gridCount: 4,
+ themeColor: MyTheme.themeColor(),
+ requestType: wxp.RequestType.image,
+ textDelegate: wxp.AssetPickerTextDelegate(),
+ ),
+ ).then((List<wxp.AssetEntity>? result) {
+ /// 没有选择文件
+ if (result == null) {
+ return;
+ }
+ result.forEach((wxp.AssetEntity element) async {
+ File? imageFile = await (element.file);
+ if (imageFile == null) {
+ q1Toast("文件出错");
+ return;
+ }
+
+ File? resultFile = await compressFileGetFile(imageFile);
+ if (resultFile != null) {
+ final apiValue = strNoEmpty(Q1Data.userInfoRspEntity!.avatar)
+ ? await ApiV2.fileChange(
+ context,
+ Q1Data.userInfoRspEntity!.avatar!
+ .split('/')
+ .last
+ .split('?')
+ .first,
+ model.account,
+ resultFile)
+ : await ApiV2.uploadFile(context, model.account, resultFile);
+ if (!strNoEmpty(apiValue)) {
+ return;
+ }
+ final String resultAvatar =
+ "$apiValue?time=${DateTime.now().millisecondsSinceEpoch}";
+ final V2TimCallback callback = await ImApi.setSelfInfo(
+ faceUrl: resultAvatar,
+ nickname: model.nickName,
+ );
+ if (callback.code == 0) {
+ /// 【用户资料更新同时通知服务api】服务api更新头像
+ ApiV2.updateUserInfo(
+ null,
+ Q1Data.userInfoRspEntity!.id!,
+ avatar: apiValue,
+ );
+
+ q1Toast('设置头像成功');
+ model.setAvatar(resultAvatar);
+ model.refresh();
+ Q1Data.userInfoRspEntity!.avatar = resultAvatar;
+ } else {
+ q1Toast(ImResponseTipUtil.getInfoOResultCode(callback.code));
+ }
+ } else {
+ q1Toast("压缩图片出现错误");
+ }
+ });
+ });
+ }
+
+ Widget dynamicAvatar(avatar, {size}) {
+ if (isNetWorkImg(avatar)) {
+ return new CachedNetworkImage(
+ imageUrl: avatar,
+ cacheManager: cacheManager,
+ width: size ?? null,
+ height: size ?? null,
+ fit: BoxFit.cover);
+ } else {
+ return new Image.asset(avatar,
+ fit: BoxFit.cover, width: size ?? null, height: size ?? null);
+ }
+ }
+
+ Widget body(GlobalModel model) {
+ List data = [
+ {'label': '${AppConfig.appName}号', 'value': model.account},
+ {'label': '二维码名片', 'value': ''},
+ {'label': '更多', 'value': ''},
+ {'label': '我的地址', 'value': ''},
+ ];
+
+ var content = [
+ new LabelRow(
+ label: '头像',
+ isLine: true,
+ isRight: true,
+ rightW: new SizedBox(
+ width: 55.0,
+ height: 55.0,
+ child: new ClipRRect(
+ borderRadius: BorderRadius.all(Radius.circular(5.0)),
+ child: strNoEmpty(model.avatar)
+ ? dynamicAvatar(model.avatar)
+ : new Image.asset(defIcon, fit: BoxFit.cover),
+ ),
+ ),
+ onPressed: () => _openGallery(),
+ ),
+ new LabelRow(
+ label: '昵称',
+ isLine: true,
+ isRight: true,
+ rValue: model.nickName,
+ onPressed: () => Get.to(new ChangeNamePage(model.nickName)),
+ ),
+ new Column(
+ children: data.map((item) => buildContent(item, model)).toList(),
+ ),
+ ];
+
+ return new Column(children: content);
+ }
+
+ Widget buildContent(item, GlobalModel model) {
+ return new LabelRow(
+ label: item['label'],
+ rValue: item['value'],
+ isLine: item['label'] == '我的地址' || item['label'] == '更多' ? false : true,
+ isRight: item['label'] == '${AppConfig.appName}号' ? false : true,
+ margin: EdgeInsets.only(bottom: item['label'] == '更多' ? 10.0 : 0.0),
+ rightW: item['label'] == '二维码名片'
+ ? new Image.asset('assets/images/mine/ic_small_code.png',
+ color: mainTextColor.withOpacity(0.7))
+ : new Container(),
+ onPressed: () => action(item['label']),
+ );
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ final model = Provider.of<GlobalModel>(context);
+
+ return new Scaffold(
+ backgroundColor: appBarColor,
+ appBar: new ComMomBar(title: '个人信息'),
+ body: new SingleChildScrollView(child: body(model)),
+ );
+ }
+}
diff --git a/lib/pages/common/more/add_friend/add_friend_binding.dart b/lib/pages/common/more/add_friend/add_friend_binding.dart
new file mode 100644
index 0000000..d1842cb
--- /dev/null
+++ b/lib/pages/common/more/add_friend/add_friend_binding.dart
@@ -0,0 +1,10 @@
+import 'package:get/get.dart';
+
+import 'add_friend_logic.dart';
+
+class AddFriendBinding extends Bindings {
+ @override
+ void dependencies() {
+ Get.lazyPut(() => AddFriendLogic());
+ }
+}
diff --git a/lib/pages/common/more/add_friend/add_friend_logic.dart b/lib/pages/common/more/add_friend/add_friend_logic.dart
new file mode 100644
index 0000000..b65784d
--- /dev/null
+++ b/lib/pages/common/more/add_friend/add_friend_logic.dart
@@ -0,0 +1,83 @@
+import 'package:flutter/material.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_user_full_info.dart';
+import 'package:wechat_flutter/pages/common/more/add_friend_details.dart';
+import 'package:wechat_flutter/tools/entity/api_entity.dart';
+import 'package:wechat_flutter/tools/http/api_v2.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+class AddFriendLogic extends GetxController {
+ bool isSearch = false;
+ bool showBtn = false;
+ bool isResult = false;
+
+ String? currentUser;
+
+ FocusNode searchF = new FocusNode();
+ TextEditingController searchC = new TextEditingController();
+
+ @override
+ void onReady() {
+ super.onReady();
+ getUser();
+ }
+
+ getUser() async {
+ currentUser = null;
+ update();
+ }
+
+ unFocusMethod() {
+ searchF.unfocus();
+ isSearch = false;
+ if (isResult) isResult = !isResult;
+ update();
+ }
+
+ // 搜索好友
+ Future search(String userName) async {
+
+ final List<V2TimUserFullInfo>? data = await ImApi.getUsersInfo([userName]);
+ if (!listNoEmpty(data)) {
+ isResult = true;
+ update();
+ return;
+ }
+
+ final V2TimUserFullInfo value = data!.first;
+
+ /// 如果是搜索自己的话直接提示出来
+ if (value.userID == Q1Data.user()) {
+ q1Toast('你不能添加自己到通讯录');
+ return;
+ }
+
+ final List<V2TimUserFullInfo>? userInfoList =
+ await ImApi.getUsersInfo([value.userID!]);
+
+ /// 获取用户信息失败了
+ if (!listNoEmpty(userInfoList)) {
+ isResult = true;
+ update();
+ return;
+ }
+
+ V2TimUserFullInfo model = userInfoList![0];
+ if (model.allowType != null) {
+ Get.to(new AddFriendsDetails(
+ 'search', model.userID, model.faceUrl, model.nickName, model.gender));
+ } else {
+ isResult = true;
+ }
+ update();
+ }
+
+ void onChange(String txt) {
+ if (strNoEmpty(searchC.text))
+ showBtn = true;
+ else
+ showBtn = false;
+ if (isResult) isResult = false;
+
+ update();
+ }
+}
diff --git a/lib/pages/common/more/add_friend/add_friend_view.dart b/lib/pages/common/more/add_friend/add_friend_view.dart
new file mode 100644
index 0000000..5484e03
--- /dev/null
+++ b/lib/pages/common/more/add_friend/add_friend_view.dart
@@ -0,0 +1,212 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:wechat_flutter/pages/common/mine/code_page.dart';
+import 'package:wechat_flutter/pages/common/user/user_page.dart';
+import 'package:wechat_flutter/tools/core/global_controller.dart';
+import 'package:wechat_flutter/ui/view/list_tile_view.dart';
+import 'package:wechat_flutter/ui/view/search_main_view.dart';
+import 'package:wechat_flutter/ui/view/search_tile_view.dart';
+
+import '../../../../tools/wechat_flutter.dart';
+import 'add_friend_logic.dart';
+
+class AddFriendPage extends StatelessWidget {
+ final logic = Get.find<AddFriendLogic>();
+
+ Widget buildItem(item) {
+ return new ListTileView(
+ border: item['title'] == '雷达加朋友'
+ ? null
+ : Border(top: BorderSide(color: lineColor, width: 0.2)),
+ title: item['title'],
+ label: item['label'],
+ icon: strNoEmpty(item['icon'])
+ ? item['icon']
+ : 'assets/images/favorite.webp',
+ fit: BoxFit.cover,
+ onPressed: () => Get.to(new UserPage()),
+ );
+ }
+
+ Widget body() {
+ final model = Get.find<GlobalController>();
+
+ List data = [
+ {
+ 'icon': contactAssets + 'ic_reda.webp',
+ 'title': '雷达加朋友',
+ 'label': '添加身边的朋友',
+ },
+ {
+ 'icon': contactAssets + 'ic_group.webp',
+ 'title': '面对面建群',
+ 'label': '与身边的朋友进入同一个群聊'
+ },
+ {
+ 'icon': contactAssets + 'ic_scanqr.webp',
+ 'title': '扫一扫',
+ 'label': '扫描二维码名片',
+ },
+ {
+ 'icon': contactAssets + 'ic_new_friend.webp',
+ 'title': '手机联系人',
+ 'label': '添加或邀请通讯录中的朋友',
+ },
+ {
+ 'icon': contactAssets + 'ic_offical.webp',
+ 'title': '公众号',
+ 'label': '获取更多资讯和服务',
+ },
+ {
+ 'icon': contactAssets + 'ic_search_wework.webp',
+ 'title': '企业${AppConfig.appName}联系人',
+ 'label': '通过手机号搜索企业${AppConfig.appName}用户',
+ },
+ ];
+ var content = [
+ new SearchMainView(
+ text: '${AppConfig.appName}号/手机号',
+ onTap: () {
+ logic.isSearch = true;
+ logic.update();
+ logic.searchF.requestFocus();
+ },
+ ),
+ new Padding(
+ padding: EdgeInsets.only(top: 15.0, bottom: 30.0),
+ child: new Row(
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: <Widget>[
+ new Text(
+ '我的${AppConfig.appName}号：${logic.currentUser ?? '[${model.account}]'}',
+ style: TextStyle(color: mainTextColor, fontSize: 14.0),
+ ),
+ new Space(width: mainSpace * 1.5),
+ new InkWell(
+ child: new Image.asset('assets/images/mine/ic_small_code.png',
+ color: mainTextColor.withOpacity(0.7)),
+ onTap: () => Get.to(new CodePage(id: model.account)),
+ )
+ ],
+ ),
+ ),
+ new Column(children: data.map(buildItem).toList())
+ ];
+
+ return new Column(children: content);
+ }
+
+ List<Widget> searchBody(BuildContext context) {
+ if (logic.isResult) {
+ return [
+ new Container(
+ color: Colors.white,
+ width: FrameSize.winWidth(),
+ height: 110.0,
+ alignment: Alignment.center,
+ child: new Text(
+ '该用户不存在',
+ style: TextStyle(color: mainTextColor),
+ ),
+ ),
+ new Space(height: mainSpace),
+ new SearchTileView(logic.searchC.text, type: 1),
+ new Container(
+ color: Colors.white,
+ width: FrameSize.winWidth(),
+ height: (FrameSize.winHeight() - 185 * 1.38),
+ )
+ ];
+ } else {
+ return [
+ new SearchTileView(
+ logic.searchC.text,
+ onPressed: () => logic.search(logic.searchC.text),
+ ),
+ new Container(
+ color: strNoEmpty(logic.searchC.text) ? Colors.white : appBarColor,
+ width: FrameSize.winWidth(),
+ height: strNoEmpty(logic.searchC.text)
+ ? (FrameSize.winHeight() - 65 * 2.1) -
+ FrameSize.winKeyHeight(context)
+ : FrameSize.winHeight(),
+ )
+ ];
+ }
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return GetBuilder<AddFriendLogic>(
+ builder: (logic) {
+ print("刷新了页面");
+ return WillPopScope(
+ child: new Scaffold(
+ backgroundColor: appBarColor,
+ appBar: new ComMomBar(
+ leadingW: logic.isSearch
+ ? new InkWell(
+ child: new Container(
+ width: 15,
+ height: 28,
+ child:
+ new Icon(CupertinoIcons.back, color: Colors.black),
+ ),
+ onTap: () => logic.unFocusMethod(),
+ )
+ : null,
+ title: '添加朋友',
+ titleW: logic.isSearch
+ ? new Row(
+ children: [
+ new Expanded(
+ child: new TextField(
+ focusNode: logic.searchF,
+ controller: logic.searchC,
+ style: TextStyle(
+ textBaseline: TextBaseline.alphabetic),
+ decoration: InputDecoration(
+ hintText: '${AppConfig.appName}号/手机号',
+ border: InputBorder.none),
+ onChanged: logic.onChange,
+ textInputAction: TextInputAction.search,
+ onSubmitted: (txt) => logic.search(txt),
+ ),
+ ),
+ strNoEmpty(logic.searchC.text)
+ ? new InkWell(
+ child: new Image.asset(
+ 'assets/images/ic_delete.webp'),
+ onTap: () {
+ logic.searchC.text = '';
+ logic.update();
+ },
+ )
+ : new Container()
+ ],
+ )
+ : null,
+ ),
+ body: new SingleChildScrollView(
+ child: logic.isSearch
+ ? new GestureDetector(
+ child: new Column(children: searchBody(context)),
+ onTap: () => logic.unFocusMethod(),
+ )
+ : body(),
+ ),
+ ),
+ onWillPop: () async {
+ if (logic.isSearch) {
+ logic.unFocusMethod();
+ } else {
+ Navigator.pop(context);
+ }
+ return false;
+ },
+ );
+ },
+ );
+ }
+}
diff --git a/lib/pages/more/add_friend_details.dart b/lib/pages/common/more/add_friend_details.dart
similarity index 81%
rename from lib/pages/more/add_friend_details.dart
rename to lib/pages/common/more/add_friend_details.dart
index 3a0d6bd..d351f0f 100644
--- a/lib/pages/more/add_friend_details.dart
+++ b/lib/pages/common/more/add_friend_details.dart
@@ -1,6 +1,7 @@
-import 'package:wechat_flutter/pages/wechat_friends/page/wechat_friends_circle.dart';
+import 'package:get/get.dart';
+import 'package:wechat_flutter/pages/common/wechat_friends/page/wechat_friends_circle.dart';
import 'package:flutter/material.dart';
-import 'package:wechat_flutter/pages/more/verification_page.dart';
+import 'package:wechat_flutter/pages/common/more/verification_page.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
import 'package:wechat_flutter/ui/orther/button_row.dart';
import 'package:wechat_flutter/ui/orther/label_row.dart';
@@ -8,10 +9,10 @@ import 'package:wechat_flutter/ui/orther/person_card.dart';
class AddFriendsDetails extends StatefulWidget {
final String type;
- final String imUser;
- final String avatarImg;
- final String nickName;
- final int gender;
+ final String? imUser;
+ final String? avatarImg;
+ final String? nickName;
+ final int? gender;
AddFriendsDetails(
this.type, this.imUser, this.avatarImg, this.nickName, this.gender);
@@ -39,19 +40,19 @@ class _AddFriendsDetailsState extends State<AddFriendsDetails> {
),
new LabelRow(
label: '个性签名',
- labelWidth: winWidth(context) / 4.5,
+ labelWidth: FrameSize.winWidth() / 4.5,
isRight: false,
isLine: true,
value: '这是我的签名',
),
new LabelRow(
label: '朋友圈',
- onPressed: () => routePush(new WeChatFriendsCircle()),
+ onPressed: () => Get.to(new WeChatFriendsCircle()),
),
new ButtonRow(
margin: EdgeInsets.only(top: 10.0),
text: '添加到通讯录',
- onPressed: () => routePush(
+ onPressed: () => Get.to(
new VerificationPage(nickName: widget.nickName, id: widget.imUser)),
),
];
diff --git a/lib/pages/more/verification_page.dart b/lib/pages/common/more/verification_page.dart
similarity index 66%
rename from lib/pages/more/verification_page.dart
rename to lib/pages/common/more/verification_page.dart
index 05cf640..8c94733 100644
--- a/lib/pages/more/verification_page.dart
+++ b/lib/pages/common/more/verification_page.dart
@@ -1,13 +1,14 @@
import 'package:flutter/material.dart';
-import 'package:wechat_flutter/im/friend_handle.dart';
-
+import 'package:tencent_im_sdk_plugin/models/v2_tim_friend_operation_result.dart';
+import 'package:wechat_flutter/im/im_handle/im_friend_api.dart';
+import 'package:wechat_flutter/im/util/im_response_tip_util.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
import 'package:wechat_flutter/ui/orther/verify_input.dart';
import 'package:wechat_flutter/ui/orther/verify_switch.dart';
class VerificationPage extends StatefulWidget {
- final String nickName;
- final String id;
+ final String? nickName;
+ final String? id;
VerificationPage({this.nickName = '', this.id});
@@ -22,6 +23,29 @@ class _VerificationPageState extends State<VerificationPage> {
FocusNode infoF = new FocusNode();
FocusNode remarksF = new FocusNode();
+ /// 发送好友请求
+ Future sendRequest() async {
+ final V2TimFriendOperationResult? model =
+ await ImFriendApi.addFriend(widget.id);
+
+ if (model == null) {
+ q1Toast("发送失败");
+ return;
+ }
+
+ if (model.resultCode == 200 || model.resultCode == 0) {
+ Navigator.of(context).pop();
+ q1Toast("添加成功");
+ return;
+ } else if (model.resultCode == 30539) {
+ Navigator.of(context).pop();
+ q1Toast("等待对方通过好友申请");
+ return;
+ } else {
+ q1Toast(ImResponseTipUtil.getInfoOResultCode(model.resultCode));
+ }
+ }
+
Widget body() {
var content = [
new VerifyInput(
@@ -57,7 +81,9 @@ class _VerificationPageState extends State<VerificationPage> {
width: 55.0,
margin: EdgeInsets.only(right: 15.0, top: 10.0, bottom: 10.0),
radius: 4.0,
- onTap: () => addFriend(widget.id, context),
+ onTap: () {
+ sendRequest();
+ },
),
],
),
diff --git a/lib/pages/red_package/red_receive_dialog.dart b/lib/pages/common/red_package/red_receive_dialog.dart
similarity index 95%
rename from lib/pages/red_package/red_receive_dialog.dart
rename to lib/pages/common/red_package/red_receive_dialog.dart
index cd9b403..5bad108 100644
--- a/lib/pages/red_package/red_receive_dialog.dart
+++ b/lib/pages/common/red_package/red_receive_dialog.dart
@@ -28,8 +28,8 @@ class _RedReceiveDialogState extends State<RedReceiveDialog> {
mainAxisAlignment: MainAxisAlignment.center,
children: [
Container(
- width: winWidth(context) - 100,
- height: winHeight(context) / 1.8,
+ width: FrameSize.winWidth() - 100,
+ height: FrameSize.winHeight() / 1.8,
margin: EdgeInsets.symmetric(horizontal: 50),
decoration: BoxDecoration(
color: Color(0xffd26853),
@@ -73,7 +73,7 @@ class _RedReceiveDialogState extends State<RedReceiveDialog> {
width: 80,
),
onTap: () {
- showToast(context, ' 敬请期待');
+ q1Toast( ' 敬请期待');
},
),
Spacer(),
diff --git a/lib/pages/settings/chat_background_page.dart b/lib/pages/common/settings/chat_background_page.dart
similarity index 79%
rename from lib/pages/settings/chat_background_page.dart
rename to lib/pages/common/settings/chat_background_page.dart
index f083eeb..8154f5a 100644
--- a/lib/pages/settings/chat_background_page.dart
+++ b/lib/pages/common/settings/chat_background_page.dart
@@ -1,10 +1,11 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
+import 'package:get/get.dart';
import 'package:image_picker/image_picker.dart';
import 'package:provider/provider.dart';
-import 'package:wechat_flutter/pages/group/group_details_page.dart';
-import 'package:wechat_flutter/pages/settings/select_backgroud_page.dart';
-import 'package:wechat_flutter/provider/global_model.dart';
+import 'package:wechat_flutter/pages/common/group/group_details_page.dart';
+import 'package:wechat_flutter/pages/common/settings/select_backgroud_page.dart';
+import 'package:wechat_flutter/tools/provider/global_model.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
class ChatBackgroundPage extends StatefulWidget {
@@ -24,7 +25,7 @@ class _ChatBackgroundPageState extends State<ChatBackgroundPage> {
children: <Widget>[
new GroupItem(
title: '选择背景图',
- onPressed: () => routePush(new SelectBgPage()),
+ onPressed: () => Get.to(new SelectBgPage()),
),
new GroupItem(
title: '从手机相册选择',
@@ -48,14 +49,14 @@ class _ChatBackgroundPageState extends State<ChatBackgroundPage> {
BuildContext context, {
ImageSource source = ImageSource.gallery,
}) async {
- XFile data = await ImagePicker().pickImage(source: source);
+ XFile? data = await ImagePicker().pickImage(source: source);
if (data != null) {
// File fileImg = data;
// globalModel.localAvatarImgPath = fileImg.path;
// if (Navigator.of(context).canPop()) {
// Navigator.of(context).pop();
// }
- showToast(context, '切换完毕');
+ q1Toast( '切换完毕');
} else {
return;
}
diff --git a/lib/pages/common/settings/friend_pro_page.dart b/lib/pages/common/settings/friend_pro_page.dart
new file mode 100644
index 0000000..084b3c2
--- /dev/null
+++ b/lib/pages/common/settings/friend_pro_page.dart
@@ -0,0 +1,116 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_user_full_info.dart';
+import 'package:wechat_flutter/im/im_handle/Im_api.dart';
+import 'package:wechat_flutter/tools/config/app_config.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+import 'package:wechat_flutter/ui/card/set_item.dart';
+
+class FriendProPage extends StatefulWidget {
+ const FriendProPage({Key? key}) : super(key: key);
+
+ @override
+ State<FriendProPage> createState() => _FriendProPageState();
+}
+
+class _FriendProPageState extends State<FriendProPage> {
+ late V2TimUserFullInfo userInfo;
+
+ /// 添加我是否需要验证
+ RxBool isNeedVer = true.obs;
+
+ /// 向我推荐通讯录朋友
+ RxBool rec = true.obs;
+
+ List items = [
+ "加我为朋友时需要验证",
+ "添加我的方式",
+ "向我推荐通讯录朋友",
+ "仅聊天",
+ "朋友圈",
+ "视频号",
+ "看一看",
+ "${AppConfig.appName}运动",
+ "通讯录黑名单",
+ ];
+
+ bool isNotBorder(String value) {
+ return value == "加我为朋友时需要验证" ||
+ value == "向我推荐通讯录朋友" ||
+ value == "${AppConfig.appName}运动" ||
+ value == "通讯录黑名单";
+ }
+
+ bool isTopMargin(String value) {
+ return value == "添加我的方式" || value == "通讯录黑名单" || value == "帮助与反馈";
+ }
+
+ void actionHandle(String value) {}
+
+ @override
+ void initState() {
+ super.initState();
+ getCurrentAddType();
+ }
+
+ Future getCurrentAddType() async {
+ userInfo = (await ImApi.getUsersInfo([Q1Data.user()]))![0];
+ //用户的好友验证方式 0:允许所有人加我好友 1:不允许所有人加我好友 2:加我好友需我确认
+ isNeedVer.value = userInfo.allowType != 0;
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return Scaffold(
+ backgroundColor: appBarColor,
+ appBar: ComMomBar(title: "朋友权限"),
+ body: ListView(
+ children: items.map((e) {
+ return Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ if (isTopMargin(e))
+ new Container(
+ width: double.infinity, height: 10, color: appBarColor),
+ if (e == "仅聊天")
+ Padding(
+ padding:
+ EdgeInsets.only(left: 20, right: 20, bottom: 6, top: 15),
+ child: Text(
+ '朋友圈',
+ style: TextStyle(color: Colors.black.withOpacity(0.6)),
+ ),
+ ),
+ SetItem(
+ onTap: () => actionHandle(e),
+ isBorder: isNotBorder(e),
+ text: e,
+ subText: "",
+ bottomText: e == "加我为朋友时需要验证" ? "开启后，为你推荐已经注册账号的手机联系人。" : null,
+ rWidget: e == "加我为朋友时需要验证" || e == "向我推荐通讯录朋友"
+ ? Obx(() {
+ return CupertinoSwitch(
+ onChanged: (bool value) {
+ //用户的好友验证方式 0:允许所有人加我好友 1:不允许所有人加我好友 2:加我好友需我确认
+ if (e == "加我为朋友时需要验证") {
+ isNeedVer.value = !isNeedVer.value;
+ ImApi.setSelfInfo(
+ allowType: isNeedVer.value ? 2 : 0);
+ } else {
+ rec.value = !rec.value;
+ }
+ },
+ value:
+ e == "加我为朋友时需要验证" ? isNeedVer.value : rec.value,
+ );
+ })
+ : null,
+ ),
+ ],
+ );
+ }).toList(),
+ ),
+ );
+ }
+}
diff --git a/lib/pages/settings/language_page.dart b/lib/pages/common/settings/language_page.dart
similarity index 62%
rename from lib/pages/settings/language_page.dart
rename to lib/pages/common/settings/language_page.dart
index 4bfd3c7..774b85f 100755
--- a/lib/pages/settings/language_page.dart
+++ b/lib/pages/common/settings/language_page.dart
@@ -1,7 +1,8 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
-import 'package:wechat_flutter/provider/global_model.dart';
-import 'package:wechat_flutter/tools/shared_util.dart';
+import 'package:wechat_flutter/tools/provider/global_model.dart';
+import 'package:wechat_flutter/tools/config/app_config.dart';
+import 'package:wechat_flutter/tools/func/shared_util.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
@@ -12,8 +13,8 @@ class LanguagePage extends StatefulWidget {
class _LanguagePageState extends State<LanguagePage> {
final List<LanguageData> languageDatas = [
- LanguageData("中文", "zh", "CN", "微信-flutter"),
- LanguageData("English", "en", "US", "Wechat-flutter"),
+ LanguageData("中文", "zh", "CN", "${AppConfig.appName}"),
+ LanguageData("English", "en", "US", "${AppConfig.appName}"),
];
@override
@@ -29,23 +30,23 @@ class _LanguagePageState extends State<LanguagePage> {
return new RadioListTile(
value: language,
groupValue: model.currentLanguage,
- onChanged: (value) {
- model.currentLanguageCode = [languageCode, countryCode];
- model.currentLanguage = language;
- model.currentLocale = Locale(languageCode, countryCode);
- model.appName = appName;
+ onChanged: (dynamic value) {
+ model.setCurrentLanguageCode([languageCode, countryCode]);
+ model.setCurrentLanguage(language);
+ model.setCurrentLocale(Locale(languageCode, countryCode));
+ model.setAppName(appName);
model.refresh();
- SharedUtil.instance.saveStringList(
+ SharedUtil.instance!.saveStringList(
Keys.currentLanguageCode, [languageCode, countryCode]);
- SharedUtil.instance.saveString(Keys.currentLanguage, language);
- SharedUtil.instance.saveString(Keys.appName, appName);
+ SharedUtil.instance!.saveString(Keys.currentLanguage, language);
+ SharedUtil.instance!.saveString(Keys.appName, appName);
},
title: new Text(languageDatas[index].language),
);
}),
);
return new Scaffold(
- appBar: new ComMomBar(title: S.of(context).multiLanguage),
+ appBar: new ComMomBar(title: "多语言"),
body: body,
);
}
diff --git a/lib/pages/settings/select_backgroud_page.dart b/lib/pages/common/settings/select_backgroud_page.dart
similarity index 88%
rename from lib/pages/settings/select_backgroud_page.dart
rename to lib/pages/common/settings/select_backgroud_page.dart
index 0ef9f1a..b058515 100644
--- a/lib/pages/settings/select_backgroud_page.dart
+++ b/lib/pages/common/settings/select_backgroud_page.dart
@@ -18,7 +18,7 @@ class _SelectBgPageState extends State<SelectBgPage> {
];
Widget buildBg(item) {
- double _size = (winWidth(context) - 30) / 3;
+ double _size = (FrameSize.winWidth() - 30) / 3;
return new InkWell(
child: new ClipRRect(
borderRadius: BorderRadius.all(Radius.circular(5)),
@@ -29,9 +29,9 @@ class _SelectBgPageState extends State<SelectBgPage> {
fit: BoxFit.fill,
),
),
- onTap: () => showToast(context, '敬请期待'),
+ onTap: () => q1Toast( '敬请期待'),
// onTap: () =>
-// routePush(new ChatBackgroundDetailsPage(item['img'], item['name'])),
+// Get.to(new ChatBackgroundDetailsPage(item['img'], item['name'])),
);
}
@@ -46,7 +46,7 @@ class _SelectBgPageState extends State<SelectBgPage> {
runSpacing: 10.0,
spacing: 10.0,
children:
- listNoEmpty(data) ? data.map(buildBg).toList() : new Container(),
+ listNoEmpty(data) ? data.map(buildBg).toList() : new Container() as List<Widget>,
),
),
);
diff --git a/lib/pages/common/settings/set_page.dart b/lib/pages/common/settings/set_page.dart
new file mode 100644
index 0000000..7f66ed2
--- /dev/null
+++ b/lib/pages/common/settings/set_page.dart
@@ -0,0 +1,132 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:wechat_flutter/pages/common/settings/friend_pro_page.dart';
+import 'package:wechat_flutter/pages/common/settings/language_page.dart';
+import 'package:wechat_flutter/tools/config/app_config.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+import 'package:wechat_flutter/im/login_handle.dart';
+import 'package:wechat_flutter/ui/card/set_item.dart';
+import 'package:wechat_flutter/ui_commom/dialog/confirm_sw_dialog.dart';
+
+class SetPage extends StatefulWidget {
+ const SetPage({Key? key}) : super(key: key);
+
+ @override
+ State<SetPage> createState() => _SetPageState();
+}
+
+class _SetPageState extends State<SetPage> {
+ List items = [
+ "账号与安全",
+ "青少年模式",
+ "关怀模式",
+ "消息通知",
+ "通用",
+ "朋友权限",
+ "个人信息权限",
+ "个人信息收集清单",
+ "第三方信息共享清单",
+ "帮助与反馈",
+ "界面语言",
+ "关于${AppConfig.appName}",
+ "插件",
+ ];
+
+ List itemsEnd = [
+ "切换账号",
+ "退出登录",
+ ];
+
+ void actionHandle(e) {
+ switch (e) {
+ case "朋友权限":
+ Get.to(FriendProPage());
+ break;
+ case "退出登录":
+ confirmSwDialog(context, text: "你确定要退出登录吗？", onPressed: () {
+ loginOut(context);
+ });
+ break;
+ case "界面语言":
+ Get.to(LanguagePage());
+ break;
+ default:
+ q1Toast( "开发中");
+ break;
+ }
+ }
+
+ bool isNotBorder(String value) {
+ return value == "账号与安全" ||
+ value == "关怀模式" ||
+ value == "通用" ||
+ value == "第三方信息共享清单" ||
+ value == "关于${AppConfig.appName}" ||
+ value == "插件";
+ }
+
+ bool isTopMargin(String value) {
+ return value == "青少年模式" ||
+ value == "消息通知" ||
+ value == "帮助与反馈" ||
+ value == "插件";
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return Scaffold(
+ backgroundColor: appBarColor,
+ appBar: ComMomBar(title: "设置"),
+ body: ListView(
+ children: items.map<Widget>((e) {
+ return Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ if (isTopMargin(e))
+ new Container(
+ width: double.infinity, height: 10, color: appBarColor),
+ if (e == "朋友权限")
+ Padding(
+ padding:
+ EdgeInsets.only(left: 20, right: 20, bottom: 6, top: 15),
+ child: Text(
+ '隐私',
+ style: TextStyle(color: Colors.black.withOpacity(0.6)),
+ ),
+ ),
+ SetItem(
+ onTap: () => actionHandle(e),
+ isBorder: isNotBorder(e),
+ text: e,
+ subText: e == "关于${AppConfig.appName}" ? '版本 8.0.29' : "",
+ ),
+ ],
+ );
+ }).toList()
+ ..add(Space())
+ ..addAll(
+ itemsEnd.map((e) {
+ return Container(
+ margin: EdgeInsets.only(top: e == "退出登录" ? 10 : 0),
+ child: TextButton(
+ style: ButtonStyle(
+ backgroundColor: MaterialStateProperty.all(Colors.white),
+ padding: MaterialStateProperty.all(
+ EdgeInsets.symmetric(vertical: 15)),
+ ),
+ onPressed: () => actionHandle(e),
+ child: Text(
+ e,
+ style: TextStyle(
+ color: Colors.black, fontWeight: FontWeight.w500),
+ ),
+ ),
+ );
+ }).toList(),
+ )
+ ..add(Space()),
+ ),
+ );
+ }
+}
diff --git a/lib/pages/common/tools/scan_page.dart b/lib/pages/common/tools/scan_page.dart
new file mode 100644
index 0000000..5a8c97a
--- /dev/null
+++ b/lib/pages/common/tools/scan_page.dart
@@ -0,0 +1,144 @@
+import 'dart:ui';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_scankit/scan_kit_widget.dart';
+import 'package:get/get.dart';
+import 'package:wechat_flutter/pages/common/contacts/contacts_details_page.dart';
+import 'package:wechat_flutter/pages/common/group/group_join_page.dart';
+import 'package:wechat_flutter/tools/data/qr_data.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+class ScanPage extends StatefulWidget {
+ @override
+ _ScanPageState createState() => _ScanPageState();
+}
+
+const boxSize = 200.0;
+
+class _ScanPageState extends State<ScanPage> {
+ late ScanKitController _controller;
+
+ final screenWidth = window.physicalSize.width;
+ final screenHeight = window.physicalSize.height;
+ StreamSubscription? resultListen;
+
+ void handleResult(String result) {
+ debugPrint("scanning result:$result");
+
+ if (!QrData.isSelfCode(result)) {
+ cantRec();
+ return;
+ }
+
+ final List<String> qrList = QrData.fetchData(result);
+ if (qrList[0] == QrDataType.group.toString()) {
+ /// 如果已经加入群了直接到聊天界面
+ /// 否则才到申请进群页面。
+ Get.off(GroupJoinPage(groupId: qrList[1]));
+ } else if (qrList[0] == QrDataType.personal.toString()) {
+ Get.off(ContactsDetailsPage(id: qrList[1]));
+ } else {
+ cantRec();
+ }
+ }
+
+ void cantRec() {
+ Navigator.of(context).pop();
+ q1Toast( "此内容暂时无法识别");
+ }
+
+ @override
+ void initState() {
+ super.initState();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ var pixelSize = boxSize * window.devicePixelRatio;
+ var left = screenWidth / 2 - pixelSize / 2;
+ var top = screenHeight / 2 - pixelSize / 2;
+ var right = screenWidth / 2 + pixelSize / 2;
+ var bottom = screenHeight / 2 + pixelSize / 2;
+ var rect = Rect.fromLTRB(left, top, right, bottom);
+
+ return Scaffold(
+ body: Stack(
+ children: [
+ ScanKitWidget(
+ callback: (controller) {
+ _controller = controller;
+
+ resultListen = _controller.onResult.listen(handleResult);
+ },
+ continuouslyScan: false,
+ boundingBox: rect),
+ SafeArea(
+ child: Align(
+ alignment: Alignment.topCenter,
+ child: Row(
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ children: [
+ IconButton(
+ padding:
+ EdgeInsets.symmetric(horizontal: 20, vertical: 10),
+ onPressed: () {
+ Navigator.of(context).pop();
+ },
+ icon: Icon(
+ Icons.arrow_back,
+ color: Colors.white,
+ size: 28,
+ )),
+ IconButton(
+ padding:
+ EdgeInsets.symmetric(horizontal: 20, vertical: 10),
+ onPressed: () {
+ _controller.switchLight();
+ },
+ icon: Icon(
+ Icons.lightbulb_outline_rounded,
+ color: Colors.white,
+ size: 28,
+ )),
+ IconButton(
+ onPressed: () {
+ _controller.pickPhoto();
+ },
+ padding: EdgeInsets.symmetric(horizontal: 20, vertical: 10),
+ icon: Icon(
+ Icons.picture_in_picture_rounded,
+ color: Colors.white,
+ size: 28,
+ ),
+ )
+ ],
+ ),
+ ),
+ ),
+ Align(
+ alignment: Alignment.center,
+ child: Container(
+ width: boxSize,
+ height: boxSize,
+ decoration: BoxDecoration(
+ border: Border(
+ left: BorderSide(color: Colors.orangeAccent, width: 2),
+ right: BorderSide(color: Colors.orangeAccent, width: 2),
+ top: BorderSide(color: Colors.orangeAccent, width: 2),
+ bottom: BorderSide(color: Colors.orangeAccent, width: 2)),
+ ),
+ ),
+ )
+ ],
+ ),
+ );
+ }
+
+ @override
+ void dispose() {
+ _controller.dispose();
+ resultListen?.cancel();
+ resultListen = null;
+ super.dispose();
+ }
+}
diff --git a/lib/pages/root/user_page.dart b/lib/pages/common/user/user_page.dart
similarity index 75%
rename from lib/pages/root/user_page.dart
rename to lib/pages/common/user/user_page.dart
index 672a435..03dfa3a 100644
--- a/lib/pages/root/user_page.dart
+++ b/lib/pages/common/user/user_page.dart
@@ -1,11 +1,8 @@
-import 'package:wechat_flutter/im/friend_handle.dart';
+import 'package:flutter/material.dart';
import 'package:wechat_flutter/im/model/user_data.dart';
-import 'package:wechat_flutter/im/send_handle.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
import 'package:wechat_flutter/ui/dialog/confirm_alert.dart';
import 'package:wechat_flutter/ui/new_friend_card.dart';
-import 'package:flutter/material.dart';
-
-import 'package:wechat_flutter/tools/wechat_flutter.dart';
class UserPage extends StatefulWidget {
@override
@@ -22,29 +19,16 @@ class _UserPageState extends State<UserPage> {
}
Future getUserData() async {
- final str = await UserDataPageGet().listUserData();
-
- List<UserData> listData = str;
+ List<UserData> listData = [];
_userData.clear();
_userData..addAll(listData.reversed);
if (mounted) setState(() {});
}
- action(UserData model) {
- addFriend(
- model.identifier,
- context,
- suCc: (v) {
- if (v) {
- sendTextMsg(model.identifier, 1, '你好${model.name}，我添加你为好友啦');
- Navigator.of(context).maybePop();
- }
- },
- );
- }
+ action(UserData model) {}
Widget body() {
- if (_userData == null || _userData?.length == 0)
+ if (_userData.length == 0)
return new LoadingView(isStr: false);
return new ListView.builder(
@@ -57,7 +41,7 @@ class _UserPageState extends State<UserPage> {
onTap: () => action(model),
);
},
- itemCount: _userData?.length ?? 0,
+ itemCount: _userData.length,
);
}
@@ -76,7 +60,7 @@ class _UserPageState extends State<UserPage> {
confirmAlert(
context,
(bool) {
- if (bool) showToast(context, '感谢支持');
+ if (bool) q1Toast( '感谢支持');
},
tips:
'如果显示添加成功了好友列表还是没这个好友，说明对方的好友数量上限了，你可以选择下一个或者自己注册一个新的来测试。',
diff --git a/lib/pages/wallet/pay_home_page.dart b/lib/pages/common/wallet/pay_home_page.dart
similarity index 96%
rename from lib/pages/wallet/pay_home_page.dart
rename to lib/pages/common/wallet/pay_home_page.dart
index fd48ee7..4a6da98 100644
--- a/lib/pages/wallet/pay_home_page.dart
+++ b/lib/pages/common/wallet/pay_home_page.dart
@@ -68,7 +68,7 @@ class _PayHomePageState extends State<PayHomePage> {
{'label': '钱包', 'icon': ''},
].map((e) {
return new Container(
- width: (winWidth(context) - 22) / 2,
+ width: (FrameSize.winWidth() - 22) / 2,
padding: EdgeInsets.symmetric(vertical: 35),
child: new Column(
children: [
@@ -108,7 +108,7 @@ class _PayHomePageState extends State<PayHomePage> {
new Wrap(
children: out['data'].map<Widget>((e) {
return new Container(
- width: (winWidth(context) - 42) / 4,
+ width: (FrameSize.winWidth() - 42) / 4,
padding: EdgeInsets.symmetric(vertical: 20),
child: new Column(
children: [
diff --git a/lib/pages/wechat_friends/chat_style.dart b/lib/pages/common/wechat_friends/chat_style.dart
similarity index 96%
rename from lib/pages/wechat_friends/chat_style.dart
rename to lib/pages/common/wechat_friends/chat_style.dart
index 553b735..7fe72ce 100644
--- a/lib/pages/wechat_friends/chat_style.dart
+++ b/lib/pages/common/wechat_friends/chat_style.dart
@@ -4,11 +4,11 @@ var backgroundImage =
'https://hbimg.huabanimg.com/907605885b6dac544640128d8f5c6b089de96519117bb5-VdbptL';
class Line extends StatelessWidget {
- final Color color;
- final EdgeInsetsGeometry margin;
+ final Color? color;
+ final EdgeInsetsGeometry? margin;
final double lineHeight;
- Line({Key key, this.color, this.margin, this.lineHeight: 0.2})
+ Line({Key? key, this.color, this.margin, this.lineHeight: 0.2})
: super(key: key);
@override
@@ -24,7 +24,7 @@ class TextStyles {
static TextStyle textStyle(
{double fontSize: Dimens.font_sp12,
Color color: Colors.white,
- FontWeight fontWeight}) {
+ FontWeight? fontWeight}) {
return TextStyle(
fontSize: fontSize,
color: color,
diff --git a/lib/pages/wechat_friends/from.dart b/lib/pages/common/wechat_friends/from.dart
similarity index 51%
rename from lib/pages/wechat_friends/from.dart
rename to lib/pages/common/wechat_friends/from.dart
index f4d6bd8..ed59f0d 100644
--- a/lib/pages/wechat_friends/from.dart
+++ b/lib/pages/common/wechat_friends/from.dart
@@ -1,27 +1,25 @@
class FriendsDynamic {
- /**
- * username : "张三"
- * userAvatar : "http://cdn.duitang.com/uploads/item/201409/18/20140918141220_N4Tic.thumb.700_0.jpeg"
- * desc : "这里是文字描述"
- * address : "北京"
- * datetime : "2019-01-01 23:11:23"
- * isSelf : true
- * share : null
- * id : 1
- * video : {"id":1,"url":"","image":"https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=2267040693,3719567402&fm=27&gp=0.jpg"}
- * images : [{"id":1,"image":"https://www.7160.com/templets/new7160/hotpic/2/s.jpg"}]
- * comment : []
- */
+ /// username : "张三"
+ /// userAvatar : "http://cdn.duitang.com/uploads/item/201409/18/20140918141220_N4Tic.thumb.700_0.jpeg"
+ /// desc : "这里是文字描述"
+ /// address : "北京"
+ /// datetime : "2019-01-01 23:11:23"
+ /// isSelf : true
+ /// share : null
+ /// id : 1
+ /// video : {"id":1,"url":"","image":"https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=2267040693,3719567402&fm=27&gp=0.jpg"}
+ /// images : [{"id":1,"image":"https://www.7160.com/templets/new7160/hotpic/2/s.jpg"}]
+ /// comment : []
- String username;
- String userAvatar;
- String desc;
- String address;
- String datetime;
- bool isSelf;
- int id;
- VideoBean video;
- List<ImagesListBean> images;
+ String? username;
+ String? userAvatar;
+ String? desc;
+ String? address;
+ String? datetime;
+ bool? isSelf;
+ int? id;
+ VideoBean? video;
+ List<ImagesListBean?>? images;
static FriendsDynamic fromMap(Map<String, dynamic> map) {
FriendsDynamic friends_dynamic = FriendsDynamic();
@@ -39,8 +37,8 @@ class FriendsDynamic {
return friends_dynamic;
}
- static List<FriendsDynamic> fromMapList(dynamic mapList) {
- List<FriendsDynamic> list = List(mapList.length);
+ static List<FriendsDynamic?> fromMapList(dynamic mapList) {
+ List<FriendsDynamic?> list = List.filled(mapList.length, null, growable: false);
for (int i = 0; i < mapList.length; i++) {
list[i] = fromMap(mapList[i]);
}
@@ -49,15 +47,13 @@ class FriendsDynamic {
}
class VideoBean {
- /**
- * url : ""
- * image : "https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=2267040693,3719567402&fm=27&gp=0.jpg"
- * id : 1
- */
+ /// url : ""
+ /// image : "https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=2267040693,3719567402&fm=27&gp=0.jpg"
+ /// id : 1
- String url;
- String image;
- int id;
+ String? url;
+ String? image;
+ int? id;
static VideoBean fromMap(Map<String, dynamic> map) {
VideoBean videoBean = VideoBean();
@@ -67,8 +63,8 @@ class VideoBean {
return videoBean;
}
- static List<VideoBean> fromMapList(dynamic mapList) {
- List<VideoBean> list = List(mapList.length);
+ static List<VideoBean?> fromMapList(dynamic mapList) {
+ List<VideoBean?> list = List.filled(mapList.length, null, growable: false);
for (int i = 0; i < mapList.length; i++) {
list[i] = fromMap(mapList[i]);
}
@@ -77,13 +73,11 @@ class VideoBean {
}
class ImagesListBean {
- /**
- * image : "https://www.7160.com/templets/new7160/hotpic/2/s.jpg"
- * id : 1
- */
+ /// image : "https://www.7160.com/templets/new7160/hotpic/2/s.jpg"
+ /// id : 1
- String image;
- int id;
+ String? image;
+ int? id;
static ImagesListBean fromMap(Map<String, dynamic> map) {
ImagesListBean imagesListBean = ImagesListBean();
@@ -92,8 +86,8 @@ class ImagesListBean {
return imagesListBean;
}
- static List<ImagesListBean> fromMapList(dynamic mapList) {
- List<ImagesListBean> list = List(mapList.length);
+ static List<ImagesListBean?> fromMapList(dynamic mapList) {
+ List<ImagesListBean?> list = List.filled(mapList.length, null, growable: false);
for (int i = 0; i < mapList.length; i++) {
list[i] = fromMap(mapList[i]);
}
diff --git a/lib/pages/wechat_friends/page/publish_dynamic.dart b/lib/pages/common/wechat_friends/page/publish_dynamic.dart
similarity index 86%
rename from lib/pages/wechat_friends/page/publish_dynamic.dart
rename to lib/pages/common/wechat_friends/page/publish_dynamic.dart
index ea549b1..ba1d7b0 100755
--- a/lib/pages/wechat_friends/page/publish_dynamic.dart
+++ b/lib/pages/common/wechat_friends/page/publish_dynamic.dart
@@ -1,10 +1,8 @@
import 'package:flutter/material.dart';
import 'dart:async';
-import 'package:flutter/services.dart';
import '../chat_style.dart';
import '../ui/asset_view.dart';
-//import 'package:multi_image_picker/multi_image_picker.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
@@ -13,7 +11,7 @@ class PublishDynamicPage extends StatefulWidget {
final List images;
final int maxImages;
- PublishDynamicPage({Key key, this.images: const [], this.maxImages: 9})
+ PublishDynamicPage({Key? key, this.images: const [], this.maxImages: 9})
: super(key: key);
@override
@@ -23,7 +21,7 @@ class PublishDynamicPage extends StatefulWidget {
class _PublishDynamicPageState extends State<PublishDynamicPage> {
// List<Asset> _images = [];
- int imageNum;
+ int? imageNum;
@override
void initState() {
@@ -43,13 +41,15 @@ class _PublishDynamicPageState extends State<PublishDynamicPage> {
actions: <Widget>[
Container(
padding: EdgeInsets.symmetric(vertical: 12.0, horizontal: 10),
- child: RaisedButton(
- onPressed: () {
- /// TODO
- Navigator.of(context).pop();
- },
- child: Text('发表', style: TextStyle(color: Colors.white)),
- color: Colors.green),
+ child: ElevatedButton(
+ style: ButtonStyle(
+ backgroundColor: MaterialStateProperty.all(Colors.green),
+ ),
+ onPressed: () {
+ Navigator.of(context).pop();
+ },
+ child: Text('发表', style: TextStyle(color: Colors.white)),
+ ),
)
],
),
@@ -60,13 +60,15 @@ class _PublishDynamicPageState extends State<PublishDynamicPage> {
Container(
padding: EdgeInsets.all(10.0),
height: 100,
- child: Form(onWillPop: _onBackPressed, child: TextField()),
+ child: Form(
+ onWillPop: _onBackPressed as Future<bool> Function()?,
+ child: TextField()),
),
Line(color: Colors.grey),
GridView.builder(
padding: EdgeInsets.all(10.0),
gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent(
- maxCrossAxisExtent: (winWidth(context) - 20) / 3,
+ maxCrossAxisExtent: (FrameSize.winWidth() - 20) / 3,
crossAxisSpacing: 5.0,
mainAxisSpacing: 5.0,
childAspectRatio: 1.0),
@@ -74,7 +76,7 @@ class _PublishDynamicPageState extends State<PublishDynamicPage> {
// asset: index == imageNum ? null : _images[index],
asset: null,
onTap: () {
- if (imageNum < widget.maxImages && index == imageNum) {
+ if (imageNum! < widget.maxImages && index == imageNum) {
loadAssets();
}
@@ -82,7 +84,7 @@ class _PublishDynamicPageState extends State<PublishDynamicPage> {
},
),
itemCount:
- imageNum < widget.maxImages ? imageNum + 1 : imageNum,
+ imageNum! < widget.maxImages ? imageNum! + 1 : imageNum,
physics: NeverScrollableScrollPhysics(),
shrinkWrap: true,
primary: false),
@@ -166,7 +168,7 @@ class _PublishDynamicPageState extends State<PublishDynamicPage> {
// });
}
- Future<bool> _onBackPressed() {
+ Future<bool?> _onBackPressed() {
return showDialog(
context: context,
builder: (context) {
@@ -177,14 +179,14 @@ class _PublishDynamicPageState extends State<PublishDynamicPage> {
//标题的padding值
actions: <Widget>[
//操作按钮数组
- FlatButton(
+ TextButton(
onPressed: () {
Navigator.pop(context);
Navigator.pop(context, false);
},
child: Text('不保留', style: TextStyles.textGrey14),
),
- FlatButton(
+ TextButton(
onPressed: () {
Navigator.pop(context);
Navigator.pop(context, true);
diff --git a/lib/pages/wechat_friends/page/wechat_friends_circle.dart b/lib/pages/common/wechat_friends/page/wechat_friends_circle.dart
similarity index 90%
rename from lib/pages/wechat_friends/page/wechat_friends_circle.dart
rename to lib/pages/common/wechat_friends/page/wechat_friends_circle.dart
index ba564ad..1bc827f 100755
--- a/lib/pages/wechat_friends/page/wechat_friends_circle.dart
+++ b/lib/pages/common/wechat_friends/page/wechat_friends_circle.dart
@@ -1,12 +1,11 @@
import 'dart:convert';
-import 'package:wechat_flutter/pages/wechat_friends/chat_style.dart';
-import 'package:wechat_flutter/pages/wechat_friends/from.dart';
-import 'package:wechat_flutter/pages/wechat_friends/ui/load_view.dart';
+import 'package:wechat_flutter/pages/common/wechat_friends/chat_style.dart';
+import 'package:wechat_flutter/pages/common/wechat_friends/from.dart';
+import 'package:wechat_flutter/pages/common/wechat_friends/ui/load_view.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
import '../ui/item_dynamic.dart';
//import 'package:multi_image_picker/multi_image_picker.dart';
@@ -14,17 +13,17 @@ import '../ui/item_dynamic.dart';
//import 'publish_dynamic.dart';
class WeChatFriendsCircle extends StatefulWidget {
- WeChatFriendsCircle({Key key}) : super(key: key);
+ WeChatFriendsCircle({Key? key}) : super(key: key);
@override
createState() => _WeChatFriendsCircleState();
}
class _WeChatFriendsCircleState extends State<WeChatFriendsCircle> {
- List<FriendsDynamic> friendsDynamic = [];
+ List<FriendsDynamic?> friendsDynamic = [];
double navAlpha = 0;
- double headerHeight;
+ double? headerHeight;
ScrollController scrollController = ScrollController();
Color c = Colors.grey;
@@ -48,8 +47,8 @@ class _WeChatFriendsCircleState extends State<WeChatFriendsCircle> {
if (navAlpha != 0) {
setState(() => navAlpha = 0);
}
- } else if (offset < headerHeight) {
- if (headerHeight - offset <= navigationBarHeight(context)) {
+ } else if (offset < headerHeight!) {
+ if (headerHeight! - offset <= FrameSize.navigationBarHeight()) {
setState(() {
c = Colors.black;
title = '朋友圈';
@@ -58,7 +57,7 @@ class _WeChatFriendsCircleState extends State<WeChatFriendsCircle> {
c = Colors.white;
title = '';
}
- setState(() => navAlpha = 1 - (headerHeight - offset) / headerHeight);
+ setState(() => navAlpha = 1 - (headerHeight! - offset) / headerHeight!);
} else if (navAlpha != 1) {
setState(() => navAlpha = 1);
}
@@ -88,7 +87,7 @@ class _WeChatFriendsCircleState extends State<WeChatFriendsCircle> {
child: ImageLoadView(backgroundImage,
fit: BoxFit.cover,
height: headerHeight,
- width: winWidth(context)),
+ width: FrameSize.winWidth()),
margin: EdgeInsets.only(bottom: 30.0)),
Container(
child: Row(
@@ -123,7 +122,7 @@ class _WeChatFriendsCircleState extends State<WeChatFriendsCircle> {
]),
),
Container(
- height: navigationBarHeight(context) + 10,
+ height: FrameSize.navigationBarHeight() + 10,
child: new ComMomBar(
title: title,
rightDMActions: <Widget>[
@@ -229,7 +228,7 @@ class _WeChatFriendsCircleState extends State<WeChatFriendsCircle> {
// debugPrint(images.toString());
//
// if (images.isNotEmpty) {
-// routePush(PublishDynamicPage(images: images, maxImages: maxImages));
+// Get.to(PublishDynamicPage(images: images, maxImages: maxImages));
// }
// });
}
diff --git a/lib/pages/wechat_friends/ui/asset_view.dart b/lib/pages/common/wechat_friends/ui/asset_view.dart
similarity index 89%
rename from lib/pages/wechat_friends/ui/asset_view.dart
rename to lib/pages/common/wechat_friends/ui/asset_view.dart
index e149b93..6b4ab99 100755
--- a/lib/pages/wechat_friends/ui/asset_view.dart
+++ b/lib/pages/common/wechat_friends/ui/asset_view.dart
@@ -6,9 +6,9 @@ import 'package:flutter/material.dart';
class AssetView extends StatefulWidget {
// final Asset asset;
final dynamic asset;
- final VoidCallback onTap;
+ final VoidCallback? onTap;
- AssetView({Key key, this.asset, this.onTap}) : super(key: key);
+ AssetView({Key? key, this.asset, this.onTap}) : super(key: key);
@override
createState() => _AssetState();
@@ -22,7 +22,7 @@ class _AssetState extends State<AssetView> {
}
void _loadImage() async {
- ByteData byteData =
+ ByteData? byteData =
await widget.asset.requestThumbnail(300, 300, quality: 60);
setState(() {});
diff --git a/lib/pages/wechat_friends/ui/item_dynamic.dart b/lib/pages/common/wechat_friends/ui/item_dynamic.dart
similarity index 87%
rename from lib/pages/wechat_friends/ui/item_dynamic.dart
rename to lib/pages/common/wechat_friends/ui/item_dynamic.dart
index 67ef939..e6a8d26 100755
--- a/lib/pages/wechat_friends/ui/item_dynamic.dart
+++ b/lib/pages/common/wechat_friends/ui/item_dynamic.dart
@@ -1,29 +1,27 @@
-import 'package:wechat_flutter/pages/wechat_friends/from.dart';
-import 'package:wechat_flutter/tools/wechat_flutter.dart' as prefix1;
+import 'package:wechat_flutter/pages/common/wechat_friends/from.dart';
import 'package:wechat_flutter/ui/w_pop/friend_pop.dart';
import 'package:flutter/material.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
-import 'package:flutter/material.dart' as prefix0;
import 'load_view.dart';
class ItemDynamic extends StatelessWidget {
- final FriendsDynamic dynamic;
+ final FriendsDynamic? dynamic;
- ItemDynamic(this.dynamic, {Key key}) : super(key: key);
+ ItemDynamic(this.dynamic, {Key? key}) : super(key: key);
@override
Widget build(BuildContext context) {
- int imageSize = this.dynamic.images.length;
+ int imageSize = this.dynamic!.images!.length;
- double imageWidth = (winWidth(context) - 20 - 50 - 10) /
+ double imageWidth = (FrameSize.winWidth() - 20 - 50 - 10) /
((imageSize == 3 || imageSize > 4)
? 3.0
: (imageSize == 2 || imageSize == 4) ? 2.0 : 1.5);
- double videoWidth = (winWidth(context) - 20 - 50 - 10) / 2.2;
+ double videoWidth = (FrameSize.winWidth() - 20 - 50 - 10) / 2.2;
- String desc = this.dynamic.desc;
+ String desc = this.dynamic!.desc!;
String def =
'https://c-ssl.duitang.com/uploads/item/201803/04/20180304085215_WGFx8.thumb.700_0.jpeg';
@@ -48,7 +46,7 @@ class ItemDynamic extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
/// 发布者昵称
- Text('${this.dynamic.username}'),
+ Text('${this.dynamic!.username}'),
/// 发布的文字描述
Offstage(
@@ -76,7 +74,7 @@ class ItemDynamic extends StatelessWidget {
childAspectRatio: 1),
itemBuilder: (context, index) =>
ImageLoadView(
- '${this.dynamic.images.isNotEmpty ? this.dynamic.images[index].image : def}',
+ '${this.dynamic!.images!.isNotEmpty ? this.dynamic!.images![index]!.image : def}',
fit: BoxFit.cover,
width: imageWidth,
height: imageWidth,
@@ -95,14 +93,14 @@ class ItemDynamic extends StatelessWidget {
/// 视频区域
Offstage(
- offstage: this.dynamic.video == null,
+ offstage: this.dynamic!.video == null,
child: Container(
padding: EdgeInsets.only(top: 8.0),
child: Stack(
alignment: Alignment.center,
children: <Widget>[
ImageLoadView(
- '${this.dynamic.video?.image ?? def}',
+ '${this.dynamic!.video?.image ?? def}',
height: 200,
),
IconButton(
@@ -118,7 +116,7 @@ class ItemDynamic extends StatelessWidget {
offstage: imageSize % 2 == 0,
child: Padding(
padding: EdgeInsets.only(top: 8.0),
- child: Text('${this.dynamic.address}',
+ child: Text('${this.dynamic!.address}',
style: TextStyle(
color: Colors.grey[500],
fontSize: 13)))),
@@ -128,11 +126,11 @@ class ItemDynamic extends StatelessWidget {
Row(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
- Text('${this.dynamic.datetime}',
+ Text('${this.dynamic!.datetime}',
style: TextStyle(
color: Colors.grey[500], fontSize: 13)),
Offstage(
- offstage: !this.dynamic.isSelf,
+ offstage: !this.dynamic!.isSelf!,
child: Padding(
padding: EdgeInsets.only(left: 10.0),
child: Text('删除',
@@ -179,13 +177,13 @@ class _TestPushState extends State<TestPush> {
child: new Row(
children: <Widget>[
new Expanded(
- child: new FlatButton(
+ child: new TextButton(
onPressed: () {},
child: new Text('赞', style: labelStyle),
),
),
new Expanded(
- child: new FlatButton(
+ child: new TextButton(
onPressed: () {},
child: new Text('评论', style: labelStyle),
),
diff --git a/lib/pages/wechat_friends/ui/load_view.dart b/lib/pages/common/wechat_friends/ui/load_view.dart
similarity index 92%
rename from lib/pages/wechat_friends/ui/load_view.dart
rename to lib/pages/common/wechat_friends/ui/load_view.dart
index 6fcbe0e..c5a04d1 100644
--- a/lib/pages/wechat_friends/ui/load_view.dart
+++ b/lib/pages/common/wechat_friends/ui/load_view.dart
@@ -10,10 +10,10 @@ class ImageLoadView extends StatelessWidget {
final String path;
/// 宽
- final double width;
+ final double? width;
/// 高
- final double height;
+ final double? height;
/// 填充效果
final BoxFit fit;
@@ -23,7 +23,7 @@ class ImageLoadView extends StatelessWidget {
ImageLoadView(
this.path, {
- Key key,
+ Key? key,
this.width,
this.height,
this.fit: BoxFit.fill,
diff --git a/lib/pages/contacts/contacts_details_page.dart b/lib/pages/contacts/contacts_details_page.dart
deleted file mode 100644
index 9d22ef5..0000000
--- a/lib/pages/contacts/contacts_details_page.dart
+++ /dev/null
@@ -1,100 +0,0 @@
-import 'package:wechat_flutter/pages/chat/chat_page.dart';
-import 'package:wechat_flutter/pages/chat/more_info_page.dart';
-import 'package:wechat_flutter/pages/chat/set_remark_page.dart';
-import 'package:wechat_flutter/pages/wechat_friends/page/wechat_friends_circle.dart';
-import 'package:wechat_flutter/provider/global_model.dart';
-import 'package:wechat_flutter/ui/dialog/friend_item_dialog.dart';
-import 'package:wechat_flutter/ui/item/contact_card.dart';
-import 'package:wechat_flutter/ui/orther/button_row.dart';
-import 'package:wechat_flutter/ui/orther/label_row.dart';
-import 'package:flutter/material.dart';
-
-import 'package:wechat_flutter/tools/wechat_flutter.dart';
-import 'package:provider/provider.dart';
-
-class ContactsDetailsPage extends StatefulWidget {
- final String avatar, title, id;
-
- ContactsDetailsPage({this.avatar, this.title, this.id});
-
- @override
- _ContactsDetailsPageState createState() => _ContactsDetailsPageState();
-}
-
-class _ContactsDetailsPageState extends State<ContactsDetailsPage> {
- List<Widget> body(bool isSelf) {
- return [
- new ContactCard(
- img: widget.avatar,
- id: widget.id,
- title: widget.title,
- nickName: widget.title,
- area: '北京 海淀',
- isBorder: true,
- ),
- new Visibility(
- visible: !isSelf,
- child: new LabelRow(
- label: '设置备注和标签',
- onPressed: () => routePush(new SetRemarkPage()),
- ),
- ),
- new Space(),
- new LabelRow(
- label: '朋友圈',
- isLine: true,
- lineWidth: 0.3,
- onPressed: () => routePush(new WeChatFriendsCircle()),
- ),
- new LabelRow(
- label: '更多信息',
- onPressed: () => routePush(new MoreInfoPage()),
- ),
- new ButtonRow(
- margin: EdgeInsets.only(top: 10.0),
- text: '发消息',
- isBorder: true,
- onPressed: () => routePushReplace(
- new ChatPage(id: widget.id, title: widget.title, type: 1)),
- ),
- new Visibility(
- visible: !isSelf,
- child: new ButtonRow(
- text: '音视频通话',
- onPressed: () => showToast(context, '敬请期待'),
- ),
- ),
- ];
- }
-
- @override
- Widget build(BuildContext context) {
- final globalModel = Provider.of<GlobalModel>(context);
- bool isSelf = globalModel.account == widget.id;
-
- var rWidget = [
- new SizedBox(
- width: 60,
- child: new FlatButton(
- padding: EdgeInsets.all(0),
- onPressed: () =>
- friendItemDialog(context, userId: widget.id, suCc: (v) {
- if (v) Navigator.of(context).maybePop();
- }),
- child: new Image.asset(contactAssets + 'ic_contacts_details.png'),
- ),
- )
- ];
-
- return new Scaffold(
- backgroundColor: chatBg,
- appBar: new ComMomBar(
- title: '',
- backgroundColor: Colors.white,
- rightDMActions: isSelf ? [] : rWidget),
- body: new SingleChildScrollView(
- child: new Column(children: body(isSelf)),
- ),
- );
- }
-}
diff --git a/lib/pages/contacts/new_friend_page.dart b/lib/pages/contacts/new_friend_page.dart
deleted file mode 100644
index 290abea..0000000
--- a/lib/pages/contacts/new_friend_page.dart
+++ /dev/null
@@ -1,215 +0,0 @@
-import 'dart:convert';
-
-import 'package:wechat_flutter/pages/more/add_friend_page.dart';
-import 'package:wechat_flutter/ui/orther/label_row.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:wechat_flutter/im/info_handle.dart';
-import 'package:wechat_flutter/pages/more/add_friend_details.dart';
-
-import 'package:wechat_flutter/tools/wechat_flutter.dart';
-import 'package:wechat_flutter/ui/view/list_tile_view.dart';
-import 'package:wechat_flutter/ui/view/search_main_view.dart';
-import 'package:wechat_flutter/ui/view/search_tile_view.dart';
-
-class NewFriendPage extends StatefulWidget {
- @override
- _NewFriendPageState createState() => new _NewFriendPageState();
-}
-
-class _NewFriendPageState extends State<NewFriendPage> {
- bool isSearch = false;
- bool showBtn = false;
- bool isResult = false;
-
- String currentUser;
-
- FocusNode searchF = new FocusNode();
- TextEditingController searchC = new TextEditingController();
-
- Widget buildItem(item) {
- return new ListTileView(
- border: item['title'] == '雷达加朋友'
- ? null
- : Border(top: BorderSide(color: lineColor, width: 0.2)),
- title: item['title'],
- label: item['label'],
- );
- }
-
- Widget body() {
- var content = [
- new SearchMainView(
- text: '微信号/手机号',
- isBorder: true,
- onTap: () {
- isSearch = true;
- setState(() {});
- searchF.requestFocus();
- },
- ),
- new LabelRow(
- headW: new Padding(
- padding: EdgeInsets.only(right: 15.0),
- child: new Image.asset('assets/images/contact/ic_voice.png',
- width: 25, fit: BoxFit.cover),
- ),
- label: '添加手机联系人',
- )
- ];
-
- return new Column(children: content);
- }
-
- List<Widget> searchBody() {
- if (isResult) {
- return [
- new Container(
- color: Colors.white,
- width: winWidth(context),
- height: 110.0,
- alignment: Alignment.center,
- child: new Text(
- '该用户不存在',
- style: TextStyle(color: mainTextColor),
- ),
- ),
- new Space(height: mainSpace),
- new SearchTileView(searchC.text, type: 1),
- new Container(
- color: Colors.white,
- width: winWidth(context),
- height: (winHeight(context) - 185 * 1.38),
- )
- ];
- } else {
- return [
- new SearchTileView(
- searchC.text,
- onPressed: () => search(searchC.text),
- ),
- new Container(
- color: strNoEmpty(searchC.text) ? Colors.white : appBarColor,
- width: winWidth(context),
- height: strNoEmpty(searchC.text)
- ? (winHeight(context) - 65 * 2.1) - winKeyHeight(context)
- : winHeight(context),
- )
- ];
- }
- }
-
- @override
- void initState() {
- super.initState();
- getUser();
- }
-
- getUser() async {
- currentUser = await im.getCurrentLoginUser();
- setState(() {});
- }
-
- unFocusMethod() {
- searchF.unfocus();
- isSearch = false;
- if (isResult) isResult = !isResult;
- setState(() {});
- }
-
- /// 搜索好友
- Future search(String userName) async {
- final data = await getUsersProfile([userName]);
- List<dynamic> dataMap = json.decode(data);
- Map map = dataMap[0];
- if (strNoEmpty(map['allowType'])) {
- routePush(new AddFriendsDetails('search', map['identifier'],
- map['faceUrl'], map['nickName'], map['gender']));
- } else {
- isResult = true;
- setState(() {});
- }
- }
-
- @override
- Widget build(BuildContext context) {
- var leading = new InkWell(
- child: new Container(
- width: 15,
- height: 28,
- child: new Icon(CupertinoIcons.back, color: Colors.black),
- ),
- onTap: () => unFocusMethod(),
- );
-
- // ignore: unused_element
- List<Widget> searchView() {
- return [
- new Expanded(
- child: new TextField(
- style: TextStyle(textBaseline: TextBaseline.alphabetic),
- focusNode: searchF,
- controller: searchC,
- decoration:
- InputDecoration(hintText: '微信号/手机号', border: InputBorder.none),
- onChanged: (txt) {
- if (strNoEmpty(searchC.text))
- showBtn = true;
- else
- showBtn = false;
- if (isResult) isResult = false;
-
- setState(() {});
- },
- textInputAction: TextInputAction.search,
- onSubmitted: (txt) => search(txt),
- ),
- ),
- strNoEmpty(searchC.text)
- ? new InkWell(
- child: new Image.asset('assets/images/ic_delete.webp'),
- onTap: () {
- searchC.text = '';
- setState(() {});
- },
- )
- : new Container()
- ];
- }
-
- var bodyView = new SingleChildScrollView(
- child: isSearch
- ? new GestureDetector(
- child: new Column(children: searchBody()),
- onTap: () => unFocusMethod(),
- )
- : body(),
- );
-
- var rWidget = new FlatButton(
- onPressed: () => routePush(new AddFriendPage()),
- child: new Text('添加朋友'),
- );
-
- return WillPopScope(
- child: new Scaffold(
- backgroundColor: appBarColor,
- appBar: new ComMomBar(
- leadingW: isSearch ? leading : null,
- title: '新的朋友',
- titleW: isSearch ? new Row(children: searchView()) : null,
- rightDMActions: !isSearch ? [rWidget] : [],
- ),
- body: bodyView,
- ),
- onWillPop: () {
- if (isSearch) {
- unFocusMethod();
- } else {
- Navigator.pop(context);
- }
- return;
- },
- );
- }
-}
diff --git a/lib/pages/group/group_members_page.dart b/lib/pages/group/group_members_page.dart
deleted file mode 100644
index 8d13781..0000000
--- a/lib/pages/group/group_members_page.dart
+++ /dev/null
@@ -1,173 +0,0 @@
-import 'dart:convert';
-
-import 'package:flutter/material.dart';
-import 'package:wechat_flutter/im/friend/fun_dim_friend.dart';
-import 'package:wechat_flutter/im/fun_dim_group_model.dart';
-import 'package:wechat_flutter/pages/group/select_members_page.dart';
-import 'package:wechat_flutter/tools/wechat_flutter.dart';
-
-class GroupMembersPage extends StatefulWidget {
- final String groupId;
-
- GroupMembersPage(this.groupId);
-
- @override
- _GroupMembersPageState createState() => _GroupMembersPageState();
-}
-
-class _GroupMembersPageState extends State<GroupMembersPage> {
- Future _futureBuilderFuture;
- List memberList = [
- {'user': '+'},
-// {'user': '-'}
- ];
-
- @override
- void initState() {
- super.initState();
- _futureBuilderFuture = _gerData();
- }
-
- handle(String uId) {
- if (!strNoEmpty(uId)) {
- routePush(new SelectMembersPage());
-// routePush(CreateGroupChat(
-// 'invite',
-// groupId: widget.groupId,
-// callBack: (data) {
-// if (data.toString().contains('suc')) {
-// setState(() {});
-// }
-// print('邀请好友进群callback >>>> $data');
-// },
-// ));
-// } else {
-// routePush(ConversationDetailPage(
-// title: uId,
-// type: 1,
-// ));
- } else {
- showToast(context, '敬请期待');
- }
- }
-
- Widget memberItem(item) {
- List userInfo;
- String uId;
- String uFace;
- String nickName;
-
- if (item['user'] == "+" || item['user'] == '-') {
- return new InkWell(
- child: new SizedBox(
- width: (winWidth(context) - 60) / 5,
- child: Image.asset(
- 'assets/images/group/${item['user']}.png',
- height: 48.0,
- width: 48.0,
- ),
- ),
- onTap: () => handle(null),
- );
- }
-
- return new FutureBuilder(
- future: DimFriend.getUsersProfile(item['user'], (cb) {
- userInfo = json.decode(cb.toString());
- uId = userInfo[0]['identifier'];
- uFace = userInfo[0]['faceUrl'];
- nickName = userInfo[0]['nickName'];
- }),
- builder: (context, snap) {
- return new SizedBox(
- width: (winWidth(context) - 60) / 5,
- child: FlatButton(
- onPressed: () => handle(uId),
- padding: EdgeInsets.all(0),
- highlightColor: Colors.transparent,
- child: Column(
- children: <Widget>[
- ClipRRect(
- borderRadius: BorderRadius.all(Radius.circular(5)),
- child: !strNoEmpty(uFace)
- ? new Image.asset(
- defIcon,
- height: 48.0,
- width: 48.0,
- fit: BoxFit.cover,
- )
- : CachedNetworkImage(
- imageUrl: uFace,
- height: 48.0,
- width: 48.0,
- cacheManager: cacheManager,
- fit: BoxFit.cover,
- ),
- ),
- SizedBox(height: 2),
- Container(
- alignment: Alignment.center,
- height: 20.0,
- width: 50,
- child: Text(
- nickName == null || nickName == ''
- ? '默认昵称'
- : nickName.length > 5
- ? '${nickName.substring(0, 3)}...'
- : nickName,
- style: TextStyle(fontSize: 12.0),
- ),
- ),
- ],
- ),
- ),
- );
- },
- );
- }
-
- Future _gerData() async {
- return DimGroup.getGroupMembersListModel(widget.groupId,
- callback: (result) {
- setState(() {
- memberList.insertAll(
- 0, json.decode(result.toString().replaceAll("'", '"')));
- });
- });
- }
-
- Widget titleWidget() {
- return FutureBuilder(
- future: _futureBuilderFuture,
- builder: (context, snap) {
- return new Text(
- '聊天成员(${memberList?.length != null ? memberList.length - 1 : 0})',
- style: new TextStyle(
- color: Colors.black, fontSize: 17.0, fontWeight: FontWeight.w600),
- );
- },
- );
- }
-
- @override
- Widget build(BuildContext context) {
- if (!listNoEmpty(memberList)) {
- return Container();
- }
-
- return new Scaffold(
- appBar: new ComMomBar(titleW: titleWidget()),
- body: new ListView(
- padding: EdgeInsets.all(10),
- children: <Widget>[
- new Wrap(
- alignment: WrapAlignment.start,
- children: memberList.map(memberItem).toList(),
- runSpacing: 20.0,
- spacing: 10,
- ),
- ],
- ),
- );
- }
-}
diff --git a/lib/pages/home/home_page.dart b/lib/pages/home/home_page.dart
deleted file mode 100755
index 3a39de2..0000000
--- a/lib/pages/home/home_page.dart
+++ /dev/null
@@ -1,170 +0,0 @@
-import 'package:wechat_flutter/im/conversation_handle.dart';
-import 'package:wechat_flutter/im/model/chat_list.dart';
-import 'package:wechat_flutter/pages/chat/chat_page.dart';
-import 'package:wechat_flutter/tools/wechat_flutter.dart';
-import 'package:wechat_flutter/ui/view/indicator_page_view.dart';
-import 'package:flutter/material.dart';
-import 'package:wechat_flutter/ui/edit/text_span_builder.dart';
-import 'package:wechat_flutter/ui/chat/my_conversation_view.dart';
-import 'package:wechat_flutter/ui/view/pop_view.dart';
-
-class HomePage extends StatefulWidget {
- @override
- _HomePageState createState() => _HomePageState();
-}
-
-class _HomePageState extends State<HomePage>
- with AutomaticKeepAliveClientMixin {
- List<ChatList> _chatData = [];
-
- var tapPos;
- TextSpanBuilder _builder = TextSpanBuilder();
- StreamSubscription<dynamic> _messageStreamSubscription;
-
- @override
- void initState() {
- super.initState();
- initPlatformState();
- getChatData();
- }
-
- Future getChatData() async {
- final str = await ChatListData().chatListData();
- List<ChatList> listChat = str;
- if (!listNoEmpty(listChat)) return;
- _chatData.clear();
- _chatData..addAll(listChat?.reversed);
- if (mounted) setState(() {});
- }
-
- _showMenu(BuildContext context, Offset tapPos, int type, String id) {
- final RenderBox overlay = Overlay.of(context).context.findRenderObject();
- final RelativeRect position = RelativeRect.fromLTRB(tapPos.dx, tapPos.dy,
- overlay.size.width - tapPos.dx, overlay.size.height - tapPos.dy);
- showMenu<String>(
- context: context,
- position: position,
- items: <MyPopupMenuItem<String>>[
- new MyPopupMenuItem(child: Text('标为已读'), value: '标为已读'),
- new MyPopupMenuItem(child: Text('置顶聊天'), value: '置顶聊天'),
- new MyPopupMenuItem(child: Text('删除该聊天'), value: '删除该聊天'),
- // ignore: missing_return
- ]).then<String>((String selected) {
- switch (selected) {
- case '删除该聊天':
- deleteConversationAndLocalMsgModel(type, id, callback: (str) {
- debugPrint('deleteConversationAndLocalMsgModel' + str.toString());
- });
- delConversationModel(id, type, callback: (str) {
- debugPrint('deleteConversationModel' + str.toString());
- });
- getChatData();
- break;
- case '标为已读':
- getUnreadMessageNumModel(type, id, callback: (str) {
- int num = int.parse(str.toString());
- if (num != 0) {
- setReadMessageModel(type, id);
- setState(() {});
- }
- });
- break;
- }
- });
- }
-
- void canCelListener() {
- if (_messageStreamSubscription != null) {
- _messageStreamSubscription.cancel();
- }
- }
-
- Future<void> initPlatformState() async {
- if (!mounted) return;
-
- if (_messageStreamSubscription == null) {
- _messageStreamSubscription =
- im.onMessage.listen((dynamic onData) => getChatData());
- }
- }
-
- @override
- bool get wantKeepAlive => true;
-
- Widget timeView(int time) {
- DateTime dateTime = DateTime.fromMillisecondsSinceEpoch(time * 1000);
-
- String hourParse = "0${dateTime.hour}";
- String minuteParse = "0${dateTime.minute}";
-
- String hour = dateTime.hour.toString().length == 1
- ? hourParse
- : dateTime.hour.toString();
- String minute = dateTime.minute.toString().length == 1
- ? minuteParse
- : dateTime.minute.toString();
-
- String timeStr = '$hour:$minute';
-
- return new SizedBox(
- width: 35.0,
- child: new Text(
- timeStr,
- maxLines: 1,
- overflow: TextOverflow.ellipsis,
- style: TextStyle(color: mainTextColor, fontSize: 14.0),
- ),
- );
- }
-
- @override
- Widget build(BuildContext context) {
- super.build(context);
- if (!listNoEmpty(_chatData)) return new HomeNullView();
- return new Container(
- color: Color(AppColors.BackgroundColor),
- child: new ScrollConfiguration(
- behavior: MyBehavior(),
- child: new ListView.builder(
- itemBuilder: (BuildContext context, int index) {
- ChatList model = _chatData[index];
-
- return InkWell(
- onTap: () {
- routePush(new ChatPage(
- id: model.identifier,
- title: model.name,
- type: model.type == 'Group' ? 2 : 1));
- },
- onTapDown: (TapDownDetails details) {
- tapPos = details.globalPosition;
- },
- onLongPress: () {
- if (Platform.isAndroid) {
- _showMenu(context, tapPos, model.type == 'Group' ? 2 : 1,
- model.identifier);
- } else {
- debugPrint("IOS聊天长按选项功能开发中");
- }
- },
- child: new MyConversationView(
- imageUrl: model.avatar,
- title: model?.name ?? '',
- content: model?.content,
- time: timeView(model?.time ?? 0),
- isBorder: model?.name != _chatData[0].name,
- ),
- );
- },
- itemCount: _chatData?.length ?? 1,
- ),
- ),
- );
- }
-
- @override
- void dispose() {
- super.dispose();
- canCelListener();
- }
-}
diff --git a/lib/pages/mine/code_page.dart b/lib/pages/mine/code_page.dart
deleted file mode 100644
index 0400b93..0000000
--- a/lib/pages/mine/code_page.dart
+++ /dev/null
@@ -1,136 +0,0 @@
-import 'package:wechat_flutter/ui/dialog/code_dialog.dart';
-import 'package:flutter/material.dart';
-
-import 'package:wechat_flutter/tools/wechat_flutter.dart';
-
-class CodePage extends StatefulWidget {
- final bool isGroup;
-
- CodePage([this.isGroup = false]);
-
- @override
- _CodePageState createState() => _CodePageState();
-}
-
-class _CodePageState extends State<CodePage> {
- List data = ['换个样式', '保存到手机', '扫描二维码', '重置二维码'];
- List groupData = ['保存到手机', '扫描二维码'];
-
- @override
- Widget build(BuildContext context) {
- var rWidget = [
- new SizedBox(
- width: 60,
- child: new FlatButton(
- padding: EdgeInsets.all(0),
- onPressed: () => codeDialog(
- context,
- widget.isGroup ? groupData : data,
- ),
- child: new Image.asset(contactAssets + 'ic_contacts_details.png'),
- ),
- )
- ];
-
- var body = [
- new Container(
- margin: EdgeInsets.only(
- left: 20.0, right: 20.0, top: winHeight(context) / 10),
- decoration: BoxDecoration(
- color: Colors.white,
- borderRadius: BorderRadius.all(Radius.circular(4.0)),
- ),
- child: new Padding(
- padding: EdgeInsets.all(20.0),
- child: new Column(
- children: <Widget>[
- new SizedBox(
- width: winWidth(context) - 40.0,
- child: new CardPerson(
- name: 'CrazyQ1',
- area: '北京 海淀',
- icon: 'assets/images/Contact_Male.webp',
- groupName: widget.isGroup ? 'wechat_flutter 101号群' : null,
- ),
- ),
- new Space(width: mainSpace),
- new Container(
- padding: EdgeInsets.symmetric(
- horizontal: !widget.isGroup ? 0 : 20,
- vertical: !widget.isGroup ? 0 : 20,
- ),
- child: new CachedNetworkImage(
- imageUrl: widget.isGroup ? download : myCode,
- fit: BoxFit.cover,
- width: winWidth(context) - 40,
- ),
- ),
- new Space(height: mainSpace * 2),
- new Text(
- '${widget.isGroup ? '该二维码7天内(7月1日前)有效，重新进入将更新' : '扫一扫上面的二维码图案，加我微信'}',
- style: TextStyle(color: mainTextColor),
- ),
- ],
- ),
- ),
- )
- ];
- return new Scaffold(
- backgroundColor: chatBg,
- appBar: new ComMomBar(
- title: '${widget.isGroup ? '群' : ''}二维码名片', rightDMActions: rWidget),
- body: new SingleChildScrollView(child: new Column(children: body)),
- );
- }
-}
-
-class CardPerson extends StatelessWidget {
- final String name, icon, area, groupName;
-
- CardPerson({this.name, this.icon, this.area, this.groupName});
-
- @override
- Widget build(BuildContext context) {
- return new Row(
- children: <Widget>[
- new Padding(
- padding: EdgeInsets.only(right: 15.0),
- child: new ImageView(
- img: strNoEmpty(groupName) ? defGroupAvatar : defAvatar,
- width: 45,
- ),
- ),
- strNoEmpty(groupName)
- ? new Text(
- groupName ?? '',
- style: TextStyle(fontSize: 17.0, fontWeight: FontWeight.w600),
- )
- : new Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: <Widget>[
- new Row(
- children: <Widget>[
- new Text(
- name ?? '',
- style: TextStyle(
- fontSize: 17.0, fontWeight: FontWeight.w600),
- ),
- new Space(width: mainSpace / 2),
- new Image.asset(
- icon ?? '',
- width: 18.0,
- fit: BoxFit.cover,
- ),
- ],
- ),
- new Space(height: mainSpace / 3),
- new Text(
- area ?? '',
- style: TextStyle(fontSize: 14.0, color: mainTextColor),
- ),
- ],
- )
- ],
- );
- }
-}
diff --git a/lib/pages/mine/personal_info_page.dart b/lib/pages/mine/personal_info_page.dart
deleted file mode 100644
index 68b34ea..0000000
--- a/lib/pages/mine/personal_info_page.dart
+++ /dev/null
@@ -1,146 +0,0 @@
-import 'dart:convert';
-
-import 'package:wechat_flutter/http/api.dart';
-import 'package:wechat_flutter/pages/mine/code_page.dart';
-import 'package:wechat_flutter/tools/commom.dart';
-import 'package:wechat_flutter/tools/wechat_flutter.dart';
-import 'package:flutter/material.dart';
-import 'package:image_picker/image_picker.dart';
-import 'package:provider/provider.dart';
-import 'package:wechat_flutter/im/info_handle.dart';
-import 'package:wechat_flutter/pages/mine/change_name_page.dart';
-import 'package:wechat_flutter/provider/global_model.dart';
-
-import 'package:wechat_flutter/ui/orther/label_row.dart';
-
-class PersonalInfoPage extends StatefulWidget {
- @override
- _PersonalInfoPageState createState() => _PersonalInfoPageState();
-}
-
-class _PersonalInfoPageState extends State<PersonalInfoPage> {
- @override
- void initState() {
- super.initState();
- }
-
- action(v) {
- if (v == '二维码名片') {
- routePush(new CodePage());
- } else {
- print(v);
- }
- }
-
- _openGallery({type = ImageSource.gallery}) async {
- showToast(context, '服务器正在调整，敬请期待');
-
- // final model = Provider.of<GlobalModel>(context, listen: false);
- // File imageFile = await ImagePicker.pickImage(source: type);
- // List<int> imageBytes = await compressFile(imageFile);
- // if (imageFile != null) {
- // String base64Img = 'data:image/jpeg;base64,${base64Encode(imageBytes)}';
- // uploadImgApi(context, base64Img, (v) {
- // if (v == null) {
- // showToast(context, '上传头像失败,请换张图像再试');
- // return;
- // }
- //
- // setUsersProfileMethod(
- // context,
- // avatarStr: v,
- // nickNameStr: model.nickName,
- // callback: (data) {
- // if (data.toString().contains('ucc')) {
- // showToast(context, '设置头像成功');
- // model.avatar = v;
- // model.refresh();
- // } else {
- // showToast(context, '设置头像失败');
- // }
- // },
- // );
- // });
- // }
- }
-
- Widget dynamicAvatar(avatar, {size}) {
- if (isNetWorkImg(avatar)) {
- return new CachedNetworkImage(
- imageUrl: avatar,
- cacheManager: cacheManager,
- width: size ?? null,
- height: size ?? null,
- fit: BoxFit.fill);
- } else {
- return new Image.asset(avatar,
- fit: BoxFit.fill, width: size ?? null, height: size ?? null);
- }
- }
-
- Widget body(GlobalModel model) {
- List data = [
- {'label': '微信号', 'value': model.account},
- {'label': '二维码名片', 'value': ''},
- {'label': '更多', 'value': ''},
- {'label': '我的地址', 'value': ''},
- ];
-
- var content = [
- new LabelRow(
- label: '头像',
- isLine: true,
- isRight: true,
- rightW: new SizedBox(
- width: 55.0,
- height: 55.0,
- child: new ClipRRect(
- borderRadius: BorderRadius.all(Radius.circular(5.0)),
- child: strNoEmpty(model.avatar)
- ? dynamicAvatar(model.avatar)
- : new Image.asset(defIcon, fit: BoxFit.cover),
- ),
- ),
- onPressed: () => _openGallery(),
- ),
- new LabelRow(
- label: '昵称',
- isLine: true,
- isRight: true,
- rValue: model.nickName,
- onPressed: () => routePush(new ChangeNamePage(model.nickName)),
- ),
- new Column(
- children: data.map((item) => buildContent(item, model)).toList(),
- ),
- ];
-
- return new Column(children: content);
- }
-
- Widget buildContent(item, GlobalModel model) {
- return new LabelRow(
- label: item['label'],
- rValue: item['value'],
- isLine: item['label'] == '我的地址' || item['label'] == '更多' ? false : true,
- isRight: item['label'] == '微信号' ? false : true,
- margin: EdgeInsets.only(bottom: item['label'] == '更多' ? 10.0 : 0.0),
- rightW: item['label'] == '二维码名片'
- ? new Image.asset('assets/images/mine/ic_small_code.png',
- color: mainTextColor.withOpacity(0.7))
- : new Container(),
- onPressed: () => action(item['label']),
- );
- }
-
- @override
- Widget build(BuildContext context) {
- final model = Provider.of<GlobalModel>(context);
-
- return new Scaffold(
- backgroundColor: appBarColor,
- appBar: new ComMomBar(title: '个人信息'),
- body: new SingleChildScrollView(child: body(model)),
- );
- }
-}
diff --git a/lib/pages/more/add_friend_page.dart b/lib/pages/more/add_friend_page.dart
deleted file mode 100644
index 1059579..0000000
--- a/lib/pages/more/add_friend_page.dart
+++ /dev/null
@@ -1,277 +0,0 @@
-import 'dart:convert';
-
-import 'package:wechat_flutter/im/entity/i_person_info_entity.dart';
-import 'package:wechat_flutter/im/entity/person_info_entity.dart';
-import 'package:wechat_flutter/pages/mine/code_page.dart';
-import 'package:wechat_flutter/pages/root/user_page.dart';
-import 'package:wechat_flutter/provider/global_model.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:wechat_flutter/im/info_handle.dart';
-import 'package:wechat_flutter/pages/more/add_friend_details.dart';
-
-import 'package:wechat_flutter/tools/wechat_flutter.dart';
-import 'package:wechat_flutter/ui/view/list_tile_view.dart';
-import 'package:wechat_flutter/ui/view/search_main_view.dart';
-import 'package:wechat_flutter/ui/view/search_tile_view.dart';
-import 'package:provider/provider.dart';
-
-class AddFriendPage extends StatefulWidget {
- @override
- _AddFriendPageState createState() => new _AddFriendPageState();
-}
-
-class _AddFriendPageState extends State<AddFriendPage> {
- bool isSearch = false;
- bool showBtn = false;
- bool isResult = false;
-
- String currentUser;
-
- FocusNode searchF = new FocusNode();
- TextEditingController searchC = new TextEditingController();
-
- Widget buildItem(item) {
- return new ListTileView(
- border: item['title'] == '雷达加朋友'
- ? null
- : Border(top: BorderSide(color: lineColor, width: 0.2)),
- title: item['title'],
- label: item['label'],
- icon: strNoEmpty(item['icon'])
- ? item['icon']
- : 'assets/images/favorite.webp',
- fit: BoxFit.cover,
- onPressed: () => routePush(new UserPage()),
- );
- }
-
- Widget body() {
- final model = Provider.of<GlobalModel>(context);
-
- List data = [
- {
- 'icon': contactAssets + 'ic_reda.webp',
- 'title': '雷达加朋友',
- 'label': '添加身边的朋友',
- },
- {
- 'icon': contactAssets + 'ic_group.webp',
- 'title': '面对面建群',
- 'label': '与身边的朋友进入同一个群聊'
- },
- {
- 'icon': contactAssets + 'ic_scanqr.webp',
- 'title': '扫一扫',
- 'label': '扫描二维码名片',
- },
- {
- 'icon': contactAssets + 'ic_new_friend.webp',
- 'title': '手机联系人',
- 'label': '添加或邀请通讯录中的朋友',
- },
- {
- 'icon': contactAssets + 'ic_offical.webp',
- 'title': '公众号',
- 'label': '获取更多资讯和服务',
- },
- {
- 'icon': contactAssets + 'ic_search_wework.webp',
- 'title': '企业微信联系人',
- 'label': '通过手机号搜索企业微信用户',
- },
- ];
- var content = [
- new SearchMainView(
- text: '微信号/手机号',
- onTap: () {
- isSearch = true;
- setState(() {});
- searchF.requestFocus();
- },
- ),
- new Padding(
- padding: EdgeInsets.only(top: 15.0, bottom: 30.0),
- child: new Row(
- mainAxisAlignment: MainAxisAlignment.center,
- children: <Widget>[
- new Text(
- '我的微信号：${currentUser ?? '[${model.account}]'}',
- style: TextStyle(color: mainTextColor, fontSize: 14.0),
- ),
- new Space(width: mainSpace * 1.5),
- new InkWell(
- child: new Image.asset('assets/images/mine/ic_small_code.png',
- color: mainTextColor.withOpacity(0.7)),
- onTap: () => routePush(new CodePage()),
- )
- ],
- ),
- ),
- new Column(children: data.map(buildItem).toList())
- ];
-
- return new Column(children: content);
- }
-
- List<Widget> searchBody() {
- if (isResult) {
- return [
- new Container(
- color: Colors.white,
- width: winWidth(context),
- height: 110.0,
- alignment: Alignment.center,
- child: new Text(
- '该用户不存在',
- style: TextStyle(color: mainTextColor),
- ),
- ),
- new Space(height: mainSpace),
- new SearchTileView(searchC.text, type: 1),
- new Container(
- color: Colors.white,
- width: winWidth(context),
- height: (winHeight(context) - 185 * 1.38),
- )
- ];
- } else {
- return [
- new SearchTileView(
- searchC.text,
- onPressed: () => search(searchC.text),
- ),
- new Container(
- color: strNoEmpty(searchC.text) ? Colors.white : appBarColor,
- width: winWidth(context),
- height: strNoEmpty(searchC.text)
- ? (winHeight(context) - 65 * 2.1) - winKeyHeight(context)
- : winHeight(context),
- )
- ];
- }
- }
-
- @override
- void initState() {
- super.initState();
- getUser();
- }
-
- getUser() async {
- if (Platform.isAndroid) {
- currentUser = await im.getCurrentLoginUser();
- } else {
- currentUser = null;
- }
- setState(() {});
- }
-
- unFocusMethod() {
- searchF.unfocus();
- isSearch = false;
- if (isResult) isResult = !isResult;
- setState(() {});
- }
-
- // 搜索好友
- Future search(String userName) async {
- final data = await getUsersProfile([userName]);
- List<dynamic> dataMap = json.decode(data);
- setState(() {
- if (Platform.isIOS) {
- IPersonInfoEntity model = IPersonInfoEntity.fromJson(dataMap[0]);
- if (strNoEmpty(model.allowType.toString())) {
- routePush(new AddFriendsDetails('search', model.identifier,
- model.faceURL, model.nickname, model.gender));
- } else {
- isResult = true;
- }
- } else {
- PersonInfoEntity model = PersonInfoEntity.fromJson(dataMap[0]);
- if (strNoEmpty(model.allowType)) {
- routePush(new AddFriendsDetails('search', model.identifier,
- model.faceUrl, model.nickName, model.gender));
- } else {
- isResult = true;
- }
- }
- });
- }
-
- @override
- Widget build(BuildContext context) {
- var leading = new InkWell(
- child: new Container(
- width: 15,
- height: 28,
- child: new Icon(CupertinoIcons.back, color: Colors.black),
- ),
- onTap: () => unFocusMethod(),
- );
-
- // ignore: unused_element
- List<Widget> searchView() {
- return [
- new Expanded(
- child: new TextField(
- focusNode: searchF,
- controller: searchC,
- style: TextStyle(textBaseline: TextBaseline.alphabetic),
- decoration:
- InputDecoration(hintText: '微信号/手机号', border: InputBorder.none),
- onChanged: (txt) {
- if (strNoEmpty(searchC.text))
- showBtn = true;
- else
- showBtn = false;
- if (isResult) isResult = false;
-
- setState(() {});
- },
- textInputAction: TextInputAction.search,
- onSubmitted: (txt) => search(txt),
- ),
- ),
- strNoEmpty(searchC.text)
- ? new InkWell(
- child: new Image.asset('assets/images/ic_delete.webp'),
- onTap: () {
- searchC.text = '';
- setState(() {});
- },
- )
- : new Container()
- ];
- }
-
- var bodyView = new SingleChildScrollView(
- child: isSearch
- ? new GestureDetector(
- child: new Column(children: searchBody()),
- onTap: () => unFocusMethod(),
- )
- : body(),
- );
-
- return WillPopScope(
- child: new Scaffold(
- backgroundColor: appBarColor,
- appBar: new ComMomBar(
- leadingW: isSearch ? leading : null,
- title: '添加朋友',
- titleW: isSearch ? new Row(children: searchView()) : null,
- ),
- body: bodyView,
- ),
- onWillPop: () {
- if (isSearch) {
- unFocusMethod();
- } else {
- Navigator.pop(context);
- }
- return;
- },
- );
- }
-}
diff --git a/lib/pages/root/root/root_binding.dart b/lib/pages/root/root/root_binding.dart
new file mode 100644
index 0000000..bea6181
--- /dev/null
+++ b/lib/pages/root/root/root_binding.dart
@@ -0,0 +1,10 @@
+import 'package:get/get.dart';
+
+import 'root_logic.dart';
+
+class RootBinding extends Bindings {
+ @override
+ void dependencies() {
+ Get.lazyPut(() => RootLogic());
+ }
+}
diff --git a/lib/pages/root/root/root_logic.dart b/lib/pages/root/root/root_logic.dart
new file mode 100644
index 0000000..a67b3ad
--- /dev/null
+++ b/lib/pages/root/root/root_logic.dart
@@ -0,0 +1,22 @@
+
+import '../../../tools/wechat_flutter.dart';
+
+class RootLogic extends GetxController {
+
+ ifBrokenNetwork() async {
+ final ifNetWork = await SharedUtil.instance!.getBoolean(Keys.brokenNetwork);
+ if (ifNetWork) {
+ /// 监测网络变化
+ subscription.onConnectivityChanged
+ .listen((ConnectivityResult result) async {
+ if (result == ConnectivityResult.mobile ||
+ result == ConnectivityResult.wifi) {
+ await SharedUtil.instance!.saveBoolean(Keys.brokenNetwork, false);
+ }
+ });
+ } else {
+ return;
+ }
+ }
+
+}
diff --git a/lib/pages/root/root_page.dart b/lib/pages/root/root/root_view.dart
similarity index 54%
rename from lib/pages/root/root_page.dart
rename to lib/pages/root/root/root_view.dart
index e395f37..020c2ab 100644
--- a/lib/pages/root/root_page.dart
+++ b/lib/pages/root/root/root_view.dart
@@ -1,78 +1,83 @@
-import 'package:wechat_flutter/http/api.dart';
import 'package:flutter/material.dart';
-import 'package:wechat_flutter/pages/contacts/contacts_page.dart';
-import 'package:wechat_flutter/pages/discover/discover_page.dart';
-import 'package:wechat_flutter/pages/home/home_page.dart';
-import 'package:wechat_flutter/pages/mine/mine_page.dart';
+import 'package:get/get.dart';
+import 'package:wechat_flutter/pages/common/contacts/contacts_page.dart';
+import 'package:wechat_flutter/pages/common/discover/discover_page.dart';
+import 'package:wechat_flutter/pages/common/home/home_page.dart';
+import 'package:wechat_flutter/pages/common/mine/mine_page.dart';
import 'package:wechat_flutter/pages/root/root_tabbar.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
+import 'root_logic.dart';
+
class RootPage extends StatefulWidget {
@override
- _RootPageState createState() => _RootPageState();
+ State<RootPage> createState() => _RootPageState();
}
-class _RootPageState extends State<RootPage> {
+class _RootPageState extends State<RootPage> with WidgetsBindingObserver {
+ final logic = Get.find<RootLogic>();
+
@override
void initState() {
super.initState();
- ifBrokenNetwork();
- updateApi(context);
+ logic.ifBrokenNetwork();
+ // updateApi(context);
+
+ WidgetsBinding.instance.addObserver(this);
}
- ifBrokenNetwork() async {
- final ifNetWork = await SharedUtil.instance.getBoolean(Keys.brokenNetwork);
- if (ifNetWork) {
- /// 监测网络变化
- subscription.onConnectivityChanged
- .listen((ConnectivityResult result) async {
- if (result == ConnectivityResult.mobile ||
- result == ConnectivityResult.wifi) {
- final currentUser = await im.getCurrentLoginUser();
- if (currentUser == '' || currentUser == null) {
- final account = await SharedUtil.instance.getString(Keys.account);
- im.imAutoLogin(account);
- }
- await SharedUtil.instance.saveBoolean(Keys.brokenNetwork, false);
+ @override
+ void didChangeMetrics() {
+ super.didChangeMetrics();
+ WidgetsBinding.instance.addPostFrameCallback((_) {
+ if (mounted) {
+ var keyboardSize = MediaQuery.of(context).viewInsets.bottom;
+ if (keyboardSize > AppConfig.keyboardHeight) {
+ AppConfig.keyboardHeight = keyboardSize;
+ SharedUtil.instance!
+ .saveDouble(Keys.keyboardSize, AppConfig.keyboardHeight);
}
- });
- } else {
- return;
- }
+ }
+ });
}
@override
Widget build(BuildContext context) {
List<TabBarModel> pages = <TabBarModel>[
new TabBarModel(
- title: S.of(context).weChat,
+ title: "消息",
icon: new LoadImage("assets/images/tabbar_chat_c.webp"),
selectIcon: new LoadImage("assets/images/tabbar_chat_s.webp"),
page: new HomePage()),
new TabBarModel(
- title: S.of(context).contacts,
+ title: "通讯录",
icon: new LoadImage("assets/images/tabbar_contacts_c.webp"),
selectIcon: new LoadImage("assets/images/tabbar_contacts_s.webp"),
page: new ContactsPage(),
),
new TabBarModel(
- title: S.of(context).discover,
+ title: "发现",
icon: new LoadImage("assets/images/tabbar_discover_c.webp"),
selectIcon: new LoadImage("assets/images/tabbar_discover_s.webp"),
page: new DiscoverPage(),
),
new TabBarModel(
- title: S.of(context).me,
+ title: "我",
icon: new LoadImage("assets/images/tabbar_me_c.webp"),
selectIcon: new LoadImage("assets/images/tabbar_me_s.webp"),
page: new MinePage(),
),
];
return new Scaffold(
- key: scaffoldGK,
body: new RootTabBar(pages: pages, currentIndex: 0),
);
}
+
+ @override
+ void dispose() {
+ super.dispose();
+ WidgetsBinding.instance.removeObserver(this);
+ }
}
class LoadImage extends StatelessWidget {
diff --git a/lib/pages/root/root_tabbar.dart b/lib/pages/root/root_tabbar.dart
index 9abe6a3..582a3f6 100644
--- a/lib/pages/root/root_tabbar.dart
+++ b/lib/pages/root/root_tabbar.dart
@@ -1,14 +1,14 @@
import 'dart:io';
-import 'package:wechat_flutter/pages/contacts/group_launch_page.dart';
-import 'package:wechat_flutter/pages/home/search_page.dart';
-import 'package:wechat_flutter/pages/settings/language_page.dart';
-import 'package:wechat_flutter/ui/view/indicator_page_view.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
-import 'package:wechat_flutter/pages/more/add_friend_page.dart';
-
+import 'package:get/get.dart';
+import 'package:wechat_flutter/pages/common/contacts/group_launch_page.dart';
+import 'package:wechat_flutter/pages/common/home/search_page.dart';
+import 'package:wechat_flutter/pages/common/settings/language_page.dart';
+import 'package:wechat_flutter/pages/common/tools/scan_page.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
+import 'package:wechat_flutter/ui/view/indicator_page_view.dart';
import 'package:wechat_flutter/ui/w_pop/w_popup_menu.dart';
typedef CheckLogin(index);
@@ -16,8 +16,8 @@ typedef CheckLogin(index);
class RootTabBar extends StatefulWidget {
RootTabBar({this.pages, this.checkLogin, this.currentIndex = 0});
- final List pages;
- final CheckLogin checkLogin;
+ final List? pages;
+ final CheckLogin? checkLogin;
final int currentIndex;
@override
@@ -25,21 +25,21 @@ class RootTabBar extends StatefulWidget {
}
class RootTabBarState extends State<RootTabBar> {
- var pages = new List<BottomNavigationBarItem>();
- int currentIndex;
- var contents = new List<Offstage>();
- PageController pageController;
+ var pages = <BottomNavigationBarItem>[];
+ late int currentIndex;
+ var contents = <Offstage>[];
+ PageController? pageController;
@override
void initState() {
super.initState();
currentIndex = widget.currentIndex;
pageController = PageController(initialPage: currentIndex);
- for (int i = 0; i < widget.pages.length; i++) {
- TabBarModel model = widget.pages[i];
+ for (int i = 0; i < widget.pages!.length; i++) {
+ TabBarModel model = widget.pages![i];
pages.add(
new BottomNavigationBarItem(
- icon: model.icon,
+ icon: model.icon!,
activeIcon: model.selectIcon,
label: model.title,
),
@@ -49,13 +49,15 @@ class RootTabBarState extends State<RootTabBar> {
actionsHandle(v) {
if (v == '添加朋友') {
- routePush(new AddFriendPage());
+ Get.toNamed(RouteConfig.addFriendPage);
} else if (v == '发起群聊') {
- routePush(new GroupLaunchPage());
+ Get.to(new GroupLaunchPage());
} else if (v == '帮助与反馈') {
- routePush(new WebViewPage(helpUrl, '帮助与反馈'));
+ Get.to(new WebViewPage(helpUrl, '帮助与反馈'));
+ } else if (v == '扫一扫') {
+ Get.to(new ScanPage());
} else {
- routePush(new LanguagePage());
+ Get.to(new LanguagePage());
}
}
@@ -77,7 +79,7 @@ class RootTabBarState extends State<RootTabBar> {
unselectedItemColor: mainTextColor,
onTap: (int index) {
setState(() => currentIndex = index);
- pageController.jumpToPage(currentIndex);
+ pageController!.jumpToPage(currentIndex);
},
unselectedFontSize: 12.0,
selectedFontSize: 12.0,
@@ -86,23 +88,25 @@ class RootTabBarState extends State<RootTabBar> {
);
var appBar = new ComMomBar(
- title: widget.pages[currentIndex].title,
+ title: widget.pages![currentIndex].title,
showShadow: false,
+ showPop: false,
rightDMActions: <Widget>[
new InkWell(
child: new Container(
width: 60.0,
child: new Image.asset('assets/images/search_black.webp'),
),
- onTap: () => routeFadePush(new SearchPage()),
+ onTap: () => Get.to(new SearchPage()),
),
new WPopupMenu(
- menuWidth: winWidth(context) / 2.5,
+ menuWidth: FrameSize.winWidth() / 2.5,
alignment: Alignment.center,
- onValueChanged: (String value) {
+ onValueChanged: (String? value) {
if (!strNoEmpty(value)) return;
actionsHandle(value);
},
+ menuHeight: (actions.length * 50) + 10.0,
actions: actions,
child: new Container(
margin: EdgeInsets.symmetric(horizontal: 15.0),
@@ -126,13 +130,14 @@ class RootTabBarState extends State<RootTabBar> {
child: bottomNavigationBar,
),
),
- appBar:
- widget.pages[currentIndex].title != S.of(context).me ? appBar : null,
+ appBar: widget.pages![currentIndex].title != "我"
+ ? appBar
+ : null,
body: new ScrollConfiguration(
behavior: MyBehavior(),
child: new PageView.builder(
itemBuilder: (BuildContext context, int index) =>
- widget.pages[index].page,
+ widget.pages![index].page,
controller: pageController,
itemCount: pages.length,
physics: Platform.isAndroid
@@ -150,8 +155,8 @@ class RootTabBarState extends State<RootTabBar> {
class TabBarModel {
const TabBarModel({this.title, this.page, this.icon, this.selectIcon});
- final String title;
- final Widget icon;
- final Widget selectIcon;
- final Widget page;
+ final String? title;
+ final Widget? icon;
+ final Widget? selectIcon;
+ final Widget? page;
}
diff --git a/lib/provider/global_model.dart b/lib/provider/global_model.dart
deleted file mode 100755
index f1a065a..0000000
--- a/lib/provider/global_model.dart
+++ /dev/null
@@ -1,87 +0,0 @@
-import 'dart:convert';
-
-import 'package:wechat_flutter/im/entity/i_person_info_entity.dart';
-import 'package:wechat_flutter/tools/wechat_flutter.dart';
-import 'package:flutter/material.dart';
-import 'package:wechat_flutter/im/info_handle.dart';
-import 'package:wechat_flutter/provider/loginc/global_loginc.dart';
-
-class GlobalModel extends ChangeNotifier {
- BuildContext context;
-
- ///app的名字
- String appName = "微信flutter";
-
- /// 用户信息
- String account = '';
- String nickName = 'nickName';
- String avatar = '';
- int gender = 0;
-
- ///当前语言
- List<String> currentLanguageCode = ["zh", "CN"];
- String currentLanguage = "中文";
- Locale currentLocale;
-
- ///是否进入登录页
- bool goToLogin = true;
-
- GlobalLogic logic;
-
- GlobalModel() {
- logic = GlobalLogic(this);
- }
-
- void setContext(BuildContext context) {
- if (this.context == null) {
- this.context = context;
- Future.wait([
- logic.getAppName(),
- logic.getCurrentLanguageCode(),
- logic.getCurrentLanguage(),
- logic.getLoginState(),
- logic.getAccount(),
- logic.getNickName(),
- logic.getFaceUrl(),
- logic.getGender(),
- ]).then((value) {
- currentLocale = Locale(currentLanguageCode[0], currentLanguageCode[1]);
- refresh();
- });
- }
- }
-
- void initInfo() async {
- final data = await getUsersProfile([account]);
- if (data == null) return;
- List<dynamic> result = json.decode(data);
- if (Platform.isAndroid) {
- nickName = result[0]['nickName'];
- await SharedUtil.instance
- .saveString(Keys.nickName, result[0]['nickName']);
- avatar = result[0]['faceUrl'];
- await SharedUtil.instance.saveString(Keys.faceUrl, result[0]['faceUrl']);
- gender = result[0]['gender'];
- await SharedUtil.instance.saveInt(Keys.gender, result[0]['gender']);
- } else {
- IPersonInfoEntity model = IPersonInfoEntity.fromJson(result[0]);
- nickName = model.nickname;
- await SharedUtil.instance.saveString(Keys.nickName, model.nickname);
- avatar = model.faceURL;
- await SharedUtil.instance.saveString(Keys.faceUrl, model.faceURL);
- gender = model.gender;
- await SharedUtil.instance.saveInt(Keys.gender, model.gender);
- }
- }
-
- @override
- void dispose() {
- super.dispose();
- debugPrint("GlobalModel销毁了");
- }
-
- void refresh() {
- if (!goToLogin) initInfo();
- notifyListeners();
- }
-}
diff --git a/lib/routes/app_pages.dart b/lib/routes/app_pages.dart
new file mode 100644
index 0000000..fed623e
--- /dev/null
+++ b/lib/routes/app_pages.dart
@@ -0,0 +1,49 @@
+import 'package:get/get.dart';
+import 'package:wechat_flutter/app.dart';
+import 'package:wechat_flutter/pages/common/chat/chat_page/chat_binding.dart';
+import 'package:wechat_flutter/pages/common/chat/chat_page/chat_view.dart';
+import 'package:wechat_flutter/pages/common/more/add_friend/add_friend_binding.dart';
+import 'package:wechat_flutter/pages/common/more/add_friend/add_friend_view.dart';
+import 'package:wechat_flutter/pages/root/root/root_binding.dart';
+import 'package:wechat_flutter/pages/root/root/root_view.dart';
+import 'package:wechat_flutter/video/pages/audio_single/binding.dart';
+import 'package:wechat_flutter/video/pages/audio_single/view.dart';
+import 'package:wechat_flutter/video/pages/video_sigle/binding.dart';
+import 'package:wechat_flutter/video/pages/video_sigle/view.dart';
+
+part 'app_routes.dart';
+
+class AppPages {
+ static final routes = <GetPage>[
+ GetPage(
+ name: RouteConfig.startPage,
+ page: () => StartPage(),
+ // binding: RootBinding(),
+ ),
+ GetPage(
+ name: RouteConfig.rootPage,
+ page: () => RootPage(),
+ binding: RootBinding(),
+ ),
+ GetPage(
+ name: RouteConfig.addFriendPage,
+ page: () => AddFriendPage(),
+ binding: AddFriendBinding(),
+ ),
+ GetPage(
+ name: RouteConfig.videoSinglePage,
+ page: () => VideoSinglePage(),
+ binding: VideoSingleBinding(),
+ ),
+ GetPage(
+ name: RouteConfig.audioSinglePage,
+ page: () => AudioSinglePage(),
+ binding: AudioSingleBinding(),
+ ),
+ GetPage(
+ name: RouteConfig.chatPage,
+ page: () => ChatPage(),
+ binding: ChatBinding(),
+ ),
+ ];
+}
diff --git a/lib/routes/app_routes.dart b/lib/routes/app_routes.dart
new file mode 100644
index 0000000..e7df72a
--- /dev/null
+++ b/lib/routes/app_routes.dart
@@ -0,0 +1,14 @@
+part of 'app_pages.dart';
+
+class RouteConfig {
+ static const String notFond = '/notFond';
+ static const String startPage = '/startPage';
+ static const String rootPage = '/rootPage';
+ static const String addFriendPage = '/addFriendPage';
+ static const String videoSinglePage = '/videoSinglePage';
+ static const String audioSinglePage = '/audioSinglePage';
+ static const String chatPage = '/chatPage';
+ static const String videoMultiplePage = "/videoMultiplePage";
+ static const String audioMultiplePage = "/audioMultiplePage";
+ static const String acceptPage = "/acceptPage";
+}
diff --git a/lib/tools/chat/chat_memory.dart b/lib/tools/chat/chat_memory.dart
new file mode 100644
index 0000000..a3bf245
--- /dev/null
+++ b/lib/tools/chat/chat_memory.dart
@@ -0,0 +1,5 @@
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+class ChatMemory {
+ static Map<String, List<V2TimMessage>?> chatData = {};
+}
diff --git a/lib/tools/commom.dart b/lib/tools/commom.dart
deleted file mode 100644
index 625bb39..0000000
--- a/lib/tools/commom.dart
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-/*
-* 屏幕适配
-* SizeConfig().init(context); 初始化
-* height: SizeConfig.blockSizeVertical * 20,
-* width: SizeConfig.blockSizeHorizontal * 50,
-*
-* screen
-* width: SizeConfig.screenWidth,
-* height: SizeConfig.screenHeight,
-*
-* 字体 （均可）
-* SizeConfig.safeBlockHorizontal
-* SizeConfig.blockSizeVertical
-*
-***/
-import 'dart:io';
-
-import 'package:flutter/material.dart';
-// import 'package:flutter_image_compress/flutter_image_compress.dart';
-
-class SizeConfig {
- static MediaQueryData _mediaQueryData;
- static double screenWidth;
- static double screenHeight;
- static double blockSizeHorizontal;
- static double blockSizeVertical;
-
- static double _safeAreaHorizontal;
- static double _safeAreaVertical;
- static double safeBlockHorizontal;
- static double safeBlockVertical;
-
- void init(BuildContext context) {
- _mediaQueryData = MediaQuery.of(context);
- screenWidth = _mediaQueryData.size.width;
- screenHeight = _mediaQueryData.size.height;
- blockSizeHorizontal = screenWidth / 100;
- blockSizeVertical = screenHeight / 100;
-
- _safeAreaHorizontal =
- _mediaQueryData.padding.left + _mediaQueryData.padding.right;
- _safeAreaVertical =
- _mediaQueryData.padding.top + _mediaQueryData.padding.bottom;
- safeBlockHorizontal = (screenWidth - _safeAreaHorizontal) / 100;
- safeBlockVertical = (screenHeight - _safeAreaVertical) / 100;
- }
-}
-
-
-Future<File> singleCompressFile(File file) async {
- return file;
-// try {
-// File result = await FlutterNativeImage.compressImage(file.absolute.path,
-// quality: 80, percentage: 50);
-// debugPrint('图片压缩中');
-// print(file.lengthSync());
-// print(result.length);
-// return result;
-// } catch (e) {
-// debugPrint('e => ${e.toString()}');
-// return null;
-// }
-}
-
-// Future<List<int>> compressFile(File file) async {
-// try {
-// var result = await FlutterImageCompress.compressWithFile(
-// file.absolute.path,
-// minWidth: 200,
-// minHeight: 300,
-// quality: 80,
-// );
-// print(file.lengthSync());
-// print(result.length);
-// return result;
-// } catch (e) {
-// print('e => ${e.toString()}');
-// return null;
-// }
-// }
diff --git a/plugin/wechat_flutter_plugin/lib/commom/check.dart b/lib/tools/commom/check.dart
similarity index 73%
rename from plugin/wechat_flutter_plugin/lib/commom/check.dart
rename to lib/tools/commom/check.dart
index 74899c4..1af6248 100644
--- a/plugin/wechat_flutter_plugin/lib/commom/check.dart
+++ b/lib/tools/commom/check.dart
@@ -43,20 +43,27 @@ bool isAliPayName(String value) {
}
/// 字符串不为空
-bool strNoEmpty(String value) {
+bool strNoEmpty(String? value) {
if (value == null) return false;
return value.trim().isNotEmpty;
}
+/// 数字不为空
+bool numNoEmpty(int? value) {
+ if (value == null) return false;
+
+ return value == 0;
+}
+
/// 字符串不为空
-bool mapNoEmpty(Map value) {
+bool mapNoEmpty(Map? value) {
if (value == null) return false;
return value.isNotEmpty;
}
///判断List是否为空
-bool listNoEmpty(List list) {
+bool listNoEmpty(List? list) {
if (list == null) return false;
if (list.length == 0) return false;
@@ -65,13 +72,15 @@ bool listNoEmpty(List list) {
}
/// 判断是否网络
-bool isNetWorkImg(String img) {
- return img.startsWith('http') || img.startsWith('https');
+bool isNetWorkImg(String? img) {
+ if (!strNoEmpty(img)) return false;
+ return img!.startsWith('http');
}
/// 判断是否资源图片
-bool isAssetsImg(String img) {
- return img.startsWith('asset') || img.startsWith('assets');
+bool isAssetsImg(String? img) {
+ if (String == null) return false;
+ return img!.startsWith('asset') || img.startsWith('assets');
}
double getMemoryImageCashe() {
@@ -88,12 +97,12 @@ String stringAsFixed(value, num) {
return str;
}
-String hiddenPhone(String phone){
+String hiddenPhone(String phone) {
String result = '';
- if(phone != null && phone.length >= 11){
- String sub = phone.substring(0,3);
- String end = phone.substring(8,11);
+ if (phone != null && phone.length >= 11) {
+ String sub = phone.substring(0, 3);
+ String end = phone.substring(8, 11);
result = '$sub****$end';
}
@@ -125,4 +134,21 @@ String removeDot(v) {
String vStr = v.toString().replaceAll('.', '');
return vStr;
-}
\ No newline at end of file
+}
+
+///补齐数字两位
+String doubleNum(v) {
+ int _v;
+ if (v is int) {
+ _v = v;
+ } else {
+ _v = int.parse(removeDot(v));
+ }
+ if (_v <= 0) {
+ return '00';
+ } else if (_v.toString().length < 2) {
+ return '0$_v';
+ } else {
+ return '$_v';
+ }
+}
diff --git a/plugin/wechat_flutter_plugin/lib/commom/ui.dart b/lib/tools/commom/ui.dart
similarity index 98%
rename from plugin/wechat_flutter_plugin/lib/commom/ui.dart
rename to lib/tools/commom/ui.dart
index 63ecee9..657cf6d 100644
--- a/plugin/wechat_flutter_plugin/lib/commom/ui.dart
+++ b/lib/tools/commom/ui.dart
@@ -47,7 +47,7 @@ class VerticalLine extends StatelessWidget {
}
class Space extends StatelessWidget {
- final double width;
+ final double? width;
final double height;
Space({this.width = 10.0, this.height = 10.0});
diff --git a/lib/tools/confidential/confidential.dart b/lib/tools/confidential/confidential.dart
deleted file mode 100644
index 202fe94..0000000
--- a/lib/tools/confidential/confidential.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-import 'dart:convert' as convert;
-import 'dart:convert';
-
-
-class Confidential{
- /*
- * Base64加密
- */
- static String encodeBase64(String data) {
- var content = utf8.encode(data);
- var digest = base64Encode(content);
- return digest;
- }
-
- /*
- * Base64解密
- */
- static String decodeBase64(String data) {
- List<int> bytes = convert.base64Decode(data);
- String result = convert.utf8.decode(bytes);
- return result;
- }
-}
\ No newline at end of file
diff --git a/lib/tools/config/api.dart b/lib/tools/config/api.dart
new file mode 100644
index 0000000..51069af
--- /dev/null
+++ b/lib/tools/config/api.dart
@@ -0,0 +1,43 @@
+class ApiUrlV1 {
+ static const nameUrl = 'https://www.apiopen.top/femaleNameApi';
+ static const avatarUrl = 'http://www.lorempixel.com/200/200/';
+ static const cat = 'https://api.thecatapi.com/v1/images/search';
+ static const upImg = "http://111.230.251.115/oldchen/fUser/oneDaySuggestion";
+ static const update = 'http://www.flutterj.com/api/update.json';
+ static const uploadImg = 'http://www.flutterj.com/upload/avatar';
+}
+
+class ApiUrlV2 {
+ /// 基础url
+ static const baseUrl = "http://xxx.com";
+
+ /// 注册
+ static const register = baseUrl + '/passport/register';
+
+ /// 获取短信
+ static const smsGet = baseUrl + '/sms/get/';
+
+ /// 获取自己的信息
+ static const userMe = baseUrl + '/users/me';
+
+ /// 登录
+ static const login = baseUrl + '/auth/login';
+
+ /// 获取腾讯云签名
+ static const timGetSig = baseUrl + '/tim/get-sig';
+
+ /// 搜索用户
+ static const searchUser = baseUrl + '/users';
+
+ /// 更新用户资料
+ static const updateUserInfo = baseUrl + '/users/';
+
+ /// 上传图片
+ static const uploadFile = baseUrl + '/files';
+
+ /// 更新图片
+ static const fileChange = baseUrl + '/files/';
+
+ /// 刷新Token
+ static const authRefresh = baseUrl + '/auth/refresh';
+}
diff --git a/lib/tools/config/app_config.dart b/lib/tools/config/app_config.dart
new file mode 100644
index 0000000..e1446bf
--- /dev/null
+++ b/lib/tools/config/app_config.dart
@@ -0,0 +1,77 @@
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+class AppConfig {
+ /// 应用名字
+ static String appName = "微信";
+
+ /// 模拟封面
+ static String mockCover = defIcon;
+
+ static String logoImg = "assets/images/wechat/in/default_nor_avatar.png";
+
+ static String defPic = logoImg;
+
+ /// 【IM】是否允许添加自己为好友
+ static bool isArrowAddSelf = false;
+
+ // /// 腾讯云IM AppId
+ // static int IMSdkAppID = 1400597090;
+ //
+ // /// 腾讯云IM 签名
+ // static String ImSdkSign =
+ // "0dba8e0d933e3bb73e1a8c7befc4730cdadcc3a5733f126f5487b013ea373aaa";
+
+ /// 腾讯云IM AppId
+ static int IMSdkAppID = 1400250651;
+
+ /// 腾讯云IM 签名
+ static String ImSdkSign =
+ "4236133554a57c8fa7ae748534177e97cac28b0750f57ca2edbb974a17a14544";
+
+ static int sdkAppId = IMSdkAppID;
+
+ /// 模拟房间id
+ static int mockCallRoomId = 888888;
+
+ // 注册是否需要邀请码
+ static bool needInviteCode = true;
+
+ /// 未注册用户的状态代码
+ static int noRegisterCode = 411;
+
+ /// 微信登录授权登录码过期
+ static int wxLoginCodeOverdue = 420;
+
+ /// 倒计时秒
+ static int countdownSecond = 60;
+
+ /// 会话列表[conversation]一页获取数量
+ static var cvsPageCount = 30;
+
+ /// 键盘高度
+ static double keyboardHeight = 300;
+
+ /// 微信团队用户id
+ static String wxTeamUserId = "166";
+
+ /// 是否生产环境
+ static bool inProduction = const bool.fromEnvironment("dart.vm.product");
+
+ static String get mockPw {
+ if (inProduction) {
+ return "";
+ }
+ return "a1111111";
+ }
+
+ static String get mockPhone {
+ if (inProduction) {
+ return "";
+ }
+ if (Platform.isAndroid) {
+ return "13244766725";
+ } else {
+ return "18826987045";
+ }
+ }
+}
diff --git a/lib/tools/config/call_config.dart b/lib/tools/config/call_config.dart
new file mode 100644
index 0000000..4dd926d
--- /dev/null
+++ b/lib/tools/config/call_config.dart
@@ -0,0 +1,5 @@
+import 'package:tencent_trtc_cloud/trtc_cloud_def.dart';
+
+class CallConfig {
+ static int audioQuality = TRTCCloudDef.TRTC_AUDIO_QUALITY_DEFAULT;
+}
diff --git a/lib/config/dictionary.dart b/lib/tools/config/dictionary.dart
similarity index 100%
rename from lib/config/dictionary.dart
rename to lib/tools/config/dictionary.dart
diff --git a/lib/config/keys.dart b/lib/tools/config/keys.dart
similarity index 75%
rename from lib/config/keys.dart
rename to lib/tools/config/keys.dart
index 6fc3bc1..e481e67 100755
--- a/lib/config/keys.dart
+++ b/lib/tools/config/keys.dart
@@ -3,6 +3,7 @@ class Keys {
static final String currentLanguage = "current_language";
static final String appName = "app_name";
static final String account = "account";
+ static final String userSig = "userSig";
static final String password = "password";
static final String hasLogged = "hasLogged";
static final String area = "area";
@@ -11,4 +12,7 @@ class Keys {
static final String faceUrl = 'faceUrl';
static final String nickName = 'nickName';
static final String gender = 'gender';
+ static final String userMe = 'userMe';
+ static final String keyboardSize = 'keyboardSize';
+ static final String loginResult = 'loginResult';
}
diff --git a/lib/config/provider_config.dart b/lib/tools/config/provider_config.dart
similarity index 76%
rename from lib/config/provider_config.dart
rename to lib/tools/config/provider_config.dart
index b2a7744..d957877 100755
--- a/lib/config/provider_config.dart
+++ b/lib/tools/config/provider_config.dart
@@ -1,13 +1,13 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
-import 'package:wechat_flutter/provider/global_model.dart';
-import 'package:wechat_flutter/provider/login_model.dart';
+import 'package:wechat_flutter/tools/provider/global_model.dart';
+import 'package:wechat_flutter/tools/provider/login_model.dart';
/// ProviderConfig provider配置
class ProviderConfig {
- static ProviderConfig _instance;
+ static ProviderConfig? _instance;
- static ProviderConfig getInstance() {
+ static ProviderConfig? getInstance() {
if (_instance == null) {
_instance = ProviderConfig._internal();
}
diff --git a/lib/tools/config/q1_config.dart b/lib/tools/config/q1_config.dart
new file mode 100644
index 0000000..fed0da4
--- /dev/null
+++ b/lib/tools/config/q1_config.dart
@@ -0,0 +1,3 @@
+class Q1Config {
+ static final double chatRowHeight = 50.0;
+}
diff --git a/lib/tools/config/storage_manager.dart b/lib/tools/config/storage_manager.dart
new file mode 100755
index 0000000..2ad905b
--- /dev/null
+++ b/lib/tools/config/storage_manager.dart
@@ -0,0 +1,53 @@
+import 'package:connectivity_plus/connectivity_plus.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:wechat_flutter/tools/config/app_config.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+class StorageManager {
+ /// app全局配置
+ static late SharedPreferences sp;
+
+ /// 网络连接
+ var connect;
+
+ /// 必备数据的初始化操作
+ static init() async {
+ // async 异步操作
+ // sync 同步操作
+ sp = await SharedPreferences.getInstance();
+
+ StorageManager().initAutoLogin();
+
+ /// 初始化上次键盘高度
+ final double? storeKeySize =
+ await SharedUtil.instance!.getDouble(Keys.keyboardSize);
+ if (storeKeySize != null) {
+ AppConfig.keyboardHeight = storeKeySize;
+ }
+ }
+
+ initAutoLogin() async {
+ try {
+ // 监测网络变化
+ connect = Connectivity()
+ .onConnectivityChanged
+ .listen((ConnectivityResult result) async {
+ if (result != ConnectivityResult.mobile &&
+ result != ConnectivityResult.wifi) {
+ await SharedUtil.instance!.saveBoolean(Keys.brokenNetwork, true);
+ } else {
+ // await SharedUtil.instance.saveBoolean(Keys.brokenNetwork, false);
+ // final hasLogged =
+ // await SharedUtil.instance.getBoolean(Keys.hasLogged);
+ // final currentUser = await im.getCurrentLoginUser();
+ // if (hasLogged) if (currentUser == '' || currentUser == null) {
+ // final account = await SharedUtil.instance.getString(Keys.account);
+ // im.imAutoLogin(account);
+ // }
+ }
+ });
+ } on PlatformException {
+ print('你已登录或者其他错误');
+ }
+ }
+}
diff --git a/lib/config/strings.dart b/lib/tools/config/strings.dart
similarity index 100%
rename from lib/config/strings.dart
rename to lib/tools/config/strings.dart
diff --git a/lib/tools/core/global_controller.dart b/lib/tools/core/global_controller.dart
new file mode 100644
index 0000000..bd1255d
--- /dev/null
+++ b/lib/tools/core/global_controller.dart
@@ -0,0 +1,63 @@
+import 'package:flutter/material.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_user_full_info.dart';
+import 'package:wechat_flutter/tools/provider/loginc/global_loginc.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+class GlobalController extends GetxController {
+
+ BuildContext? context;
+
+ ///app的名字
+ String appName = "${AppConfig.appName}";
+
+ /// 用户信息
+ /// account是TID
+ String account = '';
+ String? nickName = 'nickName';
+ String? avatar = '';
+ int? gender = 0;
+
+ ///当前语言
+ List<String> currentLanguageCode = ["zh", "CN"];
+ String currentLanguage = "中文";
+ Locale? currentLocale;
+
+ ///是否进入登录页
+ bool goToLogin = true;
+
+ late GlobalLogic logic;
+
+ GlobalController() {
+ logic = GlobalLogic(this);
+ }
+
+ void setContext(BuildContext context) {
+ if (this.context == null) {
+ this.context = context;
+ Future.wait([
+ logic.getAppName(),
+ logic.getCurrentLanguageCode(),
+ logic.getCurrentLanguage(),
+ logic.getLoginState(),
+ logic.getAccount(),
+ logic.getNickName(),
+ logic.getFaceUrl(),
+ logic.getGender(),
+ ]).then((value) {
+ currentLocale = Locale(currentLanguageCode[0], currentLanguageCode[1]);
+ refresh();
+ });
+ }
+ }
+
+ Future initInfo() async {
+ final List<V2TimUserFullInfo>? data = await ImApi.getUsersInfo([account]);
+ if (!listNoEmpty(data)) return;
+ nickName = data![0].nickName;
+ await SharedUtil.instance!.saveString(Keys.nickName, data[0].nickName);
+ avatar = data[0].faceUrl;
+ await SharedUtil.instance!.saveString(Keys.faceUrl, data[0].faceUrl);
+ gender = data[0].gender;
+ await SharedUtil.instance!.saveInt(Keys.gender, data[0].gender!);
+ }
+}
diff --git a/lib/tools/data/data.dart b/lib/tools/data/data.dart
index 05e7abd..ee419ea 100644
--- a/lib/tools/data/data.dart
+++ b/lib/tools/data/data.dart
@@ -1,7 +1,10 @@
-import 'package:wechat_flutter/config/keys.dart';
+import 'dart:convert';
+
+import 'package:wechat_flutter/tools/config/keys.dart';
+import 'package:wechat_flutter/tools/entity/api_entity.dart';
+import 'package:wechat_flutter/tools/commom/check.dart';
import 'package:wechat_flutter/tools/data/store.dart';
-export 'package:wechat_flutter/tools/data/store.dart';
-export 'package:wechat_flutter/tools/data/notice.dart';
+import 'package:wechat_flutter/tools/func/shared_util.dart';
class WeChatActions {
static String msg() => 'msg';
@@ -13,16 +16,57 @@ class WeChatActions {
static String user() => 'user';
}
-class Data {
- static String msg() => Store(WeChatActions.msg()).value = '';
+class Q1Data {
+ static UserInfoRspEntity? userInfoRspEntity;
+ static LoginRspEntity? loginRspEntity;
+ static String? userSig;
+
+ static bool get isLogin {
+ return loginRspEntity == null;
+ }
+
+ static String? get tokenOfRefresh {
+ return loginRspEntity?.refreshToken;
+ }
+
+ /// 格式化之后token
+ static String get tokenFmt {
+ if (!strNoEmpty(loginRspEntity?.accessToken)) {
+ return "";
+ }
+ return "Bearer " + loginRspEntity!.accessToken!;
+ }
- static String user() => Store(WeChatActions.user()).value = '';
+ static String msg() => Store(WeChatActions.msg()).value ?? '';
- static String voiceImg() => Store(WeChatActions.voiceImg()).value = '';
+ /// kUserId
+ static String user() => Store(WeChatActions.user()).value ?? '';
- static initData() {
+ static String get loginUserId => user();
+
+ static String voiceImg() => Store(WeChatActions.voiceImg()).value ?? '';
+
+ static Future initData() async {
getStoreValue(Keys.account).then((data) {
Store(WeChatActions.user()).value = data;
});
+ getStoreValue(Keys.loginResult).then((data) {
+ print("登录结果::$data");
+ if (strNoEmpty(data)) {
+ loginRspEntity = LoginRspEntity.fromJson(json.decode(data!));
+ }
+ });
+ getStoreValue(Keys.userMe).then((data) {
+ if (strNoEmpty(data)) {
+ userInfoRspEntity = UserInfoRspEntity.fromJson(json.decode(data!));
+ }
+ });
+ }
+
+ static Future clearData() async {
+ loginRspEntity = null;
+ Store(WeChatActions.user()).value = "";
+ SharedUtil.instance!.saveString(Keys.loginResult, "");
+ SharedUtil.instance!.saveString(Keys.userMe, "");
}
}
diff --git a/lib/tools/data/notice.dart b/lib/tools/data/notice.dart
index 1077e7d..c4de4df 100644
--- a/lib/tools/data/notice.dart
+++ b/lib/tools/data/notice.dart
@@ -10,7 +10,7 @@ class Notice {
static Callback addListener(String event, Callback call) {
var callList = _eventMap[event];
if (callList == null) {
- callList = new List();
+ callList = [];
_eventMap[event] = callList;
}
@@ -26,7 +26,7 @@ class Notice {
static removeListener(Callback call) {
final keys = _eventMap.keys.toList(growable: false);
for (final k in keys) {
- final v = _eventMap[k];
+ final v = _eventMap[k]!;
final remove = v.remove(call);
if (remove && v.isEmpty) {
@@ -69,15 +69,15 @@ class Notice {
}
mixin BusStateMixin<T extends StatefulWidget> on State<T> {
- List<Callback> _listeners;
+ List<Callback>? _listeners;
void bus(String event, Callback call) {
- _listeners ??= new List();
- _listeners.add(Notice.addListener(event, call));
+ _listeners ??= [];
+ _listeners!.add(Notice.addListener(event, call));
}
void busDel(Callback call) {
- if (_listeners.remove(call)) {
+ if (_listeners!.remove(call)) {
Notice.removeListener(call);
}
}
diff --git a/lib/tools/data/qr_data.dart b/lib/tools/data/qr_data.dart
new file mode 100644
index 0000000..5a44695
--- /dev/null
+++ b/lib/tools/data/qr_data.dart
@@ -0,0 +1,18 @@
+enum QrDataType { group, personal }
+
+class QrData {
+ static String code = "C2FC19F47B36C916212E5B4F63F408F8";
+
+ static String generateData(bool isGroup, String id) {
+ return "${isGroup ? QrDataType.group.toString() : QrDataType.personal.toString()},$id;;;${code * 3};;;${DateTime.now()}";
+ }
+
+ static bool isSelfCode(String qrData) {
+ return qrData.contains(code);
+ }
+
+ /// 数组索引0为类型，1为id。
+ static List<String> fetchData(String qrData) {
+ return qrData.split(';;;')[0].split(',');
+ }
+}
diff --git a/lib/tools/data/store.dart b/lib/tools/data/store.dart
index 6bdef24..f12e3a6 100644
--- a/lib/tools/data/store.dart
+++ b/lib/tools/data/store.dart
@@ -1,7 +1,7 @@
-import 'package:wechat_flutter/tools/data/notice.dart';
import 'package:flutter/material.dart';
import 'dart:async';
import 'package:shared_preferences/shared_preferences.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
typedef Widget StoreBuilder<T>(T item);
@@ -12,9 +12,9 @@ class Store<T> {
const Store(this._action);
- T get value => _storeMap[_action];
+ T? get value => _storeMap[_action];
- set value(T v) {
+ set value(T? v) {
if (!(v is List) && !(v is Set) && !(v is Map) && v == _storeMap[_action])
return;
@@ -45,20 +45,20 @@ class CacheWidget<T> extends StatefulWidget {
final StoreBuilder<T> builder;
final data;
- CacheWidget(this.action, this.builder, {Key key,this.data}) : super(key: key);
+ CacheWidget(this.action, this.builder, {Key? key,this.data}) : super(key: key);
@override
_CacheWidgetState createState() => new _CacheWidgetState<T>();
}
-class _CacheWidgetState<T> extends State<CacheWidget<T>>
+class _CacheWidgetState<T> extends State<CacheWidget<T?>>
with BusStateMixin {
- T item;
+ T? item;
void init() {
final action = widget.action;
- item = _storeMap[action] as T;
+ item = _storeMap[action] as T?;
bus('Store::$action', onData);
}
@@ -71,7 +71,7 @@ class _CacheWidgetState<T> extends State<CacheWidget<T>>
}
@override
- void didUpdateWidget(CacheWidget oldWidget) {
+ void didUpdateWidget(CacheWidget<T> oldWidget) {
super.didUpdateWidget(oldWidget);
busDel(onData);
@@ -91,7 +91,7 @@ storeString(String k,v) async {
prefs.setString(k, v);
}
-Future<String> getStoreValue(String k) async {
+Future<String?> getStoreValue(String k) async {
SharedPreferences prefs = await SharedPreferences.getInstance();
- return prefs.get(k);
+ return prefs.get(k) as String?;
}
diff --git a/lib/tools/entity/api_entity.dart b/lib/tools/entity/api_entity.dart
new file mode 100644
index 0000000..2d4ad68
--- /dev/null
+++ b/lib/tools/entity/api_entity.dart
@@ -0,0 +1,201 @@
+import 'dart:convert';
+
+T? asT<T>(dynamic value) {
+ if (value is T) {
+ return value;
+ }
+ return null;
+}
+
+class CodeRspEntity {
+ CodeRspEntity({
+ this.token,
+ this.code,
+ this.phone,
+ });
+
+ factory CodeRspEntity.fromJson(Map<String, dynamic>? json) => json == null
+ ? CodeRspEntity()
+ : CodeRspEntity(
+ token: asT<String>(json['token']),
+ code: asT<String>(json['code']),
+ phone: asT<String>(json['phone']),
+ );
+
+ String? token;
+ String? code;
+ String? phone;
+
+ @override
+ String toString() {
+ return jsonEncode(this);
+ }
+
+ Map<String, dynamic> toJson() => <String, dynamic>{
+ 'token': token,
+ 'code': code,
+ 'phone': phone,
+ };
+}
+
+class LoginRspEntity {
+ LoginRspEntity({
+ this.accessToken,
+ this.expires,
+ this.refreshToken,
+ });
+
+ factory LoginRspEntity.fromJson(Map<String, dynamic>? json) => json == null
+ ? LoginRspEntity()
+ : LoginRspEntity(
+ accessToken: asT<String>(json['access_token']),
+ expires: asT<int>(json['expires']),
+ refreshToken: asT<String>(json['refresh_token']),
+ );
+
+ String? accessToken;
+ int? expires;
+ String? refreshToken;
+
+ @override
+ String toString() {
+ return jsonEncode(this);
+ }
+
+ Map<String, dynamic> toJson() => <String, dynamic>{
+ 'access_token': accessToken,
+ 'expires': expires,
+ 'refresh_token': refreshToken,
+ };
+}
+
+class UserInfoRspEntity {
+ UserInfoRspEntity({
+ this.id,
+ this.firstName,
+ this.lastName,
+ this.email,
+ this.password,
+ this.location,
+ this.title,
+ this.description,
+ this.tags,
+ this.avatar,
+ this.language,
+ this.theme,
+ this.tfaSecret,
+ this.status,
+ this.role,
+ this.token,
+ this.lastAccess,
+ this.lastPage,
+ this.provider,
+ this.externalIdentifier,
+ this.authData,
+ this.emailNotifications,
+ this.kid,
+ this.mobile,
+ this.nickname,
+ });
+
+ factory UserInfoRspEntity.fromJson(Map<String, dynamic>? json) {
+ if (json == null) {
+ return UserInfoRspEntity();
+ }
+
+ final List<Object?>? tags = json['tags'] is List ? <Object?>[] : null;
+ if (tags != null) {
+ for (final dynamic item in json['tags']) {
+ if (item != null) {
+ tags.add(asT<Object>(item));
+ }
+ }
+ }
+ return UserInfoRspEntity(
+ id: asT<String>(json['id']),
+ firstName: asT<String>(json['first_name']),
+ lastName: asT<String>(json['last_name']),
+ email: asT<String>(json['email']),
+ password: asT<String>(json['password']),
+ location: asT<String>(json['location']),
+ title: asT<String>(json['title']),
+ description: asT<String>(json['description']),
+ tags: tags,
+ avatar: asT<String>(json['avatar']),
+ language: asT<String>(json['language']),
+ theme: asT<String>(json['theme']),
+ tfaSecret: asT<String>(json['tfa_secret']),
+ status: asT<String>(json['status']),
+ role: asT<String>(json['role']),
+ token: asT<String>(json['token']),
+ lastAccess: asT<String>(json['last_access']),
+ lastPage: asT<String>(json['last_page']),
+ provider: asT<String>(json['provider']),
+ externalIdentifier: asT<String>(json['external_identifier']),
+ authData: asT<String>(json['auth_data']),
+ emailNotifications: asT<bool>(json['email_notifications']),
+ kid: asT<String>(json['kid']),
+ mobile: asT<String>(json['mobile']),
+ nickname: asT<String>(json['nickname']),
+ );
+ }
+
+ String? id;
+ String? firstName;
+ String? lastName;
+ String? email;
+ String? password;
+ String? location;
+ String? title;
+ String? description;
+ List<Object?>? tags;
+ String? avatar;
+ String? language;
+ String? theme;
+ String? tfaSecret;
+ String? status;
+ String? role;
+ String? token;
+ String? lastAccess;
+ String? lastPage;
+ String? provider;
+ String? externalIdentifier;
+ String? authData;
+ bool? emailNotifications;
+ String? kid;
+ String? mobile;
+ String? nickname;
+
+ @override
+ String toString() {
+ return jsonEncode(this);
+ }
+
+ Map<String, dynamic> toJson() => <String, dynamic>{
+ 'id': id,
+ 'first_name': firstName,
+ 'last_name': lastName,
+ 'email': email,
+ 'password': password,
+ 'location': location,
+ 'title': title,
+ 'description': description,
+ 'tags': tags,
+ 'avatar': avatar,
+ 'language': language,
+ 'theme': theme,
+ 'tfa_secret': tfaSecret,
+ 'status': status,
+ 'role': role,
+ 'token': token,
+ 'last_access': lastAccess,
+ 'last_page': lastPage,
+ 'provider': provider,
+ 'external_identifier': externalIdentifier,
+ 'auth_data': authData,
+ 'email_notifications': emailNotifications,
+ 'kid': kid,
+ 'mobile': mobile,
+ 'nickname': nickname,
+ };
+}
diff --git a/lib/im/other/update_entity.dart b/lib/tools/entity/update_entity.dart
similarity index 86%
rename from lib/im/other/update_entity.dart
rename to lib/tools/entity/update_entity.dart
index b2d1e11..e270de0 100644
--- a/lib/im/other/update_entity.dart
+++ b/lib/tools/entity/update_entity.dart
@@ -1,9 +1,9 @@
class UpdateEntity {
- String updateInfo;
- String appVersion;
- String appName;
- String appId;
- String downloadUrl;
+ String? updateInfo;
+ String? appVersion;
+ String? appName;
+ String? appId;
+ String? downloadUrl;
UpdateEntity({this.updateInfo, this.appVersion, this.appName, this.appId, this.downloadUrl});
diff --git a/lib/tools/eventbus/contacts_bus.dart b/lib/tools/eventbus/contacts_bus.dart
new file mode 100644
index 0000000..95b730f
--- /dev/null
+++ b/lib/tools/eventbus/contacts_bus.dart
@@ -0,0 +1,5 @@
+import 'package:event_bus/event_bus.dart';
+
+EventBus contactsBus = EventBus();
+
+class ContactsModel {}
diff --git a/lib/tools/eventbus/group_list_bus.dart b/lib/tools/eventbus/group_list_bus.dart
new file mode 100644
index 0000000..3672ab2
--- /dev/null
+++ b/lib/tools/eventbus/group_list_bus.dart
@@ -0,0 +1,10 @@
+import 'package:event_bus/event_bus.dart';
+
+/// 群聊列表刷新
+EventBus groupListBus = EventBus();
+
+class GroupListModel {
+ final String id;
+
+ GroupListModel(this.id);
+}
diff --git a/lib/tools/eventbus/msg_bus.dart b/lib/tools/eventbus/msg_bus.dart
new file mode 100644
index 0000000..fb9a84b
--- /dev/null
+++ b/lib/tools/eventbus/msg_bus.dart
@@ -0,0 +1,10 @@
+import 'package:event_bus/event_bus.dart';
+
+EventBus msgBus = EventBus();
+
+class MsgBusModel {
+ final String? toUserId;
+
+
+ MsgBusModel(this.toUserId);
+}
diff --git a/lib/tools/func/commom.dart b/lib/tools/func/commom.dart
new file mode 100644
index 0000000..0d7ee58
--- /dev/null
+++ b/lib/tools/func/commom.dart
@@ -0,0 +1,111 @@
+/*
+* 屏幕适配
+* SizeConfig().init(context); 初始化
+* height: SizeConfig.blockSizeVertical * 20,
+* width: SizeConfig.blockSizeHorizontal * 50,
+*
+* screen
+* width: SizeConfig.screenWidth,
+* height: SizeConfig.screenHeight,
+*
+* 字体 （均可）
+* SizeConfig.safeBlockHorizontal
+* SizeConfig.blockSizeVertical
+*
+***/
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_image_compress/flutter_image_compress.dart';
+import 'package:path_provider/path_provider.dart';
+
+class SizeConfig {
+ static late MediaQueryData _mediaQueryData;
+ static late double screenWidth;
+ static late double screenHeight;
+ static late double blockSizeHorizontal;
+ static double? blockSizeVertical;
+
+ static late double _safeAreaHorizontal;
+ static late double _safeAreaVertical;
+ static double? safeBlockHorizontal;
+ static double? safeBlockVertical;
+
+ void init(BuildContext context) {
+ _mediaQueryData = MediaQuery.of(context);
+ screenWidth = _mediaQueryData.size.width;
+ screenHeight = _mediaQueryData.size.height;
+ blockSizeHorizontal = screenWidth / 100;
+ blockSizeVertical = screenHeight / 100;
+
+ _safeAreaHorizontal =
+ _mediaQueryData.padding.left + _mediaQueryData.padding.right;
+ _safeAreaVertical =
+ _mediaQueryData.padding.top + _mediaQueryData.padding.bottom;
+ safeBlockHorizontal = (screenWidth - _safeAreaHorizontal) / 100;
+ safeBlockVertical = (screenHeight - _safeAreaVertical) / 100;
+ }
+}
+
+Future<File> singleCompressFile(File file) async {
+ return file;
+// try {
+// File result = await FlutterNativeImage.compressImage(file.absolute.path,
+// quality: 80, percentage: 50);
+// debugPrint('图片压缩中');
+// print(file.lengthSync());
+// print(result.length);
+// return result;
+// } catch (e) {
+// debugPrint('e => ${e.toString()}');
+// return null;
+// }
+}
+
+Future<List<int>?> compressFile(File file) async {
+ try {
+ var result = await FlutterImageCompress.compressWithFile(
+ file.absolute.path,
+ minWidth: 200,
+ minHeight: 300,
+ quality: 80,
+ );
+ print(file.lengthSync());
+ if (result != null) {
+ print(result.length);
+ }
+ return result;
+ } catch (e) {
+ print('e => ${e.toString()}');
+ return null;
+ }
+}
+
+Future<File?> compressFileGetFile(File file) async {
+ try {
+ Directory tempDir = await getTemporaryDirectory();
+
+ final String fileName = file.path.split("/").last;
+
+ final String fullPathOfResult = tempDir.path + "/" + "$fileName";
+
+ print("你要压缩的图片为::${file.absolute.path}");
+ print("结果路径::$fullPathOfResult");
+
+ var result = await FlutterImageCompress.compressAndGetFile(
+ file.absolute.path,
+ fullPathOfResult,
+ minWidth: 200,
+ minHeight: 300,
+ quality: 70,
+ format: fileName.endsWith("png") || fileName.endsWith("PNG")
+ ? CompressFormat.png
+ : CompressFormat.jpeg,
+ );
+ print(file.lengthSync());
+ return result;
+ } catch (e) {
+ print('e => ${e.toString()}');
+ return null;
+ }
+}
diff --git a/lib/tools/date.dart b/lib/tools/func/date.dart
similarity index 93%
rename from lib/tools/date.dart
rename to lib/tools/func/date.dart
index 6e048c9..c2ebb29 100644
--- a/lib/tools/date.dart
+++ b/lib/tools/func/date.dart
@@ -1,7 +1,7 @@
class DateTimeForMater {
static String full = "yyyy-MM-dd HH:mm:ss";
- static String formatDateV(DateTime dateTime, {bool isUtc, String format}) {
+ static String formatDateV(DateTime dateTime, {bool? isUtc, String? format}) {
if (dateTime == null) return "";
format = format ?? full;
if (format.contains("yy")) {
diff --git a/lib/tools/func/func.dart b/lib/tools/func/func.dart
new file mode 100644
index 0000000..1ff491e
--- /dev/null
+++ b/lib/tools/func/func.dart
@@ -0,0 +1,84 @@
+import 'dart:async';
+
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/gestures.dart';
+import 'package:flutter/material.dart';
+import 'package:just_throttle_it/just_throttle_it.dart';
+
+bool isTemporaryTapProcessing = false;
+
+void restoreTemporaryProcess([int milliseconds = 500]) {
+ Future.delayed(Duration(milliseconds: milliseconds)).then((value) {
+ isTemporaryTapProcessing = false;
+ });
+}
+
+/*
+* 防止同时多个事件
+*
+* 关键字：防多次点击、防点击
+* */
+
+/// 通用防重复【防多点】点击组件
+class ClickEvent extends StatefulWidget {
+ final Widget? child;
+ final GestureTapCallback? onTap;
+ final bool isNet;
+
+ const ClickEvent({
+ this.onTap,
+ this.child,
+ this.isNet = true,
+ });
+
+ @override
+ State<ClickEvent> createState() => _ClickEventState();
+}
+
+class _ClickEventState extends State<ClickEvent> {
+ /// 放到全局出现弹出对话框后，对话框内的内容不能点击
+ bool isInkWellProcessing = false;
+
+ @override
+ Widget build(BuildContext context) {
+ return InkWell(
+ splashColor: Colors.transparent,
+ onTap: () {
+ /// 防止多个事件一起点
+ if (isTemporaryTapProcessing) {
+ return;
+ }
+ isTemporaryTapProcessing = true;
+ restoreTemporaryProcess(300);
+
+ Throttle.milliseconds(widget.isNet ? 1000 : 300, widget.onTap!);
+ },
+ child: widget.child ?? Container(),
+ );
+ }
+
+ @override
+ void dispose() {
+ Throttle.clear(widget.onTap!);
+ super.dispose();
+ }
+}
+
+class MyInkWell extends StatelessWidget {
+ final Widget? child;
+ final GestureTapCallback? onTap;
+
+ MyInkWell({this.child, this.onTap});
+
+ @override
+ Widget build(BuildContext context) {
+ return InkWell(
+ child: child,
+ onTap: onTap,
+ splashColor: Colors.transparent,
+ hoverColor: Colors.transparent,
+ focusColor: Colors.transparent,
+ highlightColor: Colors.transparent,
+ );
+ }
+}
diff --git a/lib/tools/func/log.dart b/lib/tools/func/log.dart
new file mode 100644
index 0000000..0787db6
--- /dev/null
+++ b/lib/tools/func/log.dart
@@ -0,0 +1,83 @@
+import 'package:flutter/cupertino.dart';
+import 'package:wechat_flutter/main.dart';
+
+class LogUtil {
+ static bool? _isDebug = true;
+ static int _limitLength = 800;
+
+ static void init({@required bool? isDebug, int? limitLength}) {
+ _isDebug = isDebug;
+ _limitLength = limitLength ??= _limitLength;
+ }
+
+ //仅Debug模式可见
+ static void d(dynamic obj) {
+ /// 方便输出，非debug也需要见
+ _log(obj.toString());
+ }
+
+ static void v(dynamic obj) {
+ _log(obj.toString());
+ }
+
+ static void vPrint(dynamic obj) {
+ _logPrint(obj.toString());
+ }
+
+ static void _log(String msg) {
+ if (msg.length < _limitLength) {
+ q1Logger.info(msg);
+ } else {
+ segmentationLog(msg);
+ }
+ _logEmpyLine();
+ }
+
+ static void _logPrint(String msg) {
+ if (msg.length < _limitLength) {
+ debugPrint(msg);
+ } else {
+ segmentationLogPrint(msg);
+ }
+ }
+
+ static void segmentationLog(String msg) {
+ var outStr = StringBuffer();
+ for (var index = 0; index < msg.length; index++) {
+ outStr.write(msg[index]);
+ if (index % _limitLength == 0 && index != 0) {
+ q1Logger.info(outStr);
+
+ outStr.clear();
+ var lastIndex = index + 1;
+ if (msg.length - lastIndex < _limitLength) {
+ var remainderStr = msg.substring(lastIndex, msg.length);
+ q1Logger.info(remainderStr);
+ break;
+ }
+ }
+ }
+ }
+
+ static void segmentationLogPrint(String msg) {
+ var outStr = StringBuffer();
+ for (var index = 0; index < msg.length; index++) {
+ outStr.write(msg[index]);
+ if (index % _limitLength == 0 && index != 0) {
+ debugPrint(outStr.toString());
+
+ outStr.clear();
+ var lastIndex = index + 1;
+ if (msg.length - lastIndex < _limitLength) {
+ var remainderStr = msg.substring(lastIndex, msg.length);
+ debugPrint(remainderStr);
+ break;
+ }
+ }
+ }
+ }
+
+ static void _logEmpyLine() {
+ print("");
+ }
+}
diff --git a/lib/tools/shared_util.dart b/lib/tools/func/shared_util.dart
similarity index 81%
rename from lib/tools/shared_util.dart
rename to lib/tools/func/shared_util.dart
index 1cb7931..803594e 100755
--- a/lib/tools/shared_util.dart
+++ b/lib/tools/func/shared_util.dart
@@ -1,34 +1,34 @@
-import 'package:wechat_flutter/config/keys.dart';
-export 'package:wechat_flutter/config/keys.dart';
-import 'package:wechat_flutter/config/storage_manager.dart';
+import 'package:wechat_flutter/tools/config/keys.dart';
+import 'package:wechat_flutter/tools/config/storage_manager.dart';
+
+export 'package:wechat_flutter/tools/config/keys.dart';
class SharedUtil {
- factory SharedUtil() => _getInstance();
+ factory SharedUtil() => _getInstance()!;
- static SharedUtil get instance => _getInstance();
- static SharedUtil _instance;
+ static SharedUtil? get instance => _getInstance();
+ static SharedUtil? _instance;
SharedUtil._internal() {
//初始化
//init
}
- static SharedUtil _getInstance() {
+ static SharedUtil? _getInstance() {
if (_instance == null) {
_instance = new SharedUtil._internal();
}
return _instance;
}
-
/// save
- Future saveString(String key, String value) async {
+ Future saveString(String key, String? value) async {
if (key == Keys.account) {
- await StorageManager.sp.setString(key, value);
+ await StorageManager.sp.setString(key, value ?? "");
return;
}
String account = StorageManager.sp.getString(Keys.account) ?? "default";
- await StorageManager.sp.setString(key + account, value);
+ await StorageManager.sp.setString(key + account, value ?? "");
}
Future saveInt(String key, int value) async {
@@ -75,7 +75,7 @@ class SharedUtil {
}
/// get
- Future<String> getString(String key) async {
+ Future<String?> getString(String key) async {
if (key == Keys.account) {
return StorageManager.sp.getString(key);
}
@@ -83,12 +83,12 @@ class SharedUtil {
return StorageManager.sp.getString(key + account);
}
- Future<int> getInt(String key) async {
+ Future<int?> getInt(String key) async {
String account = StorageManager.sp.getString(Keys.account) ?? "default";
return StorageManager.sp.getInt(key + account);
}
- Future<double> getDouble(String key) async {
+ Future<double?> getDouble(String key) async {
String account = StorageManager.sp.getString(Keys.account) ?? "default";
return StorageManager.sp.getDouble(key + account);
}
@@ -98,7 +98,7 @@ class SharedUtil {
return StorageManager.sp.getBool(key + account) ?? false;
}
- Future<List<String>> getStringList(String key) async {
+ Future<List<String>?> getStringList(String key) async {
String account = StorageManager.sp.getString(Keys.account) ?? "default";
return StorageManager.sp.getStringList(key + account);
}
diff --git a/lib/http/api.dart b/lib/tools/http/api.dart
similarity index 64%
rename from lib/http/api.dart
rename to lib/tools/http/api.dart
index b5081fc..c1b93a2 100644
--- a/lib/http/api.dart
+++ b/lib/tools/http/api.dart
@@ -1,35 +1,28 @@
+import 'package:flutter/material.dart';
import 'package:package_info_plus/package_info_plus.dart';
-import 'package:wechat_flutter/im/info_handle.dart';
-import 'package:wechat_flutter/im/other/update_entity.dart';
-import 'package:wechat_flutter/provider/global_model.dart';
+import 'package:provider/provider.dart';
+import 'package:wechat_flutter/tools/entity/update_entity.dart';
+import 'package:wechat_flutter/tools/provider/global_model.dart';
+import 'package:wechat_flutter/tools/commom/check.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
import 'package:wechat_flutter/ui/dialog/update_dialog.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
/// 随机头像 [Random avatar]
void postSuggestionWithAvatar(BuildContext context) async {
final model = Provider.of<GlobalModel>(context);
- Req.getInstance().get(
- API.cat,
+ Req.getInstance()!.get(
+ ApiUrlV1.cat,
(v) async {
- String avatarUrl = v['url'];
- final data = await setUsersProfileMethod(
- context,
- avatarStr: avatarUrl,
- nickNameStr: model.nickName,
- callback: (data) {},
- );
-
- if (data.toString().contains('ucc')) {
- showToast(context, '设置头像成功');
- model.avatar = avatarUrl;
- model.refresh();
- await SharedUtil.instance.saveString(Keys.faceUrl, avatarUrl);
- } else {
- showToast(context, '设置头像失败');
+ String? avatarUrl = v['url'];
+ if (!strNoEmpty(avatarUrl)) {
+ q1FailToast("设置失败");
+ return;
}
+ q1Toast('设置头像成功');
+ model.setAvatar(avatarUrl!);
+ model.refresh();
+ await SharedUtil.instance!.saveString(Keys.faceUrl, avatarUrl);
},
);
}
@@ -37,8 +30,8 @@ void postSuggestionWithAvatar(BuildContext context) async {
/// 检查更新 [check update]
void updateApi(BuildContext context) async {
if (Platform.isIOS) return;
- Req.getInstance().get(
- API.update,
+ Req.getInstance()!.get(
+ ApiUrlV1.update,
(v) async {
final packageInfo = await PackageInfo.fromPlatform();
@@ -64,8 +57,8 @@ void updateApi(BuildContext context) async {
/// 上传头像 [uploadImg]
uploadImgApi(BuildContext context, base64Img, Callback callback) async {
- Req.getInstance().post(
- API.uploadImg,
+ Req.getInstance()!.post(
+ ApiUrlV1.uploadImg,
(v) {
print('code::${v['code']}');
print('URL::${v['result']['URL']}');
@@ -75,8 +68,8 @@ uploadImgApi(BuildContext context, base64Img, Callback callback) async {
callback(null);
}
},
- errorCallBack: (String msg, int code) {
- showToast(context, msg);
+ errorCallBack: (String? msg, int? code) {
+ q1Toast(msg);
},
params: {"image_base_64": base64Img},
);
diff --git a/lib/tools/http/api_v2.dart b/lib/tools/http/api_v2.dart
new file mode 100644
index 0000000..69706b0
--- /dev/null
+++ b/lib/tools/http/api_v2.dart
@@ -0,0 +1,335 @@
+import 'dart:convert';
+
+import 'package:dio/dio.dart';
+import 'package:flutter/material.dart';
+import 'package:wechat_flutter/tools/entity/api_entity.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+class ApiV2 {
+ /// 注册
+ static Future<bool> register(
+ BuildContext context, {
+ required String phone,
+ required String password,
+ required String code,
+ required String? token,
+ }) async {
+ if (!strNoEmpty(token)) {
+ q1Toast( '请先获取验证码');
+ return false;
+ }
+ if (!strNoEmpty(phone)) {
+ q1Toast( "请输入手机号");
+ return false;
+ }
+ if (!strNoEmpty(password)) {
+ q1Toast( "请输入密码");
+ return false;
+ }
+ if (!strNoEmpty(code)) {
+ q1Toast( "请输入验证码");
+ return false;
+ }
+
+ Map<String, dynamic> params = {
+ "phone": phone,
+ "password": password,
+ "code": code,
+ "token": token,
+ "privacy": true,
+ };
+
+ Completer<bool> completer = Completer<bool>();
+
+ Req.getInstance()!.post(
+ ApiUrlV2.register,
+ (v) async {
+ completer.complete(true);
+
+ /// 注册完立刻调用一次登录，否则uid不存在腾讯云im
+ login(context, phone, password);
+ },
+ params: params,
+ errorCallBack: (String? msg, int? code) {
+ q1Toast( msg);
+ completer.complete(false);
+ },
+ );
+ return completer.future;
+ }
+
+ /// 获取验证码
+ static Future<CodeRspEntity?> smsGet(
+ BuildContext context, {
+ required String phone,
+ }) async {
+ if (!strNoEmpty(phone)) {
+ q1Toast( '请输入手机号');
+ return null;
+ }
+
+ Completer<CodeRspEntity?> completer = Completer<CodeRspEntity?>();
+
+ Map<String, dynamic> params = {"phone": phone};
+
+ Req.getInstance()!.get(
+ ApiUrlV2.smsGet,
+ (v) async {
+ CodeRspEntity codeRspEntity = CodeRspEntity.fromJson(v);
+ completer.complete(codeRspEntity);
+ },
+ params: params,
+ errorCallBack: (String? msg, int? code) {
+ q1Toast( msg);
+ completer.complete(null);
+ },
+ );
+ return completer.future;
+ }
+
+ /// 获取自己的信息
+ static Future<UserInfoRspEntity?> userMe(BuildContext context) async {
+ Map<String, dynamic> params = {};
+
+ Completer<UserInfoRspEntity?> completer = Completer<UserInfoRspEntity?>();
+ Req.getInstance()!.get(
+ ApiUrlV2.userMe,
+ (v) async {
+ Q1Data.userInfoRspEntity = UserInfoRspEntity.fromJson(v['data']);
+ SharedUtil.instance!
+ .saveString(Keys.userMe, json.encode(Q1Data.userInfoRspEntity));
+ completer.complete(Q1Data.userInfoRspEntity);
+ },
+ params: params,
+ errorCallBack: (String? msg, int? code) {
+ q1Toast( msg);
+ completer.complete(null);
+ },
+ );
+ return completer.future;
+ }
+
+ /// 登录
+ static Future<LoginRspEntity?> login(
+ BuildContext context, String phone, String password) async {
+ if (!strNoEmpty(phone)) {
+ q1Toast( '请输入手机号');
+ return null;
+ }
+ if (!strNoEmpty(password)) {
+ q1Toast( '请输入密码');
+ return null;
+ }
+
+ Map<String, dynamic> params = {
+ "email": '$phone@$phone.com',
+ "password": password,
+ };
+
+ Completer<LoginRspEntity?> completer = Completer<LoginRspEntity?>();
+ Req.getInstance()!.post(
+ ApiUrlV2.login,
+ (v) async {
+ LoginRspEntity rspEntity = LoginRspEntity.fromJson(v['data']);
+ completer.complete(rspEntity);
+ },
+ params: params,
+ errorCallBack: (String? msg, int? code) {
+ q1Toast( msg);
+ completer.complete(null);
+ },
+ );
+ return completer.future;
+ }
+
+ /// 获取腾讯云签名
+ static Future<String?> timGetSig(BuildContext context) async {
+ Map<String, dynamic> params = {};
+
+ Completer<String?> completer = Completer<String?>();
+ Req.getInstance()!.get(
+ ApiUrlV2.timGetSig,
+ (v) async {
+ completer.complete(v["sig"]);
+ },
+ params: params,
+ errorCallBack: (String? msg, int? code) {
+ q1Toast( msg);
+ completer.complete(null);
+ },
+ );
+ return completer.future;
+ }
+
+ /// 搜索用户
+ static Future<UserInfoRspEntity?> searchUser(
+ BuildContext? context, String value) async {
+ if (!strNoEmpty(value)) {
+ q1Toast( '搜索内容不能为空');
+ return null;
+ }
+
+ Map<String, dynamic> params = {
+ /// 需要服务端返回的字段，不传则返回所有的字段。
+ "fields": ["kid", "mobile", "id"],
+ "filter": {
+ "_or": [
+ {
+ "mobile": {"_eq": value}
+ },
+ {
+ "kid": {"_eq": value}
+ }
+ ]
+ },
+ };
+
+ Completer<UserInfoRspEntity?> completer = Completer<UserInfoRspEntity?>();
+ Req.getInstance()!.get(
+ ApiUrlV2.searchUser,
+ (v) async {
+ if (!listNoEmpty(v['data'])) {
+ completer.complete(null);
+ return;
+ }
+ UserInfoRspEntity userInfoRspEntity =
+ UserInfoRspEntity.fromJson(v['data'][0]);
+ completer.complete(userInfoRspEntity);
+ },
+ params: params,
+ errorCallBack: (String? msg, int? code) {
+ q1Toast( msg);
+ completer.complete(null);
+ },
+ );
+ return completer.future;
+ }
+
+ /// 更新用户资料
+ static void updateUserInfo(
+ BuildContext? context,
+ String id, {
+ String? avatar,
+ String? nickname,
+ }) async {
+ Map<String, dynamic> params = {
+ "avatar": avatar,
+ "nickname": nickname,
+ };
+
+ Req.getInstance()!.patch(
+ ApiUrlV2.updateUserInfo + id,
+ (v) async {},
+ params: params,
+ errorCallBack: (String? msg, int? code) {
+ q1Toast( msg);
+ },
+ );
+ }
+
+ /// 上传图片
+ static Future<String?> uploadFile(
+ BuildContext context, String title, File file) async {
+ if (!strNoEmpty(title)) {
+ q1Toast( '用户错误');
+ return null;
+ }
+ if (file == null) {
+ q1Toast( '文件不能为空');
+ return null;
+ }
+
+ MultipartFile fileData = await MultipartFile.fromFile(file.path);
+ FormData params = FormData.fromMap({"title": title, "file": fileData});
+
+ Completer<String?> completer = Completer<String?>();
+
+ Req.getInstance()!.postUpload(
+ ApiUrlV2.uploadFile,
+ (v) async {
+ completer.complete(v['data']['id']);
+ },
+ (int count, int total) {},
+ formData: params,
+ errorCallBack: (String? msg, int? code) {
+ q1Toast( msg);
+ completer.complete(null);
+ },
+ );
+ return completer.future;
+ }
+
+ /// 更新图片
+ static Future<String?> fileChange(
+ BuildContext context, String avatarId, String title, File? file) async {
+ if (!strNoEmpty(avatarId)) {
+ q1Toast( '旧图片id不能为空');
+ return null;
+ }
+
+ if (!strNoEmpty(title)) {
+ q1Toast( '用户错误');
+ return null;
+ }
+
+ if (file == null) {
+ q1Toast( '文件不能为空');
+ return null;
+ }
+
+ MultipartFile fileData = await MultipartFile.fromFile(file.path);
+ FormData params = FormData.fromMap({"title": title, "file": fileData});
+ Completer<String?> completer = Completer<String?>();
+
+ Req.getInstance()!.patchUpload(
+ ApiUrlV2.fileChange + avatarId,
+ (v) async {
+ completer.complete(v['data']['id']);
+ },
+ (int count, int total) {},
+ formData: params,
+ errorCallBack: (String? msg, int? code) {
+ q1Toast( msg);
+
+ completer.complete(null);
+ },
+ );
+
+ return completer.future;
+ }
+
+ /// 刷新token
+ ///
+ /// 只要不是登录和注册接口，其他接口出现401，调用此方法，获取到新token后重新调用原本方法。
+ static Future<LoginRspEntity?> authRefresh(BuildContext? context) async {
+ final String? loginResult =
+ await SharedUtil.instance!.getString(Keys.loginResult);
+ if (!strNoEmpty(loginResult)) {
+ return null;
+ }
+
+ LoginRspEntity loginRspEntityStore =
+ LoginRspEntity.fromJson(json.decode(loginResult!));
+
+ Map<String, dynamic> params = {
+ "refresh_token": loginRspEntityStore.refreshToken,
+ "mode": "json",
+ };
+
+ Completer<LoginRspEntity?> completer = Completer<LoginRspEntity?>();
+
+ Req.getInstance()!.patch(
+ ApiUrlV2.authRefresh,
+ (v) async {
+ LoginRspEntity loginRspEntity = LoginRspEntity.fromJson(v['data']);
+ completer.complete(loginRspEntity);
+ },
+ params: params,
+ errorCallBack: (String? msg, int? code) {
+ q1Toast( msg);
+ completer.complete(null);
+ },
+ );
+ return completer.future;
+ }
+}
diff --git a/lib/tools/http/req.dart b/lib/tools/http/req.dart
new file mode 100644
index 0000000..b9cae4b
--- /dev/null
+++ b/lib/tools/http/req.dart
@@ -0,0 +1,286 @@
+import 'dart:convert';
+
+import 'package:dio/dio.dart';
+import 'package:wechat_flutter/tools/entity/api_entity.dart';
+import 'package:wechat_flutter/tools/http/api_v2.dart';
+import 'package:wechat_flutter/im/login_handle.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+var _id = 0;
+
+typedef OnData(t);
+typedef OnError(String? msg, int? code);
+
+enum RequestType { GET, POST, PATCH }
+
+class Req {
+ static Req? _instance;
+
+ ///连接超时时间为5秒
+ static const int connectTimeOut = 5 * 1000;
+
+ ///响应超时时间为7秒
+ static const int receiveTimeOut = 7 * 1000;
+
+ Dio? _client;
+
+ static Req? getInstance() {
+ if (_instance == null) {
+ _instance = Req._internal();
+ }
+ return _instance;
+ }
+
+ Req._internal() {
+ if (_client == null) {
+ BaseOptions options = new BaseOptions();
+ options.connectTimeout = connectTimeOut;
+ options.receiveTimeout = receiveTimeOut;
+ _client = new Dio(options);
+ }
+ }
+
+ Dio? get client => _client;
+
+ ///get请求
+ void get(
+ String url,
+ OnData callBack, {
+ Map<String, dynamic>? params,
+ OnError? errorCallBack,
+ CancelToken? token,
+ }) async {
+ this._request(
+ url,
+ callBack,
+ method: RequestType.GET,
+ params: params,
+ errorCallBack: errorCallBack,
+ token: token,
+ );
+ }
+
+ //post请求
+ void post(
+ String url,
+ OnData callBack, {
+ Map<String, dynamic>? params,
+ OnError? errorCallBack,
+ CancelToken? token,
+ }) async {
+ this._request(
+ url,
+ callBack,
+ method: RequestType.POST,
+ params: params,
+ errorCallBack: errorCallBack,
+ token: token,
+ );
+ }
+
+ void patch(
+ String url,
+ OnData callBack, {
+ Map<String, dynamic>? params,
+ OnError? errorCallBack,
+ CancelToken? token,
+ }) async {
+ this._request(
+ url,
+ callBack,
+ method: RequestType.PATCH,
+ params: params,
+ errorCallBack: errorCallBack,
+ token: token,
+ );
+ }
+
+ //post请求
+ void postUpload(
+ String url,
+ OnData callBack,
+ ProgressCallback progressCallBack, {
+ FormData? formData,
+ OnError? errorCallBack,
+ CancelToken? token,
+ }) async {
+ this._request(
+ url,
+ callBack,
+ method: RequestType.POST,
+ formData: formData,
+ errorCallBack: errorCallBack,
+ progressCallBack: progressCallBack,
+ token: token,
+ );
+ }
+
+ //patch请求
+ void patchUpload(
+ String url,
+ OnData callBack,
+ ProgressCallback progressCallBack, {
+ FormData? formData,
+ OnError? errorCallBack,
+ CancelToken? token,
+ }) async {
+ this._request(
+ url,
+ callBack,
+ method: RequestType.PATCH,
+ formData: formData,
+ errorCallBack: errorCallBack,
+ progressCallBack: progressCallBack,
+ token: token,
+ );
+ }
+
+ void _request(
+ String url,
+ OnData callBack, {
+ RequestType? method,
+ Map<String, dynamic>? params,
+ FormData? formData,
+ OnError? errorCallBack,
+ ProgressCallback? progressCallBack,
+ CancelToken? token,
+ }) async {
+ final id = _id++;
+ int? statusCode;
+ try {
+ print('HTTP_REQUEST_URL::[$id]::$url');
+ if (formData != null) {
+ print('HTTP_REQUEST_BODY::[$id]::${formData.fields}');
+ } else {
+ print('HTTP_REQUEST_BODY::[$id]::${params ?? ' no'}');
+ }
+
+ if (formData != null) {
+ _client!.options.headers[HttpHeaders.contentTypeHeader] =
+ "multipart/form-data";
+ } else {
+ _client!.options.headers[HttpHeaders.contentTypeHeader] =
+ "application/json; charset=utf-8";
+ }
+
+ print("loginRspEntity?.accessToken::${Q1Data.loginRspEntity?.accessToken}");
+ if (url == ApiUrlV2.login) {
+ _client!.options.headers['Authorization'] = null;
+ } else if (strNoEmpty(Q1Data.tokenFmt)) {
+ _client!.options.headers['Authorization'] = Q1Data.tokenFmt;
+ }
+
+ print(
+ 'HTTP_REQUEST_HEADER::[$id]::${json.encode(_client!.options.headers)}');
+
+ Response response;
+ if (method == RequestType.GET) {
+ ///组合GET请求的参数
+ if (mapNoEmpty(params)) {
+ response = await _client!.get(url,
+ queryParameters: params, cancelToken: token);
+ } else {
+ response = await _client!.get(url, cancelToken: token);
+ }
+ } else if (method == RequestType.PATCH) {
+ ///组合GET请求的参数
+ if (mapNoEmpty(params) || formData != null) {
+ response = await _client!.patch(
+ url,
+ queryParameters: params,
+ cancelToken: token,
+ data: formData ?? params,
+ );
+ } else {
+ response = await _client!.patch(url, cancelToken: token);
+ }
+ } else {
+ if (mapNoEmpty(params) || formData != null) {
+ response = await _client!.post(
+ url,
+ data: formData ?? params,
+ onSendProgress: progressCallBack,
+ cancelToken: token,
+ );
+ } else {
+ response = await _client!.post(url, cancelToken: token);
+ }
+ }
+
+ statusCode = response.statusCode;
+
+ if (response != null) {
+ if (response.data is Map && strNoEmpty(response.data["error"])) {
+ errorCallBack!(response.data["error"], -1);
+ return;
+ }
+ if (response.data is List) {
+ Map? data = response.data[0];
+ callBack(data);
+ } else {
+ Map? data = response.data;
+ callBack(data);
+ }
+ }
+
+ print('HTTP_RESPONSE_BODY::[$id]::${json.encode(response.data)}');
+
+ ///处理错误部分
+ if (statusCode! < 0) {
+ _handError(errorCallBack, statusCode);
+ return;
+ }
+ } catch (e) {
+ print("HTTP_RESPONSE_ERROR::[$id]::${e.runtimeType}::${e.toString()}");
+ if (e is DioError) {
+ DioError dioError = e;
+ if (dioError.response!.statusCode == 401) {
+ if (url == ApiUrlV2.login) {
+ errorCallBack!("手机号或密码错误", dioError.response!.statusCode);
+ } else {
+ /// 刷新token
+ if (strNoEmpty(Q1Data.tokenOfRefresh) && url != ApiUrlV2.register) {
+ final LoginRspEntity? refreshResult =
+ await ApiV2.authRefresh(null);
+ if (refreshResult != null) {
+ SharedUtil.instance!
+ .saveString(Keys.loginResult, json.encode(refreshResult));
+ Q1Data.loginRspEntity = refreshResult;
+ return _request(
+ url,
+ callBack,
+ method: method,
+ params: params,
+ formData: formData,
+ errorCallBack: errorCallBack,
+ progressCallBack: progressCallBack,
+ token: token,
+ );
+ } else {
+ errorCallBack!("用户验证失败，请重新登录", dioError.response!.statusCode);
+ loginOut(null);
+ }
+ } else {
+ errorCallBack!("用户验证失败，请重新登录", dioError.response!.statusCode);
+ loginOut(null);
+ }
+ }
+ } else {
+ errorCallBack!(
+ dioError.response!.data.toString(), dioError.response!.statusCode);
+ }
+ return;
+ }
+ _handError(errorCallBack, statusCode);
+ }
+ }
+
+ ///处理异常
+ static void _handError(OnError? errorCallback, int? statusCode) {
+ String errorMsg = 'Network request error';
+ if (errorCallback != null) {
+ errorCallback(errorMsg, statusCode);
+ }
+ print("HTTP_RESPONSE_ERROR::$errorMsg code:$statusCode");
+ }
+}
diff --git a/lib/tools/im/im_info_util.dart b/lib/tools/im/im_info_util.dart
new file mode 100644
index 0000000..d268a2b
--- /dev/null
+++ b/lib/tools/im/im_info_util.dart
@@ -0,0 +1,28 @@
+import 'package:lpinyin/lpinyin.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_friend_info.dart';
+import 'package:wechat_flutter/im/model/contacts.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+class ImInfoUtil {
+ static List<Contact> friendListToContactList(
+ List<V2TimFriendInfo>? listFriendInfo) {
+ return listFriendInfo?.map((e) {
+ final String? showName = strNoEmpty(e.friendRemark)
+ ? e.friendRemark
+ : strNoEmpty(e.userProfile!.nickName)
+ ? e.userProfile!.nickName
+ : e.userID;
+
+ String pinyin = PinyinHelper.getFirstWordPinyin(
+ strNoEmpty(showName) ? showName! : "");
+ String tag =
+ strNoEmpty(pinyin) ? pinyin.substring(0, 1).toUpperCase() : "#";
+ return Contact(
+ nameIndex: tag,
+ showName: showName,
+ info: e,
+ );
+ }).toList() ??
+ [];
+ }
+}
diff --git a/lib/tools/provider/global_model.dart b/lib/tools/provider/global_model.dart
new file mode 100755
index 0000000..b8c56e5
--- /dev/null
+++ b/lib/tools/provider/global_model.dart
@@ -0,0 +1,79 @@
+import 'package:flutter/material.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_user_full_info.dart';
+import 'package:wechat_flutter/im/im_handle/Im_api.dart';
+import 'package:wechat_flutter/tools/core/global_controller.dart';
+import 'package:wechat_flutter/tools/provider/loginc/global_loginc.dart';
+import 'package:wechat_flutter/tools/config/app_config.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+class GlobalModel extends ChangeNotifier {
+ final model = Get.find<GlobalController>();
+
+ String get account {
+ return model.account;
+ }
+
+ String get appName {
+ return model.appName;
+ }
+
+ String? get avatar {
+ return model.avatar;
+ }
+
+ String? get nickName {
+ return model.nickName;
+ }
+
+ String get currentLanguage {
+ return model.currentLanguage;
+ }
+
+ bool get goToLogin {
+ return model.goToLogin;
+ }
+
+ void setCurrentLanguageCode(List<String> value) {
+ model.currentLanguageCode = value;
+ }
+
+ void setAvatar(String value) {
+ model.avatar = value;
+ }
+
+ void setCurrentLanguage(String value) {
+ model.currentLanguage = value;
+ }
+
+ void setAppName(String value) {
+ model.appName = value;
+ }
+
+ void setCurrentLocale(Locale value) {
+ model.currentLocale = value;
+ }
+
+ void setAccount(String value) {
+ model.account = value;
+ }
+
+ void setGoToLogin(bool value) {
+ model.goToLogin = value;
+ }
+
+ @override
+ void dispose() {
+ super.dispose();
+ debugPrint("GlobalModel销毁了");
+ }
+
+ Future setContext(BuildContext context) async {
+ model.setContext(context);
+ }
+
+ Future refresh() async {
+ if (!model.goToLogin) await model.initInfo();
+ notifyListeners();
+ model.update();
+ }
+}
diff --git a/lib/tools/provider/im/im_event.dart b/lib/tools/provider/im/im_event.dart
new file mode 100644
index 0000000..791e7ca
--- /dev/null
+++ b/lib/tools/provider/im/im_event.dart
@@ -0,0 +1,659 @@
+import 'package:flutter/cupertino.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_conversation.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_group_change_info.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_group_member_change_info.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_group_member_info.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_message.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_message_receipt.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_user_full_info.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_user_info.dart';
+import 'package:wechat_flutter/tools/data/data.dart';
+import 'package:wechat_flutter/tools/eventbus/msg_bus.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+class IMEvent with ChangeNotifier {
+ List<Map<String, dynamic>> events = List.empty(growable: true);
+
+ void addEvents(Map<String, dynamic> event) {
+ this.events.add(event);
+ notifyListeners();
+ }
+
+ void clearEvents() {
+ this.events.clear();
+ notifyListeners();
+ }
+
+ // initListenr
+ void onConnectFailed(int code, String error) {
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onConnectFailed",
+ "code": code,
+ "error": error,
+ },
+ ),
+ );
+ }
+
+ void onConnectSuccess() {
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onConnectSuccess",
+ },
+ ),
+ );
+ }
+
+ void onConnecting() {
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onConnecting",
+ },
+ ),
+ );
+ }
+
+ void onKickedOffline() {
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onKickedOffline",
+ },
+ ),
+ );
+ }
+
+ void onSelfInfoUpdated(V2TimUserFullInfo info) {
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onSelfInfoUpdated",
+ "info": info.toJson(),
+ },
+ ),
+ );
+ }
+
+ void onUserSigExpired() {
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onUserSigExpired",
+ },
+ ),
+ );
+ }
+
+ // V2TimSimpleMsgListener
+ void onRecvC2CCustomMessage(
+ String msgID,
+ V2TimUserInfo sender,
+ String customData,
+ ) {
+ print("收到消息::$customData");
+ msgBus.fire(MsgBusModel(sender.userID));
+ Notice.send(WeChatActions.msg());
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onRecvC2CCustomMessage",
+ "msgID": msgID,
+ "sender": sender.toJson(),
+ "customData": customData,
+ },
+ ),
+ );
+ }
+
+ void onRecvC2CTextMessage(
+ String msgID,
+ V2TimUserInfo userInfo,
+ String text,
+ ) {
+ print("收到消息::onRecvC2CTextMessage::$text");
+ msgBus.fire(MsgBusModel(userInfo.userID));
+ Notice.send(WeChatActions.msg());
+ // circleBus.fire(CircleBusModel(userInfo.userID));
+
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onRecvC2CTextMessage",
+ "msgID": msgID,
+ "userInfo": userInfo.toJson(),
+ "text": text,
+ },
+ ),
+ );
+ }
+
+ void onRecvGroupCustomMessage(
+ String msgID,
+ String groupID,
+ V2TimGroupMemberInfo sender,
+ String customData,
+ ) {
+ print("收到消息::$customData");
+ msgBus.fire(MsgBusModel(groupID));
+ Notice.send(WeChatActions.msg());
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onRecvGroupCustomMessage",
+ "msgID": msgID,
+ "groupID": groupID,
+ "sender": sender.toJson(),
+ "customData": customData,
+ },
+ ),
+ );
+ }
+
+ void onRecvGroupTextMessage(
+ String msgID,
+ String groupID,
+ V2TimGroupMemberInfo sender,
+ String text,
+ ) {
+ print("收到消息::onRecvGroupTextMessage::$text");
+ msgBus.fire(MsgBusModel(groupID));
+ Notice.send(WeChatActions.msg());
+ // circleBus.fire(CircleBusModel(groupID));
+
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onRecvGroupTextMessage",
+ "msgID": msgID,
+ "groupID": groupID,
+ "sender": sender.toJson(),
+ "text": text,
+ },
+ ),
+ );
+ }
+
+// V2TimGroupListener
+ void onApplicationProcessed(
+ String groupID,
+ V2TimGroupMemberInfo opUser,
+ bool isAgreeJoin,
+ String opReason,
+ ) {
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onApplicationProcessed",
+ "groupID": groupID,
+ "opUser": opUser.toJson(),
+ "isAgreeJoin": isAgreeJoin,
+ "opReason": opReason,
+ },
+ ),
+ );
+ }
+
+ void onGrantAdministrator(
+ String groupID,
+ V2TimGroupMemberInfo opUser,
+ List<V2TimGroupMemberInfo> memberList,
+ ) {
+ List<Map<String, dynamic>> ml = List.empty(growable: true);
+ memberList.forEach((element) {
+ ml.add(element.toJson());
+ });
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onGrantAdministrator",
+ "groupID": groupID,
+ "opUser": opUser.toJson(),
+ "memberList": ml,
+ },
+ ),
+ );
+ }
+
+ void onGroupAttributeChanged(
+ String groupID,
+ Map<String, String> groupAttributeMap,
+ ) {
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onApplicationProcessed",
+ "groupID": groupID,
+ "groupAttributeMap": groupAttributeMap,
+ },
+ ),
+ );
+ }
+
+ void onGroupCreated(groupID) {
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onGroupCreated",
+ "groupID": groupID,
+ },
+ ),
+ );
+ }
+
+ void onGroupDismissed(
+ String groupID,
+ V2TimGroupMemberInfo opUser,
+ ) {
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onGroupDismissed",
+ "groupID": groupID,
+ "opUser": opUser.toJson(),
+ },
+ ),
+ );
+ }
+
+ void onGroupInfoChanged(
+ String groupID,
+ List<V2TimGroupChangeInfo> changeInfos,
+ ) {
+ List<Map<String, dynamic>> ml = List.empty(growable: true);
+ changeInfos.forEach((element) {
+ ml.add(element.toJson());
+ });
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onGroupInfoChanged",
+ "groupID": groupID,
+ "changeInfos": ml,
+ },
+ ),
+ );
+ }
+
+ void onGroupRecycled(
+ String groupID,
+ V2TimGroupMemberInfo opUser,
+ ) {
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onGroupRecycled",
+ "groupID": groupID,
+ "opUser": opUser.toJson(),
+ },
+ ),
+ );
+ }
+
+ void onMemberEnter(
+ String groupID,
+ List<V2TimGroupMemberInfo> memberList,
+ ) {
+ List<Map<String, dynamic>> ml = List.empty(growable: true);
+ memberList.forEach((element) {
+ ml.add(element.toJson());
+ });
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onMemberEnter",
+ "groupID": groupID,
+ "memberList": ml,
+ },
+ ),
+ );
+ }
+
+ void onMemberInfoChanged(
+ String groupID,
+ List<V2TimGroupMemberChangeInfo> v2TIMGroupMemberChangeInfoList,
+ ) {
+ List<Map<String, dynamic>> ml = List.empty(growable: true);
+ v2TIMGroupMemberChangeInfoList.forEach((element) {
+ ml.add(element.toJson());
+ });
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onMemberInfoChanged",
+ "groupID": groupID,
+ "v2TIMGroupMemberChangeInfoList": ml,
+ },
+ ),
+ );
+ }
+
+ void onMemberInvited(
+ String groupID,
+ V2TimGroupMemberInfo opUser,
+ List<V2TimGroupMemberInfo> memberList,
+ ) {
+ List<Map<String, dynamic>> ml = List.empty(growable: true);
+ memberList.forEach((element) {
+ ml.add(element.toJson());
+ });
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onMemberInvited",
+ "groupID": groupID,
+ "opUser": opUser.toJson(),
+ "memberList": ml,
+ },
+ ),
+ );
+ }
+
+ void onMemberKicked(
+ String groupID,
+ V2TimGroupMemberInfo opUser,
+ List<V2TimGroupMemberInfo> memberList,
+ ) {
+ List<Map<String, dynamic>> ml = List.empty(growable: true);
+ memberList.forEach((element) {
+ ml.add(element.toJson());
+ });
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onMemberKicked",
+ "groupID": groupID,
+ "opUser": opUser.toJson(),
+ "memberList": ml,
+ },
+ ),
+ );
+ }
+
+ void onMemberLeave(
+ String groupID,
+ V2TimGroupMemberInfo member,
+ ) {
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onMemberLeave",
+ "groupID": groupID,
+ "member": member.toJson(),
+ },
+ ),
+ );
+ }
+
+ void onQuitFromGroup(String groupID) {
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onQuitFromGroup",
+ "groupID": groupID,
+ },
+ ),
+ );
+ }
+
+ void onReceiveJoinApplication(
+ String groupID,
+ V2TimGroupMemberInfo member,
+ String opReason,
+ ) {
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onReceiveJoinApplication",
+ "groupID": groupID,
+ "member": member.toJson(),
+ "opReason": opReason
+ },
+ ),
+ );
+ }
+
+ void onReceiveRESTCustomData(
+ String groupID,
+ String customData,
+ ) {
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onReceiveRESTCustomData",
+ "groupID": groupID,
+ "customData": customData
+ },
+ ),
+ );
+ }
+
+ void onRevokeAdministrator(
+ String groupID,
+ V2TimGroupMemberInfo opUser,
+ List<V2TimGroupMemberInfo> memberList,
+ ) {
+ List<Map<String, dynamic>> ml = List.empty(growable: true);
+ memberList.forEach((element) {
+ ml.add(element.toJson());
+ });
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onRevokeAdministrator",
+ "groupID": groupID,
+ "opUser": opUser.toJson(),
+ "memberList": ml,
+ },
+ ),
+ );
+ }
+
+ // V2TimAdvancedMsgListener
+ void onRecvC2CReadReceipt(
+ List<V2TimMessageReceipt> receiptList,
+ ) {
+ List<Map<String, dynamic>> ml = List.empty(growable: true);
+ receiptList.forEach((element) {
+ ml.add(element.toJson());
+ });
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onRecvC2CReadReceipt",
+ "receiptList": ml,
+ },
+ ),
+ );
+ }
+
+ void onRecvMessageRevoked(String msgID) {
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onRecvMessageRevoked",
+ "msgID": msgID,
+ },
+ ),
+ );
+ }
+
+ void onRecvNewMessage(V2TimMessage msg) {
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onRecvNewMessage",
+ "chat": msg.toJson(),
+ },
+ ),
+ );
+ }
+
+ void onSendMessageProgress(
+ V2TimMessage message,
+ int progress,
+ ) {
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onSendMessageProgress",
+ "message": message.toJson(),
+ "progress": progress,
+ },
+ ),
+ );
+ }
+
+// 信令
+ void onInvitationCancelled(
+ String inviteID,
+ String inviter,
+ String data,
+ ) {
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onInvitationCancelled",
+ "inviteID": inviteID,
+ "inviter": inviter,
+ "data": data,
+ },
+ ),
+ );
+ }
+
+ void onInvitationTimeout(String inviteID, List<String> inviteeList) {
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onInvitationTimeout",
+ "inviteID": inviteID,
+ "inviteeList": inviteeList,
+ },
+ ),
+ );
+ }
+
+ void onInviteeAccepted(
+ String inviteID,
+ String invitee,
+ String data,
+ ) {
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onInviteeAccepted",
+ "inviteID": inviteID,
+ "invitee": invitee,
+ "data": data,
+ },
+ ),
+ );
+ }
+
+ void onInviteeRejected(
+ String inviteID,
+ String invitee,
+ String data,
+ ) {
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onInviteeRejected",
+ "inviteID": inviteID,
+ "invitee": invitee,
+ "data": data,
+ },
+ ),
+ );
+ }
+
+ void onReceiveNewInvitation(
+ String inviteID,
+ String inviter,
+ String groupID,
+ List<String> inviteeList,
+ String data,
+ ) {
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onReceiveNewInvitation",
+ "inviteID": inviteID,
+ "groupID": groupID,
+ "inviter": inviter,
+ "inviteeList": inviteeList,
+ "data": data,
+ },
+ ),
+ );
+ }
+
+ // 会话
+ void onConversationChanged(
+ List<V2TimConversation> conversationList,
+ ) {
+ List<Map<String, dynamic>> ml = List.empty(growable: true);
+ conversationList.forEach((element) {
+ ml.add(element.toJson());
+ });
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onConversationChanged",
+ "conversationList": ml,
+ },
+ ),
+ );
+ }
+
+ void onNewConversation(
+ List<V2TimConversation> conversationList,
+ ) {
+ List<Map<String, dynamic>> ml = List.empty(growable: true);
+ conversationList.forEach((element) {
+ ml.add(element.toJson());
+ });
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onNewConversation",
+ "conversationList": ml,
+ },
+ ),
+ );
+ }
+
+ void onSyncServerFailed() {
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onSyncServerFailed",
+ },
+ ),
+ );
+ }
+
+ void onSyncServerFinish() {
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onSyncServerFinish",
+ },
+ ),
+ );
+ }
+
+ void onSyncServerStart() {
+ this.addEvents(
+ Map<String, dynamic>.from(
+ {
+ "type": "onSyncServerStart",
+ },
+ ),
+ );
+ }
+}
diff --git a/lib/provider/login_model.dart b/lib/tools/provider/login_model.dart
similarity index 81%
rename from lib/provider/login_model.dart
rename to lib/tools/provider/login_model.dart
index b70c6b5..145508f 100644
--- a/lib/provider/login_model.dart
+++ b/lib/tools/provider/login_model.dart
@@ -1,10 +1,10 @@
import 'package:flutter/material.dart';
-import 'package:wechat_flutter/provider/loginc/login_loginc.dart';
+import 'package:wechat_flutter/tools/provider/loginc/login_loginc.dart';
class LoginModel extends ChangeNotifier {
- BuildContext context;
+ BuildContext? context;
- LoginLogic logic;
+ late LoginLogic logic;
String area = '中国大陆（+86）';
diff --git a/lib/provider/loginc/global_loginc.dart b/lib/tools/provider/loginc/global_loginc.dart
similarity index 65%
rename from lib/provider/loginc/global_loginc.dart
rename to lib/tools/provider/loginc/global_loginc.dart
index 5c865fc..3f0ce2c 100755
--- a/lib/provider/loginc/global_loginc.dart
+++ b/lib/tools/provider/loginc/global_loginc.dart
@@ -1,15 +1,16 @@
-import 'package:wechat_flutter/provider/global_model.dart';
-import 'package:wechat_flutter/tools/shared_util.dart';
+import 'package:wechat_flutter/tools/core/global_controller.dart';
+import 'package:wechat_flutter/tools/provider/global_model.dart';
+import 'package:wechat_flutter/tools/func/shared_util.dart';
class GlobalLogic {
- final GlobalModel _model;
+ final GlobalController _model;
GlobalLogic(this._model);
///获取当前的语言code
Future getCurrentLanguageCode() async {
final list =
- await SharedUtil.instance.getStringList(Keys.currentLanguageCode);
+ await SharedUtil.instance!.getStringList(Keys.currentLanguageCode);
if (list == null) return;
if (list == _model.currentLanguageCode) return;
_model.currentLanguageCode = list;
@@ -18,7 +19,7 @@ class GlobalLogic {
///获取当前的语言
Future getCurrentLanguage() async {
final currentLanguage =
- await SharedUtil.instance.getString(Keys.currentLanguage);
+ await SharedUtil.instance!.getString(Keys.currentLanguage);
if (currentLanguage == null) return;
if (currentLanguage == _model.currentLanguage) return;
_model.currentLanguage = currentLanguage;
@@ -26,7 +27,7 @@ class GlobalLogic {
///获取app的名字
Future getAppName() async {
- final appName = await SharedUtil.instance.getString(Keys.appName);
+ final appName = await SharedUtil.instance!.getString(Keys.appName);
if (appName == null) return;
if (appName == _model.appName) return;
_model.appName = appName;
@@ -34,7 +35,7 @@ class GlobalLogic {
///获取本人昵称
Future getNickName() async {
- final nickName = await SharedUtil.instance.getString(Keys.nickName);
+ final nickName = await SharedUtil.instance!.getString(Keys.nickName);
if (nickName == null) return;
if (nickName == _model.nickName) return;
_model.nickName = nickName;
@@ -42,7 +43,7 @@ class GlobalLogic {
///获取本人头像
Future getFaceUrl() async {
- final faceUrl = await SharedUtil.instance.getString(Keys.faceUrl);
+ final faceUrl = await SharedUtil.instance!.getString(Keys.faceUrl);
if (faceUrl == null) return;
if (faceUrl == _model.avatar) return;
_model.avatar = faceUrl;
@@ -50,7 +51,7 @@ class GlobalLogic {
///获取本人性别
Future getGender() async {
- final gender = await SharedUtil.instance.getInt(Keys.gender);
+ final gender = await SharedUtil.instance!.getInt(Keys.gender);
if (gender == null) return;
if (gender == _model.gender) return;
_model.gender = gender;
@@ -58,7 +59,7 @@ class GlobalLogic {
///用于判断是否进入登录页面
Future getLoginState() async {
- final hasLogged = await SharedUtil.instance.getBoolean(Keys.hasLogged);
+ final hasLogged = await SharedUtil.instance!.getBoolean(Keys.hasLogged);
if (hasLogged == null)
_model.goToLogin = true;
else
@@ -67,7 +68,7 @@ class GlobalLogic {
///获取当前登录的用户名
Future getAccount() async {
- final appAccount = await SharedUtil.instance.getString(Keys.account);
+ final appAccount = await SharedUtil.instance!.getString(Keys.account);
if (appAccount == null) return;
if (appAccount == _model.account) return;
_model.account = appAccount;
diff --git a/lib/provider/loginc/login_loginc.dart b/lib/tools/provider/loginc/login_loginc.dart
similarity index 55%
rename from lib/provider/loginc/login_loginc.dart
rename to lib/tools/provider/loginc/login_loginc.dart
index 50177c1..003926e 100644
--- a/lib/provider/loginc/login_loginc.dart
+++ b/lib/tools/provider/loginc/login_loginc.dart
@@ -1,5 +1,5 @@
-import 'package:wechat_flutter/provider/login_model.dart';
-import 'package:wechat_flutter/tools/shared_util.dart';
+import 'package:wechat_flutter/tools/provider/login_model.dart';
+import 'package:wechat_flutter/tools/func/shared_util.dart';
class LoginLogic {
final LoginModel _model;
@@ -8,7 +8,7 @@ class LoginLogic {
///获取当前选择的地区号码
Future getArea() async {
- final area = await SharedUtil.instance.getString(Keys.area);
+ final area = await SharedUtil.instance!.getString(Keys.area);
if (area == null) return;
if (area == _model.area) return;
_model.area = area;
diff --git a/lib/tools/test/live_log_page.dart b/lib/tools/test/live_log_page.dart
new file mode 100644
index 0000000..d957cee
--- /dev/null
+++ b/lib/tools/test/live_log_page.dart
@@ -0,0 +1,115 @@
+import 'dart:async';
+
+import 'package:event_bus/event_bus.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+
+EventBus liveLogRefreshBus = EventBus();
+
+class LiveLogRefreshModel {}
+
+
+/// 【2021 12.30】
+/// 直播流质量日志打印到ui，方便测试音画不同步
+class LiveLogPageData {
+ static StringBuffer strBuf = StringBuffer();
+ static void writeData(String str) {
+ strBuf.write(str);
+ }
+}
+
+
+class LiveLogPage extends StatefulWidget {
+ @override
+ _LiveLogPageState createState() => _LiveLogPageState();
+}
+
+class _LiveLogPageState extends State<LiveLogPage> {
+ StreamSubscription? _liveLogRefreshBus;
+
+ ScrollController controller = ScrollController(initialScrollOffset: 300);
+
+ //搜索的字符
+ final String _searchStr = '/v1/live/exit';
+
+ //正常文本
+ final TextStyle _normalStyle = TextStyle(
+ fontSize: 12,
+ color: Colors.black,
+ );
+
+ //高亮文本
+ final TextStyle _highlightStyle = TextStyle(
+ fontSize: 12,
+ color: Colors.blue,
+ );
+
+ String get strValue {
+ return LiveLogPageData.strBuf.toString();
+ }
+
+ @override
+ void initState() {
+ super.initState();
+ _liveLogRefreshBus =
+ liveLogRefreshBus.on<LiveLogRefreshModel>().listen((event) {
+ if (mounted) setState(() {});
+ });
+ }
+
+ ///返回设置好的富文本
+ Widget _splitEnglish() {
+ final List<TextSpan> spans = [];
+ //split 截出来
+ final List<String> strList = strValue.split(_searchStr);
+ for (int i = 0; i < strList.length; i++) {
+ //拿出字符串
+ final String str = strList[i];
+ //为空字符串的都是高亮
+ if (str == '' && i < strList.length - 1) {
+ spans.add(TextSpan(text: _searchStr, style: _highlightStyle));
+ } else {
+ //其他
+ spans.add(TextSpan(text: str, style: _normalStyle));
+ //最后一个字符
+ if (i < str.length - 1) {
+ spans.add(TextSpan(text: _searchStr, style: _highlightStyle));
+ }
+ }
+ }
+ //返回
+ return SelectableText.rich(
+ TextSpan(children: spans),
+ );
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return Scaffold(
+ backgroundColor: Colors.white,
+ appBar: AppBar(
+ title: Text('日志'),
+ ),
+ body: CupertinoScrollbar(
+ controller: controller,
+ child: ListView(
+ controller: controller,
+ reverse: true,
+ padding: EdgeInsets.all(10),
+ children: [
+ SizedBox(height: 20),
+ _splitEnglish(),
+ SizedBox(height: 20),
+ ],
+ ),
+ ),
+ );
+ }
+
+ @override
+ void dispose() {
+ super.dispose();
+ _liveLogRefreshBus?.cancel();
+ _liveLogRefreshBus = null;
+ }
+}
diff --git a/lib/config/const.dart b/lib/tools/theme/const.dart
similarity index 79%
rename from lib/config/const.dart
rename to lib/tools/theme/const.dart
index 2a81962..18226e6 100644
--- a/lib/config/const.dart
+++ b/lib/tools/theme/const.dart
@@ -1,8 +1,6 @@
import 'package:flutter/material.dart';
-int appId = 1400250651;
-
-const appBarColor = Color.fromRGBO(237, 237, 237, 1);
+const appBarColor = Color(0xffeaeaea);
const Color ComMomBGColor = Color.fromRGBO(240, 240, 245, 1.0);
@@ -34,11 +32,11 @@ const defIcon = 'assets/images/def_avatar.png';
const contactAssets = 'assets/images/contact/';
-const defAvatar = 'http://flutterj.com/f.jpeg';
+const defAvatar = 'http://www.shenmeniuma.com/mockImg/test1.jpeg';
-const myCode = 'http://flutterj.com/c.jpg';
+const myCode = 'http://www.shenmeniuma.com/mockImg/personal_code.jpg';
-const download = 'http://flutterj.com/download.png';
+const download = 'http://www.shenmeniuma.com/mockImg/group_code.png';
const helpUrl =
'https://kf.qq.com/touch/product/wechat_app.html?scene_id=kf338';
diff --git a/lib/config/contacts.dart b/lib/tools/theme/contacts.dart
similarity index 96%
rename from lib/config/contacts.dart
rename to lib/tools/theme/contacts.dart
index 671bdac..529ae99 100755
--- a/lib/config/contacts.dart
+++ b/lib/tools/theme/contacts.dart
@@ -87,12 +87,6 @@ class AppStyles {
color: const Color(AppColors.TitleColor));
}
-class Routes {
- static const Home = "/homepage";
- static const Conversation = "/conversation";
- static const Login = "/login";
-}
-
class Constants {
static const IconFontFamily = "appIconFont";
static const ActionIconSize = 20.0;
diff --git a/lib/tools/theme/my_theme.dart b/lib/tools/theme/my_theme.dart
new file mode 100644
index 0000000..247365f
--- /dev/null
+++ b/lib/tools/theme/my_theme.dart
@@ -0,0 +1,134 @@
+import 'package:flutter/material.dart';
+
+class MyTheme {
+ static MaterialColor themeColor() {
+ final _colorValue = 0xff3bb565;
+ final _colorEntity = Color(_colorValue);
+ MaterialColor themeColor = MaterialColor(
+ _colorValue,
+ <int, Color>{
+ 50: _colorEntity,
+ 100: _colorEntity,
+ 200: _colorEntity.withOpacity(0.2),
+ 300: _colorEntity.withOpacity(0.3),
+ 400: _colorEntity.withOpacity(0.4),
+ 500: _colorEntity.withOpacity(0.5),
+ 600: _colorEntity,
+ 700: _colorEntity,
+ 800: _colorEntity,
+ 900: _colorEntity,
+ },
+ );
+ return themeColor;
+ }
+
+ static MaterialColor primarySwatch() {
+ final _primaryValue = Colors.black.value;
+ return MaterialColor(
+ _primaryValue,
+ <int, Color>{
+ 50: Color(0xFFE3F2FD),
+ 100: Color(0xFFBBDEFB),
+ 200: Color(0xFF90CAF9),
+ 300: Color(0xFF64B5F6),
+ 400: Color(0xFF42A5F5),
+ 500: Color(_primaryValue),
+ 600: Color(0xFF1E88E5),
+ 700: Color(0xFF1976D2),
+ 800: Color(0xFF1565C0),
+ 900: Color(0xFF0D47A1),
+ },
+ );
+ }
+
+ static appBarMainColor() {
+ // if (!Q1Data.isDark()) {
+ // return Colors.white;
+ // }
+ return Colors.black;
+ }
+
+ static double susItemHeight() => 40;
+
+ static Decoration getIndexBarDecoration(Color? color) {
+ return BoxDecoration(
+ color: color,
+ borderRadius: BorderRadius.circular(20.0),
+ border: Border.all(color: Colors.grey[300]!, width: .5));
+ }
+
+ static Color mainLineColor() {
+ // if (!Q1Data.isDark()) {
+ // return Colors.grey.withOpacity(0.1);
+ // }
+ return const Color(0xfff1f0f1);
+ }
+
+ static TextStyle mapLabelStyle([Color? color]) {
+ return TextStyle(
+ color: color ?? Colors.black,
+ fontSize: 15,
+ fontWeight: MyTheme.fontWeight(),
+ );
+ }
+
+ /// 常用item标题样式
+ static TextStyle itemTitleStyle([Color? color]) {
+ return TextStyle(
+ color: Colors.black.withOpacity(0.7),
+ fontSize: 15,
+ fontWeight: MyTheme.fontWeight(),
+ );
+ }
+
+ static TextStyle hintLabel1([Color? color]) {
+ return TextStyle(
+ color: color ?? Colors.grey,
+ fontSize: 12,
+ fontWeight: MyTheme.fontWeight(),
+ );
+ }
+
+ static TextStyle hintLabel2([Color? color]) {
+ return TextStyle(
+ color: color ?? Colors.grey,
+ fontSize: 10,
+ fontWeight: MyTheme.fontWeight(),
+ );
+ }
+
+ static FontWeight fontWeight() {
+ return FontWeight.w300;
+ }
+
+ static Color get btBackgroundColor {
+ return Color(0xfff0f0f0);
+ }
+
+ static Color fieldBorderColor() {
+ return Colors.grey.withOpacity(0.2);
+ }
+
+ static Color selectLabelColor() {
+ return MyTheme.themeColor().withOpacity(0.8);
+ }
+
+ static Border mainBorder([Color? color]) {
+ return Border(bottom: mainBorderSide(color));
+ }
+
+ static mainBorderSide([Color? color]) {
+ return BorderSide(color: color ?? Color(0xffEFEFEF), width: 1);
+ }
+}
+
+class MyStyle {
+ static TextStyle hitLabelStyle =
+ TextStyle(color: Colors.white, fontSize: 9, fontWeight: FontWeight.w300);
+
+ static TextStyle hitLabelStyleBlack1 =
+ TextStyle(color: Colors.black, fontSize: 9, fontWeight: FontWeight.w300);
+
+ static TextStyle hitLabelStyleBlack =
+ TextStyle(color: Colors.black, fontSize: 13, fontWeight: FontWeight.w300);
+}
diff --git a/lib/tools/ui/fram_size.dart b/lib/tools/ui/fram_size.dart
new file mode 100644
index 0000000..6396a40
--- /dev/null
+++ b/lib/tools/ui/fram_size.dart
@@ -0,0 +1,286 @@
+/*
+* num扩展方法
+* */
+import 'dart:ui';
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+
+extension FrameSizeNum on num {
+ double get px {
+ return FrameSize.px(this);
+ }
+}
+
+class FrameSize {
+ FrameSize();
+
+ static MediaQueryData mediaQuery = MediaQueryData.fromWindow(window);
+ static final double _width = mediaQuery.size.width;
+ static final double _height = mediaQuery.size.height;
+ static final double _topBarH = mediaQuery.padding.top;
+ static final double _botBarH = mediaQuery.padding.bottom;
+ static final double _pixelRatio = mediaQuery.devicePixelRatio;
+ static double? _ratio;
+
+ static void init(int number) {
+ final int uiWidth = number;
+ _ratio = _width / uiWidth;
+ }
+
+ /// 适配方式：实际值 *（屏幕宽度 / 375【设计稿宽度】）
+ static double px(num number) {
+ if (kIsWeb) {
+ return number.toDouble();
+ }
+ if (!(_ratio is double || _ratio is int)) {
+ FrameSize.init(375);
+ }
+
+ return number * (_ratio ?? 0);
+ }
+
+ /*
+ * 当横屏时获取的值还是竖屏的
+ * */
+ static double screenW() {
+ return _width;
+ }
+
+ /*
+ * 当横屏时获取的值还是竖屏的
+ * */
+ static double screenH() {
+ return _height;
+ }
+
+ static bool isHorizontal() {
+ return winWidth() > winHeight();
+ }
+
+ /*
+ * 取宽高里面的最大值，
+ * 如果宽大于高那就使用宽
+ * 如果高大于宽那就使用高
+ * */
+ static double maxValue() {
+ final maxValue = isHorizontal() ? winWidth() : winHeight();
+
+ return maxValue;
+ }
+
+ /*
+ * 取宽高里面的最小值，
+ * */
+ static double minValue() {
+ final minValue = isHorizontal() ? winHeight() : winWidth();
+
+ return minValue;
+ }
+
+ static bool isNeedRotate() {
+ return !kIsWeb && isHorizontal();
+ }
+
+ /// 屏幕宽度[横屏需要]
+ static double winWidth() {
+ final MediaQueryData mediaQuery = MediaQueryData.fromWindow(window);
+ return mediaQuery.size.width;
+ }
+
+ /// 屏幕高度[横屏需要]
+ static double winHeight() {
+ final MediaQueryData mediaQuery = MediaQueryData.fromWindow(window);
+ return mediaQuery.size.height;
+ }
+
+ /// 屏幕宽度[横屏需要]-动态-横竖屏转换会变化
+ /// 会影响到上下文
+ static double winWidthDynamic(BuildContext context) {
+ return MediaQuery.of(context).size.width;
+ }
+
+ /// 屏幕高度[横屏需要]-动态-横竖屏转换会变化
+ /// 会影响到上下文
+ static double winHeightDynamic(BuildContext context) {
+ return MediaQuery.of(context).size.height;
+ }
+
+ /// 键盘高度
+ /// 如果为0则是键盘未弹出
+ static double winKeyHeight(BuildContext context) {
+ return MediaQuery.of(context).viewInsets.bottom;
+ }
+
+ /// 状态栏高度
+ static double statusBarHeight() {
+ return MediaQueryData.fromWindow(window).padding.top;
+ }
+
+ /// navigationBar高度
+ static double navigationBarHeight() {
+ return kToolbarHeight;
+ }
+
+ /// 整AppBar高度
+ /// 状态栏高度 + navigationBar高度
+ static double topBarHeight() {
+ return navigationBarHeight() + statusBarHeight();
+ }
+
+ static double padTopH() {
+ return _topBarH;
+ }
+
+ static double padTopHDynamic(BuildContext context) {
+ return MediaQuery.of(context).padding.top;
+ }
+
+ /// 【2021 12.28】优惠券图标适配有左右安全区时
+ /// 获取安全区右边间距
+ static double padRight() {
+ return MediaQueryData.fromWindow(window).padding.right;
+ }
+
+ /// 【2021 12.28】优惠券图标适配有左右安全区时
+ /// /// 获取安全区左边间距
+ static double padLeft() {
+ return MediaQueryData.fromWindow(window).padding.left;
+ }
+
+ static double padBotH() {
+ return _botBarH;
+ }
+
+ static double pixelRatio() {
+ return _pixelRatio;
+ }
+}
+
+
+/*
+* num扩展方法
+* */
+extension ScreenUtilNum on num {
+ /// 根据设计稿的设备高度适配【简单用法】
+ /// 例子：
+ /// fontSize: 10.f
+ double get f {
+ return ScreenUtil.f(this);
+ }
+
+ /// 根据设计稿的设备高度适配【简单用法】
+ /// 例子：
+ /// height: 10.h
+ double get h {
+ return ScreenUtil.h(this);
+ }
+
+ /// 根据设计稿的设备宽度适配【简单用法】
+ /// 例子：
+ /// width: 10.w
+ double get w {
+ return ScreenUtil.w(this);
+ }
+}
+
+class ScreenUtil {
+ //设计稿的设备尺寸修改
+ static int width = 375;
+ static int height = 812;
+ static bool allowFontScaling = true;
+
+ static MediaQueryData mediaQuery = MediaQueryData.fromWindow(window);
+
+ static double _pixelRatio = mediaQuery.devicePixelRatio;
+ static double _screenWidth = mediaQuery.size.width;
+ static double _screenHeight = mediaQuery.size.height;
+ static double _statusBarHeight = mediaQuery.padding.top;
+ static double _bottomBarHeight = mediaQuery.padding.bottom;
+ static final double _textScaleFactor = mediaQuery.textScaleFactor;
+
+ ///每个逻辑像素的字体像素数，字体的缩放比例
+ static double get textScaleFactory => _textScaleFactor;
+
+ ///设备的像素密度
+ static double get pixelRatio => _pixelRatio;
+
+ ///当前设备宽度 dp
+ static double get screenWidthDp => _screenWidth;
+
+ ///当前设备高度 dp
+ static double get screenHeightDp => _screenHeight;
+
+ ///当前设备宽度 px
+ static double get screenWidth => _screenWidth * _pixelRatio;
+
+ ///当前设备高度 px
+ static double get screenHeight => _screenHeight * _pixelRatio;
+
+ ///状态栏高度 刘海屏会更高
+ static double get statusBarHeight => _statusBarHeight * _pixelRatio;
+
+ ///底部安全区距离
+ static double get bottomBarHeight => _bottomBarHeight * _pixelRatio;
+
+ ///实际的dp与设计稿px的比例
+ static get scaleWidth => _screenWidth / width;
+
+ static get scaleHeight => _screenHeight / height;
+
+ static double winWidth() {
+ return screenWidth;
+ }
+
+ static double winHeight() {
+ return screenHeight;
+ }
+
+ /*
+ * 设置新宽高尺寸
+ * */
+ static void setWindow(ViewConfiguration viewConfiguration) {
+ _pixelRatio = viewConfiguration.devicePixelRatio;
+ _screenWidth = viewConfiguration.geometry.width / _pixelRatio;
+ _screenHeight = viewConfiguration.geometry.height / _pixelRatio;
+ _statusBarHeight = viewConfiguration.padding.top;
+ _bottomBarHeight = viewConfiguration.padding.bottom;
+ }
+
+ ///根据设计稿的设备宽度适配
+ ///高度也根据这个来做适配可以保证不变形
+ static w(num width) {
+ if (width == null) return null;
+ return width * scaleWidth;
+ }
+
+ /// 根据设计稿的设备高度适配
+ /// 当发现设计稿中的一屏显示的与当前样式效果不符合时,
+ /// 或者形状有差异时,高度适配建议使用此方法
+ /// 高度适配主要针对想根据设计稿的一屏展示一样的效果
+ static h(num height) {
+ if (height == null) return null;
+ return height * scaleHeight;
+ }
+
+ ///字体大小适配方法
+ ///@param fontSize 传入设计稿上字体的px ,
+ ///@param allowFontScaling 控制字体是否要根据系统的“字体大小”辅助选项来进行缩放。默认值为true。
+ ///@param allowFontScaling Specifies whether fonts should scale to respect Text Size accessibility settings. The default is true.
+ static f(num fontSize) {
+// print('allowFontScaling == $allowFontScaling');
+ return allowFontScaling ? w(fontSize) : w(fontSize) / _textScaleFactor;
+ }
+
+ static lineHeight(num fontSize) {
+// print('allowFontScaling == $allowFontScaling');
+ return w(fontSize) / _textScaleFactor * 1.2;
+ }
+
+ /// 键盘高度
+ /// 如果为0则是键盘未弹出
+ static double winKeyHeight(BuildContext context) {
+ return MediaQuery.of(context).viewInsets.bottom;
+ }
+}
+
diff --git a/lib/tools/ui/q1_toast.dart b/lib/tools/ui/q1_toast.dart
new file mode 100644
index 0000000..52881f3
--- /dev/null
+++ b/lib/tools/ui/q1_toast.dart
@@ -0,0 +1,164 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:oktoast/oktoast.dart';
+import 'package:wechat_flutter/tools/commom/check.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+Color toastBgColor = const Color(0xff000000).withOpacity(0.8);
+
+void q1ToastLong(String tips,
+ {Duration duration = const Duration(milliseconds: 2000)}) {
+ if (!strNoEmpty(tips)) {
+ return;
+ }
+
+ /// 修复多重提示
+ dismissAllToast();
+
+ showToast(
+ tips,
+ textPadding:
+ EdgeInsets.symmetric(horizontal: FrameSize.px(24), vertical: 15.px),
+ textStyle: TextStyle(color: const Color(0xffFFFFFF), fontSize: 14.px),
+ radius: 8.px,
+ backgroundColor: toastBgColor,
+ duration: duration,
+ );
+}
+
+void q1Toast(String? tips,
+ {Duration duration = const Duration(milliseconds: 2000)}) {
+ if (!strNoEmpty(tips)) {
+ return;
+ }
+
+ LogUtil.d("q1Toast::$tips");
+
+ dismissAllToast();
+
+ showToast(
+ tips!,
+ textPadding:
+
+ EdgeInsets.symmetric(horizontal: FrameSize.px(20), vertical: 10.px),
+ textStyle: TextStyle(color: const Color(0xffFFFFFF), fontSize: 14.px),
+ radius: 8.px,
+ backgroundColor: toastBgColor,
+ duration: duration,
+ );
+}
+
+void q1FailToast(String? tips,
+ {Duration duration = const Duration(milliseconds: 2000)}) {
+ if (!strNoEmpty(tips)) {
+ return;
+ }
+ final Widget body = IconToastView(
+ tips,
+ Image.asset('assets/images/main/tip_close.png',
+ width: 20.px, height: 20.px),
+ );
+
+ /// 修复多重提示
+ dismissAllToast();
+
+ showToastWidget(UnconstrainedBox(child: body), duration: duration);
+}
+
+Widget circularProgressIcon(
+ double size, {
+ Color primaryColor = Colors.white,
+ Color? secondaryColor,
+ int lapDuration = 1000,
+ double strokeWidth = 1.67,
+}) {
+ return SizedBox(
+ height: size,
+ width: size,
+ child: Image.asset('assets/images/main/loading.gif'),
+ );
+}
+
+/*
+* 加载中对话框
+* */
+void q1LoadingToast({
+ String? tips,
+ Duration duration = const Duration(milliseconds: 30000),
+ VoidCallback? onComplete,
+ double? marginTop,
+}) {
+ final Widget body = IconToastView(
+ tips ?? "加载中",
+ circularProgressIcon(20.px),
+ );
+
+ dismissAllToast();
+
+ final ToastFuture toastFuture = showToastWidget(
+ Container(
+ margin: EdgeInsets.only(top: marginTop ?? 0),
+ child: UnconstrainedBox(child: body),
+ ),
+ duration: duration);
+ Future.delayed(duration - const Duration(milliseconds: 10)).then((value) {
+ /// 为true则表示已销毁，否则表示还显示了
+ final bool isDismiss =
+ toastFuture.timer == null || !toastFuture.timer!.isActive;
+ if (isDismiss) {
+ return;
+ }
+ if (onComplete != null) {
+ onComplete();
+ }
+ });
+}
+
+void q1SuccessToast(String tips,
+ {Duration duration = const Duration(milliseconds: 2000)}) {
+ if (!strNoEmpty(tips)) {
+ return;
+ }
+ final Widget body = IconToastView(
+ tips,
+ Image.asset('assets/images/main/tip_ok.png', width: 20.px, height: 20.px),
+ );
+
+ dismissAllToast();
+
+ showToastWidget(UnconstrainedBox(child: body), duration: duration);
+}
+
+class IconToastView extends StatelessWidget {
+ final String? tips;
+ final Widget icon;
+ final EdgeInsetsGeometry? padding;
+
+ const IconToastView(this.tips, this.icon, {this.padding});
+
+ @override
+ Widget build(BuildContext context) {
+ return Container(
+ margin: const EdgeInsets.all(50),
+ decoration: BoxDecoration(
+ color: toastBgColor,
+ borderRadius: BorderRadius.circular(8),
+ ),
+ padding: padding ??
+ EdgeInsets.symmetric(horizontal: FrameSize.px(20), vertical: 10.px),
+ child: ClipRect(
+ child: Row(
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: [
+ icon,
+ Space(width: 8.px),
+ Text(
+ tips!,
+ style: TextStyle(color: const Color(0xffFFFFFF), fontSize: 14.px),
+ )
+ ],
+ ),
+ ),
+ );
+ }
+}
diff --git a/lib/tools/utils/file_util.dart b/lib/tools/utils/file_util.dart
index 3e6dc6c..64b7a27 100644
--- a/lib/tools/utils/file_util.dart
+++ b/lib/tools/utils/file_util.dart
@@ -6,9 +6,9 @@ import 'package:flutter/services.dart';
import 'package:path_provider/path_provider.dart';
class FileUtil {
- static FileUtil _instance;
+ static FileUtil? _instance;
- static FileUtil getInstance() {
+ static FileUtil? getInstance() {
if (_instance == null) {
_instance = FileUtil._internal();
}
@@ -53,13 +53,13 @@ class FileUtil {
///[fileName] 例子 'girl.jpg'
Future<String> copyAssetToFile(String assetPath, String assetName,
String filePath, String fileName) async {
- String newPath = await FileUtil.getInstance().getSavePath(filePath);
+ String newPath = await FileUtil.getInstance()!.getSavePath(filePath);
String name = fileName;
bool exists = await new File(newPath + name).exists();
if (!exists) {
var data = await rootBundle.load(assetPath + assetName);
List<int> bytes =
- data.buffer.asUint8List(data.offsetInBytes, data.lengthInBytes);
+ data.buffer.asUint8List(data.offsetInBytes, data.lengthInBytes);
await File(newPath + name).writeAsBytes(bytes);
return newPath + name;
} else
@@ -67,13 +67,13 @@ class FileUtil {
}
void downloadFile(
- {String url,
- String filePath,
- String fileName,
- Function onComplete}) async {
- final path = await FileUtil.getInstance().getSavePath(filePath);
+ {required String url,
+ required String filePath,
+ String? fileName,
+ Function? onComplete}) async {
+ final path = await FileUtil.getInstance()!.getSavePath(filePath);
String name = fileName ?? url.split("/").last;
- Req.getInstance().client.download(
+ Req.getInstance()!.client!.download(
url,
path + name,
onReceiveProgress: (int count, int total) {
@@ -85,4 +85,25 @@ class FileUtil {
options: Options(sendTimeout: 15 * 1000, receiveTimeout: 360 * 1000),
);
}
+
+ /// 媒体文件类型，1=图片；2=视频；
+ int mediaTypeOfPath(String path) {
+ if (path.endsWith("MP4") ||
+ path.endsWith("mp4") ||
+ path.endsWith("mov") ||
+ path.endsWith("MOV")) {
+ return 2;
+ } else {
+ return 1;
+ }
+ }
+
+ /// 视频文件类型
+ String videoTypeOfPath(String path) {
+ if (path.endsWith("MP4") || path.endsWith("mp4")) {
+ return "mp4";
+ } else {
+ return "mov";
+ }
+ }
}
diff --git a/lib/tools/utils/handle_util.dart b/lib/tools/utils/handle_util.dart
deleted file mode 100644
index 0dc4050..0000000
--- a/lib/tools/utils/handle_util.dart
+++ /dev/null
@@ -1,3 +0,0 @@
-
-void logError(String code, String message) =>
- print('Error: $code\nError Message: $message');
diff --git a/lib/tools/utils/video_util.dart b/lib/tools/utils/video_util.dart
new file mode 100644
index 0000000..d5ef13f
--- /dev/null
+++ b/lib/tools/utils/video_util.dart
@@ -0,0 +1,46 @@
+import 'dart:typed_data';
+
+import 'package:fijkplayer/fijkplayer.dart';
+import 'package:image_gallery_saver/image_gallery_saver.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+import 'package:flutter_video_info/flutter_video_info.dart';
+
+class VideoUtilModel {
+ /// 视频时长，单位秒
+ final int duration;
+
+ /// 封面路径
+ final String coverPath;
+
+ VideoUtilModel(this.duration, this.coverPath);
+
+ @override
+ String toString() {
+ return 'VideoUtilModel{duration: $duration, coverPath: $coverPath}';
+ }
+}
+
+class VideoUtil {
+ /// 保存封面
+ /// 返回值：文件路径
+ static Future<String?> saveCover(Uint8List imageBytes) async {
+ final result = await ImageGallerySaver.saveImage(imageBytes,
+ quality: 60, name: "cover_${DateTime.now().millisecondsSinceEpoch}");
+ return result['filePath'];
+ }
+
+ /// 获取视频时长
+ static Future<VideoUtilModel> getVideoDuration(String videoPath) async {
+ try {
+ final videoInfo = FlutterVideoInfo();
+ final VideoData? info = await videoInfo.getVideoInfo(videoPath);
+
+ final int secondDuration = (info?.duration?.toInt() ?? 0) ~/ 1000;
+
+ return VideoUtilModel(secondDuration, ""); //saveCov
+ } catch (e) {
+ LogUtil.d("出现异常::${e.toString()}");
+ return VideoUtilModel(0, ""); //saveCov
+ }
+ }
+}
diff --git a/lib/tools/wechat_flutter.dart b/lib/tools/wechat_flutter.dart
index 14c4441..385aa94 100755
--- a/lib/tools/wechat_flutter.dart
+++ b/lib/tools/wechat_flutter.dart
@@ -1,42 +1,55 @@
-export 'dart:ui';
+import 'dart:ui';
+
+import 'package:connectivity_plus/connectivity_plus.dart';
+import 'package:flutter_cache_manager/flutter_cache_manager.dart';
+
export 'dart:async';
-export 'package:flutter/services.dart';
export 'dart:io';
-export 'package:dim/dim.dart';
+export 'dart:ui';
+
export 'package:cached_network_image/cached_network_image.dart';
-export 'package:connectivity/connectivity.dart';
+export 'package:flutter/services.dart';
+export 'package:wechat_flutter/tools/config/api.dart';
+export 'package:wechat_flutter/tools/theme/const.dart';
+export 'package:wechat_flutter/tools/theme/contacts.dart';
+export 'package:wechat_flutter/tools/config/strings.dart';
+export 'package:wechat_flutter/tools/http/req.dart';
+export 'package:wechat_flutter/tools/commom/check.dart';
+export 'package:wechat_flutter/tools/commom/ui.dart';
+export 'package:wechat_flutter/tools/data/data.dart';
+export 'package:wechat_flutter/tools/func/shared_util.dart';
export 'package:wechat_flutter/ui/bar/commom_bar.dart';
-export 'package:wechat_flutter/config/const.dart';
export 'package:wechat_flutter/ui/button/commom_button.dart';
-export 'package:wechat_flutter/generated/i18n.dart';
export 'package:wechat_flutter/ui/dialog/show_snack.dart';
-export 'package:wechat_flutter/ui/dialog/show_toast.dart';
-export 'package:wechat_flutter/ui/view/main_input.dart';
-export 'package:wechat_flutter/config/contacts.dart';
-export 'package:wechat_flutter/config/strings.dart';
-export 'package:wechat_flutter/tools/shared_util.dart';
-export 'package:wechat_flutter/ui/web/web_view.dart';
-export 'package:wechat_flutter/ui/view/loading_view.dart';
export 'package:wechat_flutter/ui/view/image_view.dart';
-export 'package:wechat_flutter/config/api.dart';
-export 'package:wechat_flutter/http/req.dart';
-export 'package:wechat_flutter/tools/data/data.dart';
+export 'package:wechat_flutter/ui/view/loading_view.dart';
+export 'package:wechat_flutter/ui/view/main_input.dart';
export 'package:wechat_flutter/ui/view/null_view.dart';
-import 'dart:ui';
-
-import 'package:connectivity/connectivity.dart';
-import 'package:dim/dim.dart';
-import 'package:flutter_cache_manager/flutter_cache_manager.dart';
-
-Dim im = new Dim();
+export 'package:wechat_flutter/ui/web/web_view.dart';
+export 'package:wechat_flutter/tools/ui/fram_size.dart';
+export 'package:wechat_flutter/tools/func/log.dart';
+export 'package:wechat_flutter/tools/ui/q1_toast.dart';
+export 'package:wechat_flutter/tools/config/keys.dart';
+export 'package:wechat_flutter/tools/theme/my_theme.dart';
+export 'package:wechat_flutter/tools/data/notice.dart';
+export 'package:connectivity_plus/connectivity_plus.dart';
+export 'package:get/get.dart'
+ hide HeaderValue, Response, MultipartFile, FormData;
+export 'package:wechat_flutter/tools/config/app_config.dart';
+export 'package:wechat_flutter/routes/app_pages.dart';
+export 'package:wechat_flutter/im/im_handle/Im_api.dart';
+export 'package:wechat_flutter/tools/eventbus/msg_bus.dart';
+export 'package:tencent_im_sdk_plugin/models/v2_tim_message.dart';
+export 'package:tencent_im_sdk_plugin/models/v2_tim_value_callback.dart';
+export 'package:wechat_flutter/im/im_handle/im_msg_api.dart';
var subscription = Connectivity();
typedef Callback(data);
+typedef VoidCallbackConfirm = void Function(bool isOk);
DefaultCacheManager cacheManager = new DefaultCacheManager();
-const String defGroupAvatar =
- 'http://www.flutterj.com/content/uploadfile/zidingyi/g.png';
+const String defGroupAvatar = 'http://www.shenmeniuma.com/mockImg/group.png';
const Color mainBGColor = Color.fromRGBO(240, 240, 245, 1.0);
diff --git a/lib/ui/bar/commom_bar.dart b/lib/ui/bar/commom_bar.dart
index b906dd9..6becbe9 100755
--- a/lib/ui/bar/commom_bar.dart
+++ b/lib/ui/bar/commom_bar.dart
@@ -1,6 +1,7 @@
-import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
-import 'package:wechat_flutter/config/const.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:wechat_flutter/tools/theme/const.dart';
class ComMomBar extends StatelessWidget implements PreferredSizeWidget {
const ComMomBar(
@@ -11,25 +12,27 @@ class ComMomBar extends StatelessWidget implements PreferredSizeWidget {
this.mainColor = Colors.black,
this.titleW,
this.bottom,
+ this.showPop,
this.leadingImg = '',
this.leadingW});
- final String title;
+ final String? title;
final bool showShadow;
- final List<Widget> rightDMActions;
+ final bool? showPop;
+ final List<Widget>? rightDMActions;
final Color backgroundColor;
final Color mainColor;
- final Widget titleW;
- final Widget leadingW;
- final PreferredSizeWidget bottom;
+ final Widget? titleW;
+ final Widget? leadingW;
+ final PreferredSizeWidget? bottom;
final String leadingImg;
@override
Size get preferredSize => new Size(100, 50);
- Widget leading(BuildContext context) {
+ Widget? leading(BuildContext context) {
final bool isShow = Navigator.canPop(context);
- if (isShow) {
+ if (isShow && (showPop ?? true)) {
return new InkWell(
child: new Container(
width: 15,
@@ -61,39 +64,37 @@ class ComMomBar extends StatelessWidget implements PreferredSizeWidget {
child: new AppBar(
title: titleW == null
? new Text(
- title,
+ title!,
style: new TextStyle(
color: mainColor,
fontSize: 17.0,
- fontWeight: FontWeight.w600),
+ fontWeight: FontWeight.w500),
)
: titleW,
backgroundColor: mainColor,
elevation: 0.0,
- brightness: Brightness.light,
leading: leadingW ?? leading(context),
centerTitle: true,
actions: rightDMActions ?? [new Center()],
- bottom: bottom != null ? bottom : null,
+ bottom: bottom != null ? bottom : null, systemOverlayStyle: SystemUiOverlayStyle.dark,
),
)
: new AppBar(
title: titleW == null
? new Text(
- title,
+ title!,
style: new TextStyle(
color: mainColor,
fontSize: 17.0,
- fontWeight: FontWeight.w600),
+ fontWeight: FontWeight.w500),
)
: titleW,
backgroundColor: backgroundColor,
elevation: 0.0,
- brightness: Brightness.light,
leading: leadingW ?? leading(context),
- centerTitle: false,
+ centerTitle: true,
bottom: bottom != null ? bottom : null,
- actions: rightDMActions ?? [new Center()],
+ actions: rightDMActions ?? [new Center()], systemOverlayStyle: SystemUiOverlayStyle.dark,
);
}
}
diff --git a/lib/ui/button/commom_button.dart b/lib/ui/button/commom_button.dart
index 33a8a68..dd60baa 100644
--- a/lib/ui/button/commom_button.dart
+++ b/lib/ui/button/commom_button.dart
@@ -1,16 +1,16 @@
import 'package:flutter/material.dart';
class ComMomButton extends StatelessWidget {
- final double width;
+ final double? width;
final double height;
- final List<BoxShadow> boxShadow;
+ final List<BoxShadow>? boxShadow;
final double radius;
final String text;
- final VoidCallback onTap;
+ final VoidCallback? onTap;
final EdgeInsetsGeometry padding;
- final EdgeInsetsGeometry margin;
- final TextStyle style;
- final Color color;
+ final EdgeInsetsGeometry? margin;
+ final TextStyle? style;
+ final Color? color;
final bool isBorder;
final int borderColor;
final Gradient gradient;
diff --git a/lib/ui/call/select_call_type_dialog.dart b/lib/ui/call/select_call_type_dialog.dart
new file mode 100644
index 0000000..76f11ee
--- /dev/null
+++ b/lib/ui/call/select_call_type_dialog.dart
@@ -0,0 +1,75 @@
+import 'package:flutter/material.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+Future<int?> selectCallTypeDialog(BuildContext context) async {
+ final List _pickerSheetList = ["视频通话", '语音通话', '取消'];
+
+ return showModalBottomSheet(
+ backgroundColor: Colors.transparent,
+ context: context,
+ builder: (context) {
+ return SelectCallTypeDialog(titleList: _pickerSheetList);
+ });
+}
+
+/// 底部弹出框
+class SelectCallTypeDialog extends StatefulWidget {
+ final List? titleList;
+
+ const SelectCallTypeDialog({Key? key, this.titleList}) : super(key: key);
+
+ @override
+ SelectCallTypeDialogState createState() => SelectCallTypeDialogState();
+}
+
+typedef OnItemClickListener = void Function(int index);
+
+class SelectCallTypeDialogState extends State<SelectCallTypeDialog> {
+ double? itemHeight = FrameSize.px(44);
+ double? speedH = FrameSize.px(10);
+
+ @override
+ void initState() {
+ super.initState();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return SafeArea(
+ child: SizedBox(
+ height: itemHeight! * 3 + speedH! + 2,
+ child: Column(children: [
+ _sheetItem(0, FrameSize.px(10)),
+ Container(height: FrameSize.px(1), color: const Color(0xFFF3F3F3)),
+ _sheetItem(1, 0),
+ Container(height: FrameSize.px(10), color: const Color(0xFFF3F3F3)),
+ _sheetItem(2, 0),
+ ]),
+ ),
+ );
+ }
+
+ Widget _sheetItem(int index, double radius) {
+ return Container(
+ height: itemHeight,
+ width: FrameSize.screenW(),
+ decoration: BoxDecoration(
+ borderRadius: BorderRadius.only(
+ topLeft: Radius.circular(radius),
+ topRight: Radius.circular(radius)),
+ color: Colors.white,
+ ),
+ child: MaterialButton(
+ onPressed: () {
+ if (index != 2) {
+ Get.back(result: index);
+ }
+ },
+ child: Text(
+ widget.titleList![index],
+ style: const TextStyle(color: Colors.black),
+ ),
+ ),
+ );
+ }
+}
diff --git a/lib/ui/card/more_item_card.dart b/lib/ui/card/more_item_card.dart
index e1fd0ca..aeda146 100644
--- a/lib/ui/card/more_item_card.dart
+++ b/lib/ui/card/more_item_card.dart
@@ -4,21 +4,21 @@ import 'package:flutter/material.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
class MoreItemCard extends StatelessWidget {
- final String name, icon;
- final VoidCallback onPressed;
- final double keyboardHeight;
+ final String? name, icon;
+ final VoidCallback? onPressed;
+ final double? keyboardHeight;
MoreItemCard({this.name, this.icon, this.onPressed, this.keyboardHeight});
@override
Widget build(BuildContext context) {
- double _margin =
+ double? _margin =
keyboardHeight != null && keyboardHeight != 0.0 ? keyboardHeight : 0.0;
- double _top = _margin != 0.0 ? _margin / 10 : 20.0;
+ double _top = _margin != 0.0 ? _margin! / 10 : 20.0;
return new Container(
padding: EdgeInsets.only(top: _top, bottom: 5.0),
- width: (winWidth(context) - 70) / 4,
+ width: (FrameSize.winWidth() - 70) / 4,
child: new Column(
children: <Widget>[
new Container(
@@ -28,22 +28,26 @@ class MoreItemCard extends StatelessWidget {
Radius.circular(10.0),
),
),
- child: new FlatButton(
+ child: new TextButton(
onPressed: () {
if (onPressed != null) {
- onPressed();
+ onPressed!();
}
},
- shape: RoundedRectangleBorder(
- borderRadius: BorderRadius.all(
- Radius.circular(10.0),
+ style: ButtonStyle(
+ backgroundColor: MaterialStateProperty.all(Colors.white),
+ shape: MaterialStateProperty.all(
+ RoundedRectangleBorder(
+ borderRadius: BorderRadius.all(
+ Radius.circular(10.0),
+ ),
+ ),
),
+ padding: MaterialStateProperty.all(EdgeInsets.all(0)),
),
- padding: EdgeInsets.all(0),
- color: Colors.white,
child: new Container(
width: 50.0,
- child: new Image.asset(icon, fit: BoxFit.cover),
+ child: new Image.asset(icon!, fit: BoxFit.cover),
),
),
),
diff --git a/lib/ui/card/set_item.dart b/lib/ui/card/set_item.dart
new file mode 100644
index 0000000..af3ca1d
--- /dev/null
+++ b/lib/ui/card/set_item.dart
@@ -0,0 +1,89 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:wechat_flutter/tools/commom/check.dart';
+
+class SetItem extends StatelessWidget {
+ final GestureTapCallback? onTap;
+ final bool? isBorder;
+ final String? text;
+ final String? bottomText;
+ final String? subText;
+ final Widget? rWidget;
+
+ SetItem({
+ this.onTap,
+ this.isBorder,
+ this.text,
+ this.bottomText,
+ this.subText,
+ this.rWidget,
+ });
+
+ @override
+ Widget build(BuildContext context) {
+ return Material(
+ color: Colors.white,
+ child: InkWell(
+ onTap: onTap,
+ child: Container(
+ width: double.infinity,
+ padding: EdgeInsets.symmetric(vertical: rWidget == null ? 15 : 10),
+ margin: EdgeInsets.only(left: 15),
+ decoration: BoxDecoration(
+ border: Border(
+ bottom: BorderSide(
+ color: Colors.grey.withOpacity(isBorder! ? 0 : 0.2),
+ ),
+ ),
+ ),
+ child: Row(
+ children: [
+ Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Text(
+ text!,
+ style: TextStyle(
+ fontSize: 15,
+ ),
+ ),
+ if (strNoEmpty(bottomText))
+ Padding(
+ padding: EdgeInsets.only(top: 5),
+ child: Text(
+ bottomText!,
+ style: TextStyle(
+ fontSize: 12,
+ color: Colors.grey,
+ ),
+ ),
+ ),
+ ],
+ ),
+ Spacer(),
+ if (strNoEmpty(subText))
+ Container(
+ margin: EdgeInsets.only(right: 5),
+ child: Text(
+ subText!,
+ style: TextStyle(color: Colors.grey, fontSize: 15),
+ ),
+ ),
+ if (rWidget != null)
+ rWidget!
+ else
+ Container(
+ margin: EdgeInsets.only(right: 15),
+ child: Icon(
+ CupertinoIcons.right_chevron,
+ size: 18,
+ color: Colors.grey,
+ ),
+ ),
+ ],
+ ),
+ ),
+ ),
+ );
+ }
+}
diff --git a/lib/ui/chat/chat_details_body.dart b/lib/ui/chat/chat_details_body.dart
index f5bb461..928e4bf 100644
--- a/lib/ui/chat/chat_details_body.dart
+++ b/lib/ui/chat/chat_details_body.dart
@@ -1,12 +1,12 @@
-import 'package:wechat_flutter/im/model/chat_data.dart';
-import 'package:wechat_flutter/ui/massage/wait1.dart';
-import 'package:wechat_flutter/ui/view/indicator_page_view.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_message.dart';
+import 'package:wechat_flutter/ui/massage/wait1.dart';
+import 'package:wechat_flutter/ui/view/indicator_page_view.dart';
class ChatDetailsBody extends StatelessWidget {
- final ScrollController sC;
- final List<ChatData> chatData;
+ final ScrollController? sC;
+ final List<V2TimMessage>? chatData;
ChatDetailsBody({this.sC, this.chatData});
@@ -20,10 +20,10 @@ class ChatDetailsBody extends StatelessWidget {
padding: EdgeInsets.all(8.0),
reverse: true,
itemBuilder: (context, int index) {
- ChatData model = chatData[index];
+ V2TimMessage model = chatData![index];
return new SendMessageView(model);
},
- itemCount: chatData.length,
+ itemCount: chatData!.length,
dragStartBehavior: DragStartBehavior.down,
),
),
diff --git a/lib/ui/chat/chat_details_row.dart b/lib/ui/chat/chat_details_row.dart
index 0fc0189..1cb2678 100644
--- a/lib/ui/chat/chat_details_row.dart
+++ b/lib/ui/chat/chat_details_row.dart
@@ -1,17 +1,16 @@
-import 'package:wechat_flutter/config/contacts.dart';
-import 'package:wechat_flutter/im/message_handle.dart';
+import 'package:flutter/material.dart';
+import 'package:wechat_flutter/tools/config/q1_config.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
import 'package:wechat_flutter/ui/item/chat_voice.dart';
-import 'package:flutter/material.dart';
class ChatDetailsRow extends StatefulWidget {
- final GestureTapCallback voiceOnTap;
- final bool isVoice;
- final LayoutWidgetBuilder edit;
- final VoidCallback onEmojio;
- final Widget more;
- final String id;
- final int type;
+ final GestureTapCallback? voiceOnTap;
+ final bool? isVoice;
+ final LayoutWidgetBuilder? edit;
+ final VoidCallback? onEmojio;
+ final Widget? more;
+ final String? id;
+ final int? type;
ChatDetailsRow({
this.voiceOnTap,
@@ -27,7 +26,7 @@ class ChatDetailsRow extends StatefulWidget {
}
class ChatDetailsRowState extends State<ChatDetailsRow> {
- String path;
+ String? path;
@override
void initState() {
@@ -36,41 +35,39 @@ class ChatDetailsRowState extends State<ChatDetailsRow> {
Notice.addListener(WeChatActions.voiceImg(), (v) {
if (!v) return;
if (!strNoEmpty(path)) return;
- sendSoundMessages(
- widget.id,
- path,
- 2,
- widget.type,
- (value) => Notice.send(WeChatActions.msg(), v ?? ''),
- );
+ // sendSoundMessages(
+ // widget.id,
+ // path,
+ // 2,
+ // widget.type,
+ // (value) => Notice.send(WeChatActions.msg(), v ?? ''),
+ // );
});
}
@override
Widget build(BuildContext context) {
return new GestureDetector(
- child: new Container(
- height: 50.0,
+ child: new Container(
+ height: Q1Config.chatRowHeight,
padding: EdgeInsets.symmetric(horizontal: 8.0),
decoration: BoxDecoration(
- color: Color(AppColors.ChatBoxBg),
border: Border(
top: BorderSide(color: lineColor, width: Constants.DividerWidth),
- bottom: BorderSide(color: lineColor, width: Constants.DividerWidth),
),
),
child: new Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
- new InkWell(
- child: new Image.asset('assets/images/chat/ic_voice.webp',
- width: 25, color: mainTextColor),
- onTap: () {
- if (widget.voiceOnTap != null) {
- widget.voiceOnTap();
- }
- },
- ),
+ // new InkWell(
+ // child: new Image.asset('assets/images/chat/ic_voice.webp',
+ // width: 25, color: mainTextColor),
+ // onTap: () {
+ // if (widget.voiceOnTap != null) {
+ // widget.voiceOnTap();
+ // }
+ // },
+ // ),
new Expanded(
child: new Container(
margin: const EdgeInsets.only(
@@ -78,28 +75,27 @@ class ChatDetailsRowState extends State<ChatDetailsRow> {
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(5.0)),
- child: widget.isVoice
+ child: widget.isVoice!
? new ChatVoice(
- voiceFile: (path) {
- setState(() => this.path = path);
- },
- )
- : new LayoutBuilder(builder: widget.edit),
+ voiceFile: (path) {
+ setState(() => this.path = path);
+ },
+ )
+ : new LayoutBuilder(builder: widget.edit!),
),
),
new InkWell(
child: new Image.asset('assets/images/chat/ic_Emotion.webp',
width: 30, fit: BoxFit.cover),
onTap: () {
- widget.onEmojio();
+ widget.onEmojio!();
},
),
- widget.more,
+ widget.more!,
],
),
),
onTap: () {},
);
}
-
}
diff --git a/lib/ui/chat/my_conversation_view.dart b/lib/ui/chat/my_conversation_view.dart
index a90fe97..6252f18 100644
--- a/lib/ui/chat/my_conversation_view.dart
+++ b/lib/ui/chat/my_conversation_view.dart
@@ -1,12 +1,13 @@
-import 'package:wechat_flutter/ui/message_view/content_msg.dart';
import 'package:flutter/material.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_message.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
+import 'package:wechat_flutter/ui/message_view/content_msg.dart';
class MyConversationView extends StatefulWidget {
- final String imageUrl;
- final String title;
- final Map content;
- final Widget time;
+ final String? imageUrl;
+ final String? title;
+ final V2TimMessage? content;
+ final Widget? time;
final bool isBorder;
MyConversationView({
@@ -36,14 +37,14 @@ class _MyConversationViewState extends State<MyConversationView> {
style: TextStyle(fontSize: 17.0, fontWeight: FontWeight.normal),
),
new SizedBox(height: 2.0),
- new ContentMsg(widget?.content),
+ new ContentMsg(widget.content),
],
),
),
new Space(width: mainSpace),
new Column(
children: [
- widget.time,
+ widget.time!,
new Icon(Icons.flag, color: Colors.transparent),
],
)
@@ -63,7 +64,7 @@ class _MyConversationViewState extends State<MyConversationView> {
fit: BoxFit.cover),
new Container(
padding: EdgeInsets.only(right: 18.0, top: 12.0, bottom: 12.0),
- width: winWidth(context) - 68,
+ width: FrameSize.winWidth() - 68,
decoration: BoxDecoration(
border: widget.isBorder
? Border(
diff --git a/lib/ui/dialog/code_dialog.dart b/lib/ui/dialog/code_dialog.dart
index bd16a4a..cf05ffc 100644
--- a/lib/ui/dialog/code_dialog.dart
+++ b/lib/ui/dialog/code_dialog.dart
@@ -2,10 +2,10 @@ import 'package:flutter/material.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
-codeDialog(BuildContext context, List items) {
+Future<String?> codeDialog(BuildContext context, List items) {
Widget item(item) {
return new Container(
- width: winWidth(context),
+ width: FrameSize.winWidth(),
decoration: BoxDecoration(
border: item != '重置二维码'
? Border(
@@ -13,19 +13,21 @@ codeDialog(BuildContext context, List items) {
)
: null,
),
- child: new FlatButton(
- color: Colors.white,
- padding: EdgeInsets.symmetric(vertical: 15.0),
+ child: new TextButton(
+ style: ButtonStyle(
+ backgroundColor: MaterialStateProperty.all(Colors.white),
+ padding:
+ MaterialStateProperty.all(EdgeInsets.symmetric(vertical: 15.0)),
+ ),
onPressed: () {
- Navigator.of(context).pop();
- showToast(context, '$item正在开发中');
+ Navigator.of(context).pop(item);
},
child: new Text(item),
),
);
}
- showModalBottomSheet(
+ return showModalBottomSheet(
context: context,
builder: (context) {
return new Center(
@@ -49,12 +51,16 @@ codeDialog(BuildContext context, List items) {
children: <Widget>[
new Column(children: items.map(item).toList()),
new HorizontalLine(color: appBarColor, height: 10.0),
- new FlatButton(
- padding: EdgeInsets.symmetric(vertical: 15.0),
- color: Colors.white,
+ new TextButton(
+ style: ButtonStyle(
+ backgroundColor:
+ MaterialStateProperty.all(Colors.white),
+ padding: MaterialStateProperty.all(
+ EdgeInsets.symmetric(vertical: 15.0)),
+ ),
onPressed: () => Navigator.of(context).pop(),
child: new Container(
- width: winWidth(context),
+ width: FrameSize.winWidth(),
alignment: Alignment.center,
child: new Text('取消'),
),
diff --git a/lib/ui/dialog/confirm_alert.dart b/lib/ui/dialog/confirm_alert.dart
index cb05425..b273c79 100644
--- a/lib/ui/dialog/confirm_alert.dart
+++ b/lib/ui/dialog/confirm_alert.dart
@@ -1,3 +1,4 @@
+import 'package:wechat_flutter/tools/commom/check.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
import 'package:flutter/material.dart';
import 'package:wechat_flutter/ui/flutter/my_cupertino_dialog.dart';
@@ -5,14 +6,14 @@ import 'package:wechat_flutter/ui/flutter/my_cupertino_dialog.dart';
void confirmAlert<T>(
BuildContext context,
VoidCallbackConfirm callBack, {
- int type,
- String tips,
- String okBtn,
- String cancelBtn,
- TextStyle okBtnStyle,
- TextStyle style,
+ int? type,
+ String? tips,
+ String? okBtn,
+ String? cancelBtn,
+ TextStyle? okBtnStyle,
+ TextStyle? style,
bool isWarm = false,
- String warmStr,
+ String? warmStr,
}) {
showDialog<T>(
context: context,
@@ -76,5 +77,5 @@ void confirmAlert<T>(
],
);
},
- ).then<void>((T value) {});
+ ).then<void>((T? value) {});
}
diff --git a/lib/ui/dialog/friend_item_dialog.dart b/lib/ui/dialog/friend_item_dialog.dart
index 10eed02..5df827c 100644
--- a/lib/ui/dialog/friend_item_dialog.dart
+++ b/lib/ui/dialog/friend_item_dialog.dart
@@ -1,18 +1,16 @@
-import 'package:wechat_flutter/im/friend_handle.dart';
import 'package:flutter/material.dart';
-
import 'package:wechat_flutter/tools/wechat_flutter.dart';
import 'confirm_alert.dart';
-friendItemDialog(BuildContext context, {String userId, OnSuCc suCc}) {
+friendItemDialog(BuildContext context, {String? userId}) {
action(v) {
Navigator.of(context).pop();
if (v == '删除') {
confirmAlert(
context,
(bool) {
- if (bool) delFriend(userId, context, suCc: (v) => suCc(v));
+ if (bool) {}
},
tips: '你确定要删除此联系人吗',
okBtn: '删除',
@@ -21,13 +19,13 @@ friendItemDialog(BuildContext context, {String userId, OnSuCc suCc}) {
style: TextStyle(fontWeight: FontWeight.w500),
);
} else {
- showToast(context, '删除功能是好的');
+ q1Toast('删除功能是好的');
}
}
Widget item(item) {
return new Container(
- width: winWidth(context),
+ width: FrameSize.winWidth(),
decoration: BoxDecoration(
border: item != '删除'
? Border(
@@ -35,9 +33,11 @@ friendItemDialog(BuildContext context, {String userId, OnSuCc suCc}) {
)
: null,
),
- child: new FlatButton(
- color: Colors.white,
- padding: EdgeInsets.symmetric(vertical: 15.0),
+ child: new TextButton(
+ style: ButtonStyle(
+ backgroundColor: MaterialStateProperty.all(Colors.white),
+ padding: MaterialStateProperty.all(EdgeInsets.symmetric(vertical: 15.0)),
+ ),
onPressed: () => action(item),
child: new Text(item),
),
@@ -80,12 +80,16 @@ friendItemDialog(BuildContext context, {String userId, OnSuCc suCc}) {
children: <Widget>[
new Column(children: data.map(item).toList()),
new HorizontalLine(color: appBarColor, height: 10.0),
- new FlatButton(
- padding: EdgeInsets.symmetric(vertical: 15.0),
- color: Colors.white,
+ new TextButton(
+ style: ButtonStyle(
+ backgroundColor:
+ MaterialStateProperty.all(Colors.white),
+ padding: MaterialStateProperty.all(
+ EdgeInsets.symmetric(vertical: 15.0)),
+ ),
onPressed: () => Navigator.of(context).pop(),
child: new Container(
- width: winWidth(context),
+ width: FrameSize.winWidth(),
alignment: Alignment.center,
child: new Text('取消'),
),
diff --git a/lib/ui/dialog/show_snack.dart b/lib/ui/dialog/show_snack.dart
index 07c0399..b0985d5 100755
--- a/lib/ui/dialog/show_snack.dart
+++ b/lib/ui/dialog/show_snack.dart
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
showSnack(BuildContext context, text) {
- Scaffold.of(context).showSnackBar(
+ ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: new Text('$text')),
);
}
diff --git a/lib/ui/dialog/show_toast.dart b/lib/ui/dialog/show_toast.dart
deleted file mode 100755
index a8dcbea..0000000
--- a/lib/ui/dialog/show_toast.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-import 'package:flutter/material.dart';
-
-import 'package:toast/toast.dart';
-
-showToast(BuildContext context, String msg, {int duration = 1, int gravity}) {
- Toast.show(msg, context, duration: duration, gravity: gravity);
-}
diff --git a/lib/ui/dialog/update_dialog.dart b/lib/ui/dialog/update_dialog.dart
index 1a6c275..8afcd29 100644
--- a/lib/ui/dialog/update_dialog.dart
+++ b/lib/ui/dialog/update_dialog.dart
@@ -8,9 +8,9 @@ import 'package:url_launcher/url_launcher.dart';
import 'package:open_file/open_file.dart';
class UpdateDialog extends StatefulWidget {
- final String version;
- final String updateInfo;
- final String updateUrl;
+ final String? version;
+ final String? updateInfo;
+ final String? updateUrl;
final bool isForce;
UpdateDialog({
@@ -26,7 +26,7 @@ class UpdateDialog extends StatefulWidget {
class UpdateDialogState extends State<UpdateDialog> {
int _downloadProgress = 0;
- CancelToken token;
+ CancelToken? token;
UploadingFlag uploadingFlag = UploadingFlag.idle;
@override
@@ -68,11 +68,11 @@ class UpdateDialogState extends State<UpdateDialog> {
flex: 2,
child: Row(
children: <Widget>[
- new Space(width: (winWidth(context) - 40) / 2),
+ new Space(width: (FrameSize.winWidth() - 40) / 2),
!widget.isForce
? Expanded(
flex: 1,
- child: FlatButton(
+ child: TextButton(
onPressed: () {
Navigator.of(context).pop();
},
@@ -85,7 +85,7 @@ class UpdateDialogState extends State<UpdateDialog> {
: SizedBox(),
Expanded(
flex: 1,
- child: FlatButton(
+ child: TextButton(
onPressed: () async {
if (uploadingFlag == UploadingFlag.uploading) return;
uploadingFlag = UploadingFlag.uploading;
@@ -111,10 +111,10 @@ class UpdateDialogState extends State<UpdateDialog> {
}
void _androidUpdate() async {
- final apkPath = await FileUtil.getInstance().getSavePath("/Download/");
+ final apkPath = await FileUtil.getInstance()!.getSavePath("/Download/");
try {
- await Req.getInstance().client.download(
- widget.updateUrl,
+ await Req.getInstance()!.client!.download(
+ widget.updateUrl!,
apkPath + "wechat_flutter.apk",
cancelToken: token,
onReceiveProgress: (int count, int total) {
@@ -216,7 +216,7 @@ class UpdateDialogState extends State<UpdateDialog> {
}
void _iosUpdate() {
- launch(widget.updateUrl);
+ launch(widget.updateUrl!);
}
@override
@@ -227,7 +227,7 @@ class UpdateDialogState extends State<UpdateDialog> {
@override
void dispose() {
- if (!token.isCancelled) token?.cancel();
+ if (!token!.isCancelled) token?.cancel();
super.dispose();
debugPrint("升级销毁");
}
diff --git a/lib/ui/dialog/voice_dialog.dart b/lib/ui/dialog/voice_dialog.dart
index 5e90926..a8a947b 100644
--- a/lib/ui/dialog/voice_dialog.dart
+++ b/lib/ui/dialog/voice_dialog.dart
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
-showVoiceDialog(BuildContext context, {int index}) {
+showVoiceDialog(BuildContext context, {int? index}) {
OverlayEntry overlayEntry = new OverlayEntry(builder: (content) {
return Positioned(
top: MediaQuery.of(context).size.height * 0.5 - 80,
@@ -8,13 +8,13 @@ showVoiceDialog(BuildContext context, {int index}) {
child: new VoiceDialog(index),
);
});
- Overlay.of(context).insert(overlayEntry);
+ Overlay.of(context)!.insert(overlayEntry);
return overlayEntry;
}
class VoiceDialog extends StatefulWidget {
- final int index;
+ final int? index;
VoiceDialog(this.index);
@@ -25,10 +25,10 @@ class VoiceDialog extends StatefulWidget {
class _VoiceDialogState extends State<VoiceDialog> {
@override
Widget build(BuildContext context) {
- int index = widget.index;
+ int? index = widget.index;
String icon() {
- if (index > 0 && index <= 16) {
+ if (index! > 0 && index <= 16) {
return 'assets/images/chat/voice_volume_2.webp';
} else if (16 < index && index <= 32) {
return 'assets/images/chat/voice_volume_3.webp';
diff --git a/lib/ui/edit/emoji_text.dart b/lib/ui/edit/emoji_text.dart
index 8bd8b3a..53626d6 100644
--- a/lib/ui/edit/emoji_text.dart
+++ b/lib/ui/edit/emoji_text.dart
@@ -4,14 +4,14 @@ import 'package:flutter/material.dart';
///emoji/image text
class EmojiText extends SpecialText {
static const String flag = "[";
- final int start;
- EmojiText(TextStyle textStyle, {this.start})
+ final int? start;
+ EmojiText(TextStyle? textStyle, {this.start})
: super(EmojiText.flag, "]", textStyle);
@override
InlineSpan finishText() {
var key = toString();
- if (EmojiUitl.instance.emojiMap.containsKey(key)) {
+ if (EmojiUitl.instance!.emojiMap.containsKey(key)) {
//fontsize id define image height
//size = 30.0/26.0 * fontSize
final double size = 20.0;
@@ -19,11 +19,11 @@ class EmojiText extends SpecialText {
///fontSize 26 and text height =30.0
//final double fontSize = 26.0;
- return ImageSpan(AssetImage(EmojiUitl.instance.emojiMap[key]),
+ return ImageSpan(AssetImage(EmojiUitl.instance!.emojiMap[key]!),
actualText: key,
imageWidth: size,
imageHeight: size,
- start: start,
+ start: start!,
fit: BoxFit.fill,
margin: EdgeInsets.only(left: 2.0, right: 2.0));
}
@@ -39,8 +39,8 @@ class EmojiUitl {
final String _emojiFilePath = "assets/images/emoji";
- static EmojiUitl _instance;
- static EmojiUitl get instance {
+ static EmojiUitl? _instance;
+ static EmojiUitl? get instance {
if (_instance == null) _instance = new EmojiUitl._();
return _instance;
}
diff --git a/lib/ui/edit/image_text.dart b/lib/ui/edit/image_text.dart
index e83330d..2235ebe 100644
--- a/lib/ui/edit/image_text.dart
+++ b/lib/ui/edit/image_text.dart
@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
///emoji/image text
class EmojiText extends SpecialText {
static const String flag = "[";
- final int start;
+ final int? start;
EmojiText(TextStyle textStyle, {this.start})
: super(EmojiText.flag, "]", textStyle);
@@ -12,7 +12,7 @@ class EmojiText extends SpecialText {
@override
InlineSpan finishText() {
var key = toString();
- if (EmojiUitl.instance.emojiMap.containsKey(key)) {
+ if (EmojiUitl.instance!.emojiMap.containsKey(key)) {
//fontsize id define image height
//size = 30.0/26.0 * fontSize
final double size = 20.0;
@@ -20,11 +20,11 @@ class EmojiText extends SpecialText {
///fontSize 26 and text height =30.0
//final double fontSize = 26.0;
- return ImageSpan(AssetImage(EmojiUitl.instance.emojiMap[key]),
+ return ImageSpan(AssetImage(EmojiUitl.instance!.emojiMap[key]!),
actualText: key,
imageWidth: size,
imageHeight: size,
- start: start,
+ start: start!,
fit: BoxFit.fill,
margin: EdgeInsets.only(left: 2.0, right: 2.0));
}
@@ -40,9 +40,9 @@ class EmojiUitl {
final String _emojiFilePath = "assets";
- static EmojiUitl _instance;
+ static EmojiUitl? _instance;
- static EmojiUitl get instance {
+ static EmojiUitl? get instance {
if (_instance == null) _instance = new EmojiUitl._();
return _instance;
}
diff --git a/lib/ui/edit/text_span_builder.dart b/lib/ui/edit/text_span_builder.dart
index d5080f3..b5fc7d8 100644
--- a/lib/ui/edit/text_span_builder.dart
+++ b/lib/ui/edit/text_span_builder.dart
@@ -10,23 +10,23 @@ class TextSpanBuilder extends SpecialTextSpanBuilder {
});
@override
- TextSpan build(String data, {TextStyle textStyle, onTap}) {
+ TextSpan build(String data, {TextStyle? textStyle, onTap}) {
TextSpan result = super.build(data, textStyle: textStyle, onTap: onTap);
return result;
}
@override
- SpecialText createSpecialText(String flag,
- {TextStyle textStyle, SpecialTextGestureTapCallback onTap, int index}) {
+ SpecialText? createSpecialText(String flag,
+ {TextStyle? textStyle, SpecialTextGestureTapCallback? onTap, int? index}) {
if (flag == null || flag == "") return null;
if (isStart(flag, EmojiText.flag)) {
- return EmojiText(textStyle, start: index - (EmojiText.flag.length - 1));
+ return EmojiText(textStyle, start: index! - (EmojiText.flag.length - 1));
}
return null;
}
}
class SpecialTextStyle {
- TextRange textRange;
+ TextRange? textRange;
}
diff --git a/lib/ui/flutter/my_cupertino_dialog.dart b/lib/ui/flutter/my_cupertino_dialog.dart
index 8aaeda3..71e6edf 100644
--- a/lib/ui/flutter/my_cupertino_dialog.dart
+++ b/lib/ui/flutter/my_cupertino_dialog.dart
@@ -8,7 +8,6 @@ import 'dart:ui' show ImageFilter;
import 'package:flutter/cupertino.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/rendering.dart';
-import 'package:flutter/widgets.dart';
// TODO(abarth): These constants probably belong somewhere more general.
@@ -86,7 +85,7 @@ const double _kMaxRegularTextScaleFactor = 1.4;
// user has selected.
bool _isInAccessibilityMode(BuildContext context) {
final MediaQueryData data = MediaQuery.of(context);
- return data != null && data.textScaleFactor > _kMaxRegularTextScaleFactor;
+ return data.textScaleFactor > _kMaxRegularTextScaleFactor;
}
/// An iOS-style alert dialog.
@@ -119,7 +118,7 @@ class MyCupertinoAlertDialog extends StatelessWidget {
///
/// The [actions] must not be null.
const MyCupertinoAlertDialog({
- Key key,
+ Key? key,
this.title,
this.content,
this.actions = const <Widget>[],
@@ -127,20 +126,19 @@ class MyCupertinoAlertDialog extends StatelessWidget {
this.actionScrollController,
this.insetAnimationDuration = const Duration(milliseconds: 100),
this.insetAnimationCurve = Curves.decelerate,
- }) : assert(actions != null),
- super(key: key);
+ }) : super(key: key);
/// The (optional) title of the dialog is displayed in a large font at the top
/// of the dialog.
///
/// Typically a [Text] widget.
- final Widget title;
+ final Widget? title;
/// The (optional) content of the dialog is displayed in the center of the
/// dialog in a lighter font.
///
/// Typically a [Text] widget.
- final Widget content;
+ final Widget? content;
/// The (optional) set of actions that are displayed at the bottom of the
/// dialog.
@@ -158,7 +156,7 @@ class MyCupertinoAlertDialog extends StatelessWidget {
///
/// * [actionScrollController], which can be used for controlling the actions
/// section when there are many actions.
- final ScrollController scrollController;
+ final ScrollController? scrollController;
/// A scroll controller that can be used to control the scrolling of the
/// actions in the dialog.
@@ -169,7 +167,7 @@ class MyCupertinoAlertDialog extends StatelessWidget {
///
/// * [scrollController], which can be used for controlling the [content]
/// section when it is long.
- final ScrollController actionScrollController;
+ final ScrollController? actionScrollController;
/// {@macro flutter.material.dialog.insetAnimationDuration}
final Duration insetAnimationDuration;
@@ -292,12 +290,12 @@ class MyCupertinoAlertDialog extends StatelessWidget {
class CupertinoDialog extends StatelessWidget {
/// Creates an iOS-style dialog.
const CupertinoDialog({
- Key key,
+ Key? key,
this.child,
}) : super(key: key);
/// The widget below this widget in the tree.
- final Widget child;
+ final Widget? child;
@override
Widget build(BuildContext context) {
@@ -330,7 +328,7 @@ class CupertinoDialog extends StatelessWidget {
class CupertinoPopupSurface extends StatelessWidget {
/// Creates an iOS-style rounded rectangle popup surface.
const CupertinoPopupSurface({
- Key key,
+ Key? key,
this.isSurfacePainted = true,
this.child,
}) : super(key: key);
@@ -346,7 +344,7 @@ class CupertinoPopupSurface extends StatelessWidget {
final bool isSurfacePainted;
/// The widget below this widget in the tree.
- final Widget child;
+ final Widget? child;
@override
Widget build(BuildContext context) {
@@ -372,9 +370,9 @@ class CupertinoPopupSurface extends StatelessWidget {
// See [_RenderCupertinoDialog] for specific layout policy details.
class _CupertinoDialogRenderWidget extends RenderObjectWidget {
const _CupertinoDialogRenderWidget({
- Key key,
- @required this.contentSection,
- @required this.actionsSection,
+ Key? key,
+ required this.contentSection,
+ required this.actionsSection,
}) : super(key: key);
final Widget contentSection;
@@ -410,8 +408,8 @@ class _CupertinoDialogRenderElement extends RenderObjectElement {
_CupertinoDialogRenderElement(_CupertinoDialogRenderWidget widget)
: super(widget);
- Element _contentElement;
- Element _actionsElement;
+ Element? _contentElement;
+ Element? _actionsElement;
@override
_CupertinoDialogRenderWidget get widget =>
@@ -424,15 +422,15 @@ class _CupertinoDialogRenderElement extends RenderObjectElement {
@override
void visitChildren(ElementVisitor visitor) {
if (_contentElement != null) {
- visitor(_contentElement);
+ visitor(_contentElement!);
}
if (_actionsElement != null) {
- visitor(_actionsElement);
+ visitor(_actionsElement!);
}
}
@override
- void mount(Element parent, dynamic newSlot) {
+ void mount(Element? parent, dynamic newSlot) {
super.mount(parent, newSlot);
_contentElement = updateChild(_contentElement, widget.contentSection,
_AlertDialogSections.contentSection);
@@ -442,7 +440,6 @@ class _CupertinoDialogRenderElement extends RenderObjectElement {
@override
void insertChildRenderObject(RenderObject child, _AlertDialogSections slot) {
- assert(slot != null);
switch (slot) {
case _AlertDialogSections.contentSection:
renderObject.contentSection = child as RenderBox;
@@ -453,11 +450,6 @@ class _CupertinoDialogRenderElement extends RenderObjectElement {
}
}
- @override
- void moveChildRenderObject(RenderObject child, _AlertDialogSections slot) {
- assert(false);
- }
-
@override
void update(RenderObjectWidget newWidget) {
super.update(newWidget);
@@ -480,7 +472,7 @@ class _CupertinoDialogRenderElement extends RenderObjectElement {
}
@override
- void removeChildRenderObject(RenderObject child) {
+ void removeRenderObjectChild(RenderObject child, Object? slot) {
assert(child == renderObject.contentSection ||
child == renderObject.actionsSection);
if (renderObject.contentSection == child) {
@@ -518,11 +510,11 @@ class _CupertinoDialogRenderElement extends RenderObjectElement {
// section is given whatever height remains.
class _RenderCupertinoDialog extends RenderBox {
_RenderCupertinoDialog({
- RenderBox contentSection,
- RenderBox actionsSection,
+ RenderBox? contentSection,
+ RenderBox? actionsSection,
double dividerThickness = 0.0,
bool isInAccessibilityMode = false,
- Color dividerColor,
+ required Color dividerColor,
}) : _contentSection = contentSection,
_actionsSection = actionsSection,
_dividerThickness = dividerThickness,
@@ -531,32 +523,32 @@ class _RenderCupertinoDialog extends RenderBox {
..color = dividerColor
..style = PaintingStyle.fill;
- RenderBox get contentSection => _contentSection;
- RenderBox _contentSection;
+ RenderBox? get contentSection => _contentSection;
+ RenderBox? _contentSection;
- set contentSection(RenderBox newContentSection) {
+ set contentSection(RenderBox? newContentSection) {
if (newContentSection != _contentSection) {
if (_contentSection != null) {
- dropChild(_contentSection);
+ dropChild(_contentSection!);
}
_contentSection = newContentSection;
if (_contentSection != null) {
- adoptChild(_contentSection);
+ adoptChild(_contentSection!);
}
}
}
- RenderBox get actionsSection => _actionsSection;
- RenderBox _actionsSection;
+ RenderBox? get actionsSection => _actionsSection;
+ RenderBox? _actionsSection;
- set actionsSection(RenderBox newActionsSection) {
+ set actionsSection(RenderBox? newActionsSection) {
if (newActionsSection != _actionsSection) {
if (null != _actionsSection) {
- dropChild(_actionsSection);
+ dropChild(_actionsSection!);
}
_actionsSection = newActionsSection;
if (null != _actionsSection) {
- adoptChild(_actionsSection);
+ adoptChild(_actionsSection!);
}
}
}
@@ -593,10 +585,10 @@ class _RenderCupertinoDialog extends RenderBox {
void attach(PipelineOwner owner) {
super.attach(owner);
if (null != contentSection) {
- contentSection.attach(owner);
+ contentSection!.attach(owner);
}
if (null != actionsSection) {
- actionsSection.attach(owner);
+ actionsSection!.attach(owner);
}
}
@@ -604,20 +596,20 @@ class _RenderCupertinoDialog extends RenderBox {
void detach() {
super.detach();
if (null != contentSection) {
- contentSection.detach();
+ contentSection!.detach();
}
if (null != actionsSection) {
- actionsSection.detach();
+ actionsSection!.detach();
}
}
@override
void redepthChildren() {
if (null != contentSection) {
- redepthChild(contentSection);
+ redepthChild(contentSection!);
}
if (null != actionsSection) {
- redepthChild(actionsSection);
+ redepthChild(actionsSection!);
}
}
@@ -631,10 +623,10 @@ class _RenderCupertinoDialog extends RenderBox {
@override
void visitChildren(RenderObjectVisitor visitor) {
if (contentSection != null) {
- visitor(contentSection);
+ visitor(contentSection!);
}
if (actionsSection != null) {
- visitor(actionsSection);
+ visitor(actionsSection!);
}
}
@@ -642,10 +634,10 @@ class _RenderCupertinoDialog extends RenderBox {
List<DiagnosticsNode> debugDescribeChildren() {
List result = <DiagnosticsNode>[];
if (contentSection != null)
- result.add(contentSection.toDiagnosticsNode(name: 'content'));
+ result.add(contentSection!.toDiagnosticsNode(name: 'content'));
if (actionsSection != null)
- result.add(actionsSection.toDiagnosticsNode(name: 'actions'));
- return result;
+ result.add(actionsSection!.toDiagnosticsNode(name: 'actions'));
+ return result as List<DiagnosticsNode>;
}
@override
@@ -660,8 +652,8 @@ class _RenderCupertinoDialog extends RenderBox {
@override
double computeMinIntrinsicHeight(double width) {
- final double contentHeight = contentSection.getMinIntrinsicHeight(width);
- final double actionsHeight = actionsSection.getMinIntrinsicHeight(width);
+ final double contentHeight = contentSection!.getMinIntrinsicHeight(width);
+ final double actionsHeight = actionsSection!.getMinIntrinsicHeight(width);
final bool hasDivider = contentHeight > 0.0 && actionsHeight > 0.0;
final double height =
contentHeight + (hasDivider ? _dividerThickness : 0.0) + actionsHeight;
@@ -672,8 +664,8 @@ class _RenderCupertinoDialog extends RenderBox {
@override
double computeMaxIntrinsicHeight(double width) {
- final double contentHeight = contentSection.getMaxIntrinsicHeight(width);
- final double actionsHeight = actionsSection.getMaxIntrinsicHeight(width);
+ final double contentHeight = contentSection!.getMaxIntrinsicHeight(width);
+ final double actionsHeight = actionsSection!.getMaxIntrinsicHeight(width);
final bool hasDivider = contentHeight > 0.0 && actionsHeight > 0.0;
final double height =
contentHeight + (hasDivider ? _dividerThickness : 0.0) + actionsHeight;
@@ -698,28 +690,28 @@ class _RenderCupertinoDialog extends RenderBox {
void performRegularLayout() {
final bool hasDivider =
- contentSection.getMaxIntrinsicHeight(_dialogWidth) > 0.0 &&
- actionsSection.getMaxIntrinsicHeight(_dialogWidth) > 0.0;
+ contentSection!.getMaxIntrinsicHeight(_dialogWidth) > 0.0 &&
+ actionsSection!.getMaxIntrinsicHeight(_dialogWidth) > 0.0;
final double dividerThickness = hasDivider ? _dividerThickness : 0.0;
final double minActionsHeight =
- actionsSection.getMinIntrinsicHeight(_dialogWidth);
+ actionsSection!.getMinIntrinsicHeight(_dialogWidth);
// Size alert dialog content.
- contentSection.layout(
+ contentSection!.layout(
constraints.deflate(
EdgeInsets.only(bottom: minActionsHeight + dividerThickness)),
parentUsesSize: true,
);
- final Size contentSize = contentSection.size;
+ final Size contentSize = contentSection!.size;
// Size alert dialog actions.
- actionsSection.layout(
+ actionsSection!.layout(
constraints
.deflate(EdgeInsets.only(top: contentSize.height + dividerThickness)),
parentUsesSize: true,
);
- final Size actionsSize = actionsSection.size;
+ final Size actionsSize = actionsSection!.size;
// Calculate overall dialog height.
final double dialogHeight =
@@ -730,23 +722,23 @@ class _RenderCupertinoDialog extends RenderBox {
// Set the position of the actions box to sit at the bottom of the dialog.
// The content box defaults to the top left, which is where we want it.
- assert(actionsSection.parentData is BoxParentData);
+ assert(actionsSection!.parentData is BoxParentData);
final BoxParentData actionParentData =
- actionsSection.parentData as BoxParentData;
+ actionsSection!.parentData as BoxParentData;
actionParentData.offset =
Offset(0.0, contentSize.height + dividerThickness);
}
void performAccessibilityLayout() {
final bool hasDivider =
- contentSection.getMaxIntrinsicHeight(_dialogWidth) > 0.0 &&
- actionsSection.getMaxIntrinsicHeight(_dialogWidth) > 0.0;
+ contentSection!.getMaxIntrinsicHeight(_dialogWidth) > 0.0 &&
+ actionsSection!.getMaxIntrinsicHeight(_dialogWidth) > 0.0;
final double dividerThickness = hasDivider ? _dividerThickness : 0.0;
final double maxContentHeight =
- contentSection.getMaxIntrinsicHeight(_dialogWidth);
+ contentSection!.getMaxIntrinsicHeight(_dialogWidth);
final double maxActionsHeight =
- actionsSection.getMaxIntrinsicHeight(_dialogWidth);
+ actionsSection!.getMaxIntrinsicHeight(_dialogWidth);
Size contentSize;
Size actionsSize;
@@ -758,35 +750,35 @@ class _RenderCupertinoDialog extends RenderBox {
// section.
// Size alert dialog actions.
- actionsSection.layout(
+ actionsSection!.layout(
constraints.deflate(EdgeInsets.only(top: constraints.maxHeight / 2.0)),
parentUsesSize: true,
);
- actionsSize = actionsSection.size;
+ actionsSize = actionsSection!.size;
// Size alert dialog content.
- contentSection.layout(
+ contentSection!.layout(
constraints.deflate(
EdgeInsets.only(bottom: actionsSize.height + dividerThickness)),
parentUsesSize: true,
);
- contentSize = contentSection.size;
+ contentSize = contentSection!.size;
} else {
// Everything fits. Give content and actions all the space they want.
// Size alert dialog content.
- contentSection.layout(
+ contentSection!.layout(
constraints,
parentUsesSize: true,
);
- contentSize = contentSection.size;
+ contentSize = contentSection!.size;
// Size alert dialog actions.
- actionsSection.layout(
+ actionsSection!.layout(
constraints.deflate(EdgeInsets.only(top: contentSize.height)),
parentUsesSize: true,
);
- actionsSize = actionsSection.size;
+ actionsSize = actionsSection!.size;
}
// Calculate overall dialog height.
@@ -798,9 +790,9 @@ class _RenderCupertinoDialog extends RenderBox {
// Set the position of the actions box to sit at the bottom of the dialog.
// The content box defaults to the top left, which is where we want it.
- assert(actionsSection.parentData is BoxParentData);
+ assert(actionsSection!.parentData is BoxParentData);
final BoxParentData actionParentData =
- actionsSection.parentData as BoxParentData;
+ actionsSection!.parentData as BoxParentData;
actionParentData.offset =
Offset(0.0, contentSize.height + dividerThickness);
}
@@ -808,25 +800,25 @@ class _RenderCupertinoDialog extends RenderBox {
@override
void paint(PaintingContext context, Offset offset) {
final BoxParentData contentParentData =
- contentSection.parentData as BoxParentData;
- contentSection.paint(context, offset + contentParentData.offset);
+ contentSection!.parentData as BoxParentData;
+ contentSection!.paint(context, offset + contentParentData.offset);
final bool hasDivider =
- contentSection.size.height > 0.0 && actionsSection.size.height > 0.0;
+ contentSection!.size.height > 0.0 && actionsSection!.size.height > 0.0;
if (hasDivider) {
_paintDividerBetweenContentAndActions(context.canvas, offset);
}
final BoxParentData actionsParentData =
- actionsSection.parentData as BoxParentData;
- actionsSection.paint(context, offset + actionsParentData.offset);
+ actionsSection!.parentData as BoxParentData;
+ actionsSection!.paint(context, offset + actionsParentData.offset);
}
void _paintDividerBetweenContentAndActions(Canvas canvas, Offset offset) {
canvas.drawRect(
Rect.fromLTWH(
offset.dx,
- offset.dy + contentSection.size.height,
+ offset.dy + contentSection!.size.height,
size.width,
_dividerThickness,
),
@@ -835,25 +827,25 @@ class _RenderCupertinoDialog extends RenderBox {
}
@override
- bool hitTestChildren(BoxHitTestResult result, {Offset position}) {
+ bool hitTestChildren(BoxHitTestResult result, {required Offset position}) {
final BoxParentData contentSectionParentData =
- contentSection.parentData as BoxParentData;
- final BoxParentData actionsSectionParentData =
- actionsSection.parentData as BoxParentData;
+ contentSection!.parentData as BoxParentData;
+ final BoxParentData? actionsSectionParentData =
+ actionsSection!.parentData as BoxParentData?;
return result.addWithPaintOffset(
offset: contentSectionParentData.offset,
position: position,
hitTest: (BoxHitTestResult result, Offset transformed) {
assert(transformed == position - contentSectionParentData.offset);
- return contentSection.hitTest(result, position: transformed);
+ return contentSection!.hitTest(result, position: transformed);
},
) ||
result.addWithPaintOffset(
- offset: actionsSectionParentData.offset,
+ offset: actionsSectionParentData!.offset,
position: position,
hitTest: (BoxHitTestResult result, Offset transformed) {
assert(transformed == position - actionsSectionParentData.offset);
- return actionsSection.hitTest(result, position: transformed);
+ return actionsSection!.hitTest(result, position: transformed);
},
);
}
@@ -873,7 +865,7 @@ enum _AlertDialogSections {
// a SingleChildScrollView with a zero-sized Container.
class _CupertinoAlertContentSection extends StatelessWidget {
const _CupertinoAlertContentSection({
- Key key,
+ Key? key,
this.title,
this.content,
this.scrollController,
@@ -883,20 +875,20 @@ class _CupertinoAlertContentSection extends StatelessWidget {
// of the dialog.
//
// Typically a Text widget.
- final Widget title;
+ final Widget? title;
// The (optional) content of the dialog is displayed in the center of the
// dialog in a lighter font.
//
// Typically a Text widget.
- final Widget content;
+ final Widget? content;
// A scroll controller that can be used to control the scrolling of the
// content in the dialog.
//
// Defaults to null, and is typically not needed, since most alert contents
// are short.
- final ScrollController scrollController;
+ final ScrollController? scrollController;
@override
Widget build(BuildContext context) {
@@ -923,7 +915,7 @@ class _CupertinoAlertContentSection extends StatelessWidget {
CupertinoColors.label, context),
),
textAlign: TextAlign.center,
- child: title,
+ child: title!,
),
)
: new Container(),
@@ -941,7 +933,7 @@ class _CupertinoAlertContentSection extends StatelessWidget {
CupertinoColors.label, context),
),
textAlign: TextAlign.center,
- child: content,
+ child: content!,
),
)
: new Container(),
@@ -966,11 +958,10 @@ class _CupertinoAlertContentSection extends StatelessWidget {
// and layout.
class _CupertinoAlertActionSection extends StatefulWidget {
const _CupertinoAlertActionSection({
- Key key,
- @required this.children,
+ Key? key,
+ required this.children,
this.scrollController,
- }) : assert(children != null),
- super(key: key);
+ }) : super(key: key);
final List<Widget> children;
@@ -979,7 +970,7 @@ class _CupertinoAlertActionSection extends StatefulWidget {
//
// Defaults to null, and is typically not needed, since most alert dialogs
// don't have many actions.
- final ScrollController scrollController;
+ final ScrollController? scrollController;
@override
_CupertinoAlertActionSectionState createState() =>
@@ -1020,7 +1011,7 @@ class _CupertinoAlertActionSectionState
// appropriately by _RenderCupertinoDialogActions.
class _PressableActionButton extends StatefulWidget {
const _PressableActionButton({
- @required this.child,
+ required this.child,
});
final Widget child;
@@ -1066,12 +1057,12 @@ class _PressableActionButtonState extends State<_PressableActionButton> {
class _ActionButtonParentDataWidget
extends ParentDataWidget<_ActionButtonParentData> {
const _ActionButtonParentDataWidget({
- Key key,
+ Key? key,
this.isPressed,
- @required Widget child,
+ required Widget child,
}) : super(key: key, child: child);
- final bool isPressed;
+ final bool? isPressed;
@override
void applyParentData(RenderObject renderObject) {
@@ -1082,7 +1073,7 @@ class _ActionButtonParentDataWidget
parentData.isPressed = isPressed;
// Force a repaint.
- final AbstractNode targetParent = renderObject.parent;
+ final AbstractNode? targetParent = renderObject.parent;
if (targetParent is RenderObject) targetParent.markNeedsPaint();
}
}
@@ -1095,11 +1086,9 @@ class _ActionButtonParentDataWidget
// ParentData applied to individual action buttons that report whether or not
// that button is currently pressed by the user.
class _ActionButtonParentData extends MultiChildLayoutParentData {
- _ActionButtonParentData({
- this.isPressed = false,
- });
+ _ActionButtonParentData();
- bool isPressed;
+ bool? isPressed;
}
/// A button typically used in a [MyCupertinoAlertDialog].
@@ -1111,22 +1100,19 @@ class _ActionButtonParentData extends MultiChildLayoutParentData {
class CupertinoDialogAction extends StatelessWidget {
/// Creates an action for an iOS-style dialog.
const CupertinoDialogAction({
- Key key,
+ Key? key,
this.onPressed,
this.isDefaultAction = false,
this.isDestructiveAction = false,
this.textStyle,
- @required this.child,
- }) : assert(child != null),
- assert(isDefaultAction != null),
- assert(isDestructiveAction != null),
- super(key: key);
+ required this.child,
+ }) : super(key: key);
/// The callback that is called when the button is tapped or otherwise
/// activated.
///
/// If this is set to null, the button will be disabled.
- final VoidCallback onPressed;
+ final VoidCallback? onPressed;
/// Set to true if button is the default choice in the dialog.
///
@@ -1151,7 +1137,7 @@ class CupertinoDialogAction extends StatelessWidget {
/// ensure that this resizing policy always works as expected, [textStyle]
/// must be used if a text size is desired other than that specified in
/// [_kCupertinoDialogActionStyle].
- final TextStyle textStyle;
+ final TextStyle? textStyle;
/// The widget below this widget in the tree.
///
@@ -1172,9 +1158,9 @@ class CupertinoDialogAction extends StatelessWidget {
//
// This policy only applies when the device is not in accessibility mode.
Widget _buildContentWithRegularSizingPolicy({
- @required BuildContext context,
- @required TextStyle textStyle,
- @required Widget content,
+ required BuildContext context,
+ required TextStyle textStyle,
+ required Widget content,
}) {
final bool isInAccessibilityMode = _isInAccessibilityMode(context);
final double dialogWidth = isInAccessibilityMode
@@ -1186,7 +1172,7 @@ class CupertinoDialogAction extends StatelessWidget {
// buttons. This ratio information is used to automatically scale down action
// button text to fit the available space.
final double fontSizeRatio =
- (textScaleFactor * textStyle.fontSize) / _kMinButtonFontSize;
+ (textScaleFactor * textStyle.fontSize!) / _kMinButtonFontSize;
final double padding = _calculatePadding(context);
return IntrinsicHeight(
@@ -1219,8 +1205,8 @@ class CupertinoDialogAction extends StatelessWidget {
// accessibility mode. If text is used as the content, the text wraps instead
// of ellipsizing.
Widget _buildContentWithAccessibilitySizingPolicy({
- @required TextStyle textStyle,
- @required Widget content,
+ required TextStyle textStyle,
+ required Widget content,
}) {
return DefaultTextStyle(
style: textStyle,
@@ -1246,7 +1232,7 @@ class CupertinoDialogAction extends StatelessWidget {
}
if (!enabled) {
- style = style.copyWith(color: style.color.withOpacity(0.5));
+ style = style.copyWith(color: style.color!.withOpacity(0.5));
}
// Apply a sizing policy to the action button's content based on whether or
@@ -1294,8 +1280,8 @@ class CupertinoDialogAction extends StatelessWidget {
// See [_RenderCupertinoDialogActions] for specific layout policy details.
class _CupertinoDialogActionsRenderWidget extends MultiChildRenderObjectWidget {
_CupertinoDialogActionsRenderWidget({
- Key key,
- @required List<Widget> actionButtons,
+ Key? key,
+ required List<Widget> actionButtons,
double dividerThickness = 0.0,
}) : _dividerThickness = dividerThickness,
super(key: key, children: actionButtons);
@@ -1372,12 +1358,12 @@ class _RenderCupertinoDialogActions extends RenderBox
ContainerRenderObjectMixin<RenderBox, MultiChildLayoutParentData>,
RenderBoxContainerDefaultsMixin<RenderBox, MultiChildLayoutParentData> {
_RenderCupertinoDialogActions({
- List<RenderBox> children,
- @required double dialogWidth,
+ List<RenderBox>? children,
+ required double dialogWidth,
double dividerThickness = 0.0,
- @required Color dialogColor,
- @required Color dialogPressedColor,
- @required Color dividerColor,
+ required Color dialogColor,
+ required Color dialogPressedColor,
+ required Color dividerColor,
}) : _dialogWidth = dialogWidth,
_buttonBackgroundPaint = Paint()
..color = dialogColor
@@ -1441,12 +1427,12 @@ class _RenderCupertinoDialogActions extends RenderBox
}
Iterable<RenderBox> get _pressedButtons sync* {
- RenderBox currentChild = firstChild;
+ RenderBox? currentChild = firstChild;
while (currentChild != null) {
assert(currentChild.parentData is _ActionButtonParentData);
final _ActionButtonParentData parentData =
currentChild.parentData as _ActionButtonParentData;
- if (parentData.isPressed) {
+ if (parentData.isPressed!) {
yield currentChild;
}
currentChild = childAfter(currentChild);
@@ -1454,12 +1440,12 @@ class _RenderCupertinoDialogActions extends RenderBox
}
bool get _isButtonPressed {
- RenderBox currentChild = firstChild;
+ RenderBox? currentChild = firstChild;
while (currentChild != null) {
assert(currentChild.parentData is _ActionButtonParentData);
final _ActionButtonParentData parentData =
currentChild.parentData as _ActionButtonParentData;
- if (parentData.isPressed) {
+ if (parentData.isPressed!) {
return true;
}
currentChild = childAfter(currentChild);
@@ -1511,12 +1497,12 @@ class _RenderCupertinoDialogActions extends RenderBox
double minHeight;
if (childCount == 1) {
- minHeight = firstChild.getMinIntrinsicHeight(width);
+ minHeight = firstChild!.getMinIntrinsicHeight(width);
} else {
final double perButtonWidth = (width - dividerThickness) / 2.0;
minHeight = math.max(
- firstChild.getMinIntrinsicHeight(perButtonWidth),
- lastChild.getMinIntrinsicHeight(perButtonWidth),
+ firstChild!.getMinIntrinsicHeight(perButtonWidth),
+ lastChild!.getMinIntrinsicHeight(perButtonWidth),
);
}
return minHeight;
@@ -1527,9 +1513,9 @@ class _RenderCupertinoDialogActions extends RenderBox
double _computeMinIntrinsicHeightStacked(double width) {
assert(childCount >= 2);
- return firstChild.getMinIntrinsicHeight(width) +
+ return firstChild!.getMinIntrinsicHeight(width) +
dividerThickness +
- (0.5 * childAfter(firstChild).getMinIntrinsicHeight(width));
+ (0.5 * childAfter(firstChild!)!.getMinIntrinsicHeight(width));
}
@override
@@ -1540,7 +1526,7 @@ class _RenderCupertinoDialogActions extends RenderBox
maxHeight = 0.0;
} else if (childCount == 1) {
// One button. Our max intrinsic height is equal to the button's.
- maxHeight = firstChild.getMaxIntrinsicHeight(width);
+ maxHeight = firstChild!.getMaxIntrinsicHeight(width);
} else if (childCount == 2) {
// Two buttons...
if (_isSingleButtonRow(width)) {
@@ -1548,8 +1534,8 @@ class _RenderCupertinoDialogActions extends RenderBox
// to the taller of the 2 buttons.
final double perButtonWidth = (width - dividerThickness) / 2.0;
maxHeight = math.max(
- firstChild.getMaxIntrinsicHeight(perButtonWidth),
- lastChild.getMaxIntrinsicHeight(perButtonWidth),
+ firstChild!.getMaxIntrinsicHeight(perButtonWidth),
+ lastChild!.getMaxIntrinsicHeight(perButtonWidth),
);
} else {
// The 2 buttons do not fit side by side. Measure total height as a
@@ -1571,7 +1557,7 @@ class _RenderCupertinoDialogActions extends RenderBox
final double allDividersHeight = (childCount - 1) * dividerThickness;
double heightAccumulation = allDividersHeight;
- RenderBox button = firstChild;
+ RenderBox? button = firstChild;
while (button != null) {
heightAccumulation += button.getMaxIntrinsicHeight(width);
button = childAfter(button);
@@ -1587,9 +1573,9 @@ class _RenderCupertinoDialogActions extends RenderBox
// There are 2 buttons. If they can fit side-by-side then that's what
// we want to do. Otherwise, stack them vertically.
final double sideBySideWidth =
- firstChild.getMaxIntrinsicWidth(double.infinity) +
+ firstChild!.getMaxIntrinsicWidth(double.infinity) +
dividerThickness +
- lastChild.getMaxIntrinsicWidth(double.infinity);
+ lastChild!.getMaxIntrinsicWidth(double.infinity);
isSingleButtonRow = sideBySideWidth <= width;
} else {
isSingleButtonRow = false;
@@ -1604,12 +1590,13 @@ class _RenderCupertinoDialogActions extends RenderBox
if (childCount == 1) {
// We have 1 button. Our size is the width of the dialog and the height
// of the single button.
- firstChild.layout(
+ firstChild!.layout(
constraints,
parentUsesSize: true,
);
- size = constraints.constrain(Size(dialogWidth, firstChild.size.height));
+ size =
+ constraints.constrain(Size(dialogWidth, firstChild!.size.height));
} else {
// Each button gets half the available width, minus a single divider.
final BoxConstraints perButtonConstraints = BoxConstraints(
@@ -1620,29 +1607,29 @@ class _RenderCupertinoDialogActions extends RenderBox
);
// Layout the 2 buttons.
- firstChild.layout(
+ firstChild!.layout(
perButtonConstraints,
parentUsesSize: true,
);
- lastChild.layout(
+ lastChild!.layout(
perButtonConstraints,
parentUsesSize: true,
);
// The 2nd button needs to be offset to the right.
- assert(lastChild.parentData is MultiChildLayoutParentData);
+ assert(lastChild!.parentData is MultiChildLayoutParentData);
final MultiChildLayoutParentData secondButtonParentData =
- lastChild.parentData as MultiChildLayoutParentData;
+ lastChild!.parentData as MultiChildLayoutParentData;
secondButtonParentData.offset =
- Offset(firstChild.size.width + dividerThickness, 0.0);
+ Offset(firstChild!.size.width + dividerThickness, 0.0);
// Calculate our size based on the button sizes.
size = constraints.constrain(
Size(
dialogWidth,
math.max(
- firstChild.size.height,
- lastChild.size.height,
+ firstChild!.size.height,
+ lastChild!.size.height,
),
),
);
@@ -1654,7 +1641,7 @@ class _RenderCupertinoDialogActions extends RenderBox
maxHeight: double.infinity,
);
- RenderBox child = firstChild;
+ RenderBox? child = firstChild;
int index = 0;
double verticalOffset = 0.0;
while (child != null) {
@@ -1703,12 +1690,12 @@ class _RenderCupertinoDialogActions extends RenderBox
// left or right button is pressed.
final Rect verticalDivider = childCount == 2 && !_isButtonPressed
? Rect.fromLTWH(
- offset.dx + firstChild.size.width,
+ offset.dx + firstChild!.size.width,
offset.dy,
dividerThickness,
math.max(
- firstChild.size.height,
- lastChild.size.height,
+ firstChild!.size.height,
+ lastChild!.size.height,
),
)
: Rect.zero;
@@ -1774,15 +1761,15 @@ class _RenderCupertinoDialogActions extends RenderBox
Offset accumulatingOffset = offset;
- RenderBox child = firstChild;
- RenderBox prevChild;
+ RenderBox? child = firstChild;
+ RenderBox? prevChild;
while (child != null) {
assert(child.parentData is _ActionButtonParentData);
final _ActionButtonParentData currentButtonParentData =
child.parentData as _ActionButtonParentData;
- final bool isButtonPressed = currentButtonParentData.isPressed;
+ final bool isButtonPressed = currentButtonParentData.isPressed!;
- bool isPrevButtonPressed = false;
+ bool? isPrevButtonPressed = false;
if (prevChild != null) {
assert(prevChild.parentData is _ActionButtonParentData);
final _ActionButtonParentData previousButtonParentData =
@@ -1792,7 +1779,7 @@ class _RenderCupertinoDialogActions extends RenderBox
final bool isDividerPresent = child != firstChild;
final bool isDividerPainted =
- isDividerPresent && !(isButtonPressed || isPrevButtonPressed);
+ isDividerPresent && !(isButtonPressed || isPrevButtonPressed!);
final Rect dividerRect = Rect.fromLTWH(
accumulatingOffset.dx,
accumulatingOffset.dy,
@@ -1835,7 +1822,7 @@ class _RenderCupertinoDialogActions extends RenderBox
}
void _drawButtons(PaintingContext context, Offset offset) {
- RenderBox child = firstChild;
+ RenderBox? child = firstChild;
while (child != null) {
final MultiChildLayoutParentData childParentData =
child.parentData as MultiChildLayoutParentData;
@@ -1845,7 +1832,7 @@ class _RenderCupertinoDialogActions extends RenderBox
}
@override
- bool hitTestChildren(BoxHitTestResult result, {Offset position}) {
+ bool hitTestChildren(BoxHitTestResult result, {required Offset position}) {
return defaultHitTestChildren(result, position: position);
}
}
diff --git a/lib/ui/item/build_sus_widget.dart b/lib/ui/item/build_sus_widget.dart
new file mode 100644
index 0000000..358b079
--- /dev/null
+++ b/lib/ui/item/build_sus_widget.dart
@@ -0,0 +1,31 @@
+import 'package:flutter/material.dart';
+import 'package:wechat_flutter/tools/theme/my_theme.dart';
+
+class BuildSubWidget extends StatelessWidget {
+ final String susTag;
+
+ const BuildSubWidget(this.susTag, {Key? key}) : super(key: key);
+
+ @override
+ Widget build(BuildContext context) {
+ return Container(
+ padding: EdgeInsets.symmetric(horizontal: 15.0),
+ height: MyTheme.susItemHeight(),
+ width: double.infinity,
+ alignment: Alignment.centerLeft,
+ child: Row(
+ children: <Widget>[
+ Text(
+ '$susTag',
+ textScaleFactor: 1.2,
+ ),
+ Expanded(
+ child: Divider(
+ height: .0,
+ indent: 10.0,
+ ))
+ ],
+ ),
+ );
+ }
+}
diff --git a/lib/ui/item/chat_mamber.dart b/lib/ui/item/chat_mamber.dart
index 710043b..9e115cf 100644
--- a/lib/ui/item/chat_mamber.dart
+++ b/lib/ui/item/chat_mamber.dart
@@ -1,14 +1,14 @@
-import 'package:wechat_flutter/im/entity/person_info_entity.dart';
-import 'package:wechat_flutter/pages/contacts/contacts_details_page.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_user_full_info.dart';
+import 'package:wechat_flutter/pages/common/contacts/contacts_details_page.dart';
import 'package:flutter/material.dart';
-import 'package:wechat_flutter/pages/contacts/group_launch_page.dart';
+import 'package:wechat_flutter/pages/common/contacts/group_launch_page.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
class ChatMamBer extends StatefulWidget {
- final dynamic model;
+ final V2TimUserFullInfo? info;
- ChatMamBer({this.model});
+ ChatMamBer(this.info);
@override
_ChatMamBerState createState() => _ChatMamBerState();
@@ -17,16 +17,11 @@ class ChatMamBer extends StatefulWidget {
class _ChatMamBerState extends State<ChatMamBer> {
@override
Widget build(BuildContext context) {
- String face =
- Platform.isIOS ? widget.model?.faceURL : widget.model?.faceUrl;
- String name =
- Platform.isIOS ? widget.model?.nickname : widget.model?.nickName;
-
List<Widget> wrap = [];
wrap.add(
new Wrap(
- spacing: (winWidth(context) - 315) / 5,
+ spacing: (FrameSize.winWidth() - 315) / 5,
runSpacing: 10.0,
children: [0].map((item) {
return new InkWell(
@@ -35,22 +30,33 @@ class _ChatMamBerState extends State<ChatMamBer> {
child: new Column(
children: <Widget>[
new ImageView(
- img: strNoEmpty(face) ? face : defIcon,
+ img: strNoEmpty(widget.info?.faceUrl)
+ ? widget.info!.faceUrl
+ : defIcon,
width: 55.0,
height: 55.0,
fit: BoxFit.cover,
),
new Space(height: mainSpace / 2),
new Text(
- strNoEmpty(name) ? name : '无名氏',
+ strNoEmpty(widget.info?.nickName)
+ ? widget.info!.nickName!
+ : '',
style: TextStyle(color: mainTextColor),
overflow: TextOverflow.ellipsis,
),
],
),
),
- onTap: () => routePush(new ContactsDetailsPage(
- id: widget.model.identifier, title: name, avatar: face)),
+ onTap: () {
+ if (widget.info == null) {
+ return;
+ }
+ Get.to(new ContactsDetailsPage(
+ id: widget.info!.userID,
+ title: widget.info!.nickName,
+ avatar: widget.info!.faceUrl));
+ },
);
}).toList(),
),
@@ -64,16 +70,16 @@ class _ChatMamBerState extends State<ChatMamBer> {
child: new Image.asset('assets/images/chat/ic_details_add.png',
width: 55.0, height: 55.0, fit: BoxFit.cover),
),
- onTap: () => routePush(new GroupLaunchPage()),
+ onTap: () => Get.to(new GroupLaunchPage()),
),
);
return Container(
color: Colors.white,
- width: winWidth(context),
+ width: FrameSize.winWidth(),
padding: EdgeInsets.symmetric(horizontal: 20.0, vertical: 15.0),
child: new Wrap(
- spacing: (winWidth(context) - 315) / 5,
+ spacing: (FrameSize.winWidth() - 315) / 5,
runSpacing: 10.0,
children: wrap,
),
diff --git a/lib/ui/item/chat_more_icon.dart b/lib/ui/item/chat_more_icon.dart
index 3621d20..f9575b2 100644
--- a/lib/ui/item/chat_more_icon.dart
+++ b/lib/ui/item/chat_more_icon.dart
@@ -4,12 +4,14 @@ import 'package:wechat_flutter/tools/wechat_flutter.dart';
class ChatMoreIcon extends StatelessWidget {
final bool isMore;
- final String value;
- final VoidCallback onTap;
- final GestureTapCallback moreTap;
+ final bool isEmoji;
+ final String? value;
+ final VoidCallback? onTap;
+ final GestureTapCallback? moreTap;
ChatMoreIcon({
this.isMore = false,
+ this.isEmoji = false,
this.value,
this.onTap,
this.moreTap,
@@ -17,7 +19,7 @@ class ChatMoreIcon extends StatelessWidget {
@override
Widget build(BuildContext context) {
- return strNoEmpty(value)
+ return strNoEmpty(value) && !isEmoji
? new ComMomButton(
text: '发送',
style: TextStyle(color: Colors.white),
@@ -38,7 +40,7 @@ class ChatMoreIcon extends StatelessWidget {
),
onTap: () {
if (moreTap != null) {
- moreTap();
+ moreTap!();
}
},
);
diff --git a/lib/ui/item/chat_voice.dart b/lib/ui/item/chat_voice.dart
index 7b56ae3..857cbbe 100644
--- a/lib/ui/item/chat_voice.dart
+++ b/lib/ui/item/chat_voice.dart
@@ -1,16 +1,14 @@
import 'dart:async';
-import 'dart:io';
-import 'package:wechat_flutter/tools/date.dart';
+import 'package:wechat_flutter/tools/func/date.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
import 'package:wechat_flutter/ui/dialog/voice_dialog.dart';
import 'package:intl/date_symbol_data_local.dart';
import 'package:flutter/material.dart';
-import 'package:flutter_sound/flutter_sound.dart';
typedef VoiceFile = void Function(String path);
class ChatVoice extends StatefulWidget {
- final VoiceFile voiceFile;
+ final VoiceFile? voiceFile;
ChatVoice({this.voiceFile});
@@ -21,67 +19,68 @@ class ChatVoice extends StatefulWidget {
class _ChatVoiceWidgetState extends State<ChatVoice> {
double startY = 0.0;
double offset = 0.0;
- int index;
+ int? index;
bool isUp = false;
String textShow = "按住说话";
String toastShow = "手指上滑,取消发送";
String voiceIco = "images/voice_volume_1.png";
- StreamSubscription _recorderSubscription;
- StreamSubscription _dbPeakSubscription;
+ StreamSubscription? _recorderSubscription;
+ StreamSubscription? _dbPeakSubscription;
///默认隐藏状态
bool voiceState = true;
- OverlayEntry overlayEntry;
- FlutterSound flutterSound;
+ OverlayEntry? overlayEntry;
+ // FlutterSoundRecorder flutterSound = FlutterSoundRecorder();
@override
void initState() {
super.initState();
- flutterSound = new FlutterSound();
- // flutterSound.setSubscriptionDuration(0.01);
- // flutterSound.setDbPeakLevelUpdate(0.8);
+ // flutterSound.openRecorder();
+ // flutterSound.setSubscriptionDuration(Duration(milliseconds: 100));
+ // flutterSound.thePlayer.setDbPeakLevelUpdate(0.8);
// flutterSound.setDbLevelEnabled(true);
initializeDateFormatting();
}
void start() async {
print('开始拉。当前路径');
- showToast(context, "正在兼容最新flutter");
- // try {
- // String path = await flutterSound
- // .startRecorder(Platform.isIOS ? 'ios.m4a' : 'android.mp4');
- // widget.voiceFile(path);
- // _recorderSubscription =
- // flutterSound.onRecorderStateChanged.listen((e) {});
- // } catch (err) {
- // RecorderRunningException e = err;
- // showToast(context, 'startRecorder error: ${e.message}');
- // }
+ try {
+ // await flutterSound.startRecorder(
+ // toFile: Platform.isIOS ? 'ios.m4a' : 'android.mp4');
+ // widget.voiceFile(path);
+ // _recorderSubscription =
+ // flutterSound.onRecorderStateChanged.listen((e) {});
+ } catch (err) {
+ // RecorderRunningException e = err;
+ print("startRecorder errorLLL${err.toString()}");
+ q1Toast( 'startRecorder error: ${err.toString()}');
+ }
}
void stop() async {
- // try {
- // String result = await flutterSound.stopRecorder();
- // print('stopRecorder: $result');
- //
- // if (_recorderSubscription != null) {
- // _recorderSubscription.cancel();
- // _recorderSubscription = null;
- // }
- // if (_dbPeakSubscription != null) {
- // _dbPeakSubscription.cancel();
- // _dbPeakSubscription = null;
- // }
- // } catch (err) {
- // RecorderStoppedException e = err;
- // showToast(context, 'stopRecorder error: ${e.message}');
- // }
+ try {
+ // String result = await flutterSound.stopRecorder();
+ // print('stopRecorder: $result');
+
+ if (_recorderSubscription != null) {
+ _recorderSubscription!.cancel();
+ _recorderSubscription = null;
+ }
+ if (_dbPeakSubscription != null) {
+ _dbPeakSubscription!.cancel();
+ _dbPeakSubscription = null;
+ }
+ } catch (err) {
+ // RecorderStoppedException e = err;
+ print('stopRecorder error: ${err.toString()}');
+ q1Toast( 'stopRecorder error: ${err.toString()}');
+ }
}
showVoiceView() {
- int index;
+ int? index;
setState(() {
textShow = "松开结束";
voiceState = false;
@@ -92,6 +91,7 @@ class _ChatVoiceWidgetState extends State<ChatVoice> {
String recordingTime =
DateTimeForMater.formatDateV(current, format: "ss:SS");
index = int.parse(recordingTime.toString().substring(3, 5));
+ print("indexindexindex::$index");
});
start();
@@ -109,7 +109,7 @@ class _ChatVoiceWidgetState extends State<ChatVoice> {
stop();
if (overlayEntry != null) {
- overlayEntry.remove();
+ overlayEntry!.remove();
overlayEntry = null;
}
@@ -154,10 +154,16 @@ class _ChatVoiceWidgetState extends State<ChatVoice> {
child: new Container(
height: 50.0,
alignment: Alignment.center,
- width: winWidth(context),
+ width: FrameSize.winWidth(),
color: Colors.white,
child: Text(textShow),
),
);
}
+
+ @override
+ void dispose() {
+ super.dispose();
+ // flutterSound.closeRecorder();
+ }
}
diff --git a/lib/ui/item/circle_item_widget.dart b/lib/ui/item/circle_item_widget.dart
new file mode 100644
index 0000000..fccd800
--- /dev/null
+++ b/lib/ui/item/circle_item_widget.dart
@@ -0,0 +1,223 @@
+import 'package:flutter/material.dart';
+import 'package:wechat_flutter/tools/theme/my_theme.dart';
+import 'package:wechat_flutter/tools/func/func.dart';
+import 'package:wechat_flutter/ui_commom/image/sw_image.dart';
+
+import '../../tools/wechat_flutter.dart';
+
+class CircleItemWidget extends StatelessWidget {
+ final String? imageUrl;
+ final String? title;
+ final String? des;
+ final Widget? desWidget;
+ final Widget? time;
+ final Widget? endWidget;
+ final bool isBorder;
+ final bool isSubText;
+ final GestureTapCallback? onTap;
+ final String? id;
+ final int? type;
+ final double? rSpace;
+
+ CircleItemWidget({
+ this.imageUrl,
+ this.title,
+ this.des,
+ this.desWidget,
+ this.id,
+ this.time,
+ this.type,
+ this.endWidget,
+ this.isBorder = true,
+ this.isSubText = true,
+ this.onTap,
+ this.rSpace,
+ });
+
+ final mainTextColor = Color.fromRGBO(115, 115, 115, 1.0);
+
+ @override
+ Widget build(BuildContext context) {
+ final Widget titleW = new Text(
+ title ?? '',
+ style: TextStyle(fontSize: 17.0, fontWeight: MyTheme.fontWeight()),
+ );
+ var row = new Row(
+ children: <Widget>[
+ Space(width: mainSpace),
+ new Expanded(
+ child: !isSubText
+ ? titleW
+ : new Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: <Widget>[
+ titleW,
+ new SizedBox(height: 2.0),
+ desWidget ??
+ Text(
+ des ?? '',
+ style: TextStyle(
+ color: mainTextColor,
+ fontSize: 14.0,
+ fontWeight: MyTheme.fontWeight()),
+ ),
+ ],
+ ),
+ ),
+ new Space(width: mainSpace),
+ SizedBox(
+ width: 45,
+ child: endWidget != null
+ ? endWidget
+ : new Column(
+ children: [
+ time!,
+ new Icon(Icons.flag, color: Colors.transparent),
+ ],
+ ),
+ ),
+ new Space(width: rSpace),
+ ],
+ );
+
+ return ClickEvent(
+ child: new Container(
+ padding: EdgeInsets.only(left: 18.0),
+ color: Colors.white,
+ child: new Row(
+ crossAxisAlignment: CrossAxisAlignment.center,
+ children: [
+ new ImageView(
+ img: imageUrl, height: 50.0, width: 50.0, fit: BoxFit.cover),
+ new Container(
+ padding: EdgeInsets.only(right: 18.0, top: 12.0, bottom: 12.0),
+ width: FrameSize.winWidth() - 68,
+ decoration: BoxDecoration(
+ border: isBorder
+ ? Border(
+ top: BorderSide(
+ color: const Color(0xfff1f0f1), width: 0.2),
+ )
+ : null,
+ ),
+ child: row,
+ )
+ ],
+ ),
+ ),
+ onTap: onTap ??
+ () {
+ // Get.to(ChatPage(
+ // id: id,
+ // title: title,
+ // type: type ?? 1,
+ // ));
+ },
+ );
+ }
+}
+
+class CircleItemWidgetNew extends StatelessWidget {
+ final String? imageUrl;
+ final String? title;
+ final String? des;
+ final Widget? desWidget;
+ final Widget? time;
+ final Widget? endWidget;
+ final bool isBorder;
+ final GestureTapCallback? onTap;
+ final String? id;
+ final int? type;
+ final double? rSpace;
+ final bool isOwner;
+
+ CircleItemWidgetNew({
+ this.imageUrl,
+ this.title,
+ this.des,
+ this.desWidget,
+ this.id,
+ this.time,
+ this.type,
+ this.endWidget,
+ this.isBorder = true,
+ this.isOwner = false,
+ this.onTap,
+ this.rSpace,
+ });
+
+ final mainTextColor = Color.fromRGBO(115, 115, 115, 1.0);
+
+ @override
+ Widget build(BuildContext context) {
+ final Widget titleW = new Text(
+ title ?? '',
+ style: TextStyle(fontSize: 18.0, fontWeight: MyTheme.fontWeight()),
+ );
+ var row = new Row(
+ children: <Widget>[
+ Space(width: mainSpace),
+ new Expanded(
+ child: new Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: <Widget>[
+ titleW,
+ new SizedBox(height: 10.0),
+ desWidget ??
+ Text(
+ des ?? '',
+ style: TextStyle(
+ color: mainTextColor,
+ fontSize: 14.0,
+ fontWeight: MyTheme.fontWeight()),
+ ),
+ ],
+ ),
+ ),
+ new Space(width: mainSpace),
+ if (isOwner)
+ SwImage(
+ 'images/main/ic_group_owner.png',
+ width: 20,
+ ),
+ new Space(width: rSpace),
+ ],
+ );
+
+ return ClickEvent(
+ child: new Container(
+ padding: EdgeInsets.only(left: 18.0, top: 10, bottom: 10),
+ color: Colors.white,
+ child: new Row(
+ crossAxisAlignment: CrossAxisAlignment.center,
+ children: [
+ new ImageView(
+ img: imageUrl, height: 80.0, width: 80.0, fit: BoxFit.cover),
+ new Expanded(
+ child: Container(
+ padding: EdgeInsets.only(right: 18.0, top: 12.0, bottom: 12.0),
+ decoration: BoxDecoration(
+ border: isBorder
+ ? Border(
+ top: BorderSide(
+ color: const Color(0xfff1f0f1), width: 0.2),
+ )
+ : null,
+ ),
+ child: row,
+ ),
+ )
+ ],
+ ),
+ ),
+ onTap: onTap ??
+ () {
+ // Get.to(ChatPage(
+ // id: id,
+ // title: title,
+ // type: type ?? 1,
+ // ));
+ },
+ );
+ }
+}
diff --git a/lib/ui/item/contact_card.dart b/lib/ui/item/contact_card.dart
index 74ea809..3e54518 100644
--- a/lib/ui/item/contact_card.dart
+++ b/lib/ui/item/contact_card.dart
@@ -1,17 +1,16 @@
import 'package:wechat_flutter/tools/wechat_flutter.dart';
-import 'package:wechat_flutter/ui/view/image_view.dart';
import 'package:flutter/material.dart';
import 'package:photo_view/photo_view.dart';
class ContactCard extends StatelessWidget {
- final String img, title, nickName, id, area;
+ final String? img, title, nickName, id, area;
final bool isBorder;
final double lineWidth;
ContactCard({
- @required this.img,
+ required this.img,
this.title,
- this.id,
+ required String this.id,
this.nickName,
this.area,
this.isBorder = false,
@@ -30,7 +29,7 @@ class ContactCard extends StatelessWidget {
)
: null,
),
- width: winWidth(context),
+ width: FrameSize.winWidth(),
padding: EdgeInsets.only(right: 15.0, left: 15.0, bottom: 20.0),
child: new Row(
crossAxisAlignment: CrossAxisAlignment.start,
@@ -40,16 +39,16 @@ class ContactCard extends StatelessWidget {
img: img, width: 55, height: 55, fit: BoxFit.cover),
onTap: () {
if (isNetWorkImg(img)) {
- routePush(
+ Get.to(
new PhotoView(
- imageProvider: NetworkImage(img),
+ imageProvider: NetworkImage(img!),
onTapUp: (c, f, s) => Navigator.of(context).pop(),
maxScale: 3.0,
minScale: 1.0,
),
);
} else {
- showToast(context, '无头像');
+ q1Toast('无头像');
}
},
),
@@ -74,10 +73,10 @@ class ContactCard extends StatelessWidget {
),
new Padding(
padding: EdgeInsets.only(top: 3.0),
- child: new Text("昵称：" + nickName ?? '', style: labelStyle),
+ child: new Text("昵称：" + (nickName ?? ''), style: labelStyle),
),
- new Text("微信号：" + id ?? '', style: labelStyle),
- new Text("地区：" + area ?? '', style: labelStyle),
+ new Text("${AppConfig.appName}号：" + id!, style: labelStyle),
+ new Text("地区：" + area!, style: labelStyle),
],
)
],
diff --git a/lib/ui/item/contact_item.dart b/lib/ui/item/contact_item.dart
index 9bc43fd..25418f8 100644
--- a/lib/ui/item/contact_item.dart
+++ b/lib/ui/item/contact_item.dart
@@ -1,8 +1,9 @@
-import 'package:wechat_flutter/pages/contacts/all_label_page.dart';
-import 'package:wechat_flutter/pages/contacts/contacts_details_page.dart';
-import 'package:wechat_flutter/pages/contacts/group_list_page.dart';
-import 'package:wechat_flutter/pages/contacts/new_friend_page.dart';
-import 'package:wechat_flutter/pages/contacts/public_page.dart';
+import 'package:get/get.dart';
+import 'package:wechat_flutter/pages/common/contacts/all_label_page.dart';
+import 'package:wechat_flutter/pages/common/contacts/contacts_details_page.dart';
+import 'package:wechat_flutter/pages/common/contacts/group_list_page.dart';
+import 'package:wechat_flutter/pages/common/contacts/new_friend_page.dart';
+import 'package:wechat_flutter/pages/common/contacts/public_page.dart';
import 'package:flutter/material.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
@@ -12,18 +13,18 @@ typedef OnAdd = void Function(String v);
typedef OnCancel = void Function(String v);
class ContactItem extends StatefulWidget {
- final String avatar;
- final String title;
- final String identifier;
- final String groupTitle;
+ final String? avatar;
+ final String? title;
+ final String? identifier;
+ final String? groupTitle;
final bool isLine;
- final ClickType type;
- final OnAdd add;
- final OnCancel cancel;
+ final ClickType? type;
+ final OnAdd? add;
+ final OnCancel? cancel;
ContactItem({
- @required this.avatar,
- @required this.title,
+ required this.avatar,
+ required this.title,
this.identifier,
this.isLine = true,
this.groupTitle,
@@ -55,7 +56,7 @@ class ContactItemState extends State<ContactItem> {
bool isSelect = false;
- Map<String, dynamic> mapData;
+ Map<String, dynamic>? mapData;
bool isLine() {
if (widget.isLine) {
@@ -107,7 +108,7 @@ class ContactItemState extends State<ContactItem> {
),
/// 姓名
- child: new Text(widget.title,
+ child: new Text(widget.title!,
style: TextStyle(fontWeight: FontWeight.w400), maxLines: 1),
),
),
@@ -121,33 +122,35 @@ class ContactItemState extends State<ContactItem> {
),
onTap: () {
setState(() => isSelect = !isSelect);
- if (isSelect) widget.add(widget.identifier);
- if (!isSelect) widget.cancel(widget.identifier);
+ if (isSelect) widget.add!(widget.identifier ?? "");
+ if (!isSelect) widget.cancel!(widget.identifier ?? '');
},
)
: new Container()
];
/// 列表项主体部分
- Widget button = new FlatButton(
- color: Colors.white,
+ Widget button = new TextButton(
+ style: ButtonStyle(
+ backgroundColor: MaterialStateProperty.all(Colors.white),
+ ),
onPressed: () {
if (widget.type == ClickType.select) {
setState(() => isSelect = !isSelect);
- if (isSelect) widget.add(widget.identifier);
- if (!isSelect) widget.cancel(widget.identifier);
+ if (isSelect) widget.add!(widget.identifier ?? "");
+ if (!isSelect) widget.cancel!(widget.identifier ?? "");
return;
}
if (widget.title == '新的朋友') {
- routePush(new NewFriendPage());
+ Get.to(new NewFriendPage());
} else if (widget.title == '群聊') {
- routePush(new GroupListPage());
+ Get.to(new GroupListPage());
} else if (widget.title == '标签') {
- routePush(new AllLabelPage());
+ Get.to(new AllLabelPage());
} else if (widget.title == '公众号') {
- routePush(new PublicPage());
+ Get.to(new PublicPage());
} else {
- routePush(new ContactsDetailsPage(
+ Get.to(new ContactsDetailsPage(
id: widget.identifier,
avatar: widget.avatar,
title: widget.title));
@@ -172,7 +175,7 @@ class ContactItemState extends State<ContactItem> {
),
),
alignment: Alignment.centerLeft,
- child: new Text(widget.groupTitle,
+ child: new Text(widget.groupTitle!,
style: AppStyles.GroupTitleItemTextStyle),
),
button,
diff --git a/lib/ui/item/contact_view.dart b/lib/ui/item/contact_view.dart
index 4cfce52..d4de193 100644
--- a/lib/ui/item/contact_view.dart
+++ b/lib/ui/item/contact_view.dart
@@ -1,17 +1,18 @@
-import 'package:wechat_flutter/im/model/contacts.dart';
-import 'package:wechat_flutter/ui/view/indicator_page_view.dart';
import 'package:flutter/material.dart';
+import 'package:wechat_flutter/im/model/contacts.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
+import 'package:wechat_flutter/ui/view/indicator_page_view.dart';
+
import 'contact_item.dart';
enum ClickType { select, open }
class ContactView extends StatelessWidget {
- final ScrollController sC;
+ final ScrollController? sC;
final List<ContactItem> functionButtons;
final List<Contact> contacts;
- final ClickType type;
- final Callback callback;
+ final ClickType? type;
+ final Callback? callback;
ContactView({
this.sC,
@@ -28,6 +29,7 @@ class ContactView extends StatelessWidget {
behavior: MyBehavior(),
child: new ListView.builder(
controller: sC,
+ physics: BouncingScrollPhysics(),
itemBuilder: (BuildContext context, int index) {
if (index < functionButtons.length) return functionButtons[index];
@@ -43,36 +45,36 @@ class ContactView extends StatelessWidget {
if (_contact.name != contacts[contacts.length - 1].name) {
return new ContactItem(
avatar: _contact.avatar,
- title: _contact.name,
+ title: _contact.name ?? "",
identifier: _contact.identifier,
groupTitle: _isGroupTitle ? _contact.nameIndex : null,
isLine: _isBorder,
type: type,
cancel: (v) {
data.remove(v);
- callback(data);
+ callback!(data);
},
add: (v) {
data.add(v);
- callback(data);
+ callback!(data);
},
);
} else {
return new Column(children: <Widget>[
new ContactItem(
avatar: _contact.avatar,
- title: _contact.name,
+ title: _contact.showName,
identifier: _contact.identifier,
groupTitle: _isGroupTitle ? _contact.nameIndex : null,
isLine: false,
type: type,
cancel: (v) {
data.remove(v);
- callback(data);
+ callback!(data);
},
add: (v) {
data.add(v);
- callback(data);
+ callback!(data);
},
),
new HorizontalLine(),
diff --git a/lib/ui/item/launch_group.dart b/lib/ui/item/launch_group.dart
index 5811a2e..1330d2f 100644
--- a/lib/ui/item/launch_group.dart
+++ b/lib/ui/item/launch_group.dart
@@ -1,4 +1,5 @@
-import 'package:wechat_flutter/pages/contacts/group_select_page.dart';
+import 'package:get/get.dart';
+import 'package:wechat_flutter/pages/common/contacts/group_select_page.dart';
import 'package:flutter/material.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
@@ -17,18 +18,21 @@ class LaunchGroupItem extends StatelessWidget {
),
),
alignment: Alignment.centerLeft,
- child: new FlatButton(
- color: Colors.white,
- padding: EdgeInsets.symmetric(vertical: 15.0),
+ child: new TextButton(
+ style: ButtonStyle(
+ backgroundColor: MaterialStateProperty.all(Colors.white),
+ padding:
+ MaterialStateProperty.all(EdgeInsets.symmetric(vertical: 15.0)),
+ ),
onPressed: () {
if (item == '选择一个群') {
- routePush(new GroupSelectPage());
+ Get.to(new GroupSelectPage());
} else {
- showToast(context, '敬请期待');
+ q1Toast('敬请期待');
}
},
child: new Container(
- width: winWidth(context),
+ width: FrameSize.winWidth(),
padding: EdgeInsets.only(left: 20.0),
child: new Text(item),
),
@@ -38,12 +42,12 @@ class LaunchGroupItem extends StatelessWidget {
}
class LaunchSearch extends StatelessWidget {
- final FocusNode searchF;
- final TextEditingController searchC;
- final ValueChanged<String> onChanged;
- final GestureTapCallback onTap;
- final ValueChanged<String> onSubmitted;
- final GestureTapCallback delOnTap;
+ final FocusNode? searchF;
+ final TextEditingController? searchC;
+ final ValueChanged<String>? onChanged;
+ final GestureTapCallback? onTap;
+ final ValueChanged<String>? onSubmitted;
+ final GestureTapCallback? delOnTap;
LaunchSearch({
this.searchF,
@@ -79,12 +83,12 @@ class LaunchSearch extends StatelessWidget {
onSubmitted: onSubmitted,
),
),
- strNoEmpty(searchC.text)
+ strNoEmpty(searchC!.text)
? new InkWell(
child: new Image.asset('assets/images/ic_delete.webp'),
onTap: () {
- searchC.text = '';
- delOnTap();
+ searchC!.text = '';
+ delOnTap!();
},
)
: new Container()
diff --git a/lib/ui/live/live_msg_list.dart b/lib/ui/live/live_msg_list.dart
new file mode 100644
index 0000000..8e4a29a
--- /dev/null
+++ b/lib/ui/live/live_msg_list.dart
@@ -0,0 +1,142 @@
+import 'package:flutter/material.dart';
+import 'package:wechat_flutter/video/event/live_stream_event.dart';
+import 'package:wechat_flutter/video/event_bus/recognition_bus.dart';
+import 'package:wechat_flutter/video/impl/live_base_impl.dart';
+import 'package:wechat_flutter/video/interface/base_interface.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+class LiveMsgList extends StatefulWidget {
+ final LiveBaseImpl liveBaseImpl;
+ final MediaType mediaType;
+ final String targetId;
+ final bool isAudio;
+
+ LiveMsgList(
+ this.liveBaseImpl,
+ this.mediaType, {
+ required this.targetId,
+ required this.isAudio,
+ Key? key,
+ }) : super(key: key);
+
+ @override
+ State<LiveMsgList> createState() => _LiveMsgListState();
+}
+
+class _LiveMsgListState extends State<LiveMsgList> {
+ double _alignmentY = 0.0;
+ ScrollController scrollController = ScrollController();
+
+ StreamSubscription? recognitionBusValue;
+
+ List<RecognitionBusBusModel> data = [];
+
+ @override
+ void initState() {
+ super.initState();
+
+ /// 光标到最下
+ // WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+ // scrollController.jumpTo(1);
+ // });
+
+ recognitionBusValue =
+ recognitionBus.on<RecognitionBusBusModel>().listen((event) {
+ /// Message from self and the translation function is not enable
+ /// direct return.
+ // if (!widget.tlBase.enableTl.value && event.isSelf) {
+ // return;
+ // }
+ if (!mounted) {
+ return;
+ }
+
+ data.insert(0, event);
+ LogUtil.d("组件收到数据:::${event.text}");
+ setState(() {});
+
+ if (event.isSelf) {
+ try {
+ widget.liveBaseImpl.sendLiveMsg(
+ LiveEventName.ttsContent,
+ widget.mediaType,
+ widget.isAudio,
+ targetId: widget.targetId,
+ content: event.text,
+ msgId: event.msgId,
+ );
+ } catch (e) {
+ LogUtil.d("发送语音识别后的消息给其他人时出现错误::${e.toString()}");
+ }
+ }
+ });
+ }
+
+ bool _handleScrollNotification(ScrollNotification notification) {
+ final ScrollMetrics metrics = notification.metrics;
+ _alignmentY = -1 + (metrics.pixels / metrics.maxScrollExtent) * 2;
+ setState(() {});
+ return true;
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return Container(
+ margin: EdgeInsets.symmetric(horizontal: 15.w),
+ decoration: BoxDecoration(
+ border: Border.all(color: Colors.white.withOpacity(0.2))),
+ child: NotificationListener<ScrollNotification>(
+ onNotification: _handleScrollNotification,
+ child: Stack(
+ alignment: Alignment.topRight,
+ children: <Widget>[
+ ListView.builder(
+ reverse: true,
+ itemCount: data.length,
+ controller: scrollController,
+ itemBuilder: (context, index) {
+ RecognitionBusBusModel model = data[index];
+ return Text('ChatItem');
+ // return ChatItem(
+ // isGroup: false,
+ // textString: model.text,
+ // msgId: model.msgId,
+ // isMine: model.isSelf ||
+ // "${widget.liveBaseImpl.myAgoraId}" == model.userId,
+ //
+ // /// 直播弹幕实际不需要知道是哪个用户，只需要知道是不是自己
+ // userId: "0",
+ // );
+ },
+ ),
+ Container(
+ width: 6,
+ decoration: BoxDecoration(
+ color: const Color(0xffD8D8D8).withOpacity(0.34),
+ ),
+ ),
+ //滚动条
+ Container(
+ alignment: Alignment(1, -_alignmentY),
+ child: Container(
+ height: 18,
+ width: 6,
+ decoration: const BoxDecoration(
+ borderRadius: BorderRadius.all(Radius.circular(2)),
+ color: Colors.white,
+ ),
+ ),
+ )
+ ],
+ ),
+ ),
+ );
+ }
+
+ @override
+ void dispose() {
+ super.dispose();
+ recognitionBusValue?.cancel();
+ recognitionBusValue = null;
+ }
+}
diff --git a/lib/ui/massage/img_item_container.dart b/lib/ui/massage/img_item_container.dart
index a447b4c..591d598 100644
--- a/lib/ui/massage/img_item_container.dart
+++ b/lib/ui/massage/img_item_container.dart
@@ -3,8 +3,8 @@ import 'package:wechat_flutter/tools/wechat_flutter.dart';
import 'package:wechat_flutter/ui/w_pop/magic_pop.dart';
class ImgItemContainer extends StatefulWidget {
- final Widget child;
- final double height;
+ final Widget? child;
+ final double? height;
ImgItemContainer({this.child, this.height});
@@ -31,12 +31,12 @@ class _ImgItemContainerState extends State<ImgItemContainer> {
child: new Container(
height: widget.height ?? null,
constraints: BoxConstraints(
- maxWidth: (winWidth(context) - 66) - 100,
+ maxWidth: (FrameSize.winWidth() - 66) - 100,
maxHeight: 250,
),
padding: EdgeInsets.all(5.0),
-// width: text.length > 30 ? (winWidth(context) - 66) - 100 : null,
- width: (winWidth(context) - 66) - 100,
+// width: text.length > 30 ? (FrameSize.winWidth() - 66) - 100 : null,
+ width: (FrameSize.winWidth() - 66) - 100,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.all(
diff --git a/lib/ui/massage/sound_item_container.dart b/lib/ui/massage/sound_item_container.dart
index 4ebab2b..b40ee54 100644
--- a/lib/ui/massage/sound_item_container.dart
+++ b/lib/ui/massage/sound_item_container.dart
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
class SoundItemContainer extends StatefulWidget {
- final List<Widget> children;
- final VoidCallback onPressed;
+ final List<Widget>? children;
+ final VoidCallback? onPressed;
SoundItemContainer({this.children, this.onPressed});
@@ -16,15 +16,18 @@ class _SoundItemContainerState extends State<SoundItemContainer> {
return Container(
width: 100.0,
padding: EdgeInsets.only(right: 10.0),
- child: RaisedButton(
- padding: EdgeInsets.only(left: 8.0, right: 4.0),
+ child: ElevatedButton(
+ style: ButtonStyle(
+ padding: MaterialStateProperty.all(
+ EdgeInsets.only(left: 8.0, right: 4.0)),
+ shape: MaterialStateProperty.all(RoundedRectangleBorder(
+ borderRadius: BorderRadius.circular(18))),
+ backgroundColor: MaterialStateProperty.all(Colors.blueAccent),
+ ),
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
- children: widget.children,
+ children: widget.children!,
),
- shape:
- RoundedRectangleBorder(borderRadius: BorderRadius.circular(18)),
- color: Colors.blueAccent,
onPressed: widget.onPressed ?? () {},
));
}
diff --git a/lib/ui/massage/switch_widget.dart b/lib/ui/massage/switch_widget.dart
index 6df9ada..7d2f8ea 100644
--- a/lib/ui/massage/switch_widget.dart
+++ b/lib/ui/massage/switch_widget.dart
@@ -3,9 +3,9 @@ import 'package:flutter/material.dart';
class SwitchWidget extends StatefulWidget {
final bool value;
final String title;
- final String id;
- final Function functionT;
- final Function functionF;
+ final String? id;
+ final Function? functionT;
+ final Function? functionF;
SwitchWidget(this.value, this.title,
{this.id, this.functionT, this.functionF});
@@ -15,7 +15,7 @@ class SwitchWidget extends StatefulWidget {
}
class _SwitchWidgetState extends State<SwitchWidget> {
- bool valueCan;
+ late bool valueCan;
@override
void initState() {
@@ -27,9 +27,12 @@ class _SwitchWidgetState extends State<SwitchWidget> {
Widget build(BuildContext context) {
return Column(
children: <Widget>[
- FlatButton(
- padding: EdgeInsets.symmetric(vertical: 4.0, horizontal: 20.0),
- color: Colors.white,
+ TextButton(
+ style: ButtonStyle(
+ backgroundColor: MaterialStateProperty.all(Colors.white),
+ padding: MaterialStateProperty.all(
+ EdgeInsets.symmetric(vertical: 4.0, horizontal: 20.0)),
+ ),
onPressed: () {
valueCan = !valueCan;
setState(() {});
diff --git a/lib/ui/massage/triangle_painter.dart b/lib/ui/massage/triangle_painter.dart
index fcab344..9120b49 100644
--- a/lib/ui/massage/triangle_painter.dart
+++ b/lib/ui/massage/triangle_painter.dart
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
class TrianglePainter extends CustomPainter {
- Paint _paint;
+ late Paint _paint;
final Color color;
final RelativeRect position;
final Size size;
@@ -9,9 +9,9 @@ class TrianglePainter extends CustomPainter {
final bool isInverted;
TrianglePainter(
- {@required this.color,
- @required this.position,
- @required this.size,
+ {required this.color,
+ required this.position,
+ required this.size,
this.radius = 20,
this.isInverted = false}) {
_paint = Paint()
diff --git a/lib/ui/massage/wait.dart b/lib/ui/massage/wait.dart
index cf18541..03ee974 100644
--- a/lib/ui/massage/wait.dart
+++ b/lib/ui/massage/wait.dart
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
OverlayEntry showDialogTipView(BuildContext context, int index, int type) {
- Widget img() {
+ Widget img() {
if (0 <= index && index <= 16) {
return Image.asset('assets/images/chat/3.0x/dialog_audio_v1.png');
} else if (16 < index && index <= 32) {
@@ -15,6 +15,7 @@ OverlayEntry showDialogTipView(BuildContext context, int index, int type) {
} else if (80 < index && index <= 99) {
return Image.asset('assets/images/chat/3.0x/dialog_audio_v6.png');
}
+ return Image.asset('assets/images/chat/3.0x/dialog_audio_v6.png');
}
OverlayEntry overlayEntry = OverlayEntry(builder: (context) {
@@ -77,7 +78,7 @@ OverlayEntry showDialogTipView(BuildContext context, int index, int type) {
),
);
});
- Overlay.of(context).insert(overlayEntry);
+ Overlay.of(context)!.insert(overlayEntry);
return overlayEntry;
}
diff --git a/lib/ui/massage/wait1.dart b/lib/ui/massage/wait1.dart
index 09fb036..a972f60 100644
--- a/lib/ui/massage/wait1.dart
+++ b/lib/ui/massage/wait1.dart
@@ -1,24 +1,14 @@
-import 'dart:io';
-
-import 'package:wechat_flutter/im/model/chat_data.dart';
-import 'package:wechat_flutter/tools/wechat_flutter.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
-import 'package:wechat_flutter/provider/global_model.dart';
-
+import 'package:tencent_im_sdk_plugin/models/v2_tim_message.dart';
import 'package:wechat_flutter/ui/message_view/Img_msg.dart';
-import 'package:wechat_flutter/ui/message_view/join_message.dart';
-import 'package:wechat_flutter/ui/message_view/modify_groupInfo_message.dart';
-import 'package:wechat_flutter/ui/message_view/modify_notification_message.dart';
-import 'package:wechat_flutter/ui/message_view/quit_message.dart';
import 'package:wechat_flutter/ui/message_view/red_package.dart';
import 'package:wechat_flutter/ui/message_view/sound_msg.dart';
-import 'package:wechat_flutter/ui/message_view/tem_message.dart';
import 'package:wechat_flutter/ui/message_view/text_msg.dart';
import 'package:wechat_flutter/ui/message_view/video_message.dart';
class SendMessageView extends StatefulWidget {
- final ChatData model;
+ final V2TimMessage model;
SendMessageView(this.model);
@@ -27,37 +17,31 @@ class SendMessageView extends StatefulWidget {
}
class _SendMessageViewState extends State<SendMessageView> {
+ V2TimMessage get model {
+ return widget.model;
+ }
+
@override
Widget build(BuildContext context) {
- Map msg = widget.model.msg;
- String msgType = msg['type'];
- String msgStr = msg.toString();
-
- bool isI = Platform.isIOS;
- bool iosText = isI && msgStr.contains('text:');
- bool iosImg = isI && msgStr.contains('imageList:');
- var iosS = msgStr.contains('downloadFlag:') && msgStr.contains('second:');
- bool iosSound = isI && iosS;
- if ((msgType == "Text" || iosText) &&
- widget.model.msg.toString().contains("测试发送红包消息")) {
+ if ((model.textElem != null) &&
+ widget.model.textElem!.text.toString().contains("测试发送红包消息")) {
return new RedPackage(widget.model);
- } else if (msgType == "Text" || iosText) {
- return new TextMsg(msg['text'], widget.model);
- } else if (msgType == "Image" || iosImg) {
- return new ImgMsg(msg, widget.model);
- } else if (msgType == 'Sound' || iosSound) {
+ } else if (model.textElem != null) {
+ return new TextMsg(model.textElem!.text, widget.model);
+ } else if (model.imageElem != null) {
+ return new ImgMsg(model.imageElem, widget.model);
+ } else if (model.soundElem != null) {
return new SoundMsg(widget.model);
-// } else if (msg.toString().contains('snapshotPath') &&
-// msg.toString().contains('videoPath')) {
-// return VideoMessage(msg, msgType, widget.data);
- } else if (msg['tipsType'] == 'Join') {
- return JoinMessage(msg);
- } else if (msg['tipsType'] == 'Quit') {
- return QuitMessage(msg);
- } else if (msg['groupInfoList'][0]['type'] == 'ModifyIntroduction') {
- return ModifyNotificationMessage(msg);
- } else if (msg['groupInfoList'][0]['type'] == 'ModifyName') {
- return ModifyGroupInfoMessage(msg);
+ } else if (model.videoElem != null) {
+ return VideoMessage(widget.model);
+// } else if (msg['tipsType'] == 'Join') {
+// return JoinMessage(msg);
+// } else if (msg['tipsType'] == 'Quit') {
+// return QuitMessage(msg);
+// } else if (msg['groupInfoList'][0]['type'] == 'ModifyIntroduction') {
+// return ModifyNotificationMessage(msg);
+// } else if (msg['groupInfoList'][0]['type'] == 'ModifyName') {
+// return ModifyGroupInfoMessage(msg);
} else {
return new Text('未知消息');
}
diff --git a/lib/ui/message_view/Img_msg.dart b/lib/ui/message_view/Img_msg.dart
index f9a815b..65ba7bc 100644
--- a/lib/ui/message_view/Img_msg.dart
+++ b/lib/ui/message_view/Img_msg.dart
@@ -1,26 +1,33 @@
-import 'package:wechat_flutter/im/model/chat_data.dart';
-import 'package:wechat_flutter/ui/message_view/msg_avatar.dart';
import 'package:flutter/material.dart';
+import 'package:flutter_cache_manager/flutter_cache_manager.dart';
+import 'package:get/get.dart';
import 'package:photo_view/photo_view.dart';
import 'package:provider/provider.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_image_elem.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_message.dart';
+import 'package:wechat_flutter/tools/provider/global_model.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
-
-import '../../provider/global_model.dart';
+import 'package:wechat_flutter/ui/message_view/msg_avatar.dart';
class ImgMsg extends StatelessWidget {
- final msg;
-
- final ChatData model;
+ final V2TimImageElem? msg;
+ final V2TimMessage model;
ImgMsg(this.msg, this.model);
@override
Widget build(BuildContext context) {
- if (!listNoEmpty(msg['imageList'])) return Text('发送中');
- var msgInfo = msg['imageList'][1];
- var _height = msgInfo['height'].toDouble();
+ if (!listNoEmpty(msg!.imageList)) return Text('发送中');
+ if (msg!.imageList!.length < 2) {
+ /// 图片异常了
+ return Container();
+ }
+ var msgInfo = msg!.imageList![1]!;
+ var _height = msgInfo.height!.toDouble();
var resultH = _height > 200.0 ? 200.0 : _height;
- var url = msgInfo['url'];
+ var url = msgInfo.url!;
+
+ LogUtil.d("加载图片::$url");
var isFile = File(url).existsSync();
final globalModel = Provider.of<GlobalModel>(context);
var body = [
@@ -39,12 +46,18 @@ class ImgMsg extends StatelessWidget {
child: isFile
? new Image.file(File(url))
: new CachedNetworkImage(
- imageUrl: url, height: resultH, fit: BoxFit.cover),
+ imageUrl: url,
+ height: resultH,
+ fit: BoxFit.cover,
+ cacheKey: url,
+ // cacheManager: DefaultCacheManager(),
+ ),
),
),
- onTap: () => routePush(
+ onTap: () => Get.to(
new PhotoView(
- imageProvider: isFile ? FileImage(File(url)) : NetworkImage(url),
+ imageProvider: (isFile ? FileImage(File(url)) : NetworkImage(url))
+ as ImageProvider<Object>?,
onTapUp: (c, f, s) => Navigator.of(context).pop(),
maxScale: 3.0,
minScale: 1.0,
@@ -54,7 +67,7 @@ class ImgMsg extends StatelessWidget {
),
new Spacer(),
];
- if (model.id == globalModel.account) {
+ if (model.sender == globalModel.account) {
body = body.reversed.toList();
} else {
body = body;
diff --git a/lib/ui/message_view/content_msg.dart b/lib/ui/message_view/content_msg.dart
index 01eb7f0..78c7b37 100644
--- a/lib/ui/message_view/content_msg.dart
+++ b/lib/ui/message_view/content_msg.dart
@@ -1,11 +1,11 @@
import 'package:extended_text/extended_text.dart';
import 'package:flutter/material.dart';
-
+import 'package:tencent_im_sdk_plugin/models/v2_tim_message.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
import 'package:wechat_flutter/ui/edit/text_span_builder.dart';
class ContentMsg extends StatefulWidget {
- final Map msg;
+ final V2TimMessage? msg;
ContentMsg(this.msg);
@@ -14,45 +14,41 @@ class ContentMsg extends StatefulWidget {
}
class _ContentMsgState extends State<ContentMsg> {
- String str;
+ String? str = "[未知消息]";
TextStyle _style = TextStyle(color: mainTextColor, fontSize: 14.0);
+ V2TimMessage? get msg {
+ return widget.msg;
+ }
+
@override
Widget build(BuildContext context) {
- if (widget.msg == null) return new Text('未知消息', style: _style);
- Map msg = widget.msg['message'];
- String msgType = msg['type'];
- String msgStr = msg.toString();
-
- bool isI = Platform.isIOS;
- bool iosText = isI && msgStr.contains('text:');
- bool iosImg = isI && msgStr.contains('imageList:');
- var iosS = msgStr.contains('downloadFlag:') && msgStr.contains('second:');
- bool iosSound = isI && iosS;
- if (msgType == "Text" || iosText) {
- str = msg['text'];
- } else if (msgType == "Image" || iosImg) {
+ if (msg == null) return new Text('未知消息', style: _style);
+
+ if (msg!.textElem != null) {
+ str = widget.msg!.textElem!.text;
+ } else if (msg!.imageElem != null) {
str = '[图片]';
- } else if (msgType == 'Sound' || iosSound) {
+ } else if (msg!.soundElem != null) {
str = '[语音消息]';
- } else if (msg.toString().contains('snapshotPath') &&
- msg.toString().contains('videoPath')) {
+ } else if (msg!.videoElem != null) {
str = '[视频]';
- } else if (msg['tipsType'] == 'Join') {
- str = '[系统消息] 新人入群';
- } else if (msg['tipsType'] == 'Quit') {
- str = '[系统消息] 有人退出群聊';
- } else if (msg['groupInfoList'][0]['type'] == 'ModifyIntroduction') {
- str = '[系统消息] 群公告';
- } else if (msg['groupInfoList'][0]['type'] == 'ModifyName') {
- str = '[系统消息] 群名修改';
} else {
str = '[未知消息]';
}
+ // } else if (msg['tipsType'] == 'Join') {
+ // str = '[系统消息] 新人入群';
+ // } else if (msg['tipsType'] == 'Quit') {
+ // str = '[系统消息] 有人退出群聊';
+ // } else if (msg['groupInfoList'][0]['type'] == 'ModifyIntroduction') {
+ // str = '[系统消息] 群公告';
+ // } else if (msg['groupInfoList'][0]['type'] == 'ModifyName') {
+ // str = '[系统消息] 群名修改';
+ // }
return new ExtendedText(
- str,
+ str!,
specialTextSpanBuilder: TextSpanBuilder(showAtBackground: true),
maxLines: 1,
overflow: TextOverflow.ellipsis,
diff --git a/lib/ui/message_view/join_message.dart b/lib/ui/message_view/join_message.dart
index 9087880..14e1690 100644
--- a/lib/ui/message_view/join_message.dart
+++ b/lib/ui/message_view/join_message.dart
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
-import 'package:wechat_flutter/provider/global_model.dart';
+import 'package:wechat_flutter/tools/provider/global_model.dart';
class JoinMessage extends StatelessWidget {
final dynamic data;
diff --git a/lib/ui/message_view/modify_groupInfo_message.dart b/lib/ui/message_view/modify_groupInfo_message.dart
index b790250..9eec46c 100644
--- a/lib/ui/message_view/modify_groupInfo_message.dart
+++ b/lib/ui/message_view/modify_groupInfo_message.dart
@@ -1,7 +1,7 @@
import 'dart:convert';
import 'package:flutter/material.dart';
-import 'package:wechat_flutter/im/group/fun_dim_info.dart';
+import 'package:wechat_flutter/tools/data/store.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
class ModifyGroupInfoMessage extends StatefulWidget {
@@ -13,27 +13,24 @@ class ModifyGroupInfoMessage extends StatefulWidget {
}
class ModifyGroupInfoMessageState extends State<ModifyGroupInfoMessage> {
- String name;
- List membersData;
+ String? name;
+ List? membersData;
@override
void initState() {
super.initState();
- String user = widget.data['opGroupMemberInfo']['user'];
+ String? user = widget.data['opGroupMemberInfo']['user'];
getCardName(user);
}
- getCardName(String user) async {
- await InfoModel.getGroupMembersInfoModel(widget.data['groupId'], [user],
- callback: (str) {
- String strToData = str.toString().replaceAll("'", '"');
- membersData = json.decode(strToData);
- });
+ getCardName(String? user) async {
+ String strToData = "";
+ membersData = json.decode(strToData);
var userPhone = await getStoreValue('userPhone');
if (listNoEmpty(membersData)) if (user == userPhone)
name = '你';
- else if (strNoEmpty(membersData[0]['nameCard']))
- name = membersData[0]['nameCard'];
+ else if (strNoEmpty(membersData![0]['nameCard']))
+ name = membersData![0]['nameCard'];
else
name = user;
setState(() {});
diff --git a/lib/ui/message_view/modify_notification_message.dart b/lib/ui/message_view/modify_notification_message.dart
index c0a0957..42bbfc7 100644
--- a/lib/ui/message_view/modify_notification_message.dart
+++ b/lib/ui/message_view/modify_notification_message.dart
@@ -1,7 +1,7 @@
import 'dart:convert';
import 'package:flutter/material.dart';
-import 'package:wechat_flutter/im/group/fun_dim_info.dart';
+import 'package:wechat_flutter/tools/data/store.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
class ModifyNotificationMessage extends StatefulWidget {
@@ -14,27 +14,24 @@ class ModifyNotificationMessage extends StatefulWidget {
}
class ModifyNotificationMessageState extends State<ModifyNotificationMessage> {
- String name;
- List membersData;
+ String? name;
+ List? membersData;
@override
void initState() {
super.initState();
- String user = widget.data['opGroupMemberInfo']['user'];
+ String? user = widget.data['opGroupMemberInfo']['user'];
getCardName(user);
}
- getCardName(String user) async {
- await InfoModel.getGroupMembersInfoModel(widget.data['groupId'], [user],
- callback: (str) {
- String strToData = str.toString().replaceAll("'", '"');
- membersData = json.decode(strToData);
- });
+ getCardName(String? user) async {
+ String strToData = "";
+ membersData = json.decode(strToData);
var userPhone = await getStoreValue('userPhone');
if (listNoEmpty(membersData)) if (user == userPhone)
name = '你';
- else if (strNoEmpty(membersData[0]['nameCard']))
- name = membersData[0]['nameCard'];
+ else if (strNoEmpty(membersData![0]['nameCard']))
+ name = membersData![0]['nameCard'];
else
name = user;
setState(() {});
diff --git a/lib/ui/message_view/msg_avatar.dart b/lib/ui/message_view/msg_avatar.dart
index dd71390..c7f7604 100644
--- a/lib/ui/message_view/msg_avatar.dart
+++ b/lib/ui/message_view/msg_avatar.dart
@@ -1,29 +1,27 @@
import 'dart:math';
-import 'package:wechat_flutter/im/model/chat_data.dart';
-import 'package:wechat_flutter/pages/contacts/contacts_details_page.dart';
-import 'package:wechat_flutter/provider/global_model.dart';
import 'package:flutter/material.dart';
-
+import 'package:wechat_flutter/pages/common/contacts/contacts_details_page.dart';
+import 'package:wechat_flutter/tools/provider/global_model.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
import 'package:wechat_flutter/ui/view/shake_view.dart';
///封装之后的拍一拍效果[ShakeView]
class MsgAvatar extends StatefulWidget {
final GlobalModel globalModel;
- final ChatData model;
+ final V2TimMessage model;
MsgAvatar({
- @required this.globalModel,
- @required this.model,
+ required this.globalModel,
+ required this.model,
});
_MsgAvatarState createState() => _MsgAvatarState();
}
class _MsgAvatarState extends State<MsgAvatar> with TickerProviderStateMixin {
- Animation<double> animation;
- AnimationController controller;
+ late Animation<double> animation;
+ late AnimationController controller;
@override
initState() {
@@ -57,7 +55,7 @@ class _MsgAvatarState extends State<MsgAvatar> with TickerProviderStateMixin {
child: new ImageView(
img: widget.model.id == widget.globalModel.account
? widget.globalModel.avatar ?? defIcon
- : widget.model.avatar,
+ : widget.model.faceUrl,
height: 35,
width: 35,
fit: BoxFit.cover,
@@ -68,9 +66,9 @@ class _MsgAvatarState extends State<MsgAvatar> with TickerProviderStateMixin {
setState(() => start(false));
},
onTap: () {
- routePush(new ContactsDetailsPage(
+ Get.to(new ContactsDetailsPage(
title: widget.model.nickName,
- avatar: widget.model.avatar,
+ avatar: widget.model.faceUrl,
id: widget.model.id,
));
},
@@ -84,16 +82,16 @@ class _MsgAvatarState extends State<MsgAvatar> with TickerProviderStateMixin {
}
class AnimateWidget extends AnimatedWidget {
- final Widget child;
+ final Widget? child;
AnimateWidget({
- Animation<double> animation,
+ required Animation<double> animation,
this.child,
}) : super(listenable: animation);
@override
Widget build(BuildContext context) {
- final Animation<double> animation = listenable;
+ final Animation<double> animation = listenable as Animation<double>;
var result = Transform(
transform: Matrix4.rotationZ(animation.value * pi / 180),
alignment: Alignment.bottomCenter,
diff --git a/lib/ui/message_view/quit_message.dart b/lib/ui/message_view/quit_message.dart
index fd8a0ca..375d5b3 100644
--- a/lib/ui/message_view/quit_message.dart
+++ b/lib/ui/message_view/quit_message.dart
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
-import 'package:wechat_flutter/provider/global_model.dart';
+import 'package:wechat_flutter/tools/provider/global_model.dart';
class QuitMessage extends StatelessWidget {
final dynamic data;
diff --git a/lib/ui/message_view/red_package.dart b/lib/ui/message_view/red_package.dart
index cd25bc9..4644496 100644
--- a/lib/ui/message_view/red_package.dart
+++ b/lib/ui/message_view/red_package.dart
@@ -1,17 +1,15 @@
-import 'package:dim/commom/check.dart';
-import 'package:dim/commom/ui.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
-import 'package:wechat_flutter/config/const.dart';
-import 'package:wechat_flutter/im/model/chat_data.dart';
-import 'package:wechat_flutter/pages/red_package/red_receive_dialog.dart';
-import 'package:wechat_flutter/provider/global_model.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_message.dart';
+import 'package:wechat_flutter/pages/common/red_package/red_receive_dialog.dart';
+import 'package:wechat_flutter/tools/provider/global_model.dart';
+import 'package:wechat_flutter/tools/config/app_config.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
import 'msg_avatar.dart';
class RedPackage extends StatelessWidget {
- final ChatData model;
+ final V2TimMessage model;
RedPackage(this.model);
@@ -55,7 +53,7 @@ class RedPackage extends StatelessWidget {
),
HorizontalLine(color: Colors.white, height: 1),
Text(
- '微信红包',
+ '${AppConfig.appName}红包',
style: TextStyle(
color: Colors.white.withOpacity(0.7), fontSize: 8),
)
diff --git a/lib/ui/message_view/sound_msg.dart b/lib/ui/message_view/sound_msg.dart
index 3ee468f..dc65a98 100644
--- a/lib/ui/message_view/sound_msg.dart
+++ b/lib/ui/message_view/sound_msg.dart
@@ -1,18 +1,16 @@
-import 'package:audioplayers/audioplayers.dart';
-import 'package:wechat_flutter/im/entity/i_sound_msg_entity.dart';
-import 'package:wechat_flutter/im/entity/sound_msg_entity.dart';
-import 'package:wechat_flutter/im/model/chat_data.dart';
-import 'package:wechat_flutter/provider/global_model.dart';
-import 'package:wechat_flutter/tools/wechat_flutter.dart';
-import 'package:wechat_flutter/ui/message_view/msg_avatar.dart';
+// import 'package:audioplayers/audioplayers.dart';
import 'package:flutter/material.dart';
-import 'package:flutter_sound/flutter_sound.dart';
+
+// import 'package:flutter_sound/flutter_sound.dart';
import 'package:intl/date_symbol_data_local.dart';
-import 'package:intl/intl.dart';
import 'package:provider/provider.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_message.dart';
+import 'package:wechat_flutter/tools/provider/global_model.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+import 'package:wechat_flutter/ui/message_view/msg_avatar.dart';
class SoundMsg extends StatefulWidget {
- final ChatData model;
+ final V2TimMessage model;
SoundMsg(this.model);
@@ -21,17 +19,18 @@ class SoundMsg extends StatefulWidget {
}
class _SoundMsgState extends State<SoundMsg> with TickerProviderStateMixin {
- Duration duration;
- Duration position;
+ Duration? duration;
+ Duration? position;
+
+ late AnimationController controller;
+ Animation? animation;
- AnimationController controller;
- Animation animation;
- FlutterSound flutterSound;
- AudioPlayer audioPlayer = AudioPlayer();
+ // FlutterSound flutterSound;
+ // AudioPlayer audioPlayer = AudioPlayer();
- StreamSubscription _positionSubscription;
- StreamSubscription _audioPlayerStateSubscription;
- StreamSubscription _playerSubscription;
+ StreamSubscription? _positionSubscription;
+ StreamSubscription? _audioPlayerStateSubscription;
+ StreamSubscription? _playerSubscription;
double sliderCurrentPosition = 0.0;
double maxDuration = 1.0;
@@ -39,10 +38,10 @@ class _SoundMsgState extends State<SoundMsg> with TickerProviderStateMixin {
@override
void initState() {
super.initState();
- flutterSound = new FlutterSound();
- // flutterSound.setSubscriptionDuration(0.01);
- // flutterSound.setDbPeakLevelUpdate(0.8);
- // flutterSound.setDbLevelEnabled(true);
+ // flutterSound = new FlutterSound();
+ // flutterSound.thePlayer.setSubscriptionDuration(Duration(milliseconds: 100));
+ // flutterSound.thePlayer.setDbPeakLevelUpdate(0.8);
+ // flutterSound.thePlayer.setDbLevelEnabled(true);
initializeDateFormatting();
initAudioPlayer();
}
@@ -53,7 +52,7 @@ class _SoundMsgState extends State<SoundMsg> with TickerProviderStateMixin {
duration: const Duration(milliseconds: 1000), vsync: this);
final Animation curve =
CurvedAnimation(parent: controller, curve: Curves.easeOut);
- animation = IntTween(begin: 0, end: 3).animate(curve)
+ animation = IntTween(begin: 0, end: 3).animate(curve as Animation<double>)
..addStatusListener((status) {
if (status == AnimationStatus.completed) {
controller.reverse();
@@ -62,56 +61,55 @@ class _SoundMsgState extends State<SoundMsg> with TickerProviderStateMixin {
controller.forward();
}
});
-//
-// _audioPlayerStateSubscription =
-// flutterSound.onPlayerStateChanged.listen((s) {
-// if (s != null) {
-// } else {
-// controller.reset();
-// setState(() {
-// position = duration;
-// });
-// }
-// }, onError: (msg) {
-// setState(() {
-// duration = new Duration(seconds: 0);
-// position = new Duration(seconds: 0);
-// });
-// });
+
+ // _audioPlayerStateSubscription =
+ // flutterSound.onPlayerStateChanged.listen((s) {
+ // if (s != null) {
+ // } else {
+ // controller.reset();
+ // setState(() {
+ // position = duration;
+ // });
+ // }
+ // }, onError: (msg) {
+ // setState(() {
+ // duration = new Duration(seconds: 0);
+ // position = new Duration(seconds: 0);
+ // });
+ // });
}
void start(String path) async {
- showToast(context, "正在兼容最新flutter");
- // try {
- // controller.forward();
- // await flutterSound.startPlayer(path);
- // await flutterSound.setVolume(1.0);
- // debugPrint('startPlayer: $path');
- //
- // _playerSubscription = flutterSound.onPlayerStateChanged.listen((e) {
- // if (e != null) {
- // sliderCurrentPosition = e.currentPosition;
- // maxDuration = e.duration;
- //
- // DateTime date = new DateTime.fromMillisecondsSinceEpoch(
- // e.currentPosition.toInt(),
- // isUtc: true);
- // String txt = DateFormat('mm:ss:SS', 'en_GB').format(date);
- //
- // print(txt.substring(0, 8).toString());
- // }
- // });
- // } catch (err) {
- // print('error: $err');
- // }
+ try {
+ controller.forward();
+ // await flutterSound.thePlayer.startPlayer(fromURI: path);
+ // await flutterSound.thePlayer.setVolume(1.0);
+ // debugPrint('startPlayer: $path');
+
+ // _playerSubscription = flutterSound.thePlayer.onPlayerStateChanged.listen((e) {
+ // if (e != null) {
+ // sliderCurrentPosition = e.currentPosition;
+ // maxDuration = e.duration;
+ //
+ // DateTime date = new DateTime.fromMillisecondsSinceEpoch(
+ // e.currentPosition.toInt(),
+ // isUtc: true);
+ // String txt = DateFormat('mm:ss:SS', 'en_GB').format(date);
+ //
+ // print(txt.substring(0, 8).toString());
+ // }
+ // });
+ } catch (err) {
+ print('error: $err');
+ }
}
playNew(url) async {
- int result = await audioPlayer.play(url);
- if (result == 1) {
- showToast(context, '播放中');
- } else {
- showToast(context, '播放出问题了');
+ try {
+ // await audioPlayer.play(url);
+ q1Toast('播放中');
+ } catch (e) {
+ q1Toast('播放出问题了');
}
}
@@ -139,19 +137,28 @@ class _SoundMsgState extends State<SoundMsg> with TickerProviderStateMixin {
soundImg = leftSoundNames;
}
- SoundMsgEntity model = SoundMsgEntity.fromJson(widget.model.msg);
- ISoundMsgEntity iModel = ISoundMsgEntity.fromJson(widget.model.msg);
- bool isIos = Platform.isIOS;
- if (!listNoEmpty(isIos ? iModel.soundUrls : model.urls)) return Container();
+ // SoundMsgEntity model = SoundMsgEntity.fromJson(widget.model.msg);
+ // ISoundMsgEntity iModel = ISoundMsgEntity.fromJson(widget.model.msg);
+ // bool isIos = Platform.isIOS;
+ // if (!listNoEmpty(isIos ? iModel.soundUrls : model.urls)) return Container();
- var urls = isIos ? iModel.soundUrls[0] : model.urls[0];
+ // var urls = isIos ? iModel.soundUrls[0] : model.urls[0];
var body = [
new MsgAvatar(model: widget.model, globalModel: globalModel),
new Container(
width: 100.0,
padding: EdgeInsets.only(right: 10.0),
- child: new FlatButton(
- padding: EdgeInsets.only(left: 18.0, right: 4.0),
+ child: new TextButton(
+ style: ButtonStyle(
+ backgroundColor: MaterialStateProperty.all(
+ widget.model.id == globalModel.account
+ ? Color(0xff98E165)
+ : Colors.white),
+ shape: MaterialStateProperty.all(
+ RoundedRectangleBorder(borderRadius: BorderRadius.circular(4))),
+ padding: MaterialStateProperty.all(
+ EdgeInsets.only(left: 18.0, right: 4.0)),
+ ),
child: new Row(
mainAxisAlignment:
isSelf ? MainAxisAlignment.end : MainAxisAlignment.start,
@@ -160,7 +167,7 @@ class _SoundMsgState extends State<SoundMsg> with TickerProviderStateMixin {
new Space(width: mainSpace / 2),
new Image.asset(
animation != null
- ? soundImg[animation.value % 3]
+ ? soundImg[animation!.value % 3]
: soundImg[3],
height: 20.0,
color: Colors.black,
@@ -168,16 +175,12 @@ class _SoundMsgState extends State<SoundMsg> with TickerProviderStateMixin {
new Space(width: mainSpace)
],
),
- shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(4)),
- color: widget.model.id == globalModel.account
- ? Color(0xff98E165)
- : Colors.white,
onPressed: () {
- if (strNoEmpty(urls)) {
- playNew(urls);
- } else {
- showToast(context, '未知错误');
- }
+ // if (strNoEmpty(urls)) {
+ // playNew(urls);
+ // } else {
+ // q1Toast( '未知错误');
+ // }
},
),
),
@@ -197,13 +200,13 @@ class _SoundMsgState extends State<SoundMsg> with TickerProviderStateMixin {
@override
void dispose() {
if (_positionSubscription != null) {
- _positionSubscription.cancel();
+ _positionSubscription!.cancel();
}
if (_audioPlayerStateSubscription != null) {
- _audioPlayerStateSubscription.cancel();
+ _audioPlayerStateSubscription!.cancel();
}
if (_playerSubscription != null) {
- _playerSubscription.cancel();
+ _playerSubscription!.cancel();
}
controller.dispose();
super.dispose();
diff --git a/lib/ui/message_view/text_item_container.dart b/lib/ui/message_view/text_item_container.dart
index de81cf2..e4b8804 100644
--- a/lib/ui/message_view/text_item_container.dart
+++ b/lib/ui/message_view/text_item_container.dart
@@ -6,8 +6,8 @@ import 'package:wechat_flutter/ui/edit/text_span_builder.dart';
import 'package:wechat_flutter/ui/w_pop/magic_pop.dart';
class TextItemContainer extends StatefulWidget {
- final String text;
- final String action;
+ final String? text;
+ final String? action;
final bool isMyself;
TextItemContainer({this.text, this.action, this.isMyself = true});
@@ -34,7 +34,7 @@ class _TextItemContainerState extends State<TextItemContainer> {
pressType: PressType.longPress,
actions: ['复制', '转发', '收藏', '撤回', '删除'],
child: new Container(
- width: widget.text.length > 24 ? (winWidth(context) - 66) - 100 : null,
+ width: widget.text!.length > 24 ? (FrameSize.winWidth() - 66) - 100 : null,
padding: EdgeInsets.all(5.0),
decoration: BoxDecoration(
color: widget.isMyself ? Color(0xff98E165) : Colors.white,
diff --git a/lib/ui/message_view/text_msg.dart b/lib/ui/message_view/text_msg.dart
index 35804dc..015f3f1 100644
--- a/lib/ui/message_view/text_msg.dart
+++ b/lib/ui/message_view/text_msg.dart
@@ -1,15 +1,14 @@
-import 'package:wechat_flutter/im/model/chat_data.dart';
-import 'package:wechat_flutter/ui/message_view/msg_avatar.dart';
import 'package:flutter/material.dart';
-import 'package:wechat_flutter/ui/message_view/text_item_container.dart';
import 'package:provider/provider.dart';
+import 'package:tencent_im_sdk_plugin/models/v2_tim_message.dart';
+import 'package:wechat_flutter/tools/provider/global_model.dart';
+import 'package:wechat_flutter/ui/message_view/msg_avatar.dart';
+import 'package:wechat_flutter/ui/message_view/text_item_container.dart';
-import '../../provider/global_model.dart';
-import '../view/image_view.dart';
class TextMsg extends StatelessWidget {
- final String text;
- final ChatData model;
+ final String? text;
+ final V2TimMessage model;
TextMsg(this.text, this.model);
@@ -21,11 +20,11 @@ class TextMsg extends StatelessWidget {
new TextItemContainer(
text: text ?? '文字为空',
action: '',
- isMyself: model.id == globalModel.account,
+ isMyself: model.sender == globalModel.account,
),
new Spacer(),
];
- if (model.id == globalModel.account) {
+ if (model.sender == globalModel.account) {
body = body.reversed.toList();
} else {
body = body;
diff --git a/lib/ui/message_view/video_message.dart b/lib/ui/message_view/video_message.dart
index c3fe02c..5d24eba 100644
--- a/lib/ui/message_view/video_message.dart
+++ b/lib/ui/message_view/video_message.dart
@@ -1,109 +1,83 @@
-//import 'package:cached_network_image/cached_network_image.dart';
-//import 'package:flutter/material.dart';
-//import 'package:wechat_flutter/pages/chat/video_play_page.dart';
-//import 'package:wechat_flutter/tools/wechat_flutter.dart';
-//import 'package:wechat_flutter/ui/massage/img_item_container.dart';
-//import 'package:wechat_flutter/ui/massage/vertical_container.dart';
-//import 'package:wechat_flutter/ui/message_view/wai2.dart';
-//
-//class VideoMessage extends StatefulWidget {
-// final dynamic video;
-// final int type;
-// final dynamic data;
-//
-// VideoMessage(this.video, this.type, this.data);
-//
-// @override
-// _VideoMessageState createState() => _VideoMessageState();
-//}
-//
-//class _VideoMessageState extends State<VideoMessage> {
-// Widget time() {
-// return new Container(
-// margin: EdgeInsets.only(right: 8.0, bottom: 5.0),
-// alignment: Alignment.bottomRight,
-// child: new Text(
-// '0:0${widget.video['video']['duaration']}',
-// style: TextStyle(color: Colors.white),
-// ),
-// );
-// }
-//
-// @override
-// Widget build(BuildContext context) {
-// if (widget.type == 1) {
-// return VerticalContainer(
-// type: 1,
-// children: <Widget>[
-// new MassageAvatar(widget.data, type: 1),
-// new ImgItemContainer(
-// height: 210,
-// child: new GestureDetector(
-// child: new Stack(
-// alignment: Alignment.center,
-// children: <Widget>[
-// new ClipRRect(
-// borderRadius: BorderRadius.all(Radius.circular(5.0)),
-// child: new CachedNetworkImage(
-// imageUrl:
-// '${widget.video['snapshot']['urls'].toString() == '[]' ? defContentImg : widget.video['snapshot']['urls'][0].toString()}',
-// width: double.parse(
-// '${widget.video['snapshot']['width']}.0'),
-// height: double.parse(
-// '${widget.video['snapshot']['height']}.0'),
-// fit: BoxFit.cover,
-// cacheManager: cacheManager,
-// ),
-// ),
-// new Image.asset('assets/images/ic_chat_play_icon.webp'),
-// time(),
-// ],
-// ),
-// onTap: () {
-// routePush(
-// VideoPlayPage(widget.video['video']['urls'][0]),
-// );
-// },
-// )),
-// ],
-// );
-// } else {
-// return VerticalContainer(
-// type: 2,
-// children: <Widget>[
-// new ImgItemContainer(
-// height: 210,
-// child: new GestureDetector(
-// child: new Stack(
-// alignment: Alignment.center,
-// children: <Widget>[
-// new ClipRRect(
-// borderRadius: BorderRadius.all(Radius.circular(5.0)),
-// child: new CachedNetworkImage(
-// imageUrl:
-// '${widget.video['snapshot']['urls'].toString() == '[]' ? defContentImg : widget.video['snapshot']['urls'][0].toString()}',
-// width: double.parse(
-// '${widget.video['snapshot']['width']}.0'),
-// height: double.parse(
-// '${widget.video['snapshot']['height']}.0'),
-// fit: BoxFit.cover,
-// cacheManager: cacheManager,
-// ),
-// ),
-// new Image.asset('assets/images/ic_chat_play_icon.webp'),
-// time(),
-// ],
-// ),
-// onTap: () {
-// routePush(
-// VideoPlayPage(widget.video['video']['urls'][0]),
-// );
-// },
-// )),
-// new Space(width: 8.0),
-// new MassageAvatar(widget.data, type: 0),
-// ],
-// );
-// }
-// }
-//}
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:wechat_flutter/pages/common/chat/video_play_page.dart';
+
+// import 'package:wechat_flutter/pages/common/chat/video_play_page.dart';
+import 'package:wechat_flutter/tools/provider/global_model.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+import 'package:wechat_flutter/ui/massage/img_item_container.dart';
+import 'package:wechat_flutter/ui/message_view/msg_avatar.dart';
+
+class VideoMessage extends StatefulWidget {
+ final V2TimMessage model;
+
+ VideoMessage(this.model);
+
+ @override
+ _VideoMessageState createState() => _VideoMessageState();
+}
+
+class _VideoMessageState extends State<VideoMessage> {
+ Widget time() {
+ return new Container(
+ margin: EdgeInsets.only(right: 8.0, bottom: 5.0),
+ alignment: Alignment.bottomRight,
+ child: new Text(
+ '0:0${widget.model.videoElem!.duration}',
+ style: TextStyle(color: Colors.white),
+ ),
+ );
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ final globalModel = Provider.of<GlobalModel>(context);
+ List<Widget> body = [
+ new MsgAvatar(model: widget.model, globalModel: globalModel),
+ Space(width: 5),
+ new ImgItemContainer(
+ height: 210,
+ child: new GestureDetector(
+ child: new Stack(
+ alignment: Alignment.center,
+ children: <Widget>[
+ new ClipRRect(
+ borderRadius: BorderRadius.all(Radius.circular(5.0)),
+ child: new CachedNetworkImage(
+ imageUrl: '${widget.model.videoElem!.snapshotUrl}',
+ width: double.parse(
+ '${widget.model.videoElem!.snapshotWidth}.0'),
+ height: double.parse(
+ '${widget.model.videoElem!.snapshotHeight}.0'),
+ fit: BoxFit.cover,
+ cacheManager: cacheManager,
+ ),
+ ),
+ new Image.asset(
+ 'assets/images/ic_chat_play_icon.png',
+ color: Colors.white.withOpacity(0.5),
+ ),
+ time(),
+ ],
+ ),
+ onTap: () {
+ Get.to(VideoPlayPage(widget.model.videoElem!.videoUrl));
+ },
+ ),
+ ),
+ new Spacer(),
+ ];
+
+ if (widget.model.sender == globalModel.account) {
+ body = body.reversed.toList();
+ } else {
+ body = body;
+ }
+
+ return Container(
+ // type: 1,
+ padding: EdgeInsets.symmetric(vertical: 5.0),
+ child: new Row(children: body),
+ );
+ }
+}
diff --git a/lib/ui/new_friend_card.dart b/lib/ui/new_friend_card.dart
index 330e377..680b4b5 100644
--- a/lib/ui/new_friend_card.dart
+++ b/lib/ui/new_friend_card.dart
@@ -3,24 +3,27 @@ import 'package:flutter/material.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
class NewFriendCard extends StatelessWidget {
- final String name, img;
+ final String? name, img;
final bool isAdd;
- final VoidCallback onTap;
+ final VoidCallback? onTap;
NewFriendCard({this.name, this.img, this.isAdd = false, this.onTap});
@override
Widget build(BuildContext context) {
- return new FlatButton(
- color: Colors.white,
- padding: EdgeInsets.symmetric(horizontal: 20.0),
+ return new TextButton(
+ style: ButtonStyle(
+ backgroundColor: MaterialStateProperty.all(Colors.white),
+ padding:
+ MaterialStateProperty.all(EdgeInsets.symmetric(horizontal: 20.0)),
+ ),
onPressed: () {},
child: new Row(
children: <Widget>[
new ImageView(img: img, width: 45.0, height: 45.0, fit: BoxFit.cover),
new Space(width: mainSpace),
new Container(
- width: winWidth(context) - 95,
+ width: FrameSize.winWidth() - 95,
padding: EdgeInsets.symmetric(vertical: 15.0),
decoration: BoxDecoration(
border: Border(
@@ -58,7 +61,7 @@ class NewFriendCard extends StatelessWidget {
style: TextStyle(color: Colors.green),
onTap: () {
if (onTap != null) {
- onTap();
+ onTap!();
}
},
)
diff --git a/lib/ui/orther/button_row.dart b/lib/ui/orther/button_row.dart
index b12ae65..c82199f 100644
--- a/lib/ui/orther/button_row.dart
+++ b/lib/ui/orther/button_row.dart
@@ -3,10 +3,10 @@ import 'package:flutter/material.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
class ButtonRow extends StatelessWidget {
- final EdgeInsetsGeometry margin;
- final String text;
+ final EdgeInsetsGeometry? margin;
+ final String? text;
final TextStyle style;
- final VoidCallback onPressed;
+ final VoidCallback? onPressed;
final bool isBorder;
final double lineWidth;
@@ -31,14 +31,16 @@ class ButtonRow extends StatelessWidget {
)
: null,
),
- child: new FlatButton(
- padding: EdgeInsets.all(0),
- color: Colors.white,
+ child: new TextButton(
+ style: ButtonStyle(
+ backgroundColor: MaterialStateProperty.all(Colors.white),
+ padding: MaterialStateProperty.all(EdgeInsets.all(0)),
+ ),
onPressed: onPressed ?? () {},
child: new Container(
padding: EdgeInsets.symmetric(vertical: 15.0),
alignment: Alignment.center,
- child: new Text(text, style: style),
+ child: new Text(text!, style: style),
),
),
);
diff --git a/lib/ui/orther/label_row.dart b/lib/ui/orther/label_row.dart
index a873819..11f32fd 100644
--- a/lib/ui/orther/label_row.dart
+++ b/lib/ui/orther/label_row.dart
@@ -4,17 +4,17 @@ import 'package:flutter/cupertino.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
class LabelRow extends StatelessWidget {
- final String label;
- final VoidCallback onPressed;
- final double labelWidth;
+ final String? label;
+ final VoidCallback? onPressed;
+ final double? labelWidth;
final bool isRight;
final bool isLine;
- final String value;
- final String rValue;
- final Widget rightW;
- final EdgeInsetsGeometry margin;
+ final String? value;
+ final String? rValue;
+ final Widget? rightW;
+ final EdgeInsetsGeometry? margin;
final EdgeInsetsGeometry padding;
- final Widget headW;
+ final Widget? headW;
final double lineWidth;
LabelRow({
@@ -35,9 +35,11 @@ class LabelRow extends StatelessWidget {
@override
Widget build(BuildContext context) {
return new Container(
- child: new FlatButton(
- color: Colors.white,
- padding: EdgeInsets.all(0),
+ child: new TextButton(
+ style: ButtonStyle(
+ backgroundColor: MaterialStateProperty.all(Colors.white),
+ padding: MaterialStateProperty.all(EdgeInsets.all(0)),
+ ),
onPressed: onPressed ?? () {},
child: new Container(
padding: padding,
@@ -49,7 +51,7 @@ class LabelRow extends StatelessWidget {
),
child: new Row(
children: <Widget>[
- if (headW != null) headW,
+ if (headW != null) headW!,
new SizedBox(
width: labelWidth,
child: new Text(
@@ -58,19 +60,19 @@ class LabelRow extends StatelessWidget {
),
),
value != null
- ? new Text(value,
+ ? new Text(value!,
style: TextStyle(
color: mainTextColor.withOpacity(0.7),
))
: new Container(),
new Spacer(),
rValue != null
- ? new Text(rValue,
+ ? new Text(rValue!,
style: TextStyle(
color: mainTextColor.withOpacity(0.7),
fontWeight: FontWeight.w400))
: new Container(),
- rightW != null ? rightW : new Container(),
+ rightW != null ? rightW! : new Container(),
isRight
? new Icon(CupertinoIcons.right_chevron,
color: mainTextColor.withOpacity(0.5))
diff --git a/lib/ui/orther/person_card.dart b/lib/ui/orther/person_card.dart
index bd3d9c6..6699deb 100644
--- a/lib/ui/orther/person_card.dart
+++ b/lib/ui/orther/person_card.dart
@@ -3,9 +3,9 @@ import 'package:flutter/material.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
class PersonCard extends StatelessWidget {
- final String imageUrl;
- final String name;
- final String area;
+ final String? imageUrl;
+ final String? name;
+ final String? area;
final int gender;
PersonCard({this.imageUrl, this.name, this.area, this.gender = 0});
@@ -44,7 +44,7 @@ class PersonCard extends StatelessWidget {
new Row(
children: <Widget>[
new Text(
- name,
+ name!,
style: TextStyle(fontSize: 20.0, fontWeight: FontWeight.w500),
),
new Space(),
diff --git a/lib/ui/orther/tip_verify_Input.dart b/lib/ui/orther/tip_verify_Input.dart
index f26bf8b..882dbfa 100644
--- a/lib/ui/orther/tip_verify_Input.dart
+++ b/lib/ui/orther/tip_verify_Input.dart
@@ -3,10 +3,10 @@ import 'package:flutter/material.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
class TipVerifyInput extends StatefulWidget {
- final String title;
- final String defStr;
- final TextEditingController controller;
- final FocusNode focusNode;
+ final String? title;
+ final String? defStr;
+ final TextEditingController? controller;
+ final FocusNode? focusNode;
final Color color;
TipVerifyInput(
@@ -24,7 +24,7 @@ class _VerifyInputState extends State<TipVerifyInput> {
@override
void initState() {
super.initState();
- widget.controller.text = widget.defStr;
+ widget.controller!.text = widget.defStr!;
}
Widget contentBuild() {
@@ -39,21 +39,21 @@ class _VerifyInputState extends State<TipVerifyInput> {
},
onTap: () => setState(() {}),
style: TextStyle(
- color: widget.focusNode.hasFocus ? Colors.black : Colors.grey,
+ color: widget.focusNode!.hasFocus ? Colors.black : Colors.grey,
textBaseline: TextBaseline.alphabetic,
),
),
),
- widget.controller.text != ''
+ widget.controller!.text != ''
? new Visibility(
- visible: widget.focusNode.hasFocus,
+ visible: widget.focusNode!.hasFocus,
child: new InkWell(
child: new Padding(
padding: EdgeInsets.all(2.0),
child: new Image.asset('assets/images/ic_delete.webp'),
),
onTap: () {
- widget.controller.text = '';
+ widget.controller!.text = '';
setState(() {});
},
))
@@ -66,11 +66,11 @@ class _VerifyInputState extends State<TipVerifyInput> {
new Space(height: mainSpace),
new Expanded(
child: new Container(
- width: winWidth(context) - 20,
+ width: FrameSize.winWidth() - 20,
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(
- color: widget.focusNode.hasFocus
+ color: widget.focusNode!.hasFocus
? Colors.green
: lineColor.withOpacity(0.5),
width: 0.5),
@@ -95,7 +95,7 @@ class _VerifyInputState extends State<TipVerifyInput> {
Widget build(BuildContext context) {
return new Container(
height: 100.0,
- width: winWidth(context),
+ width: FrameSize.winWidth(),
color: widget.color,
padding: EdgeInsets.all(10.0),
margin: EdgeInsets.symmetric(horizontal: 10.0),
diff --git a/lib/ui/orther/verify_input.dart b/lib/ui/orther/verify_input.dart
index 5dfb133..3fd56b1 100644
--- a/lib/ui/orther/verify_input.dart
+++ b/lib/ui/orther/verify_input.dart
@@ -3,10 +3,10 @@ import 'package:flutter/material.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
class VerifyInput extends StatefulWidget {
- final String title;
+ final String? title;
final String defStr;
- final TextEditingController controller;
- final FocusNode focusNode;
+ final TextEditingController? controller;
+ final FocusNode? focusNode;
VerifyInput({this.title, this.controller, this.defStr = '', this.focusNode});
@@ -18,7 +18,7 @@ class _VerifyInputState extends State<VerifyInput> {
@override
void initState() {
super.initState();
- widget.controller.text = widget.defStr;
+ widget.controller!.text = widget.defStr;
}
Widget contentBuild() {
@@ -33,21 +33,21 @@ class _VerifyInputState extends State<VerifyInput> {
},
onTap: () => setState(() {}),
style: TextStyle(
- color: widget.focusNode.hasFocus ? Colors.black : Colors.grey,
+ color: widget.focusNode!.hasFocus ? Colors.black : Colors.grey,
textBaseline: TextBaseline.alphabetic,
),
),
),
- widget.controller.text != ''
+ widget.controller!.text != ''
? new Visibility(
- visible: widget.focusNode.hasFocus,
+ visible: widget.focusNode!.hasFocus,
child: new InkWell(
child: new Padding(
padding: EdgeInsets.all(2.0),
child: new Image.asset('assets/images/ic_delete.webp'),
),
onTap: () {
- widget.controller.text = '';
+ widget.controller!.text = '';
setState(() {});
},
))
@@ -64,11 +64,11 @@ class _VerifyInputState extends State<VerifyInput> {
new Space(height: mainSpace),
new Expanded(
child: new Container(
- width: winWidth(context) - 20,
+ width: FrameSize.winWidth() - 20,
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(
- color: widget.focusNode.hasFocus
+ color: widget.focusNode!.hasFocus
? Colors.green
: lineColor.withOpacity(0.5),
width: 0.5),
@@ -87,7 +87,7 @@ class _VerifyInputState extends State<VerifyInput> {
Widget build(BuildContext context) {
return new Container(
height: 100.0,
- width: winWidth(context),
+ width: FrameSize.winWidth(),
color: Colors.white,
padding: EdgeInsets.all(10.0),
child: contentBuild(),
diff --git a/lib/ui/orther/verify_switch.dart b/lib/ui/orther/verify_switch.dart
index 795cbbc..ddb22fd 100644
--- a/lib/ui/orther/verify_switch.dart
+++ b/lib/ui/orther/verify_switch.dart
@@ -5,7 +5,7 @@ import 'package:flutter/material.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
class VerifySwitch extends StatefulWidget {
- final String title;
+ final String? title;
final String defStr;
VerifySwitch({this.title, this.defStr = ''});
@@ -42,7 +42,7 @@ class _VerifySwitchState extends State<VerifySwitch> {
),
new Space(height: mainSpace * 1),
new Container(
- width: winWidth(context) - 20,
+ width: FrameSize.winWidth() - 20,
padding: EdgeInsets.symmetric(horizontal: 10.0),
alignment: Alignment.center,
child: row,
@@ -55,7 +55,7 @@ class _VerifySwitchState extends State<VerifySwitch> {
Widget build(BuildContext context) {
return new Container(
height: 100.0,
- width: winWidth(context),
+ width: FrameSize.winWidth(),
color: Colors.white,
padding: EdgeInsets.symmetric(horizontal: 10.0, vertical: 10.0),
child: contentBuild(),
diff --git a/lib/ui/view/edit_view.dart b/lib/ui/view/edit_view.dart
index 36eec29..5a7d8d5 100644
--- a/lib/ui/view/edit_view.dart
+++ b/lib/ui/view/edit_view.dart
@@ -3,29 +3,36 @@ import 'package:flutter/material.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
class EditView extends StatelessWidget {
- final String label;
- final String hint;
- final TextEditingController controller;
- final Color bottomLineColor;
- final FocusNode focusNode;
- final GestureTapCallback onTap;
- final ValueChanged<String> onChanged;
+ final String? label;
+ final String? hint;
+ final TextEditingController? controller;
+ final Color? bottomLineColor;
+ final FocusNode? focusNode;
+ final GestureTapCallback? onTap;
+ final ValueChanged<String>? onChanged;
+ final bool obscureText;
+ final TextInputType? keyboardType;
+ final Widget? rWidget;
- EditView(
- {this.label,
- this.hint,
- this.controller,
- this.bottomLineColor,
- this.focusNode,
- this.onTap,
- this.onChanged});
+ EditView({
+ this.label,
+ this.hint,
+ this.controller,
+ this.bottomLineColor,
+ this.focusNode,
+ this.onTap,
+ this.onChanged,
+ this.obscureText = false,
+ this.keyboardType,
+ this.rWidget,
+ });
@override
Widget build(BuildContext context) {
var row = new Row(
children: <Widget>[
new Container(
- width: winWidth(context) * 0.25,
+ width: FrameSize.winWidth() * 0.25,
alignment: Alignment.centerLeft,
child: new Text(label ?? '',
style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.w400)),
@@ -39,8 +46,11 @@ class EditView extends StatelessWidget {
InputDecoration(hintText: hint ?? '', border: InputBorder.none),
onTap: onTap ?? () {},
onChanged: onChanged ?? (str) {},
+ obscureText: obscureText,
+ keyboardType: keyboardType,
),
),
+ if (rWidget != null) rWidget!,
],
);
diff --git a/lib/ui/view/image_view.dart b/lib/ui/view/image_view.dart
index 34138b8..ffd1ae9 100644
--- a/lib/ui/view/image_view.dart
+++ b/lib/ui/view/image_view.dart
@@ -1,16 +1,16 @@
import 'package:flutter/material.dart';
-
+import 'package:wechat_flutter/tools/commom/check.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
class ImageView extends StatelessWidget {
- final String img;
- final double width;
- final double height;
- final BoxFit fit;
+ final String? img;
+ final double? width;
+ final double? height;
+ final BoxFit? fit;
final bool isRadius;
ImageView({
- @required this.img,
+ required this.img,
this.height,
this.width,
this.fit,
@@ -20,42 +20,67 @@ class ImageView extends StatelessWidget {
@override
Widget build(BuildContext context) {
Widget image;
- if (isNetWorkImg(img)) {
- image = new CachedNetworkImage(
- imageUrl: img,
- width: width,
- height: height,
- fit: fit,
- cacheManager: cacheManager,
- );
- } else if (File(img).existsSync()) {
- image = new Image.file(
- File(img),
- width: width,
- height: height,
- fit: fit,
- );
- } else if (isAssetsImg(img)) {
- image = new Image.asset(
- img,
- width: width,
- height: height,
- fit: width != null && height != null ? BoxFit.fill : fit,
- );
- } else {
- image = new Container(
- decoration: BoxDecoration(
+
+ Widget defWidget = new Container(
+ decoration: BoxDecoration(
color: Colors.black26.withOpacity(0.1),
- border: Border.all(color: Colors.black.withOpacity(0.2),width: 0.3)
- ),
- child: new Image.asset(
+ border: Border.all(color: Colors.black.withOpacity(0.2), width: 0.3)),
+ child: new Image.asset(
+ defIcon,
+ width: (width ?? 1) - 1,
+ height: (height ?? 1) - 1,
+ fit: width != null && height != null ? BoxFit.fill : fit,
+ ),
+ );
+ try {
+ if (!strNoEmpty(img)) {
+ image = new Image.asset(
defIcon,
- width: width-1,
- height: height-1,
+ width: width,
+ height: height,
fit: width != null && height != null ? BoxFit.fill : fit,
- ),
- );
+ );
+ } else if (isNetWorkImg(img)) {
+ LogUtil.d("img avatar::$img");
+ image = new CachedNetworkImage(
+ imageUrl: img!,
+ width: width,
+ height: height,
+ fit: fit,
+ cacheManager: cacheManager,
+ errorWidget: (
+ BuildContext context,
+ String url,
+ dynamic error,
+ ) {
+ return defWidget;
+ },
+ placeholder: (BuildContext context, String url) {
+ return defWidget;
+ },
+ );
+ } else if (File(img!).existsSync()) {
+ image = new Image.file(
+ File(img!),
+ width: width,
+ height: height,
+ fit: fit,
+ );
+ } else if (isAssetsImg(img)) {
+ image = new Image.asset(
+ img!,
+ width: width,
+ height: height,
+ fit: width != null && height != null ? BoxFit.fill : fit,
+ );
+ } else {
+ image = defWidget;
+ }
+ } catch (e) {
+ print("加载头像出现错误::${e.toString()}");
+ image = defWidget;
}
+
if (isRadius) {
return new ClipRRect(
borderRadius: BorderRadius.all(
diff --git a/lib/ui/view/indicator_page_view.dart b/lib/ui/view/indicator_page_view.dart
index 7ae1346..870bd43 100644
--- a/lib/ui/view/indicator_page_view.dart
+++ b/lib/ui/view/indicator_page_view.dart
@@ -3,8 +3,8 @@ import 'package:flutter/material.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
class IndicatorPageView extends StatefulWidget {
- final PageController pageC;
- final List<Widget> pages;
+ final PageController? pageC;
+ final List<Widget>? pages;
IndicatorPageView({this.pageC, this.pages});
@@ -44,14 +44,14 @@ class IndicatorPageViewState extends State<IndicatorPageView> {
onPageChanged: (v) {
setState(() => currentMoreIndex = v);
},
- children: widget.pages,
+ children: widget.pages!,
),
),
new Container(
padding: EdgeInsets.only(bottom: 10.0),
child: new Row(
mainAxisAlignment: MainAxisAlignment.center,
- children: List.generate(widget.pages.length, itemView),
+ children: List.generate(widget.pages!.length, itemView),
),
)
],
diff --git a/lib/ui/view/list_tile_view.dart b/lib/ui/view/list_tile_view.dart
index 86c3339..233030b 100644
--- a/lib/ui/view/list_tile_view.dart
+++ b/lib/ui/view/list_tile_view.dart
@@ -4,18 +4,18 @@ import 'package:flutter/material.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
class ListTileView extends StatelessWidget {
- final BoxBorder border;
- final VoidCallback onPressed;
- final String title;
- final String label;
- final String icon;
+ final BoxBorder? border;
+ final VoidCallback? onPressed;
+ final String? title;
+ final String? label;
+ final String? icon;
final double width;
final double horizontal;
final TextStyle titleStyle;
final bool isLabel;
final EdgeInsetsGeometry padding;
- final EdgeInsetsGeometry margin;
- final BoxFit fit;
+ final EdgeInsetsGeometry? margin;
+ final BoxFit? fit;
ListTileView({
this.border,
@@ -38,7 +38,7 @@ class ListTileView extends StatelessWidget {
var text = new Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
- new Text(title ?? '', style: titleStyle ?? null),
+ new Text(title ?? '', style: titleStyle),
new Text(
label ?? '',
style: TextStyle(color: mainTextColor, fontSize: 12),
@@ -47,7 +47,7 @@ class ListTileView extends StatelessWidget {
);
var view = [
- isLabel ? text : new Text(title, style: titleStyle),
+ isLabel ? text : new Text(title!, style: titleStyle),
new Spacer(),
new Container(
width: 7.0,
@@ -69,7 +69,7 @@ class ListTileView extends StatelessWidget {
new ImageView(img: icon, width: width, fit: fit),
),
new Container(
- width: winWidth(context) - 60,
+ width: FrameSize.winWidth() - 60,
padding: padding,
decoration: BoxDecoration(border: border),
child: new Row(children: view),
@@ -79,9 +79,11 @@ class ListTileView extends StatelessWidget {
return new Container(
margin: margin,
- child: new FlatButton(
- color: Colors.white,
- padding: EdgeInsets.all(0),
+ child: new TextButton(
+ style: ButtonStyle(
+ backgroundColor: MaterialStateProperty.all(Colors.white),
+ padding: MaterialStateProperty.all(EdgeInsets.all(0)),
+ ),
onPressed: onPressed ?? () {},
child: row,
),
diff --git a/lib/ui/view/loading_view.dart b/lib/ui/view/loading_view.dart
index 97c2a5d..be5c6b7 100644
--- a/lib/ui/view/loading_view.dart
+++ b/lib/ui/view/loading_view.dart
@@ -1,4 +1,5 @@
-import 'package:wechat_flutter/pages/root/user_page.dart';
+import 'package:get/get.dart';
+import 'package:wechat_flutter/pages/common/user/user_page.dart';
import 'package:flutter/material.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
@@ -30,7 +31,7 @@ class LoadingView extends StatelessWidget {
],
),
onTap: () {
- if (isStr) routePush(new UserPage());
+ if (isStr) Get.to(new UserPage());
},
),
new Space(),
diff --git a/lib/ui/view/main_input.dart b/lib/ui/view/main_input.dart
index f3e737b..d526d56 100755
--- a/lib/ui/view/main_input.dart
+++ b/lib/ui/view/main_input.dart
@@ -8,10 +8,10 @@ class MainInputBody extends StatefulWidget {
this.onTap,
});
- final Widget child;
+ final Widget? child;
final Color color;
- final Decoration decoration;
- final GestureTapCallback onTap;
+ final Decoration? decoration;
+ final GestureTapCallback? onTap;
@override
State<StatefulWidget> createState() => new MainInputBodyState();
@@ -31,7 +31,7 @@ class MainInputBodyState extends State<MainInputBody> {
onTap: () {
FocusScope.of(context).requestFocus(new FocusNode());
if (widget.onTap != null) {
- widget.onTap();
+ widget.onTap!();
}
},
),
@@ -46,7 +46,7 @@ class MainInputBodyState extends State<MainInputBody> {
onTap: () {
FocusScope.of(context).requestFocus(new FocusNode());
if (widget.onTap != null) {
- widget.onTap();
+ widget.onTap!();
}
},
),
diff --git a/lib/ui/view/null_view.dart b/lib/ui/view/null_view.dart
index bdcebe3..a5fa7b0 100644
--- a/lib/ui/view/null_view.dart
+++ b/lib/ui/view/null_view.dart
@@ -1,6 +1,5 @@
-import 'package:wechat_flutter/pages/root/user_page.dart';
import 'package:flutter/material.dart';
-
+import 'package:wechat_flutter/pages/common/user/user_page.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
class HomeNullView extends StatelessWidget {
@@ -13,10 +12,10 @@ class HomeNullView extends StatelessWidget {
return new Center(
child: new InkWell(
child: new Text(
- str ?? '',
+ str,
style: TextStyle(color: mainTextColor),
),
- onTap: () => routePush(new UserPage()),
+ onTap: () => Get.to(new UserPage()),
),
);
}
diff --git a/lib/ui/view/pop_view.dart b/lib/ui/view/pop_view.dart
index 559743f..b79b80c 100755
--- a/lib/ui/view/pop_view.dart
+++ b/lib/ui/view/pop_view.dart
@@ -5,7 +5,7 @@ const double _kMenuHorizontalPadding = 16.0;
const double _kMenuItemHeight = 48.0;
class MyPopupMenuItem<T> extends PopupMenuEntry<T> {
- final T value;
+ final T? value;
final bool enabled;
@override
final double height;
@@ -15,10 +15,10 @@ class MyPopupMenuItem<T> extends PopupMenuEntry<T> {
{this.value,
this.enabled = true,
this.height = _kMenuItemHeight,
- @required this.child});
+ required this.child});
@override
- bool represents(T value) => value == this.value;
+ bool represents(T? value) => value == this.value;
@override
PopupMenuItemState<T, MyPopupMenuItem<T>> createState() =>
@@ -38,15 +38,15 @@ class PopupMenuItemState<T, W extends MyPopupMenuItem<T>> extends State<W> {
Widget build(BuildContext context) {
final ThemeData theme = Theme.of(context);
/// 适配flutter2.5.2
- TextStyle style = theme.textTheme.subtitle1;
- if (!widget.enabled) style = style.copyWith(color: theme.disabledColor);
+ TextStyle? style = theme.textTheme.subtitle1;
+ if (!widget.enabled) style = style!.copyWith(color: theme.disabledColor);
Widget item = AnimatedDefaultTextStyle(
- style: style,
+ style: style!,
duration: Duration(milliseconds: 20),
child: Baseline(
baseline: widget.height - _kBaselineOffsetFromBottom,
- baselineType: style.textBaseline,
+ baselineType: style.textBaseline!,
child: buildChild(),
),
);
diff --git a/lib/ui/view/search_main_view.dart b/lib/ui/view/search_main_view.dart
index ff0a603..206b1e0 100644
--- a/lib/ui/view/search_main_view.dart
+++ b/lib/ui/view/search_main_view.dart
@@ -3,8 +3,8 @@ import 'package:flutter/material.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
class SearchMainView extends StatelessWidget {
- final GestureTapCallback onTap;
- final String text;
+ final GestureTapCallback? onTap;
+ final String? text;
final bool isBorder;
SearchMainView({
@@ -22,7 +22,7 @@ class SearchMainView extends StatelessWidget {
child: new Icon(Icons.search, color: mainTextColor),
),
new Text(
- text,
+ text!,
style: TextStyle(color: mainTextColor),
)
],
diff --git a/lib/ui/view/search_tile_view.dart b/lib/ui/view/search_tile_view.dart
index 8278053..00384ef 100644
--- a/lib/ui/view/search_tile_view.dart
+++ b/lib/ui/view/search_tile_view.dart
@@ -5,13 +5,13 @@ import 'package:wechat_flutter/tools/wechat_flutter.dart';
class SearchTileView extends StatelessWidget {
final String text;
final int type;
- final VoidCallback onPressed;
+ final VoidCallback? onPressed;
SearchTileView(this.text, {this.type = 0, this.onPressed});
@override
Widget build(BuildContext context) {
- var bt = new FlatButton(
+ var bt = new TextButton(
onPressed: onPressed ?? () {},
child: new Row(
children: <Widget>[
@@ -68,7 +68,7 @@ class SearchTileView extends StatelessWidget {
border: Border(
top: BorderSide(
color: Colors.grey.withOpacity(0.2), width: 0.5))),
- width: winWidth(context),
+ width: FrameSize.winWidth(),
height: 65.0,
child: strNoEmpty(text) ? bt : new Container(),
);
@@ -80,9 +80,9 @@ class SearchTileView extends StatelessWidget {
top: BorderSide(color: Colors.grey.withOpacity(0.2), width: 0.5),
),
),
- width: winWidth(context),
+ width: FrameSize.winWidth(),
height: 65.0,
- child: new FlatButton(
+ child: new TextButton(
onPressed: () {},
child: row,
),
diff --git a/lib/ui/view/shake_view.dart b/lib/ui/view/shake_view.dart
index 5d6433c..9ab3963 100644
--- a/lib/ui/view/shake_view.dart
+++ b/lib/ui/view/shake_view.dart
@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
/// 封装之后的拍一拍
class ShakeView extends StatefulWidget {
- final Widget child;
+ final Widget? child;
ShakeView({
this.child,
@@ -15,8 +15,8 @@ class ShakeView extends StatefulWidget {
class _ShakeViewState extends State<ShakeView>
with SingleTickerProviderStateMixin {
- Animation<double> animation;
- AnimationController controller;
+ late Animation<double> animation;
+ late AnimationController controller;
initState() {
super.initState();
@@ -44,14 +44,14 @@ class _ShakeViewState extends State<ShakeView>
}
class AnimateWidget extends AnimatedWidget {
- final Widget child;
+ final Widget? child;
- AnimateWidget({Animation<double> animation, this.child})
+ AnimateWidget({required Animation<double> animation, this.child})
: super(listenable: animation);
@override
Widget build(BuildContext context) {
- final Animation<double> animation = listenable;
+ final Animation<double> animation = listenable as Animation<double>;
var result = Transform(
transform: Matrix4.rotationZ(animation.value * pi / 180),
alignment: Alignment.bottomCenter,
diff --git a/lib/ui/w_pop/friend_pop.dart b/lib/ui/w_pop/friend_pop.dart
index 3aca1f2..def5696 100644
--- a/lib/ui/w_pop/friend_pop.dart
+++ b/lib/ui/w_pop/friend_pop.dart
@@ -4,16 +4,16 @@ class PopRoute extends PopupRoute {
final Duration _duration = Duration(milliseconds: 300);
Widget child;
- PopRoute({@required this.child});
+ PopRoute({required this.child});
@override
- Color get barrierColor => null;
+ Color? get barrierColor => null;
@override
bool get barrierDismissible => true;
@override
- String get barrierLabel => null;
+ String? get barrierLabel => null;
@override
Widget buildPage(BuildContext context, Animation<double> animation,
@@ -26,13 +26,13 @@ class PopRoute extends PopupRoute {
}
class Popup extends StatefulWidget {
- final BuildContext btnContext;
+ final BuildContext? btnContext;
final Widget child;
- final Function onClick; //点击child事件
+ final Function? onClick; //点击child事件
Popup({
this.btnContext,
- @required this.child,
+ required this.child,
this.onClick,
});
@@ -40,21 +40,21 @@ class Popup extends StatefulWidget {
}
class PopupState extends State<Popup> {
- RenderBox button;
- RenderBox overlay;
- RelativeRect position;
+ RenderBox? button;
+ RenderBox? overlay;
+ late RelativeRect position;
@override
void initState() {
super.initState();
- button = widget.btnContext.findRenderObject();
- overlay = Overlay.of(widget.btnContext).context.findRenderObject();
+ button = widget.btnContext!.findRenderObject() as RenderBox?;
+ overlay = Overlay.of(widget.btnContext!)!.context.findRenderObject() as RenderBox?;
position = RelativeRect.fromRect(
Rect.fromPoints(
- button.localToGlobal(Offset.zero, ancestor: overlay),
- button.localToGlobal(Offset.zero, ancestor: overlay),
+ button!.localToGlobal(Offset.zero, ancestor: overlay),
+ button!.localToGlobal(Offset.zero, ancestor: overlay),
),
- Offset.zero & overlay.size,
+ Offset.zero & overlay!.size,
);
}
@@ -97,7 +97,7 @@ class PopupState extends State<Popup> {
//点击子child
if (widget.onClick != null) {
Navigator.of(context).pop();
- widget.onClick();
+ widget.onClick!();
}
},
),
diff --git a/lib/ui/w_pop/magic_pop.dart b/lib/ui/w_pop/magic_pop.dart
index 4c928da..c043531 100644
--- a/lib/ui/w_pop/magic_pop.dart
+++ b/lib/ui/w_pop/magic_pop.dart
@@ -5,9 +5,9 @@ const double _kMenuScreenPadding = 8.0;
class MagicPop extends StatefulWidget {
MagicPop({
- @required this.onValueChanged,
- @required this.actions,
- @required this.child,
+ required this.onValueChanged,
+ required this.actions,
+ required this.child,
this.pressType = PressType.longPress,
this.pageMaxChildCount = 5,
this.backgroundColor = Colors.black,
@@ -17,9 +17,9 @@ class MagicPop extends StatefulWidget {
assert(actions != null && actions.length > 0),
assert(child != null);
- final ValueChanged<int> onValueChanged;
- final List<String> actions;
- final Widget child;
+ final ValueChanged<int>? onValueChanged;
+ final List<String>? actions;
+ final Widget? child;
final PressType pressType; // 点击方式 长按 还是单击
final int pageMaxChildCount;
final Color backgroundColor;
@@ -51,10 +51,15 @@ class _WPopupMenuState extends State<MagicPop> {
void onTap() {
Navigator.push(
context,
- _PopupMenuRoute(context, widget.actions, widget.pageMaxChildCount,
- widget.backgroundColor, widget.menuWidth, widget.menuHeight))
+ _PopupMenuRoute(
+ context,
+ widget.actions ?? [],
+ widget.pageMaxChildCount,
+ widget.backgroundColor,
+ widget.menuWidth,
+ widget.menuHeight))
.then((index) {
- widget.onValueChanged(index);
+ if (widget.onValueChanged != null) widget.onValueChanged!(index);
});
}
}
@@ -68,8 +73,8 @@ enum PressType {
class _PopupMenuRoute extends PopupRoute {
final BuildContext btnContext;
- double _height;
- double _width;
+ double? _height;
+ double? _width;
final List<String> actions;
final int _pageMaxChildCount;
final Color backgroundColor;
@@ -78,8 +83,8 @@ class _PopupMenuRoute extends PopupRoute {
_PopupMenuRoute(this.btnContext, this.actions, this._pageMaxChildCount,
this.backgroundColor, this.menuWidth, this.menuHeight) {
- _height = btnContext.size.height;
- _width = btnContext.size.width;
+ _height = btnContext.size!.height;
+ _width = btnContext.size!.width;
}
@override
@@ -92,13 +97,13 @@ class _PopupMenuRoute extends PopupRoute {
}
@override
- Color get barrierColor => null;
+ Color? get barrierColor => null;
@override
bool get barrierDismissible => true;
@override
- String get barrierLabel => null;
+ String? get barrierLabel => null;
@override
Widget buildPage(BuildContext context, Animation<double> animation,
@@ -113,8 +118,8 @@ class _PopupMenuRoute extends PopupRoute {
class _MenuPopWidget extends StatefulWidget {
final BuildContext btnContext;
- final double _height;
- final double _width;
+ final double? _height;
+ final double? _width;
final List<String> actions;
final int _pageMaxChildCount;
final Color backgroundColor;
@@ -141,21 +146,22 @@ class __MenuPopWidgetState extends State<_MenuPopWidget> {
final double _separatorWidth = 1;
final double _triangleHeight = 10;
- RenderBox button;
- RenderBox overlay;
- RelativeRect position;
+ RenderBox? button;
+ RenderBox? overlay;
+ RelativeRect? position;
@override
void initState() {
super.initState();
- button = widget.btnContext.findRenderObject();
- overlay = Overlay.of(widget.btnContext).context.findRenderObject();
+ button = widget.btnContext.findRenderObject() as RenderBox?;
+ overlay =
+ Overlay.of(widget.btnContext)!.context.findRenderObject() as RenderBox?;
position = RelativeRect.fromRect(
Rect.fromPoints(
- button.localToGlobal(Offset.zero, ancestor: overlay),
- button.localToGlobal(Offset.zero, ancestor: overlay),
+ button!.localToGlobal(Offset.zero, ancestor: overlay),
+ button!.localToGlobal(Offset.zero, ancestor: overlay),
),
- Offset.zero & overlay.size,
+ Offset.zero & overlay!.size,
);
}
@@ -189,10 +195,10 @@ class __MenuPopWidgetState extends State<_MenuPopWidget> {
// ignore: unused_element
Widget view() {
- var isInverted = (position.top +
+ var isInverted = (position!.top +
(MediaQuery.of(context).size.height -
- position.top -
- position.bottom) /
+ position!.top -
+ position!.bottom) /
2.0 -
(widget.menuHeight + _triangleHeight)) <
(widget.menuHeight + _triangleHeight) * 2;
@@ -203,7 +209,7 @@ class __MenuPopWidgetState extends State<_MenuPopWidget> {
color: widget.backgroundColor,
position: position,
isInverted: true,
- size: button.size),
+ size: button!.size),
);
var row = Row(
@@ -308,7 +314,7 @@ class __MenuPopWidgetState extends State<_MenuPopWidget> {
painter: TrianglePainter(
color: widget.backgroundColor,
position: position,
- size: button.size),
+ size: button!.size),
),
],
),
@@ -387,7 +393,7 @@ class _PopupMenuRouteLayout extends SingleChildLayoutDelegate {
this.textDirection, this.width, this.menuWidth);
// Rectangle of underlying button, relative to the overlay's dimensions.
- final RelativeRect position;
+ final RelativeRect? position;
// The distance from the top of the menu to the middle of selected item.
//
@@ -397,7 +403,7 @@ class _PopupMenuRouteLayout extends SingleChildLayoutDelegate {
// Whether to prefer going to the left or to the right.
final TextDirection textDirection;
- final double width;
+ final double? width;
final double menuWidth;
// We put the child wherever position specifies, so long as it will fit within
@@ -409,7 +415,8 @@ class _PopupMenuRouteLayout extends SingleChildLayoutDelegate {
// The menu can be at most the size of the overlay minus 8.0 pixels in each
// direction.
return BoxConstraints.loose(constraints.biggest -
- const Offset(_kMenuScreenPadding * 2.0, _kMenuScreenPadding * 2.0));
+ const Offset(_kMenuScreenPadding * 2.0, _kMenuScreenPadding * 2.0)
+ as Size);
}
@override
@@ -421,27 +428,27 @@ class _PopupMenuRouteLayout extends SingleChildLayoutDelegate {
// Find the ideal vertical position.
double y;
if (selectedItemOffset == null) {
- y = position.top;
+ y = position!.top;
} else {
- y = position.top +
- (size.height - position.top - position.bottom) / 2.0 -
+ y = position!.top +
+ (size.height - position!.top - position!.bottom) / 2.0 -
selectedItemOffset;
}
// Find the ideal horizontal position.
double x;
- if (position.left > position.right) {
+ if (position!.left > position!.right) {
// Menu button is closer to the right edge, so grow to the left, aligned to the right edge.
// x = childSize.width - (size.width - position.right);
- x = position.left + width - childSize.width;
- } else if (position.left < position.right) {
+ x = position!.left + width! - childSize.width;
+ } else if (position!.left < position!.right) {
// Menu button is closer to the left edge, so grow to the right, aligned to the left edge.
- if (width > childSize.width) {
- x = position.left + (childSize.width - menuWidth) / 2;
+ if (width! > childSize.width) {
+ x = position!.left + (childSize.width - menuWidth) / 2;
} else
- x = position.left;
+ x = position!.left;
} else {
- x = position.right - width / 2 - childSize.width / 2;
+ x = position!.right - width! / 2 - childSize.width / 2;
}
// Avoid going outside an area defined as the rectangle 8.0 pixels from the
// edge of the screen in every direction.
@@ -454,7 +461,7 @@ class _PopupMenuRouteLayout extends SingleChildLayoutDelegate {
else if (y + childSize.height > size.height - _kMenuScreenPadding)
y = size.height - childSize.height;
else if (y < childSize.height * 2) {
- y = position.top + childSize.height;
+ y = position!.top + childSize.height;
}
return Offset(x, y);
}
diff --git a/lib/ui/w_pop/menu_popup_widget.dart b/lib/ui/w_pop/menu_popup_widget.dart
index ff27c00..aa094c6 100644
--- a/lib/ui/w_pop/menu_popup_widget.dart
+++ b/lib/ui/w_pop/menu_popup_widget.dart
@@ -1,20 +1,19 @@
import 'package:flutter/material.dart';
-import 'package:wechat_flutter/config/const.dart';
import 'package:wechat_flutter/tools/wechat_flutter.dart';
import 'package:wechat_flutter/ui/w_pop/popup_menu_route_layout.dart';
import 'triangle_painter.dart';
class MenuPopWidget extends StatefulWidget {
final BuildContext btnContext;
- final double _height;
- final double _width;
+ final double? _height;
+ final double? _width;
final List actions;
final int _pageMaxChildCount;
final Color backgroundColor;
final double menuWidth;
final double menuHeight;
- final EdgeInsets padding;
- final EdgeInsets margin;
+ final EdgeInsets? padding;
+ final EdgeInsets? margin;
MenuPopWidget(
this.btnContext,
@@ -41,21 +40,21 @@ class _MenuPopWidgetState extends State<MenuPopWidget> {
Color itemColor = itemBgColor;
- RenderBox button;
- RenderBox overlay;
- RelativeRect position;
+ RenderBox? button;
+ RenderBox? overlay;
+ RelativeRect? position;
@override
void initState() {
super.initState();
- button = widget.btnContext.findRenderObject();
- overlay = Overlay.of(widget.btnContext).context.findRenderObject();
+ button = widget.btnContext.findRenderObject() as RenderBox?;
+ overlay = Overlay.of(widget.btnContext)!.context.findRenderObject() as RenderBox?;
position = new RelativeRect.fromRect(
new Rect.fromPoints(
- button.localToGlobal(Offset(-10, 100), ancestor: overlay),
- button.localToGlobal(Offset(-10, 0), ancestor: overlay),
+ button!.localToGlobal(Offset(-10, 100), ancestor: overlay),
+ button!.localToGlobal(Offset(-10, 0), ancestor: overlay),
),
- Offset.zero & overlay.size,
+ Offset.zero & overlay!.size,
);
}
@@ -93,7 +92,7 @@ class _MenuPopWidgetState extends State<MenuPopWidget> {
color: itemBgColor,
position: position,
isInverted: true,
- size: button.size,
+ size: button!.size,
screenWidth: MediaQuery.of(context).size.width,
),
),
@@ -140,7 +139,10 @@ class _MenuPopWidgetState extends State<MenuPopWidget> {
new Padding(
padding: EdgeInsets.symmetric(horizontal: 10.0),
child: strNoEmpty(item['icon'])
- ? new Image.asset(item['icon'])
+ ? new Image.asset(
+ item['icon'],
+ width: 30.0,
+ )
: new Icon(Icons.phone, color: Colors.white),
),
new Expanded(
@@ -160,8 +162,10 @@ class _MenuPopWidgetState extends State<MenuPopWidget> {
),
)
];
- return new FlatButton(
- padding: EdgeInsets.all(0),
+ return new TextButton(
+ style: ButtonStyle(
+ padding: MaterialStateProperty.all(EdgeInsets.all(0)),
+ ),
onPressed: () {
isShow = false;
setState(() {});
diff --git a/lib/ui/w_pop/popup_menu_route.dart b/lib/ui/w_pop/popup_menu_route.dart
index caff01e..f139bd7 100644
--- a/lib/ui/w_pop/popup_menu_route.dart
+++ b/lib/ui/w_pop/popup_menu_route.dart
@@ -7,15 +7,15 @@ enum PressType { longPress, singleClick }
class PopupMenuRoute extends PopupRoute {
final BuildContext btnContext;
- double _height;
- double _width;
+ double? _height;
+ double? _width;
final List actions;
final int _pageMaxChildCount;
final Color backgroundColor;
final double menuWidth;
final double menuHeight;
- final EdgeInsets padding;
- final EdgeInsets margin;
+ final EdgeInsets? padding;
+ final EdgeInsets? margin;
final ValueChanged<String> onValueChanged;
PopupMenuRoute(
@@ -28,14 +28,14 @@ class PopupMenuRoute extends PopupRoute {
this.padding,
this.margin,
this.onValueChanged) {
- _height = btnContext.size.height -
+ _height = btnContext.size!.height -
(padding == null
- ? margin == null ? 0 : margin.vertical
- : padding.vertical);
- _width = btnContext.size.width -
+ ? margin == null ? 0 : margin!.vertical
+ : padding!.vertical);
+ _width = btnContext.size!.width -
(padding == null
- ? margin == null ? 0 : margin.horizontal
- : padding.horizontal);
+ ? margin == null ? 0 : margin!.horizontal
+ : padding!.horizontal);
}
@override
@@ -48,13 +48,13 @@ class PopupMenuRoute extends PopupRoute {
}
@override
- Color get barrierColor => null;
+ Color? get barrierColor => null;
@override
bool get barrierDismissible => true;
@override
- String get barrierLabel => null;
+ String? get barrierLabel => null;
@override
Widget buildPage(BuildContext context, Animation<double> animation,
diff --git a/lib/ui/w_pop/popup_menu_route_layout.dart b/lib/ui/w_pop/popup_menu_route_layout.dart
index 6188e53..2d748ef 100644
--- a/lib/ui/w_pop/popup_menu_route_layout.dart
+++ b/lib/ui/w_pop/popup_menu_route_layout.dart
@@ -8,18 +8,18 @@ class PopupMenuRouteLayout extends SingleChildLayoutDelegate {
this.textDirection, this.width, this.menuWidth, this.height);
// Rectangle of underlying button, relative to the overlay's dimensions.
- final RelativeRect position;
+ final RelativeRect? position;
// The distance from the top of the menu to the middle of selected item.
//
// This will be null if there's no item to position in this way.
- final double selectedItemOffset;
+ final double? selectedItemOffset;
// Whether to prefer going to the left or to the right.
final TextDirection textDirection;
- final double width;
- final double height;
+ final double? width;
+ final double? height;
final double menuWidth;
// We put the child wherever position specifies, so long as it will fit within
@@ -31,7 +31,7 @@ class PopupMenuRouteLayout extends SingleChildLayoutDelegate {
// The menu can be at most the size of the overlay minus 8.0 pixels in each
// direction.
return BoxConstraints.loose(constraints.biggest -
- const Offset(_kMenuScreenPadding * 2.0, _kMenuScreenPadding * 2.0));
+ const Offset(_kMenuScreenPadding * 2.0, _kMenuScreenPadding * 2.0) as Size);
}
@override
@@ -43,34 +43,34 @@ class PopupMenuRouteLayout extends SingleChildLayoutDelegate {
// Find the ideal vertical position.
double y;
if (selectedItemOffset == null) {
- y = position.top;
+ y = position!.top;
} else {
- y = position.top +
- (size.height - position.top - position.bottom) / 2.0 -
- selectedItemOffset;
+ y = position!.top +
+ (size.height - position!.top - position!.bottom) / 2.0 -
+ selectedItemOffset!;
}
// Find the ideal horizontal position.
double x;
// 如果menu 的宽度 小于 child 的宽度，则直接把menu 放在 child 中间
- if (childSize.width < width) {
- x = position.left + (width - childSize.width) / 2;
+ if (childSize.width < width!) {
+ x = position!.left + (width! - childSize.width) / 2;
} else {
// 如果靠右
- if (position.left > size.width - (position.left + width)) {
- if (size.width - (position.left + width) >
+ if (position!.left > size.width - (position!.left + width!)) {
+ if (size.width - (position!.left + width!) >
childSize.width / 2 + _kMenuScreenPadding) {
- x = position.left - (childSize.width - width) / 2;
+ x = position!.left - (childSize.width - width!) / 2;
} else
- x = position.left + width - childSize.width;
- } else if (position.left < size.width - (position.left + width)) {
- if (position.left > childSize.width / 2 + _kMenuScreenPadding) {
- x = position.left - (childSize.width - width) / 2;
+ x = position!.left + width! - childSize.width;
+ } else if (position!.left < size.width - (position!.left + width!)) {
+ if (position!.left > childSize.width / 2 + _kMenuScreenPadding) {
+ x = position!.left - (childSize.width - width!) / 2;
} else
- x = position.left;
+ x = position!.left;
} else {
- x = position.right - width / 2 - childSize.width / 2;
+ x = position!.right - width! / 2 - childSize.width / 2;
}
}
@@ -79,7 +79,7 @@ class PopupMenuRouteLayout extends SingleChildLayoutDelegate {
else if (y + childSize.height > size.height - _kMenuScreenPadding)
y = size.height - childSize.height;
else if (y < childSize.height * 2) {
- y = position.top + height;
+ y = position!.top + height!;
}
return Offset(x, y);
}
diff --git a/lib/ui/w_pop/triangle_painter.dart b/lib/ui/w_pop/triangle_painter.dart
index 53a315a..1aaa577 100644
--- a/lib/ui/w_pop/triangle_painter.dart
+++ b/lib/ui/w_pop/triangle_painter.dart
@@ -1,18 +1,18 @@
import 'package:flutter/material.dart';
class TrianglePainter extends CustomPainter {
- Paint _paint;
+ late Paint _paint;
final Color color;
- final RelativeRect position;
+ final RelativeRect? position;
final Size size;
final double radius;
final bool isInverted;
- final double screenWidth;
+ final double? screenWidth;
TrianglePainter(
- {@required this.color,
- @required this.position,
- @required this.size,
+ {required this.color,
+ required this.position,
+ required this.size,
this.radius = 20,
this.isInverted = false,
this.screenWidth}) {
diff --git a/lib/ui/w_pop/w_popup_menu.dart b/lib/ui/w_pop/w_popup_menu.dart
index bc8a280..e8f1359 100644
--- a/lib/ui/w_pop/w_popup_menu.dart
+++ b/lib/ui/w_pop/w_popup_menu.dart
@@ -3,10 +3,10 @@ import 'package:wechat_flutter/ui/w_pop/popup_menu_route.dart';
class WPopupMenu extends StatefulWidget {
WPopupMenu({
- Key key,
- @required this.onValueChanged,
- @required this.actions,
- @required this.child,
+ Key? key,
+ required this.onValueChanged,
+ required this.actions,
+ required this.child,
this.pressType = PressType.singleClick,
this.pageMaxChildCount = 5,
this.backgroundColor = Colors.black,
@@ -14,12 +14,12 @@ class WPopupMenu extends StatefulWidget {
this.menuHeight = 250,
this.alignment,
this.padding,
- Color color,
- Decoration decoration,
+ Color? color,
+ Decoration? decoration,
this.foregroundDecoration,
- double width,
- double height,
- BoxConstraints constraints,
+ double? width,
+ double? height,
+ BoxConstraints? constraints,
this.margin,
this.transform,
}) : assert(onValueChanged != null),
@@ -41,14 +41,14 @@ class WPopupMenu extends StatefulWidget {
: constraints,
super(key: key);
- final BoxConstraints constraints;
- final Decoration decoration;
- final AlignmentGeometry alignment;
- final EdgeInsets padding;
- final Decoration foregroundDecoration;
- final EdgeInsets margin;
- final Matrix4 transform;
- final ValueChanged<String> onValueChanged;
+ final BoxConstraints? constraints;
+ final Decoration? decoration;
+ final AlignmentGeometry? alignment;
+ final EdgeInsets? padding;
+ final Decoration? foregroundDecoration;
+ final EdgeInsets? margin;
+ final Matrix4? transform;
+ final ValueChanged<String?> onValueChanged;
final List actions;
final Widget child;
final PressType pressType; // 点击方式 长按 还是单击
diff --git a/lib/ui/web/web_view.dart b/lib/ui/web/web_view.dart
index 584e0c6..6ba9eac 100644
--- a/lib/ui/web/web_view.dart
+++ b/lib/ui/web/web_view.dart
@@ -1,8 +1,9 @@
import 'dart:async';
+
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
-import 'package:wechat_flutter/ui/bar/commom_bar.dart';
import 'package:webview_flutter/webview_flutter.dart';
+import 'package:wechat_flutter/ui/bar/commom_bar.dart';
class WebViewPage extends StatefulWidget {
final String url;
@@ -58,7 +59,7 @@ class WebViewPageState extends State<WebViewPage> {
return new JavascriptChannel(
name: 'Toaster',
onMessageReceived: (JavascriptMessage message) {
- Scaffold.of(context).showSnackBar(
+ ScaffoldMessenger.of(context).showSnackBar(
new SnackBar(content: Text(message.message)),
);
},
diff --git a/lib/ui_commom/animation/ball.dart b/lib/ui_commom/animation/ball.dart
new file mode 100644
index 0000000..fa35f0f
--- /dev/null
+++ b/lib/ui_commom/animation/ball.dart
@@ -0,0 +1,208 @@
+import 'dart:math' as math;
+
+import 'package:flutter/material.dart';
+
+///
+/// desc:小球脉冲效果
+///
+class BallPulseLoading extends StatefulWidget {
+ final BallStyle? ballStyle;
+ final Duration duration;
+ final Curve curve;
+
+ const BallPulseLoading({
+ Key? key,
+ this.ballStyle,
+ this.duration = const Duration(milliseconds: 800),
+ this.curve = Curves.linear,
+ this.padding = const EdgeInsets.symmetric(horizontal: 3),
+ }) : super(key: key);
+
+ final EdgeInsets padding;
+
+ @override
+ BallPulseLoadingState createState() => BallPulseLoadingState();
+}
+
+class BallPulseLoadingState extends State<BallPulseLoading>
+ with SingleTickerProviderStateMixin {
+ late AnimationController _controller;
+ late Animation<double> _animation;
+
+ @override
+ void initState() {
+ _controller = AnimationController(vsync: this, duration: widget.duration)
+ ..repeat();
+
+ _animation = _controller.drive(CurveTween(curve: widget.curve));
+
+ super.initState();
+ }
+
+ @override
+ void dispose() {
+ _controller.dispose();
+ super.dispose();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return Row(
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: List.generate(3, (index) {
+ return Padding(
+ padding: widget.padding,
+ child: ScaleTransition(
+ scale: DelayTween(begin: 0.0, end: 1.0, delay: index * .2)
+ .animate(_animation),
+ child: Ball(
+ style: widget.ballStyle,
+ ),
+ ),
+ );
+ }),
+ );
+ }
+}
+
+///
+/// desc:
+///
+class DelayTween extends Tween<double> {
+ final double delay;
+
+ DelayTween({required double begin, required double end, required this.delay})
+ : super(begin: begin, end: end);
+
+ @override
+ double lerp(double t) {
+ return super.lerp((math.sin((t - delay) * 2 * math.pi) + 1) / 2);
+ }
+
+ @override
+ double evaluate(Animation<double> animation) => lerp(animation.value);
+}
+
+///
+/// 球的样式
+///
+class BallStyle {
+ ///
+ /// 尺寸
+ ///
+ final double size;
+
+ ///
+ /// 实心球颜色
+ ///
+ final Color color;
+
+ ///
+ /// 球的类型 [ BallType ]
+ ///
+ final BallType ballType;
+
+ ///
+ /// 边框宽
+ ///
+ final double borderWidth;
+
+ ///
+ /// 边框颜色
+ ///
+ final Color borderColor;
+
+ const BallStyle(
+ {required this.size,
+ required this.color,
+ required this.ballType,
+ required this.borderWidth,
+ required this.borderColor});
+
+ BallStyle copyWith(
+ {double? size,
+ Color? color,
+ BallType? ballType,
+ double? borderWidth,
+ Color? borderColor}) {
+ return BallStyle(
+ size: size ?? this.size,
+ color: color ?? this.color,
+ ballType: ballType ?? this.ballType,
+ borderWidth: borderWidth ?? this.borderWidth,
+ borderColor: borderColor ?? this.borderColor);
+ }
+
+ @override
+ bool operator ==(Object other) {
+ if (identical(this, other)) return true;
+ if (other.runtimeType != runtimeType) return false;
+ return other is BallStyle &&
+ other.size == size &&
+ other.color == color &&
+ other.ballType == ballType &&
+ other.borderWidth == borderWidth &&
+ other.borderColor == borderColor;
+ }
+}
+
+///
+/// 默认球的样式
+///
+const kDefaultBallStyle = BallStyle(
+ size: 10.0,
+ color: Colors.white,
+ ballType: BallType.solid,
+ borderWidth: 0.0,
+ borderColor: Colors.white,
+);
+
+///
+/// desc:球
+///
+class Ball extends StatelessWidget {
+ ///
+ /// 球样式
+ ///
+ final BallStyle? style;
+
+ const Ball({
+ Key? key,
+ this.style,
+ }) : super(key: key);
+
+ @override
+ Widget build(BuildContext context) {
+ BallStyle ballStyle = kDefaultBallStyle.copyWith(
+ size: style?.size,
+ color: style?.color,
+ ballType: style?.ballType,
+ borderWidth: style?.borderWidth,
+ borderColor: style?.borderColor);
+
+ return SizedBox(
+ width: ballStyle.size,
+ height: ballStyle.size,
+ child: DecoratedBox(
+ decoration: BoxDecoration(
+ shape: BoxShape.circle,
+ color:
+ ballStyle.ballType == BallType.solid ? ballStyle.color : null,
+ border: Border.all(
+ color: ballStyle.borderColor, width: ballStyle.borderWidth)),
+ ),
+ );
+ }
+}
+
+enum BallType {
+ ///
+ /// 空心
+ ///
+ hollow,
+
+ ///
+ /// 实心
+ ///
+ solid
+}
diff --git a/lib/ui_commom/app/my_scaffold.dart b/lib/ui_commom/app/my_scaffold.dart
new file mode 100644
index 0000000..342cc5d
--- /dev/null
+++ b/lib/ui_commom/app/my_scaffold.dart
@@ -0,0 +1,172 @@
+import 'dart:io';
+
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+class MyScaffold extends StatelessWidget {
+ final Widget? body;
+ final PreferredSizeWidget? appBar;
+
+ /// 是否删除滑动焦点，为true则滑动到顶无焦点显示
+ /// 默认为true
+ final bool isRemoveBehavior;
+
+ /// 是否在异步加载中，为true的话会有层加载蒙版
+ final bool inAsync;
+
+ /// 是否显示加载，为true时显示加载中圆形条
+ /// 前提是inAsync为true才有效
+ final bool isShowLoading;
+
+ /// 是否删除[状态栏高度-安全区顶部]的边距
+ final bool removeTop;
+
+ final Color? backgroundColor;
+
+ /// 控制状态栏字体颜色的，
+ /// [SystemUiOverlayStyle.dark] = 黑色状态栏字体颜色
+ /// [SystemUiOverlayStyle.light] = 百色状态栏字体颜色
+ final SystemUiOverlayStyle? overlayStyle;
+ final Widget? bottomSheet;
+
+ /// 动画加载
+ final bool animateLoading;
+
+ /// 键盘不遮盖视图，遮盖的话传false
+ final bool? resizeToAvoidBottomInset;
+
+ const MyScaffold({
+ this.body,
+ this.appBar,
+ this.isRemoveBehavior = true,
+ this.removeTop = false,
+ this.overlayStyle,
+ this.inAsync = false,
+ this.animateLoading = false,
+ this.isShowLoading = true,
+ this.backgroundColor,
+ this.bottomSheet,
+ this.resizeToAvoidBottomInset,
+ });
+
+ @override
+ Widget build(BuildContext context) {
+ Widget _content = AnimatedCrossFade(
+ crossFadeState:
+ animateLoading ? CrossFadeState.showFirst : CrossFadeState.showSecond,
+ duration: const Duration(milliseconds: 500),
+ firstChild: Container(
+ width: FrameSize.winWidth(),
+ height: FrameSize.winHeight(),
+ color: animateLoading ? Colors.white : Colors.white,
+ child: const CupertinoActivityIndicator(radius: 12),
+ ),
+ secondChild: SizedBox(
+ width: FrameSize.winWidth(),
+ height: FrameSize.winHeight(),
+ child: ModalProgressHUD(
+ inAsyncCall: inAsync,
+ color: isShowLoading ? Colors.black : Colors.transparent,
+ opacity: 0.5,
+ progressIndicator: isShowLoading
+ ? const CircularProgressIndicator(
+ valueColor: AlwaysStoppedAnimation(Colors.white),
+ )
+ : Container(),
+ child: isRemoveBehavior
+ ? ScrollConfiguration(
+ behavior: MyBehavior(),
+ child: body ?? Container(),
+ )
+ : body,
+ ),
+ ),
+ );
+ _content = MainInputBody(child: _content);
+ _content = MediaQuery.removePadding(
+ removeTop: removeTop,
+ context: context,
+ child: Scaffold(
+ body: _content,
+ appBar: appBar,
+ backgroundColor: backgroundColor ?? Colors.white,
+ bottomSheet: bottomSheet,
+ resizeToAvoidBottomInset: resizeToAvoidBottomInset,
+ ),
+ );
+ if (overlayStyle != null) {
+ return AnnotatedRegion<SystemUiOverlayStyle>(
+ value: overlayStyle!,
+ child: _content,
+ );
+ }
+ return _content;
+ }
+}
+
+class ModalProgressHUD extends StatelessWidget {
+ final bool inAsyncCall;
+ final double opacity;
+ final Color color;
+ final Widget progressIndicator;
+ final Offset? offset;
+ final bool dismissible;
+ final Widget? child;
+
+ const ModalProgressHUD({
+ Key? key,
+ required this.inAsyncCall,
+ this.opacity = 0.3,
+ this.color = Colors.grey,
+ this.progressIndicator = const CircularProgressIndicator(),
+ this.offset,
+ this.dismissible = false,
+ required this.child,
+ }) : super(key: key);
+
+ @override
+ Widget build(BuildContext context) {
+ List<Widget> widgetList = [];
+ widgetList.add(child ?? Container());
+ if (inAsyncCall) {
+ Widget layOutProgressIndicator;
+ if (offset == null)
+ layOutProgressIndicator = Center(child: progressIndicator);
+ else {
+ layOutProgressIndicator = Positioned(
+ left: offset!.dx,
+ top: offset!.dy,
+ child: progressIndicator,
+ );
+ }
+ final modal = [
+ Opacity(
+ opacity: opacity,
+ child: ModalBarrier(dismissible: dismissible, color: color),
+ ),
+ layOutProgressIndicator
+ ];
+ widgetList += modal;
+ }
+ return Stack(
+ children: widgetList as List<Widget>,
+ );
+ }
+}
+
+class MyBehavior extends ScrollBehavior {
+ @override
+ Widget buildOverscrollIndicator(
+ BuildContext context, Widget child, ScrollableDetails details) {
+ if (kIsWeb) {
+ return super.buildOverscrollIndicator(context, child, details);
+ } else if (Platform.isAndroid || Platform.isFuchsia) {
+ return child;
+ } else {
+ return super.buildOverscrollIndicator(context, child, details);
+ }
+ }
+}
diff --git a/lib/ui_commom/bt/small_button.dart b/lib/ui_commom/bt/small_button.dart
new file mode 100644
index 0000000..0f283d9
--- /dev/null
+++ b/lib/ui_commom/bt/small_button.dart
@@ -0,0 +1,195 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
+import 'package:wechat_flutter/tools/theme/my_theme.dart';
+import 'package:wechat_flutter/tools/func/func.dart';
+
+const Color _kDisabledBackground = Color(0xFFA9A9A9);
+const Color _kDisabledForeground = Color(0xFFD1D1D1);
+const double kMinInteractiveDimensionMagic = 44;
+
+const EdgeInsets _kButtonPadding = EdgeInsets.all(16);
+const EdgeInsets _kBackgroundButtonPadding =
+ EdgeInsets.symmetric(vertical: 10, horizontal: 64);
+
+class SmallButton extends StatefulWidget {
+ const SmallButton({
+ Key? key,
+ required this.child,
+ this.padding,
+ this.margin = const EdgeInsets.symmetric(horizontal: 37),
+ this.width,
+ this.height,
+ this.color,
+ this.disabledColor = const Color(0xffEFEFEF),
+ this.minWidth = kMinInteractiveDimensionMagic,
+ this.minHeight = kMinInteractiveDimensionMagic,
+ this.pressedOpacity = 1,
+ this.borderRadius = const BorderRadius.all(Radius.circular(4)),
+ this.isShadow = false,
+ this.shadowColor,
+ this.border,
+ this.gradient,
+ this.filled = false,
+ this.isCanMultipleClick = false,
+ required this.onPressed,
+ }) : assert((pressedOpacity >= 0.0 && pressedOpacity <= 1.0)),
+ super(key: key);
+
+ final Widget child;
+ final EdgeInsetsGeometry? padding;
+ final EdgeInsetsGeometry margin;
+ final Color? color;
+ final Color disabledColor;
+ final GestureTapCallback onPressed;
+ final double minWidth;
+ final double minHeight;
+ final double? width;
+ final double? height;
+ final double pressedOpacity;
+ final BorderRadius borderRadius;
+ final bool filled;
+ final bool isShadow;
+ final Color? shadowColor;
+ final BoxBorder? border;
+ final Gradient? gradient;
+
+ /// 是否可以多次点击
+ final bool isCanMultipleClick;
+
+ bool get enabled => onPressed != null;
+
+ @override
+ _SmallButtonState createState() => _SmallButtonState();
+
+ @override
+ void debugFillProperties(DiagnosticPropertiesBuilder properties) {
+ super.debugFillProperties(properties);
+ properties
+ .add(FlagProperty('enabled', value: enabled, ifFalse: 'disabled'));
+ }
+}
+
+class _SmallButtonState extends State<SmallButton>
+ with SingleTickerProviderStateMixin {
+ final Tween<double> _opacityTween = Tween<double>(begin: 1);
+
+ AnimationController? _animationController;
+ late Animation<double> _opacityAnimation;
+
+ bool isInkWellProcessing = false;
+
+ @override
+ void initState() {
+ super.initState();
+ _animationController = AnimationController(
+ duration: const Duration(milliseconds: 200),
+ value: 0,
+ vsync: this,
+ );
+ _opacityAnimation = _animationController!
+ .drive(CurveTween(curve: Curves.decelerate))
+ .drive(_opacityTween);
+ _setTween();
+ }
+
+ @override
+ void didUpdateWidget(SmallButton old) {
+ super.didUpdateWidget(old);
+ _setTween();
+ }
+
+ void _setTween() {
+ _opacityTween.end = widget.pressedOpacity;
+ }
+
+ @override
+ void dispose() {
+ _animationController!.dispose();
+ _animationController = null;
+ super.dispose();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ final Color color = widget.color ?? MyTheme.themeColor();
+ final bool enabled = widget.enabled;
+ final Color primaryColor = CupertinoTheme.of(context).primaryColor;
+ final Color backgroundColor = color;
+ final Color foregroundColor = backgroundColor != null
+ ? CupertinoTheme.of(context).primaryContrastingColor
+ : enabled
+ ? primaryColor
+ : _kDisabledForeground;
+ final TextStyle textStyle = CupertinoTheme.of(context)
+ .textTheme
+ .textStyle
+ .copyWith(color: foregroundColor);
+ final Color resultColor = !enabled
+ ? widget.disabledColor
+ : backgroundColor;
+ final btWidget = Semantics(
+ button: true,
+ child: ConstrainedBox(
+ constraints: BoxConstraints(
+ minWidth: widget.minWidth, minHeight: widget.minHeight),
+ child: FadeTransition(
+ opacity: _opacityAnimation,
+ child: DecoratedBox(
+ decoration: BoxDecoration(
+ borderRadius: widget.borderRadius,
+ color: widget.gradient != null ? null : resultColor,
+ gradient: widget.gradient,
+ boxShadow: widget.isShadow
+ ? [
+ BoxShadow(
+ color: widget.shadowColor!,
+ blurRadius: 10,
+ spreadRadius: 0.5),
+ ]
+ : [],
+ border: widget.border,
+ ),
+ child: Padding(
+ padding: widget.padding ??
+ (backgroundColor != null
+ ? _kBackgroundButtonPadding
+ : _kButtonPadding),
+ child: Center(
+ widthFactor: 1,
+ heightFactor: 1,
+ child: DefaultTextStyle(
+ style: textStyle,
+ child: IconTheme(
+ data: IconThemeData(color: foregroundColor),
+ child: widget.child,
+ ),
+ ),
+ ),
+ ),
+ ),
+ ),
+ ),
+ );
+ return Container(
+ margin: widget.margin,
+ width: widget.width,
+ height: widget.height,
+ decoration: BoxDecoration(borderRadius: widget.borderRadius),
+ child: widget.isCanMultipleClick
+ ? MyInkWell(
+ onTap: () {
+ widget.onPressed();
+ },
+ child: btWidget,
+ )
+ : ClickEvent(
+ onTap: () {
+ widget.onPressed();
+ },
+ child: btWidget,
+ ),
+ );
+ }
+}
diff --git a/lib/ui_commom/data/no_data_view.dart b/lib/ui_commom/data/no_data_view.dart
new file mode 100644
index 0000000..3d90a39
--- /dev/null
+++ b/lib/ui_commom/data/no_data_view.dart
@@ -0,0 +1,75 @@
+import 'package:flutter/material.dart';
+import 'package:wechat_flutter/tools/theme/my_theme.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+import 'package:wechat_flutter/ui_commom/bt/small_button.dart';
+
+class NoDataView extends StatefulWidget {
+ final String? label;
+ final VoidCallback? onRefresh;
+ final bool isTeam;
+ final Function? onPressed;
+ final double? height;
+
+ NoDataView({
+ this.label,
+ this.height,
+ this.onRefresh,
+ this.isTeam = true,
+ this.onPressed,
+ });
+
+ NoDataViewState createState() => NoDataViewState();
+}
+
+class NoDataViewState extends State<NoDataView> {
+ bool isWay = false;
+
+ @override
+ Widget build(BuildContext context) {
+ final String label = widget.label ?? '暂无数据';
+ final double imgWidth = widget.isTeam ? 168 : 84.5;
+ return Container(
+ height: widget.height ?? 320,
+ width: FrameSize.winWidth(),
+ child: new Column(
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: <Widget>[
+ new Image.asset(
+ 'images/main/${widget.isTeam ? 'ic_empty' : 'ic_no_data'}.png',
+ width: widget.height != null ? widget.height! / 2 : imgWidth),
+ new Space(height: mainSpace * 1.5),
+ new Text(
+ label,
+ style: TextStyle(color: Colors.grey, fontSize: 14.0),
+ ),
+ new Space(height: mainSpace * 2.5),
+ new Visibility(
+ visible: widget.onRefresh != null,
+ child: isWay
+ ? new CircularProgressIndicator(
+ valueColor: AlwaysStoppedAnimation(MyTheme.themeColor()),
+ )
+ : new Container(),
+ ),
+ new Visibility(
+ visible: widget.onRefresh != null,
+ child: SmallButton(
+ padding: EdgeInsets.symmetric(horizontal: 10),
+ onPressed: () => handle(),
+ child: new Text('重新加载'),
+ ),
+ )
+ ],
+ ),
+ );
+ }
+
+ handle() {
+ widget.onRefresh!();
+
+ if (mounted) setState(() => isWay = true);
+ new Future.delayed(new Duration(seconds: 2), () {}).then((v) {
+ if (mounted) setState(() => isWay = false);
+ });
+ }
+}
diff --git a/lib/ui_commom/dialog/confirm_sw_dialog.dart b/lib/ui_commom/dialog/confirm_sw_dialog.dart
new file mode 100644
index 0000000..53e37fc
--- /dev/null
+++ b/lib/ui_commom/dialog/confirm_sw_dialog.dart
@@ -0,0 +1,346 @@
+import 'package:flutter/material.dart';
+import 'package:wechat_flutter/tools/func/func.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+import 'package:wechat_flutter/ui_commom/dialog/sw_scroll_dialog.dart';
+
+bool _canShow = true;
+
+typedef CallAppState = Function(AppLifecycleState state);
+
+Future confirmSwDialog(
+ BuildContext context, {
+ String? text,
+ TextStyle? headTextStyle,
+ TextStyle? contentStyle,
+ VoidCallback? onPressed,
+ VoidCallback? onCancel,
+ String? cancelText,
+ TextStyle? cancelTextStyle,
+ String? okText,
+ TextStyle? okTextStyle,
+ Widget? head,
+ int type = 1,
+ TextAlign textAlign = TextAlign.center,
+ Widget? child,
+ bool? barrierDismissible,
+ double? headTopPadding,
+ double? headBottomPadding,
+ double? textBottomPadding,
+ String? title,
+ bool? isOkPop,
+ bool? isDarkMode,
+ bool isHaveCancel = true,
+ final WillPopCallback? onWillPop,
+ final CallAppState? callAppState,
+}) {
+ if (!_canShow) {
+ return Future.value();
+ }
+ return showDialog(
+ context: context,
+ builder: (context) {
+ return SwDialog(
+ title,
+ text,
+ onPressed,
+ cancelText,
+ cancelTextStyle,
+ okText,
+ okTextStyle,
+ head,
+
+ type,
+ textAlign,
+ onCancel,
+ barrierDismissible: barrierDismissible,
+ headTopPadding: headTopPadding,
+ headBottomPadding: headBottomPadding,
+ textBottomPadding: textBottomPadding,
+ isOkPop: isOkPop ?? true,
+ isDarkMode: isDarkMode ?? false,
+ //是否为黑色主题
+ contentStyle: contentStyle,
+ headTextStyle: headTextStyle,
+ onWillPop: onWillPop,
+ isHaveCancel: isHaveCancel,
+ callAppState: callAppState,
+ child: child,
+ );
+ }).then<void>((value) {
+ _canShow = false;
+ Future.delayed(const Duration(milliseconds: 20)).then((value) {
+ _canShow = true;
+ });
+ });
+}
+
+class SwDialog extends StatefulWidget {
+ final String? text;
+ final TextStyle? contentStyle;
+ final String? title;
+ final String? cancelText;
+ final TextStyle? cancelTextStyle;
+ final String? okText;
+ final TextStyle? okTextStyle;
+ final VoidCallback? onPressed;
+ final VoidCallback? onCancel;
+ final Widget? head;
+ final TextStyle? headTextStyle;
+ final int type;
+ final TextAlign textAlign;
+ final Widget? child;
+ final bool? barrierDismissible;
+ final double? headTopPadding;
+ final double? headBottomPadding;
+ final double? textBottomPadding;
+ final bool? isOkPop;
+ final bool? isDarkMode;
+ final bool? isHaveCancel;
+ final WillPopCallback? onWillPop;
+ final CallAppState? callAppState;
+
+ const SwDialog(
+ this.title,
+ this.text,
+ this.onPressed,
+ this.cancelText,
+ this.cancelTextStyle,
+ this.okText,
+ this.okTextStyle,
+ this.head,
+ this.type,
+ this.textAlign,
+ this.onCancel, {
+ this.child,
+ this.onWillPop,
+ this.isHaveCancel,
+ this.barrierDismissible,
+ this.headTopPadding,
+ this.headBottomPadding,
+ this.textBottomPadding,
+ this.isOkPop,
+ this.isDarkMode,
+ this.contentStyle,
+ this.headTextStyle,
+ this.callAppState,
+ });
+
+ @override
+ _SwDialogState createState() => _SwDialogState();
+}
+
+class _SwDialogState extends State<SwDialog> with WidgetsBindingObserver {
+ GlobalKey key = GlobalKey();
+
+ final BorderSide borderSide = BorderSide(
+ color: const Color(0xff8f959e).withOpacity(0.2),
+ width: (0.5));
+
+ @override
+ void initState() {
+ super.initState();
+ WidgetsBinding.instance.addObserver(this);
+ }
+
+ ///切换到前后台
+ @override
+ void didChangeAppLifecycleState(AppLifecycleState state) {
+ if (widget.callAppState != null) {
+ widget.callAppState!(state);
+ }
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return ScrollDialog(
+ barrierDismissible: widget.barrierDismissible ?? false,
+ onWillPop: widget.onWillPop,
+ child: Material(
+ type: MaterialType.transparency,
+ child: Stack(
+ children: [
+ SizedBox(
+ width: FrameSize.winWidth(),
+ child: Column(
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: [
+ Container(
+ decoration: BoxDecoration(
+ color: widget.isDarkMode!
+ ? Colors.black.withOpacity(0.85)
+ : Colors.white,
+ borderRadius: const BorderRadius.all(Radius.circular(8)),
+ ),
+ padding: EdgeInsets.only(top: widget.headTopPadding ?? 20),
+ width: FrameSize.winHeight() - (47.5 * 2),
+ margin: EdgeInsets.only(
+ bottom: MediaQuery.of(context).viewInsets.bottom),
+ child: Column(
+ children: [
+ Center(
+ child: widget.head ??
+ Text(
+ widget.title ?? '提 示',
+ style: widget.headTextStyle ??
+ TextStyle(
+ color: widget.isDarkMode!
+ ? Colors.white
+ : const Color(0xff121212),
+ fontSize: 18,
+ ),
+ ),
+ ),
+ SizedBox(height: widget.headBottomPadding ?? 30),
+ if (widget.child != null)
+ SizedBox(
+ width: FrameSize.winHeight(),
+ child: widget.child,
+ )
+ else
+ Padding(
+ padding: EdgeInsets.symmetric(
+ horizontal: (24)),
+ child: Text(
+ widget.text ?? '请输入内容',
+ style: widget.contentStyle ??
+ TextStyle(
+ color: widget.isDarkMode!
+ ? Colors.white
+ : const Color(0xff121212),
+ fontSize: 16,
+ ),
+ textAlign: widget.textAlign,
+ ),
+ ),
+ Container(
+ key: key,
+ width: FrameSize.winHeight() - 50,
+ height: 0,
+ color: widget.isDarkMode!
+ ? const Color(0xff333333)
+ : Colors.grey.withOpacity(0.5),
+ ),
+ SizedBox(height: widget.textBottomPadding ?? 40),
+ if (widget.type == 1)
+ ClipRRect(
+ borderRadius: const BorderRadius.vertical(
+ bottom: Radius.circular(8)),
+ child: Container(
+ decoration: BoxDecoration(
+ border: Border(top: borderSide),
+ color: widget.isDarkMode!
+ ? Colors.transparent
+ : Colors.white,
+ ),
+ child: Row(
+ children: [
+ if (widget.isHaveCancel!)
+ Expanded(
+ child: ClickEvent(
+ onTap: () async {
+ Navigator.pop(context);
+ if (widget.onCancel != null) {
+ widget.onCancel!();
+ }
+ },
+ child: Container(
+ alignment: Alignment.center,
+ height: (55.5),
+ decoration: BoxDecoration(
+ border:
+ Border(right: borderSide)),
+ child: Text(
+ widget.cancelText ?? '取消',
+ style: widget.cancelTextStyle ??
+ TextStyle(
+ fontSize: (17),
+ color: widget.isDarkMode!
+ ? Colors.white
+ : const Color(0xff363940),
+ ),
+ ),
+ ),
+ ),
+ ),
+ Expanded(
+ child: InkWell(
+ onTap: () {
+ if (widget.isOkPop!)
+ Navigator.pop(context);
+ if (widget.onPressed != null) {
+ widget.onPressed!();
+ }
+ },
+ child: Container(
+ alignment: Alignment.center,
+ height: (55.5),
+ child: Text(
+ widget.okText ?? '确定',
+ style: widget.okTextStyle ??
+ TextStyle(
+ fontSize: (17),
+ color: widget.isDarkMode!
+ ? const Color(0xff1677FF)
+ : const Color(0xff6179f2),
+ ),
+ ),
+ ),
+ ),
+ ),
+ ],
+ ),
+ ),
+ )
+ else
+ InkWell(
+ onTap: () {
+ if (widget.isOkPop!) Navigator.pop(context);
+ if (widget.onPressed != null) {
+ widget.onPressed!();
+ }
+ },
+ child: Container(
+ alignment: Alignment.center,
+ width: FrameSize.winHeight(),
+ height: (55.5),
+ decoration: BoxDecoration(
+ border: Border(
+ top: BorderSide(
+ color: widget.isDarkMode!
+ ? const Color(0xff333333)
+ : const Color(0xff8f959e)
+ .withOpacity(0.2),
+ width: (0.5),
+ ),
+ ),
+ ),
+ child: Text(
+ widget.okText ?? '确定',
+ style: TextStyle(
+ fontSize: (17),
+ color: widget.isDarkMode!
+ ? const Color(0xff1677FF)
+ : const Color(0xff6179f2),
+ fontWeight: FontWeight.w600,
+ ),
+ ),
+ ),
+ ),
+ ],
+ ),
+ ),
+ ],
+ ),
+ ),
+ ],
+ ),
+ ),
+ );
+ }
+
+ @override
+ void dispose() {
+ super.dispose();
+ WidgetsBinding.instance.removeObserver(this);
+ }
+}
diff --git a/lib/ui_commom/dialog/sw_scroll_dialog.dart b/lib/ui_commom/dialog/sw_scroll_dialog.dart
new file mode 100644
index 0000000..e9ef69f
--- /dev/null
+++ b/lib/ui_commom/dialog/sw_scroll_dialog.dart
@@ -0,0 +1,115 @@
+import 'dart:io';
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+class ScrollDialog extends StatefulWidget {
+ final Widget child;
+ final bool barrierDismissible;
+ final WillPopCallback? onWillPop;
+ final bool isDecoration;
+ final double? width;
+ final double? height;
+
+ const ScrollDialog({
+ required this.child,
+ this.barrierDismissible = false,
+ this.isDecoration = false,
+ this.onWillPop,
+ this.height,
+ this.width,
+ });
+
+ @override
+ _ScrollDialogState createState() => _ScrollDialogState();
+}
+
+class _ScrollDialogState extends State<ScrollDialog> {
+ GlobalKey key = GlobalKey();
+
+ @override
+ void initState() {
+ super.initState();
+ Future.delayed(const Duration(milliseconds: 600)).then((value) {
+ if (mounted) setState(() {});
+ });
+ }
+
+ double getHeight() {
+ final RenderBox? box = key.currentContext?.findRenderObject() as RenderBox?;
+ double size;
+ final _fullHeight = FrameSize.winHeight() - FrameSize.padTopH();
+ final _boxHeight = box?.size.height ?? 0;
+ if (_boxHeight == 0) {
+ size = _fullHeight;
+ } else {
+ size = _boxHeight > _fullHeight ? _boxHeight : _fullHeight;
+ }
+ return size;
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ final _content = Material(
+ type: MaterialType.transparency,
+ child: ScrollConfiguration(
+ behavior: MyBehavior(),
+ child: SingleChildScrollView(
+ child: SizedBox(
+ height: getHeight(),
+ child: Column(
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: [
+ if (widget.isDecoration)
+ Container(
+ key: key,
+ decoration: const BoxDecoration(
+ color: Colors.white,
+ borderRadius: BorderRadius.all(Radius.circular(12)),
+ ),
+ padding: const EdgeInsets.symmetric(
+ horizontal: 25, vertical: 24),
+ width: FrameSize.winWidth() - 60,
+ child: widget.child,
+ )
+ else
+ Container(
+ key: key,
+ child: widget.child,
+ ),
+ ],
+ ),
+ ),
+ ),
+ ),
+ );
+ if (widget.onWillPop != null) {
+ return WillPopScope(
+ onWillPop: widget.onWillPop,
+ child: _content,
+ );
+ } else if (widget.barrierDismissible) {
+ return GestureDetector(
+ onTap: () => Navigator.of(context).pop(),
+ child: _content,
+ );
+ } else {
+ return _content;
+ }
+ }
+}
+
+class MyBehavior extends ScrollBehavior {
+ @override
+ Widget buildOverscrollIndicator(
+ BuildContext context, Widget child, ScrollableDetails details) {
+ if (kIsWeb) {
+ return super.buildOverscrollIndicator(context, child, details);
+ } else if (Platform.isAndroid || Platform.isFuchsia) {
+ return child;
+ } else {
+ return super.buildOverscrollIndicator(context, child, details);
+ }
+ }
+}
diff --git a/lib/ui_commom/image/sw_avatar.dart b/lib/ui_commom/image/sw_avatar.dart
new file mode 100644
index 0000000..5459440
--- /dev/null
+++ b/lib/ui_commom/image/sw_avatar.dart
@@ -0,0 +1,71 @@
+import 'package:flutter/material.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+import 'package:wechat_flutter/ui_commom/image/sw_image.dart';
+
+typedef ClickEventCallback = Future<void> Function();
+
+class AvatarView extends SwAvatar{
+ AvatarView(String? image) : super(image);
+}
+
+class SwAvatar extends StatelessWidget {
+ final String? image;
+ final double size;
+ final ClickEventCallback? onTap;
+ final bool isBorder;
+
+ /// When no avatar use male def img.
+ final bool isMaleDef;
+
+ const SwAvatar(
+ this.image, {
+ this.size = 30,
+ this.onTap,
+ this.isBorder = false,
+ this.isMaleDef = false,
+ Key? key,
+ }) : super(key: key);
+
+ @override
+ Widget build(BuildContext context) {
+ Widget result;
+ Widget defAvatar = SwImage(
+ isMaleDef ? "assets/images/pic_register_def_n.png" : AppConfig.defPic,
+ width: size,
+ height: size,
+ onTap: onTap,
+ fit: BoxFit.cover,
+ borderRadius: BorderRadius.all(Radius.circular(size / 2)),
+ );
+ if (!strNoEmpty(image)) {
+ result = defAvatar;
+ return result;
+ }
+ result = SwImage(
+ image,
+ width: size,
+ height: size,
+ onTap: onTap,
+ fit: BoxFit.cover,
+ borderRadius: BorderRadius.all(Radius.circular(size / 2)),
+ placeholder: (context, url) {
+ return defAvatar;
+ },
+ errorWidget: (context, url, e) {
+ return defAvatar;
+ },
+ );
+ if (isBorder) {
+ return Container(
+ width: size,
+ height: size,
+ decoration: BoxDecoration(
+ borderRadius: BorderRadius.all(Radius.circular(size / 2)),
+ border: Border.all(color: Colors.white),
+ ),
+ child: result,
+ );
+ }
+ return result;
+ }
+}
diff --git a/lib/ui_commom/image/sw_image.dart b/lib/ui_commom/image/sw_image.dart
new file mode 100644
index 0000000..a753a76
--- /dev/null
+++ b/lib/ui_commom/image/sw_image.dart
@@ -0,0 +1,156 @@
+import 'dart:io';
+import 'dart:typed_data';
+
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:flutter/material.dart';
+import 'package:wechat_flutter/tools/func/func.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+class SwImage extends StatelessWidget {
+ final String? image;
+ final double? width;
+ final double? height;
+ final Color? color;
+ final BoxFit? fit;
+ final String? package;
+ final BorderRadius? borderRadius;
+ final GestureTapCallback? onTap;
+ final EdgeInsetsGeometry? margin;
+ final Alignment? alignment;
+
+ final PlaceholderWidgetBuilder? placeholder;
+ final LoadingErrorWidgetBuilder? errorWidget;
+
+ const SwImage(
+ this.image, {
+ this.width,
+ this.height,
+ this.color,
+ this.fit,
+ this.package,
+ this.borderRadius,
+ this.onTap,
+ this.margin,
+ this.placeholder,
+ this.errorWidget,
+ this.alignment,
+ Key? key,
+ }) : super(key: key);
+
+ @override
+ Widget build(BuildContext context) {
+ Widget imageWidget;
+ try {
+ if (!strNoEmpty(image)) {
+ imageWidget = const DefImageView();
+ } else if (isNetWorkImg(image)) {
+ imageWidget = CachedNetworkImage(
+ imageUrl: image!,
+ width: width,
+ height: height,
+ fit: fit,
+ color: color,
+ alignment: alignment!,
+ placeholder: placeholder ??
+ (context, url) {
+ return DefImageView(
+ width: width,
+ height: height,
+ );
+ },
+ errorWidget: errorWidget ??
+ (context, url, error) {
+ return DefImageView(
+ width: width,
+ height: height,
+ );
+ },
+ );
+ } else if (isAssetsImg(image)) {
+ imageWidget = Image.asset(
+ image!,
+ width: width,
+ height: height,
+ fit: fit,
+ package: package,
+ color: color,
+ );
+ } else if (File(image!).existsSync()) {
+ imageWidget = Image.file(
+ File(image!),
+ width: width,
+ height: height,
+ fit: fit,
+ color: color,
+ );
+ } else if (!strNoEmpty(image)) {
+ imageWidget = const DefImageView();
+ } else {
+ imageWidget = Image.memory(
+ image!.codeUnits as Uint8List,
+ width: width,
+ height: height,
+ fit: fit,
+ color: color,
+ );
+ }
+ } catch (e) {
+ imageWidget = const DefImageView();
+ }
+ if (borderRadius != null) {
+ imageWidget = ClipRRect(borderRadius: borderRadius, child: imageWidget);
+ }
+ if (onTap != null) {
+ imageWidget = ClickEvent(
+ onTap: onTap,
+ child: imageWidget,
+ );
+ }
+ if (margin != null) {
+ imageWidget = Container(margin: margin, child: imageWidget);
+ }
+
+ return imageWidget;
+ }
+}
+
+ImageProvider? swImageProvider(String image) {
+ ImageProvider? imageProvider;
+
+ if (!strNoEmpty(image)) {
+ } else if (isNetWorkImg(image)) {
+ imageProvider = CachedNetworkImageProvider(image);
+ } else if (isAssetsImg(image)) {
+ imageProvider = AssetImage(image);
+ } else if (File(image).existsSync()) {
+ imageProvider = FileImage(File(image));
+ } else {
+ imageProvider = MemoryImage(image.codeUnits as Uint8List);
+ }
+ return imageProvider;
+}
+
+/// 同步改一下[11.6]
+class DefImageView extends StatelessWidget {
+ final double? width;
+ final double? height;
+
+ const DefImageView({this.width, this.height});
+
+ @override
+ Widget build(BuildContext context) {
+ return Container(
+ width: width,
+ height: height,
+ decoration: const BoxDecoration(
+ color: Color(0xffe1dfe1),
+ borderRadius: BorderRadius.all(Radius.circular(5)),
+ ),
+ padding: const EdgeInsets.symmetric(horizontal: 5, vertical: 3),
+ child: const Text(
+ '',
+ style: TextStyle(color: Colors.white),
+ ),
+ );
+ }
+}
diff --git a/lib/ui_commom/view/hud_view.dart b/lib/ui_commom/view/hud_view.dart
new file mode 100644
index 0000000..9a724ee
--- /dev/null
+++ b/lib/ui_commom/view/hud_view.dart
@@ -0,0 +1,253 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+
+class HudView {
+ static bool isLoading = false;
+ static bool isAutoShow = false;
+ static OverlayEntry? overlayEntry = OverlayEntry(builder: (context) {
+ return Container();
+ });
+ static BuildContext? _context;
+ static Timer? _timer;
+ static String icon = 'assets/images/loading.gif';
+
+ /*
+ * 定时关闭
+ *
+ * */
+ static void timerTread([int s = 5, VoidCallback? onTimeOut]) {
+ if (_timer != null && _timer!.isActive) {
+ _timer?.cancel();
+ _timer = null;
+ }
+ int index = 0;
+ _timer = Timer.periodic(const Duration(seconds: 1), (Timer timer) {
+ index++;
+ if (index >= s) {
+ index = 0;
+ timer.cancel();
+ if (onTimeOut != null && isLoading) {
+ onTimeOut();
+ }
+ dismiss();
+ }
+ });
+ }
+
+ /*
+ * 显示自定义的Widget
+ *
+ * */
+ static void showWidget(BuildContext context,
+ {required Widget child, int second = 3}) {
+ if (context == null) {
+ return;
+ }
+
+ WidgetsBinding widgetsBinding = WidgetsBinding.instance;
+ widgetsBinding.addPostFrameCallback((callback) {
+ dismiss();
+
+ if (isLoading) {
+ return;
+ }
+ isLoading = true;
+ isAutoShow = false;
+ _context = context;
+
+ timerTread(second);
+
+ overlayEntry = OverlayEntry(
+ builder: (context) {
+ return Center(
+ child: Material(type: MaterialType.transparency, child: child),
+ );
+ },
+ );
+
+ if (overlayEntry != null) {
+ Overlay.of(_context!)!.insert(overlayEntry!);
+ }
+ });
+ }
+
+ /*
+ * 显示
+ *
+ * */
+ static void show(BuildContext? context,
+ {String? msg, int second = 10, VoidCallback? onTimeOut}) {
+ if (context == null) {
+ return;
+ }
+
+ WidgetsBinding widgetsBinding = WidgetsBinding.instance;
+ widgetsBinding.addPostFrameCallback((callback) {
+ dismiss();
+
+ if (isLoading) {
+ return;
+ }
+ isLoading = true;
+ isAutoShow = false;
+ _context = context;
+
+ timerTread(second, onTimeOut);
+
+ overlayEntry = OverlayEntry(
+ builder: (context) {
+ return Center(
+ child: Material(
+ type: MaterialType.transparency,
+ textStyle: const TextStyle(color: Color(0xFF212121)),
+ child: Container(
+ decoration: const BoxDecoration(
+ borderRadius: BorderRadius.all(Radius.circular(4.0)),
+ color: Color.fromRGBO(0, 0, 0, 0.3),
+ ),
+ padding:
+ const EdgeInsets.symmetric(vertical: 10.0, horizontal: 4),
+ width: 90.0,
+ height: 90.0,
+ alignment: Alignment.center,
+ child: Wrap(
+ crossAxisAlignment: WrapCrossAlignment.center,
+ children: <Widget>[
+ Container(
+ width: double.infinity,
+ alignment: Alignment.center,
+ child: Image.asset(icon),
+ ),
+ Padding(
+ padding: const EdgeInsets.only(top: 10),
+ child: Center(
+ child: Text(
+ msg ?? "加载中...",
+ style: const TextStyle(color: Colors.white),
+ maxLines: 3,
+ ),
+ ),
+ ),
+ ],
+ ),
+ ),
+ ),
+ );
+ },
+ );
+
+ if (overlayEntry != null) {
+ try {
+ Overlay.of(_context!)!.insert(overlayEntry!);
+ } catch (e) {
+ debugPrint("HudView出现错误::Overlay.of(_context).insert(overlayEntry);");
+ }
+ }
+ });
+ }
+
+ /*
+ * 消散
+ *
+ * */
+ static void dismiss() {
+ if (isLoading && overlayEntry != null && _context != null) {
+ try {
+ if (overlayEntry != null) overlayEntry?.remove();
+ } catch (e) {
+ debugPrint("HudView出现错误::remove");
+ }
+ overlayEntry = null;
+ }
+ isLoading = false;
+ isAutoShow = false;
+ }
+
+ /*
+ * 自动显示
+ *
+ * */
+ static void autoShow(BuildContext context, {String? msg}) {
+ WidgetsBinding widgetsBinding = WidgetsBinding.instance;
+ widgetsBinding.addPostFrameCallback((callback) {
+ dismiss();
+
+ if (isLoading) {
+ return;
+ }
+
+ isLoading = true;
+ isAutoShow = true;
+ _context = context;
+
+ timerTread();
+
+ overlayEntry ??= OverlayEntry(
+ builder: (context) {
+ return Center(
+ child: Material(
+ type: MaterialType.transparency,
+ textStyle: const TextStyle(color: Color(0xFF212121)),
+ child: Container(
+ decoration: const BoxDecoration(
+ borderRadius:
+ const BorderRadius.all(const Radius.circular(4.0)),
+ color: const Color.fromRGBO(0, 0, 0, 0.3),
+ ),
+ padding:
+ const EdgeInsets.symmetric(vertical: 10.0, horizontal: 4),
+ width: 90.0,
+ height: 90.0,
+ alignment: Alignment.center,
+ child: Wrap(
+ crossAxisAlignment: WrapCrossAlignment.center,
+ children: <Widget>[
+ Container(
+ width: double.infinity,
+ alignment: Alignment.center,
+ child: Image.asset(icon),
+ ),
+ Padding(
+ padding: const EdgeInsets.only(top: 10),
+ child: Center(
+ child: Text(
+ msg ?? "加载中...",
+ style: const TextStyle(color: Colors.white),
+ maxLines: 3,
+ ),
+ ),
+ ),
+ ],
+ ),
+ ),
+ ),
+ );
+ },
+ );
+
+ Overlay.of(_context!)!.insert(overlayEntry!);
+ });
+ }
+
+ /*
+ * 自动消散
+ *
+ * */
+ static void autoDismiss() {
+ if (isAutoShow) {
+ if (isLoading && overlayEntry != null) {
+ try {
+ overlayEntry?.remove();
+ } catch (e) {
+ debugPrint("HudView出现错误::overlayEntry?.remove();");
+ }
+ overlayEntry = null;
+ }
+ isLoading = false;
+ } else {
+ isAutoShow = false;
+ }
+ }
+}
diff --git a/lib/video/event/live_stream_event.dart b/lib/video/event/live_stream_event.dart
new file mode 100644
index 0000000..62d976e
--- /dev/null
+++ b/lib/video/event/live_stream_event.dart
@@ -0,0 +1,63 @@
+import 'dart:convert';
+
+enum LiveEventName {
+ /// 打开摄像头
+ openCamera,
+
+ /// 关闭摄像头
+ closeCamera,
+
+ /// 打开麦克风
+ openMicrophone,
+
+ /// 关闭麦克风
+ closeMicrophone,
+
+ /// 切换到音频
+ changeToVoice,
+
+ /// 语音转文字内容
+ ttsContent,
+}
+
+T? asT<T>(dynamic value) {
+ if (value is T) {
+ return value;
+ }
+ return null;
+}
+
+class LiveSteamEvent {
+ LiveSteamEvent({
+ required this.uid,
+ required this.eventName,
+ this.content,
+ this.msgId,
+ });
+
+ factory LiveSteamEvent.fromJson(Map<String, dynamic> json) => LiveSteamEvent(
+ uid: asT<int>(json['uid'])!,
+ eventName: asT<String>(json['eventName'])!,
+ content: asT<String?>(json['content']),
+ msgId: asT<String?>(json['msgId']),
+ );
+
+ int uid;
+ String eventName;
+
+ // When [eventName] is [ttsContent] can't be null.
+ String? content;
+ String? msgId;
+
+ @override
+ String toString() {
+ return jsonEncode(this);
+ }
+
+ Map<String, dynamic> toJson() => <String, dynamic>{
+ 'uid': uid,
+ 'eventName': eventName,
+ 'content': content,
+ 'msgId': msgId,
+ };
+}
diff --git a/lib/video/event_bus/account_change_bus.dart b/lib/video/event_bus/account_change_bus.dart
new file mode 100644
index 0000000..f0397ee
--- /dev/null
+++ b/lib/video/event_bus/account_change_bus.dart
@@ -0,0 +1,5 @@
+import 'package:event_bus/event_bus.dart';
+
+EventBus accountChangeBus = EventBus();
+
+class AccountChangeModel {}
diff --git a/lib/video/event_bus/live_msg_bus.dart b/lib/video/event_bus/live_msg_bus.dart
new file mode 100644
index 0000000..0f7024b
--- /dev/null
+++ b/lib/video/event_bus/live_msg_bus.dart
@@ -0,0 +1,22 @@
+import 'package:event_bus/event_bus.dart';
+import 'package:wechat_flutter/video/model/msg_entity.dart';
+
+// enum LiveMsgEventState {
+// /// 【单人】【视频】对方未响应
+// singleVideoNotRsp,
+//
+// /// 【单人】【音频】对方未响应
+// singleAudioNotRsp,
+// }
+
+EventBus liveStateToChatBus = EventBus();
+
+class LiveMsgBusModel {
+ final String targetId;
+ final MsgEntity msgMap;
+
+ LiveMsgBusModel({
+ required this.targetId,
+ required this.msgMap,
+ });
+}
diff --git a/lib/video/event_bus/live_state_bus.dart b/lib/video/event_bus/live_state_bus.dart
new file mode 100644
index 0000000..2008f3c
--- /dev/null
+++ b/lib/video/event_bus/live_state_bus.dart
@@ -0,0 +1,20 @@
+import 'package:event_bus/event_bus.dart';
+
+enum LiveEventState {
+ /// 被拒绝
+ denied,
+
+ /// 发送人取消【需要关闭可接听电话页面】
+ senderCancel,
+
+ /// 接收人正忙
+ receiverBusy,
+}
+
+EventBus liveStateBus = EventBus();
+
+class LiveStateBusModel {
+ final LiveEventState liveEventState;
+
+ LiveStateBusModel(this.liveEventState);
+}
diff --git a/lib/video/event_bus/live_stream_msg_bus.dart b/lib/video/event_bus/live_stream_msg_bus.dart
new file mode 100644
index 0000000..f3fd6bd
--- /dev/null
+++ b/lib/video/event_bus/live_stream_msg_bus.dart
@@ -0,0 +1,11 @@
+import 'package:event_bus/event_bus.dart';
+
+EventBus liveStreamMsgBus = EventBus();
+
+
+class LiveStreamMsgModel {
+ final int channelId;
+ final String? msgContent;
+
+ LiveStreamMsgModel(this.channelId,this.msgContent);
+}
diff --git a/lib/video/event_bus/msg_option_bus.dart b/lib/video/event_bus/msg_option_bus.dart
new file mode 100644
index 0000000..c7b3f39
--- /dev/null
+++ b/lib/video/event_bus/msg_option_bus.dart
@@ -0,0 +1,42 @@
+import 'package:event_bus/event_bus.dart';
+
+EventBus msgOptionBus = EventBus();
+
+enum MsgOptionType {
+ /// 自己发送消息
+ selfSendMsg,
+
+ /// 设置已读消息
+ setReadMsg,
+}
+
+class MsgOptionParam {
+ final MsgOptionType msgOptionType;
+ final chatType;///ChatType
+
+ /// 消息内容，如果是发消息给目标必填
+ /// 主要给会话列表显示的，所以如果特殊消息是需要转化之后的，比如图片消息：[图片]
+ final String? msgContent;
+
+ /// 发送对象
+ final String targetId;
+
+ /// 发送对象的显示标题
+ final String title;
+ final String msgId;
+
+ MsgOptionParam({
+ required this.msgOptionType,
+ required this.chatType,
+ required this.msgContent,
+ required this.targetId,
+ required this.title,
+ required this.msgId,
+ });
+}
+
+class MsgOptionModel {
+ final MsgOptionParam param;
+
+ MsgOptionModel(this.param);
+}
diff --git a/lib/video/event_bus/received_msg_bus.dart b/lib/video/event_bus/received_msg_bus.dart
new file mode 100644
index 0000000..3172116
--- /dev/null
+++ b/lib/video/event_bus/received_msg_bus.dart
@@ -0,0 +1,20 @@
+import 'package:event_bus/event_bus.dart';
+
+EventBus receivedMsgBus = EventBus();
+
+class ReceivedMsgModel {
+ final msg;///EMMessage
+
+ /// 是否只有首页刷新
+ final bool isOnlyHomeRefresh;
+
+ /*
+ * 如果时个人聊天则为对方id，因为是接受消息
+ * 如果是群则为群id
+ * */
+ String get conversationId {
+ return msg.conversationId ?? "";
+ }
+
+ ReceivedMsgModel(this.msg, {this.isOnlyHomeRefresh = false});
+}
diff --git a/lib/video/event_bus/recognition_bus.dart b/lib/video/event_bus/recognition_bus.dart
new file mode 100644
index 0000000..26ce76d
--- /dev/null
+++ b/lib/video/event_bus/recognition_bus.dart
@@ -0,0 +1,16 @@
+import 'package:event_bus/event_bus.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+EventBus recognitionBus = EventBus();
+
+class RecognitionBusBusModel {
+ final String userId;
+ final String text;
+ final String msgId;
+
+ bool get isSelf {
+ return Q1Data.loginUserId == userId;
+ }
+
+ RecognitionBusBusModel(this.userId, this.text, this.msgId);
+}
diff --git a/lib/video/event_bus/refresh_cov_bus.dart b/lib/video/event_bus/refresh_cov_bus.dart
new file mode 100644
index 0000000..41f32a9
--- /dev/null
+++ b/lib/video/event_bus/refresh_cov_bus.dart
@@ -0,0 +1,9 @@
+import 'package:event_bus/event_bus.dart';
+
+EventBus refreshCovBus = EventBus();
+
+class RefreshCovModel {
+ final bool isOnlyRefreshUI;
+
+ RefreshCovModel({this.isOnlyRefreshUI = false});
+}
diff --git a/lib/video/float/float_view/logic.dart b/lib/video/float/float_view/logic.dart
new file mode 100644
index 0000000..b3653b7
--- /dev/null
+++ b/lib/video/float/float_view/logic.dart
@@ -0,0 +1,156 @@
+import 'package:flutter/material.dart';
+import 'package:wechat_flutter/video/float/float_view/state.dart';
+import 'package:wechat_flutter/video/float/float_view/view.dart';
+import 'package:wechat_flutter/video/float/float_window.dart';
+import 'package:wechat_flutter/video/float/float_window_impl.dart';
+import 'package:wechat_flutter/video/impl/live_event_bus_impl.dart';
+import 'package:wechat_flutter/video/impl/live_logic_impl.dart';
+import 'package:wechat_flutter/video/impl/single_no_rsp.dart';
+import 'package:wechat_flutter/video/interface/base_interface.dart';
+import 'package:wechat_flutter/video/logic/live_time_logic.dart';
+import 'package:wechat_flutter/video/model/channel_entity.dart';
+import 'package:wechat_flutter/video/msg/chat_msg_mixin.dart';
+import 'package:wechat_flutter/video/msg/chat_msg_param.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+
+class FloatViewLogic extends GetxController
+ with
+ LiveCheckClose,
+ SingleNoRspAbs,
+ SingleNoRsp,
+ LiveEventBus,
+ LiveEventBusImpl,
+ LiveTimeObs,
+ LiveTimeLogic {
+ final FloatViewState state = FloatViewState();
+
+/*
+* 需要主动在initState调用
+* */
+ void onInitHandle(FloatWindowParam param) {
+ initLiveEventBus(() => setClosePage());
+ initParam(param);
+ if (!param.isHaveConnect) {
+ noRspStartTime(() {
+ LiveBaseInterface agoraIml = param.agoraIml;
+ Rx<ChannelEntity?> channelEntity = param.channelEntity!;
+ // 发送隐藏消息给对方【让其关闭等待接听的页面】
+ ChatMsgParam chatMsgParam = ChatMsgParam(
+ agoraIml.channelId ?? AppConfig.mockCallRoomId,
+ param.type,
+ channelEntity.value!.targetId,
+
+ /// 是否群聊应该为真实数据
+ param.type.toString().contains('multiple'),
+ );
+ ChatMsgUtil.sendCancelHideMsg(chatMsgParam);
+
+ // 发送【对方无应答】可视消息
+ ChatMsgUtil.sendNoRspShowMsg(chatMsgParam);
+ });
+ } else {
+ startTime();
+ }
+ if (state.isShowAudioWindow) {
+ state.left = state.overlayHomeLeft;
+ state.top = state.overlayHomeTop;
+ } else {
+ state.left = state.overlayLeft;
+ state.top = state.overlayTop;
+ }
+ }
+
+ /*
+ * 初始化参数
+ * */
+ void initParam(FloatWindowParam param) {
+ noRspTimeValue = param.noRspTimeValue ?? 0;
+ noRspIsOk = param.noRspIsOk ?? false;
+ if (param.timeValue != null) {
+ timeValue = param.timeValue!;
+ }
+ }
+
+ /*
+ * 拖动更新位置
+ * */
+ void onPanUpdate(DragUpdateDetails details, State<FloatViewPage> pageState) {
+ pageState.setState(() {
+ if (state.isShowAudioWindow) {
+ state.top = details.globalPosition.dy;
+ state.left = details.globalPosition.dx;
+ } else {
+ state.left = details.globalPosition.dx - state.viewWidth / 2;
+ state.top = details.globalPosition.dy - state.viewHeight / 2;
+ if (state.left <= 0) {
+ state.left = 0;
+ } else if (state.left >= Get.width - state.viewWidth) {
+ state.left = Get.width - state.viewWidth;
+ }
+
+ if (state.top <= ScreenUtil.mediaQuery.padding.top + 64) {
+ state.top = ScreenUtil.mediaQuery.padding.top + 64;
+ } else if (state.top >=
+ Get.height -
+ ScreenUtil.mediaQuery.padding.bottom -
+ state.viewWidth * 2) {
+ state.top = Get.height -
+ ScreenUtil.mediaQuery.padding.bottom -
+ state.viewWidth * 2;
+ }
+ }
+ });
+ }
+
+ /*
+ * 拖动结束
+ * */
+ void onPanEnd(details, State<FloatViewPage> pageState) {
+ pageState.setState(() {
+ if (state.isShowAudioWindow) {
+ if (state.top <= (ScreenUtil.mediaQuery.padding.top + 5.5)) {
+ state.top = ScreenUtil.mediaQuery.padding.top + 5.5;
+ } else if (state.top >=
+ Get.height - (ScreenUtil.mediaQuery.padding.bottom * 2)) {
+ state.top = Get.height - (ScreenUtil.mediaQuery.padding.bottom * 2);
+ }
+ }
+ if (state.left + state.viewWidth / 2 < Get.width / 2) {
+ state.left = 0;
+ } else {
+ if (state.isShowAudioWindow) {
+ state.left = Get.width - 32;
+ } else {
+ state.left = Get.width - state.viewWidth;
+ }
+ }
+ });
+
+ /// 设置全局存储位置数据
+ if (state.isShowAudioWindow) {
+ state.overlayHomeLeft = state.left;
+ state.overlayHomeTop = state.top;
+ } else {
+ state.overlayLeft = state.left;
+ state.overlayTop = state.top;
+ }
+ }
+
+/*
+* 需要主动在dispose调用
+* */
+ void onCloseHandle(FloatWindowParam param) {
+ // 关闭事件总线
+ closeLiveEventBus();
+
+ param.timeValue = timeValue;
+ param.timeValueStr = timeValueStr;
+ floatWindow.setParamValue(param: param);
+
+ /// 都取消，防止有中途连接上的
+ /// 一定要关闭否则不是同一个实例
+ noRspCancelTime();
+ cancelTime();
+ }
+}
diff --git a/lib/video/float/float_view/state.dart b/lib/video/float/float_view/state.dart
new file mode 100644
index 0000000..a93bf9c
--- /dev/null
+++ b/lib/video/float/float_view/state.dart
@@ -0,0 +1,31 @@
+import 'package:get/get.dart';
+
+class FloatViewState {
+
+ double viewWidth = 92; //浮窗中画面的宽
+ double viewHeight = 116; //浮窗中画面的高
+
+ /// 悬浮窗【小房子图标】左边距离
+ double overlayHomeLeft = 5.5;
+
+ /// 悬浮窗【小房子图标】顶部距离
+ double overlayHomeTop = 5.5 + Get.statusBarHeight;
+
+ /// 悬浮窗左边距离
+ double overlayLeft = Get.width - 90;
+
+ /// 悬浮窗顶部距离
+ double overlayTop = 100;
+
+ bool get isShowAudioWindow {
+ return false;
+ }
+
+ double left = Get.width - 90;
+ double top = (Get.height / 2 - 139) / 2;
+
+
+ FloatViewState() {
+ ///Initialize variables
+ }
+}
diff --git a/lib/video/float/float_view/view.dart b/lib/video/float/float_view/view.dart
new file mode 100644
index 0000000..4b0d94b
--- /dev/null
+++ b/lib/video/float/float_view/view.dart
@@ -0,0 +1,133 @@
+import 'package:flutter/material.dart';
+import 'package:wechat_flutter/video/float/float_view/state.dart';
+import 'package:wechat_flutter/video/float/float_window.dart';
+import 'package:wechat_flutter/video/float/float_window_impl.dart';
+import 'package:wechat_flutter/tools/func/func.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+import 'logic.dart';
+
+enum LivePageType {
+ singleAudio,
+ multipleAudio,
+ singleVideo,
+ multipleVideo,
+}
+
+class FloatViewPage extends StatefulWidget {
+ final FloatWindowParam param;
+
+ const FloatViewPage(this.param, {Key? key}) : super(key: key);
+
+ @override
+ FloatViewPageState createState() => FloatViewPageState();
+}
+
+class FloatViewPageState extends State<FloatViewPage> {
+ late FloatViewLogic logic;
+ late FloatViewState state;
+
+ @override
+ void initState() {
+ super.initState();
+ logic = Get.put(FloatViewLogic());
+ state = Get.find<FloatViewLogic>().state;
+
+ logic.onInitHandle(widget.param);
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return Positioned(
+ /// 【2021 11.25】优化小窗口位置（安卓苹果统一）
+ /// 直播UI验收11.16 - 飞书云文档 【商品分享】安卓、IOS分享商品，都会出现挡住
+ top: state.top,
+ left: state.left,
+ child: GetBuilder<FloatViewLogic>(
+ builder: (v) {
+ return GestureDetector(
+ // 移动中
+ onPanUpdate: (v) => logic.onPanUpdate(v, this),
+ // 移动结束
+ onPanEnd: (v) => logic.onPanEnd(v, this),
+ child: ClipRRect(
+ borderRadius: BorderRadius.circular(8),
+ child: Material(
+ type: MaterialType.transparency,
+ child: _floatViewItemWidget(context, state),
+ ),
+ ),
+ );
+ },
+ ),
+ );
+ }
+
+ Widget _floatViewItemWidget(BuildContext context, FloatViewState state) {
+ if (widget.param.type == LivePageType.singleAudio ||
+ widget.param.type == LivePageType.multipleAudio) {
+ return ClickEvent(
+ child: Stack(
+ alignment: Alignment.center,
+ children: [
+ Image.asset(
+ 'assets/images/live/live_audio_windwo_bg.png',
+ width: 89,
+ height: 88,
+ ),
+ Obx(() {
+ return Text(
+ !listNoEmpty(widget.param.agoraIml.remoteUid.value)
+ ? "等待接听"
+ : '通话中\n${logic.timeValueStr.value}',
+ style: TextStyle(
+ color: const Color(0xff07C160),
+ fontSize: 12.f,
+ ),
+ );
+ })
+ ],
+ ),
+ onTap: () {
+ floatWindow.floatClick();
+ },
+ );
+ }
+ return ClipRRect(
+ borderRadius: BorderRadius.circular(8),
+ child: ClickEvent(
+ onTap: () async {
+ floatWindow.floatClick();
+ },
+ child: SizedBox(
+ width: state.viewWidth,
+ height: state.viewHeight,
+ child: () {
+ if (!listNoEmpty(widget.param.remoteUid) ||
+ widget.param.type == LivePageType.multipleVideo) {
+ return Container();
+ // return const SurfaceView(
+ // zOrderMediaOverlay: true,
+ // zOrderOnTop: true,
+ // );
+ } else {
+ return Container();
+
+ // return SurfaceView(
+ // uid: widget.param.remoteUid[0],
+ // channelId: widget.param.channelId,
+ // renderMode: VideoRenderMode.Hidden,
+ // );
+ }
+ }(),
+ ),
+ ),
+ );
+ }
+
+ @override
+ void dispose() {
+ super.dispose();
+ logic.onCloseHandle(widget.param);
+ }
+}
diff --git a/lib/video/float/float_window.dart b/lib/video/float/float_window.dart
new file mode 100644
index 0000000..da135cb
--- /dev/null
+++ b/lib/video/float/float_window.dart
@@ -0,0 +1,85 @@
+// 抽象类，接口作用
+import 'package:flutter/material.dart';
+import 'package:tencent_trtc_cloud/trtc_cloud.dart';
+import 'package:wechat_flutter/video/impl/agora_audio_iml.dart';
+import 'package:wechat_flutter/video/impl/agora_video_iml.dart';
+import 'package:wechat_flutter/video/model/channel_entity.dart';
+import 'package:wechat_flutter/video/other/user/entity.dart';
+import 'package:wechat_flutter/video/float/float_view/view.dart';
+import 'package:wechat_flutter/video/interface/base_interface.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+class FloatWindowParam {
+ LivePageType type;
+ AgoraVideoIml? agoraVideoIml;
+ AgoraAudioIml? agoraAudioIml;
+ RxList<UserInfoEntity?>? infoList;
+ int? noRspTimeValue;
+ bool? noRspIsOk;
+ RxBool? isSend;
+ RxList<int>? singleRemoteUid;
+ int? myAgoraId;
+ TRTCCloud? trtcCloud;
+ int? timeValue;
+ Rx<ChannelEntity?>? channelEntity;
+ RxString timeValueStr;
+
+ bool get isJoin {
+ return agoraVideoIml?.isJoined ?? false;
+ }
+
+ LiveBaseInterface get agoraIml {
+ return (agoraVideoIml ?? agoraAudioIml)!;
+ }
+
+ RxList<int> get remoteUid {
+ return agoraVideoIml?.remoteUid ?? agoraAudioIml?.remoteUid ?? <int>[].obs;
+ }
+
+ bool get isHaveConnect {
+ return listNoEmpty(singleRemoteUid);
+ }
+
+ int get channelId {
+ return agoraVideoIml?.channelId ?? agoraAudioIml?.channelId ?? AppConfig.mockCallRoomId;
+ }
+
+ FloatWindowParam(
+ this.type, {
+ this.agoraVideoIml,
+ this.agoraAudioIml,
+ this.infoList,
+ this.noRspTimeValue,
+ this.noRspIsOk,
+ this.myAgoraId,
+ this.trtcCloud,
+ required this.singleRemoteUid,
+ required this.isSend,
+ required this.timeValue,
+ required this.channelEntity,
+ required this.timeValueStr,
+ });
+}
+
+abstract class FloatWindow {
+ bool get isHaveFloat;
+
+ FloatWindowParam? paramValue;
+
+ /// 打开悬浮窗
+ void open(BuildContext context, {required FloatWindowParam param});
+
+ /*
+ * 设置参数值
+ * */
+ void setParamValue({required FloatWindowParam param});
+
+ /// 关闭悬浮窗
+ Future<bool> close();
+
+ /// 销毁小窗实体与引擎
+ void closeFloatUIAndEngine();
+
+ /// 悬浮窗被点击
+ void floatClick();
+}
diff --git a/lib/video/float/float_window_impl.dart b/lib/video/float/float_window_impl.dart
new file mode 100644
index 0000000..d9d5611
--- /dev/null
+++ b/lib/video/float/float_window_impl.dart
@@ -0,0 +1,64 @@
+// 混装类，通用
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:wechat_flutter/video/float/overlay_view.dart';
+import 'package:wechat_flutter/video/impl/live_util.dart';
+import 'package:wechat_flutter/video/float/float_view/view.dart';
+import 'package:wechat_flutter/video/float/float_window.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+FloatWindow floatWindow = IosFloatWindow();
+
+/// IOS专用
+/// Android和iOS都先试用这个，后续再一
+class IosFloatWindow extends FloatWindow {
+ @override
+ void open(BuildContext context, {required FloatWindowParam param}) {
+ paramValue = param;
+ OverlayView.showOverlayEntry(context, param: param);
+ }
+
+ @override
+ Future<bool> close() async {
+ OverlayView.removeOverlayEntry();
+ return true;
+ }
+
+ @override
+ void closeFloatUIAndEngine() {}
+
+ @override
+ void floatClick() {
+ close();
+ Map arguments = {
+ "isWindowPush": true,
+ "channelId": paramValue?.channelId ?? "",
+ "isSend": paramValue?.agoraVideoIml?.isSend,
+ };
+ LiveUtil.checkPermissionThen(() async {
+ if (paramValue?.type == LivePageType.singleVideo) {
+ Get.toNamed(RouteConfig.videoSinglePage, arguments: arguments);
+ } else if (paramValue?.type == LivePageType.multipleVideo) {
+ Get.toNamed(RouteConfig.videoMultiplePage, arguments: arguments);
+ } else if (paramValue?.type == LivePageType.singleAudio) {
+ Get.toNamed(RouteConfig.audioSinglePage, arguments: arguments);
+ } else if (paramValue?.type == LivePageType.multipleAudio) {
+ Get.toNamed(RouteConfig.audioMultiplePage, arguments: arguments);
+ }
+ });
+ }
+
+ @override
+ bool get isHaveFloat => OverlayView.overlayEntry != null;
+
+ void pushToLive() {}
+
+ Future<bool> onlyCloseUI() async {
+ return false;
+ }
+
+ @override
+ void setParamValue({required FloatWindowParam param}) {
+ paramValue = param;
+ }
+}
diff --git a/lib/video/float/live_show_widnow.dart b/lib/video/float/live_show_widnow.dart
new file mode 100644
index 0000000..1ea4145
--- /dev/null
+++ b/lib/video/float/live_show_widnow.dart
@@ -0,0 +1,145 @@
+import 'package:flutter/material.dart';
+import 'package:wechat_flutter/video/pages/audio_multiple/view.dart';
+import 'package:wechat_flutter/video/pages/audio_single/view.dart';
+import 'package:wechat_flutter/video/pages/video_multiple/view.dart';
+import 'package:wechat_flutter/video/pages/video_sigle/view.dart';
+
+final imLiveRouteObserver = RouteObserver<Route<dynamic>>();
+
+abstract class LivePageHandleInterface {
+ Future<bool> popHandle();
+
+ bool get mounted;
+
+ BuildContext get context;
+}
+
+mixin LiveShowWindow
+ on RouteAware, WidgetsBindingObserver, LivePageHandleInterface {
+ void initStateHandle() {
+ WidgetsBinding.instance.addObserver(this);
+ }
+
+ @override
+ void didPop() {
+ WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+ popHandle();
+ });
+ super.didPop();
+ }
+
+ void didChangeDependenciesHandle() {
+ imLiveRouteObserver.subscribe(
+ this, ModalRoute.of(context) as Route<dynamic>);
+ }
+
+ @override
+ void didPopNext() {
+ super.didPopNext();
+ }
+
+ void disposeHandle() {
+ imLiveRouteObserver.unsubscribe(this);
+ WidgetsBinding.instance.removeObserver(this);
+ }
+}
+
+mixin VideoSinglePageHandle on State<VideoSinglePage>, LiveShowWindow {
+ @override
+ void initState() {
+ super.initState();
+ initStateHandle();
+ }
+
+ @override
+ void didChangeDependencies() {
+ super.didChangeDependencies();
+ didChangeDependenciesHandle();
+ }
+
+ @override
+ void dispose() {
+ super.dispose();
+ disposeHandle();
+ }
+}
+
+mixin VideoMultiplePageHandle on State<VideoMultiplePage>, LiveShowWindow {
+ @override
+ void initState() {
+ super.initState();
+ initStateHandle();
+ }
+
+ @override
+ void didChangeDependencies() {
+ super.didChangeDependencies();
+ didChangeDependenciesHandle();
+ }
+
+ @override
+ void dispose() {
+ super.dispose();
+ disposeHandle();
+ }
+}
+mixin VideoAudioPageHandle on State<AudioSinglePage>, LiveShowWindow {
+ @override
+ void initState() {
+ super.initState();
+ initStateHandle();
+ }
+
+ @override
+ void didChangeDependencies() {
+ super.didChangeDependencies();
+ didChangeDependenciesHandle();
+ }
+
+ @override
+ void dispose() {
+ super.dispose();
+ disposeHandle();
+ }
+}
+
+mixin AudioSinglePageHandle on State<AudioSinglePage>, LiveShowWindow {
+ @override
+ void initState() {
+ super.initState();
+ initStateHandle();
+ }
+
+ @override
+ void didChangeDependencies() {
+ super.didChangeDependencies();
+ didChangeDependenciesHandle();
+ }
+
+ @override
+ void dispose() {
+ super.dispose();
+ disposeHandle();
+ }
+}
+
+
+mixin AudioMultiplePageHandle on State<AudioMultiplePage>, LiveShowWindow {
+ @override
+ void initState() {
+ super.initState();
+ initStateHandle();
+ }
+
+ @override
+ void didChangeDependencies() {
+ super.didChangeDependencies();
+ didChangeDependenciesHandle();
+ }
+
+ @override
+ void dispose() {
+ super.dispose();
+ disposeHandle();
+ }
+}
diff --git a/lib/video/float/overlay_view.dart b/lib/video/float/overlay_view.dart
new file mode 100644
index 0000000..a4b6832
--- /dev/null
+++ b/lib/video/float/overlay_view.dart
@@ -0,0 +1,39 @@
+import 'package:flutter/material.dart';
+import 'package:wechat_flutter/video/float/float_view/view.dart';
+import 'package:wechat_flutter/video/float/float_window.dart';
+import 'package:wechat_flutter/video/float/float_window_impl.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+class OverlayView {
+ static double viewHeight = 138.5; //浮窗中画面的高
+ static OverlayEntry? overlayEntry;
+
+ /*
+ * 显示悬浮窗
+ * */
+ static void showOverlayEntry(BuildContext context,
+ {required FloatWindowParam param}) {
+ floatWindow.close();
+
+ overlayEntry = OverlayEntry(builder: (context) {
+ return FloatViewPage(param);
+ });
+
+ OverlayState? overlayState = Overlay.of(context, rootOverlay: true);
+ overlayState?.insert(overlayEntry!);
+ }
+
+ /*
+ * 关闭悬浮窗
+ * */
+ static void removeOverlayEntry([bool isDismiss = true]) {
+ if (overlayEntry != null) {
+ try {
+ overlayEntry?.remove();
+ } catch (e) {
+ LogUtil.d('removeOverlayEntry failed');
+ }
+ overlayEntry = null;
+ }
+ }
+}
diff --git a/lib/video/impl/agora_audio_iml.dart b/lib/video/impl/agora_audio_iml.dart
new file mode 100644
index 0000000..b691bc4
--- /dev/null
+++ b/lib/video/impl/agora_audio_iml.dart
@@ -0,0 +1,296 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:typed_data';
+
+import 'package:flutter/foundation.dart';
+import 'package:get/get.dart';
+import 'package:permission_handler/permission_handler.dart';
+import 'package:wechat_flutter/video/event/live_stream_event.dart';
+import 'package:wechat_flutter/video/event_bus/recognition_bus.dart';
+import 'package:wechat_flutter/video/impl/live_util.dart';
+import 'package:wechat_flutter/video/interface/base_interface.dart';
+import 'package:wechat_flutter/tools/func/log.dart';
+
+import '../interface/live_audio_interface.dart';
+
+const int defaultSampleRate = 16000;
+const int defaultChannelCount = 1;
+
+class AgoraAudioIml extends LiveAudioInterFace {
+ final MediaType mediaType;
+
+ AgoraAudioIml(this.mediaType);
+
+ @override
+ // TRTCCloud? engine;
+
+ // final CustomCaptureAudioApi _api = CustomCaptureAudioApi();
+
+ /// 语音识别文字的timer
+ Timer? recognitionTimer;
+ int recognitionCount = 0;
+
+ @override
+ void addListeners(
+ VoidCallback onUserJoined,
+ VoidCallback? onSelfJoinChannel,
+ LiveStateChange? onLiveStateChange,
+ LiveJoinFail? onLiveJoinFail,
+ // RxBool enableTl,
+ ) {
+ LogUtil.d("$logHead 添加监听");
+ // engine?.setEventHandler(RtcEngineEventHandler(
+ // warning: (warningCode) {
+ // LogUtil.d('$logHead warning $warningCode');
+ // if (warningCode == WarningCode.OpenChannelTimeout ||
+ // warningCode == WarningCode.OpenChannelRejected) {
+ // if (onLiveJoinFail != null) {
+ // onLiveJoinFail(LiveErrorType.channelError);
+ // }
+ // }
+ // },
+ // error: (ErrorCode errorCode) {
+ // LogUtil.d(
+ // '$logHead error $errorCode。errorCode.name::${errorCode.name}');
+ // },
+ // joinChannelSuccess: (channel, uid, elapsed) async {
+ // LogUtil.d('$logHead joinChannelSuccess $channel $uid $elapsed');
+ //
+ // /// 开始音频采集
+ // await _api.startAudioRecord(
+ // defaultSampleRate, defaultChannelCount, enableTl, openMicrophone);
+ //
+ // /// 开始识别
+ // startRecognition(enableTl);
+ //
+ // // 取消hud
+ // HudView.dismiss();
+ //
+ // myAgoraId = uid;
+ // if (onSelfJoinChannel != null) onSelfJoinChannel();
+ // joinOkHandle();
+ // },
+ // networkQuality: handleNet,
+ // leaveChannel: (stats) async {
+ // LogUtil.d('$logHead leaveChannel ${stats.toJson()}');
+ // isJoined = false;
+ // remoteUid.clear();
+ // },
+ // userJoined: (uid, elapsed) async {
+ // LogUtil.d('$logHead:userJoined $uid $elapsed');
+ // remoteUid.add(uid);
+ // onUserJoined();
+ // },
+ // userOffline: (uid, reason) {
+ // LogUtil.d('$logHead:userOffline $uid $reason');
+ //
+ // remoteUid.removeWhere((element) => element == uid);
+ // },
+ // streamMessage: (uid, streamId, data) =>
+ // streamMessage(uid, streamId, data, onLiveStateChange),
+ // ));
+ }
+
+ @override
+ void streamMessage(int uid, int streamId, Uint8List data,
+ LiveStateChange? onLiveStateChange) {
+ final realMsg = utf8.decode(data);
+ LogUtil.d("收到附加消息::$realMsg");
+ final LiveSteamEvent steamEvent =
+ LiveSteamEvent.fromJson(json.decode(realMsg));
+ if (steamEvent.eventName == LiveEventName.ttsContent.name) {
+ recognitionBus.fire(RecognitionBusBusModel('${steamEvent.uid}',
+ steamEvent.content ?? "未知", steamEvent.msgId ?? '0'));
+ } else if (steamEvent.eventName == LiveEventName.changeToVoice.name) {
+ /// 此事件音频不需要处理
+ } else {
+ if (onLiveStateChange != null) onLiveStateChange(steamEvent);
+ }
+ }
+
+ /*
+ * 开始识别语音
+ * */
+ Future startRecognition(RxBool enableTl) async {
+ LogUtil.d("【语音识别】开始倒计时轮训");
+ recognitionTimer = Timer.periodic(Duration(seconds: 1), (timer) async {
+ if (recognitionCount < 5) {
+ recognitionCount++;
+ } else {
+ if (enableTl.value) {
+ // await _api.startGetText(enableTl);
+ } else {
+ LogUtil.d("已经关闭了语音转文字翻译功能");
+ }
+ recognitionCount = 0;
+ }
+ });
+ }
+
+ /*
+ * 取消识别语音
+ * */
+ Future cancelRecognition() async {
+ LogUtil.d("【语音识别】取消倒计时");
+ recognitionTimer?.cancel();
+ recognitionTimer = null;
+ // await _api.stopAudioRecord();
+ }
+
+ @override
+ Future initEngine({
+ required VoidCallback onUserJoined,
+ required VoidCallback onSetClosePage,
+ VoidCallback? onSelfJoinChannel,
+ LiveStateChange? onLiveStateChange,
+ LiveJoinFail? onLiveJoinFail,
+ }) async {
+ setTestUserId();
+
+ // engine = await RtcEngine?.createWithContext(
+ // RtcEngineContext(Environment.appIdAgora));
+ //
+ // // engine.enable();
+ //
+ // addListeners(onUserJoined, onSelfJoinChannel, onLiveStateChange,
+ // onLiveJoinFail, enableTl);
+ //
+ // /// 使用自定义采集，不需要开启音频了
+ // // await engine?.enableAudio();
+ //
+ // /// 一定要直播模式，否则服务端收不到加入频道和退出频道通知
+ // await engine?.setChannelProfile(ChannelProfile.LiveBroadcasting);
+ // await engine?.setClientRole(ClientRole.Broadcaster);
+
+ await getUserToken(onSetClosePage);
+
+ await joinChannel(onSetClosePage);
+ }
+
+ @override
+ Future destroyEngine() async {
+ // 取消文字识别
+ cancelRecognition();
+
+ channelId = null;
+ remoteUid.clear();
+ // await engine?.leaveChannel();
+ // await engine?.destroy();
+ }
+
+ @override
+ Future joinChannel(VoidCallback onSetClosePage) async {
+ if (defaultTargetPlatform == TargetPlatform.android) {
+ await Permission.microphone.request();
+ }
+
+ if (channelId == null) {
+ onSetClosePage();
+ LiveUtil.closeAndTip("加入频道失败");
+ }
+
+ // LogUtil.d(
+ // '声网加入频道::userToken:$userToken，channelId:$channelId，userAccount:$userAccount');
+ //
+ // await engine?.setDefaultAudioRouteToSpeakerphone(true);
+ //
+ // // Sets the external audio source.
+ // // PS: Ensure that you call this method before the joinChannel method
+ // await _api.setExternalAudioSource(
+ // true, defaultSampleRate, defaultChannelCount);
+ //
+ // // Set audio route to speaker
+ // await engine?.setDefaultAudioRouteToSpeakerphone(true);
+ //
+ // final option = ChannelMediaOptions();
+ // option.autoSubscribeAudio = true;
+ // option.autoSubscribeVideo = false;
+ //
+ // await engine
+ // ?.joinChannelWithUserAccount(
+ // userToken, channelId!, userAccount.toString(), option)
+ // .catchError((onError) {
+ // LogUtil.d('$logHead error ${onError.toString()}');
+ // });
+ startCheckJoin(onSetClosePage);
+ }
+
+ @override
+ Future leaveChannel() async {
+ // await engine?.leaveChannel();
+
+ // 取消文字识别
+ cancelRecognition();
+
+ isJoined = false;
+ openMicrophone.value = true;
+ enableSpeakerphone.value = true;
+ playEffect.value = false;
+ enableInEarMonitoring = false;
+ recordingVolume = 100;
+ playbackVolume = 100;
+ inEarMonitoringVolume = 100;
+ }
+
+ @override
+ void onChangeInEarMonitoringVolume(double value) async {
+ inEarMonitoringVolume = value;
+ // await engine?.setInEarMonitoringVolume(inEarMonitoringVolume.toInt());
+ }
+
+ @override
+ void switchEffect() async {
+ // if (playEffect.value) {
+ // engine?.stopEffect(1).then((value) {
+ // playEffect.value = false;
+ // }).catchError((err) {
+ // LogUtil.d('$logHead stopEffect $err');
+ // });
+ // } else {
+ // final path =
+ // (await engine?.getAssetAbsolutePath("assets/Sound_Horizon.mp3"))!;
+ // engine
+ // ?.playEffect(1, path, 0, 1, 1, 100, openMicrophone.value)
+ // .then((value) {
+ // playEffect.value = true;
+ // }).catchError((err) {
+ // LogUtil.d('$logHead playEffect $err');
+ // });
+ // }
+ }
+
+ @override
+ void switchMicrophone(String targetId) async {
+ // await engine?.enableLocalAudio(!openMicrophone.value).then((value) {
+ // openMicrophone.value = !openMicrophone.value;
+ // }).catchError((err) {
+ // LogUtil.d('$logHead enableLocalAudio $err');
+ // });
+ //
+ // final LiveEventName msEvent = openMicrophone.value
+ // ? LiveEventName.openMicrophone
+ // : LiveEventName.closeMicrophone;
+ //
+ // sendLiveMsg(
+ // msEvent,
+ // mediaType,
+ // true,
+ // targetId: targetId,
+ // );
+ }
+
+ @override
+ void switchSpeakerphone() {
+ // engine?.setEnableSpeakerphone(!enableSpeakerphone.value).then((value) {
+ // enableSpeakerphone.value = !enableSpeakerphone.value;
+ // }).catchError((err) {
+ // LogUtil.d('$logHead setEnableSpeakerphone $err');
+ // });
+ }
+
+ @override
+ void toggleInEarMonitoring(value) async {
+ enableInEarMonitoring = value;
+ // await engine?.enableInEarMonitoring(enableInEarMonitoring);
+ }
+}
diff --git a/lib/video/impl/agora_video_iml.dart b/lib/video/impl/agora_video_iml.dart
new file mode 100644
index 0000000..5de7c6b
--- /dev/null
+++ b/lib/video/impl/agora_video_iml.dart
@@ -0,0 +1,377 @@
+import 'dart:convert';
+import 'dart:typed_data';
+
+import 'package:oktoast/oktoast.dart';
+import 'package:tencent_trtc_cloud/trtc_cloud.dart';
+import 'package:tencent_trtc_cloud/trtc_cloud_def.dart';
+import 'package:tencent_trtc_cloud/tx_audio_effect_manager.dart';
+import 'package:tencent_trtc_cloud/tx_beauty_manager.dart';
+import 'package:tencent_trtc_cloud/tx_device_manager.dart';
+import 'package:wechat_flutter/video/event/live_stream_event.dart';
+import 'package:wechat_flutter/video/event_bus/recognition_bus.dart';
+import 'package:wechat_flutter/video/interface/base_interface.dart';
+import 'package:wechat_flutter/video/pages/audio_single/view.dart';
+import 'package:wechat_flutter/video/pages/video_sigle/logic.dart';
+import 'package:wechat_flutter/im/login_handle.dart';
+import 'package:wechat_flutter/tools/config/call_config.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+import 'package:wechat_flutter/video/interface/live_video_interface.dart';
+
+abstract class CallVideoToAudioPage {
+ Future toVoicePage(VideoSingleLogic logic);
+}
+
+class AgoraVideoIml extends LiveVideoInterFace with CallVideoToAudioPage {
+ final MediaType mediaType;
+
+ AgoraVideoIml(this.mediaType);
+
+ @override
+ TRTCCloud? trtcCloud;
+ @override
+ TXDeviceManager? txDeviceManager;
+ @override
+ TXBeautyManager? txBeautyManager;
+ @override
+ TXAudioEffectManager? txAudioManager;
+
+ @override
+ bool isJoined = false;
+ @override
+ RxBool switchCamera = true.obs;
+ @override
+ RxBool isEnableVideo = true.obs;
+
+ final RxBool isChangeToVoice = false.obs;
+
+ // final _api = CustomCaptureAudioApi();
+
+ int localViewId = 0;
+
+ @override
+ void addListeners(
+ VoidCallback onUserJoined,
+ VoidCallback? onSelfJoinChannel,
+ LiveStateChange? onLiveStateChange,
+ LiveJoinFail? onLiveJoinFail,
+ ) {
+ LogUtil.d("$logHead 添加监听");
+ // engine?.setEventHandler(RtcEngineEventHandler(
+ // warning: (warningCode) {
+ // LogUtil.d('$logHead:warning $warningCode');
+ //
+ // if (warningCode == WarningCode.OpenChannelTimeout ||
+ // warningCode == WarningCode.OpenChannelRejected) {
+ // if (onLiveJoinFail != null) {
+ // onLiveJoinFail(LiveErrorType.channelError);
+ // }
+ // }
+ // },
+ // error: (errorCode) {
+ // LogUtil.d(
+ // '$logHead error $errorCode。errorCode.name::${errorCode.name}');
+ // },
+ // joinChannelSuccess: (channel, uid, elapsed) async {
+ // LogUtil.d('$logHead:joinChannelSuccess $channel $uid $elapsed');
+ // myAgoraId = uid;
+ // if (onSelfJoinChannel != null) onSelfJoinChannel();
+ // joinOkHandle();
+ //
+ // /// 开始音频采集
+ // await _api.startAudioRecord(
+ // defaultSampleRate, defaultChannelCount, enableTl, openMicrophone);
+ //
+ // /// 开始识别
+ // startRecognition(enableTl);
+ //
+ // HudView.dismiss();
+ // },
+ // userJoined: (uid, elapsed) {
+ // LogUtil.d('$logHead:userJoined $uid $elapsed');
+ // remoteUid.add(uid);
+ // onUserJoined();
+ // },
+ // networkQuality: handleNet,
+ // userOffline: (uid, reason) {
+ // LogUtil.d('$logHead:userOffline $uid $reason');
+ //
+ // remoteUid.removeWhere((element) => element == uid);
+ // },
+ // leaveChannel: (stats) {
+ // LogUtil.d('$logHead:leaveChannel ${stats.toJson()}');
+ //
+ // isJoined = false;
+ // remoteUid.clear();
+ // },
+ // contentInspectResult: (ContentInspectResult result) {
+ // ///
+ // if (result == ContentInspectResult.ContentInspectSexy) {
+ // Get.defaultDialog(content: const Text('内容过于性感'));
+ // } else if (result == ContentInspectResult.ContentInspectPorn) {
+ // Get.defaultDialog(content: const Text('检测到违规内容，请注意规范'));
+ // }
+ // },
+ // streamMessage: (uid, streamId, data) =>
+ // streamMessage(uid, streamId, data, onLiveStateChange),
+ // ));
+ }
+
+ @override
+ void streamMessage(int uid, int streamId, Uint8List data,
+ LiveStateChange? onLiveStateChange) {
+ final realMsg = utf8.decode(data);
+ LogUtil.d("收到附加消息::$realMsg");
+ final LiveSteamEvent steamEvent =
+ LiveSteamEvent.fromJson(json.decode(realMsg));
+ if (steamEvent.eventName == LiveEventName.ttsContent.name) {
+ recognitionBus.fire(RecognitionBusBusModel('${steamEvent.uid}',
+ steamEvent.content ?? "未知", steamEvent.msgId ?? '0'));
+ } else if (steamEvent.eventName == LiveEventName.changeToVoice.name) {
+ isChangeToVoice.value = true;
+ } else {
+ if (onLiveStateChange != null) onLiveStateChange(steamEvent);
+ }
+ }
+
+ @override
+ Future changeToVoice({required String targetId}) async {
+ if (trtcCloud == null) {
+ LogUtil.d("引擎为空了");
+ }
+ // engine?.disableVideo();
+ // engine?.enableAudio();
+
+ sendLiveMsg(LiveEventName.changeToVoice, mediaType, false,
+ targetId: targetId);
+
+ isChangeToVoice.value = true;
+ }
+
+ @override
+ Future initEngine({
+ required VoidCallback onUserJoined,
+ required VoidCallback onSetClosePage,
+ VoidCallback? onSelfJoinChannel,
+ LiveStateChange? onLiveStateChange,
+ LiveJoinFail? onLiveJoinFail,
+ }) async {
+ setTestUserId();
+
+ trtcCloud = (await TRTCCloud.sharedInstance())!;
+ txDeviceManager = trtcCloud?.getDeviceManager();
+ txBeautyManager = trtcCloud?.getBeautyManager();
+ txAudioManager = trtcCloud?.getAudioEffectManager();
+
+ addListeners(
+ onUserJoined,
+ onSelfJoinChannel,
+ onLiveStateChange,
+ onLiveJoinFail,
+ );
+
+ // engine?.registerListener(onRtcListener);
+
+ if (!strNoEmpty(Q1Data.userSig)) {
+ dismissAllToast();
+ loginOut(null, tip: "检测用户异常");
+ return;
+ }
+
+ await trtcCloud?.enterRoom(
+ TRTCParams(
+ sdkAppId: AppConfig.sdkAppId,
+ userId: Q1Data.user(),
+ userSig: Q1Data.userSig!,
+ role: TRTCCloudDef.TRTCRoleAnchor,
+ roomId: channelId ?? AppConfig.mockCallRoomId),
+ TRTCCloudDef.TRTC_APP_SCENE_LIVE);
+
+ trtcCloud?.startLocalAudio(CallConfig.audioQuality);
+ // await engine?.enableVideo();
+
+ /// 音频专属【使用自定义采集，不需要使用这个方法了】
+ // await engine?.enableAudio();
+
+ // await engine?.startPreview();
+
+ /// 一定要直播模式，否则服务端收不到加入频道和退出频道通知
+ // await engine?.setChannelProfile(ChannelProfile.LiveBroadcasting);
+ // await engine?.setClientRole(ClientRole.Broadcaster);
+
+ await getUserToken(onSetClosePage);
+
+ await joinChannel(onSetClosePage);
+ }
+
+ @override
+ Future joinChannel(VoidCallback onSetClosePage) async {
+ // if (channelId == null) {
+ // onSetClosePage();
+ // LiveUtil.closeAndTip("加入频道失败");
+ // }
+ //
+ // LogUtil.d(
+ // '声网加入频道::userToken:$userToken，channelId:$channelId，userAccount:$userAccount');
+ //
+ // await engine?.setDefaultAudioRouteToSpeakerphone(true);
+ //
+ // // Sets the external audio source.
+ // // PS: Ensure that you call this method before the joinChannel method
+ // await _api.setExternalAudioSource(
+ // true, defaultSampleRate, defaultChannelCount);
+ //
+ // // Set audio route to speaker
+ // await engine?.setDefaultAudioRouteToSpeakerphone(true);
+ //
+ // final option = ChannelMediaOptions();
+ // option.autoSubscribeAudio = true;
+ //
+ // /// 在视频情况下[autoSubscribeVideo]需要为true
+ // option.autoSubscribeVideo = true;
+ //
+ // await engine
+ // ?.joinChannelWithUserAccount(
+ // userToken, channelId!, userAccount.toString(), option)
+ // .catchError((onError) {
+ // LogUtil.d('$logHead error ${onError.toString()}');
+ // });
+ startCheckJoin(onSetClosePage);
+ }
+
+ @override
+ Future leaveChannel() async {
+ // await engine?.leaveChannel();
+
+ /// 音频专属
+ isJoined = false;
+ openMicrophone.value = true;
+ enableSpeakerphone.value = true;
+ playEffect.value = false;
+ enableInEarMonitoring = false;
+ recordingVolume = 100;
+ playbackVolume = 100;
+ inEarMonitoringVolume = 100;
+ }
+
+ @override
+ void switchCameraHandle() {
+ LogUtil.d(
+ "引擎是否正常::engine::${trtcCloud == null},是否切换为前置::${!switchCamera.value}");
+ txDeviceManager?.switchCamera(!switchCamera.value).then((value) {
+ switchCamera.value = !switchCamera.value;
+ }).catchError((err) {
+ LogUtil.d('$logHead:switchCamera $err');
+ });
+ }
+
+ @override
+ Future enableAndDisableCamera({required String targetId}) async {
+ /// 对方未接听不允许开关摄像头，否则出现错误
+ // if (!listNoEmpty(remoteUid)) {
+ // q1Toast( "等待对方接听");
+ // return;
+ // }
+ // if (isEnableVideo.value) {
+ // await engine?.stopPreview();
+ // await engine?.enableLocalVideo(false);
+ // isEnableVideo.value = false;
+ // } else {
+ // await engine?.startPreview();
+ // await engine?.enableLocalVideo(true);
+ // isEnableVideo.value = true;
+ // }
+
+ final LiveEventName msEvent = isEnableVideo.value
+ ? LiveEventName.openCamera
+ : LiveEventName.closeCamera;
+
+ sendLiveMsg(msEvent, mediaType, false, targetId: targetId);
+ }
+
+ /// 下面全是音频专属
+ @override
+ void onChangeInEarMonitoringVolume(double value) async {
+ inEarMonitoringVolume = value;
+ // await engine?.setInEarMonitoringVolume(inEarMonitoringVolume.toInt());
+ }
+
+ @override
+ void switchEffect() async {
+ // if (playEffect.value) {
+ // engine?.stopEffect(1).then((value) {
+ // playEffect.value = false;
+ // }).catchError((err) {
+ // LogUtil.d('$logHead stopEffect $err');
+ // });
+ // } else {
+ // final path =
+ // (await engine?.getAssetAbsolutePath("assets/Sound_Horizon.mp3"))!;
+ // engine
+ // ?.playEffect(1, path, 0, 1, 1, 100, openMicrophone.value)
+ // .then((value) {
+ // playEffect.value = true;
+ // }).catchError((err) {
+ // LogUtil.d('$logHead playEffect $err');
+ // });
+ // }
+ }
+
+ @override
+ void switchMicrophone({required String targetId}) async {
+ // await engine?.muteLocalAudioStream(!openMicrophone);
+ // await engine?.enableLocalAudio(!openMicrophone.value).then((value) {
+ // openMicrophone.value = !openMicrophone.value;
+ // }).catchError((err) {
+ // LogUtil.d('$logHead enableLocalAudio $err');
+ // });
+
+ final LiveEventName msEvent = openMicrophone.value
+ ? LiveEventName.openMicrophone
+ : LiveEventName.closeMicrophone;
+
+ sendLiveMsg(msEvent, mediaType, true, targetId: targetId);
+ }
+
+ @override
+ void switchSpeakerphone() {
+ // engine?.setEnableSpeakerphone(!enableSpeakerphone.value).then((value) {
+ // enableSpeakerphone.value = !enableSpeakerphone.value;
+ // }).catchError((err) {
+ // LogUtil.d('$logHead setEnableSpeakerphone $err');
+ // });
+ }
+
+ @override
+ void toggleInEarMonitoring(value) async {
+ enableInEarMonitoring = value;
+ // await engine?.enableInEarMonitoring(enableInEarMonitoring);
+ }
+
+ @override
+ Future toVoicePage(VideoSingleLogic logic) async {
+ Get.off(
+ AudioSinglePage(
+ isChangeToVoice: true,
+ timeValue: logic.timeValue,
+ agoraImlVideo: logic.agoraIml,
+ singleNoRspValue: logic,
+ channelId: logic.agoraIml.channelId!,
+ audToVideoMyAgoraId: logic.agoraIml.myAgoraId!,
+ ),
+ routeName: RouteConfig.audioSinglePage,
+ arguments: Get.arguments,
+ );
+ }
+
+ @override
+ Future destroyEngine() async {
+ channelId = null;
+ remoteUid.clear();
+
+ await trtcCloud?.exitRoom();
+ await TRTCCloud.destroySharedInstance();
+
+ // await engine?.leaveChannel();
+ // await engine?.destroy();
+ }
+}
diff --git a/plugin/wechat_flutter_plugin/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/lib/video/impl/chat_msg_mixin.dart
similarity index 100%
rename from plugin/wechat_flutter_plugin/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to lib/video/impl/chat_msg_mixin.dart
diff --git a/lib/video/impl/live_base_impl.dart b/lib/video/impl/live_base_impl.dart
new file mode 100644
index 0000000..e900933
--- /dev/null
+++ b/lib/video/impl/live_base_impl.dart
@@ -0,0 +1,217 @@
+import 'dart:convert';
+import 'dart:typed_data';
+
+import 'package:flutter/material.dart';
+import 'package:wechat_flutter/video/event/live_stream_event.dart';
+import 'package:wechat_flutter/video/impl/live_util.dart';
+import 'package:wechat_flutter/video/msg/chat_msg_mixin.dart';
+import 'package:wechat_flutter/video/other/user/entity.dart';
+import 'package:wechat_flutter/video/float/float_view/view.dart';
+import 'package:wechat_flutter/video/interface/base_interface.dart';
+import 'package:wechat_flutter/video/msg/live_msg_event.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+mixin LiveBaseImpl on LiveBaseInterface {
+ /*
+ * 开始检测加入频道
+ * */
+ @override
+ Future startCheckJoin(VoidCallback onSetClosePage) async {
+ await Future.delayed(const Duration(seconds: 5));
+
+ /// 等待了5秒还没出现加入频道成功，向服务器请求看是否加入成功
+ if (isJoined) return;
+
+ /// 频道id为空，说明已经退出了或异常了
+ if (!numNoEmpty(channelId)) return;
+
+ final List<UserInfoEntity> allUser =
+ await channelAllUserInfo(onSetClosePage);
+
+ UserInfoEntity? whenData;
+ for (UserInfoEntity element in allUser) {
+ final int intUid = int.parse("${element.uid}");
+ if (intUid == userAccount) {
+ whenData = element;
+ }
+ }
+ if (whenData == null) return;
+
+ joinOkHandle();
+
+ LogUtil.d("allUser::${allUser.toString()}");
+ LogUtil.d("whenData::${whenData.toString()}");
+ }
+
+ @override
+ Future joinOkHandle() async {
+ // q1Toast( "连接成功");
+ isJoined = true;
+ // await channelAllUserInfo();
+ // await channelActiveUserInfo();
+ // await activeChannel();
+ // await activeAll();
+ // await getChannelBaseInfo();
+ }
+
+ /*
+ * 设置测试用户id
+ * */
+ Future setTestUserId() async {
+ // String userAccountSp = await SpUtil().get(KeyConstant.agoraAccount);
+ String userAccountSp = Q1Data.user();
+ if (!strNoEmpty(userAccountSp)) {
+ userAccount = 0;
+ return;
+ }
+ try {
+ userAccount = int.parse(userAccountSp);
+ } catch (e) {
+ debugPrint("解析存储的账号异常");
+ }
+ }
+
+ @override
+ Future getUserToken(VoidCallback onSetClosePage) async {
+ // try {
+ // final rsp = await liveViewModel
+ // .getUserTokenRequestModel(strNoEmpty(channelId) ? channelId : null);
+ // if (rsp.data == null) {
+ // onSetClosePage();
+ // LiveUtil.closeAndTip("获取用户token失败");
+ // return;
+ // }
+ //
+ // channelId = rsp.data['channel'];
+ // userAccount = rsp.data['account'];
+ // userToken = rsp.data["token"];
+ // if (!strNoEmpty(userToken)) {
+ // onSetClosePage();
+ // LiveUtil.closeAndTip("获取用户失败");
+ // }
+ // debugPrint("fetch userToken::$userToken");
+ // } catch (e) {
+ // debugPrint("fetch userToken error ::${e.toString()}");
+ // onSetClosePage();
+ // LiveUtil.closeAndTip("获取用户失败");
+ // }
+
+ // if (!strNoEmpty(userToken)) {
+ // onSetClosePage();
+ // LiveUtil.closeAndTip("获取用户失败");
+ // }
+ }
+
+ @override
+ Future<List<UserInfoEntity>> channelAllUserInfo(
+ VoidCallback onSetClosePage) async {
+
+ // try {
+ // final rsp = await liveViewModel.channelAllUserInfo(channelId: channelId!);
+ //
+ // if (rsp.data == null || (rsp.data is List && rsp.data.length == 0)) {
+ // return [];
+ // }
+ //
+ // List<UserInfoEntity> dataList = List.from(rsp.data ?? []).map((e) {
+ // return UserInfoEntity.fromJson(e);
+ // }).toList();
+ // return dataList;
+ // } catch (e) {
+ // LogUtil.d("获取在线人数出错:${e.toString()}");
+ // onSetClosePage();
+ // LiveUtil.closeAndTip("获取在线人数失败");
+ return [];
+ // }
+ }
+
+ @override
+ Future channelActiveUserInfo() async {
+ // final rsp =
+ // await liveViewModel.channelActiveUserInfo(channelId: channelId!);
+ // if (rsp.data == null) {
+ // return;
+ // }
+ }
+
+ @override
+ Future activeChannel() async {
+ // final rsp = await liveViewModel.activeChannel();
+ // if (rsp.data == null) {
+ // return;
+ // }
+ }
+
+ @override
+ Future activeAll() async {
+ // final rsp = await liveViewModel.activeAll();
+ // if (rsp.data == null) {
+ // return;
+ // }
+ }
+
+ @override
+ Future getChannelBaseInfo() async {
+ // final rsp = await liveViewModel.getChannelBaseInfo(channelId!);
+ // if (rsp.data == null) {
+ // return;
+ // }
+ }
+
+ /*
+ * 处理网络
+ * */
+ @override
+ void handleNet(int uid, txQuality, rxQuality) {
+ // final bool isBad = txQuality.index >= NetworkQuality.VBad.index ||
+ // rxQuality.index >= NetworkQuality.VBad.index;
+ // if (isBad) {
+ // // q1Toast( '你的网络有点差哦 ', gravity: ToastGravity.CENTER);
+ // }
+ }
+
+ /*
+ * 发送直播消息
+ * 发送数据流消息
+ * */
+ Future sendLiveMsg(LiveEventName msEvent, MediaType mediaType, bool isAudio,
+ {String? content, String? msgId, required String targetId}) async {
+ LogUtil.d("LiveBaseImpl::sendLiveMsg::发送直播消息");
+ if (myAgoraId == null) {
+ LogUtil.d("用户id为空，无法发送附加消息");
+ return;
+ }
+ if (!strNoEmpty(targetId)) {
+ LogUtil.d("targetId为空，无法发送附加消息");
+ q1Toast( "targetId为空，无法发送附加消息");
+ return;
+ }
+
+ final msgValue = LiveSteamEvent(
+ uid: myAgoraId!,
+ eventName: msEvent.name,
+ content: content,
+ msgId: msgId ?? "0",
+ );
+
+ final Uint8List sendData = utf8.encode(msgValue.toString()) as Uint8List;
+
+ bool isGroup = mediaType == MediaType.multiple;
+
+ LivePageType audioPageType = mediaType == MediaType.multiple
+ ? LivePageType.multipleAudio
+ : LivePageType.singleAudio;
+
+ LivePageType videoPageType = mediaType == MediaType.multiple
+ ? LivePageType.multipleVideo
+ : LivePageType.singleVideo;
+
+ /// 发送隐藏消息【流附加消息】
+ ChatMsgUtil.sendHideMsg(channelId!, LiveMsgEventSingleHide.liveMsg,
+ isAudio ? audioPageType : videoPageType, targetId, isGroup,
+ msgContent: sendData.toString());
+
+ LogUtil.d("send sendLiveMsg success : msEvent::${msEvent.name},"
+ "content :$content,isGroup :$isGroup, targetId :$targetId, uid: $myAgoraId");
+ }
+}
diff --git a/lib/video/impl/live_event_bus_impl.dart b/lib/video/impl/live_event_bus_impl.dart
new file mode 100644
index 0000000..7975eaf
--- /dev/null
+++ b/lib/video/impl/live_event_bus_impl.dart
@@ -0,0 +1,40 @@
+import 'package:wechat_flutter/video/event_bus/live_state_bus.dart';
+import 'package:wechat_flutter/video/impl/live_util.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+class LiveEventBus {
+ StreamSubscription? liveStateBusValue;
+}
+
+mixin LiveEventBusImpl on LiveEventBus {
+ void initLiveEventBus(VoidCallback onSetClosePage,
+
+ /// onSenderCancel需要判断当前是否通话中，如果是通话中则通话结束，且发送正常的可显示消息，
+ /// 否则处理对方已取消
+ {VoidCallback? onReject,
+ VoidCallback? onBusy,
+ VoidCallback? onSenderCancel}) {
+ liveStateBusValue = liveStateBus.on<LiveStateBusModel>().listen((event) {
+ LogUtil.d(
+ "liveStateBus::LiveStateBusModel::${event.liveEventState.toString()}");
+ if (event.liveEventState == LiveEventState.denied) {
+ onSetClosePage();
+ if (onReject != null) onReject();
+ LiveUtil.closeAndTip("对方拒绝接听");
+ } else if (event.liveEventState == LiveEventState.senderCancel) {
+ onSetClosePage();
+
+ if (onSenderCancel != null) onSenderCancel();
+ } else if (event.liveEventState == LiveEventState.receiverBusy) {
+ onSetClosePage();
+ if (onBusy != null) onBusy();
+ LiveUtil.closeAndTip("对方正忙");
+ }
+ });
+ }
+
+ void closeLiveEventBus() {
+ liveStateBusValue?.cancel();
+ liveStateBusValue = null;
+ }
+}
diff --git a/lib/video/impl/live_logic_impl.dart b/lib/video/impl/live_logic_impl.dart
new file mode 100644
index 0000000..b642b10
--- /dev/null
+++ b/lib/video/impl/live_logic_impl.dart
@@ -0,0 +1,246 @@
+import 'dart:async';
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:wechat_flutter/video/float/float_view/view.dart';
+import 'package:wechat_flutter/video/interface/base_interface.dart';
+import 'package:wechat_flutter/video/logic/live_time_logic.dart';
+import 'package:wechat_flutter/video/model/channel_entity.dart';
+import 'package:wechat_flutter/video/msg/chat_msg_mixin.dart';
+import 'package:wechat_flutter/video/msg/chat_msg_param.dart';
+import 'package:wechat_flutter/video/other/user/entity.dart';
+import 'package:wechat_flutter/video/float/float_window_impl.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+import 'package:wechat_flutter/ui_commom/view/hud_view.dart';
+
+import 'live_util.dart';
+import 'single_no_rsp.dart';
+
+abstract class LiveCheckClose {
+ /// 是否关闭了页面;
+ bool isClosePage = false;
+
+ /*
+ * 设置关闭了页面，点击挂断调用
+ * */
+ void setClosePage() {
+ isClosePage = true;
+ }
+}
+
+abstract class LiveLogicAbs {
+ @protected
+ late LiveBaseInterface agoraIml;
+
+ /// 监听关闭
+ StreamSubscription? listenClose;
+
+ RxList<UserInfoEntity?> infoList = <UserInfoEntity?>[].obs;
+
+ Rx<ChannelEntity?> channelEntity = ChannelEntity.no().obs;
+
+ Future enterLive(
+ Map result,
+ bool isClosed,
+ bool isMultiple,
+ VoidCallback onNoFloatEnter, {
+ required VoidCallback onUserJoined,
+ VoidCallback? onSelfJoinChannel,
+ LiveStateChange? onLiveStateChange,
+ required LivePageType livePageType,
+ });
+}
+
+mixin LiveLogicImpl
+ on
+ SingleNoRspAbs,
+ SingleNoRsp,
+ LiveLogicAbs,
+ LiveCheckClose,
+ LiveTimeObs,
+ LiveTimeLogic {
+ /*
+ * 获取基础信息
+ * */
+ Future initBaseInfo() async {
+ LogUtil.d("channelEntity :: initBaseInfo");
+ Map result = Get.arguments as Map;
+ if (!result.containsKey("content")) {
+ LogUtil.d("channelEntity :: initBaseInfo :: content为空");
+ return;
+ }
+ channelEntity.value =
+ ChannelEntity.fromJson(json.decode(result['content']));
+ // String userAccountSp = await SpUtil().get(KeyConstant.agoraAccount);
+ String userAccountSp = Q1Data.user();
+ agoraIml.isSend.value = channelEntity.value?.sendAgoraUid == userAccountSp;
+
+ LogUtil.d("channelEntity::${channelEntity.toJson()}");
+ LogUtil.d("channelEntity::目标id::${channelEntity.value?.targetId}");
+ }
+
+ /*
+ * 进入音视频直播页面处理
+ * */
+ @override
+ Future enterLive(
+ Map result,
+ bool isClosed,
+ bool isMultiple,
+ VoidCallback onNoFloatEnter, {
+ required VoidCallback onUserJoined,
+ VoidCallback? onSelfJoinChannel,
+ LiveStateChange? onLiveStateChange,
+ LiveJoinFail? onLiveJoinFail,
+ required LivePageType livePageType,
+ }) async {
+ final bool isFloatEnter = result.containsKey("isWindowPush") &&
+ result["isWindowPush"] is bool &&
+ result["isWindowPush"];
+
+ LogUtil.d("是否小窗进入:$isFloatEnter");
+ if (isFloatEnter) {
+ agoraIml = floatWindow.paramValue!.agoraIml;
+ if (floatWindow.paramValue?.trtcCloud != null) {
+ agoraIml.trtcCloud = floatWindow.paramValue!.trtcCloud!;
+ }
+ if (floatWindow.paramValue?.infoList != null) {
+ infoList = floatWindow.paramValue!.infoList!;
+ }
+ if (floatWindow.paramValue?.noRspTimeValue != null) {
+ noRspTimeValue = floatWindow.paramValue!.noRspTimeValue!;
+ }
+ if (floatWindow.paramValue?.noRspIsOk != null) {
+ noRspIsOk = floatWindow.paramValue!.noRspIsOk!;
+ }
+ if (floatWindow.paramValue?.singleRemoteUid?.value != null) {
+ agoraIml.remoteUid.value =
+ floatWindow.paramValue!.singleRemoteUid!.value;
+ }
+ if (floatWindow.paramValue?.myAgoraId != null) {
+ agoraIml.myAgoraId = floatWindow.paramValue!.myAgoraId;
+ }
+ if (floatWindow.paramValue?.timeValue != null) {
+ timeValue = floatWindow.paramValue!.timeValue!;
+ }
+ if (floatWindow.paramValue?.channelEntity != null) {
+ channelEntity.value = floatWindow.paramValue!.channelEntity!.value;
+ // String userAccountSp = await SpUtil().get(KeyConstant.agoraAccount);
+ String userAccountSp = Q1Data.user();
+ agoraIml.isSend.value =
+ channelEntity.value?.sendAgoraUid == userAccountSp;
+
+ print(
+ "channelEntity.value?.sendAgoraUid::${channelEntity.value?.sendAgoraUid},userAccountSp::$userAccountSp.是否为发送方::${agoraIml.isSend}");
+ }
+
+ /// 监听
+ agoraIml.addListeners(
+ onUserJoined, onSelfJoinChannel, onLiveStateChange, onLiveJoinFail);
+
+ /// 监听用户改变从而判断是否结束
+ listenClose = agoraIml.remoteUid.stream
+ .listen((v) => handleIdsChange(v, isClosed, isMultiple));
+
+ /// 开始计时
+ if (listNoEmpty(agoraIml.remoteUid.value)) {
+ startTime();
+ }
+
+ /// 必须调用，否则不会开始倒计时
+ noRspStartTime(() {
+ ChatMsgParam chatMsgParam = ChatMsgParam(
+ agoraIml.channelId ?? channelEntity.value!.channelId,
+ livePageType,
+ channelEntity.value!.targetId,
+ isMultiple,
+ );
+ // 发送隐藏消息给对方【让其关闭等待接听的页面】
+ ChatMsgUtil.sendCancelHideMsg(chatMsgParam);
+
+ // 发送【对方无应答】可视消息
+ ChatMsgUtil.sendNoRspShowMsg(chatMsgParam);
+ });
+
+ fetchChannelId();
+ } else {
+ onNoFloatEnter();
+ }
+ }
+
+ /*
+ * 从页面拿到频道ID
+ * */
+
+ Future fetchChannelId() async {
+ Map result = Get.arguments as Map;
+ if (result.containsKey("channelId") && strNoEmpty(result['channelId'])) {
+ agoraIml.channelId = result['channelId'];
+ }
+
+ if (result.containsKey("isSend") && result['isSend'] != null) {
+ agoraIml.isSend.value = result['isSend'] is RxBool
+ ? (result['isSend'] as RxBool).value
+ : result['isSend'];
+ }
+ debugPrint("从页面拿到频道ID:${agoraIml.channelId}");
+ }
+
+ /*
+ * 监听remote_ids值改变
+ *
+ * isMultiple为true表示多人通话，自己的也算上，所以要减一之后再做处理
+ * */
+ void handleIdsChange(List<int> v, bool isClosed, bool isMultiple) {
+ if (isClosed) {
+ return;
+ }
+ debugPrint('listen ids of remote value change as ${v.toString()}');
+
+ if (!listNoEmpty(v)) {
+ closeChannel();
+ }
+ }
+
+ /*
+ * 关闭频道
+ * */
+ void closeChannel() {
+ /// 不显示小窗
+ setClosePage();
+
+ /// 关闭音视频且提示消息【对方挂断】【通话结束】
+ LiveUtil.closeAndTip("通话结束");
+ }
+}
+
+mixin LiveHudShow on LiveCheckClose {
+ void initLiveHudShow(BuildContext context, Rx<ChannelEntity?> channelEntity,
+ LiveBaseInterface agoraIml) {
+ WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+ Future.delayed(const Duration(seconds: 1)).then((value) {
+ if (agoraIml.isJoined) {
+ HudView.dismiss();
+ }
+ });
+
+ HudView.show(context, msg: "加载中", onTimeOut: () {
+ if (!agoraIml.isJoined) {
+ isClosePage = true;
+ ChatMsgParam chatMsgParam = ChatMsgParam(
+ agoraIml.channelId ?? channelEntity.value!.channelId,
+ LivePageType.singleVideo,
+ channelEntity.value!.targetId,
+
+ /// 如果群组id不为空则为群组
+ strNoEmpty(channelEntity.value?.groupId),
+ );
+
+ ChatMsgUtil.sendCancelHideMsg(chatMsgParam);
+ LiveUtil.closeAndTip("加载超时");
+ }
+ });
+ });
+ }
+}
diff --git a/lib/video/impl/live_util.dart b/lib/video/impl/live_util.dart
new file mode 100644
index 0000000..c4c6913
--- /dev/null
+++ b/lib/video/impl/live_util.dart
@@ -0,0 +1,149 @@
+import 'dart:convert';
+import 'dart:io';
+import 'dart:typed_data';
+
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:permission_handler/permission_handler.dart';
+import 'package:wechat_flutter/video/event/live_stream_event.dart';
+import 'package:wechat_flutter/video/event_bus/live_stream_msg_bus.dart';
+import 'package:wechat_flutter/video/model/channel_entity.dart';
+import 'package:wechat_flutter/video/float/float_window_impl.dart';
+import 'package:wechat_flutter/video/interface/base_interface.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+class LiveUtilData {
+ /// 视频转语音通话列表
+ static List<String> videoToVoiceList = [];
+}
+
+class LiveUtil {
+ static handleLiveMsg(LiveStreamMsgModel p0, Rx<ChannelEntity?> channelEntity,
+ LiveBaseInterface agoraIml, LiveStateChange? onLiveStateChange) {
+ if (p0.channelId == channelEntity.value?.channelId ||
+ p0.channelId == agoraIml.channelId) {
+ LogUtil.d(
+ "解析直播数据流消息：类型：：${p0.msgContent!.runtimeType}，p0.msgContent!：：${p0.msgContent!}");
+ final realMsg = utf8.decode(List.from(json.decode(p0.msgContent!)));
+ LogUtil.d(
+ "解析直播数据流消息【解析后】：类型：：${json.decode(realMsg)!.runtimeType}，数据：：${json.decode(realMsg)}");
+
+ LiveSteamEvent liveSteamEvent =
+ LiveSteamEvent.fromJson(json.decode(realMsg));
+ final Uint8List sendData =
+ utf8.encode(json.encode(json.decode(realMsg))) as Uint8List;
+ agoraIml.streamMessage(
+ liveSteamEvent.uid, 0, sendData, onLiveStateChange);
+ }
+ }
+
+ /*
+ * 是否包含直播【音视频通话】
+ * */
+ static bool get isHasLive {
+ return floatWindow.isHaveFloat || isLiveRoute;
+ }
+
+ /*
+ * 是否直播【音视频通话】或相关路由
+ * */
+ static bool get isLiveRoute {
+ return Get.currentRoute.contains("audio") ||
+ Get.currentRoute.contains("video") ||
+ Get.currentRoute.contains("acceptPage");
+ ;
+ }
+
+ /*
+ * 检测音视频权限再执行下一步
+ * */
+ static Future<void> checkPermissionThen(VoidCallback then) async {
+ List<Permission> permissions = [
+ Permission.camera,
+ Permission.microphone,
+ ];
+ Map<Permission, PermissionStatus> statuses = await permissions.request();
+ LogUtil.d("statuses[Permission.camera]::${statuses[Permission.camera]}");
+ LogUtil.d(
+ "statuses[Permission.microphone]::${statuses[Permission.microphone]}");
+ if (statuses[Permission.camera] != PermissionStatus.granted ||
+ statuses[Permission.microphone] != PermissionStatus.granted) {
+ /// 这里不能back，否则页面逻辑出错
+ Get.defaultDialog(
+ title: '提示',
+ content: const Text('请到系统内设置允许本应用使用麦克风和摄像头权限!'),
+ textConfirm: "确定",
+ onConfirm: () {
+ Get.back();
+ openAppSettings();
+ },
+ );
+ } else {
+ then();
+ }
+ LogUtil.d("LiveUtil::checkPermissionThen::如果有悬浮窗的话这时会取消掉悬浮窗"); // 取消掉悬浮窗
+ floatWindow.close();
+ }
+
+ /*
+ * 检测音视频和扫码权限再执行下一步
+ *
+ /// ### Android (AndroidManifest.xml)
+ /// * READ_EXTERNAL_STORAGE (REQUIRED)
+ /// * WRITE_EXTERNAL_STORAGE
+ /// * ACCESS_MEDIA_LOCATION
+ ///
+ /// ### iOS (Info.plist)
+ /// * NSPhotoLibraryUsageDescription
+ /// * NSPhotoLibraryAddUsageDescription
+ ///
+ * */
+ static Future<void> checkScanPermissionThen(VoidCallback then) async {
+ List<Permission> permissions = Platform.isAndroid
+ ? [Permission.storage]
+ : [
+ Permission.camera,
+ Permission.microphone,
+ Permission.location,
+ Permission.photos,
+ ];
+ Map<Permission, PermissionStatus> statuses = await permissions.request();
+
+ final bool hasPermission = Platform.isAndroid
+ ? statuses[Permission.storage] != PermissionStatus.granted
+ : (statuses[Permission.camera] != PermissionStatus.granted ||
+ statuses[Permission.microphone] != PermissionStatus.granted ||
+ statuses[Permission.storage] != PermissionStatus.granted ||
+ statuses[Permission.location] != PermissionStatus.granted ||
+ statuses[Permission.photos] != PermissionStatus.granted);
+ if (hasPermission) {
+ /// 这里不能back，否则页面逻辑出错
+ Get.defaultDialog(
+ title: '提示',
+ content: const Text('请到系统内设置允许本应用使用相册访问等权限'),
+ textConfirm: "确定",
+ onConfirm: () {
+ Get.back();
+ openAppSettings();
+ },
+ );
+ } else {
+ then();
+ }
+ LogUtil.d(
+ "LiveUtil::checkScanPermissionThen::hasPermission[$hasPermission]>>执行完毕");
+ }
+
+ static void closeAndTip(String tip) {
+ /// 倒计时完无响应如果有小窗就取消小窗；
+ if (floatWindow.isHaveFloat) {
+ floatWindow.close();
+ q1Toast(tip);
+ } else {
+ if (isLiveRoute) {
+ Get.back();
+ q1Toast(tip);
+ }
+ }
+ }
+}
diff --git a/lib/video/impl/single_no_rsp.dart b/lib/video/impl/single_no_rsp.dart
new file mode 100644
index 0000000..4f35565
--- /dev/null
+++ b/lib/video/impl/single_no_rsp.dart
@@ -0,0 +1,114 @@
+import 'dart:async';
+
+import 'package:get/get.dart';
+import 'package:wechat_flutter/video/float/float_window_impl.dart';
+import 'package:wechat_flutter/video/impl/live_logic_impl.dart';
+import 'package:wechat_flutter/video/impl/live_util.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+abstract class SingleNoRspAbs {
+ /// 倒计时秒
+ int noRspTimeValue = 0;
+
+ /// 是否倒计时完毕
+ /// 如果对方接听了则设置为ok，下次无论怎么转音频视频都不需要再倒计时了
+ bool noRspIsOk = false;
+
+ /// 倒计时计时器
+ Timer? noRspTimer;
+
+ /// 未接听最大秒
+ /// 50秒
+ final int noRspMaxTimerCount = 50;
+
+ /*
+ * 【未响应处理】开始倒计时
+ * */
+ void noRspStartTime(VoidCallback onNoRsp);
+
+ /*
+ * 【未响应处理】取消倒计时
+ * */
+ void noRspCancelTime();
+
+ /*
+ * 【未响应处理】接听
+ * */
+ void noRspReceive() {
+ noRspIsOk = true;
+
+ noRspCancelTime();
+ }
+
+ /*
+ * 【未响应处理】方便视频转语音
+ * */
+ void noRspChangeToVoice(SingleNoRspAbs? value) {
+ if (value == null) return;
+ noRspTimeValue = value.noRspTimeValue;
+ noRspIsOk = value.noRspIsOk;
+ if (noRspIsOk) noRspCancelTime();
+ }
+
+ /*
+ * 【未响应处理】重置值
+ * */
+ void noRspRestValue() {
+ noRspTimeValue = 0;
+ }
+}
+
+/*
+* 单聊没有响应处理
+*
+* 现在多聊也要使用了
+* */
+mixin SingleNoRsp on SingleNoRspAbs, LiveCheckClose {
+ @override
+ void noRspStartTime(VoidCallback onNoRsp) {
+ LogUtil.d("noRspStartTime::开始检测倒计时::noRspIsOk是$noRspIsOk");
+
+ /// 已接听，直接返回
+ if (noRspIsOk) {
+ return;
+ }
+
+ noRspCancelTime();
+ noRspTimer = Timer.periodic(const Duration(seconds: 1), (timer) async {
+ if (noRspTimeValue < noRspMaxTimerCount) {
+ noRspTimeValue++;
+ LogUtil.d("noRspTimeValue::$noRspTimeValue");
+ } else {
+ noRspCancelTime();
+
+ /// 先等待，如果还未接听
+ await Future.delayed(const Duration(milliseconds: 100));
+
+ /// 如果是视频转语音有慢操作
+ if (noRspIsOk) {
+ return;
+ }
+ noRspRestValue();
+
+ // 关闭页面，不显示小窗;
+ setClosePage();
+
+ /// 防止[setClosePage]没有响应过来
+ await Future.delayed(const Duration(milliseconds: 100));
+
+ /// 发送隐藏消息给对方【让其关闭等待接听的页面】
+ /// 发送【对方无应答】可视消息
+ onNoRsp();
+
+ /// 关闭音视频且提示消息
+ LiveUtil.closeAndTip("对方无响应");
+ }
+ });
+ }
+
+ @override
+ void noRspCancelTime() {
+ noRspTimer?.cancel();
+ noRspTimer = null;
+ }
+}
diff --git a/lib/video/interface/base_interface.dart b/lib/video/interface/base_interface.dart
new file mode 100644
index 0000000..49cf1cb
--- /dev/null
+++ b/lib/video/interface/base_interface.dart
@@ -0,0 +1,94 @@
+import 'dart:typed_data';
+import 'dart:ui';
+
+import 'package:get/get_rx/src/rx_types/rx_types.dart';
+import 'package:tencent_trtc_cloud/trtc_cloud.dart';
+import 'package:tencent_trtc_cloud/tx_audio_effect_manager.dart';
+import 'package:tencent_trtc_cloud/tx_beauty_manager.dart';
+import 'package:tencent_trtc_cloud/tx_device_manager.dart';
+import 'package:wechat_flutter/video/event/live_stream_event.dart';
+
+enum MediaType {
+ single,
+ multiple,
+}
+
+enum LiveErrorType {
+ /// 频道异常
+ channelError,
+}
+
+typedef LiveStateChange = Function(LiveSteamEvent eventName);
+typedef LiveJoinFail = Function(LiveErrorType errorType);
+
+abstract class LiveBaseInterface extends LiveSdkBaseInterface {
+ String? userToken;
+
+ late bool isJoined = false;
+
+ int? channelId;
+
+ // 是否发起方 默认false
+ RxBool isSend = false.obs;
+
+ int? myAgoraId;
+
+ String logHead = "【live】";
+
+ RxList<int> remoteUid = <int>[].obs;
+
+ late int userAccount;
+
+ Future startCheckJoin(VoidCallback onSetClosePage);
+
+ Future joinOkHandle();
+
+ Future getUserToken(VoidCallback onSetClosePage);
+
+ Future channelAllUserInfo(VoidCallback onSetClosePage);
+
+ Future channelActiveUserInfo();
+
+ Future activeChannel();
+
+ Future activeAll();
+
+ Future getChannelBaseInfo();
+
+ void handleNet(int uid, txQuality, rxQuality);
+
+ void streamMessage(
+ int uid,
+ int streamId,
+ Uint8List data,
+ LiveStateChange? onLiveStateChange,
+ );
+}
+
+abstract class LiveSdkBaseInterface {
+ TRTCCloud? trtcCloud;
+ TXDeviceManager? txDeviceManager;
+ TXBeautyManager? txBeautyManager;
+ TXAudioEffectManager? txAudioManager;
+
+ Future initEngine({
+ required VoidCallback onUserJoined,
+ required VoidCallback onSetClosePage,
+ VoidCallback? onSelfJoinChannel,
+ LiveStateChange? onLiveStateChange,
+ });
+
+ Future destroyEngine();
+
+ void addListeners(
+ VoidCallback onUserJoined,
+ VoidCallback? onSelfJoinChannel,
+ LiveStateChange? onLiveStateChange,
+ LiveJoinFail? onLiveJoinFail,
+ // RxBool enableTl,
+ );
+
+ Future joinChannel(VoidCallback onSetClosePage);
+
+ Future leaveChannel();
+}
diff --git a/lib/video/interface/live_audio_interface.dart b/lib/video/interface/live_audio_interface.dart
new file mode 100644
index 0000000..f6b79c3
--- /dev/null
+++ b/lib/video/interface/live_audio_interface.dart
@@ -0,0 +1,25 @@
+import 'package:get/get.dart';
+import 'package:wechat_flutter/video/impl/live_base_impl.dart';
+import 'package:wechat_flutter/video/interface/base_interface.dart';
+
+abstract class LiveAudioInterFace extends LiveBaseInterface with LiveBaseImpl {
+ RxBool openMicrophone = true.obs,
+ enableSpeakerphone = true.obs,
+ playEffect = false.obs;
+
+ bool enableInEarMonitoring = false;
+
+ double recordingVolume = 100,
+ playbackVolume = 100,
+ inEarMonitoringVolume = 100;
+
+ void switchMicrophone(String targetId);
+
+ void switchSpeakerphone();
+
+ void switchEffect();
+
+ void onChangeInEarMonitoringVolume(double value);
+
+ void toggleInEarMonitoring(value);
+}
diff --git a/lib/video/interface/live_video_interface.dart b/lib/video/interface/live_video_interface.dart
new file mode 100644
index 0000000..a4a7509
--- /dev/null
+++ b/lib/video/interface/live_video_interface.dart
@@ -0,0 +1,36 @@
+import 'package:get/get.dart';
+import 'package:wechat_flutter/video/impl/live_base_impl.dart';
+import 'package:wechat_flutter/video/interface/base_interface.dart';
+
+abstract class LiveVideoInterFace extends LiveBaseInterface with LiveBaseImpl {
+ late RxBool switchCamera;
+ late bool switchRender;
+ late RxBool isEnableVideo;
+
+ void switchCameraHandle();
+
+ void enableAndDisableCamera({required String targetId});
+
+ Future changeToVoice({required String targetId});
+
+ /// 音频专属
+ RxBool openMicrophone = true.obs,
+ enableSpeakerphone = true.obs,
+ playEffect = false.obs;
+
+ bool enableInEarMonitoring = false;
+
+ double recordingVolume = 100,
+ playbackVolume = 100,
+ inEarMonitoringVolume = 100;
+
+ void switchMicrophone({required String targetId});
+
+ void switchSpeakerphone();
+
+ void switchEffect();
+
+ void onChangeInEarMonitoringVolume(double value);
+
+ void toggleInEarMonitoring(value);
+}
diff --git a/lib/video/logic/live_time_logic.dart b/lib/video/logic/live_time_logic.dart
new file mode 100644
index 0000000..1ebe398
--- /dev/null
+++ b/lib/video/logic/live_time_logic.dart
@@ -0,0 +1,45 @@
+
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+abstract class LiveTimeObs {
+ Timer? timer;
+
+ int timeValue = 0;
+ RxString timeValueStr = "".obs;
+}
+
+mixin LiveTimeLogic on LiveTimeObs {
+ void startTime() {
+ LogUtil.d("音频计时");
+ timer = Timer.periodic(const Duration(seconds: 1), (timer) {
+ timeValue++;
+ LogUtil.d("音频计时 timeValue：$timeValue");
+
+ setTimeStr();
+ });
+ }
+
+ /// 接听电话之后计时
+ void setTimeStr() {
+ var remainingTimeMyDate = DateTime.now().add(Duration(seconds: timeValue));
+ var def = remainingTimeMyDate.difference(DateTime.now());
+ var inHour = doubleNum(def.inHours % 24);
+ String inHours = inHour;
+ var inMinute = doubleNum(def.inMinutes % 60);
+ String inMinutes = inMinute;
+ var inSecond = doubleNum(def.inSeconds % 60);
+ String inSeconds = inSecond;
+ if (inHours != "00") {
+ timeValueStr.value = "$inHours:$inMinutes:$inSeconds";
+ } else {
+ timeValueStr.value = "$inMinutes:$inSeconds";
+ }
+ }
+
+ void cancelTime() {
+ timeValue = 0;
+ timeValueStr.value = "00:00";
+ timer?.cancel();
+ timer = null;
+ }
+}
diff --git a/lib/video/model/channel_entity.dart b/lib/video/model/channel_entity.dart
new file mode 100644
index 0000000..b6d9b39
--- /dev/null
+++ b/lib/video/model/channel_entity.dart
@@ -0,0 +1,100 @@
+import 'dart:convert';
+
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+T? asT<T>(dynamic value) {
+ if (value is T) {
+ return value;
+ }
+ return null;
+}
+
+class ChannelEntity {
+ ChannelEntity({
+ required this.channelId,
+ required this.mediaType,
+ required this.toChatId,
+ required this.toChatName,
+ required this.toAvatar,
+ required this.sendChatId,
+ required this.sendChatName,
+ required this.sendAvatarUrl,
+ required this.sendAgoraUid,
+ required this.groupId,
+ });
+
+ /// 总是发送消息的id【真实需要取到的消息id】【targetId目标id】
+ ///
+ /// 如果自己是发起人，返回的就是toChatId
+ /// 如果自己是接收人，返回的就是sendChatId
+ String get targetId {
+ LogUtil.d("ChannelEntity格式化的groupId::$groupId");
+ if (strNoEmpty(groupId)) {
+ return groupId!;
+ }
+ // String userAccountSp = SpUtil().get(KeyConstant.agoraAccount);
+ String userAccountSp = Q1Data.user();
+ LogUtil.d("获取targetId时候拿到的userAccountSp::$userAccountSp");
+ bool isSend = sendAgoraUid == userAccountSp;
+ if (isSend) {
+ return toChatId;
+ } else {
+ return sendChatId;
+ }
+ }
+
+ ChannelEntity.no({
+ this.channelId = 0,
+ this.mediaType = "",
+ this.toChatId = "",
+ this.toChatName = "",
+ this.toAvatar = "",
+ this.sendChatId = "",
+ this.sendChatName = "",
+ this.sendAvatarUrl = "",
+ this.sendAgoraUid = "",
+ this.groupId = "",
+ });
+
+ factory ChannelEntity.fromJson(Map<String, dynamic> json) => ChannelEntity(
+ channelId: asT<int>(json['channelId'])!,
+ mediaType: asT<String>(json['mediaType'])!,
+ toChatId: asT<String>(json['toChatId'])!,
+ toChatName: asT<String>(json['toChatName'])!,
+ toAvatar: asT<String>(json['toAvatar'])!,
+ sendChatId: asT<String>(json['sendChatId'])!,
+ sendChatName: asT<String>(json['sendChatName'])!,
+ sendAvatarUrl: asT<String>(json['sendAvatarUrl'])!,
+ sendAgoraUid: asT<String>(json['sendAgoraUid'])!,
+ groupId: asT<String?>(json['groupId']),
+ );
+
+ int channelId;
+ String mediaType;
+ String toChatId;
+ String toChatName;
+ String toAvatar;
+ String sendChatId;
+ String sendChatName;
+ String sendAvatarUrl;
+ String sendAgoraUid;
+ String? groupId;
+
+ @override
+ String toString() {
+ return jsonEncode(this);
+ }
+
+ Map<String, dynamic> toJson() => <String, dynamic>{
+ 'channelId': channelId,
+ 'mediaType': mediaType,
+ 'toChatId': toChatId,
+ 'toChatName': toChatName,
+ 'toAvatar': toAvatar,
+ 'sendChatId': sendChatId,
+ 'sendChatName': sendChatName,
+ 'sendAvatarUrl': sendAvatarUrl,
+ 'sendAgoraUid': sendAgoraUid,
+ 'groupId': groupId,
+ };
+}
diff --git a/lib/video/model/msg_entity.dart b/lib/video/model/msg_entity.dart
new file mode 100644
index 0000000..f43ee0f
--- /dev/null
+++ b/lib/video/model/msg_entity.dart
@@ -0,0 +1,83 @@
+import 'dart:convert' as convert;
+
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+T? asT<T>(dynamic value) {
+ if (value is T) {
+ return value;
+ }
+ return null;
+}
+
+class MsgEntity {
+ MsgEntity({
+ required this.type,
+ required this.isMine,
+ required this.content,
+ // required this.specialMsg,
+ });
+
+ factory MsgEntity.fromJson(Map<String, dynamic> json) {
+ final bool isHaveContent =
+ json['content'] != null && json['content'] is String;
+ return MsgEntity(
+ type: asT<int>(json['type'])!,
+ isMine: asT<int>(json['isMine'])!,
+ content:
+ // isHaveContent
+ // ? EMMessage.fromJson(Map.from(convert.json.decode(json['content'])))
+ // :
+ null,
+ // specialMsg: asT<String?>(json['specialMsg']),
+ );
+ }
+
+ factory MsgEntity.no() => MsgEntity(
+ type: 0,
+ isMine: 1,
+ content: null,
+ // specialMsg: null,
+ );
+
+ String get textStringValue {
+ String? textString;
+ // if (type == 0) {
+ // textString = (content!.body as EMTextMessageBody).content;
+ // } else if (type == 1 || type == 2) {
+ // EMImageMessageBody img = (content!.body as EMImageMessageBody);
+ // textString = strNoEmpty(img.remotePath) ? img.remotePath : img.localPath;
+ // } else {
+ // textString = (content?.body as EMCustomMessageBody?)?.params?['content'];
+ // }
+
+ /// [specialMsg] 主要作用于显示：
+ /// 1.对方无应答2.对方已拒绝3.对方已取消4.通话时长10:58
+ // return specialMsg ?? textString ?? '';
+ return textString ?? '';
+ }
+
+ /// 具体类型
+ /// 0=text 1和2=image 3=语音通话 4=视频通话 5=修改群名
+ int type;
+
+ /// 1=是自己，2=不是自己
+ int isMine;
+
+ /// 消息具体内容
+ final content; // EMMessage?
+
+ /// 特殊消息内容
+ // String? specialMsg;
+
+ @override
+ String toString() {
+ return convert.jsonEncode(this);
+ }
+
+ Map<String, dynamic> toJson() => <String, dynamic>{
+ 'type': type,
+ 'isMine': isMine,
+ 'content': convert.json.encode(content),
+ // 'specialMsg': specialMsg,
+ };
+}
diff --git a/lib/video/msg/chat_msg_mixin.dart b/lib/video/msg/chat_msg_mixin.dart
new file mode 100644
index 0000000..dbda005
--- /dev/null
+++ b/lib/video/msg/chat_msg_mixin.dart
@@ -0,0 +1,206 @@
+import 'dart:convert';
+
+import 'package:wechat_flutter/video/msg/chat_msg_param.dart';
+import 'package:wechat_flutter/video/float/float_view/view.dart';
+import 'package:wechat_flutter/video/msg/live_msg_event.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+
+class ChatMsgUtil {
+ /*
+ * 发送隐藏消息
+ * */
+ static Future sendHideMsg(
+ int channelIdValue,
+ LiveMsgEventSingleHide msgType,
+ LivePageType livePageType,
+ String targetId,
+ bool isGroup, {
+ String? msgContent,
+ }) async {
+ if (!strNoEmpty(targetId)) {
+ q1Toast( '发送消息出错');
+ return;
+ }
+ if (!numNoEmpty(channelIdValue)) {
+ q1Toast( '发送出错');
+ return;
+ }
+ // EMUserInfo? selfInfo =
+ // await EMClient.getInstance.userInfoManager.fetchOwnInfo();
+ //
+ // String userAccountSp = await SpUtil().get(KeyConstant.agoraAccount);
+ // LogUtil.d("msgType.toString()::${msgType.toString()}");
+ // LiveSingleHideMsgModel msgModel = LiveSingleHideMsgModel(
+ // msgType: msgType.toString(),
+ // livePageType: livePageType.toString(),
+ // sendChatId: selfInfo?.userId ?? "",
+ // sendChatName: selfInfo?.nickName ?? '',
+ // sendAvatarUrl: selfInfo?.avatarUrl ?? '',
+ // sendAgoraUid: userAccountSp,
+ // channelId: channelNameValue,
+ // msgContent: msgContent,
+ // groupId: isGroup ? targetId : "",
+ // );
+ //
+ // EMMessage msg = EMMessage.createCustomSendMessage(
+ // targetId: targetId,
+ // event: msgModel.msgType,
+ // params: {"content": json.encode(msgModel)},
+ // );
+ //
+ // msg.setMessageStatusCallBack(MessageStatusCallBack(
+ // onSuccess: () {
+ // LogUtil.d("发送隐藏消息 成功targetId:$targetId，是否发群:$isGroup，内容为:${msg.body}");
+ // },
+ // onError: (e) {
+ // debugPrint('发送隐藏消息 失败targetId:$targetId $e');
+ // LogUtil.d("发送隐藏消息 失败targetId:$targetId，内容为:${msg.body}");
+ // },
+ // ));
+ //
+ // if (isGroup) {
+ // msg.chatType = ChatType.GroupChat; //设置消息类型为群聊，不设置默认为单聊
+ // }
+ //
+ // /// 隐藏消息不需要插入数据库
+ // // MsgDao.insert(msgEntity);
+ //
+ // EMClient.getInstance.chatManager.sendMessage(msg);
+ }
+
+ /*
+ * 发送可视消息
+ * */
+ static Future sendShowMsg(
+ int channelIdValue,
+ LiveMsgEventSingleShow msgType,
+ LivePageType livePageType,
+ String targetId,
+ bool isGroup, {
+ String? longTime,
+ }) async {
+ if (!strNoEmpty(targetId)) {
+ q1Toast( '发送消息出错');
+ return;
+ }
+ // EMUserInfo? selfInfo =
+ // await EMClient.getInstance.userInfoManager.fetchOwnInfo();
+ //
+ // String userAccountSp = await SpUtil().get(KeyConstant.agoraAccount);
+ // LogUtil.d("msgType.toString()::${msgType.toString()}");
+ // LiveSingleShowMsgModel msgModel = LiveSingleShowMsgModel(
+ // msgType: msgType.toString(),
+ // livePageType: livePageType.toString(),
+ // sendChatId: selfInfo?.userId ?? "",
+ // sendChatName: selfInfo?.nickName ?? '',
+ // sendAvatarUrl: selfInfo?.avatarUrl ?? '',
+ // sendAgoraUid: userAccountSp,
+ // channelId: channelNameValue,
+ // longTime: longTime,
+ // );
+ //
+ // LogUtil.d("发送的正常消息内容：${json.encode(msgModel)}");
+ // EMMessage msg = EMMessage.createCustomSendMessage(
+ // targetId: targetId,
+ // event: msgModel.msgType,
+ // params: {"content": json.encode(msgModel)},
+ // );
+ //
+ // msg.setMessageStatusCallBack(MessageStatusCallBack(
+ // onSuccess: () {
+ // LogUtil.d("发送可视消息 成功targetId:$targetId，内容为:${msg.body}");
+ // },
+ // onError: (e) {
+ // debugPrint('发送可视消息 失败targetId:$targetId $e');
+ // LogUtil.d("发送可视消息 失败targetId:$targetId，内容为:${msg.body}");
+ // },
+ // ));
+ //
+ // if (isGroup) {
+ // msg.chatType = ChatType.GroupChat; //设置消息类型为群聊，不设置默认为单聊
+ // }
+ //
+ // MsgEntity msgMap = MsgEntity.no();
+ // msgMap.isMine = 1;
+ // msgMap.content = msg;
+ //
+ // if (livePageType == LivePageType.singleAudio) {
+ // msgMap.type = 3;
+ // } else {
+ // msgMap.type = 4;
+ // }
+ // // msgMap.specialMsg = json.encode({"msgType": msgType.toString()});
+ //
+ // /// 对方无应答 消息存储数据库
+ // MsgDao.insert(msgMap);
+ //
+ // EMClient.getInstance.chatManager.sendMessage(msg);
+ //
+ // /// 发送给聊天界面
+ // liveStateToChatBus.fire(LiveMsgBusModel(
+ // targetId: targetId,
+ // msgMap: msgMap,
+ // ));
+ }
+
+ /*
+ * 发送取消通话【隐藏消息】
+ * */
+ static Future sendCancelHideMsg(ChatMsgParam param) async {
+ sendHideMsg(param.channelIdValue, LiveMsgEventSingleHide.senderCancel,
+ param.livePageType, param.targetId, param.isGroup);
+ }
+
+ /*
+ * 发送【对方无应答】可视消息
+ * */
+ static Future sendNoRspShowMsg(ChatMsgParam param) async {
+ LogUtil.d("发送【对方无应答】可视消息");
+ sendShowMsg(param.channelIdValue, LiveMsgEventSingleShow.noRsp,
+ param.livePageType, param.targetId, param.isGroup);
+ }
+
+ /*
+ * 发送【已取消】可视消息
+ * */
+ static Future sendCancelShowMsg(ChatMsgParam param) async {
+ LogUtil.d("发送【已取消】可视消息【仅发送方发送】");
+ sendShowMsg(param.channelIdValue, LiveMsgEventSingleShow.canceled,
+ param.livePageType, param.targetId, param.isGroup);
+ }
+
+ /*
+ * 发送【被拒绝】可视消息
+ * */
+ static Future sendRejectShowMsg(ChatMsgParam param) async {
+ LogUtil.d("发送【被拒绝】可视消息【仅发送方发送】");
+ sendShowMsg(param.channelIdValue, LiveMsgEventSingleShow.rejected,
+ param.livePageType, param.targetId, param.isGroup);
+ }
+
+ /*
+ * 发送【正忙】可视消息
+ * */
+ static Future sendBusyShowMsg(ChatMsgParam param) async {
+ LogUtil.d("发送【正忙】可视消息【仅发送方发送】");
+ sendShowMsg(param.channelIdValue, LiveMsgEventSingleShow.busy,
+ param.livePageType, param.targetId, param.isGroup);
+ }
+
+ /*
+ * 发送【正常】可视消息
+ * */
+ static Future sendNormalShowMsg(ChatMsgParam param,
+ {required String longTime}) async {
+ LogUtil.d("发送【被拒绝】可视消息【仅发送方发送】");
+ sendShowMsg(
+ param.channelIdValue,
+ LiveMsgEventSingleShow.normal,
+ param.livePageType,
+ param.targetId,
+ param.isGroup,
+ longTime: longTime,
+ );
+ }
+}
diff --git a/lib/video/msg/chat_msg_param.dart b/lib/video/msg/chat_msg_param.dart
new file mode 100644
index 0000000..717014f
--- /dev/null
+++ b/lib/video/msg/chat_msg_param.dart
@@ -0,0 +1,21 @@
+
+import 'package:wechat_flutter/video/float/float_view/view.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+/// 发送隐藏消息和显示消息通用的参数
+class ChatMsgParam {
+ /// 频道Id
+ final int channelIdValue;
+
+ /// 直播页面类型
+ final LivePageType livePageType;
+
+ /// 目标id，如果是个人则为个人id，群则为群id
+ final String targetId;
+
+ /// 是否群来哦
+ final bool isGroup;
+
+ ChatMsgParam(
+ this.channelIdValue, this.livePageType, this.targetId, this.isGroup);
+}
diff --git a/lib/video/msg/live_msg.dart b/lib/video/msg/live_msg.dart
new file mode 100644
index 0000000..d340a7d
--- /dev/null
+++ b/lib/video/msg/live_msg.dart
@@ -0,0 +1,206 @@
+
+import 'package:wechat_flutter/video/float/float_view/view.dart';
+import 'package:wechat_flutter/video/msg/live_msg_event.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+class CustomMsgEvent {
+ /// 语音消息
+ static String voiceChat = "VoiceChat";
+
+ /// 视频消息
+ static String videoChat = "VideoChat";
+}
+
+T? asT<T>(dynamic value) {
+ if (value is T) {
+ return value;
+ }
+ return null;
+}
+
+/// 个人隐形数据模型【现在群也用这个了】
+class LiveSingleHideMsgModel {
+ /// [LiveMsgEventSingleHide.value]
+ final String msgType;
+
+ /// [LivePageType.value]
+ final String livePageType;
+ final String channelId;
+ final String sendChatId;
+ final String sendChatName;
+ final String sendAvatarUrl;
+ final String sendAgoraUid;
+ final String? msgContent;
+
+ /// 现在群组也用这个了
+ final String? groupId;
+
+ bool get livePageTypeIsGroup {
+ return livePageType == LivePageType.multipleAudio.toString() ||
+ livePageType == LivePageType.multipleVideo.toString();
+ }
+
+ LivePageType get livePageTypeRuntime {
+ LivePageType? livePageTypeValue;
+ for (LivePageType item in LivePageType.values) {
+ if (livePageType == item.toString()) {
+ livePageTypeValue = item;
+ }
+ }
+ return livePageTypeValue!;
+ }
+
+ LiveMsgEventSingleHide get msgTypeRuntime {
+ LiveMsgEventSingleHide? msgTypeValue;
+ for (LiveMsgEventSingleHide item in LiveMsgEventSingleHide.values) {
+ if (msgType == item.toString()) {
+ msgTypeValue = item;
+ }
+ }
+ return msgTypeValue!;
+ }
+
+ Map<String, dynamic> toJson() {
+ return {
+ 'msgType': msgType,
+ 'livePageType': livePageType,
+ 'channelId': channelId,
+ 'sendChatId': sendChatId,
+ 'sendChatName': sendChatName,
+ 'sendAvatarUrl': sendAvatarUrl,
+ 'sendAgoraUid': sendAgoraUid,
+ 'msgContent': msgContent,
+ 'groupId': groupId,
+ };
+ }
+
+ factory LiveSingleHideMsgModel.no() {
+ return LiveSingleHideMsgModel(
+ msgType: '',
+ livePageType: "",
+ channelId: "",
+ sendChatId: "",
+ sendChatName: "",
+ sendAvatarUrl: "",
+ sendAgoraUid: '',
+ msgContent: '',
+ groupId: '',
+ );
+ }
+
+ factory LiveSingleHideMsgModel.fromJson(Map<String, dynamic> json) =>
+ LiveSingleHideMsgModel(
+ msgType: asT<String>(json['msgType'])!,
+ livePageType: asT<String>(json['livePageType'])!,
+ channelId: asT<String>(json['channelId'])!,
+ sendChatId: asT<String>(json['sendChatId'])!,
+ sendChatName: asT<String>(json['sendChatName'])!,
+ sendAvatarUrl: asT<String>(json['sendAvatarUrl'])!,
+ sendAgoraUid: asT<String>(json['sendAgoraUid'])!,
+ msgContent: asT<String?>(json['msgContent']),
+ groupId: asT<String?>(json['groupId']),
+ );
+
+ LiveSingleHideMsgModel({
+ required this.msgType,
+ required this.livePageType,
+ required this.channelId,
+ required this.sendChatId,
+ required this.sendChatName,
+ required this.sendAvatarUrl,
+ required this.sendAgoraUid,
+ required this.groupId,
+ this.msgContent,
+ });
+}
+
+/// 个人可视数据模型
+class LiveSingleShowMsgModel {
+ /// [LiveMsgEventSingleShow.value]
+ final String msgType;
+
+ /// [LivePageType.value]
+ final String? livePageType;
+ final String channelId;
+ final String sendChatId;
+ final String sendChatName;
+ final String sendAvatarUrl;
+ final String sendAgoraUid;
+
+ /// 通话时长【当状态为正常是必须要传】
+ final String? longTime;
+
+ bool get livePageTypeIsGroup {
+ return livePageType == LivePageType.multipleAudio.toString() ||
+ livePageType == LivePageType.multipleVideo.toString();
+ }
+
+ LivePageType get livePageTypeRuntime {
+ LivePageType? livePageTypeValue;
+ for (LivePageType item in LivePageType.values) {
+ if (livePageType == item.toString()) {
+ livePageTypeValue = item;
+ }
+ }
+ return livePageTypeValue!;
+ }
+
+ LiveMsgEventSingleShow get msgTypeRuntime {
+ LiveMsgEventSingleShow? msgTypeValue;
+ for (LiveMsgEventSingleShow item in LiveMsgEventSingleShow.values) {
+ if (msgType == item.toString()) {
+ msgTypeValue = item;
+ }
+ }
+ return msgTypeValue!;
+ }
+
+ Map<String, dynamic> toJson() {
+ return {
+ 'msgType': msgType,
+ 'livePageType': livePageType,
+ 'channelId': channelId,
+ 'sendChatId': sendChatId,
+ 'sendChatName': sendChatName,
+ 'sendAvatarUrl': sendAvatarUrl,
+ 'sendAgoraUid': sendAgoraUid,
+ 'longTime': longTime,
+ };
+ }
+
+ factory LiveSingleShowMsgModel.no() {
+ return LiveSingleShowMsgModel(
+ msgType: '',
+ livePageType: "",
+ channelId: "",
+ sendChatId: "",
+ sendChatName: "",
+ sendAvatarUrl: "",
+ sendAgoraUid: '',
+ longTime: '',
+ );
+ }
+
+ factory LiveSingleShowMsgModel.fromJson(Map<String, dynamic> json) =>
+ LiveSingleShowMsgModel(
+ msgType: asT<String>(json['msgType'])!,
+ livePageType: asT<String?>(json['livePageType']),
+ channelId: asT<String>(json['channelId'] ?? "")!,
+ sendChatId: asT<String>(json['sendChatId'] ?? "")!,
+ sendChatName: asT<String>(json['sendChatName'] ?? "")!,
+ sendAvatarUrl: asT<String>(json['sendAvatarUrl'] ?? "")!,
+ sendAgoraUid: asT<String>(json['sendAgoraUid'] ?? "")!,
+ longTime: asT<String?>(json['longTime']),
+ );
+
+ LiveSingleShowMsgModel({
+ required this.msgType,
+ required this.livePageType,
+ required this.channelId,
+ required this.sendChatId,
+ required this.sendChatName,
+ required this.sendAvatarUrl,
+ required this.sendAgoraUid,
+ required this.longTime,
+ });
+}
diff --git a/lib/video/msg/live_msg_event.dart b/lib/video/msg/live_msg_event.dart
new file mode 100644
index 0000000..8393e21
--- /dev/null
+++ b/lib/video/msg/live_msg_event.dart
@@ -0,0 +1,51 @@
+/// 【单聊】不显示版消息事件
+/// 用于隐形通知
+enum LiveMsgEventSingleHide {
+ // 发送通话
+ senderSend,
+ // 发起人取消通话
+ senderCancel,
+ // 拒绝通话
+ receiverReject,
+ // 接听通话
+ receiverReceive,
+ // 正忙
+ receiverBusy,
+ // 挂断通话【已接通之后挂断】
+ bothHangUp,
+ // 音视频通话消息
+ liveMsg,
+}
+
+/// 【单聊】显示版消息事件
+/// 用于消息内容展示
+enum LiveMsgEventSingleShow {
+ // 无应答
+ noRsp,
+ // 已拒绝
+ rejected,
+ // 已取消
+ canceled,
+ // 对方正忙
+ busy,
+ // 正常=显示 "通话时长10:58"
+ normal,
+}
+
+/// 【群聊】不显示版消息事件
+/// 用于隐形通知
+enum LiveMsgEventMultipleHide {
+ // 发送通话
+ send,
+ // 取消通话
+ cancel,
+}
+
+/// 【群聊】显示版消息事件
+/// 用于消息内容展示
+enum LiveMsgEventMultipleShow {
+ // 发起了通话
+ launched,
+ // 已结束
+ closed,
+}
diff --git a/lib/video/other/key_constant.dart b/lib/video/other/key_constant.dart
new file mode 100644
index 0000000..b255281
--- /dev/null
+++ b/lib/video/other/key_constant.dart
@@ -0,0 +1,37 @@
+class KeyConstant {
+ static String loginAccount = 'loginAccount';
+
+ static String loginPassWord = 'loginPassWord';
+
+ static String easeMobUserName = 'easeMobUserName';
+
+ static String easeMobToken = 'easeMobToken';
+
+ static String userNick = 'userLoginNick'; //登录获取注册的昵称，环信设置昵称后存在不刷新问题
+
+ static String userPhone = 'userPhone';
+
+ static String invitationCode = 'invitationCode';
+
+ static String agoraAccount = 'agoraAccount';
+
+ static String mainTokenKey = 'mainTokenKey';
+
+ static String userId = 'userId';
+
+ static String isFirstLaunch = 'isFirstLaunch';
+
+ static String isLogin = 'isLogin';
+
+ static String loginResult = 'loginResult';
+
+ static String accountList = 'accountList';
+
+ static String userAgreement = 'userAgreement';
+
+ static String userPrivacy = 'userPrivacy';
+
+ static String enableTranslate = 'enableTranslate';
+
+ static String doNotDisturbList = 'doNotDisturbList';
+}
diff --git a/lib/video/other/sp_util.dart b/lib/video/other/sp_util.dart
new file mode 100644
index 0000000..60e5d37
--- /dev/null
+++ b/lib/video/other/sp_util.dart
@@ -0,0 +1,103 @@
+import 'dart:convert';
+
+import 'package:shared_preferences/shared_preferences.dart';
+
+class SpUtil {
+ //创建工厂方法
+ static SpUtil? _instance;
+
+ factory SpUtil() => _instance ??= SpUtil._initial();
+ SharedPreferences? _preferences;
+
+ //创建命名构造函数
+ SpUtil._initial() {
+ //为什么在这里需要新写init方法 主要是在命名构造中不能使用async/await
+ init();
+ }
+
+ //初始化SharedPreferences
+ void init() async {
+ _preferences ??= await SharedPreferences.getInstance();
+ }
+
+ //到这里还没有完 有时候会遇到使用时提示 SharedPreferences 未初始化,所以还需要提供一个static 的方法
+ static Future<SpUtil?> perInit() async {
+ if (_instance == null) {
+ //静态方法不能访问非静态变量所以需要创建变量再通过方法赋值回去
+ SharedPreferences preferences = await SharedPreferences.getInstance();
+ _instance = SpUtil._pre(preferences);
+ }
+ return _instance;
+ }
+
+ SpUtil._pre(SharedPreferences prefs) {
+ _preferences = prefs;
+ }
+
+ ///设置String类型的
+ Future setString(key, String value) async {
+ await _preferences?.setString(key, value);
+ }
+
+ ///设置setStringList类型的
+ Future setStringList(key, List<String> value) async {
+ await _preferences?.setStringList(key, value);
+ }
+
+ ///设置setBool类型的
+ void setBool(key, value) {
+ _preferences?.setBool(key, value);
+ }
+
+ ///设置setDouble类型的
+ void setDouble(key, value) {
+ _preferences?.setDouble(key, value);
+ }
+
+ ///设置setInt类型的
+ void setInt(key, value) {
+ _preferences?.setInt(key, value);
+ }
+
+ ///存储Json类型的
+ void setJson(key, value) {
+ value = jsonEncode(value);
+ _preferences?.setString(key, value);
+ }
+
+ ///通过泛型来获取数据
+ T? get<T>(key) {
+ var result = _preferences?.get(key);
+ if (result != null) {
+ return result as T;
+ }
+ return null;
+ }
+
+ ///获取JSON
+ Map<String, dynamic>? getJson(key) {
+ String? result = _preferences?.getString(key);
+ // if (StringUtil.isNotEmpty(result)) {
+ // return jsonDecode(result!);
+ // }
+ if (result != '' && result != null) {
+ return jsonDecode(result);
+ }
+
+ return null;
+ }
+
+ ///文中的StringUtil中的isNotEmpty的判断
+ /// static isNotEmpty(String? str) {
+ /// return str?.isNotEmpty ?? false;
+ /// }
+ ///清除全部
+ void clean() {
+ _preferences?.clear();
+ }
+
+ ///移除某一个
+ void remove(key) {
+ _preferences?.remove(key);
+ }
+}
diff --git a/lib/video/other/user/entity.dart b/lib/video/other/user/entity.dart
new file mode 100644
index 0000000..65aadc7
--- /dev/null
+++ b/lib/video/other/user/entity.dart
@@ -0,0 +1,135 @@
+import 'dart:convert';
+
+import 'package:get/get.dart';
+
+T? asT<T>(dynamic value) {
+ if (value is T) {
+ return value;
+ }
+ return null;
+}
+
+class UserInfoEntity {
+ UserInfoEntity({
+ required this.channel,
+ required this.account,
+ required this.uid,
+ required this.platform,
+ this.clienttype,
+ required this.identity,
+ required this.clientseq,
+ this.deleteat,
+ this.reason,
+ required this.timestamp,
+ required this.localuser,
+ });
+
+ factory UserInfoEntity.fromJson(Map<String, dynamic> json) => UserInfoEntity(
+ channel: asT<String>(json['channel'])!,
+ account: asT<int>(json['account'])!,
+ uid: asT<int>(json['uid'])!,
+ platform: asT<int>(json['platform'])!,
+ clienttype: asT<Object?>(json['clientType']),
+ identity: asT<int>(json['identity'])!,
+ clientseq: asT<int>(json['clientSeq'])!,
+ deleteat: asT<Object?>(json['deleteAt']),
+ reason: asT<Object?>(json['reason']),
+ timestamp: asT<int>(json['timestamp'])!,
+ localuser:
+ Localuser.fromJson(asT<Map<String, dynamic>>(json['localUser'])!),
+ );
+
+ String channel;
+ int account;
+ int uid;
+ int platform;
+ Object? clienttype;
+ int identity;
+ int clientseq;
+ Object? deleteat;
+ Object? reason;
+ int timestamp;
+ Localuser localuser;
+ RxBool isOpenCamera = true.obs;
+ RxBool isOpenMicrophone = true.obs;
+
+ @override
+ String toString() {
+ return jsonEncode(this);
+ }
+
+ Map<String, dynamic> toJson() => <String, dynamic>{
+ 'channel': channel,
+ 'account': account,
+ 'uid': uid,
+ 'platform': platform,
+ 'clientType': clienttype,
+ 'identity': identity,
+ 'clientSeq': clientseq,
+ 'deleteAt': deleteat,
+ 'reason': reason,
+ 'timestamp': timestamp,
+ 'localUser': localuser,
+ };
+}
+
+class Localuser {
+ Localuser({
+ required this.id,
+ required this.username,
+ required this.nickname,
+ required this.avatar,
+ required this.email,
+ required this.mobile,
+ required this.gender,
+ required this.status,
+ required this.creationtime,
+ required this.editiontime,
+ required this.logintime,
+ });
+
+ factory Localuser.fromJson(Map<String, dynamic> json) => Localuser(
+ id: asT<int>(json['id'])!,
+ username: asT<String>(json['username'])!,
+ nickname: asT<String>(json['nickname'])!,
+ avatar: asT<String>(json['avatar'])!,
+ email: asT<String>(json['email'])!,
+ mobile: asT<String>(json['mobile'])!,
+ gender: asT<String>(json['gender'])!,
+ status: asT<String>(json['status'])!,
+ creationtime: asT<int>(json['creationTime'])!,
+ editiontime: asT<int>(json['editionTime'])!,
+ logintime: asT<int>(json['loginTime'])!,
+ );
+
+ int id;
+ String username;
+ String nickname;
+ String avatar;
+ String email;
+ String mobile;
+ String gender;
+ String status;
+ int creationtime;
+ int editiontime;
+ int logintime;
+
+ @override
+ String toString() {
+ return jsonEncode(this);
+ }
+
+ Map<String, dynamic> toJson() => <String, dynamic>{
+ 'id': id,
+ 'username': username,
+ 'nickname': nickname,
+ 'avatar': avatar,
+ 'email': email,
+ 'mobile': mobile,
+ 'gender': gender,
+ 'status': status,
+ 'creationTime': creationtime,
+ 'editionTime': editiontime,
+ 'loginTime': logintime,
+ };
+}
diff --git a/lib/video/other/user/login_rsp_entity.dart b/lib/video/other/user/login_rsp_entity.dart
new file mode 100644
index 0000000..7853cac
--- /dev/null
+++ b/lib/video/other/user/login_rsp_entity.dart
@@ -0,0 +1,149 @@
+import 'dart:convert';
+
+T? asT<T>(dynamic value) {
+ if (value is T) {
+ return value;
+ }
+ return null;
+}
+
+class LoginRspEntity {
+ LoginRspEntity({
+ required this.MAIN,
+ required this.EASEMOB,
+ });
+
+ factory LoginRspEntity.fromJson(Map<String, dynamic> json) => LoginRspEntity(
+ MAIN: Main.fromJson(asT<Map<String, dynamic>>(json['MAIN'])!),
+ EASEMOB: Easemob.fromJson(asT<Map<String, dynamic>>(json['EASEMOB'])!),
+ );
+
+ Main MAIN;
+ Easemob EASEMOB;
+
+ @override
+ String toString() {
+ return jsonEncode(this);
+ }
+
+ Map<String, dynamic> toJson() => <String, dynamic>{
+ 'MAIN': MAIN,
+ 'EASEMOB': EASEMOB,
+ };
+}
+
+class Main {
+ Main({
+ required this.id,
+ required this.username,
+ required this.nickname,
+ required this.avatar,
+ required this.email,
+ required this.mobile,
+ required this.inviteBy,
+ required this.invitationCode,
+ required this.invitationCodeRequirement,
+ required this.status,
+ required this.creationTime,
+ required this.editionTime,
+ required this.loginTime,
+ required this.authorizationToken,
+ required this.genderCode,
+ required this.telCountryCode,
+ required this.country,
+ });
+
+ factory Main.fromJson(Map<String, dynamic> json) => Main(
+ id: asT<int>(json['id'])!,
+ username: asT<String>(json['username'])!,
+ nickname: asT<String?>(json['nickname']),
+ avatar: asT<String>(json['avatar'])!,
+ email: asT<String>(json['email'])!,
+ mobile: asT<String>(json['mobile'])!,
+ inviteBy: asT<int>(json['inviteBy'])!,
+ invitationCode: asT<String>(json['invitationCode'])!,
+ invitationCodeRequirement: asT<int>(json['invitationCodeRequirement'])!,
+ status: asT<String>(json['status'])!,
+ creationTime: asT<int>(json['creationTime'])!,
+ editionTime: asT<int>(json['editionTime'])!,
+ loginTime: asT<int>(json['loginTime'])!,
+ authorizationToken: asT<String>(json['authorizationToken'])!,
+ genderCode: asT<String>("${json['genderCode'] ?? 1}")!,
+ telCountryCode: asT<String>(json['telCountryCode'] ?? '')!,
+ country: asT<String>(json['country'] ?? '')!,
+ );
+
+ int id;
+ String username;
+ String? nickname;
+ String avatar;
+ String email;
+ String mobile;
+ int inviteBy;
+ String invitationCode;
+ int invitationCodeRequirement;
+ String status;
+ int creationTime;
+ int editionTime;
+ int loginTime;
+ String authorizationToken;
+ String telCountryCode;
+ String country;
+
+ // 1, 2, 127 为性别(男, 女, 保密)
+ String genderCode;
+
+ @override
+ String toString() {
+ return jsonEncode(this);
+ }
+
+ Map<String, dynamic> toJson() => <String, dynamic>{
+ 'id': id,
+ 'username': username,
+ 'nickname': nickname,
+ 'avatar': avatar,
+ 'email': email,
+ 'mobile': mobile,
+ 'inviteBy': inviteBy,
+ 'invitationCode': invitationCode,
+ 'invitationCodeRequirement': invitationCodeRequirement,
+ 'status': status,
+ 'creationTime': creationTime,
+ 'editionTime': editionTime,
+ 'loginTime': loginTime,
+ 'authorizationToken': authorizationToken,
+ 'genderCode': genderCode,
+ 'telCountryCode': telCountryCode,
+ 'country': country,
+ };
+}
+
+class Easemob {
+ Easemob({
+ required this.username,
+ required this.token,
+ required this.expireIn,
+ });
+
+ factory Easemob.fromJson(Map<String, dynamic> json) => Easemob(
+ username: asT<String>(json['username'])!,
+ token: asT<String>(json['token'])!,
+ expireIn: asT<int>(json['expireIn'])!,
+ );
+
+ String username;
+ String token;
+ int expireIn;
+
+ @override
+ String toString() {
+ return jsonEncode(this);
+ }
+
+ Map<String, dynamic> toJson() => <String, dynamic>{
+ 'username': username,
+ 'token': token,
+ 'expireIn': expireIn,
+ };
+}
diff --git a/lib/video/pages/accept/binding.dart b/lib/video/pages/accept/binding.dart
new file mode 100644
index 0000000..e097914
--- /dev/null
+++ b/lib/video/pages/accept/binding.dart
@@ -0,0 +1,9 @@
+import 'package:get/get.dart';
+import 'package:wechat_flutter/video/pages/accept/logic.dart';
+
+class AcceptBinding extends Bindings {
+ @override
+ void dependencies() {
+ Get.lazyPut(() => AcceptLogic());
+ }
+}
diff --git a/lib/video/pages/accept/logic.dart b/lib/video/pages/accept/logic.dart
new file mode 100644
index 0000000..9bca08b
--- /dev/null
+++ b/lib/video/pages/accept/logic.dart
@@ -0,0 +1,197 @@
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:wechat_flutter/video/impl/live_event_bus_impl.dart';
+import 'package:wechat_flutter/video/msg/live_msg.dart';
+import 'package:wechat_flutter/video/msg/live_msg_event.dart';
+import 'package:wechat_flutter/video/pages/video_sigle/logic.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+class AcceptLogic extends GetxController with LiveEventBus, LiveEventBusImpl {
+ String acceptEvent = "";
+
+ /// 顶部显示按钮
+ final List<VideoBtModel> topBts = [
+ VideoBtModel("", VideoBtType.minimize),
+ VideoBtModel("", VideoBtType.flip),
+ ];
+
+ /// 底部显示按钮
+ RxList<VideoBtModel> bottomBts = [
+ VideoBtModel("取消", VideoBtType.cancel),
+ VideoBtModel("接受", VideoBtType.acceptAudio),
+ ].obs;
+
+ Rx<LiveSingleHideMsgModel?> myMsgModel = LiveSingleHideMsgModel.no().obs;
+
+ @override
+ void onReady() {
+ super.onReady();
+ initParam();
+ initLiveEventBus(() {});
+ }
+
+ void initParam() {
+ Map result = Get.arguments as Map;
+
+ if (result.containsKey("accept_event")) {
+ acceptEvent = result["accept_event"];
+ }
+ if (!result.containsKey("accept_content")) {
+ return;
+ }
+
+ final String acceptContent = result['accept_content'];
+
+ if (acceptEvent == LiveMsgEventSingleHide.senderSend.toString()) {
+ LogUtil.d("接电话时拿到的内容数据模型::$acceptContent");
+ myMsgModel.value =
+ LiveSingleHideMsgModel.fromJson(json.decode(acceptContent));
+ }
+
+ // 刷新底部两个图标
+ bottomBts.value = [
+ VideoBtModel("取消", VideoBtType.cancel),
+ VideoBtModel(
+ "接受",
+ myMsgModel.value!.livePageType.toString().contains("Video")
+ ? VideoBtType.acceptVideo
+ : VideoBtType.acceptAudio),
+ ];
+ }
+
+ /*
+ * 按钮事件
+ * */
+ void btActions(VideoBtType e) {
+ debugPrint("Click button is ${e.name}");
+ switch (e) {
+ case VideoBtType.minimize:
+ rejectHandle();
+ break;
+ case VideoBtType.cancel:
+ rejectHandle();
+ break;
+ case VideoBtType.acceptAudio:
+ acceptHandle();
+ break;
+ case VideoBtType.acceptVideo:
+ acceptHandle();
+ break;
+ default:
+ break;
+ }
+ }
+
+ /*
+ * 拒绝处理
+ * */
+ Future rejectHandle() async {
+ try {
+ // EMUserInfo? selfInfo = await EMClient.getInstance.userInfoManager
+ // .fetchOwnInfo(expireTime: 3);
+ //
+ // String userAccountSp = await SpUtil().get(KeyConstant.agoraAccount);
+ // LiveSingleHideMsgModel msgModel = LiveSingleHideMsgModel(
+ // msgType: LiveMsgEventSingleHide.receiverReject.toString(),
+ // sendChatId: selfInfo?.userId ?? "",
+ // sendChatName: selfInfo?.nickName ?? '',
+ // sendAvatarUrl: selfInfo?.avatarUrl ?? '',
+ // sendAgoraUid: userAccountSp,
+ // channelId: myMsgModel.value!.channelId,
+ // livePageType: myMsgModel.value!.livePageType,
+ // groupId: myMsgModel.value?.groupId ?? "",
+ // );
+ //
+ // EMMessage msg = EMMessage.createCustomSendMessage(
+ // targetId: myMsgModel.value!.sendChatId,
+ // event: msgModel.msgType,
+ // params: {"content": json.encode(msgModel)},
+ // );
+ //
+ // /// 隐藏消息暂不做监听是否成功
+ // EMClient.getInstance.chatManager.sendMessage(msg);
+ // LogUtil.d("【单人】【语音】发送隐藏消息 成功，内容为:${json.encode(msgModel)}");
+ Get.back();
+ } catch (e) {
+ LogUtil.d("拒绝出现错误:${e.toString()}");
+ Get.back();
+ }
+ }
+
+ /*
+ * 接受通话
+ * */
+ Future acceptHandle() async {
+ // EMUserInfo? selfInfo =
+ // await EMClient.getInstance.userInfoManager.fetchOwnInfo(expireTime: 3);
+ //
+ // // 接电话时拿到的内容数据模型::
+ // // {"msgType":"LiveMsgEventSingleHide.senderSend","livePageType":"LivePageType.singleAudio",
+ // // "channelId":"FAFB4EFB97D57105DB690CD6B76FE04E","sendChatId":"chimera-13244766725",
+ // // "sendChatName":"q1two","sendAvatarUrl":"","sendAgoraUid":"3","msgContent":null}
+ // ChannelEntity channelEntity = ChannelEntity(
+ // sendChatId: myMsgModel.value?.sendChatId ?? "",
+ // sendChatName: myMsgModel.value?.sendChatName ?? '',
+ // mediaType: myMsgModel.value!.livePageType,
+ // sendAvatarUrl: myMsgModel.value?.sendAvatarUrl ?? '',
+ // sendAgoraUid: myMsgModel.value?.sendAgoraUid ?? '',
+ // channelName: myMsgModel.value?.channelId ?? "",
+ // toAvatar: selfInfo?.avatarUrl ?? "",
+ // toChatId: selfInfo?.userId ?? "",
+ // toChatName: selfInfo?.nickName ?? "",
+ // groupId: myMsgModel.value?.groupId,
+ // );
+ //
+ // String resultChannelId = myMsgModel.value?.channelId ?? "";
+ // Map arguments = {
+ // "channelId": resultChannelId,
+ // "isSend": false,
+ // "content": json.encode(channelEntity),
+ // };
+ // if (myMsgModel.value?.livePageType == LivePageType.singleAudio.toString()) {
+ // Get.offNamed(RouteConfig.audioSinglePage, arguments: arguments);
+ // } else if (myMsgModel.value?.livePageType ==
+ // LivePageType.multipleAudio.toString()) {
+ // Get.offNamed(RouteConfig.audioMultiplePage, arguments: arguments);
+ // } else if (myMsgModel.value?.livePageType ==
+ // LivePageType.singleVideo.toString()) {
+ // if (LiveUtilData.videoToVoiceList.contains(resultChannelId)) {
+ // /// 说明已经视频转音频了，直接进入音频
+ // Get.offNamed(RouteConfig.audioSinglePage, arguments: arguments);
+ // } else {
+ // Get.offNamed(RouteConfig.videoSinglePage, arguments: arguments);
+ // }
+ // } else if (myMsgModel.value?.livePageType ==
+ // LivePageType.multipleVideo.toString()) {
+ // Get.offNamed(RouteConfig.videoMultiplePage, arguments: arguments);
+ // }
+ //
+ // final bool isGroup = myMsgModel.value?.livePageType ==
+ // LivePageType.multipleVideo.toString() ||
+ // myMsgModel.value?.livePageType == LivePageType.multipleAudio.toString();
+ //
+ // String myLivePageType = myMsgModel.value!.livePageType;
+ // LivePageType? livePageType;
+ // for (LivePageType item in LivePageType.values) {
+ // if (myLivePageType == item.toString()) {
+ // livePageType = item;
+ // }
+ // }
+ //
+ // ChatMsgUtil.sendHideMsg(
+ // myMsgModel.value!.channelId,
+ // LiveMsgEventSingleHide.receiverReceive,
+ // livePageType!,
+ // myMsgModel.value!.sendChatId,
+ // isGroup,
+ // );
+ }
+
+ @override
+ void onClose() {
+ super.onClose();
+ closeLiveEventBus();
+ }
+}
diff --git a/lib/video/pages/accept/view.dart b/lib/video/pages/accept/view.dart
new file mode 100644
index 0000000..4bfb679
--- /dev/null
+++ b/lib/video/pages/accept/view.dart
@@ -0,0 +1,55 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+// import 'package:wechat_flutter/live/msg/live_msg.dart';
+import 'package:wechat_flutter/video/msg/live_msg.dart';
+import 'package:wechat_flutter/video/pages/video_sigle/logic.dart';
+import 'package:wechat_flutter/video/pages/video_sigle/view.dart';
+import 'package:wechat_flutter/video/ui_commom/func/av_permissions_state.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+// import 'package:wechat_flutter/util/check/regular.dart';
+// import 'package:wechat_flutter/util/screen_util.dart';
+// import 'package:wechat_flutter/widgets/func/av_permissions_state.dart';
+
+import 'logic.dart';
+
+/// 接受通话页面、接听通话页面
+class AcceptPage extends StatelessWidget {
+ final logic = Get.put(AcceptLogic());
+
+ AcceptPage({Key? key}) : super(key: key);
+
+ @override
+ Widget build(BuildContext context) {
+ return AvPermissionsBuilder(
+ child: Scaffold(
+ body: Obx(() {
+ LiveSingleHideMsgModel? model = logic.myMsgModel.value;
+ return VideoLiveBg.bgImg(
+ model?.sendAvatarUrl ?? "",
+ callItem: (VideoBtType e) => logic.btActions(e),
+ bottomBts: logic.bottomBts,
+ topBts: logic.topBts,
+ timeShow: "".obs,
+ content: Column(
+ children: [
+ SizedBox(height: 90.h),
+ CircleAvatar(
+ radius: 86 / 2,
+ backgroundImage: strNoEmpty(model?.sendAvatarUrl)
+ ? NetworkImage(model!.sendAvatarUrl)
+ : (AssetImage(AppConfig.defPic)
+ as ImageProvider),
+ ),
+ SizedBox(height: 16.h),
+ Text(
+ model?.sendChatName ?? '',
+ style: TextStyle(color: Colors.white, fontSize: 20.f),
+ )
+ ],
+ ),
+ );
+ }),
+ ),
+ );
+ }
+}
diff --git a/lib/video/pages/audio_multiple/binding.dart b/lib/video/pages/audio_multiple/binding.dart
new file mode 100644
index 0000000..b7fadd9
--- /dev/null
+++ b/lib/video/pages/audio_multiple/binding.dart
@@ -0,0 +1,9 @@
+import 'package:get/get.dart';
+import 'package:wechat_flutter/video/pages/audio_multiple/logic.dart';
+
+class AudioMultipleBinding extends Bindings {
+ @override
+ void dependencies() {
+ Get.lazyPut(() => AudioMultipleLogic());
+ }
+}
diff --git a/lib/video/pages/audio_multiple/logic.dart b/lib/video/pages/audio_multiple/logic.dart
new file mode 100644
index 0000000..1f5a8dc
--- /dev/null
+++ b/lib/video/pages/audio_multiple/logic.dart
@@ -0,0 +1,263 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:wechat_flutter/video/event/live_stream_event.dart';
+import 'package:wechat_flutter/video/event_bus/live_stream_msg_bus.dart';
+import 'package:wechat_flutter/video/impl/agora_audio_iml.dart';
+import 'package:wechat_flutter/video/impl/live_logic_impl.dart';
+import 'package:wechat_flutter/video/impl/live_util.dart';
+import 'package:wechat_flutter/video/impl/single_no_rsp.dart';
+import 'package:wechat_flutter/video/logic/live_time_logic.dart';
+import 'package:wechat_flutter/video/msg/chat_msg_mixin.dart';
+import 'package:wechat_flutter/video/msg/chat_msg_param.dart';
+import 'package:wechat_flutter/video/other/user/entity.dart';
+import 'package:wechat_flutter/video/float/float_view/view.dart';
+import 'package:wechat_flutter/video/impl/live_event_bus_impl.dart';
+import 'package:wechat_flutter/video/interface/base_interface.dart';
+import 'package:wechat_flutter/video/pages/video_sigle/logic.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+class AudioMultipleLogic extends GetxController
+ with
+ LiveLogicAbs,
+ LiveCheckClose,
+ SingleNoRspAbs,
+ SingleNoRsp,
+ LiveTimeObs,
+ LiveTimeLogic,
+ LiveLogicImpl,
+ LiveEventBus,
+ LiveEventBusImpl,
+ LiveHudShow {
+
+ @override
+ final AgoraAudioIml agoraIml = AgoraAudioIml(MediaType.multiple);
+
+ RxList<UserInfoEntity?> infoList = <UserInfoEntity?>[].obs;
+
+ StreamSubscription? liveStreamMsgBusBus;
+
+ /// 顶部显示按钮
+ final List<VideoBtModel> topBts = [
+ VideoBtModel("", VideoBtType.minimize),
+ ];
+
+ /// 底部显示按钮
+ RxList<VideoBtModel> bottomBts = [
+ VideoBtModel("麦克风", VideoBtType.microphone),
+ VideoBtModel("挂断", VideoBtType.cancel),
+ VideoBtModel("扬声器", VideoBtType.speakers),
+ ].obs;
+
+ @override
+ void onReady() {
+ super.onReady();
+ initLiveEventBus(() => setClosePage());
+ Map result = Get.arguments as Map;
+ enterLive(
+ result,
+ isClosed,
+ true,
+ () {
+ /// 非悬浮窗悬浮进入
+ noRspStartTime(() {
+ ChatMsgParam chatMsgParam = ChatMsgParam(
+ agoraIml.channelId ?? channelEntity.value!.channelId,
+ LivePageType.multipleAudio,
+ channelEntity.value!.targetId,
+ true,
+ );
+ // 发送隐藏消息给对方【让其关闭等待接听的页面】
+ ChatMsgUtil.sendCancelHideMsg(chatMsgParam);
+
+ // 发送【对方无应答】可视消息
+ ChatMsgUtil.sendNoRspShowMsg(chatMsgParam);
+ });
+ fetchChannelId();
+ agoraIml
+ .initEngine(
+ onUserJoined: onUserJoined,
+ onSelfJoinChannel: onSelfJoinChannel,
+ onLiveStateChange: onLiveStateChange,
+ onLiveJoinFail: onLiveJoinFail,
+ onSetClosePage: () {
+ setClosePage();
+ },
+ )
+ .then((value) {
+ listenClose = agoraIml.remoteUid.stream
+ .listen((v) => handleIdsChange(v, isClosed, true));
+
+ getUserListInfo();
+ });
+ initBaseInfo().then((value) {
+ });
+ },
+ onUserJoined: onUserJoined,
+ onSelfJoinChannel: onSelfJoinChannel,
+ onLiveStateChange: onLiveStateChange,
+ onLiveJoinFail: onLiveJoinFail,
+ livePageType: LivePageType.multipleAudio,
+ );
+
+ bottomBts.value = [
+ VideoBtModel("麦克风", VideoBtType.microphone, agoraIml.openMicrophone),
+ VideoBtModel("挂断", VideoBtType.cancel),
+ VideoBtModel("扬声器", VideoBtType.speakers, agoraIml.enableSpeakerphone),
+ ];
+
+ /// 监听直播数据流消息
+ liveStreamMsgBusBus = liveStreamMsgBus.on<LiveStreamMsgModel>().listen(
+ (v) => LiveUtil.handleLiveMsg(
+ v, channelEntity, agoraIml, onLiveStateChange));
+ }
+
+ /*
+ * 自己加入频道
+ * */
+ void onSelfJoinChannel() {
+ getUserListInfo();
+
+ Map result = Get.arguments as Map;
+ if (result.containsKey("call")) {
+ result["call"](agoraIml.channelId);
+ LogUtil.d("回调发送消息agoraIml.channelId：：${agoraIml.channelId}");
+ }
+ }
+
+ /*
+ * 异常处理
+ * */
+ void onLiveJoinFail(LiveErrorType errorType) {
+ if (errorType == LiveErrorType.channelError) {
+ setClosePage();
+ LiveUtil.closeAndTip('加入频道失败');
+ }
+ }
+
+ void onLiveStateChange(LiveSteamEvent eventName) {
+ LiveEventName eventNameResultValue = LiveEventName.openMicrophone;
+ for (LiveEventName newItem in LiveEventName.values) {
+ if (newItem.name == eventName.eventName) {
+ eventNameResultValue = newItem;
+ }
+ }
+ setUserLiveState(eventNameResultValue, eventName.uid);
+ }
+
+ /*
+ * 用户加入
+ * */
+
+ void onUserJoined() {
+ LogUtil.d("用户加入房间了");
+ startTime();
+ getUserListInfo();
+ noRspReceive();
+ }
+
+ /*
+ * 设置用户直播状态
+ * */
+ Future setUserLiveState(LiveEventName eventName, int uid) async {
+ if (!listNoEmpty(infoList)) {
+ return;
+ }
+ for (UserInfoEntity? p0 in infoList) {
+ if (p0?.uid == uid) {
+ switch (eventName) {
+ case LiveEventName.openCamera:
+ p0?.isOpenCamera.value = true;
+ break;
+ case LiveEventName.closeCamera:
+ p0?.isOpenCamera.value = false;
+ break;
+ case LiveEventName.openMicrophone:
+ p0?.isOpenMicrophone.value = true;
+ break;
+ case LiveEventName.closeMicrophone:
+ p0?.isOpenMicrophone.value = false;
+ break;
+ default:
+ break;
+ }
+ }
+ }
+ }
+
+ /*
+ * 获取用户信息
+ * */
+ Future getUserListInfo() async {
+ infoList.value = (await agoraIml.channelAllUserInfo(() => setClosePage()));
+ }
+
+ /*
+ * 按钮点击
+ * */
+ void btActions(VideoBtType e) {
+ debugPrint("Click button is ${e.name}");
+ switch (e) {
+ case VideoBtType.cancel:
+ ChatMsgParam chatMsgParam = ChatMsgParam(
+ agoraIml.channelId ?? channelEntity.value!.channelId,
+ LivePageType.multipleAudio,
+ channelEntity.value!.targetId,
+ true,
+ );
+
+ ChatMsgUtil.sendCancelHideMsg(chatMsgParam);
+ setClosePage();
+ Get.back();
+ break;
+ case VideoBtType.microphone:
+ agoraIml.switchMicrophone(channelEntity.value!.targetId);
+ break;
+ case VideoBtType.speakers:
+ agoraIml.switchSpeakerphone();
+ break;
+ case VideoBtType.minimize:
+ Get.back();
+ break;
+ case VideoBtType.camera:
+ break;
+ // case VideoBtType.translate:
+ // setTlOfCov(!enableTl.value);
+ // break;
+ default:
+ break;
+ }
+ }
+
+ /*
+ * 内部销毁事件监听
+ * */
+ void innerCancelBus() {
+ liveStreamMsgBusBus?.cancel();
+ liveStreamMsgBusBus = null;
+ }
+
+ @override
+ void onClose() {
+ super.onClose();
+
+ // 关闭事件总线
+ closeLiveEventBus();
+
+ innerCancelBus();
+
+ cancelTime();
+
+ /// 必须调用因为此实例已销毁
+ noRspCancelTime();
+
+ LogUtil.d('是否真实关闭页面::$isClosePage');
+ if (isClosePage) {
+ agoraIml.destroyEngine();
+ }
+ }
+
+ @override
+ String get covId => channelEntity.value?.toChatId ?? "0";
+}
diff --git a/lib/video/pages/audio_multiple/view.dart b/lib/video/pages/audio_multiple/view.dart
new file mode 100644
index 0000000..c9fbf3b
--- /dev/null
+++ b/lib/video/pages/audio_multiple/view.dart
@@ -0,0 +1,223 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:wechat_flutter/video/float/float_view/view.dart';
+import 'package:wechat_flutter/video/float/float_window.dart';
+import 'package:wechat_flutter/video/float/float_window_impl.dart';
+import 'package:wechat_flutter/video/float/live_show_widnow.dart';
+import 'package:wechat_flutter/video/interface/base_interface.dart';
+import 'package:wechat_flutter/video/other/user/entity.dart';
+import 'package:wechat_flutter/video/pages/video_sigle/logic.dart';
+import 'package:wechat_flutter/video/pages/video_sigle/view.dart';
+import 'package:wechat_flutter/video/ui_commom/func/av_permissions_state.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+import 'package:wechat_flutter/ui/live/live_msg_list.dart';
+import 'package:wechat_flutter/ui_commom/animation/ball.dart';
+
+import 'logic.dart';
+
+class AudioMultiplePage extends StatefulWidget {
+ const AudioMultiplePage({Key? key}) : super(key: key);
+
+ @override
+ State<AudioMultiplePage> createState() => _AudioMultiplePageState();
+}
+
+class _AudioMultiplePageState extends State<AudioMultiplePage>
+ with
+ RouteAware,
+ WidgetsBindingObserver,
+ LivePageHandleInterface,
+ LiveShowWindow,
+ AudioMultiplePageHandle {
+ final logic = Get.put(AudioMultipleLogic());
+
+ @override
+ void initState() {
+ super.initState();
+
+ Map result = Get.arguments as Map;
+
+ final bool isFloatEnter = result.containsKey("isWindowPush") &&
+ result["isWindowPush"] is bool &&
+ result["isWindowPush"];
+
+ /// 非悬浮窗进入暂时不做加载中
+ if (!isFloatEnter) {
+ logic.initLiveHudShow(context, logic.channelEntity, logic.agoraIml);
+ }
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return AvPermissionsBuilder(
+ child: Scaffold(
+ body: VideoLiveBg.bgImg(
+ "https://gd-hbimg.huaban.com/7d9b0e09560597333288b6ea56e8fdd2d3e9df57f52f-Z7AHiN_fw1200",
+ callItem: (VideoBtType e) => logic.btActions(e),
+ bottomBts: logic.bottomBts,
+ topBts: logic.topBts,
+ timeShow: logic.timeValueStr,
+ content: Column(
+ children: [
+ Obx(() {
+ return Wrap(
+ children: List.generate(6, (index) {
+ bool isHaveItem = listNoEmpty(logic.infoList.value)
+ ? logic.infoList.value.length > index
+ : false;
+
+ UserInfoEntity? currentItem;
+ if (isHaveItem) {
+ /// 要求1000000008格式
+ currentItem = logic.infoList.value[index]!;
+ }
+ final bool isSelfValue =
+ currentItem?.uid == logic.agoraIml.myAgoraId;
+
+ return VoiceMember(
+ isLoading: !isHaveItem,
+ isHasVoice: isHaveItem,
+ voiceValue: isSelfValue
+ ? logic.agoraIml.openMicrophone
+ : (currentItem?.isOpenMicrophone ?? true.obs),
+ model: currentItem,
+ );
+ }),
+ );
+ }),
+ Space(height: 30),
+ Expanded(
+ child: Obx(
+ () => LiveMsgList(
+ logic.agoraIml,
+ MediaType.multiple,
+ targetId: logic.channelEntity.value!.targetId,
+ isAudio: true,
+ ),
+ ),
+ ),
+ ],
+ ),
+ ),
+ ),
+ );
+ }
+
+ @override
+ Future<bool> popHandle() async {
+ if (!logic.isClosePage) {
+ floatWindow.open(
+ context,
+ param: FloatWindowParam(
+ LivePageType.multipleAudio,
+ agoraAudioIml: logic.agoraIml,
+ infoList: logic.infoList,
+ isSend: logic.agoraIml.isSend,
+ singleRemoteUid: logic.agoraIml.remoteUid,
+ noRspIsOk: logic.noRspIsOk,
+ noRspTimeValue: logic.noRspTimeValue,
+ myAgoraId: logic.agoraIml.myAgoraId,
+ trtcCloud: logic.agoraIml.trtcCloud,
+ timeValue: logic.timeValue,
+ channelEntity: logic.channelEntity,
+ timeValueStr: logic.timeValueStr,
+ ),
+ );
+ }
+ return true;
+ }
+
+ @override
+ void dispose() {
+ super.dispose();
+ logic.agoraIml.cancelRecognition();
+ }
+}
+
+class VoiceMember extends StatelessWidget {
+ final Widget? liveContainer;
+ final bool isLoading;
+ final bool isHasVoice;
+ final RxBool voiceValue;
+ final UserInfoEntity? model;
+
+ const VoiceMember({
+ required this.voiceValue,
+ this.liveContainer,
+ this.isLoading = false,
+ this.isHasVoice = false,
+ this.model,
+ Key? key,
+ }) : super(key: key);
+
+ @override
+ Widget build(BuildContext context) {
+ final double itemFullWidth = Get.width - 30;
+ final double itemSize = itemFullWidth / 3;
+ Widget content;
+ if (liveContainer != null) {
+ content = liveContainer!;
+ } else {
+ content = strNoEmpty(model?.localuser.avatar)
+ ? Image.network(model!.localuser.avatar)
+ : isLoading
+ ? Container(color: Colors.grey)
+ : Image.asset(AppConfig.defPic,
+ alignment: Alignment.center, fit: BoxFit.cover);
+ }
+ if (isLoading) {
+ content = Stack(
+ children: [
+ content,
+ Positioned.fill(
+ child: Container(
+ color: Colors.black.withOpacity(0.3),
+ alignment: Alignment.center,
+ child: const BallPulseLoading(),
+ ),
+ )
+ ],
+ );
+ }
+ content = Container(
+ padding: const EdgeInsets.all(8),
+ child: ClipRRect(
+ borderRadius: BorderRadius.all(Radius.circular(itemSize / 2)),
+ child: content,
+ ),
+ );
+ if (isHasVoice) {
+ const double voiceSize = 25;
+ content = Stack(
+ children: [
+ content,
+ Positioned(
+ right: 10,
+ bottom: 10,
+ child: Container(
+ width: voiceSize,
+ height: voiceSize,
+ decoration: const BoxDecoration(
+ color: Colors.white,
+ shape: BoxShape.circle,
+ ),
+ child: Obx(() {
+ return Image.asset(
+ 'assets/images/live/live_avatar_${voiceValue.value ? "open" : "close"}_microphone.png',
+ width: voiceSize,
+ height: voiceSize,
+ );
+ }),
+ ),
+ )
+ ],
+ );
+ }
+ return SizedBox(
+ width: itemSize,
+ height: itemSize,
+ child: content,
+ );
+ }
+}
diff --git a/lib/video/pages/audio_single/binding.dart b/lib/video/pages/audio_single/binding.dart
new file mode 100644
index 0000000..a246987
--- /dev/null
+++ b/lib/video/pages/audio_single/binding.dart
@@ -0,0 +1,9 @@
+import 'package:get/get.dart';
+import 'package:wechat_flutter/video/pages/audio_single/logic.dart';
+
+class AudioSingleBinding extends Bindings {
+ @override
+ void dependencies() {
+ Get.lazyPut(() => AudioSingleLogic(null, false, 1, null, null, null));
+ }
+}
diff --git a/lib/video/pages/audio_single/logic.dart b/lib/video/pages/audio_single/logic.dart
new file mode 100644
index 0000000..44e526e
--- /dev/null
+++ b/lib/video/pages/audio_single/logic.dart
@@ -0,0 +1,269 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:wechat_flutter/video/event_bus/live_stream_msg_bus.dart';
+import 'package:wechat_flutter/video/impl/agora_audio_iml.dart';
+import 'package:wechat_flutter/video/impl/agora_video_iml.dart';
+import 'package:wechat_flutter/video/impl/live_logic_impl.dart';
+import 'package:wechat_flutter/video/impl/live_util.dart';
+import 'package:wechat_flutter/video/impl/single_no_rsp.dart';
+import 'package:wechat_flutter/video/logic/live_time_logic.dart';
+import 'package:wechat_flutter/video/msg/chat_msg_mixin.dart';
+import 'package:wechat_flutter/video/msg/chat_msg_param.dart';
+import 'package:wechat_flutter/video/float/float_view/view.dart';
+import 'package:wechat_flutter/video/impl/live_event_bus_impl.dart';
+import 'package:wechat_flutter/video/interface/base_interface.dart';
+import 'package:wechat_flutter/video/pages/video_sigle/logic.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+class AudioSingleLogic extends GetxController
+ with
+ LiveCheckClose,
+ LiveLogicAbs,
+ SingleNoRspAbs,
+ SingleNoRsp,
+ LiveTimeObs,
+ LiveTimeLogic,
+ LiveLogicImpl,
+ LiveEventBus,
+ LiveEventBusImpl,
+ LiveHudShow {
+ final bool isChangeToVoice;
+ final SingleNoRsp? singleNoRspValue;
+ final int newTimeValue;
+ final AgoraVideoIml? agoraImlVideo;
+ final int? audToVideoChannelId;
+ final int? audToVideoMyAgoraId;
+
+ AudioSingleLogic(
+ this.singleNoRspValue,
+ this.isChangeToVoice,
+ this.newTimeValue,
+ this.agoraImlVideo,
+ this.audToVideoChannelId,
+ this.audToVideoMyAgoraId,
+ );
+
+ @override
+ final AgoraAudioIml agoraIml = AgoraAudioIml(MediaType.single);
+
+ StreamSubscription? liveStreamMsgBusBus;
+
+ /// 顶部显示按钮
+ final List<VideoBtModel> topBts = [
+ VideoBtModel("", VideoBtType.minimize),
+ ];
+
+ /// 底部显示按钮
+ RxList<VideoBtModel> bottomBts = [
+ VideoBtModel("麦克风", VideoBtType.microphone),
+ VideoBtModel("取消", VideoBtType.cancel),
+ VideoBtModel("扬声器", VideoBtType.speakers),
+ ].obs;
+
+ ChatMsgParam get chatMsgParam {
+ return ChatMsgParam(
+ agoraIml.channelId ?? channelEntity.value!.channelId,
+ LivePageType.singleAudio,
+ channelEntity.value!.targetId,
+ false,
+ );
+ }
+
+ @override
+ void onReady() {
+ super.onReady();
+ initLiveEventBus(() => setClosePage(), onReject: () {
+ // 发送【被拒绝】可视消息【仅发送方发送】
+ ChatMsgUtil.sendRejectShowMsg(chatMsgParam);
+ }, onBusy: () {
+ // 发送【正忙】可视消息【仅发送方发送】
+ ChatMsgUtil.sendBusyShowMsg(chatMsgParam);
+ }, onSenderCancel: () {
+ /// onSenderCancel需要判断当前是否通话中，如果是通话中则通话结束，且发送正常的可显示消息，
+ /// 否则处理对方已取消
+ if (listNoEmpty(agoraIml.remoteUid)) {
+ senNormalMsgHandle(chatMsgParam);
+ } else {
+ LiveUtil.closeAndTip("对方已取消");
+ }
+ });
+
+ Map result = Get.arguments as Map;
+
+ enterLive(
+ result,
+ isClosed,
+ false,
+ () {
+ /// 非悬浮窗进入
+ noRspStartTime(() {
+ // 发送隐藏消息给对方【让其关闭等待接听的页面】
+ ChatMsgUtil.sendCancelHideMsg(chatMsgParam);
+
+ // 发送【对方无应答】可视消息
+ ChatMsgUtil.sendNoRspShowMsg(chatMsgParam);
+ });
+ fetchChannelId();
+
+ if (!isChangeToVoice) {
+ agoraIml
+ .initEngine(
+ onUserJoined: onUserJoined,
+ onLiveJoinFail: onLiveJoinFail,
+ onSelfJoinChannel: onSelfJoinChannel,
+ onSetClosePage: () {
+ setClosePage();
+ },
+ )
+ .then((value) {
+ listenClose = agoraIml.remoteUid.stream
+ .listen((v) => handleIdsChange(v, isClosed, false));
+ });
+ } else {
+ noRspChangeToVoice(singleNoRspValue);
+ agoraIml.trtcCloud = agoraImlVideo!.trtcCloud;
+ agoraIml.remoteUid.value = agoraImlVideo!.remoteUid.value;
+ timeValue = newTimeValue;
+ agoraIml.isJoined = agoraImlVideo!.isJoined;
+ agoraIml.channelId = audToVideoChannelId;
+ agoraIml.myAgoraId = audToVideoMyAgoraId;
+ if (listNoEmpty(agoraIml.remoteUid.value)) {
+ startTime();
+ }
+ }
+ initBaseInfo();
+ },
+ onUserJoined: onUserJoined,
+ onLiveJoinFail: onLiveJoinFail,
+ livePageType: LivePageType.singleAudio,
+ );
+ bottomBts.value = [
+ VideoBtModel("麦克风", VideoBtType.microphone, agoraIml.openMicrophone),
+ VideoBtModel("取消", VideoBtType.cancel),
+ VideoBtModel("扬声器", VideoBtType.speakers, agoraIml.enableSpeakerphone),
+ ];
+
+ LogUtil.d("单人音视频触发 [监听直播数据流消息]");
+
+ /// 监听直播数据流消息
+ liveStreamMsgBusBus = liveStreamMsgBus.on<LiveStreamMsgModel>().listen(
+ (v) => LiveUtil.handleLiveMsg(v, channelEntity, agoraIml, null));
+ }
+
+ /*
+ * 异常处理
+ * */
+ void onLiveJoinFail(LiveErrorType errorType) {
+ if (errorType == LiveErrorType.channelError) {
+ setClosePage();
+ LiveUtil.closeAndTip('加入频道失败');
+ }
+ }
+
+ /*
+ * 自己加入频道
+ * */
+ void onSelfJoinChannel() {
+ Map result = Get.arguments as Map;
+ if (result.containsKey("call")) {
+ result["call"](agoraIml.channelId);
+ LogUtil.d("回调发送消息agoraIml.channelId：：${agoraIml.channelId}");
+ }
+ }
+
+ /*
+ * 用户加入
+ * */
+
+ void onUserJoined() {
+ LogUtil.d("用户加入房间了");
+ startTime();
+
+ /// 音频不需要获取用户信息列表
+ // getUserListInfo();
+ noRspReceive();
+ }
+
+ /// 发送正常通话结束的消息
+ void senNormalMsgHandle(ChatMsgParam chatMsgParam) {
+ // 远程的用户id不为空，表示已连接通话，这个时候结束就是通话结束
+
+ // 发送【正常】可视消息【仅发送方发送】
+ ChatMsgUtil.sendNormalShowMsg(
+ chatMsgParam,
+ longTime: timeValueStr.value,
+ );
+ }
+
+ /*
+ * 按钮点击
+ * */
+ void btActions(VideoBtType e) {
+ debugPrint("Click button is ${e.name}");
+ switch (e) {
+ case VideoBtType.cancel:
+ ChatMsgUtil.sendCancelHideMsg(chatMsgParam);
+
+ if (agoraIml.isSend.value) {
+ if (listNoEmpty(agoraIml.remoteUid)) {
+ senNormalMsgHandle(chatMsgParam);
+ } else {
+ // 发送【已取消】可视消息【仅发送方发送】
+ ChatMsgUtil.sendCancelShowMsg(chatMsgParam);
+ }
+ }
+ setClosePage();
+ Get.back();
+ break;
+ case VideoBtType.microphone:
+ agoraIml.switchMicrophone(channelEntity.value!.targetId);
+ break;
+ case VideoBtType.speakers:
+ agoraIml.switchSpeakerphone();
+ break;
+ case VideoBtType.minimize:
+ Get.back();
+ break;
+ case VideoBtType.flip:
+ debugPrint("转换");
+ break;
+ // case VideoBtType.translate:
+ // setTlOfCov(!enableTl.value);
+ // break;
+ default:
+ break;
+ }
+ }
+
+ /*
+ * 内部销毁事件监听
+ * */
+ void innerCancelBus() {
+ liveStreamMsgBusBus?.cancel();
+ liveStreamMsgBusBus = null;
+ }
+
+ @override
+ void onClose() {
+ super.onClose();
+ // 关闭事件总线
+ closeLiveEventBus();
+
+ innerCancelBus();
+
+ cancelTime();
+
+ /// 必须调用因为此实例已销毁
+ noRspCancelTime();
+
+ LogUtil.d('是否真实关闭页面::$isClosePage');
+ if (isClosePage) {
+ agoraIml.destroyEngine();
+ }
+ }
+
+ @override
+ String get covId => channelEntity.value?.toChatId ?? "0";
+}
diff --git a/lib/video/pages/audio_single/view.dart b/lib/video/pages/audio_single/view.dart
new file mode 100644
index 0000000..ffd1eb3
--- /dev/null
+++ b/lib/video/pages/audio_single/view.dart
@@ -0,0 +1,193 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:wechat_flutter/ui_commom/app/my_scaffold.dart';
+import 'package:wechat_flutter/video/float/float_view/view.dart';
+import 'package:wechat_flutter/video/float/float_window.dart';
+import 'package:wechat_flutter/video/float/float_window_impl.dart';
+import 'package:wechat_flutter/video/float/live_show_widnow.dart';
+import 'package:wechat_flutter/video/impl/agora_video_iml.dart';
+import 'package:wechat_flutter/video/impl/live_util.dart';
+import 'package:wechat_flutter/video/impl/single_no_rsp.dart';
+import 'package:wechat_flutter/video/interface/base_interface.dart';
+import 'package:wechat_flutter/video/msg/chat_msg_mixin.dart';
+import 'package:wechat_flutter/video/pages/video_sigle/logic.dart';
+import 'package:wechat_flutter/video/pages/video_sigle/view.dart';
+import 'package:wechat_flutter/video/ui_commom/func/av_permissions_state.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+import 'package:wechat_flutter/ui/live/live_msg_list.dart';
+import 'package:wechat_flutter/ui_commom/view/hud_view.dart';
+
+import 'logic.dart';
+
+class AudioSinglePage extends StatefulWidget {
+ final bool isChangeToVoice;
+ final int timeValue;
+ final AgoraVideoIml? agoraImlVideo;
+ final SingleNoRsp? singleNoRspValue;
+ final int? channelId;
+ final int? audToVideoMyAgoraId;
+
+ AudioSinglePage(
+ {this.isChangeToVoice = false,
+ this.timeValue = 0,
+ this.agoraImlVideo,
+ this.singleNoRspValue,
+ this.channelId,
+ this.audToVideoMyAgoraId,
+ Key? key})
+ : super(key: key);
+
+ @override
+ State<AudioSinglePage> createState() => _AudioSinglePageState();
+}
+
+
+class _AudioSinglePageState extends State<AudioSinglePage> with RouteAware,
+ WidgetsBindingObserver,
+ LivePageHandleInterface,
+ LiveShowWindow,
+ AudioSinglePageHandle {
+ @override
+ Widget build(BuildContext context) {
+ return MyScaffold(
+ appBar: ComMomBar(
+ title: "语音通话【敬请期待】",
+ ),
+ );
+ }
+
+ @override
+ Future<bool> popHandle() {
+ // TODO: implement popHandle
+ throw UnimplementedError();
+ }
+
+}
+// class _AudioSinglePageState extends State<AudioSinglePage> with RouteAware,
+// WidgetsBindingObserver,
+// LivePageHandleInterface,
+// LiveShowWindow,
+// AudioSinglePageHandle {
+// late AudioSingleLogic logic;
+//
+// @override
+// void initState() {
+// super.initState();
+// logic = Get.put(
+// AudioSingleLogic(
+// widget.singleNoRspValue,
+// widget.isChangeToVoice,
+// widget.timeValue,
+// widget.agoraImlVideo,
+// widget.channelId,
+// widget.audToVideoMyAgoraId,
+// ),
+// );
+//
+// Map result = Get.arguments as Map;
+//
+// final bool isFloatEnter = result.containsKey("isWindowPush") &&
+// result["isWindowPush"] is bool &&
+// result["isWindowPush"];
+//
+// /// 非悬浮窗进入暂时不做加载中
+// if (!isFloatEnter) {
+// logic.initLiveHudShow(context, logic.channelEntity, logic.agoraIml);
+// }
+// }
+//
+// @override
+// Widget build(BuildContext context) {
+// return AvPermissionsBuilder(
+// child: Scaffold(
+// body: Obx(
+// () => VideoLiveBg.bgImg(
+// "https://gd-hbimg.huaban.com/7d9b0e09560597333288b6ea56e8fdd2d3e9df57f52f-Z7AHiN_fw1200",
+// remoteUid: logic.agoraIml.remoteUid,
+// callItem: (VideoBtType e) => logic.btActions(e),
+// bottomBts: logic.bottomBts.value,
+// topBts: logic.topBts,
+// timeShow: logic.timeValueStr,
+// content: Column(
+// children: [
+// SizedBox(height: 90.h),
+// Obx(
+// () {
+// final String avatar = ((logic.agoraIml.isSend.value)
+// ? logic.channelEntity.value?.toAvatar
+// : logic.channelEntity.value?.sendAvatarUrl) ??
+// "";
+// return CircleAvatar(
+// radius: 86 / 2,
+// backgroundImage: strNoEmpty(avatar)
+// ? NetworkImage(avatar)
+// : (AssetImage(AppConfig.defPic) as ImageProvider),
+// );
+// },
+// ),
+// SizedBox(height: 16.h),
+// () {
+// final String toChatName =
+// logic.channelEntity.value?.toChatName ?? "";
+// final String sendChatName =
+// logic.channelEntity.value?.sendChatName ?? "";
+// return Obx(() {
+// final String name = (logic.agoraIml.isSend.value)
+// ? toChatName
+// : sendChatName;
+// return Text(
+// name,
+// style: TextStyle(color: Colors.white, fontSize: 20.f),
+// );
+// });
+// }(),
+// Space(height: 30),
+// Expanded(
+// child: Obx(
+// () => LiveMsgList(
+// logic.agoraIml,
+// MediaType.single,
+// targetId: logic.channelEntity.value!.targetId,
+// isAudio: true,
+// ),
+// ),
+// ),
+// ],
+// ),
+// ),
+// ),
+// ),
+// );
+// }
+//
+// @override
+// Future<bool> popHandle() async {
+// if (!logic.isClosePage) {
+// floatWindow.open(
+// context,
+// param: FloatWindowParam(
+// LivePageType.singleAudio,
+// agoraAudioIml: logic.agoraIml,
+// infoList: logic.infoList,
+// isSend: logic.agoraIml.isSend,
+// singleRemoteUid: logic.agoraIml.remoteUid,
+// noRspIsOk: logic.noRspIsOk,
+// noRspTimeValue: logic.noRspTimeValue,
+// myAgoraId: logic.agoraIml.myAgoraId,
+// trtcCloud: logic.agoraIml.trtcCloud,
+// timeValue: logic.timeValue,
+// channelEntity: logic.channelEntity,
+// timeValueStr: logic.timeValueStr,
+// ),
+// );
+// }
+// return true;
+// }
+//
+// @override
+// void dispose() {
+// super.dispose();
+// HudView.dismiss();
+// logic.agoraIml.cancelRecognition();
+// }
+// }
diff --git a/lib/video/pages/video_multiple/binding.dart b/lib/video/pages/video_multiple/binding.dart
new file mode 100644
index 0000000..1e6cf1a
--- /dev/null
+++ b/lib/video/pages/video_multiple/binding.dart
@@ -0,0 +1,9 @@
+import 'package:get/get.dart';
+import 'package:wechat_flutter/video/pages/video_multiple/logic.dart';
+
+class VideoMultipleBinding extends Bindings {
+ @override
+ void dependencies() {
+ Get.lazyPut(() => VideoMultipleLogic());
+ }
+}
diff --git a/lib/video/pages/video_multiple/logic.dart b/lib/video/pages/video_multiple/logic.dart
new file mode 100644
index 0000000..ddb5d31
--- /dev/null
+++ b/lib/video/pages/video_multiple/logic.dart
@@ -0,0 +1,268 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:wechat_flutter/video/event/live_stream_event.dart';
+import 'package:wechat_flutter/video/event_bus/live_stream_msg_bus.dart';
+import 'package:wechat_flutter/video/impl/agora_video_iml.dart';
+import 'package:wechat_flutter/video/impl/live_logic_impl.dart';
+import 'package:wechat_flutter/video/impl/live_util.dart';
+import 'package:wechat_flutter/video/impl/single_no_rsp.dart';
+import 'package:wechat_flutter/video/logic/live_time_logic.dart';
+import 'package:wechat_flutter/video/msg/chat_msg_mixin.dart';
+import 'package:wechat_flutter/video/msg/chat_msg_param.dart';
+import 'package:wechat_flutter/video/other/user/entity.dart';
+import 'package:wechat_flutter/video/float/float_view/view.dart';
+import 'package:wechat_flutter/video/impl/live_event_bus_impl.dart';
+import 'package:wechat_flutter/video/interface/base_interface.dart';
+import 'package:wechat_flutter/video/pages/video_sigle/logic.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+class VideoMultipleLogic extends GetxController
+ with
+ LiveLogicAbs,
+ LiveCheckClose,
+ SingleNoRspAbs,
+ SingleNoRsp,
+ LiveTimeObs,
+ LiveTimeLogic,
+ LiveLogicImpl,
+ LiveEventBus,
+ LiveEventBusImpl,
+ LiveHudShow {
+ @override
+ final AgoraVideoIml agoraIml = AgoraVideoIml(MediaType.multiple);
+
+ RxList<UserInfoEntity?> infoList = <UserInfoEntity?>[].obs;
+
+ StreamSubscription? liveStreamMsgBusBus;
+
+ /// 顶部显示按钮
+ final List<VideoBtModel> topBts = [
+ VideoBtModel("", VideoBtType.minimize),
+ VideoBtModel("", VideoBtType.spacer),
+ VideoBtModel("", VideoBtType.flip),
+ ];
+
+ /// 底部显示按钮
+ RxList<VideoBtModel> bottomBts = [
+ VideoBtModel("麦克风", VideoBtType.microphone),
+ VideoBtModel("摄像头", VideoBtType.camera),
+ VideoBtModel("挂断", VideoBtType.cancel),
+ ].obs;
+
+ @override
+ void onReady() {
+ super.onReady();
+ initLiveEventBus(() => setClosePage());
+
+ Map result = Get.arguments as Map;
+ enterLive(
+ result,
+ isClosed,
+ true,
+ () {
+ noRspStartTime(() {
+ ChatMsgParam chatMsgParam = ChatMsgParam(
+ agoraIml.channelId ?? channelEntity.value!.channelId,
+ LivePageType.multipleVideo,
+ channelEntity.value!.targetId,
+ false,
+ );
+
+ // 发送隐藏消息给对方【让其关闭等待接听的页面】
+ ChatMsgUtil.sendCancelHideMsg(chatMsgParam);
+
+ // 发送【对方无应答】可视消息
+ ChatMsgUtil.sendNoRspShowMsg(chatMsgParam);
+ });
+ fetchChannelId();
+ agoraIml
+ .initEngine(
+ onUserJoined: onUserJoined,
+ onSelfJoinChannel: onSelfJoinChannel,
+ onLiveStateChange: onLiveStateChange,
+ onLiveJoinFail: onLiveJoinFail,
+ onSetClosePage: () {
+ setClosePage();
+ },
+ )
+ .then((value) {
+ listenClose = agoraIml.remoteUid.stream
+ .listen((v) => handleIdsChange(v, isClosed, true));
+
+ getUserListInfo();
+ });
+
+ initBaseInfo();
+ },
+ onUserJoined: onUserJoined,
+ onSelfJoinChannel: onSelfJoinChannel,
+ onLiveStateChange: onLiveStateChange,
+ onLiveJoinFail: onLiveJoinFail,
+ livePageType: LivePageType.multipleVideo,
+ );
+ bottomBts.value = [
+ VideoBtModel("麦克风", VideoBtType.microphone, agoraIml.openMicrophone),
+ VideoBtModel("摄像头", VideoBtType.camera, agoraIml.isEnableVideo),
+ VideoBtModel("挂断", VideoBtType.cancel),
+ ];
+
+ /// 监听直播数据流消息
+ liveStreamMsgBusBus = liveStreamMsgBus.on<LiveStreamMsgModel>().listen(
+ (v) => LiveUtil.handleLiveMsg(
+ v, channelEntity, agoraIml, onLiveStateChange));
+ }
+
+ /*
+ * 异常处理
+ * */
+ void onLiveJoinFail(LiveErrorType errorType) {
+ if (errorType == LiveErrorType.channelError) {
+ setClosePage();
+ LiveUtil.closeAndTip('加入频道失败');
+ }
+ }
+
+ /*
+ * 自己加入频道
+ * */
+ void onSelfJoinChannel() {
+ getUserListInfo();
+
+ Map result = Get.arguments as Map;
+ if (result.containsKey("call")) {
+ result["call"](agoraIml.channelId);
+ LogUtil.d("回调发送消息agoraIml.channelId：：${agoraIml.channelId}");
+ }
+ }
+
+ /*
+ * 状态变更
+ * */
+ void onLiveStateChange(LiveSteamEvent eventName) {
+ LiveEventName eventNameResultValue = LiveEventName.openMicrophone;
+ for (LiveEventName newItem in LiveEventName.values) {
+ if (newItem.name == eventName.eventName) {
+ eventNameResultValue = newItem;
+ }
+ }
+ setUserLiveState(eventNameResultValue, eventName.uid);
+ }
+
+ /*
+ * 用户加入
+ * */
+ void onUserJoined() {
+ LogUtil.d("用户加入房间了");
+ startTime();
+ getUserListInfo();
+ noRspReceive();
+ }
+
+ /*
+ * 设置用户直播状态
+ * */
+ Future setUserLiveState(LiveEventName eventName, int uid) async {
+ if (!listNoEmpty(infoList)) {
+ return;
+ }
+ for (UserInfoEntity? p0 in infoList) {
+ if (p0?.uid == uid) {
+ switch (eventName) {
+ case LiveEventName.openCamera:
+ p0?.isOpenCamera.value = true;
+ break;
+ case LiveEventName.closeCamera:
+ p0?.isOpenCamera.value = false;
+ break;
+ case LiveEventName.openMicrophone:
+ p0?.isOpenMicrophone.value = true;
+ break;
+ case LiveEventName.closeMicrophone:
+ p0?.isOpenMicrophone.value = false;
+ break;
+ default:
+ break;
+ }
+ }
+ }
+ }
+
+ /*
+ * 获取用户信息
+ * */
+ Future getUserListInfo() async {
+ infoList.value = (await agoraIml.channelAllUserInfo(() => setClosePage()));
+ }
+
+ /*
+ * 按钮点击
+ * */
+ void btActions(VideoBtType e) {
+ debugPrint("Click button is ${e.name}");
+ switch (e) {
+ case VideoBtType.cancel:
+ ChatMsgParam chatMsgParam = ChatMsgParam(
+ agoraIml.channelId ?? channelEntity.value!.channelId,
+ LivePageType.multipleVideo,
+ channelEntity.value!.targetId,
+ true,
+ );
+
+ ChatMsgUtil.sendCancelHideMsg(chatMsgParam);
+ setClosePage();
+ Get.back();
+ break;
+ case VideoBtType.microphone:
+ agoraIml.switchMicrophone(targetId: channelEntity.value!.targetId);
+ break;
+ case VideoBtType.speakers:
+ agoraIml.switchSpeakerphone();
+ break;
+ case VideoBtType.minimize:
+ Get.back();
+ break;
+ case VideoBtType.flip:
+ agoraIml.switchCameraHandle();
+ break;
+ case VideoBtType.camera:
+ agoraIml.enableAndDisableCamera(
+ targetId: channelEntity.value!.targetId);
+ break;
+ default:
+ break;
+ }
+ }
+
+ /*
+ * 内部销毁事件监听
+ * */
+ void innerCancelBus() {
+ liveStreamMsgBusBus?.cancel();
+ liveStreamMsgBusBus = null;
+ }
+
+ @override
+ void onClose() {
+ super.onClose();
+
+ // 关闭事件总线
+ closeLiveEventBus();
+
+ innerCancelBus();
+
+ cancelTime();
+
+ /// 必须调用因为此实例已销毁
+ noRspCancelTime();
+
+ LogUtil.d('是否真实关闭页面::$isClosePage');
+ if (isClosePage) {
+ agoraIml.destroyEngine();
+ }
+ }
+
+ @override
+ String get covId => channelEntity.value?.toChatId ?? '0';
+}
diff --git a/lib/video/pages/video_multiple/view.dart b/lib/video/pages/video_multiple/view.dart
new file mode 100644
index 0000000..d913568
--- /dev/null
+++ b/lib/video/pages/video_multiple/view.dart
@@ -0,0 +1,247 @@
+import 'dart:math';
+
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:wechat_flutter/video/float/live_show_widnow.dart';
+import 'package:wechat_flutter/video/interface/base_interface.dart';
+import 'package:wechat_flutter/video/other/user/entity.dart';
+import 'package:wechat_flutter/video/float/float_view/view.dart';
+import 'package:wechat_flutter/video/float/float_window.dart';
+import 'package:wechat_flutter/video/float/float_window_impl.dart';
+import 'package:wechat_flutter/video/pages/video_sigle/logic.dart';
+import 'package:wechat_flutter/video/pages/video_sigle/view.dart';
+import 'package:wechat_flutter/video/ui_commom/func/av_permissions_state.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+import 'package:wechat_flutter/ui/live/live_msg_list.dart';
+import 'package:wechat_flutter/ui_commom/animation/ball.dart';
+import 'package:wechat_flutter/ui_commom/image/sw_avatar.dart';
+import 'package:wechat_flutter/ui_commom/image/sw_image.dart';
+
+import 'logic.dart';
+
+class VideoMultiplePage extends StatefulWidget {
+ const VideoMultiplePage({Key? key}) : super(key: key);
+
+ @override
+ State<VideoMultiplePage> createState() => _VideoMultiplePageState();
+}
+
+class _VideoMultiplePageState extends State<VideoMultiplePage>
+ with
+ RouteAware,
+ WidgetsBindingObserver,
+ LivePageHandleInterface,
+ LiveShowWindow,
+ VideoMultiplePageHandle {
+ final logic = Get.put(VideoMultipleLogic());
+
+ @override
+ void initState() {
+ super.initState();
+
+ Map result = Get.arguments as Map;
+
+ final bool isFloatEnter = result.containsKey("isWindowPush") &&
+ result["isWindowPush"] is bool &&
+ result["isWindowPush"];
+
+ /// 非悬浮窗进入暂时不做加载中
+ if (!isFloatEnter) {
+ logic.initLiveHudShow(context, logic.channelEntity, logic.agoraIml);
+ }
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return AvPermissionsBuilder(
+ child: Scaffold(
+ body: VideoLiveBg.bgImg(
+ "https://gd-hbimg.huaban.com/7d9b0e09560597333288b6ea56e8fdd2d3e9df57f52f-Z7AHiN_fw1200",
+ callItem: (VideoBtType e) => logic.btActions(e),
+ bottomBts: logic.bottomBts,
+ topBts: logic.topBts,
+ timeShow: logic.timeValueStr,
+ content: Column(
+ children: [
+ Obx(() {
+ return Wrap(
+ alignment: WrapAlignment.start,
+ children: List.generate(6, (index) {
+ bool isHaveItem = listNoEmpty(logic.infoList.value)
+ ? logic.infoList.value.length > index
+ : false;
+ UserInfoEntity? currentItem;
+ if (isHaveItem) {
+ /// 要求1000000008格式
+ currentItem = logic.infoList.value[index]!;
+ }
+ final bool isSelfValue =
+ currentItem?.uid == logic.agoraIml.myAgoraId;
+
+ return VideoMultipleMember(
+ isLoading: !isHaveItem,
+ isHasVoice: isHaveItem,
+ model: currentItem,
+ voiceValue: isSelfValue
+ ? logic.agoraIml.openMicrophone
+ : (currentItem?.isOpenMicrophone ?? true.obs),
+ liveContainer: currentItem == null
+ ? null
+ : isSelfValue
+ ? Obx(() {
+ /// 没有开启摄像头，显示自己头像
+ if (!logic.agoraIml.isEnableVideo.value) {
+ return SwImage(
+ currentItem!.localuser.avatar);
+ }
+ return Container();
+ // return const rtc_local_view.SurfaceView(
+ // zOrderMediaOverlay: true,
+ // zOrderOnTop: true,
+ // );
+ })
+ : Obx(() {
+ /// 没有开启摄像头，显示自己头像
+ if (!(currentItem?.isOpenCamera.value ??
+ false)) {
+ return AvatarView(
+ currentItem!.localuser.avatar);
+ }
+ return Container();
+ // return rtc_remote_view.SurfaceView(
+ // uid: currentItem!.uid,
+ // channelId: logic.agoraIml.channelId!,
+ // renderMode: VideoRenderMode.Hidden,
+ // );
+ }),
+ );
+ }),
+ );
+ }),
+ Space(height: 30),
+ Expanded(
+ child: Obx(
+ () => LiveMsgList(
+ logic.agoraIml,
+ MediaType.multiple,
+ targetId: logic.channelEntity.value!.targetId,
+ isAudio: false,
+ ),
+ ),
+ ),
+ ],
+ ),
+ ),
+ ),
+ );
+ }
+
+ @override
+ Future<bool> popHandle() async {
+ if (!logic.isClosePage) {
+ floatWindow.open(
+ context,
+ param: FloatWindowParam(
+ LivePageType.multipleVideo,
+ agoraVideoIml: logic.agoraIml,
+ infoList: logic.infoList,
+ isSend: logic.agoraIml.isSend,
+ singleRemoteUid: logic.agoraIml.remoteUid,
+ noRspIsOk: logic.noRspIsOk,
+ noRspTimeValue: logic.noRspTimeValue,
+ myAgoraId: logic.agoraIml.myAgoraId,
+ trtcCloud: logic.agoraIml.trtcCloud,
+ timeValue: logic.timeValue,
+ channelEntity: logic.channelEntity,
+ timeValueStr: logic.timeValueStr,
+ ),
+ );
+ }
+ return true;
+ }
+
+ @override
+ void dispose() {
+ super.dispose();
+ }
+}
+
+class VideoMultipleMember extends StatelessWidget {
+ final Widget? liveContainer;
+ final bool isLoading;
+ final bool isHasVoice;
+ final RxBool voiceValue;
+ final UserInfoEntity? model;
+
+ const VideoMultipleMember({
+ required this.voiceValue,
+ this.liveContainer,
+ this.isLoading = false,
+ this.isHasVoice = false,
+ this.model,
+ Key? key,
+ }) : super(key: key);
+
+ @override
+ Widget build(BuildContext context) {
+ final double itemFullWidth = Get.width - 30;
+ final double itemSize = itemFullWidth / 3;
+ Widget content;
+ if (liveContainer != null) {
+ content = liveContainer!;
+ } else {
+ content = strNoEmpty(model?.localuser.avatar)
+ ? Image.network(model!.localuser.avatar)
+ : isLoading
+ ? Container(color: Colors.grey)
+ : Image.asset(AppConfig.defPic,
+ alignment: Alignment.center, fit: BoxFit.cover);
+ }
+ if (isLoading) {
+ content = Stack(
+ children: [
+ content,
+ Positioned.fill(
+ child: Container(
+ color: Colors.black.withOpacity(0.3),
+ alignment: Alignment.center,
+ child: const BallPulseLoading(),
+ ),
+ )
+ ],
+ );
+ }
+ if (isHasVoice) {
+ const double voiceSize = 25;
+ content = Stack(
+ children: [
+ content,
+ Positioned(
+ right: 10,
+ bottom: 10,
+ child: Container(
+ width: voiceSize,
+ height: voiceSize,
+ decoration: const BoxDecoration(
+ color: Colors.white,
+ shape: BoxShape.circle,
+ ),
+ child: Obx(() {
+ return Image.asset(
+ 'assets/images/live/live_avatar_${voiceValue.value ? "open" : "close"}_microphone.png',
+ width: voiceSize,
+ height: voiceSize,
+ );
+ }),
+ ),
+ )
+ ],
+ );
+ }
+ return SizedBox(
+ width: itemSize,
+ height: itemSize,
+ child: content,
+ );
+ }
+}
diff --git a/lib/video/pages/video_sigle/binding.dart b/lib/video/pages/video_sigle/binding.dart
new file mode 100644
index 0000000..0b9a59d
--- /dev/null
+++ b/lib/video/pages/video_sigle/binding.dart
@@ -0,0 +1,10 @@
+import 'package:get/get.dart';
+import 'package:wechat_flutter/video/pages/video_sigle/logic.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+class VideoSingleBinding extends Bindings {
+ @override
+ void dependencies() {
+ Get.lazyPut(() => VideoSingleLogic());
+ }
+}
diff --git a/lib/video/pages/video_sigle/logic.dart b/lib/video/pages/video_sigle/logic.dart
new file mode 100644
index 0000000..8c7a1ee
--- /dev/null
+++ b/lib/video/pages/video_sigle/logic.dart
@@ -0,0 +1,470 @@
+import 'dart:convert';
+import 'dart:typed_data';
+
+import 'package:flutter/material.dart';
+import 'package:wechat_flutter/video/event/live_stream_event.dart';
+import 'package:wechat_flutter/video/event_bus/live_stream_msg_bus.dart';
+import 'package:wechat_flutter/video/impl/agora_video_iml.dart';
+import 'package:wechat_flutter/video/impl/live_logic_impl.dart';
+import 'package:wechat_flutter/video/impl/live_util.dart';
+import 'package:wechat_flutter/video/impl/single_no_rsp.dart';
+import 'package:wechat_flutter/video/logic/live_time_logic.dart';
+import 'package:wechat_flutter/video/msg/chat_msg_mixin.dart';
+import 'package:wechat_flutter/video/msg/chat_msg_param.dart';
+import 'package:wechat_flutter/video/other/user/entity.dart';
+import 'package:wechat_flutter/video/float/float_window_impl.dart';
+import 'package:wechat_flutter/video/float/float_view/view.dart';
+import 'package:wechat_flutter/video/impl/live_event_bus_impl.dart';
+import 'package:wechat_flutter/video/interface/base_interface.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+
+enum VideoBtType {
+ /// 麦克风
+ microphone,
+
+ /// 扬声器
+ speakers,
+
+ /// 摄像头
+ camera,
+
+ /// 取消
+ cancel,
+
+ /// 接受【音频】
+ acceptAudio,
+
+ /// 接受【视频】
+ acceptVideo,
+
+ /// 转到语音通话
+ changeToVoice,
+
+ /// 最小化
+ minimize,
+
+ /// 翻转
+ flip,
+
+ // 间隔
+ spacer,
+}
+
+class VideoBtModel {
+ final String text;
+ final VideoBtType type;
+ final RxBool? value;
+
+ RxString get icon {
+ if (type == VideoBtType.cancel) {
+ return "assets/images/live/live_cancel.png".obs;
+ } else if (type == VideoBtType.acceptAudio) {
+ return "assets/images/live/live_accept.png".obs;
+ } else if (type == VideoBtType.acceptVideo) {
+ return "assets/images/live/live_video_accept.png".obs;
+ } else if (type == VideoBtType.minimize) {
+ return "assets/images/live/live_scale.png".obs;
+ } else if (type == VideoBtType.flip) {
+ return "assets/images/live/live_switch.png".obs;
+ } else if (type == VideoBtType.changeToVoice) {
+ return "assets/images/live/live_change_to_voice.png".obs;
+ }
+ if (type == VideoBtType.camera) {
+ return value == null
+ ? "assets/images/live/live_camera_open.png".obs
+ : ("assets/images/live/live_camera_${value!.value ? "open" : "close"}.png"
+ .obs);
+ } else if (type == VideoBtType.speakers) {
+ return value == null
+ ? "assets/images/live/live_speakers_open.png".obs
+ : ("assets/images/live/live_speakers_${value!.value ? "open" : "close"}.png"
+ .obs);
+ } else if (type == VideoBtType.microphone) {
+ return value == null
+ ? "assets/images/live/live_microphone_open.png".obs
+ : ("assets/images/live/live_microphone_${value!.value ? "open" : "close"}.png"
+ .obs);
+ }
+ return "".obs;
+ }
+
+ VideoBtModel(this.text, this.type, [this.value]);
+}
+
+class VideoSingleLogic extends GetxController
+ with
+ LiveCheckClose,
+ MiniWindowAbs,
+ MiniWindow,
+ SingleNoRspAbs,
+ SingleNoRsp,
+ LiveLogicAbs,
+ LiveTimeObs,
+ LiveTimeLogic,
+ LiveLogicImpl,
+ LiveEventBus,
+ LiveEventBusImpl,
+ LiveHudShow {
+ @override
+ final AgoraVideoIml agoraIml = AgoraVideoIml(MediaType.single);
+
+ /// 对方是否打开了摄像头
+ RxBool otherSizeIsOpenCamera = true.obs;
+
+ StreamSubscription? isChangeToVoiceSubs;
+ StreamSubscription? liveStreamMsgBusBus;
+
+ /*
+ * 获取对方的头像
+ * */
+ String get getOtherAvatar {
+ String avatarValue = "";
+ try {
+ for (UserInfoEntity? entity in infoList) {
+ if (entity?.uid != agoraIml.myAgoraId) {
+ avatarValue = entity?.localuser.avatar ?? '';
+ }
+ }
+ } catch (e) {
+ LogUtil.d("获取对方头像出错");
+ return "";
+ }
+ return avatarValue;
+ }
+
+ /*
+ * 获取自己的头像
+ * */
+ String get getSelfAvatar {
+ String avatarValue = "";
+ try {
+ for (UserInfoEntity? entity in infoList) {
+ if (entity?.uid == agoraIml.myAgoraId) {
+ avatarValue = entity?.localuser.avatar ?? '';
+ }
+ }
+ } catch (e) {
+ LogUtil.d("获取自己头像出错");
+ return "";
+ }
+ return avatarValue;
+ }
+
+ /// 顶部显示按钮
+ final List<VideoBtModel> topBts = [
+ VideoBtModel("", VideoBtType.minimize),
+ VideoBtModel("", VideoBtType.spacer),
+ VideoBtModel("", VideoBtType.flip),
+ ];
+
+ /// 底部显示按钮
+ RxList<VideoBtModel> bottomBts = [
+ VideoBtModel("摄像头", VideoBtType.camera),
+ VideoBtModel("取消", VideoBtType.cancel),
+ VideoBtModel("切换到语音通话", VideoBtType.changeToVoice),
+ ].obs;
+
+ ChatMsgParam get chatMsgParam {
+ return ChatMsgParam(
+ agoraIml.channelId ?? channelEntity.value!.channelId,
+ LivePageType.singleVideo,
+ channelEntity.value!.targetId,
+ false,
+ );
+ }
+
+ @override
+ void onReady() {
+ super.onReady();
+
+ initLiveEventBus(() => setClosePage(), onReject: () {
+ // 发送【被拒绝】可视消息【仅发送方发送】
+ ChatMsgUtil.sendRejectShowMsg(chatMsgParam);
+ }, onBusy: () {
+ // 发送【正忙】可视消息【仅发送方发送】
+ ChatMsgUtil.sendBusyShowMsg(chatMsgParam);
+ }, onSenderCancel: () {
+ /// onSenderCancel需要判断当前是否通话中，如果是通话中则通话结束，且发送正常的可显示消息，
+ /// 否则处理对方已取消
+ if (listNoEmpty(agoraIml.remoteUid)) {
+ senNormalMsgHandle(chatMsgParam);
+ } else {
+ LiveUtil.closeAndTip("对方已取消");
+ }
+ });
+
+ Map result = Get.arguments as Map;
+ enterLive(
+ result,
+ isClosed,
+ false,
+ () {
+ noRspStartTime(() {
+ // 发送隐藏消息给对方【让其关闭等待接听的页面】
+ ChatMsgUtil.sendCancelHideMsg(chatMsgParam);
+
+ // 发送【对方无应答】可视消息
+ ChatMsgUtil.sendNoRspShowMsg(chatMsgParam);
+ });
+ fetchChannelId();
+ /// 初始化引擎
+ agoraIml
+ .initEngine(
+ onUserJoined: onUserJoined,
+ onSelfJoinChannel: onSelfJoinChannel,
+ onLiveStateChange: onLiveStateChange,
+ onLiveJoinFail: onLiveJoinFail,
+ onSetClosePage: () {
+ setClosePage();
+ },
+ )
+ .then((value) {
+ listenClose = agoraIml.remoteUid.stream
+ .listen((v) => handleIdsChange(v, isClosed, false));
+ });
+
+ initBaseInfo();
+ },
+ onUserJoined: onUserJoined,
+ onSelfJoinChannel: onSelfJoinChannel,
+ onLiveStateChange: onLiveStateChange,
+ onLiveJoinFail: onLiveJoinFail,
+ livePageType: LivePageType.singleVideo,
+ );
+ bottomBts.value = [
+ VideoBtModel("摄像头", VideoBtType.camera, agoraIml.isEnableVideo),
+ VideoBtModel("取消", VideoBtType.cancel),
+ VideoBtModel("切换到语音通话", VideoBtType.changeToVoice),
+ ];
+
+ /// 监听直播数据流消息
+ liveStreamMsgBusBus = liveStreamMsgBus.on<LiveStreamMsgModel>().listen(
+ (v) => LiveUtil.handleLiveMsg(
+ v, channelEntity, agoraIml, onLiveStateChange));
+
+ /// 监听视频转音频
+ isChangeToVoiceSubs = agoraIml.isChangeToVoice.listen((p0) {
+ if (p0) {
+ agoraIml.toVoicePage(this);
+ }
+ });
+ }
+
+ /*
+ * 异常处理
+ * */
+ void onLiveJoinFail(LiveErrorType errorType) {
+ if (errorType == LiveErrorType.channelError) {
+ setClosePage();
+ LiveUtil.closeAndTip('加入频道失败');
+ }
+ }
+
+ /*
+ * 自己加入频道
+ * */
+ void onSelfJoinChannel() {
+ getUserListInfo();
+
+ Map result = Get.arguments as Map;
+ if (result.containsKey("call")) {
+ result["call"](agoraIml.channelId);
+ LogUtil.d("回调发送消息agoraIml.channelId：：${agoraIml.channelId}");
+ }
+ }
+
+ /*
+ * 状态变更
+ * */
+ void onLiveStateChange(LiveSteamEvent eventName) {
+ LogUtil.d(
+ "收到音视频状态变更：：${eventName.toString()}，是否关闭摄像头：${eventName.eventName == LiveEventName.closeCamera.name}");
+ if (eventName.eventName == LiveEventName.closeCamera.name) {
+ otherSizeIsOpenCamera.value = false;
+ } else if (eventName.eventName == LiveEventName.openCamera.name) {
+ otherSizeIsOpenCamera.value = true;
+ }
+ }
+
+ /*
+ * 用户加入
+ * */
+ void onUserJoined() {
+ LogUtil.d("用户加入房间了");
+ startTime();
+ getUserListInfo();
+ noRspReceive();
+ }
+
+ /*
+ * 获取用户信息
+ * */
+ Future getUserListInfo() async {
+ infoList.value = (await agoraIml.channelAllUserInfo(() => setClosePage()));
+ }
+
+ /*
+ * 视频转音频通话
+ * */
+ Future changeToVoiceHandle() async {
+ noRspCancelTime();
+ await agoraIml.changeToVoice(targetId: channelEntity.value!.targetId);
+ }
+
+ /// 发送正常通话结束的消息
+ void senNormalMsgHandle(ChatMsgParam chatMsgParam) {
+ // 远程的用户id不为空，表示已连接通话，这个时候结束就是通话结束
+
+ // 发送【正常】可视消息【仅发送方发送】
+ ChatMsgUtil.sendNormalShowMsg(
+ chatMsgParam,
+ longTime: timeValueStr.value,
+ );
+ }
+
+ /*
+ * 按钮点击
+ * */
+ void btActions(VideoBtType e) {
+ debugPrint("Click button is ${e.name}");
+ switch (e) {
+ case VideoBtType.cancel:
+ ChatMsgUtil.sendCancelHideMsg(chatMsgParam);
+
+ if (agoraIml.isSend.value) {
+ if (listNoEmpty(agoraIml.remoteUid)) {
+ senNormalMsgHandle(chatMsgParam);
+ } else {
+ // 发送【已取消】可视消息【仅发送方发送】
+ ChatMsgUtil.sendCancelShowMsg(chatMsgParam);
+ }
+ }
+
+ setClosePage();
+ Get.back();
+ break;
+ case VideoBtType.minimize:
+ Get.back();
+ break;
+ case VideoBtType.camera:
+ agoraIml.enableAndDisableCamera(
+ targetId: channelEntity.value!.targetId);
+ break;
+ case VideoBtType.flip:
+ agoraIml.switchCameraHandle();
+ break;
+ case VideoBtType.changeToVoice:
+ changeToVoiceHandle();
+ break;
+ default:
+ break;
+ }
+ }
+
+ /*
+ * 内部销毁事件监听
+ * */
+ void innerCancelBus() {
+ /// 视频转音频监听器销毁
+ isChangeToVoiceSubs?.cancel();
+ isChangeToVoiceSubs = null;
+ liveStreamMsgBusBus?.cancel();
+ liveStreamMsgBusBus = null;
+ }
+
+ @override
+ void onClose() {
+ super.onClose();
+ // 关闭事件总线
+ closeLiveEventBus();
+
+ innerCancelBus();
+
+ cancelTime();
+
+ listenClose?.cancel();
+ listenClose = null;
+
+ /// 必须调用因为此实例已销毁
+ noRspCancelTime();
+
+ LogUtil.d('是否真实关闭页面::$isClosePage');
+ if (isClosePage) {
+ agoraIml.destroyEngine();
+ }
+ }
+
+ @override
+ String get covId => channelEntity.value?.toChatId ?? '0';
+}
+
+abstract class MiniWindowAbs {
+ // 小窗宽度
+ final double miniWindowWidth = 107.w;
+
+ // 小窗高度
+ final double miniWindowHeight = 115.h;
+
+ // 小窗顶部距离
+ RxDouble top = 0.0.obs;
+
+ // 小窗左边距离
+ RxDouble left = 0.0.obs;
+
+ /*
+ * 设置悬浮窗参数
+ * */
+ void setMiniWindow(BuildContext context);
+
+ /*
+ * 移动中
+ * */
+ void onPanUpdate(DragUpdateDetails details);
+
+ /*
+ * 移动结束
+ * */
+ void onPanEnd(DragEndDetails details);
+}
+
+mixin MiniWindow on MiniWindowAbs {
+ @override
+ void setMiniWindow(BuildContext context) {
+ if (top.value > 0) {
+ return;
+ }
+ double defRightPadding = 14;
+ top.value = MediaQuery.of(context).padding.top + 60 + 10;
+ left.value = ScreenUtil.screenWidthDp - miniWindowWidth - defRightPadding;
+ }
+
+ @override
+ void onPanUpdate(DragUpdateDetails details) {
+ left.value = details.globalPosition.dx - miniWindowWidth / 2;
+ top.value = details.globalPosition.dy - miniWindowHeight / 2;
+
+ if (left <= 0) {
+ left.value = 0;
+ } else if (left >= ScreenUtil.screenWidthDp) {
+ left.value = ScreenUtil.screenWidthDp;
+ }
+
+ final double topPadding = ScreenUtil.mediaQuery.padding.top;
+
+ if (top.value <= topPadding) {
+ top.value = topPadding;
+ } else if (top.value >=
+ ScreenUtil.screenHeightDp - topPadding - miniWindowWidth * 1) {
+ top.value = ScreenUtil.screenHeightDp - topPadding - miniWindowWidth * 1;
+ }
+ }
+
+ @override
+ void onPanEnd(DragEndDetails details) {
+ if (left + miniWindowWidth / 2 < ScreenUtil.screenWidthDp / 2) {
+ left.value = 0;
+ } else {
+ left.value = ScreenUtil.screenWidthDp - miniWindowWidth;
+ }
+ }
+}
diff --git a/lib/video/pages/video_sigle/view.dart b/lib/video/pages/video_sigle/view.dart
new file mode 100644
index 0000000..51c35df
--- /dev/null
+++ b/lib/video/pages/video_sigle/view.dart
@@ -0,0 +1,445 @@
+import 'dart:ui' as ui;
+
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:tencent_trtc_cloud/trtc_cloud_def.dart';
+import 'package:tencent_trtc_cloud/trtc_cloud_video_view.dart';
+import 'package:wechat_flutter/video/float/float_view/view.dart';
+import 'package:wechat_flutter/video/float/float_window.dart';
+import 'package:wechat_flutter/video/float/float_window_impl.dart';
+import 'package:wechat_flutter/video/float/live_show_widnow.dart';
+import 'package:wechat_flutter/video/interface/base_interface.dart';
+import 'package:wechat_flutter/video/ui_commom/func/av_permissions_state.dart';
+import 'package:wechat_flutter/tools/func/func.dart';
+import 'package:wechat_flutter/tools/wechat_flutter.dart';
+import 'package:wechat_flutter/ui/live/live_msg_list.dart';
+import 'package:wechat_flutter/ui_commom/image/sw_avatar.dart';
+
+import 'logic.dart';
+
+class VideoSinglePage extends StatefulWidget {
+ const VideoSinglePage({Key? key}) : super(key: key);
+
+ @override
+ State<VideoSinglePage> createState() => _VideoSinglePageState();
+}
+
+class _VideoSinglePageState extends State<VideoSinglePage>
+ with
+ RouteAware,
+ WidgetsBindingObserver,
+ LivePageHandleInterface,
+ LiveShowWindow,
+ VideoSinglePageHandle {
+ final logic = Get.put(VideoSingleLogic());
+
+ @override
+ void initState() {
+ super.initState();
+
+ Map result = Get.arguments as Map;
+
+ final bool isFloatEnter = result.containsKey("isWindowPush") &&
+ result["isWindowPush"] is bool &&
+ result["isWindowPush"];
+
+ /// 非悬浮窗进入暂时不做加载中
+ if (!isFloatEnter) {
+ logic.initLiveHudShow(context, logic.channelEntity, logic.agoraIml);
+ }
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ logic.setMiniWindow(context);
+
+ return AvPermissionsBuilder(
+ child: Scaffold(
+ body: Obx(() {
+ if (logic.agoraIml.isChangeToVoice.value) {
+ return Container();
+ } else {
+ return Stack(
+ children: [
+ VideoLiveBg.bgObs(
+ Obx(() {
+ if (listNoEmpty(logic.agoraIml.remoteUid)) {
+ /// 对方关闭了摄像头
+ if (!logic.otherSizeIsOpenCamera.value) {
+ return AvatarView(logic.getOtherAvatar);
+ }
+ return Container();
+ // return rtc_remote_view.SurfaceView(
+ // uid: logic.agoraIml.remoteUid[0],
+ // channelId: logic.agoraIml.channelId!,
+ // renderMode: VideoRenderMode.Hidden,
+ // );
+ } else {
+ if (!logic.agoraIml.isEnableVideo.value) {
+ return AvatarView(logic.getSelfAvatar);
+ }
+ return TRTCCloudVideoView(
+ // key: valueKey,
+ viewType: TRTCCloudDef.TRTC_VideoView_TextureView,
+ // This parameter is required for rendering desktop.(Android/iOS/web no need)
+ textureParam: CustomRender(
+ userId: Q1Data.user(),
+ isLocal: true,
+ streamType: TRTCCloudDef.TRTC_VIDEO_STREAM_TYPE_BIG,
+ width: 72,
+ height: 120,
+ ),
+ onViewCreated: (viewId) async {
+ await logic.agoraIml.trtcCloud
+ ?.startLocalPreview(true, viewId);
+ setState(() {
+ logic.agoraIml.localViewId = viewId;
+ });
+ });
+ }
+ }).obs,
+ remoteUid: logic.agoraIml.remoteUid,
+ miniWindow: Obx(
+ () {
+ if (!listNoEmpty(logic.agoraIml.remoteUid.value)) {
+ return Container();
+ }
+ return Positioned(
+ top: logic.top.value,
+ left: logic.left.value,
+ child: GestureDetector(
+ // 移动中
+ onPanUpdate: (details) {
+ logic.onPanUpdate(details);
+ },
+ // 移动结束
+ onPanEnd: (details) {
+ logic.onPanEnd(details);
+ },
+
+ child: Container(
+ width: logic.miniWindowWidth,
+ height: logic.miniWindowHeight,
+ color: Colors.black,
+ child: !logic.agoraIml.isEnableVideo.value
+ ? SwAvatar(logic.getSelfAvatar)
+ : TRTCCloudVideoView(
+ viewType:
+ TRTCCloudDef.TRTC_VideoView_TextureView,
+ // This parameter is required for rendering desktop.(Android/iOS/web no need)
+ textureParam: CustomRender(
+ userId: Q1Data.user(),
+ isLocal: true,
+ streamType: TRTCCloudDef
+ .TRTC_VIDEO_STREAM_TYPE_BIG,
+ width: 72,
+ height: 120,
+ ),
+ onViewCreated: (viewId) async {
+ await logic.agoraIml.trtcCloud
+ ?.startLocalPreview(true, viewId);
+ setState(() {
+ logic.agoraIml.localViewId = viewId;
+ });
+ }),
+ ),
+ ),
+ );
+ },
+ ),
+ callItem: (VideoBtType e) => logic.btActions(e),
+ bottomBts: logic.bottomBts,
+ topBts: logic.topBts,
+ timeShow: logic.timeValueStr,
+ ),
+ Column(
+ mainAxisAlignment: MainAxisAlignment.end,
+ children: [
+ SizedBox(
+ height: 270,
+ child: Obx(
+ () => LiveMsgList(
+ logic.agoraIml,
+ MediaType.single,
+ targetId: logic.channelEntity.value!.targetId,
+ isAudio: false,
+ ),
+ ),
+ ),
+ Space(height: 56 + 50),
+ SizedBox(height: MediaQuery.of(context).padding.bottom + 60)
+ ],
+ ),
+ ],
+ );
+ }
+ }),
+ ),
+ );
+ }
+
+ @override
+ Future<bool> popHandle() async {
+ if (!logic.isClosePage) {
+ floatWindow.open(
+ context,
+ param: FloatWindowParam(
+ LivePageType.singleVideo,
+ agoraVideoIml: logic.agoraIml,
+ infoList: logic.infoList,
+ isSend: logic.agoraIml.isSend,
+ singleRemoteUid: logic.agoraIml.remoteUid,
+ noRspIsOk: logic.noRspIsOk,
+ noRspTimeValue: logic.noRspTimeValue,
+ myAgoraId: logic.agoraIml.myAgoraId,
+ trtcCloud: logic.agoraIml.trtcCloud,
+ timeValue: logic.timeValue,
+ channelEntity: logic.channelEntity,
+ timeValueStr: logic.timeValueStr,
+ ),
+ );
+ }
+ return true;
+ }
+
+ @override
+ void dispose() {
+ super.dispose();
+ }
+}
+
+typedef CallItem = Function(VideoBtType e);
+
+class VideoLiveBg extends StatelessWidget {
+ final ObxWidget? miniWindow;
+ final Rx<Widget>? contentObs;
+ final Rx<Widget>? bgObs;
+ final Widget? content;
+ final RxString? timeShow;
+ final List<VideoBtModel> bottomBts;
+ final List<VideoBtModel> topBts;
+ final CallItem callItem;
+ final String? bgImg;
+ final RxList<int>? remoteUid;
+
+ const VideoLiveBg({
+ this.miniWindow,
+ this.contentObs,
+ this.content,
+ this.remoteUid,
+ required this.timeShow,
+ required this.bottomBts,
+ required this.topBts,
+ required this.callItem,
+ }) : bgImg = null,
+ bgObs = null,
+ super();
+
+ const VideoLiveBg.bgImg(
+ this.bgImg, {
+ this.contentObs,
+ this.content,
+ this.remoteUid,
+ required this.timeShow,
+ required this.bottomBts,
+ required this.topBts,
+ required this.callItem,
+ }) : miniWindow = null,
+ bgObs = null;
+
+ const VideoLiveBg.bgObs(
+ this.bgObs, {
+ this.miniWindow,
+ this.contentObs,
+ this.content,
+ this.remoteUid,
+ required this.timeShow,
+ required this.bottomBts,
+ required this.topBts,
+ required this.callItem,
+ }) : bgImg = null;
+
+ @override
+ Widget build(BuildContext context) {
+ return Container(
+ color: Colors.white,
+ child: Stack(
+ children: [
+ Container(
+ color: Colors.black.withOpacity(0.2),
+ width: Get.width,
+ height: Get.height,
+ child: bgObs != null
+ ? Obx(() => bgObs!.value)
+ : Stack(
+ children: [
+ !strNoEmpty(bgImg)
+ ? Image.asset(
+ AppConfig.defPic,
+ fit: BoxFit.cover,
+ width: Get.width,
+ height: Get.height,
+ )
+ : bgImg!.startsWith("asset")
+ ? Image.asset(
+ bgImg!,
+ fit: BoxFit.cover,
+ width: Get.width,
+ height: Get.height,
+ )
+ : Image.network(
+ bgImg!,
+ fit: BoxFit.cover,
+ width: Get.width,
+ height: Get.height,
+ ),
+ BackdropFilter(
+ filter: ui.ImageFilter.blur(sigmaX: 15.0, sigmaY: 15.0),
+ child: Container(
+ color: Colors.black.withOpacity(0.8),
+ ),
+ ),
+ ],
+ ),
+ ),
+ SizedBox(
+ width: Get.width,
+ height: Get.height,
+ child: Column(
+ children: [
+ Container(height: MediaQuery.of(context).padding.top),
+ Stack(
+ alignment: Alignment.center,
+ children: [
+ Row(
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ children: topBts.map<Widget>((e) {
+ if (e.type == VideoBtType.spacer) {
+ return const Spacer();
+ }
+ IconData icons = e.type == VideoBtType.minimize
+ ? Icons.fullscreen_exit_rounded
+ : Icons.change_circle_outlined;
+
+ double size = 24;
+ return ClickEvent(
+ child: Container(
+ height: 60,
+ padding: EdgeInsets.symmetric(
+ horizontal: e.type == VideoBtType.minimize
+ ? 20.w
+ : 12.w),
+ child: () {
+ Widget img = strNoEmpty(e.icon.value)
+ ? Image.asset(e.icon.value,
+ width: size, height: size)
+ : Icon(
+ icons,
+ size: 35,
+ color: Colors.white,
+ );
+ return img;
+ }(),
+ ),
+ onTap: () {
+ callItem(e.type);
+ },
+ );
+ }).toList(),
+ ),
+ if (remoteUid != null)
+ Obx(
+ () => Text(
+ remoteUid!.length == 0 ? "等待对方接听" : "对方已接听",
+ style: TextStyle(color: Colors.white, fontSize: 15.f),
+ ),
+ )
+ ],
+ ),
+ if (content != null)
+ Expanded(child: content!)
+ else if (contentObs != null)
+ Expanded(child: Obx(() => contentObs!.value))
+ else
+ const Spacer(),
+ Padding(
+ padding: EdgeInsets.symmetric(vertical: 15.h),
+ child: timeShow == null
+ ? Container()
+ : Obx(() {
+ return Text(
+ timeShow!.value,
+ style: TextStyle(
+ color: Colors.white,
+ fontSize: 15.f,
+ ),
+ );
+ }),
+ ),
+ Row(
+ mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+ children: bottomBts.map(bottomBtBuilder).toList(),
+ ),
+ SizedBox(height: MediaQuery.of(context).padding.bottom + 60)
+ ],
+ ),
+ ),
+ if (miniWindow != null) miniWindow!,
+ ],
+ ),
+ );
+ }
+
+ Widget showText(String text) {
+ return Text(
+ text,
+ style: TextStyle(
+ color: Colors.white,
+ fontSize: 12.f,
+ ),
+ );
+ }
+
+ Widget bottomBtBuilder(VideoBtModel e) {
+ final bool isCancel = e.type == VideoBtType.cancel;
+ Widget text = showText(
+ "${e.text}${e.value?.value == null ? "" : e.value!.value ? "已开" : "已关"}");
+ if (e.value?.value != null) {
+ text = Obx(() => showText(
+ "${e.text}${e.value?.value == null ? "" : e.value!.value ? "已开" : "已关"}"));
+ }
+ Widget iconWidget;
+ if (strNoEmpty(e.icon.value)) {
+ iconWidget = Obx(() => Image.asset(e.icon.value, width: 56.w));
+ } else {
+ iconWidget = Icon(
+ Icons.set_meal,
+ color: isCancel ? Colors.white : Colors.black,
+ );
+ }
+ return ClickEvent(
+ child: Container(
+ width: Get.width / bottomBts.length,
+ alignment: Alignment.center,
+ child: Column(
+ children: [
+ Container(
+ width: 56,
+ height: 56,
+ decoration: BoxDecoration(
+ shape: BoxShape.circle,
+ color: isCancel ? const Color(0xffF35341) : Colors.white,
+ ),
+ child: iconWidget,
+ ),
+ SizedBox(height: 8.h),
+ text,
+ ],
+ ),
+ ),
+ onTap: () {
+ callItem(e.type);
+ },
+ );
+ }
+}
diff --git a/lib/video/ui_commom/func/av_permissions_state.dart b/lib/video/ui_commom/func/av_permissions_state.dart
new file mode 100644
index 0000000..049fb42
--- /dev/null
+++ b/lib/video/ui_commom/func/av_permissions_state.dart
@@ -0,0 +1,60 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:permission_handler/permission_handler.dart';
+
+class AvPermissionsBuilder extends StatefulWidget {
+ final Widget child;
+
+ const AvPermissionsBuilder({required this.child, Key? key}) : super(key: key);
+
+ @override
+ State<StatefulWidget> createState() {
+ return _AvPermissionsBuilderState();
+ }
+}
+
+class _AvPermissionsBuilderState extends State<AvPermissionsBuilder> {
+ bool isHasPermission = false;
+
+ @override
+ void initState() {
+ super.initState();
+ checkPermission();
+ }
+
+ /*
+ * 检测权限
+ * */
+ Future checkPermission() async {
+ List<Permission> permissions = [
+ Permission.camera,
+ Permission.microphone,
+ ];
+ Map<Permission, PermissionStatus> statuses = await permissions.request();
+
+ if (statuses[Permission.camera] != PermissionStatus.granted ||
+ statuses[Permission.microphone] != PermissionStatus.granted) {
+ Get.back();
+ Get.defaultDialog(
+ title: '提示',
+ content: const Text('请到系统内设置允许本应用使用麦克风和摄像头权限~'),
+ textConfirm: "确定",
+ onConfirm: () {
+ Get.back();
+ openAppSettings();
+ },
+ );
+ } else {
+ isHasPermission = true;
+ if (mounted) setState(() {});
+ }
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ if (!isHasPermission) {
+ return Container(color: Colors.black);
+ }
+ return widget.child;
+ }
+}
diff --git a/plugin/camera/CHANGELOG.md b/plugin/camera/CHANGELOG.md
deleted file mode 100755
index 43e5f46..0000000
--- a/plugin/camera/CHANGELOG.md
+++ /dev/null
@@ -1,280 +0,0 @@
-## 0.5.8+3
-
-* Fix bug in usage example in README.md
-
-## 0.5.8+2
-
-* Post-v2 embedding cleanups.
-
-## 0.5.8+1
-
-* Update lower bound of dart dependency to 2.1.0.
-
-## 0.5.8
-
-* Remove Android dependencies fallback.
-* Require Flutter SDK 1.12.13+hotfix.5 or greater.
-
-## 0.5.7+5
-
-* Replace deprecated `getFlutterEngine` call on Android.
-
-## 0.5.7+4
-
-* Add `pedantic` to dev_dependency.
-
-## 0.5.7+3
-
-* Fix an Android crash when permissions are requested multiple times.
-
-## 0.5.7+2
-
-* Remove the deprecated `author:` field from pubspec.yaml
-* Migrate the plugin to the pubspec platforms manifest.
-* Require Flutter SDK 1.10.0 or greater.
-
-## 0.5.7+1
-
-* Fix example null exception.
-
-## 0.5.7
-
-* Fix unawaited futures.
-
-## 0.5.6+4
-
-* Android: Use CameraDevice.TEMPLATE_RECORD to improve image streaming.
-
-## 0.5.6+3
-
-* Remove AndroidX warning.
-
-## 0.5.6+2
-
-* Include lifecycle dependency as a compileOnly one on Android to resolve
- potential version conflicts with other transitive libraries.
-
-## 0.5.6+1
-
-* Android: Use android.arch.lifecycle instead of androidx.lifecycle:lifecycle in `build.gradle` to support apps that has not been migrated to AndroidX.
-
-## 0.5.6
-
-* Add support for the v2 Android embedding. This shouldn't affect existing
- functionality.
-
-## 0.5.5+1
-
-* Fix event type check
-
-## 0.5.5
-
-* Define clang modules for iOS.
-
-## 0.5.4+3
-
-* Update and migrate iOS example project.
-
-## 0.5.4+2
-
-* Fix Android NullPointerException on devices with only front-facing camera.
-
-## 0.5.4+1
-
-* Fix Android pause and resume video crash when executing in APIs below 24.
-
-## 0.5.4
-
-* Add feature to pause and resume video recording.
-
-## 0.5.3+1
-
-* Fix too large request code for FragmentActivity users.
-
-## 0.5.3
-
-* Added new quality presets.
-* Now all quality presets can be used to control image capture quality.
-
-## 0.5.2+2
-
-* Fix memory leak related to not unregistering stream handler in FlutterEventChannel when disposing camera.
-
-## 0.5.2+1
-
-* Fix bug that prevented video recording with audio.
-
-## 0.5.2
-
-* Added capability to disable audio for the `CameraController`. (e.g. `CameraController(_, _,
- enableAudio: false);`)
-
-## 0.5.1
-
-* Can now be compiled with earlier Android sdks below 21 when
-`<uses-sdk tools:overrideLibrary="io.flutter.plugins.camera"/>` has been added to the project
-`AndroidManifest.xml`. For sdks below 21, the plugin won't be registered and calls to it will throw
-a `MissingPluginException.`
-
-## 0.5.0
-
-* **Breaking Change** This plugin no longer handles closing and opening the camera on Android
- lifecycle changes. Please use `WidgetsBindingObserver` to control camera resources on lifecycle
- changes. See example project for example using `WidgetsBindingObserver`.
-
-## 0.4.3+2
-
-* Bump the minimum Flutter version to 1.2.0.
-* Add template type parameter to `invokeMethod` calls.
-
-## 0.4.3+1
-
-* Catch additional `Exception`s from Android and throw as `CameraException`s.
-
-## 0.4.3
-
-* Add capability to prepare the capture session for video recording on iOS.
-
-## 0.4.2
-
-* Add sensor orientation value to `CameraDescription`.
-
-## 0.4.1
-
-* Camera methods are ran in a background thread on iOS.
-
-## 0.4.0+3
-
-* Fixed a crash when the plugin is registered by a background FlutterView.
-
-## 0.4.0+2
-
-* Fix orientation of captured photos when camera is used for the first time on Android.
-
-## 0.4.0+1
-
-* Remove categories.
-
-## 0.4.0
-
-* **Breaking Change** Change iOS image stream format to `ImageFormatGroup.bgra8888` from
- `ImageFormatGroup.yuv420`.
-
-## 0.3.0+4
-
-* Fixed bug causing black screen on some Android devices.
-
-## 0.3.0+3
-
-* Log a more detailed warning at build time about the previous AndroidX
- migration.
-
-## 0.3.0+2
-
-* Fix issue with calculating iOS image orientation in certain edge cases.
-
-## 0.3.0+1
-
-* Remove initial method call invocation from static camera method.
-
-## 0.3.0
-
-* **Breaking change**. Migrate from the deprecated original Android Support
- Library to AndroidX. This shouldn't result in any functional changes, but it
- requires any Android apps using this plugin to [also
- migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
- using the original support library.
-
-## 0.2.9+1
-
-* Fix a crash when failing to start preview.
-
-## 0.2.9
-
-* Save photo orientation data on iOS.
-
-## 0.2.8
-
-* Add access to the image stream from Dart.
-* Use `cameraController.startImageStream(listener)` to process the images.
-
-## 0.2.7
-
-* Fix issue with crash when the physical device's orientation is unknown.
-
-## 0.2.6
-
-* Update the camera to use the physical device's orientation instead of the UI
- orientation on Android.
-
-## 0.2.5
-
-* Fix preview and video size with satisfying conditions of multiple outputs.
-
-## 0.2.4
-
-* Unregister the activity lifecycle callbacks when disposing the camera.
-
-## 0.2.3
-
-* Added path_provider and video_player as dev dependencies because the example uses them.
-* Updated example path_provider version to get Dart 2 support.
-
-## 0.2.2
-
-* iOS image capture is done in high quality (full camera size)
-
-## 0.2.1
-
-* Updated Gradle tooling to match Android Studio 3.1.2.
-
-## 0.2.0
-
-* Added support for video recording.
-* Changed the example app to add video recording.
-
-A lot of **breaking changes** in this version:
-
-Getter changes:
- - Removed `isStarted`
- - Renamed `initialized` to `isInitialized`
- - Added `isRecordingVideo`
-
-Method changes:
- - Renamed `capture` to `takePicture`
- - Removed `start` (the preview starts automatically when `initialize` is called)
- - Added `startVideoRecording(String filePath)`
- - Removed `stop` (the preview stops automatically when `dispose` is called)
- - Added `stopVideoRecording`
-
-## 0.1.2
-
-* Fix Dart 2 runtime errors.
-
-## 0.1.1
-
-* Fix Dart 2 runtime error.
-
-## 0.1.0
-
-* **Breaking change**. Set SDK constraints to match the Flutter beta release.
-
-## 0.0.4
-
-* Revert regression of `CameraController.capture()` introduced in v. 0.0.3.
-
-## 0.0.3
-
-* Improved resource cleanup on Android. Avoids crash on Activity restart.
-* Made the Future returned by `CameraController.dispose()` and `CameraController.capture()` actually complete on
- Android.
-
-## 0.0.2
-
-* Simplified and upgraded Android project template to Android SDK 27.
-* Moved Android package to io.flutter.plugins.
-* Fixed warnings from the Dart 2.0 analyzer.
-
-## 0.0.1
-
-* Initial release
diff --git a/plugin/camera/LICENSE b/plugin/camera/LICENSE
deleted file mode 100755
index c892933..0000000
--- a/plugin/camera/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2017 The Chromium Authors. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/plugin/camera/README.md b/plugin/camera/README.md
deleted file mode 100755
index fbd7392..0000000
--- a/plugin/camera/README.md
+++ /dev/null
@@ -1,104 +0,0 @@
-# Camera Plugin
-
-[](https://pub.dartlang.org/packages/camera)
-
-A Flutter plugin for iOS and Android allowing access to the device cameras.
-
-*Note*: This plugin is still under development, and some APIs might not be available yet. We are working on a refactor which can be followed here: [issue](https://github.com/flutter/flutter/issues/31225)
-
-## Features:
-
-* Display live camera preview in a widget.
-* Snapshots can be captured and saved to a file.
-* Record video.
-* Add access to the image stream from Dart.
-
-## Installation
-
-First, add `camera` as a [dependency in your pubspec.yaml file](https://flutter.io/using-packages/).
-
-### iOS
-
-Add two rows to the `ios/Runner/Info.plist`:
-
-* one with the key `Privacy - Camera Usage Description` and a usage description.
-* and one with the key `Privacy - Microphone Usage Description` and a usage description.
-
-Or in text format add the key:
-
-```xml
-<key>NSCameraUsageDescription</key>
-<string>Can I use the camera please?</string>
-<key>NSMicrophoneUsageDescription</key>
-<string>Can I use the mic please?</string>
-```
-
-### Android
-
-Change the minimum Android sdk version to 21 (or higher) in your `android/app/build.gradle` file.
-
-```
-minSdkVersion 21
-```
-
-### Example
-
-Here is a small example flutter app displaying a full screen camera preview.
-
-```dart
-import 'dart:async';
-import 'package:flutter/material.dart';
-import 'package:camera/camera.dart';
-
-List<CameraDescription> cameras;
-
-Future<void> main() async {
- WidgetsFlutterBinding.ensureInitialized();
- cameras = await availableCameras();
- runApp(CameraApp());
-}
-
-class CameraApp extends StatefulWidget {
- @override
- _CameraAppState createState() => _CameraAppState();
-}
-
-class _CameraAppState extends State<CameraApp> {
- CameraController controller;
-
- @override
- void initState() {
- super.initState();
- controller = CameraController(cameras[0], ResolutionPreset.medium);
- controller.initialize().then((_) {
- if (!mounted) {
- return;
- }
- setState(() {});
- });
- }
-
- @override
- void dispose() {
- controller?.dispose();
- super.dispose();
- }
-
- @override
- Widget build(BuildContext context) {
- if (!controller.value.isInitialized) {
- return Container();
- }
- return AspectRatio(
- aspectRatio:
- controller.value.aspectRatio,
- child: CameraPreview(controller));
- }
-}
-```
-
-For a more elaborate usage example see [here](https://github.com/flutter/plugins/tree/master/packages/camera/example).
-
-*Note*: This plugin is still under development, and some APIs might not be available yet.
-[Feedback welcome](https://github.com/flutter/flutter/issues) and
-[Pull Requests](https://github.com/flutter/plugins/pulls) are most welcome!
diff --git a/plugin/camera/analysis_options.yaml b/plugin/camera/analysis_options.yaml
deleted file mode 100755
index 8e4af76..0000000
--- a/plugin/camera/analysis_options.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-# This is a temporary file to allow us to land a new set of linter rules in a
-# series of manageable patches instead of one gigantic PR. It disables some of
-# the new lints that are already failing on this plugin, for this plugin. It
-# should be deleted and the failing lints addressed as soon as possible.
-
-include: ../../analysis_options.yaml
-
-analyzer:
- errors:
- public_member_api_docs: ignore
diff --git a/plugin/camera/android/build.gradle b/plugin/camera/android/build.gradle
deleted file mode 100755
index 95f5a22..0000000
--- a/plugin/camera/android/build.gradle
+++ /dev/null
@@ -1,49 +0,0 @@
-group 'io.flutter.plugins.camera'
-version '1.0-SNAPSHOT'
-
-buildscript {
- repositories {
- google()
- jcenter()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:3.3.0'
- }
-}
-
-rootProject.allprojects {
- repositories {
- google()
- jcenter()
- }
-}
-
-apply plugin: 'com.android.library'
-
-android {
- compileSdkVersion 28
-
- defaultConfig {
- minSdkVersion 21
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
- }
- lintOptions {
- disable 'InvalidPackage'
- }
- compileOptions {
- sourceCompatibility = '1.8'
- targetCompatibility = '1.8'
- }
- dependencies {
- implementation 'androidx.annotation:annotation:1.0.0'
- implementation 'androidx.core:core:1.0.0'
- }
- testOptions {
- unitTests.returnDefaultValues = true
- }
-}
-
-dependencies {
- testImplementation 'junit:junit:4.12'
-}
diff --git a/plugin/camera/android/gradle.properties b/plugin/camera/android/gradle.properties
deleted file mode 100755
index 8bd86f6..0000000
--- a/plugin/camera/android/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-org.gradle.jvmargs=-Xmx1536M
diff --git a/plugin/camera/android/settings.gradle b/plugin/camera/android/settings.gradle
deleted file mode 100755
index 5222c91..0000000
--- a/plugin/camera/android/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = 'camera'
diff --git a/plugin/camera/android/src/main/AndroidManifest.xml b/plugin/camera/android/src/main/AndroidManifest.xml
deleted file mode 100755
index d80d364..0000000
--- a/plugin/camera/android/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="io.flutter.plugins.camera">
- <uses-permission android:name="android.permission.CAMERA"/>
- <uses-permission android:name="android.permission.RECORD_AUDIO"/>
-</manifest>
diff --git a/plugin/camera/android/src/main/java/io/flutter/plugins/camera/Camera.java b/plugin/camera/android/src/main/java/io/flutter/plugins/camera/Camera.java
deleted file mode 100755
index 52e9bda..0000000
--- a/plugin/camera/android/src/main/java/io/flutter/plugins/camera/Camera.java
+++ /dev/null
@@ -1,488 +0,0 @@
-package io.flutter.plugins.camera;
-
-import static android.view.OrientationEventListener.ORIENTATION_UNKNOWN;
-import static io.flutter.plugins.camera.CameraUtils.computeBestPreviewSize;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.ImageFormat;
-import android.graphics.SurfaceTexture;
-import android.hardware.camera2.CameraAccessException;
-import android.hardware.camera2.CameraCaptureSession;
-import android.hardware.camera2.CameraCharacteristics;
-import android.hardware.camera2.CameraDevice;
-import android.hardware.camera2.CameraManager;
-import android.hardware.camera2.CameraMetadata;
-import android.hardware.camera2.CaptureFailure;
-import android.hardware.camera2.CaptureRequest;
-import android.hardware.camera2.params.StreamConfigurationMap;
-import android.media.CamcorderProfile;
-import android.media.Image;
-import android.media.ImageReader;
-import android.media.MediaRecorder;
-import android.os.Build;
-import android.util.Size;
-import android.view.OrientationEventListener;
-import android.view.Surface;
-import androidx.annotation.NonNull;
-import io.flutter.plugin.common.EventChannel;
-import io.flutter.plugin.common.MethodChannel.Result;
-import io.flutter.view.TextureRegistry.SurfaceTextureEntry;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class Camera {
- private final SurfaceTextureEntry flutterTexture;
- private final CameraManager cameraManager;
- private final OrientationEventListener orientationEventListener;
- private final boolean isFrontFacing;
- private final int sensorOrientation;
- private final String cameraName;
- private final Size captureSize;
- private final Size previewSize;
- private final boolean enableAudio;
-
- private CameraDevice cameraDevice;
- private CameraCaptureSession cameraCaptureSession;
- private ImageReader pictureImageReader;
- private ImageReader imageStreamReader;
- private DartMessenger dartMessenger;
- private CaptureRequest.Builder captureRequestBuilder;
- private MediaRecorder mediaRecorder;
- private boolean recordingVideo;
- private CamcorderProfile recordingProfile;
- private int currentOrientation = ORIENTATION_UNKNOWN;
-
- // Mirrors camera.dart
- public enum ResolutionPreset {
- low, medium, high, veryHigh, ultraHigh, max,
- }
-
- public Camera(final Activity activity, final SurfaceTextureEntry flutterTexture,
- final DartMessenger dartMessenger, final String cameraName, final String resolutionPreset,
- final boolean enableAudio) throws CameraAccessException {
- if (activity == null) {
- throw new IllegalStateException("No activity available!");
- }
-
- this.cameraName = cameraName;
- this.enableAudio = enableAudio;
- this.flutterTexture = flutterTexture;
- this.dartMessenger = dartMessenger;
- this.cameraManager = (CameraManager) activity.getSystemService(Context.CAMERA_SERVICE);
- orientationEventListener = new OrientationEventListener(activity.getApplicationContext()) {
- @Override public void onOrientationChanged(int i) {
- if (i == ORIENTATION_UNKNOWN) {
- return;
- }
- // Convert the raw deg angle to the nearest multiple of 90.
- currentOrientation = (int) Math.round(i / 90.0) * 90;
- }
- };
- orientationEventListener.enable();
-
- CameraCharacteristics characteristics = cameraManager.getCameraCharacteristics(cameraName);
- StreamConfigurationMap streamConfigurationMap =
- characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
- //noinspection ConstantConditions
- sensorOrientation = characteristics.get(CameraCharacteristics.SENSOR_ORIENTATION);
- //noinspection ConstantConditions
- isFrontFacing =
- characteristics.get(CameraCharacteristics.LENS_FACING) == CameraMetadata.LENS_FACING_FRONT;
- ResolutionPreset preset = ResolutionPreset.valueOf(resolutionPreset);
- recordingProfile =
- CameraUtils.getBestAvailableCamcorderProfileForResolutionPreset(cameraName, preset);
- captureSize = new Size(recordingProfile.videoFrameWidth, recordingProfile.videoFrameHeight);
- previewSize = computeBestPreviewSize(cameraName, preset);
- }
-
- private void prepareMediaRecorder(String outputFilePath) throws IOException {
- if (mediaRecorder != null) {
- mediaRecorder.release();
- }
- mediaRecorder = new MediaRecorder();
-
- // There's a specific order that mediaRecorder expects. Do not change the order
- // of these function calls.
- if (enableAudio) mediaRecorder.setAudioSource(MediaRecorder.AudioSource.MIC);
- mediaRecorder.setVideoSource(MediaRecorder.VideoSource.SURFACE);
- mediaRecorder.setOutputFormat(recordingProfile.fileFormat);
- if (enableAudio) mediaRecorder.setAudioEncoder(recordingProfile.audioCodec);
- mediaRecorder.setVideoEncoder(recordingProfile.videoCodec);
- mediaRecorder.setVideoEncodingBitRate(recordingProfile.videoBitRate);
- if (enableAudio) mediaRecorder.setAudioSamplingRate(recordingProfile.audioSampleRate);
- mediaRecorder.setVideoFrameRate(recordingProfile.videoFrameRate);
- mediaRecorder.setVideoSize(recordingProfile.videoFrameWidth, recordingProfile.videoFrameHeight);
- mediaRecorder.setOutputFile(outputFilePath);
- mediaRecorder.setOrientationHint(getMediaOrientation());
-
- mediaRecorder.prepare();
- }
-
- @SuppressLint("MissingPermission") public void open(@NonNull final Result result)
- throws CameraAccessException {
- pictureImageReader =
- ImageReader.newInstance(captureSize.getWidth(), captureSize.getHeight(), ImageFormat.JPEG,
- 2);
-
- // Used to steam image byte data to dart side.
- imageStreamReader = ImageReader.newInstance(previewSize.getWidth(), previewSize.getHeight(),
- ImageFormat.YUV_420_888, 2);
-
- cameraManager.openCamera(cameraName, new CameraDevice.StateCallback() {
- @Override public void onOpened(@NonNull CameraDevice device) {
- cameraDevice = device;
- try {
- startPreview();
- } catch (CameraAccessException e) {
- result.error("CameraAccess", e.getMessage(), null);
- close();
- return;
- }
- Map<String, Object> reply = new HashMap<>();
- reply.put("textureId", flutterTexture.id());
- reply.put("previewWidth", previewSize.getWidth());
- reply.put("previewHeight", previewSize.getHeight());
- result.success(reply);
- }
-
- @Override public void onClosed(@NonNull CameraDevice camera) {
- dartMessenger.sendCameraClosingEvent();
- super.onClosed(camera);
- }
-
- @Override public void onDisconnected(@NonNull CameraDevice cameraDevice) {
- close();
- dartMessenger.send(DartMessenger.EventType.ERROR, "The camera was disconnected.");
- }
-
- @Override public void onError(@NonNull CameraDevice cameraDevice, int errorCode) {
- close();
- String errorDescription;
- switch (errorCode) {
- case ERROR_CAMERA_IN_USE:
- errorDescription = "The camera device is in use already.";
- break;
- case ERROR_MAX_CAMERAS_IN_USE:
- errorDescription = "Max cameras in use";
- break;
- case ERROR_CAMERA_DISABLED:
- errorDescription = "The camera device could not be opened due to a device policy.";
- break;
- case ERROR_CAMERA_DEVICE:
- errorDescription = "The camera device has encountered a fatal error";
- break;
- case ERROR_CAMERA_SERVICE:
- errorDescription = "The camera service has encountered a fatal error.";
- break;
- default:
- errorDescription = "Unknown camera error";
- }
- dartMessenger.send(DartMessenger.EventType.ERROR, errorDescription);
- }
- }, null);
- }
-
- private void writeToFile(ByteBuffer buffer, File file) throws IOException {
- try (FileOutputStream outputStream = new FileOutputStream(file)) {
- while (0 < buffer.remaining()) {
- outputStream.getChannel().write(buffer);
- }
- }
- }
-
- SurfaceTextureEntry getFlutterTexture() {
- return flutterTexture;
- }
-
- public void takePicture(String filePath, @NonNull final Result result) {
- final File file = new File(filePath);
-
- if (file.exists()) {
- result.error("fileExists",
- "File at path '" + filePath + "' already exists. Cannot overwrite.", null);
- return;
- }
-
- pictureImageReader.setOnImageAvailableListener(reader -> {
- try (Image image = reader.acquireLatestImage()) {
- ByteBuffer buffer = image.getPlanes()[0].getBuffer();
- writeToFile(buffer, file);
- result.success(null);
- } catch (IOException e) {
- result.error("IOError", "Failed saving image", null);
- }
- }, null);
-
- try {
- final CaptureRequest.Builder captureBuilder =
- cameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_STILL_CAPTURE);
- captureBuilder.addTarget(pictureImageReader.getSurface());
- captureBuilder.set(CaptureRequest.JPEG_ORIENTATION, getMediaOrientation());
-
- cameraCaptureSession.capture(captureBuilder.build(),
- new CameraCaptureSession.CaptureCallback() {
- @Override public void onCaptureFailed(@NonNull CameraCaptureSession session,
- @NonNull CaptureRequest request, @NonNull CaptureFailure failure) {
- String reason;
- switch (failure.getReason()) {
- case CaptureFailure.REASON_ERROR:
- reason = "An error happened in the framework";
- break;
- case CaptureFailure.REASON_FLUSHED:
- reason = "The capture has failed due to an abortCaptures() call";
- break;
- default:
- reason = "Unknown reason";
- }
- result.error("captureFailure", reason, null);
- }
- }, null);
- } catch (CameraAccessException e) {
- result.error("cameraAccess", e.getMessage(), null);
- }
- }
-
- private void createCaptureSession(int templateType, Surface... surfaces)
- throws CameraAccessException {
- createCaptureSession(templateType, null, surfaces);
- }
-
- private void createCaptureSession(int templateType, Runnable onSuccessCallback,
- Surface... surfaces) throws CameraAccessException {
- // Close any existing capture session.
- closeCaptureSession();
-
- // Create a new capture builder.
- captureRequestBuilder = cameraDevice.createCaptureRequest(templateType);
-
- // Build Flutter surface to render to
- SurfaceTexture surfaceTexture = flutterTexture.surfaceTexture();
- surfaceTexture.setDefaultBufferSize(previewSize.getWidth(), previewSize.getHeight());
- Surface flutterSurface = new Surface(surfaceTexture);
- captureRequestBuilder.addTarget(flutterSurface);
-
- List<Surface> remainingSurfaces = Arrays.asList(surfaces);
- if (templateType != CameraDevice.TEMPLATE_PREVIEW) {
- // If it is not preview mode, add all surfaces as targets.
- for (Surface surface : remainingSurfaces) {
- captureRequestBuilder.addTarget(surface);
- }
- }
-
- // Prepare the callback
- CameraCaptureSession.StateCallback callback = new CameraCaptureSession.StateCallback() {
- @Override public void onConfigured(@NonNull CameraCaptureSession session) {
- try {
- if (cameraDevice == null) {
- dartMessenger.send(DartMessenger.EventType.ERROR,
- "The camera was closed during configuration.");
- return;
- }
- cameraCaptureSession = session;
- captureRequestBuilder.set(CaptureRequest.CONTROL_MODE, CameraMetadata.CONTROL_MODE_AUTO);
- cameraCaptureSession.setRepeatingRequest(captureRequestBuilder.build(), null, null);
- if (onSuccessCallback != null) {
- onSuccessCallback.run();
- }
- } catch (CameraAccessException | IllegalStateException | IllegalArgumentException e) {
- dartMessenger.send(DartMessenger.EventType.ERROR, e.getMessage());
- }
- }
-
- @Override public void onConfigureFailed(@NonNull CameraCaptureSession cameraCaptureSession) {
- dartMessenger.send(DartMessenger.EventType.ERROR, "Failed to configure camera session.");
- }
- };
-
- // Collect all surfaces we want to render to.
- List<Surface> surfaceList = new ArrayList<>();
- surfaceList.add(flutterSurface);
- surfaceList.addAll(remainingSurfaces);
- // Start the session
- cameraDevice.createCaptureSession(surfaceList, callback, null);
- }
-
- public void startVideoRecording(String filePath, Result result) {
- if (new File(filePath).exists()) {
- result.error("fileExists", "File at path '" + filePath + "' already exists.", null);
- return;
- }
- try {
- prepareMediaRecorder(filePath);
- recordingVideo = true;
- createCaptureSession(CameraDevice.TEMPLATE_RECORD, () -> mediaRecorder.start(),
- mediaRecorder.getSurface());
- result.success(null);
- } catch (CameraAccessException | IOException e) {
- result.error("videoRecordingFailed", e.getMessage(), null);
- }
- }
-
- public void stopVideoRecording(@NonNull final Result result) {
- if (!recordingVideo) {
- result.success(null);
- return;
- }
-
- try {
- recordingVideo = false;
- try {
- Camera.this.cameraCaptureSession.stopRepeating();
- Camera.this.cameraCaptureSession.abortCaptures();
- //cameraCaptureSession.stopRepeating();
- //cameraCaptureSession.abortCaptures();
- } catch (CameraAccessException e) {
- result.error("cameraException", e.getMessage(), null);
- }
- mediaRecorder.stop();
- mediaRecorder.reset();
- startPreview();
- result.success(null);
- } catch (CameraAccessException | IllegalStateException e) {
- result.error("videoRecordingFailed", e.getMessage(), null);
- }
- }
-
- public void pauseVideoRecording(@NonNull final Result result) {
- if (!recordingVideo) {
- result.success(null);
- return;
- }
-
- try {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
- mediaRecorder.pause();
- } else {
- result.error("videoRecordingFailed", "pauseVideoRecording requires Android API +24.", null);
- return;
- }
- } catch (IllegalStateException e) {
- result.error("videoRecordingFailed", e.getMessage(), null);
- return;
- }
-
- result.success(null);
- }
-
- public void resumeVideoRecording(@NonNull final Result result) {
- if (!recordingVideo) {
- result.success(null);
- return;
- }
-
- try {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
- mediaRecorder.resume();
- } else {
- result.error("videoRecordingFailed", "resumeVideoRecording requires Android API +24.",
- null);
- return;
- }
- } catch (IllegalStateException e) {
- result.error("videoRecordingFailed", e.getMessage(), null);
- return;
- }
-
- result.success(null);
- }
-
- public void startPreview() throws CameraAccessException {
- createCaptureSession(CameraDevice.TEMPLATE_PREVIEW, pictureImageReader.getSurface());
- }
-
- public void startPreviewWithImageStream(EventChannel imageStreamChannel)
- throws CameraAccessException {
- createCaptureSession(CameraDevice.TEMPLATE_RECORD, imageStreamReader.getSurface());
-
- imageStreamChannel.setStreamHandler(new EventChannel.StreamHandler() {
- @Override public void onListen(Object o, EventChannel.EventSink imageStreamSink) {
- setImageStreamImageAvailableListener(imageStreamSink);
- }
-
- @Override public void onCancel(Object o) {
- imageStreamReader.setOnImageAvailableListener(null, null);
- }
- });
- }
-
- private void setImageStreamImageAvailableListener(final EventChannel.EventSink imageStreamSink) {
- imageStreamReader.setOnImageAvailableListener(reader -> {
- Image img = reader.acquireLatestImage();
- if (img == null) return;
-
- List<Map<String, Object>> planes = new ArrayList<>();
- for (Image.Plane plane : img.getPlanes()) {
- ByteBuffer buffer = plane.getBuffer();
-
- byte[] bytes = new byte[buffer.remaining()];
- buffer.get(bytes, 0, bytes.length);
-
- Map<String, Object> planeBuffer = new HashMap<>();
- planeBuffer.put("bytesPerRow", plane.getRowStride());
- planeBuffer.put("bytesPerPixel", plane.getPixelStride());
- planeBuffer.put("bytes", bytes);
-
- planes.add(planeBuffer);
- }
-
- Map<String, Object> imageBuffer = new HashMap<>();
- imageBuffer.put("width", img.getWidth());
- imageBuffer.put("height", img.getHeight());
- imageBuffer.put("format", img.getFormat());
- imageBuffer.put("planes", planes);
-
- imageStreamSink.success(imageBuffer);
- img.close();
- }, null);
- }
-
- private void closeCaptureSession() {
- if (cameraCaptureSession != null) {
- cameraCaptureSession.close();
- cameraCaptureSession = null;
- }
- }
-
- public void close() {
- closeCaptureSession();
-
- if (cameraDevice != null) {
- cameraDevice.close();
- cameraDevice = null;
- }
- if (pictureImageReader != null) {
- pictureImageReader.close();
- pictureImageReader = null;
- }
- if (imageStreamReader != null) {
- imageStreamReader.close();
- imageStreamReader = null;
- }
- if (mediaRecorder != null) {
- mediaRecorder.reset();
- mediaRecorder.release();
- mediaRecorder = null;
- }
- }
-
- public void dispose() {
- close();
- flutterTexture.release();
- orientationEventListener.disable();
- }
-
- private int getMediaOrientation() {
- final int sensorOrientationOffset = (currentOrientation == ORIENTATION_UNKNOWN) ? 0
- : (isFrontFacing) ? -currentOrientation : currentOrientation;
- return (sensorOrientationOffset + sensorOrientation + 360) % 360;
- }
-}
diff --git a/plugin/camera/android/src/main/java/io/flutter/plugins/camera/CameraPermissions.java b/plugin/camera/android/src/main/java/io/flutter/plugins/camera/CameraPermissions.java
deleted file mode 100755
index c1c3fa8..0000000
--- a/plugin/camera/android/src/main/java/io/flutter/plugins/camera/CameraPermissions.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package io.flutter.plugins.camera;
-
-import android.Manifest;
-import android.Manifest.permission;
-import android.app.Activity;
-import android.content.pm.PackageManager;
-import androidx.annotation.VisibleForTesting;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-import io.flutter.plugin.common.PluginRegistry;
-import io.flutter.plugin.common.PluginRegistry.RequestPermissionsResultListener;
-
-final class CameraPermissions {
- interface PermissionsRegistry {
- void addListener(RequestPermissionsResultListener handler);
- }
-
- interface ResultCallback {
- void onResult(String errorCode, String errorDescription);
- }
-
- private static final int CAMERA_REQUEST_ID = 9796;
- private boolean ongoing = false;
-
- void requestPermissions(
- Activity activity,
- PermissionsRegistry permissionsRegistry,
- boolean enableAudio,
- ResultCallback callback) {
- if (ongoing) {
- callback.onResult("cameraPermission", "Camera permission request ongoing");
- }
- if (!hasCameraPermission(activity) || (enableAudio && !hasAudioPermission(activity))) {
- permissionsRegistry.addListener(
- new CameraRequestPermissionsListener(
- (String errorCode, String errorDescription) -> {
- ongoing = false;
- callback.onResult(errorCode, errorDescription);
- }));
- ongoing = true;
- ActivityCompat.requestPermissions(
- activity,
- enableAudio
- ? new String[] {Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO}
- : new String[] {Manifest.permission.CAMERA},
- CAMERA_REQUEST_ID);
- } else {
- // Permissions already exist. Call the callback with success.
- callback.onResult(null, null);
- }
- }
-
- private boolean hasCameraPermission(Activity activity) {
- return ContextCompat.checkSelfPermission(activity, permission.CAMERA)
- == PackageManager.PERMISSION_GRANTED;
- }
-
- private boolean hasAudioPermission(Activity activity) {
- return ContextCompat.checkSelfPermission(activity, permission.RECORD_AUDIO)
- == PackageManager.PERMISSION_GRANTED;
- }
-
- @VisibleForTesting
- static final class CameraRequestPermissionsListener
- implements PluginRegistry.RequestPermissionsResultListener {
-
- // There's no way to unregister permission listeners in the v1 embedding, so we'll be called
- // duplicate times in cases where the user denies and then grants a permission. Keep track of if
- // we've responded before and bail out of handling the callback manually if this is a repeat
- // call.
- boolean alreadyCalled = false;
-
- final ResultCallback callback;
-
- @VisibleForTesting
- CameraRequestPermissionsListener(ResultCallback callback) {
- this.callback = callback;
- }
-
- @Override
- public boolean onRequestPermissionsResult(int id, String[] permissions, int[] grantResults) {
- if (alreadyCalled || id != CAMERA_REQUEST_ID) {
- return false;
- }
-
- alreadyCalled = true;
- if (grantResults[0] != PackageManager.PERMISSION_GRANTED) {
- callback.onResult("cameraPermission", "MediaRecorderCamera permission not granted");
- } else if (grantResults.length > 1 && grantResults[1] != PackageManager.PERMISSION_GRANTED) {
- callback.onResult("cameraPermission", "MediaRecorderAudio permission not granted");
- } else {
- callback.onResult(null, null);
- }
- return true;
- }
- }
-}
diff --git a/plugin/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java b/plugin/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
deleted file mode 100755
index 2511898..0000000
--- a/plugin/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package io.flutter.plugins.camera;
-
-import android.app.Activity;
-import android.os.Build;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import io.flutter.embedding.engine.plugins.FlutterPlugin;
-import io.flutter.embedding.engine.plugins.activity.ActivityAware;
-import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
-import io.flutter.plugin.common.BinaryMessenger;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
-import io.flutter.plugins.camera.CameraPermissions.PermissionsRegistry;
-import io.flutter.view.TextureRegistry;
-
-/**
- * Platform implementation of the camera_plugin.
- *
- * <p>Instantiate this in an add to app scenario to gracefully handle activity and context changes.
- * See {@code io.flutter.plugins.camera.MainActivity} for an example.
- *
- * <p>Call {@link #registerWith(Registrar)} to register an implementation of this that uses the
- * stable {@code io.flutter.plugin.common} package.
- */
-public final class CameraPlugin implements FlutterPlugin, ActivityAware {
-
- private static final String TAG = "CameraPlugin";
- private @Nullable FlutterPluginBinding flutterPluginBinding;
- private @Nullable MethodCallHandlerImpl methodCallHandler;
-
- /**
- * Initialize this within the {@code #configureFlutterEngine} of a Flutter activity or fragment.
- *
- * <p>See {@code io.flutter.plugins.camera.MainActivity} for an example.
- */
- public CameraPlugin() {}
-
- /**
- * Registers a plugin implementation that uses the stable {@code io.flutter.plugin.common}
- * package.
- *
- * <p>Calling this automatically initializes the plugin. However plugins initialized this way
- * won't react to changes in activity or context, unlike {@link CameraPlugin}.
- */
- public static void registerWith(Registrar registrar) {
- CameraPlugin plugin = new CameraPlugin();
- plugin.maybeStartListening(
- registrar.activity(),
- registrar.messenger(),
- registrar::addRequestPermissionsResultListener,
- registrar.view());
- }
-
- @Override
- public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) {
- this.flutterPluginBinding = binding;
- }
-
- @Override
- public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
- this.flutterPluginBinding = null;
- }
-
- @Override
- public void onAttachedToActivity(@NonNull ActivityPluginBinding binding) {
- maybeStartListening(
- binding.getActivity(),
- flutterPluginBinding.getBinaryMessenger(),
- binding::addRequestPermissionsResultListener,
- flutterPluginBinding.getFlutterEngine().getRenderer());
- }
-
- @Override
- public void onDetachedFromActivity() {
- if (methodCallHandler == null) {
- // Could be on too low of an SDK to have started listening originally.
- return;
- }
-
- methodCallHandler.stopListening();
- methodCallHandler = null;
- }
-
- @Override
- public void onReattachedToActivityForConfigChanges(@NonNull ActivityPluginBinding binding) {
- onAttachedToActivity(binding);
- }
-
- @Override
- public void onDetachedFromActivityForConfigChanges() {
- onDetachedFromActivity();
- }
-
- private void maybeStartListening(
- Activity activity,
- BinaryMessenger messenger,
- PermissionsRegistry permissionsRegistry,
- TextureRegistry textureRegistry) {
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
- // If the sdk is less than 21 (min sdk for Camera2) we don't register the plugin.
- return;
- }
-
- methodCallHandler =
- new MethodCallHandlerImpl(
- activity, messenger, new CameraPermissions(), permissionsRegistry, textureRegistry);
- }
-}
diff --git a/plugin/camera/android/src/main/java/io/flutter/plugins/camera/CameraUtils.java b/plugin/camera/android/src/main/java/io/flutter/plugins/camera/CameraUtils.java
deleted file mode 100755
index a7bb3b7..0000000
--- a/plugin/camera/android/src/main/java/io/flutter/plugins/camera/CameraUtils.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package io.flutter.plugins.camera;
-
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.ImageFormat;
-import android.hardware.camera2.CameraAccessException;
-import android.hardware.camera2.CameraCharacteristics;
-import android.hardware.camera2.CameraManager;
-import android.hardware.camera2.CameraMetadata;
-import android.hardware.camera2.params.StreamConfigurationMap;
-import android.media.CamcorderProfile;
-import android.util.Size;
-import io.flutter.plugins.camera.Camera.ResolutionPreset;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/** Provides various utilities for camera. */
-public final class CameraUtils {
-
- private CameraUtils() {}
-
- static Size computeBestPreviewSize(String cameraName, ResolutionPreset preset) {
- if (preset.ordinal() > ResolutionPreset.high.ordinal()) {
- preset = ResolutionPreset.high;
- }
-
- CamcorderProfile profile =
- getBestAvailableCamcorderProfileForResolutionPreset(cameraName, preset);
- return new Size(profile.videoFrameWidth, profile.videoFrameHeight);
- }
-
- static Size computeBestCaptureSize(StreamConfigurationMap streamConfigurationMap) {
- // For still image captures, we use the largest available size.
- return Collections.max(
- Arrays.asList(streamConfigurationMap.getOutputSizes(ImageFormat.JPEG)),
- new CompareSizesByArea());
- }
-
- public static List<Map<String, Object>> getAvailableCameras(Activity activity)
- throws CameraAccessException {
- CameraManager cameraManager = (CameraManager) activity.getSystemService(Context.CAMERA_SERVICE);
- String[] cameraNames = cameraManager.getCameraIdList();
- List<Map<String, Object>> cameras = new ArrayList<>();
- for (String cameraName : cameraNames) {
- HashMap<String, Object> details = new HashMap<>();
- CameraCharacteristics characteristics = cameraManager.getCameraCharacteristics(cameraName);
- details.put("name", cameraName);
- int sensorOrientation = characteristics.get(CameraCharacteristics.SENSOR_ORIENTATION);
- details.put("sensorOrientation", sensorOrientation);
-
- int lensFacing = characteristics.get(CameraCharacteristics.LENS_FACING);
- switch (lensFacing) {
- case CameraMetadata.LENS_FACING_FRONT:
- details.put("lensFacing", "front");
- break;
- case CameraMetadata.LENS_FACING_BACK:
- details.put("lensFacing", "back");
- break;
- case CameraMetadata.LENS_FACING_EXTERNAL:
- details.put("lensFacing", "external");
- break;
- }
- cameras.add(details);
- }
- return cameras;
- }
-
- static CamcorderProfile getBestAvailableCamcorderProfileForResolutionPreset(
- String cameraName, ResolutionPreset preset) {
- int cameraId = Integer.parseInt(cameraName);
- switch (preset) {
- // All of these cases deliberately fall through to get the best available profile.
- case max:
- if (CamcorderProfile.hasProfile(cameraId, CamcorderProfile.QUALITY_HIGH)) {
- return CamcorderProfile.get(cameraId, CamcorderProfile.QUALITY_HIGH);
- }
- case ultraHigh:
- if (CamcorderProfile.hasProfile(cameraId, CamcorderProfile.QUALITY_2160P)) {
- return CamcorderProfile.get(cameraId, CamcorderProfile.QUALITY_2160P);
- }
- case veryHigh:
- if (CamcorderProfile.hasProfile(cameraId, CamcorderProfile.QUALITY_1080P)) {
- return CamcorderProfile.get(cameraId, CamcorderProfile.QUALITY_1080P);
- }
- case high:
- if (CamcorderProfile.hasProfile(cameraId, CamcorderProfile.QUALITY_720P)) {
- return CamcorderProfile.get(cameraId, CamcorderProfile.QUALITY_720P);
- }
- case medium:
- if (CamcorderProfile.hasProfile(cameraId, CamcorderProfile.QUALITY_480P)) {
- return CamcorderProfile.get(cameraId, CamcorderProfile.QUALITY_480P);
- }
- case low:
- if (CamcorderProfile.hasProfile(cameraId, CamcorderProfile.QUALITY_QVGA)) {
- return CamcorderProfile.get(cameraId, CamcorderProfile.QUALITY_QVGA);
- }
- default:
- if (CamcorderProfile.hasProfile(cameraId, CamcorderProfile.QUALITY_LOW)) {
- return CamcorderProfile.get(cameraId, CamcorderProfile.QUALITY_LOW);
- } else {
- throw new IllegalArgumentException(
- "No capture session available for current capture session.");
- }
- }
- }
-
- private static class CompareSizesByArea implements Comparator<Size> {
- @Override
- public int compare(Size lhs, Size rhs) {
- // We cast here to ensure the multiplications won't overflow.
- return Long.signum(
- (long) lhs.getWidth() * lhs.getHeight() - (long) rhs.getWidth() * rhs.getHeight());
- }
- }
-}
diff --git a/plugin/camera/android/src/main/java/io/flutter/plugins/camera/DartMessenger.java b/plugin/camera/android/src/main/java/io/flutter/plugins/camera/DartMessenger.java
deleted file mode 100755
index fe385be..0000000
--- a/plugin/camera/android/src/main/java/io/flutter/plugins/camera/DartMessenger.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package io.flutter.plugins.camera;
-
-import android.text.TextUtils;
-import androidx.annotation.Nullable;
-import io.flutter.plugin.common.BinaryMessenger;
-import io.flutter.plugin.common.EventChannel;
-import java.util.HashMap;
-import java.util.Map;
-
-class DartMessenger {
- @Nullable private EventChannel.EventSink eventSink;
-
- enum EventType {
- ERROR,
- CAMERA_CLOSING,
- }
-
- DartMessenger(BinaryMessenger messenger, long eventChannelId) {
- new EventChannel(messenger, "flutter.io/cameraPlugin/cameraEvents" + eventChannelId)
- .setStreamHandler(
- new EventChannel.StreamHandler() {
- @Override
- public void onListen(Object arguments, EventChannel.EventSink sink) {
- eventSink = sink;
- }
-
- @Override
- public void onCancel(Object arguments) {
- eventSink = null;
- }
- });
- }
-
- void sendCameraClosingEvent() {
- send(EventType.CAMERA_CLOSING, null);
- }
-
- void send(EventType eventType, @Nullable String description) {
- if (eventSink == null) {
- return;
- }
-
- Map<String, String> event = new HashMap<>();
- event.put("eventType", eventType.toString().toLowerCase());
- // Only errors have a description.
- if (eventType == EventType.ERROR && !TextUtils.isEmpty(description)) {
- event.put("errorDescription", description);
- }
- eventSink.success(event);
- }
-}
diff --git a/plugin/camera/android/src/main/java/io/flutter/plugins/camera/MethodCallHandlerImpl.java b/plugin/camera/android/src/main/java/io/flutter/plugins/camera/MethodCallHandlerImpl.java
deleted file mode 100755
index cb58d19..0000000
--- a/plugin/camera/android/src/main/java/io/flutter/plugins/camera/MethodCallHandlerImpl.java
+++ /dev/null
@@ -1,174 +0,0 @@
-package io.flutter.plugins.camera;
-
-import android.app.Activity;
-import android.hardware.camera2.CameraAccessException;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import io.flutter.plugin.common.BinaryMessenger;
-import io.flutter.plugin.common.EventChannel;
-import io.flutter.plugin.common.MethodCall;
-import io.flutter.plugin.common.MethodChannel;
-import io.flutter.plugin.common.MethodChannel.Result;
-import io.flutter.plugins.camera.CameraPermissions.PermissionsRegistry;
-import io.flutter.view.TextureRegistry;
-
-final class MethodCallHandlerImpl implements MethodChannel.MethodCallHandler {
- private final Activity activity;
- private final BinaryMessenger messenger;
- private final CameraPermissions cameraPermissions;
- private final PermissionsRegistry permissionsRegistry;
- private final TextureRegistry textureRegistry;
- private final MethodChannel methodChannel;
- private final EventChannel imageStreamChannel;
- private @Nullable Camera camera;
-
- MethodCallHandlerImpl(
- Activity activity,
- BinaryMessenger messenger,
- CameraPermissions cameraPermissions,
- PermissionsRegistry permissionsAdder,
- TextureRegistry textureRegistry) {
- this.activity = activity;
- this.messenger = messenger;
- this.cameraPermissions = cameraPermissions;
- this.permissionsRegistry = permissionsAdder;
- this.textureRegistry = textureRegistry;
-
- methodChannel = new MethodChannel(messenger, "plugins.flutter.io/camera");
- imageStreamChannel = new EventChannel(messenger, "plugins.flutter.io/camera/imageStream");
- methodChannel.setMethodCallHandler(this);
- }
-
- @Override
- public void onMethodCall(@NonNull MethodCall call, @NonNull final Result result) {
- switch (call.method) {
- case "availableCameras":
- try {
- result.success(CameraUtils.getAvailableCameras(activity));
- } catch (Exception e) {
- handleException(e, result);
- }
- break;
- case "initialize":
- {
- if (camera != null) {
- camera.close();
- }
- cameraPermissions.requestPermissions(
- activity,
- permissionsRegistry,
- call.argument("enableAudio"),
- (String errCode, String errDesc) -> {
- if (errCode == null) {
- try {
- instantiateCamera(call, result);
- } catch (Exception e) {
- handleException(e, result);
- }
- } else {
- result.error(errCode, errDesc, null);
- }
- });
-
- break;
- }
- case "takePicture":
- {
- camera.takePicture(call.argument("path"), result);
- break;
- }
- case "prepareForVideoRecording":
- {
- // This optimization is not required for Android.
- result.success(null);
- break;
- }
- case "startVideoRecording":
- {
- camera.startVideoRecording(call.argument("filePath"), result);
- break;
- }
- case "stopVideoRecording":
- {
- camera.stopVideoRecording(result);
- break;
- }
- case "pauseVideoRecording":
- {
- camera.pauseVideoRecording(result);
- break;
- }
- case "resumeVideoRecording":
- {
- camera.resumeVideoRecording(result);
- break;
- }
- case "startImageStream":
- {
- try {
- camera.startPreviewWithImageStream(imageStreamChannel);
- result.success(null);
- } catch (Exception e) {
- handleException(e, result);
- }
- break;
- }
- case "stopImageStream":
- {
- try {
- camera.startPreview();
- result.success(null);
- } catch (Exception e) {
- handleException(e, result);
- }
- break;
- }
- case "dispose":
- {
- if (camera != null) {
- camera.dispose();
- }
- result.success(null);
- break;
- }
- default:
- result.notImplemented();
- break;
- }
- }
-
- void stopListening() {
- methodChannel.setMethodCallHandler(null);
- }
-
- private void instantiateCamera(MethodCall call, Result result) throws CameraAccessException {
- String cameraName = call.argument("cameraName");
- String resolutionPreset = call.argument("resolutionPreset");
- boolean enableAudio = call.argument("enableAudio");
- TextureRegistry.SurfaceTextureEntry flutterSurfaceTexture =
- textureRegistry.createSurfaceTexture();
- DartMessenger dartMessenger = new DartMessenger(messenger, flutterSurfaceTexture.id());
- camera =
- new Camera(
- activity,
- flutterSurfaceTexture,
- dartMessenger,
- cameraName,
- resolutionPreset,
- enableAudio);
-
- camera.open(result);
- }
-
- // We move catching CameraAccessException out of onMethodCall because it causes a crash
- // on plugin registration for sdks incompatible with Camera2 (< 21). We want this plugin to
- // to be able to compile with <21 sdks for apps that want the camera and support earlier version.
- @SuppressWarnings("ConstantConditions")
- private void handleException(Exception exception, Result result) {
- if (exception instanceof CameraAccessException) {
- result.error("CameraAccess", exception.getMessage(), null);
- }
-
- throw (RuntimeException) exception;
- }
-}
diff --git a/plugin/camera/android/src/test/java/io/flutter/plugins/camera/CameraPermissionsTest.java b/plugin/camera/android/src/test/java/io/flutter/plugins/camera/CameraPermissionsTest.java
deleted file mode 100755
index b622c31..0000000
--- a/plugin/camera/android/src/test/java/io/flutter/plugins/camera/CameraPermissionsTest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.flutter.plugins.camera;
-
-import static junit.framework.TestCase.assertEquals;
-
-import android.content.pm.PackageManager;
-import io.flutter.plugins.camera.CameraPermissions.CameraRequestPermissionsListener;
-import org.junit.Test;
-
-public class CameraPermissionsTest {
- @Test
- public void listener_respondsOnce() {
- final int[] calledCounter = {0};
- CameraRequestPermissionsListener permissionsListener =
- new CameraRequestPermissionsListener((String code, String desc) -> calledCounter[0]++);
-
- permissionsListener.onRequestPermissionsResult(
- 9796, null, new int[] {PackageManager.PERMISSION_DENIED});
- permissionsListener.onRequestPermissionsResult(
- 9796, null, new int[] {PackageManager.PERMISSION_GRANTED});
-
- assertEquals(1, calledCounter[0]);
- }
-}
diff --git a/plugin/camera/android/src/test/java/io/flutter/plugins/camera/DartMessengerTest.java b/plugin/camera/android/src/test/java/io/flutter/plugins/camera/DartMessengerTest.java
deleted file mode 100755
index db89eb2..0000000
--- a/plugin/camera/android/src/test/java/io/flutter/plugins/camera/DartMessengerTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package io.flutter.plugins.camera;
-
-import static junit.framework.TestCase.assertNull;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import io.flutter.plugin.common.BinaryMessenger;
-import io.flutter.plugin.common.MethodCall;
-import io.flutter.plugin.common.StandardMethodCodec;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import org.junit.Before;
-import org.junit.Test;
-
-public class DartMessengerTest {
- /** A {@link BinaryMessenger} implementation that does nothing but save its messages. */
- private static class FakeBinaryMessenger implements BinaryMessenger {
- private BinaryMessageHandler handler;
- private final List<ByteBuffer> sentMessages = new ArrayList<>();
-
- @Override
- public void send(String channel, ByteBuffer message) {
- sentMessages.add(message);
- }
-
- @Override
- public void send(String channel, ByteBuffer message, BinaryReply callback) {
- send(channel, message);
- }
-
- @Override
- public void setMessageHandler(String channel, BinaryMessageHandler handler) {
- this.handler = handler;
- }
-
- BinaryMessageHandler getMessageHandler() {
- return handler;
- }
-
- List<ByteBuffer> getMessages() {
- return new ArrayList<>(sentMessages);
- }
- }
-
- private DartMessenger dartMessenger;
- private FakeBinaryMessenger fakeBinaryMessenger;
-
- @Before
- public void setUp() {
- fakeBinaryMessenger = new FakeBinaryMessenger();
- dartMessenger = new DartMessenger(fakeBinaryMessenger, 0);
- }
-
- @Test
- public void setsStreamHandler() {
- assertNotNull(fakeBinaryMessenger.getMessageHandler());
- }
-
- @Test
- public void send_handlesNullEventSinks() {
- dartMessenger.send(DartMessenger.EventType.ERROR, "error description");
-
- List<ByteBuffer> sentMessages = fakeBinaryMessenger.getMessages();
- assertEquals(0, sentMessages.size());
- }
-
- @Test
- public void send_includesErrorDescriptions() {
- initializeEventSink();
-
- dartMessenger.send(DartMessenger.EventType.ERROR, "error description");
-
- List<ByteBuffer> sentMessages = fakeBinaryMessenger.getMessages();
- assertEquals(1, sentMessages.size());
- Map<String, String> event = decodeSentMessage(sentMessages.get(0));
- assertEquals(DartMessenger.EventType.ERROR.toString().toLowerCase(), event.get("eventType"));
- assertEquals("error description", event.get("errorDescription"));
- }
-
- @Test
- public void sendCameraClosingEvent() {
- initializeEventSink();
-
- dartMessenger.sendCameraClosingEvent();
-
- List<ByteBuffer> sentMessages = fakeBinaryMessenger.getMessages();
- assertEquals(1, sentMessages.size());
- Map<String, String> event = decodeSentMessage(sentMessages.get(0));
- assertEquals(
- DartMessenger.EventType.CAMERA_CLOSING.toString().toLowerCase(), event.get("eventType"));
- assertNull(event.get("errorDescription"));
- }
-
- private Map<String, String> decodeSentMessage(ByteBuffer sentMessage) {
- sentMessage.position(0);
- return (Map<String, String>) StandardMethodCodec.INSTANCE.decodeEnvelope(sentMessage);
- }
-
- private void initializeEventSink() {
- MethodCall call = new MethodCall("listen", null);
- ByteBuffer encodedCall = StandardMethodCodec.INSTANCE.encodeMethodCall(call);
- encodedCall.position(0);
- fakeBinaryMessenger.getMessageHandler().onMessage(encodedCall, reply -> {});
- }
-}
diff --git a/plugin/camera/ios/Classes/CameraPlugin.h b/plugin/camera/ios/Classes/CameraPlugin.h
deleted file mode 100755
index ae865e4..0000000
--- a/plugin/camera/ios/Classes/CameraPlugin.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import <Flutter/Flutter.h>
-
-@interface CameraPlugin : NSObject <FlutterPlugin>
-@end
diff --git a/plugin/camera/ios/Classes/CameraPlugin.m b/plugin/camera/ios/Classes/CameraPlugin.m
deleted file mode 100755
index 42cdb6d..0000000
--- a/plugin/camera/ios/Classes/CameraPlugin.m
+++ /dev/null
@@ -1,904 +0,0 @@
-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import "CameraPlugin.h"
-#import <AVFoundation/AVFoundation.h>
-#import <Accelerate/Accelerate.h>
-#import <CoreMotion/CoreMotion.h>
-#import <libkern/OSAtomic.h>
-
-static FlutterError *getFlutterError(NSError *error) {
- return [FlutterError errorWithCode:[NSString stringWithFormat:@"Error %d", (int)error.code]
- message:error.localizedDescription
- details:error.domain];
-}
-
-@interface FLTSavePhotoDelegate : NSObject <AVCapturePhotoCaptureDelegate>
-@property(readonly, nonatomic) NSString *path;
-@property(readonly, nonatomic) FlutterResult result;
-@property(readonly, nonatomic) CMMotionManager *motionManager;
-@property(readonly, nonatomic) AVCaptureDevicePosition cameraPosition;
-
-- initWithPath:(NSString *)filename
- result:(FlutterResult)result
- motionManager:(CMMotionManager *)motionManager
- cameraPosition:(AVCaptureDevicePosition)cameraPosition;
-@end
-
-@interface FLTImageStreamHandler : NSObject <FlutterStreamHandler>
-@property FlutterEventSink eventSink;
-@end
-
-@implementation FLTImageStreamHandler
-
-- (FlutterError *_Nullable)onCancelWithArguments:(id _Nullable)arguments {
- _eventSink = nil;
- return nil;
-}
-
-- (FlutterError *_Nullable)onListenWithArguments:(id _Nullable)arguments
- eventSink:(nonnull FlutterEventSink)events {
- _eventSink = events;
- return nil;
-}
-@end
-
-@implementation FLTSavePhotoDelegate {
- /// Used to keep the delegate alive until didFinishProcessingPhotoSampleBuffer.
- FLTSavePhotoDelegate *selfReference;
-}
-
-- initWithPath:(NSString *)path
- result:(FlutterResult)result
- motionManager:(CMMotionManager *)motionManager
- cameraPosition:(AVCaptureDevicePosition)cameraPosition {
- self = [super init];
- NSAssert(self, @"super init cannot be nil");
- _path = path;
- _result = result;
- _motionManager = motionManager;
- _cameraPosition = cameraPosition;
- selfReference = self;
- return self;
-}
-
-- (void)captureOutput:(AVCapturePhotoOutput *)output
- didFinishProcessingPhotoSampleBuffer:(CMSampleBufferRef)photoSampleBuffer
- previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
- resolvedSettings:(AVCaptureResolvedPhotoSettings *)resolvedSettings
- bracketSettings:(AVCaptureBracketedStillImageSettings *)bracketSettings
- error:(NSError *)error {
- selfReference = nil;
- if (error) {
- _result(getFlutterError(error));
- return;
- }
- NSData *data = [AVCapturePhotoOutput
- JPEGPhotoDataRepresentationForJPEGSampleBuffer:photoSampleBuffer
- previewPhotoSampleBuffer:previewPhotoSampleBuffer];
- UIImage *image = [UIImage imageWithCGImage:[UIImage imageWithData:data].CGImage
- scale:1.0
- orientation:[self getImageRotation]];
- // TODO(sigurdm): Consider writing file asynchronously.
- bool success = [UIImageJPEGRepresentation(image, 1.0) writeToFile:_path atomically:YES];
- if (!success) {
- _result([FlutterError errorWithCode:@"IOError" message:@"Unable to write file" details:nil]);
- return;
- }
- _result(nil);
-}
-
-- (UIImageOrientation)getImageRotation {
- float const threshold = 45.0;
- BOOL (^isNearValue)(float value1, float value2) = ^BOOL(float value1, float value2) {
- return fabsf(value1 - value2) < threshold;
- };
- BOOL (^isNearValueABS)(float value1, float value2) = ^BOOL(float value1, float value2) {
- return isNearValue(fabsf(value1), fabsf(value2));
- };
- float yxAtan = (atan2(_motionManager.accelerometerData.acceleration.y,
- _motionManager.accelerometerData.acceleration.x)) *
- 180 / M_PI;
- if (isNearValue(-90.0, yxAtan)) {
- return UIImageOrientationRight;
- } else if (isNearValueABS(180.0, yxAtan)) {
- return _cameraPosition == AVCaptureDevicePositionBack ? UIImageOrientationUp
- : UIImageOrientationDown;
- } else if (isNearValueABS(0.0, yxAtan)) {
- return _cameraPosition == AVCaptureDevicePositionBack ? UIImageOrientationDown /*rotate 180* */
- : UIImageOrientationUp /*do not rotate*/;
- } else if (isNearValue(90.0, yxAtan)) {
- return UIImageOrientationLeft;
- }
- // If none of the above, then the device is likely facing straight down or straight up -- just
- // pick something arbitrary
- // TODO: Maybe use the UIInterfaceOrientation if in these scenarios
- return UIImageOrientationUp;
-}
-@end
-
-// Mirrors ResolutionPreset in camera.dart
-typedef enum {
- veryLow,
- low,
- medium,
- high,
- veryHigh,
- ultraHigh,
- max,
-} ResolutionPreset;
-
-static ResolutionPreset getResolutionPresetForString(NSString *preset) {
- if ([preset isEqualToString:@"veryLow"]) {
- return veryLow;
- } else if ([preset isEqualToString:@"low"]) {
- return low;
- } else if ([preset isEqualToString:@"medium"]) {
- return medium;
- } else if ([preset isEqualToString:@"high"]) {
- return high;
- } else if ([preset isEqualToString:@"veryHigh"]) {
- return veryHigh;
- } else if ([preset isEqualToString:@"ultraHigh"]) {
- return ultraHigh;
- } else if ([preset isEqualToString:@"max"]) {
- return max;
- } else {
- NSError *error = [NSError errorWithDomain:NSCocoaErrorDomain
- code:NSURLErrorUnknown
- userInfo:@{
- NSLocalizedDescriptionKey : [NSString
- stringWithFormat:@"Unknown resolution preset %@", preset]
- }];
- @throw error;
- }
-}
-
-@interface FLTCam : NSObject <FlutterTexture,
- AVCaptureVideoDataOutputSampleBufferDelegate,
- AVCaptureAudioDataOutputSampleBufferDelegate,
- FlutterStreamHandler>
-@property(readonly, nonatomic) int64_t textureId;
-@property(nonatomic, copy) void (^onFrameAvailable)();
-@property BOOL enableAudio;
-@property(nonatomic) FlutterEventChannel *eventChannel;
-@property(nonatomic) FLTImageStreamHandler *imageStreamHandler;
-@property(nonatomic) FlutterEventSink eventSink;
-@property(readonly, nonatomic) AVCaptureSession *captureSession;
-@property(readonly, nonatomic) AVCaptureDevice *captureDevice;
-@property(readonly, nonatomic) AVCapturePhotoOutput *capturePhotoOutput;
-@property(readonly, nonatomic) AVCaptureVideoDataOutput *captureVideoOutput;
-@property(readonly, nonatomic) AVCaptureInput *captureVideoInput;
-@property(readonly) CVPixelBufferRef volatile latestPixelBuffer;
-@property(readonly, nonatomic) CGSize previewSize;
-@property(readonly, nonatomic) CGSize captureSize;
-@property(strong, nonatomic) AVAssetWriter *videoWriter;
-@property(strong, nonatomic) AVAssetWriterInput *videoWriterInput;
-@property(strong, nonatomic) AVAssetWriterInput *audioWriterInput;
-@property(strong, nonatomic) AVAssetWriterInputPixelBufferAdaptor *assetWriterPixelBufferAdaptor;
-@property(strong, nonatomic) AVCaptureVideoDataOutput *videoOutput;
-@property(strong, nonatomic) AVCaptureAudioDataOutput *audioOutput;
-@property(assign, nonatomic) BOOL isRecording;
-@property(assign, nonatomic) BOOL isRecordingPaused;
-@property(assign, nonatomic) BOOL videoIsDisconnected;
-@property(assign, nonatomic) BOOL audioIsDisconnected;
-@property(assign, nonatomic) BOOL isAudioSetup;
-@property(assign, nonatomic) BOOL isStreamingImages;
-@property(assign, nonatomic) ResolutionPreset resolutionPreset;
-@property(assign, nonatomic) CMTime lastVideoSampleTime;
-@property(assign, nonatomic) CMTime lastAudioSampleTime;
-@property(assign, nonatomic) CMTime videoTimeOffset;
-@property(assign, nonatomic) CMTime audioTimeOffset;
-@property(nonatomic) CMMotionManager *motionManager;
-@property AVAssetWriterInputPixelBufferAdaptor *videoAdaptor;
-- (instancetype)initWithCameraName:(NSString *)cameraName
- resolutionPreset:(NSString *)resolutionPreset
- enableAudio:(BOOL)enableAudio
- dispatchQueue:(dispatch_queue_t)dispatchQueue
- error:(NSError **)error;
-
-- (void)start;
-- (void)stop;
-- (void)startVideoRecordingAtPath:(NSString *)path result:(FlutterResult)result;
-- (void)stopVideoRecordingWithResult:(FlutterResult)result;
-- (void)startImageStreamWithMessenger:(NSObject<FlutterBinaryMessenger> *)messenger;
-- (void)stopImageStream;
-- (void)captureToFile:(NSString *)filename result:(FlutterResult)result;
-@end
-
-@implementation FLTCam {
- dispatch_queue_t _dispatchQueue;
-}
-// Format used for video and image streaming.
-FourCharCode const videoFormat = kCVPixelFormatType_32BGRA;
-
-- (instancetype)initWithCameraName:(NSString *)cameraName
- resolutionPreset:(NSString *)resolutionPreset
- enableAudio:(BOOL)enableAudio
- dispatchQueue:(dispatch_queue_t)dispatchQueue
- error:(NSError **)error {
- self = [super init];
- NSAssert(self, @"super init cannot be nil");
- @try {
- _resolutionPreset = getResolutionPresetForString(resolutionPreset);
- } @catch (NSError *e) {
- *error = e;
- }
- _enableAudio = enableAudio;
- _dispatchQueue = dispatchQueue;
- _captureSession = [[AVCaptureSession alloc] init];
-
- _captureDevice = [AVCaptureDevice deviceWithUniqueID:cameraName];
- NSError *localError = nil;
- _captureVideoInput = [AVCaptureDeviceInput deviceInputWithDevice:_captureDevice
- error:&localError];
- if (localError) {
- *error = localError;
- return nil;
- }
-
- _captureVideoOutput = [AVCaptureVideoDataOutput new];
- _captureVideoOutput.videoSettings =
- @{(NSString *)kCVPixelBufferPixelFormatTypeKey : @(videoFormat)};
- [_captureVideoOutput setAlwaysDiscardsLateVideoFrames:YES];
- [_captureVideoOutput setSampleBufferDelegate:self queue:dispatch_get_main_queue()];
-
- AVCaptureConnection *connection =
- [AVCaptureConnection connectionWithInputPorts:_captureVideoInput.ports
- output:_captureVideoOutput];
- if ([_captureDevice position] == AVCaptureDevicePositionFront) {
- connection.videoMirrored = YES;
- }
- connection.videoOrientation = AVCaptureVideoOrientationPortrait;
- [_captureSession addInputWithNoConnections:_captureVideoInput];
- [_captureSession addOutputWithNoConnections:_captureVideoOutput];
- [_captureSession addConnection:connection];
- _capturePhotoOutput = [AVCapturePhotoOutput new];
- [_capturePhotoOutput setHighResolutionCaptureEnabled:YES];
- [_captureSession addOutput:_capturePhotoOutput];
- _motionManager = [[CMMotionManager alloc] init];
- [_motionManager startAccelerometerUpdates];
-
- [self setCaptureSessionPreset:_resolutionPreset];
- return self;
-}
-
-- (void)start {
- [_captureSession startRunning];
-}
-
-- (void)stop {
- [_captureSession stopRunning];
-}
-
-- (void)captureToFile:(NSString *)path result:(FlutterResult)result {
- AVCapturePhotoSettings *settings = [AVCapturePhotoSettings photoSettings];
- if (_resolutionPreset == max) {
- [settings setHighResolutionPhotoEnabled:YES];
- }
- [_capturePhotoOutput
- capturePhotoWithSettings:settings
- delegate:[[FLTSavePhotoDelegate alloc] initWithPath:path
- result:result
- motionManager:_motionManager
- cameraPosition:_captureDevice.position]];
-}
-
-- (void)setCaptureSessionPreset:(ResolutionPreset)resolutionPreset {
- switch (resolutionPreset) {
- case max:
- if ([_captureSession canSetSessionPreset:AVCaptureSessionPresetHigh]) {
- _captureSession.sessionPreset = AVCaptureSessionPresetHigh;
- _previewSize =
- CGSizeMake(_captureDevice.activeFormat.highResolutionStillImageDimensions.width,
- _captureDevice.activeFormat.highResolutionStillImageDimensions.height);
- break;
- }
- case ultraHigh:
- if ([_captureSession canSetSessionPreset:AVCaptureSessionPreset3840x2160]) {
- _captureSession.sessionPreset = AVCaptureSessionPreset3840x2160;
- _previewSize = CGSizeMake(3840, 2160);
- break;
- }
- case veryHigh:
- if ([_captureSession canSetSessionPreset:AVCaptureSessionPreset1920x1080]) {
- _captureSession.sessionPreset = AVCaptureSessionPreset1920x1080;
- _previewSize = CGSizeMake(1920, 1080);
- break;
- }
- case high:
- if ([_captureSession canSetSessionPreset:AVCaptureSessionPreset1280x720]) {
- _captureSession.sessionPreset = AVCaptureSessionPreset1280x720;
- _previewSize = CGSizeMake(1280, 720);
- break;
- }
- case medium:
- if ([_captureSession canSetSessionPreset:AVCaptureSessionPreset640x480]) {
- _captureSession.sessionPreset = AVCaptureSessionPreset640x480;
- _previewSize = CGSizeMake(640, 480);
- break;
- }
- case low:
- if ([_captureSession canSetSessionPreset:AVCaptureSessionPreset352x288]) {
- _captureSession.sessionPreset = AVCaptureSessionPreset352x288;
- _previewSize = CGSizeMake(352, 288);
- break;
- }
- default:
- if ([_captureSession canSetSessionPreset:AVCaptureSessionPresetLow]) {
- _captureSession.sessionPreset = AVCaptureSessionPresetLow;
- _previewSize = CGSizeMake(352, 288);
- } else {
- NSError *error =
- [NSError errorWithDomain:NSCocoaErrorDomain
- code:NSURLErrorUnknown
- userInfo:@{
- NSLocalizedDescriptionKey :
- @"No capture session available for current capture session."
- }];
- @throw error;
- }
- }
-}
-
-- (void)captureOutput:(AVCaptureOutput *)output
- didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
- fromConnection:(AVCaptureConnection *)connection {
- if (output == _captureVideoOutput) {
- CVPixelBufferRef newBuffer = CMSampleBufferGetImageBuffer(sampleBuffer);
- CFRetain(newBuffer);
- CVPixelBufferRef old = _latestPixelBuffer;
- while (!OSAtomicCompareAndSwapPtrBarrier(old, newBuffer, (void **)&_latestPixelBuffer)) {
- old = _latestPixelBuffer;
- }
- if (old != nil) {
- CFRelease(old);
- }
- if (_onFrameAvailable) {
- _onFrameAvailable();
- }
- }
- if (!CMSampleBufferDataIsReady(sampleBuffer)) {
- _eventSink(@{
- @"event" : @"error",
- @"errorDescription" : @"sample buffer is not ready. Skipping sample"
- });
- return;
- }
- if (_isStreamingImages) {
- if (_imageStreamHandler.eventSink) {
- CVPixelBufferRef pixelBuffer = CMSampleBufferGetImageBuffer(sampleBuffer);
- CVPixelBufferLockBaseAddress(pixelBuffer, kCVPixelBufferLock_ReadOnly);
-
- size_t imageWidth = CVPixelBufferGetWidth(pixelBuffer);
- size_t imageHeight = CVPixelBufferGetHeight(pixelBuffer);
-
- NSMutableArray *planes = [NSMutableArray array];
-
- const Boolean isPlanar = CVPixelBufferIsPlanar(pixelBuffer);
- size_t planeCount;
- if (isPlanar) {
- planeCount = CVPixelBufferGetPlaneCount(pixelBuffer);
- } else {
- planeCount = 1;
- }
-
- for (int i = 0; i < planeCount; i++) {
- void *planeAddress;
- size_t bytesPerRow;
- size_t height;
- size_t width;
-
- if (isPlanar) {
- planeAddress = CVPixelBufferGetBaseAddressOfPlane(pixelBuffer, i);
- bytesPerRow = CVPixelBufferGetBytesPerRowOfPlane(pixelBuffer, i);
- height = CVPixelBufferGetHeightOfPlane(pixelBuffer, i);
- width = CVPixelBufferGetWidthOfPlane(pixelBuffer, i);
- } else {
- planeAddress = CVPixelBufferGetBaseAddress(pixelBuffer);
- bytesPerRow = CVPixelBufferGetBytesPerRow(pixelBuffer);
- height = CVPixelBufferGetHeight(pixelBuffer);
- width = CVPixelBufferGetWidth(pixelBuffer);
- }
-
- NSNumber *length = @(bytesPerRow * height);
- NSData *bytes = [NSData dataWithBytes:planeAddress length:length.unsignedIntegerValue];
-
- NSMutableDictionary *planeBuffer = [NSMutableDictionary dictionary];
- planeBuffer[@"bytesPerRow"] = @(bytesPerRow);
- planeBuffer[@"width"] = @(width);
- planeBuffer[@"height"] = @(height);
- planeBuffer[@"bytes"] = [FlutterStandardTypedData typedDataWithBytes:bytes];
-
- [planes addObject:planeBuffer];
- }
-
- NSMutableDictionary *imageBuffer = [NSMutableDictionary dictionary];
- imageBuffer[@"width"] = [NSNumber numberWithUnsignedLong:imageWidth];
- imageBuffer[@"height"] = [NSNumber numberWithUnsignedLong:imageHeight];
- imageBuffer[@"format"] = @(videoFormat);
- imageBuffer[@"planes"] = planes;
-
- _imageStreamHandler.eventSink(imageBuffer);
-
- CVPixelBufferUnlockBaseAddress(pixelBuffer, kCVPixelBufferLock_ReadOnly);
- }
- }
- if (_isRecording && !_isRecordingPaused) {
- if (_videoWriter.status == AVAssetWriterStatusFailed) {
- _eventSink(@{
- @"event" : @"error",
- @"errorDescription" : [NSString stringWithFormat:@"%@", _videoWriter.error]
- });
- return;
- }
-
- CFRetain(sampleBuffer);
- CMTime currentSampleTime = CMSampleBufferGetPresentationTimeStamp(sampleBuffer);
-
- if (_videoWriter.status != AVAssetWriterStatusWriting) {
- [_videoWriter startWriting];
- [_videoWriter startSessionAtSourceTime:currentSampleTime];
- }
-
- if (output == _captureVideoOutput) {
- if (_videoIsDisconnected) {
- _videoIsDisconnected = NO;
-
- if (_videoTimeOffset.value == 0) {
- _videoTimeOffset = CMTimeSubtract(currentSampleTime, _lastVideoSampleTime);
- } else {
- CMTime offset = CMTimeSubtract(currentSampleTime, _lastVideoSampleTime);
- _videoTimeOffset = CMTimeAdd(_videoTimeOffset, offset);
- }
-
- return;
- }
-
- _lastVideoSampleTime = currentSampleTime;
-
- CVPixelBufferRef nextBuffer = CMSampleBufferGetImageBuffer(sampleBuffer);
- CMTime nextSampleTime = CMTimeSubtract(_lastVideoSampleTime, _videoTimeOffset);
- [_videoAdaptor appendPixelBuffer:nextBuffer withPresentationTime:nextSampleTime];
- } else {
- CMTime dur = CMSampleBufferGetDuration(sampleBuffer);
-
- if (dur.value > 0) {
- currentSampleTime = CMTimeAdd(currentSampleTime, dur);
- }
-
- if (_audioIsDisconnected) {
- _audioIsDisconnected = NO;
-
- if (_audioTimeOffset.value == 0) {
- _audioTimeOffset = CMTimeSubtract(currentSampleTime, _lastAudioSampleTime);
- } else {
- CMTime offset = CMTimeSubtract(currentSampleTime, _lastAudioSampleTime);
- _audioTimeOffset = CMTimeAdd(_audioTimeOffset, offset);
- }
-
- return;
- }
-
- _lastAudioSampleTime = currentSampleTime;
-
- if (_audioTimeOffset.value != 0) {
- CFRelease(sampleBuffer);
- sampleBuffer = [self adjustTime:sampleBuffer by:_audioTimeOffset];
- }
-
- [self newAudioSample:sampleBuffer];
- }
-
- CFRelease(sampleBuffer);
- }
-}
-
-- (CMSampleBufferRef)adjustTime:(CMSampleBufferRef)sample by:(CMTime)offset {
- CMItemCount count;
- CMSampleBufferGetSampleTimingInfoArray(sample, 0, nil, &count);
- CMSampleTimingInfo *pInfo = malloc(sizeof(CMSampleTimingInfo) * count);
- CMSampleBufferGetSampleTimingInfoArray(sample, count, pInfo, &count);
- for (CMItemCount i = 0; i < count; i++) {
- pInfo[i].decodeTimeStamp = CMTimeSubtract(pInfo[i].decodeTimeStamp, offset);
- pInfo[i].presentationTimeStamp = CMTimeSubtract(pInfo[i].presentationTimeStamp, offset);
- }
- CMSampleBufferRef sout;
- CMSampleBufferCreateCopyWithNewTiming(nil, sample, count, pInfo, &sout);
- free(pInfo);
- return sout;
-}
-
-- (void)newVideoSample:(CMSampleBufferRef)sampleBuffer {
- if (_videoWriter.status != AVAssetWriterStatusWriting) {
- if (_videoWriter.status == AVAssetWriterStatusFailed) {
- _eventSink(@{
- @"event" : @"error",
- @"errorDescription" : [NSString stringWithFormat:@"%@", _videoWriter.error]
- });
- }
- return;
- }
- if (_videoWriterInput.readyForMoreMediaData) {
- if (![_videoWriterInput appendSampleBuffer:sampleBuffer]) {
- _eventSink(@{
- @"event" : @"error",
- @"errorDescription" :
- [NSString stringWithFormat:@"%@", @"Unable to write to video input"]
- });
- }
- }
-}
-
-- (void)newAudioSample:(CMSampleBufferRef)sampleBuffer {
- if (_videoWriter.status != AVAssetWriterStatusWriting) {
- if (_videoWriter.status == AVAssetWriterStatusFailed) {
- _eventSink(@{
- @"event" : @"error",
- @"errorDescription" : [NSString stringWithFormat:@"%@", _videoWriter.error]
- });
- }
- return;
- }
- if (_audioWriterInput.readyForMoreMediaData) {
- if (![_audioWriterInput appendSampleBuffer:sampleBuffer]) {
- _eventSink(@{
- @"event" : @"error",
- @"errorDescription" :
- [NSString stringWithFormat:@"%@", @"Unable to write to audio input"]
- });
- }
- }
-}
-
-- (void)close {
- [_captureSession stopRunning];
- for (AVCaptureInput *input in [_captureSession inputs]) {
- [_captureSession removeInput:input];
- }
- for (AVCaptureOutput *output in [_captureSession outputs]) {
- [_captureSession removeOutput:output];
- }
-}
-
-- (void)dealloc {
- if (_latestPixelBuffer) {
- CFRelease(_latestPixelBuffer);
- }
- [_motionManager stopAccelerometerUpdates];
-}
-
-- (CVPixelBufferRef)copyPixelBuffer {
- CVPixelBufferRef pixelBuffer = _latestPixelBuffer;
- while (!OSAtomicCompareAndSwapPtrBarrier(pixelBuffer, nil, (void **)&_latestPixelBuffer)) {
- pixelBuffer = _latestPixelBuffer;
- }
-
- return pixelBuffer;
-}
-
-- (FlutterError *_Nullable)onCancelWithArguments:(id _Nullable)arguments {
- _eventSink = nil;
- // need to unregister stream handler when disposing the camera
- [_eventChannel setStreamHandler:nil];
- return nil;
-}
-
-- (FlutterError *_Nullable)onListenWithArguments:(id _Nullable)arguments
- eventSink:(nonnull FlutterEventSink)events {
- _eventSink = events;
- return nil;
-}
-
-- (void)startVideoRecordingAtPath:(NSString *)path result:(FlutterResult)result {
- if (!_isRecording) {
- if (![self setupWriterForPath:path]) {
- _eventSink(@{@"event" : @"error", @"errorDescription" : @"Setup Writer Failed"});
- return;
- }
- _isRecording = YES;
- _isRecordingPaused = NO;
- _videoTimeOffset = CMTimeMake(0, 1);
- _audioTimeOffset = CMTimeMake(0, 1);
- _videoIsDisconnected = NO;
- _audioIsDisconnected = NO;
- result(nil);
- } else {
- _eventSink(@{@"event" : @"error", @"errorDescription" : @"Video is already recording!"});
- }
-}
-
-- (void)stopVideoRecordingWithResult:(FlutterResult)result {
- if (_isRecording) {
- _isRecording = NO;
- if (_videoWriter.status != AVAssetWriterStatusUnknown) {
- [_videoWriter finishWritingWithCompletionHandler:^{
- if (self->_videoWriter.status == AVAssetWriterStatusCompleted) {
- result(nil);
- } else {
- self->_eventSink(@{
- @"event" : @"error",
- @"errorDescription" : @"AVAssetWriter could not finish writing!"
- });
- }
- }];
- }
- } else {
- NSError *error =
- [NSError errorWithDomain:NSCocoaErrorDomain
- code:NSURLErrorResourceUnavailable
- userInfo:@{NSLocalizedDescriptionKey : @"Video is not recording!"}];
- result(getFlutterError(error));
- }
-}
-
-- (void)pauseVideoRecording {
- _isRecordingPaused = YES;
- _videoIsDisconnected = YES;
- _audioIsDisconnected = YES;
-}
-
-- (void)resumeVideoRecording {
- _isRecordingPaused = NO;
-}
-
-- (void)startImageStreamWithMessenger:(NSObject<FlutterBinaryMessenger> *)messenger {
- if (!_isStreamingImages) {
- FlutterEventChannel *eventChannel =
- [FlutterEventChannel eventChannelWithName:@"plugins.flutter.io/camera/imageStream"
- binaryMessenger:messenger];
-
- _imageStreamHandler = [[FLTImageStreamHandler alloc] init];
- [eventChannel setStreamHandler:_imageStreamHandler];
-
- _isStreamingImages = YES;
- } else {
- _eventSink(
- @{@"event" : @"error", @"errorDescription" : @"Images from camera are already streaming!"});
- }
-}
-
-- (void)stopImageStream {
- if (_isStreamingImages) {
- _isStreamingImages = NO;
- _imageStreamHandler = nil;
- } else {
- _eventSink(
- @{@"event" : @"error", @"errorDescription" : @"Images from camera are not streaming!"});
- }
-}
-
-- (BOOL)setupWriterForPath:(NSString *)path {
- NSError *error = nil;
- NSURL *outputURL;
- if (path != nil) {
- outputURL = [NSURL fileURLWithPath:path];
- } else {
- return NO;
- }
- if (_enableAudio && !_isAudioSetup) {
- [self setUpCaptureSessionForAudio];
- }
- _videoWriter = [[AVAssetWriter alloc] initWithURL:outputURL
- fileType:AVFileTypeQuickTimeMovie
- error:&error];
- NSParameterAssert(_videoWriter);
- if (error) {
- _eventSink(@{@"event" : @"error", @"errorDescription" : error.description});
- return NO;
- }
- NSDictionary *videoSettings = [NSDictionary
- dictionaryWithObjectsAndKeys:AVVideoCodecH264, AVVideoCodecKey,
- [NSNumber numberWithInt:_previewSize.height], AVVideoWidthKey,
- [NSNumber numberWithInt:_previewSize.width], AVVideoHeightKey,
- nil];
- _videoWriterInput = [AVAssetWriterInput assetWriterInputWithMediaType:AVMediaTypeVideo
- outputSettings:videoSettings];
-
- _videoAdaptor = [AVAssetWriterInputPixelBufferAdaptor
- assetWriterInputPixelBufferAdaptorWithAssetWriterInput:_videoWriterInput
- sourcePixelBufferAttributes:@{
- (NSString *)kCVPixelBufferPixelFormatTypeKey : @(videoFormat)
- }];
-
- NSParameterAssert(_videoWriterInput);
- _videoWriterInput.expectsMediaDataInRealTime = YES;
-
- // Add the audio input
- if (_enableAudio) {
- AudioChannelLayout acl;
- bzero(&acl, sizeof(acl));
- acl.mChannelLayoutTag = kAudioChannelLayoutTag_Mono;
- NSDictionary *audioOutputSettings = nil;
- // Both type of audio inputs causes output video file to be corrupted.
- audioOutputSettings = [NSDictionary
- dictionaryWithObjectsAndKeys:[NSNumber numberWithInt:kAudioFormatMPEG4AAC], AVFormatIDKey,
- [NSNumber numberWithFloat:44100.0], AVSampleRateKey,
- [NSNumber numberWithInt:1], AVNumberOfChannelsKey,
- [NSData dataWithBytes:&acl length:sizeof(acl)],
- AVChannelLayoutKey, nil];
- _audioWriterInput = [AVAssetWriterInput assetWriterInputWithMediaType:AVMediaTypeAudio
- outputSettings:audioOutputSettings];
- _audioWriterInput.expectsMediaDataInRealTime = YES;
-
- [_videoWriter addInput:_audioWriterInput];
- [_audioOutput setSampleBufferDelegate:self queue:_dispatchQueue];
- }
-
- [_videoWriter addInput:_videoWriterInput];
- [_captureVideoOutput setSampleBufferDelegate:self queue:_dispatchQueue];
-
- return YES;
-}
-- (void)setUpCaptureSessionForAudio {
- NSError *error = nil;
- // Create a device input with the device and add it to the session.
- // Setup the audio input.
- AVCaptureDevice *audioDevice = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeAudio];
- AVCaptureDeviceInput *audioInput = [AVCaptureDeviceInput deviceInputWithDevice:audioDevice
- error:&error];
- if (error) {
- _eventSink(@{@"event" : @"error", @"errorDescription" : error.description});
- }
- // Setup the audio output.
- _audioOutput = [[AVCaptureAudioDataOutput alloc] init];
-
- if ([_captureSession canAddInput:audioInput]) {
- [_captureSession addInput:audioInput];
-
- if ([_captureSession canAddOutput:_audioOutput]) {
- [_captureSession addOutput:_audioOutput];
- _isAudioSetup = YES;
- } else {
- _eventSink(@{
- @"event" : @"error",
- @"errorDescription" : @"Unable to add Audio input/output to session capture"
- });
- _isAudioSetup = NO;
- }
- }
-}
-@end
-
-@interface CameraPlugin ()
-@property(readonly, nonatomic) NSObject<FlutterTextureRegistry> *registry;
-@property(readonly, nonatomic) NSObject<FlutterBinaryMessenger> *messenger;
-@property(readonly, nonatomic) FLTCam *camera;
-@end
-
-@implementation CameraPlugin {
- dispatch_queue_t _dispatchQueue;
-}
-+ (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
- FlutterMethodChannel *channel =
- [FlutterMethodChannel methodChannelWithName:@"plugins.flutter.io/camera"
- binaryMessenger:[registrar messenger]];
- CameraPlugin *instance = [[CameraPlugin alloc] initWithRegistry:[registrar textures]
- messenger:[registrar messenger]];
- [registrar addMethodCallDelegate:instance channel:channel];
-}
-
-- (instancetype)initWithRegistry:(NSObject<FlutterTextureRegistry> *)registry
- messenger:(NSObject<FlutterBinaryMessenger> *)messenger {
- self = [super init];
- NSAssert(self, @"super init cannot be nil");
- _registry = registry;
- _messenger = messenger;
- return self;
-}
-
-- (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result {
- if (_dispatchQueue == nil) {
- _dispatchQueue = dispatch_queue_create("io.flutter.camera.dispatchqueue", NULL);
- }
-
- // Invoke the plugin on another dispatch queue to avoid blocking the UI.
- dispatch_async(_dispatchQueue, ^{
- [self handleMethodCallAsync:call result:result];
- });
-}
-
-- (void)handleMethodCallAsync:(FlutterMethodCall *)call result:(FlutterResult)result {
- if ([@"availableCameras" isEqualToString:call.method]) {
- AVCaptureDeviceDiscoverySession *discoverySession = [AVCaptureDeviceDiscoverySession
- discoverySessionWithDeviceTypes:@[ AVCaptureDeviceTypeBuiltInWideAngleCamera ]
- mediaType:AVMediaTypeVideo
- position:AVCaptureDevicePositionUnspecified];
- NSArray<AVCaptureDevice *> *devices = discoverySession.devices;
- NSMutableArray<NSDictionary<NSString *, NSObject *> *> *reply =
- [[NSMutableArray alloc] initWithCapacity:devices.count];
- for (AVCaptureDevice *device in devices) {
- NSString *lensFacing;
- switch ([device position]) {
- case AVCaptureDevicePositionBack:
- lensFacing = @"back";
- break;
- case AVCaptureDevicePositionFront:
- lensFacing = @"front";
- break;
- case AVCaptureDevicePositionUnspecified:
- lensFacing = @"external";
- break;
- }
- [reply addObject:@{
- @"name" : [device uniqueID],
- @"lensFacing" : lensFacing,
- @"sensorOrientation" : @90,
- }];
- }
- result(reply);
- } else if ([@"initialize" isEqualToString:call.method]) {
- NSString *cameraName = call.arguments[@"cameraName"];
- NSString *resolutionPreset = call.arguments[@"resolutionPreset"];
- NSNumber *enableAudio = call.arguments[@"enableAudio"];
- NSError *error;
- FLTCam *cam = [[FLTCam alloc] initWithCameraName:cameraName
- resolutionPreset:resolutionPreset
- enableAudio:[enableAudio boolValue]
- dispatchQueue:_dispatchQueue
- error:&error];
- if (error) {
- result(getFlutterError(error));
- } else {
- if (_camera) {
- [_camera close];
- }
- int64_t textureId = [_registry registerTexture:cam];
- _camera = cam;
- cam.onFrameAvailable = ^{
- [_registry textureFrameAvailable:textureId];
- };
- FlutterEventChannel *eventChannel = [FlutterEventChannel
- eventChannelWithName:[NSString
- stringWithFormat:@"flutter.io/cameraPlugin/cameraEvents%lld",
- textureId]
- binaryMessenger:_messenger];
- [eventChannel setStreamHandler:cam];
- cam.eventChannel = eventChannel;
- result(@{
- @"textureId" : @(textureId),
- @"previewWidth" : @(cam.previewSize.width),
- @"previewHeight" : @(cam.previewSize.height),
- @"captureWidth" : @(cam.captureSize.width),
- @"captureHeight" : @(cam.captureSize.height),
- });
- [cam start];
- }
- } else if ([@"startImageStream" isEqualToString:call.method]) {
- [_camera startImageStreamWithMessenger:_messenger];
- result(nil);
- } else if ([@"stopImageStream" isEqualToString:call.method]) {
- [_camera stopImageStream];
- result(nil);
- } else if ([@"pauseVideoRecording" isEqualToString:call.method]) {
- [_camera pauseVideoRecording];
- result(nil);
- } else if ([@"resumeVideoRecording" isEqualToString:call.method]) {
- [_camera resumeVideoRecording];
- result(nil);
- } else {
- NSDictionary *argsMap = call.arguments;
- NSUInteger textureId = ((NSNumber *)argsMap[@"textureId"]).unsignedIntegerValue;
-
- if ([@"takePicture" isEqualToString:call.method]) {
- [_camera captureToFile:call.arguments[@"path"] result:result];
- } else if ([@"dispose" isEqualToString:call.method]) {
- [_registry unregisterTexture:textureId];
- [_camera close];
- _dispatchQueue = nil;
- result(nil);
- } else if ([@"prepareForVideoRecording" isEqualToString:call.method]) {
- [_camera setUpCaptureSessionForAudio];
- result(nil);
- } else if ([@"startVideoRecording" isEqualToString:call.method]) {
- [_camera startVideoRecordingAtPath:call.arguments[@"filePath"] result:result];
- } else if ([@"stopVideoRecording" isEqualToString:call.method]) {
- [_camera stopVideoRecordingWithResult:result];
- } else {
- result(FlutterMethodNotImplemented);
- }
- }
-}
-
-@end
diff --git a/plugin/camera/ios/Tests/CameraPluginTests.m b/plugin/camera/ios/Tests/CameraPluginTests.m
deleted file mode 100755
index e5be398..0000000
--- a/plugin/camera/ios/Tests/CameraPluginTests.m
+++ /dev/null
@@ -1,16 +0,0 @@
-@import camera;
-@import XCTest;
-
-@interface CameraPluginTests : XCTestCase
-@end
-
-@implementation CameraPluginTests
-
-- (void)testModuleImport {
- // This test will fail to compile if the module cannot be imported.
- // Make sure this plugin supports modules. See https://github.com/flutter/flutter/issues/41007.
- // If not already present, add this line to the podspec:
- // s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
-}
-
-@end
diff --git a/plugin/camera/ios/camera.podspec b/plugin/camera/ios/camera.podspec
deleted file mode 100755
index dfe566c..0000000
--- a/plugin/camera/ios/camera.podspec
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html
-#
-Pod::Spec.new do |s|
- s.name = 'camera'
- s.version = '0.0.1'
- s.summary = 'A new flutter plugin project.'
- s.description = <<-DESC
-A new flutter plugin project.
- DESC
- s.homepage = 'http://example.com'
- s.license = { :file => '../LICENSE' }
- s.author = { 'Your Company' => 'email@example.com' }
- s.source = { :path => '.' }
- s.source_files = 'Classes/**/*'
- s.public_header_files = 'Classes/**/*.h'
- s.dependency 'Flutter'
- s.platform = :ios, '8.0'
- s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS' => 'armv7 arm64 x86_64' }
-
- s.test_spec 'Tests' do |test_spec|
- test_spec.source_files = 'Tests/**/*'
- end
-end
diff --git a/plugin/camera/lib/camera.dart b/plugin/camera/lib/camera.dart
deleted file mode 100755
index ce9fd94..0000000
--- a/plugin/camera/lib/camera.dart
+++ /dev/null
@@ -1,589 +0,0 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'dart:async';
-import 'dart:typed_data';
-
-import 'package:flutter/foundation.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter/widgets.dart';
-
-part 'camera_image.dart';
-
-final MethodChannel _channel = const MethodChannel('plugins.flutter.io/camera');
-
-enum CameraLensDirection { front, back, external }
-
-/// Affect the quality of video recording and image capture:
-///
-/// If a preset is not available on the camera being used a preset of lower quality will be selected automatically.
-enum ResolutionPreset {
- /// 352x288 on iOS, 240p (320x240) on Android
- low,
-
- /// 480p (640x480 on iOS, 720x480 on Android)
- medium,
-
- /// 720p (1280x720)
- high,
-
- /// 1080p (1920x1080)
- veryHigh,
-
- /// 2160p (3840x2160)
- ultraHigh,
-
- /// The highest resolution available.
- max,
-}
-
-// ignore: inference_failure_on_function_return_type
-typedef onLatestImageAvailable = Function(CameraImage image);
-
-/// Returns the resolution preset as a String.
-String serializeResolutionPreset(ResolutionPreset resolutionPreset) {
- switch (resolutionPreset) {
- case ResolutionPreset.max:
- return 'max';
- case ResolutionPreset.ultraHigh:
- return 'ultraHigh';
- case ResolutionPreset.veryHigh:
- return 'veryHigh';
- case ResolutionPreset.high:
- return 'high';
- case ResolutionPreset.medium:
- return 'medium';
- case ResolutionPreset.low:
- return 'low';
- }
- throw ArgumentError('Unknown ResolutionPreset value');
-}
-
-CameraLensDirection _parseCameraLensDirection(String string) {
- switch (string) {
- case 'front':
- return CameraLensDirection.front;
- case 'back':
- return CameraLensDirection.back;
- case 'external':
- return CameraLensDirection.external;
- }
- throw ArgumentError('Unknown CameraLensDirection value');
-}
-
-/// Completes with a list of available cameras.
-///
-/// May throw a [CameraException].
-Future<List<CameraDescription>> availableCameras() async {
- try {
- final List<Map<dynamic, dynamic>> cameras = await _channel
- .invokeListMethod<Map<dynamic, dynamic>>('availableCameras');
- return cameras.map((Map<dynamic, dynamic> camera) {
- return CameraDescription(
- name: camera['name'],
- lensDirection: _parseCameraLensDirection(camera['lensFacing']),
- sensorOrientation: camera['sensorOrientation'],
- );
- }).toList();
- } on PlatformException catch (e) {
- throw CameraException(e.code, e.message);
- }
-}
-
-class CameraDescription {
- CameraDescription({this.name, this.lensDirection, this.sensorOrientation});
-
- final String name;
- final CameraLensDirection lensDirection;
-
- /// Clockwise angle through which the output image needs to be rotated to be upright on the device screen in its native orientation.
- ///
- /// **Range of valid values:**
- /// 0, 90, 180, 270
- ///
- /// On Android, also defines the direction of rolling shutter readout, which
- /// is from top to bottom in the sensor's coordinate system.
- final int sensorOrientation;
-
- @override
- bool operator ==(Object o) {
- return o is CameraDescription &&
- o.name == name &&
- o.lensDirection == lensDirection;
- }
-
- @override
- int get hashCode {
- return hashValues(name, lensDirection);
- }
-
- @override
- String toString() {
- return '$runtimeType($name, $lensDirection, $sensorOrientation)';
- }
-}
-
-/// This is thrown when the plugin reports an error.
-class CameraException implements Exception {
- CameraException(this.code, this.description);
-
- String code;
- String description;
-
- @override
- String toString() => '$runtimeType($code, $description)';
-}
-
-// Build the UI texture view of the video data with textureId.
-class CameraPreview extends StatelessWidget {
- const CameraPreview(this.controller);
-
- final CameraController controller;
-
- @override
- Widget build(BuildContext context) {
- return controller.value.isInitialized
- ? Texture(textureId: controller._textureId)
- : Container();
- }
-}
-
-/// The state of a [CameraController].
-class CameraValue {
- const CameraValue({
- this.isInitialized,
- this.errorDescription,
- this.previewSize,
- this.isRecordingVideo,
- this.isTakingPicture,
- this.isStreamingImages,
- bool isRecordingPaused,
- }) : _isRecordingPaused = isRecordingPaused;
-
- const CameraValue.uninitialized()
- : this(
- isInitialized: false,
- isRecordingVideo: false,
- isTakingPicture: false,
- isStreamingImages: false,
- isRecordingPaused: false,
- );
-
- /// True after [CameraController.initialize] has completed successfully.
- final bool isInitialized;
-
- /// True when a picture capture request has been sent but as not yet returned.
- final bool isTakingPicture;
-
- /// True when the camera is recording (not the same as previewing).
- final bool isRecordingVideo;
-
- /// True when images from the camera are being streamed.
- final bool isStreamingImages;
-
- final bool _isRecordingPaused;
-
- /// True when camera [isRecordingVideo] and recording is paused.
- bool get isRecordingPaused => isRecordingVideo && _isRecordingPaused;
-
- final String errorDescription;
-
- /// The size of the preview in pixels.
- ///
- /// Is `null` until [isInitialized] is `true`.
- final Size previewSize;
-
- /// Convenience getter for `previewSize.height / previewSize.width`.
- ///
- /// Can only be called when [initialize] is done.
- double get aspectRatio => previewSize.height / previewSize.width;
-
- bool get hasError => errorDescription != null;
-
- CameraValue copyWith({
- bool isInitialized,
- bool isRecordingVideo,
- bool isTakingPicture,
- bool isStreamingImages,
- String errorDescription,
- Size previewSize,
- bool isRecordingPaused,
- }) {
- return CameraValue(
- isInitialized: isInitialized ?? this.isInitialized,
- errorDescription: errorDescription,
- previewSize: previewSize ?? this.previewSize,
- isRecordingVideo: isRecordingVideo ?? this.isRecordingVideo,
- isTakingPicture: isTakingPicture ?? this.isTakingPicture,
- isStreamingImages: isStreamingImages ?? this.isStreamingImages,
- isRecordingPaused: isRecordingPaused ?? _isRecordingPaused,
- );
- }
-
- @override
- String toString() {
- return '$runtimeType('
- 'isRecordingVideo: $isRecordingVideo, '
- 'isRecordingVideo: $isRecordingVideo, '
- 'isInitialized: $isInitialized, '
- 'errorDescription: $errorDescription, '
- 'previewSize: $previewSize, '
- 'isStreamingImages: $isStreamingImages)';
- }
-}
-
-/// Controls a device camera.
-///
-/// Use [availableCameras] to get a list of available cameras.
-///
-/// Before using a [CameraController] a call to [initialize] must complete.
-///
-/// To show the camera preview on the screen use a [CameraPreview] widget.
-class CameraController extends ValueNotifier<CameraValue> {
- CameraController(
- this.description,
- this.resolutionPreset, {
- this.enableAudio = true,
- }) : super(const CameraValue.uninitialized());
-
- final CameraDescription description;
- final ResolutionPreset resolutionPreset;
-
- /// Whether to include audio when recording a video.
- final bool enableAudio;
-
- int _textureId;
- bool _isDisposed = false;
- StreamSubscription<dynamic> _eventSubscription;
- StreamSubscription<dynamic> _imageStreamSubscription;
- Completer<void> _creatingCompleter;
-
- /// Initializes the camera on the device.
- ///
- /// Throws a [CameraException] if the initialization fails.
- Future<void> initialize() async {
- if (_isDisposed) {
- return Future<void>.value();
- }
- try {
- _creatingCompleter = Completer<void>();
- final Map<String, dynamic> reply =
- await _channel.invokeMapMethod<String, dynamic>(
- 'initialize',
- <String, dynamic>{
- 'cameraName': description.name,
- 'resolutionPreset': serializeResolutionPreset(resolutionPreset),
- 'enableAudio': enableAudio,
- },
- );
- _textureId = reply['textureId'];
- value = value.copyWith(
- isInitialized: true,
- previewSize: Size(
- reply['previewWidth'].toDouble(),
- reply['previewHeight'].toDouble(),
- ),
- );
- } on PlatformException catch (e) {
- throw CameraException(e.code, e.message);
- }
- _eventSubscription =
- EventChannel('flutter.io/cameraPlugin/cameraEvents$_textureId')
- .receiveBroadcastStream()
- .listen(_listener);
- _creatingCompleter.complete();
- return _creatingCompleter.future;
- }
-
- /// Prepare the capture session for video recording.
- ///
- /// Use of this method is optional, but it may be called for performance
- /// reasons on iOS.
- ///
- /// Preparing audio can cause a minor delay in the CameraPreview view on iOS.
- /// If video recording is intended, calling this early eliminates this delay
- /// that would otherwise be experienced when video recording is started.
- /// This operation is a no-op on Android.
- ///
- /// Throws a [CameraException] if the prepare fails.
- Future<void> prepareForVideoRecording() async {
- await _channel.invokeMethod<void>('prepareForVideoRecording');
- }
-
- /// Listen to events from the native plugins.
- ///
- /// A "cameraClosing" event is sent when the camera is closed automatically by the system (for example when the app go to background). The plugin will try to reopen the camera automatically but any ongoing recording will end.
- void _listener(dynamic event) {
- final Map<dynamic, dynamic> map = event;
- if (_isDisposed) {
- return;
- }
-
- switch (map['eventType']) {
- case 'error':
- value = value.copyWith(errorDescription: event['errorDescription']);
- break;
- case 'cameraClosing':
- value = value.copyWith(isRecordingVideo: false);
- break;
- }
- }
-
- /// Captures an image and saves it to [path].
- ///
- /// A path can for example be obtained using
- /// [path_provider](https://pub.dartlang.org/packages/path_provider).
- ///
- /// If a file already exists at the provided path an error will be thrown.
- /// The file can be read as this function returns.
- ///
- /// Throws a [CameraException] if the capture fails.
- Future<void> takePicture(String path) async {
- if (!value.isInitialized || _isDisposed) {
- throw CameraException(
- 'Uninitialized CameraController.',
- 'takePicture was called on uninitialized CameraController',
- );
- }
- if (value.isTakingPicture) {
- throw CameraException(
- 'Previous capture has not returned yet.',
- 'takePicture was called before the previous capture returned.',
- );
- }
- try {
- value = value.copyWith(isTakingPicture: true);
- await _channel.invokeMethod<void>(
- 'takePicture',
- <String, dynamic>{'textureId': _textureId, 'path': path},
- );
- value = value.copyWith(isTakingPicture: false);
- } on PlatformException catch (e) {
- value = value.copyWith(isTakingPicture: false);
- throw CameraException(e.code, e.message);
- }
- }
-
- /// Start streaming images from platform camera.
- ///
- /// Settings for capturing images on iOS and Android is set to always use the
- /// latest image available from the camera and will drop all other images.
- ///
- /// When running continuously with [CameraPreview] widget, this function runs
- /// best with [ResolutionPreset.low]. Running on [ResolutionPreset.high] can
- /// have significant frame rate drops for [CameraPreview] on lower end
- /// devices.
- ///
- /// Throws a [CameraException] if image streaming or video recording has
- /// already started.
- // TODO(bmparr): Add settings for resolution and fps.
- Future<void> startImageStream(onLatestImageAvailable onAvailable) async {
- if (!value.isInitialized || _isDisposed) {
- throw CameraException(
- 'Uninitialized CameraController',
- 'startImageStream was called on uninitialized CameraController.',
- );
- }
- if (value.isRecordingVideo) {
- throw CameraException(
- 'A video recording is already started.',
- 'startImageStream was called while a video is being recorded.',
- );
- }
- if (value.isStreamingImages) {
- throw CameraException(
- 'A camera has started streaming images.',
- 'startImageStream was called while a camera was streaming images.',
- );
- }
-
- try {
- await _channel.invokeMethod<void>('startImageStream');
- value = value.copyWith(isStreamingImages: true);
- } on PlatformException catch (e) {
- throw CameraException(e.code, e.message);
- }
- const EventChannel cameraEventChannel =
- EventChannel('plugins.flutter.io/camera/imageStream');
- _imageStreamSubscription =
- cameraEventChannel.receiveBroadcastStream().listen(
- (dynamic imageData) {
- onAvailable(CameraImage._fromPlatformData(imageData));
- },
- );
- }
-
- /// Stop streaming images from platform camera.
- ///
- /// Throws a [CameraException] if image streaming was not started or video
- /// recording was started.
- Future<void> stopImageStream() async {
- if (!value.isInitialized || _isDisposed) {
- throw CameraException(
- 'Uninitialized CameraController',
- 'stopImageStream was called on uninitialized CameraController.',
- );
- }
- if (value.isRecordingVideo) {
- throw CameraException(
- 'A video recording is already started.',
- 'stopImageStream was called while a video is being recorded.',
- );
- }
- if (!value.isStreamingImages) {
- throw CameraException(
- 'No camera is streaming images',
- 'stopImageStream was called when no camera is streaming images.',
- );
- }
-
- try {
- value = value.copyWith(isStreamingImages: false);
- await _channel.invokeMethod<void>('stopImageStream');
- } on PlatformException catch (e) {
- throw CameraException(e.code, e.message);
- }
-
- await _imageStreamSubscription.cancel();
- _imageStreamSubscription = null;
- }
-
- /// Start a video recording and save the file to [path].
- ///
- /// A path can for example be obtained using
- /// [path_provider](https://pub.dartlang.org/packages/path_provider).
- ///
- /// The file is written on the flight as the video is being recorded.
- /// If a file already exists at the provided path an error will be thrown.
- /// The file can be read as soon as [stopVideoRecording] returns.
- ///
- /// Throws a [CameraException] if the capture fails.
- Future<void> startVideoRecording(String filePath) async {
- if (!value.isInitialized || _isDisposed) {
- throw CameraException(
- 'Uninitialized CameraController',
- 'startVideoRecording was called on uninitialized CameraController',
- );
- }
- if (value.isRecordingVideo) {
- throw CameraException(
- 'A video recording is already started.',
- 'startVideoRecording was called when a recording is already started.',
- );
- }
- if (value.isStreamingImages) {
- throw CameraException(
- 'A camera has started streaming images.',
- 'startVideoRecording was called while a camera was streaming images.',
- );
- }
-
- try {
- await _channel.invokeMethod<void>(
- 'startVideoRecording',
- <String, dynamic>{'textureId': _textureId, 'filePath': filePath},
- );
- value = value.copyWith(isRecordingVideo: true, isRecordingPaused: false);
- } on PlatformException catch (e) {
- throw CameraException(e.code, e.message);
- }
- }
-
- /// Stop recording.
- Future<void> stopVideoRecording() async {
- if (!value.isInitialized || _isDisposed) {
- throw CameraException(
- 'Uninitialized CameraController',
- 'stopVideoRecording was called on uninitialized CameraController',
- );
- }
- if (!value.isRecordingVideo) {
- throw CameraException(
- 'No video is recording',
- 'stopVideoRecording was called when no video is recording.',
- );
- }
- try {
- value = value.copyWith(isRecordingVideo: false);
- await _channel.invokeMethod<void>(
- 'stopVideoRecording',
- <String, dynamic>{'textureId': _textureId},
- );
- } on PlatformException catch (e) {
- throw CameraException(e.code, e.message);
- }
- }
-
- /// Pause video recording.
- ///
- /// This feature is only available on iOS and Android sdk 24+.
- Future<void> pauseVideoRecording() async {
- if (!value.isInitialized || _isDisposed) {
- throw CameraException(
- 'Uninitialized CameraController',
- 'pauseVideoRecording was called on uninitialized CameraController',
- );
- }
- if (!value.isRecordingVideo) {
- throw CameraException(
- 'No video is recording',
- 'pauseVideoRecording was called when no video is recording.',
- );
- }
- try {
- value = value.copyWith(isRecordingPaused: true);
- await _channel.invokeMethod<void>(
- 'pauseVideoRecording',
- <String, dynamic>{'textureId': _textureId},
- );
- } on PlatformException catch (e) {
- throw CameraException(e.code, e.message);
- }
- }
-
- /// Resume video recording after pausing.
- ///
- /// This feature is only available on iOS and Android sdk 24+.
- Future<void> resumeVideoRecording() async {
- if (!value.isInitialized || _isDisposed) {
- throw CameraException(
- 'Uninitialized CameraController',
- 'resumeVideoRecording was called on uninitialized CameraController',
- );
- }
- if (!value.isRecordingVideo) {
- throw CameraException(
- 'No video is recording',
- 'resumeVideoRecording was called when no video is recording.',
- );
- }
- try {
- value = value.copyWith(isRecordingPaused: false);
- await _channel.invokeMethod<void>(
- 'resumeVideoRecording',
- <String, dynamic>{'textureId': _textureId},
- );
- } on PlatformException catch (e) {
- throw CameraException(e.code, e.message);
- }
- }
-
- /// Releases the resources of this camera.
- @override
- Future<void> dispose() async {
- if (_isDisposed) {
- return;
- }
- _isDisposed = true;
- super.dispose();
- if (_creatingCompleter != null) {
- await _creatingCompleter.future;
- await _channel.invokeMethod<void>(
- 'dispose',
- <String, dynamic>{'textureId': _textureId},
- );
- await _eventSubscription?.cancel();
- }
- }
-}
diff --git a/plugin/camera/lib/camera_image.dart b/plugin/camera/lib/camera_image.dart
deleted file mode 100755
index cebc148..0000000
--- a/plugin/camera/lib/camera_image.dart
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-part of 'camera.dart';
-
-/// A single color plane of image data.
-///
-/// The number and meaning of the planes in an image are determined by the
-/// format of the Image.
-class Plane {
- Plane._fromPlatformData(Map<dynamic, dynamic> data)
- : bytes = data['bytes'],
- bytesPerPixel = data['bytesPerPixel'],
- bytesPerRow = data['bytesPerRow'],
- height = data['height'],
- width = data['width'];
-
- /// Bytes representing this plane.
- final Uint8List bytes;
-
- /// The distance between adjacent pixel samples on Android, in bytes.
- ///
- /// Will be `null` on iOS.
- final int bytesPerPixel;
-
- /// The row stride for this color plane, in bytes.
- final int bytesPerRow;
-
- /// Height of the pixel buffer on iOS.
- ///
- /// Will be `null` on Android
- final int height;
-
- /// Width of the pixel buffer on iOS.
- ///
- /// Will be `null` on Android.
- final int width;
-}
-
-// TODO:(bmparr) Turn [ImageFormatGroup] to a class with int values.
-/// Group of image formats that are comparable across Android and iOS platforms.
-enum ImageFormatGroup {
- /// The image format does not fit into any specific group.
- unknown,
-
- /// Multi-plane YUV 420 format.
- ///
- /// This format is a generic YCbCr format, capable of describing any 4:2:0
- /// chroma-subsampled planar or semiplanar buffer (but not fully interleaved),
- /// with 8 bits per color sample.
- ///
- /// On Android, this is `android.graphics.ImageFormat.YUV_420_888`. See
- /// https://developer.android.com/reference/android/graphics/ImageFormat.html#YUV_420_888
- ///
- /// On iOS, this is `kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange`. See
- /// https://developer.apple.com/documentation/corevideo/1563591-pixel_format_identifiers/kcvpixelformattype_420ypcbcr8biplanarvideorange?language=objc
- yuv420,
-
- /// 32-bit BGRA.
- ///
- /// On iOS, this is `kCVPixelFormatType_32BGRA`. See
- /// https://developer.apple.com/documentation/corevideo/1563591-pixel_format_identifiers/kcvpixelformattype_32bgra?language=objc
- bgra8888,
-}
-
-/// Describes how pixels are represented in an image.
-class ImageFormat {
- ImageFormat._fromPlatformData(this.raw) : group = _asImageFormatGroup(raw);
-
- /// Describes the format group the raw image format falls into.
- final ImageFormatGroup group;
-
- /// Raw version of the format from the Android or iOS platform.
- ///
- /// On Android, this is an `int` from class `android.graphics.ImageFormat`. See
- /// https://developer.android.com/reference/android/graphics/ImageFormat
- ///
- /// On iOS, this is a `FourCharCode` constant from Pixel Format Identifiers.
- /// See https://developer.apple.com/documentation/corevideo/1563591-pixel_format_identifiers?language=objc
- final dynamic raw;
-}
-
-ImageFormatGroup _asImageFormatGroup(dynamic rawFormat) {
- if (defaultTargetPlatform == TargetPlatform.android) {
- // android.graphics.ImageFormat.YUV_420_888
- if (rawFormat == 35) {
- return ImageFormatGroup.yuv420;
- }
- }
-
- if (defaultTargetPlatform == TargetPlatform.iOS) {
- switch (rawFormat) {
- // kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange
- case 875704438:
- return ImageFormatGroup.yuv420;
- // kCVPixelFormatType_32BGRA
- case 1111970369:
- return ImageFormatGroup.bgra8888;
- }
- }
-
- return ImageFormatGroup.unknown;
-}
-
-/// A single complete image buffer from the platform camera.
-///
-/// This class allows for direct application access to the pixel data of an
-/// Image through one or more [Uint8List]. Each buffer is encapsulated in a
-/// [Plane] that describes the layout of the pixel data in that plane. The
-/// [CameraImage] is not directly usable as a UI resource.
-///
-/// Although not all image formats are planar on iOS, we treat 1-dimensional
-/// images as single planar images.
-class CameraImage {
- CameraImage._fromPlatformData(Map<dynamic, dynamic> data)
- : format = ImageFormat._fromPlatformData(data['format']),
- height = data['height'],
- width = data['width'],
- planes = List<Plane>.unmodifiable(data['planes']
- .map((dynamic planeData) => Plane._fromPlatformData(planeData)));
-
- /// Format of the image provided.
- ///
- /// Determines the number of planes needed to represent the image, and
- /// the general layout of the pixel data in each [Uint8List].
- final ImageFormat format;
-
- /// Height of the image in pixels.
- ///
- /// For formats where some color channels are subsampled, this is the height
- /// of the largest-resolution plane.
- final int height;
-
- /// Width of the image in pixels.
- ///
- /// For formats where some color channels are subsampled, this is the width
- /// of the largest-resolution plane.
- final int width;
-
- /// The pixels planes for this image.
- ///
- /// The number of planes is determined by the format of the image.
- final List<Plane> planes;
-}
diff --git a/plugin/camera/lib/new/camera.dart b/plugin/camera/lib/new/camera.dart
deleted file mode 100755
index 08b085f..0000000
--- a/plugin/camera/lib/new/camera.dart
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-export 'src/camera_controller.dart';
-export 'src/camera_testing.dart';
-export 'src/common/camera_interface.dart';
-export 'src/common/native_texture.dart';
-export 'src/support_android/camera.dart';
-export 'src/support_android/camera_info.dart';
diff --git a/plugin/camera/lib/new/src/camera_controller.dart b/plugin/camera/lib/new/src/camera_controller.dart
deleted file mode 100755
index 4296f39..0000000
--- a/plugin/camera/lib/new/src/camera_controller.dart
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'dart:async';
-
-import 'package:flutter/foundation.dart';
-
-import 'common/camera_interface.dart';
-
-/// Controls a device camera.
-///
-/// Use [CameraController.availableCameras] to get a list of available cameras.
-///
-/// This class is used as a simple interface to control a camera on Android or
-/// iOS.
-///
-/// Only one instance of [CameraController] can be active at a time. If you call
-/// [initialize] on a [CameraController] while another is active, the old
-/// controller will be disposed before initializing the new controller.
-///
-/// Example using [CameraController]:
-///
-/// ```dart
-/// final List<CameraDescription> cameras = async CameraController.availableCameras();
-/// final CameraController controller = CameraController(description: cameras[0]);
-/// controller.initialize();
-/// controller.start();
-/// ```
-class CameraController {
- /// Default constructor.
- ///
- /// Use [CameraController.availableCameras] to get a list of available
- /// cameras.
- ///
- /// This will choose the best [CameraConfigurator] for the current device.
- factory CameraController({@required CameraDescription description}) {
- return CameraController._(
- description: description,
- configurator: _createDefaultConfigurator(description),
- api: _getCameraApi(description),
- );
- }
-
- CameraController._({
- @required this.description,
- @required this.configurator,
- @required this.api,
- }) : assert(description != null),
- assert(configurator != null),
- assert(api != null);
-
- /// Constructor for defining your own [CameraConfigurator].
- ///
- /// Use [CameraController.availableCameras] to get a list of available
- /// cameras.
- factory CameraController.customConfigurator({
- @required CameraDescription description,
- @required CameraConfigurator configurator,
- }) {
- return CameraController._(
- description: description,
- configurator: configurator,
- api: _getCameraApi(description),
- );
- }
-
- static const String _isNotInitializedMessage = 'Initialize was not called.';
- static const String _isDisposedMessage = 'This controller has been disposed.';
-
- // Keep only one active instance of CameraController.
- static CameraController _instance;
-
- bool _isDisposed = false;
-
- /// Details for the camera this controller accesses.
- final CameraDescription description;
-
- /// Configurator used to control the camera.
- final CameraConfigurator configurator;
-
- /// Api used by the [configurator].
- final CameraApi api;
-
- bool get isDisposed => _isDisposed;
-
- /// Retrieves a list of available cameras for the current device.
- ///
- /// This will choose the best [CameraAPI] for the current device.
- static Future<List<CameraDescription>> availableCameras() async {
- throw UnimplementedError('$defaultTargetPlatform not supported');
- }
-
- /// Initializes the camera on the device.
- ///
- /// You must call [dispose] when you are done using the camera, otherwise it
- /// will remain locked and be unavailable to other applications.
- ///
- /// Only one instance of [CameraController] can be active at a time. If you
- /// call [initialize] on a [CameraController] while another is active, the old
- /// controller will be disposed before initializing the new controller.
- Future<void> initialize() {
- if (_instance == this) {
- return Future<void>.value();
- }
-
- final Completer<void> completer = Completer<void>();
-
- if (_instance != null) {
- _instance
- .dispose()
- .then((_) => configurator.initialize())
- .then((_) => completer.complete());
- }
- _instance = this;
-
- return completer.future;
- }
-
- /// Begins the flow of data between the inputs and outputs connected to the camera instance.
- Future<void> start() {
- assert(!_isDisposed, _isDisposedMessage);
- assert(_instance != this, _isNotInitializedMessage);
-
- return configurator.start();
- }
-
- /// Stops the flow of data between the inputs and outputs connected to the camera instance.
- Future<void> stop() {
- assert(!_isDisposed, _isDisposedMessage);
- assert(_instance != this, _isNotInitializedMessage);
-
- return configurator.stop();
- }
-
- /// Deallocate all resources and disables further use of the controller.
- Future<void> dispose() {
- _instance = null;
- _isDisposed = true;
- return configurator.dispose();
- }
-
- static CameraConfigurator _createDefaultConfigurator(
- CameraDescription description,
- ) {
- final CameraApi api = _getCameraApi(description);
- switch (api) {
- case CameraApi.android:
- throw UnimplementedError();
- case CameraApi.iOS:
- throw UnimplementedError();
- case CameraApi.supportAndroid:
- throw UnimplementedError();
- }
-
- return null; // Unreachable code
- }
-
- static CameraApi _getCameraApi(CameraDescription description) {
- return CameraApi.iOS;
-
- // TODO(bparrishMines): Uncomment this when platform specific code is added.
- /*
- throw ArgumentError.value(
- description.runtimeType,
- 'description.runtimeType',
- 'Failed to get $CameraApi from',
- );
- */
- }
-}
diff --git a/plugin/camera/lib/new/src/camera_testing.dart b/plugin/camera/lib/new/src/camera_testing.dart
deleted file mode 100755
index 8022216..0000000
--- a/plugin/camera/lib/new/src/camera_testing.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'package:flutter/foundation.dart';
-import 'package:flutter/services.dart';
-
-import 'common/camera_channel.dart';
-
-@visibleForTesting
-class CameraTesting {
- CameraTesting._();
-
- static final MethodChannel channel = CameraChannel.channel;
- static int get nextHandle => CameraChannel.nextHandle;
- static set nextHandle(int handle) => CameraChannel.nextHandle = handle;
-}
diff --git a/plugin/camera/lib/new/src/common/camera_channel.dart b/plugin/camera/lib/new/src/common/camera_channel.dart
deleted file mode 100755
index 12036b8..0000000
--- a/plugin/camera/lib/new/src/common/camera_channel.dart
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'package:flutter/services.dart';
-
-typedef CameraCallback = void Function(dynamic result);
-
-// Non exported class
-class CameraChannel {
- static final Map<int, dynamic> callbacks = <int, CameraCallback>{};
-
- static final MethodChannel channel = const MethodChannel(
- 'flutter.plugins.io/camera',
- )..setMethodCallHandler(
- (MethodCall call) async {
- assert(call.method == 'handleCallback');
-
- final int handle = call.arguments['handle'];
- if (callbacks[handle] != null) callbacks[handle](call.arguments);
- },
- );
-
- static int nextHandle = 0;
-
- static void registerCallback(int handle, CameraCallback callback) {
- assert(handle != null);
- assert(CameraCallback != null);
-
- assert(!callbacks.containsKey(handle));
- callbacks[handle] = callback;
- }
-
- static void unregisterCallback(int handle) {
- assert(handle != null);
- callbacks.remove(handle);
- }
-}
diff --git a/plugin/camera/lib/new/src/common/camera_interface.dart b/plugin/camera/lib/new/src/common/camera_interface.dart
deleted file mode 100755
index 99ead09..0000000
--- a/plugin/camera/lib/new/src/common/camera_interface.dart
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'dart:async';
-
-/// Available APIs compatible with [CameraController].
-enum CameraApi {
- /// [Camera2](https://developer.android.com/reference/android/hardware/camera2/package-summary)
- android,
-
- /// [AVFoundation](https://developer.apple.com/av-foundation/)
- iOS,
-
- /// [Camera](https://developer.android.com/reference/android/hardware/Camera)
- supportAndroid,
-}
-
-/// Location of the camera on the device.
-enum LensDirection { front, back, unknown }
-
-/// Abstract class used to create a common interface to describe a camera from different platform APIs.
-///
-/// This provides information such as the [name] of the camera and [direction]
-/// the lens face.
-abstract class CameraDescription {
- /// Location of the camera on the device.
- LensDirection get direction;
-
- /// Identifier for this camera.
- String get name;
-}
-
-/// Abstract class used to create a common interface across platform APIs.
-abstract class CameraConfigurator {
- /// Texture id that can be used to send camera frames to a [Texture] widget.
- ///
- /// You must call [addPreviewTexture] first or this will only return null.
- int get previewTextureId;
-
- /// Initializes the camera on the device.
- Future<void> initialize();
-
- /// Begins the flow of data between the inputs and outputs connected to the camera instance.
- ///
- /// This will start updating the texture with id: [previewTextureId].
- Future<void> start();
-
- /// Stops the flow of data between the inputs and outputs connected to the camera instance.
- Future<void> stop();
-
- /// Dispose all resources and disables further use of this configurator.
- Future<void> dispose();
-
- /// Retrieves a valid texture Id to be used with a [Texture] widget.
- Future<int> addPreviewTexture();
-}
diff --git a/plugin/camera/lib/new/src/common/camera_mixins.dart b/plugin/camera/lib/new/src/common/camera_mixins.dart
deleted file mode 100755
index bb27e48..0000000
--- a/plugin/camera/lib/new/src/common/camera_mixins.dart
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'camera_channel.dart';
-
-mixin NativeMethodCallHandler {
- /// Identifier for an object on the native side of the plugin.
- ///
- /// Only used internally and for debugging.
- final int handle = CameraChannel.nextHandle++;
-}
-
-mixin CameraMappable {
- /// Creates a description of the object compatible with [PlatformChannel]s.
- ///
- /// Only used as an internal method and for debugging.
- Map<String, dynamic> asMap();
-}
diff --git a/plugin/camera/lib/new/src/common/native_texture.dart b/plugin/camera/lib/new/src/common/native_texture.dart
deleted file mode 100755
index 1deb7e3..0000000
--- a/plugin/camera/lib/new/src/common/native_texture.dart
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'dart:async';
-
-import 'package:flutter/foundation.dart';
-
-import 'camera_channel.dart';
-import 'camera_mixins.dart';
-
-/// Used to allocate a buffer for displaying a preview camera texture.
-///
-/// This is used to for a developer to have a control over the
-/// `TextureRegistry.SurfaceTextureEntry` (Android) and FlutterTexture (iOS).
-/// This gives direct access to the textureId and can be reused with separate
-/// camera instances.
-///
-/// The [textureId] can be passed to a [Texture] widget.
-class NativeTexture with CameraMappable {
- NativeTexture._({@required int handle, @required this.textureId})
- : _handle = handle,
- assert(handle != null),
- assert(textureId != null);
-
- final int _handle;
-
- bool _isClosed = false;
-
- /// Id that can be passed to a [Texture] widget.
- final int textureId;
-
- static Future<NativeTexture> allocate() async {
- final int handle = CameraChannel.nextHandle++;
-
- final int textureId = await CameraChannel.channel.invokeMethod<int>(
- '$NativeTexture#allocate',
- <String, dynamic>{'textureHandle': handle},
- );
-
- return NativeTexture._(handle: handle, textureId: textureId);
- }
-
- /// Deallocate this texture.
- Future<void> release() {
- if (_isClosed) return Future<void>.value();
-
- _isClosed = true;
- return CameraChannel.channel.invokeMethod<void>(
- '$NativeTexture#release',
- <String, dynamic>{'handle': _handle},
- );
- }
-
- @override
- Map<String, dynamic> asMap() {
- return <String, dynamic>{'handle': _handle};
- }
-}
diff --git a/plugin/camera/lib/new/src/support_android/camera.dart b/plugin/camera/lib/new/src/support_android/camera.dart
deleted file mode 100755
index d78753d..0000000
--- a/plugin/camera/lib/new/src/support_android/camera.dart
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'dart:async';
-
-import '../common/camera_channel.dart';
-import '../common/camera_mixins.dart';
-import '../common/native_texture.dart';
-import 'camera_info.dart';
-
-/// The Camera class used to set image capture settings, start/stop preview, snap pictures, and retrieve frames for encoding for video.
-///
-/// This class is a client for the Camera service, which manages the actual
-/// camera hardware.
-///
-/// This exposes the deprecated Android
-/// [Camera](https://developer.android.com/reference/android/hardware/Camera)
-/// API. This should only be used with Android sdk versions less than 21.
-class Camera with NativeMethodCallHandler {
- Camera._();
-
- bool _isClosed = false;
-
- /// Retrieves the number of physical cameras available on this device.
- static Future<int> getNumberOfCameras() {
- return CameraChannel.channel.invokeMethod<int>(
- 'Camera#getNumberOfCameras',
- );
- }
-
- /// Creates a new [Camera] object to access a particular hardware camera.
- ///
- /// If the same camera is opened by other applications, this will throw a
- /// [PlatformException].
- ///
- /// You must call [release] when you are done using the camera, otherwise it
- /// will remain locked and be unavailable to other applications.
- ///
- /// Your application should only have one [Camera] object active at a time for
- /// a particular hardware camera.
- static Camera open(int cameraId) {
- final Camera camera = Camera._();
-
- CameraChannel.channel.invokeMethod<int>(
- 'Camera#open',
- <String, dynamic>{'cameraId': cameraId, 'cameraHandle': camera.handle},
- );
-
- return camera;
- }
-
- /// Retrieves information about a particular camera.
- ///
- /// If [getNumberOfCameras] returns N, the valid id is 0 to N-1.
- static Future<CameraInfo> getCameraInfo(int cameraId) async {
- final Map<String, dynamic> infoMap =
- await CameraChannel.channel.invokeMapMethod<String, dynamic>(
- 'Camera#getCameraInfo',
- <String, dynamic>{'cameraId': cameraId},
- );
-
- return CameraInfo.fromMap(infoMap);
- }
-
- /// Sets the [NativeTexture] to be used for live preview.
- ///
- /// This method must be called before [startPreview].
- ///
- /// The one exception is that if the preview native texture is not set (or
- /// set to null) before [startPreview] is called, then this method may be
- /// called once with a non-null parameter to set the preview texture.
- /// (This allows camera setup and surface creation to happen in parallel,
- /// saving time.) The preview native texture may not otherwise change while
- /// preview is running.
- set previewTexture(NativeTexture texture) {
- assert(!_isClosed);
-
- CameraChannel.channel.invokeMethod<void>(
- 'Camera#previewTexture',
- <String, dynamic>{'handle': handle, 'nativeTexture': texture?.asMap()},
- );
- }
-
- /// Starts capturing and drawing preview frames to the screen.
- ///
- /// Preview will not actually start until a surface is supplied with
- /// [previewTexture].
- Future<void> startPreview() {
- assert(!_isClosed);
-
- return CameraChannel.channel.invokeMethod<void>(
- 'Camera#startPreview',
- <String, dynamic>{'handle': handle},
- );
- }
-
- /// Stops capturing and drawing preview frames to the [previewTexture], and resets the camera for a future call to [startPreview].
- Future<void> stopPreview() {
- assert(!_isClosed);
-
- return CameraChannel.channel.invokeMethod<void>(
- 'Camera#stopPreview',
- <String, dynamic>{'handle': handle},
- );
- }
-
- /// Disconnects and releases the Camera object resources.
- ///
- /// You must call this as soon as you're done with the Camera object.
- Future<void> release() {
- if (_isClosed) return Future<void>.value();
-
- _isClosed = true;
- return CameraChannel.channel.invokeMethod<void>(
- 'Camera#release',
- <String, dynamic>{'handle': handle},
- );
- }
-}
diff --git a/plugin/camera/lib/new/src/support_android/camera_info.dart b/plugin/camera/lib/new/src/support_android/camera_info.dart
deleted file mode 100755
index 033fecf..0000000
--- a/plugin/camera/lib/new/src/support_android/camera_info.dart
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'package:flutter/foundation.dart';
-
-import '../common/camera_interface.dart';
-
-/// The direction that the camera faces.
-enum Facing { back, front }
-
-/// Information about a camera.
-///
-/// Retrieved from [Camera.getCameraInfo].
-class CameraInfo implements CameraDescription {
- const CameraInfo({
- @required this.id,
- @required this.facing,
- @required this.orientation,
- }) : assert(id != null),
- assert(facing != null),
- assert(orientation != null);
-
- factory CameraInfo.fromMap(Map<String, dynamic> map) {
- return CameraInfo(
- id: map['id'],
- orientation: map['orientation'],
- facing: Facing.values.firstWhere(
- (Facing facing) => facing.toString() == map['facing'],
- ),
- );
- }
-
- /// Identifier for a particular camera.
- final int id;
-
- /// The direction that the camera faces.
- final Facing facing;
-
- /// The orientation of the camera image.
- ///
- /// The value is the angle that the camera image needs to be rotated clockwise
- /// so it shows correctly on the display in its natural orientation.
- /// It should be 0, 90, 180, or 270.
- ///
- /// For example, suppose a device has a naturally tall screen. The back-facing
- /// camera sensor is mounted in landscape. You are looking at the screen. If
- /// the top side of the camera sensor is aligned with the right edge of the
- /// screen in natural orientation, the value should be 90. If the top side of
- /// a front-facing camera sensor is aligned with the right of the screen, the
- /// value should be 270.
- final int orientation;
-
- @override
- String get name => id.toString();
-
- @override
- LensDirection get direction {
- switch (facing) {
- case Facing.front:
- return LensDirection.front;
- case Facing.back:
- return LensDirection.back;
- }
-
- return null;
- }
-}
diff --git a/plugin/camera/pubspec.yaml b/plugin/camera/pubspec.yaml
deleted file mode 100755
index a1ce423..0000000
--- a/plugin/camera/pubspec.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: camera
-description: A Flutter plugin for getting information about and controlling the
- camera on Android and iOS. Supports previewing the camera feed, capturing images, capturing video,
- and streaming image buffers to dart.
-version: 0.5.8+3
-
-homepage: https://github.com/flutter/plugins/tree/master/packages/camera
-
-dependencies:
- flutter:
- sdk: flutter
-
-dev_dependencies:
- path_provider: ^0.5.0
- video_player: ^0.10.0
- flutter_test:
- sdk: flutter
- flutter_driver:
- sdk: flutter
- pedantic: ^1.8.0
-
-flutter:
- plugin:
- platforms:
- android:
- package: io.flutter.plugins.camera
- pluginClass: CameraPlugin
- ios:
- pluginClass: CameraPlugin
-
-environment:
- sdk: ">=2.1.0 <3.0.0"
- flutter: ">=1.12.13+hotfix.5 <2.0.0"
diff --git a/plugin/wechat_flutter_plugin/.gitignore b/plugin/wechat_flutter_plugin/.gitignore
deleted file mode 100644
index b7d74c8..0000000
--- a/plugin/wechat_flutter_plugin/.gitignore
+++ /dev/null
@@ -1,114 +0,0 @@
-# Miscellaneous
-*.class
-*.lock
-*.log
-*.pyc
-*.swp
-.DS_Store
-.atom/
-.buildlog/
-.history
-.svn/
-
-# IntelliJ related
-*.iml
-*.ipr
-*.iws
-.idea/
-
-# Visual Studio Code related
-.classpath
-.project
-.settings/
-.vscode/
-
-# Flutter repo-specific
-/bin/cache/
-/bin/mingit/
-/dev/benchmarks/mega_gallery/
-/dev/bots/.recipe_deps
-/dev/bots/android_tools/
-/dev/docs/doc/
-/dev/docs/flutter.docs.zip
-/dev/docs/lib/
-/dev/docs/pubspec.yaml
-/dev/integration_tests/**/xcuserdata
-/dev/integration_tests/**/Pods
-/packages/flutter/coverage/
-version
-
-# packages file containing multi-root paths
-.packages.generated
-
-# Flutter/Dart/Pub related
-**/doc/api/
-.dart_tool/
-.flutter-plugins
-.flutter-plugins-dependencies
-.packages
-.pub-cache/
-.pub/
-build/
-flutter_*.png
-linked_*.ds
-unlinked.ds
-unlinked_spec.ds
-
-# Android related
-**/android/**/gradle-wrapper.jar
-**/android/.gradle
-**/android/captures/
-**/android/gradlew
-**/android/gradlew.bat
-**/android/local.properties
-**/android/**/GeneratedPluginRegistrant.java
-**/android/key.properties
-*.jks
-
-# iOS/XCode related
-**/ios/**/*.mode1v3
-**/ios/**/*.mode2v3
-**/ios/**/*.moved-aside
-**/ios/**/*.pbxuser
-**/ios/**/*.perspectivev3
-**/ios/**/*sync/
-**/ios/**/.sconsign.dblite
-**/ios/**/.tags*
-**/ios/**/.vagrant/
-**/ios/**/DerivedData/
-**/ios/**/Icon?
-**/ios/**/Pods/
-**/ios/**/.symlinks/
-**/ios/**/profile
-**/ios/**/xcuserdata
-**/ios/.generated/
-**/ios/Flutter/App.framework
-**/ios/Flutter/Flutter.framework
-**/ios/Flutter/Flutter.podspec
-**/ios/Flutter/Generated.xcconfig
-**/ios/Flutter/app.flx
-**/ios/Flutter/app.zip
-**/ios/Flutter/flutter_assets/
-**/ios/Flutter/flutter_export_environment.sh
-**/ios/ServiceDefinitions.json
-**/ios/Runner/GeneratedPluginRegistrant.*
-
-# macOS
-**/macos/Flutter/GeneratedPluginRegistrant.swift
-**/macos/Flutter/Flutter-Debug.xcconfig
-**/macos/Flutter/Flutter-Release.xcconfig
-**/macos/Flutter/Flutter-Profile.xcconfig
-
-# Coverage
-coverage/
-
-# Symbols
-app.*.symbols
-
-# Exceptions to above rules.
-!**/ios/**/default.mode1v3
-!**/ios/**/default.mode2v3
-!**/ios/**/default.pbxuser
-!**/ios/**/default.perspectivev3
-!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
-!/dev/ci/**/Gemfile.lock
diff --git a/plugin/wechat_flutter_plugin/CHANGELOG.md b/plugin/wechat_flutter_plugin/CHANGELOG.md
deleted file mode 100644
index b588dc8..0000000
--- a/plugin/wechat_flutter_plugin/CHANGELOG.md
+++ /dev/null
@@ -1,41 +0,0 @@
-## 0.2.7
-消息增加时间戳
-
-## 0.2.6
-可以发送语音消息
-
-## 0.2.5
-增加新的会话监听
-
-## 0.2.4
-简化描述
-
-## 0.2.3
-迁移仓库
-
-## 0.2.2
-修改一些说明文件。
-
-## 0.2.1
-修改不支持的引用头文件的方式。
-
-## 0.2.0
-升级imsdk到官方最新版本。
-
-## 0.1.19
-获取用户个人资料
-
-## 0.1.16
-简化dim的使用，android端不在需要在AndroidManifests.xml文件中配置service等内容，全部交给插件处理。
-
-## 0.1.13
-
-* 归一化错误码
-
-## 0.1.11
-
-* 去掉无用api，解决消息重复的问题，定位到是重复登录注册了多次listener，做了容错处理。
-
-## 0.1.8
-
-* 解决了消息解析不出的问题。
\ No newline at end of file
diff --git a/plugin/wechat_flutter_plugin/LICENSE b/plugin/wechat_flutter_plugin/LICENSE
deleted file mode 100644
index ba75c69..0000000
--- a/plugin/wechat_flutter_plugin/LICENSE
+++ /dev/null
@@ -1 +0,0 @@
-TODO: Add your license here.
diff --git a/plugin/wechat_flutter_plugin/README.md b/plugin/wechat_flutter_plugin/README.md
deleted file mode 100644
index 0bcfb12..0000000
--- a/plugin/wechat_flutter_plugin/README.md
+++ /dev/null
@@ -1,88 +0,0 @@
-# dim
-
-封装的一个腾讯云im，以便于flutter开发者可以方便继承im到自己的应用中
-
-## 使用之前注意事项
-
-如果你之前没有使用过腾讯云，请仔细阅读这段文字，如果你已经对腾讯云im了如指掌，可以越过，但建议还是熟悉以下。
-
-因为这个库是基于腾讯云im的，因此需要去云im申请一个应用，阅读这篇[文章](https://github.com/tencentyun/TIMSDK/tree/master/Android)可以获得以下知识：
-
-1、`appid`怎么来的
-
-2、`账号`及其对应的`sig`如何来的，已经推荐的sig的生成方式（当然这个是后台同学关注的）。
-
-弄清楚这些之后，就可以开始使用`dim`了。
-
-## 使用 dim
-dim的使用非常简单，只需引入这个库就可以使用了。
-
-```dart
-dependencies:
- dim: ^0.2.6
-```
-
-不需要像我之前实现的版本那样进行一些繁琐的配置，因为云im升级之后，支持`maven`以及`pod`的引用方式啦。那么Android端
-
-
-### Android端需要注意什么？
-
-1、混淆配置，在你的flutter的Android工程中配置混淆。
-
-```java
--keep class com.tencent.** { *; }
-```
-
-### IOS端需要注意什么？
-
-1、请注意在你的flutter工程的ios项目根目录执行`pod update`[**非必须，如果报错建议执行一次**]
-
-2、随后在执行一次`pod install`
-
-
-### demo截图
-
-
-
-
-
-
-
-## 已有的功能
-
-1. 初始化
-
- 建议整个应用生命周期只执行一次。
-2. 登录
-3. 登出
-4. 获取会话列表
-5. 删除一个会话
-6. 获取私信会话消息[群聊消息目前没有封装]
-
- 注意，私信发送方的资料云im改成了异步的方式，因此，这个版本不在返回！
- 建议用户自己查询一次，最好的方式是将用户资料存储在本地db中，并
-7. 发送图片消息
-
- 注意，图片消息中图片云im需要的是图片的`本地路径`。
-8. 发送文本消息
-9. 发送地理位置消息
-10. 获取用户资料
-11. 设置用户资料
-
- 目前仅仅提供了设置`nick`，`gender`，`faceUrl`，有需要在补充。
-12. 监听新的消息
-13. 监听有新的会话
-
- 注意，和新的消息是一个消息通道，只不过收到的内容是`[]`，对一个空的数组，此时需要去主动调用4获取会话列表来查最新会话列表
-14. 发送语音消息，基本和图片消息一致，使用本地路径
-
-
-
-### 注意
-
-demo中的 initListener 中的逻辑需要调用一下，最好是在initState中，建立消息通道，flutter这边才能收发消息。
-
-
-## todo
-
-根据需要，可以提issue，或者接受pr来实现更多的接口，主要是体力活。
\ No newline at end of file
diff --git a/plugin/wechat_flutter_plugin/android/.gitignore b/plugin/wechat_flutter_plugin/android/.gitignore
deleted file mode 100644
index c6cbe56..0000000
--- a/plugin/wechat_flutter_plugin/android/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-*.iml
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
-/build
-/captures
diff --git a/plugin/wechat_flutter_plugin/android/build.gradle b/plugin/wechat_flutter_plugin/android/build.gradle
deleted file mode 100644
index fb32f41..0000000
--- a/plugin/wechat_flutter_plugin/android/build.gradle
+++ /dev/null
@@ -1,39 +0,0 @@
-group 'com.brzhang.flutter.dim'
-version '1.0-SNAPSHOT'
-
-buildscript {
- repositories {
- google()
- jcenter()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:3.2.1'
- }
-}
-
-rootProject.allprojects {
- repositories {
- google()
- jcenter()
- }
-}
-
-apply plugin: 'com.android.library'
-
-android {
- compileSdkVersion 28
-
- defaultConfig {
- minSdkVersion 16
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
- }
- lintOptions {
- disable 'InvalidPackage'
- }
- dependencies {
- implementation fileTree(include: ['*.jar'], dir: 'libs')
- implementation 'com.google.code.gson:gson:2.8.5'
- api 'com.tencent.imsdk:imsdk:5.1.66'
- }
-}
diff --git a/plugin/wechat_flutter_plugin/android/gradle.properties b/plugin/wechat_flutter_plugin/android/gradle.properties
deleted file mode 100644
index 08f2b5f..0000000
--- a/plugin/wechat_flutter_plugin/android/gradle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-org.gradle.jvmargs=-Xmx1536M
-android.enableJetifier=true
-android.useAndroidX=true
diff --git a/plugin/wechat_flutter_plugin/android/gradle/wrapper/gradle-wrapper.properties b/plugin/wechat_flutter_plugin/android/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index ff88ceb..0000000
--- a/plugin/wechat_flutter_plugin/android/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Mon Jun 01 19:48:25 CST 2020
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/plugin/wechat_flutter_plugin/android/settings.gradle b/plugin/wechat_flutter_plugin/android/settings.gradle
deleted file mode 100644
index 36c8e37..0000000
--- a/plugin/wechat_flutter_plugin/android/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = 'dim'
diff --git a/plugin/wechat_flutter_plugin/android/src/main/AndroidManifest.xml b/plugin/wechat_flutter_plugin/android/src/main/AndroidManifest.xml
deleted file mode 100644
index 0721d1b..0000000
--- a/plugin/wechat_flutter_plugin/android/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.brzhang.flutter.dim">
-
- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
- <uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.CAMERA" />
- <uses-permission android:name="android.permission.RECORD_AUDIO" />
- <uses-permission android:name="android.permission.READ_PHONE_STATE" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-
- <application>
- </application>
-</manifest>
diff --git a/plugin/wechat_flutter_plugin/android/src/main/java/com/brzhang/flutter/dim/DimPlugin.java b/plugin/wechat_flutter_plugin/android/src/main/java/com/brzhang/flutter/dim/DimPlugin.java
deleted file mode 100644
index 6d3a883..0000000
--- a/plugin/wechat_flutter_plugin/android/src/main/java/com/brzhang/flutter/dim/DimPlugin.java
+++ /dev/null
@@ -1,1358 +0,0 @@
-package com.brzhang.flutter.dim;
-
-import android.graphics.Bitmap;
-import android.media.MediaMetadataRetriever;
-import android.os.Environment;
-import android.text.TextUtils;
-import android.util.Log;
-
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import com.tencent.imsdk.TIMCallBack;
-import com.tencent.imsdk.TIMConnListener;
-import com.tencent.imsdk.TIMConversation;
-import com.tencent.imsdk.TIMConversationType;
-import com.tencent.imsdk.TIMElem;
-import com.tencent.imsdk.TIMFriendAllowType;
-import com.tencent.imsdk.TIMFriendGenderType;
-import com.tencent.imsdk.TIMFriendshipManager;
-import com.tencent.imsdk.TIMGroupEventListener;
-import com.tencent.imsdk.TIMGroupManager;
-import com.tencent.imsdk.TIMGroupMemberInfo;
-import com.tencent.imsdk.TIMGroupReceiveMessageOpt;
-import com.tencent.imsdk.TIMGroupTipsElem;
-import com.tencent.imsdk.TIMImageElem;
-import com.tencent.imsdk.TIMLocationElem;
-import com.tencent.imsdk.TIMLogLevel;
-import com.tencent.imsdk.TIMManager;
-import com.tencent.imsdk.TIMMessage;
-import com.tencent.imsdk.TIMMessageListener;
-import com.tencent.imsdk.TIMRefreshListener;
-import com.tencent.imsdk.TIMSdkConfig;
-import com.tencent.imsdk.TIMSnapshot;
-import com.tencent.imsdk.TIMSoundElem;
-import com.tencent.imsdk.TIMTextElem;
-import com.tencent.imsdk.TIMUserConfig;
-import com.tencent.imsdk.TIMUserProfile;
-import com.tencent.imsdk.TIMUserStatusListener;
-import com.tencent.imsdk.TIMValueCallBack;
-import com.tencent.imsdk.TIMVideo;
-import com.tencent.imsdk.TIMVideoElem;
-import com.tencent.imsdk.ext.group.TIMGroupBaseInfo;
-import com.tencent.imsdk.ext.group.TIMGroupDetailInfoResult;
-import com.tencent.imsdk.ext.group.TIMGroupMemberResult;
-import com.tencent.imsdk.ext.group.TIMGroupSelfInfo;
-import com.tencent.imsdk.ext.message.TIMConversationExt;
-import com.tencent.imsdk.ext.message.TIMManagerExt;
-import com.tencent.imsdk.ext.message.TIMMessageLocator;
-import com.tencent.imsdk.ext.message.TIMUserConfigMsgExt;
-import com.tencent.imsdk.friendship.TIMDelFriendType;
-import com.tencent.imsdk.friendship.TIMFriend;
-import com.tencent.imsdk.friendship.TIMFriendPendencyItem;
-import com.tencent.imsdk.friendship.TIMFriendPendencyRequest;
-import com.tencent.imsdk.friendship.TIMFriendPendencyResponse;
-import com.tencent.imsdk.friendship.TIMFriendRequest;
-import com.tencent.imsdk.friendship.TIMFriendResponse;
-import com.tencent.imsdk.friendship.TIMFriendResult;
-import com.tencent.imsdk.friendship.TIMPendencyType;
-import com.tencent.imsdk.session.SessionWrapper;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import io.flutter.plugin.common.EventChannel;
-import io.flutter.plugin.common.MethodCall;
-import io.flutter.plugin.common.MethodChannel;
-import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
-import io.flutter.plugin.common.MethodChannel.Result;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
-
-/**
- * DimPlugin
- */
-public class DimPlugin implements MethodCallHandler, EventChannel.StreamHandler {
- private static final String TAG = "DimPlugin";
- private Registrar registrar;
- private EventChannel.EventSink eventSink;
- private TIMMessageListener timMessageListener;
- private TIMRefreshListener timRefreshListener;
-
- public DimPlugin(Registrar registrar) {
- this.registrar = registrar;
- //消息监听器
- timMessageListener = new TIMMessageListener() {
- @Override
- public boolean onNewMessages(List<TIMMessage> list) {
- if (list != null && list.size() > 0) {
- List<Message> messages = new ArrayList<>();
- for (TIMMessage timMessage : list) {
- messages.add(new Message(timMessage));
- }
- eventSink.success(new Gson().toJson(messages, new TypeToken<Collection<Message>>() {
- }.getType()));
- }
- return false;
- }
- };
- //会话监听器
- timRefreshListener = new TIMRefreshListener() {
- @Override
- public void onRefresh() {
- eventSink.success("[]");
- }
-
- @Override
- public void onRefreshConversation(List<TIMConversation> conversations) {
-// if (conversations != null && conversations.size() > 0) {
-// eventSink.success(new Gson().toJson(conversations, new TypeToken<Collection<TIMConversation>>() {
-// }.getType()));
-// }
- }
- };
- }
-
- /**
- * Plugin registration.
- */
- public static void registerWith(Registrar registrar) {
- final MethodChannel channel =
- new MethodChannel(registrar.messenger(), "dim_method");
- final EventChannel eventChannel =
- new EventChannel(registrar.messenger(), "dim_event");
- final DimPlugin dimPlugin = new DimPlugin(registrar);
- channel.setMethodCallHandler(dimPlugin);
- eventChannel.setStreamHandler(dimPlugin);
- }
-
- @Override
- public void onMethodCall(MethodCall call, final Result result) {
- if (call.method.equals("getPlatformVersion")) {
- result.success("Android " + android.os.Build.VERSION.RELEASE);
- } else if (call.method.equals("init")) {
- int appid = call.argument("appid");
- //初始化 IM SDK 基本配置
- //判断是否是在主线程
- if (SessionWrapper.isMainProcess(registrar.context())) {
- TIMSdkConfig config = new TIMSdkConfig(appid)
- .enableLogPrint(true)
- .setLogLevel(TIMLogLevel.DEBUG)
- .setLogPath(Environment.getExternalStorageDirectory().getPath() + "/justfortest/");
-
- //初始化 SDK
- TIMManager.getInstance().init(registrar.context(), config);
-
-
- //基本用户配置,在登录前，通过通讯管理器 TIMManager 的接口 setUserConfig 将用户配置与当前通讯管理器进行绑定
- TIMUserConfig userConfig = new TIMUserConfig()
- //设置用户状态变更事件监听器
- .setUserStatusListener(new TIMUserStatusListener() {
- @Override
- public void onForceOffline() {
- //被其他终端踢下线
- Log.i(TAG, "onForceOffline");
- }
-
- @Override
- public void onUserSigExpired() {
- //用户签名过期了，需要刷新 userSig 重新登录 IM SDK
- Log.i(TAG, "onUserSigExpired");
- }
- })
- //设置连接状态事件监听器
- .setConnectionListener(new TIMConnListener() {
- @Override
- public void onConnected() {
- Log.i(TAG, "onConnected");
- }
-
- @Override
- public void onDisconnected(int code, String desc) {
- Log.i(TAG, "onDisconnected");
- }
-
- @Override
- public void onWifiNeedAuth(String name) {
- Log.i(TAG, "onWifiNeedAuth");
- }
- })
- //设置群组事件监听器
- .setGroupEventListener(new TIMGroupEventListener() {
- @Override
- public void onGroupTipsEvent(TIMGroupTipsElem elem) {
- Log.i(TAG, "onGroupTipsEvent, type: " + elem.getTipsType());
- }
- })
- //设置会话刷新监听器
- .setRefreshListener(timRefreshListener);
-
- //消息扩展用户配置
- userConfig = new TIMUserConfigMsgExt(userConfig)
- .enableAutoReport(true)
- //开启消息已读回执
- .enableReadReceipt(true);
- //将用户配置与通讯管理器进行绑定
- TIMManager.getInstance().setUserConfig(userConfig);
-
- TIMManager.getInstance().removeMessageListener(timMessageListener);
- TIMManager.getInstance().addMessageListener(timMessageListener);
-
- result.success("init succ");
- } else {
- result.success("init failed ,not in main process");
- }
- } else if (call.method.equals("im_login")) {
- if (!TextUtils.isEmpty(TIMManager.getInstance().getLoginUser())) {
- result.error("login failed. ", "user is login", "user is already login ,you should login out first");
- return;
- }
- String identifier = call.argument("identifier");
- String userSig = call.argument("userSig");
- if (userSig == null) {
- userSig = GenerateTestUserSig.genTestUserSig(identifier);
- }
- // identifier为用户名，userSig 为用户登录凭证
- TIMManager.getInstance().login(identifier, userSig, new TIMCallBack() {
- @Override
- public void onError(int code, String desc) {
- result.error(desc, String.valueOf(code), null);
- }
-
- @Override
- public void onSuccess() {
- result.success("login succ");
- }
- });
- } else if (call.method.equals("im_logout")) {
- TIMManager.getInstance().logout(new TIMCallBack() {
- @Override
- public void onError(int code, String desc) {
- result.error(desc, String.valueOf(code), null);
- }
-
- @Override
- public void onSuccess() {
- result.success("logout success");
- }
- });
- } else if (call.method.equals("sdkLogout")) {
- //登出
- TIMManager.getInstance().logout(new TIMCallBack() {
- @Override
- public void onError(int code, String desc) {
- Log.d(TAG, "logout failed. code: " + code + " errmsg: " + desc);
- result.error(desc, String.valueOf(code), null);
- }
-
- @Override
- public void onSuccess() {
- //登出成功
- result.success("logout success");
- }
- });
- } else if (call.method.equals("getConversations")) {
- List<TIMConversation> list = TIMManagerExt.getInstance().getConversationList();
- if (list != null && list.size() > 0) {
- result.success(new Gson().toJson(list, new TypeToken<Collection<TIMConversation>>() {
- }.getType()));
- } else {
- result.success("[]");
- }
- } else if (call.method.equals("delConversation")) {
- String identifier = call.argument("identifier");
- int type = call.argument("type");
- TIMManagerExt.getInstance().deleteConversation(type == 1 ? TIMConversationType.C2C : TIMConversationType.Group, identifier);
- result.success("delConversation success");
- } else if (call.method.equals("getMessages")) {
- String identifier = call.argument("identifier");
- int count = call.argument("count");
- Log.e(TAG, "获取" + count + "条数据");
- int type = call.argument("ctype");
-// TIMMessage lastMsg = call.argument("lastMsg");
- //获取会话扩展实例
- TIMConversation con = TIMManager.getInstance().getConversation(type == 2 ? TIMConversationType.Group : TIMConversationType.C2C, identifier);
- TIMConversationExt conExt = new TIMConversationExt(con);
-
-//获取此会话的消息
- conExt.getMessage(count, //获取此会话最近的 100 条消息
- null, //不指定从哪条消息开始获取 - 等同于从最新的消息开始往前
- new TIMValueCallBack<List<TIMMessage>>() {//回调接口
- @Override
- public void onError(int code, String desc) {//获取消息失败
- Log.d(TAG, "get message failed. code: " + code + " errmsg: " + desc);
- result.error(desc, String.valueOf(code), null);
- }
-
- @Override
- public void onSuccess(List<TIMMessage> msgs) {//获取消息成功
- //遍历取得的消息
- if (msgs != null && msgs.size() > 0) {
- List<Message> messages = new ArrayList<>();
- for (TIMMessage timMessage : msgs) {
- messages.add(new Message(timMessage));
- }
- result.success(new Gson().toJson(messages, new TypeToken<Collection<Message>>() {
- }.getType()));
- } else {
- result.success("[]");
- }
- }
- });
- } else if (call.method.equals("sendTextMessages")) {
- String identifier = call.argument("identifier");
- String content = call.argument("content");
- int type = call.argument("type");
- TIMMessage msg = new TIMMessage();
- msg.setTimestamp(System.currentTimeMillis());
-
- //添加文本内容
- TIMTextElem elem = new TIMTextElem();
- elem.setText(content);
-
- //将elem添加到消息
- if (msg.addElement(elem) != 0) {
- Log.d(TAG, "addElement failed");
- return;
- }
- TIMConversation conversation = TIMManager.getInstance().getConversation(type == 1 ? TIMConversationType.C2C : TIMConversationType.Group, identifier);
-
- //发送消息
- conversation.sendMessage(msg, new TIMValueCallBack<TIMMessage>() {//发送消息回调
- @Override
- public void onError(int code, String desc) {//发送消息失败
- Log.d(TAG, "send message failed. code: " + code + " errmsg: " + desc);
- result.error(desc, String.valueOf(code), null);
- }
-
- @Override
- public void onSuccess(TIMMessage msg) {//发送消息成功
- Log.e(TAG, "sendTextMessages ok");
- result.success("sendTextMessages ok");
- }
- });
- } else if (call.method.equals("sendImageMessages")) {
- String identifier = call.argument("identifier");
- String iamgePath = call.argument("image_path");
- int type = call.argument("type");
-
- //构造一条消息
- TIMMessage msg = new TIMMessage();
- msg.setTimestamp(System.currentTimeMillis());
-
-//添加图片
- TIMImageElem elem = new TIMImageElem();
-// elem.setPath(Environment.getExternalStorageDirectory() + "/DCIM/Camera/1.jpg");
- elem.setPath(iamgePath);
-//将 elem 添加到消息
- if (msg.addElement(elem) != 0) {
- Log.d(TAG, "addElement failed");
- return;
- }
- TIMConversation conversation = TIMManager.getInstance().getConversation(type == 1 ? TIMConversationType.C2C : TIMConversationType.Group, identifier);
-//发送消息
- conversation.sendMessage(msg, new TIMValueCallBack<TIMMessage>() {//发送消息回调
- @Override
- public void onError(int code, String desc) {//发送消息失败
- Log.d(TAG, "send message failed. code: " + code + " errmsg: " + desc);
- result.error(desc, String.valueOf(code), null);
- }
-
- @Override
- public void onSuccess(TIMMessage msg) {//发送消息成功
- Log.e(TAG, "SendMsg ok");
- result.success("SendMsg ok");
- }
- });
- } else if (call.method.equals("sendSoundMessages")) {
- String identifier = call.argument("identifier");
- String sound_path = call.argument("sound_path");
- int duration = call.argument("duration");
- int type = call.argument("type");
-
- //构造一条消息
- TIMMessage msg = new TIMMessage();
- msg.setTimestamp(System.currentTimeMillis());
-
-//添加图片
- TIMSoundElem elem = new TIMSoundElem();
- elem.setPath(sound_path);
- elem.setDuration(duration);
-//将 elem 添加到消息
- if (msg.addElement(elem) != 0) {
- Log.d(TAG, "addElement failed");
- return;
- }
- TIMConversation conversation = TIMManager.getInstance().getConversation(type == 1 ? TIMConversationType.C2C : TIMConversationType.Group, identifier);
-
-//发送消息
- conversation.sendMessage(msg, new TIMValueCallBack<TIMMessage>() {//发送消息回调
- @Override
- public void onError(int code, String desc) {//发送消息失败
- Log.d(TAG, "send message failed. code: " + code + " errmsg: " + desc);
- result.error(desc, String.valueOf(code), null);
- }
-
- @Override
- public void onSuccess(TIMMessage msg) {//发送消息成功
- Log.e(TAG, "sendSoundMessages ok");
- result.success("sendSoundMessages ok");
- }
- });
- } else if (call.method.equals("buildVideoMessage")) {
-
- String identifier = call.argument("identifier");
-
- String videoPath = call.argument("videoPath");
-
- int width = call.argument("width");
- int height = call.argument("height");
- int duration = call.argument("duration");
- int type = call.argument("type");
-
- //构造一条消息
- TIMMessage msg = new TIMMessage();
- msg.setTimestamp(System.currentTimeMillis());
-
- TIMVideoElem ele = new TIMVideoElem();
-
- TIMVideo video = new TIMVideo();
- video.setDuaration(duration / 1000);
- video.setType("mp4");
- TIMSnapshot snapshot = new TIMSnapshot();
-
- MediaMetadataRetriever media = new MediaMetadataRetriever();
- media.setDataSource(videoPath);
-
- snapshot.setWidth(width);
- snapshot.setHeight(height);
-
- ele.setSnapshot(snapshot);
- ele.setVideo(video);
- ele.setVideoPath(videoPath);
- Bitmap bitmap = media.getFrameAtTime();
- File file = new File(Environment.getExternalStorageDirectory() + "/mfw.png");
- try {
- //文件输出流
- FileOutputStream fileOutputStream = new FileOutputStream(file);
- //压缩图片，如果要保存png，就用Bitmap.CompressFormat.PNG，要保存jpg就用Bitmap.CompressFormat.JPEG,质量是100%，表示不压缩
- bitmap.compress(Bitmap.CompressFormat.PNG, 50, fileOutputStream);
- //写入，这里会卡顿，因为图片较大
- fileOutputStream.flush();
- //记得要关闭写入流
- fileOutputStream.close();
- //成功的提示，写入成功后，请在对应目录中找保存的图片
- ele.setSnapshotPath(Environment.getExternalStorageDirectory() + "/mfw.png");
- Log.d(TAG, "视频封面地址 " + Environment.getExternalStorageDirectory() + "/mfw.png");
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- Log.d(TAG, e.getMessage());
- } catch (IOException e) {
- e.printStackTrace();
- Log.d(TAG, e.getMessage());
- }
-
- msg.addElement(ele);
- if (msg.addElement(ele) != 0) {
- Log.d(TAG, "addElement failed");
- return;
- }
-
- TIMConversation conversation = TIMManager.getInstance().getConversation(type == 1 ? TIMConversationType.C2C : TIMConversationType.Group, identifier);
-
-//发送消息
- conversation.sendMessage(msg, new TIMValueCallBack<TIMMessage>() {//发送视频消息回调
- @Override
- public void onError(int code, String desc) {//发送视频消息失败
- Log.d(TAG, "send buildVideoMessage failed. code: " + code + " errmsg: " + desc);
- result.error(desc, String.valueOf(code), null);
- }
-
- @Override
- public void onSuccess(TIMMessage msg) { //发送视频消息成功
- Log.e(TAG, "buildVideoMessage ok");
- result.success("buildVideoMessage ok");
- }
- });
-
- } else if (call.method.equals("sendLocation")) {
-
- String identifier = call.argument("identifier");
- double lat = call.argument("lat");
- double lng = call.argument("lng");
- String desc = call.argument("desc");
-
- TIMConversation conversation = TIMManager.getInstance().getConversation(TIMConversationType.C2C, identifier);
- //构造一条消息
- TIMMessage msg = new TIMMessage();
-
-//添加位置信息
- TIMLocationElem elem = new TIMLocationElem();
- elem.setLatitude(lat); //设置纬度
- elem.setLongitude(lng); //设置经度
- elem.setDesc(desc);
-
-//将elem添加到消息
- if (msg.addElement(elem) != 0) {
- Log.d(TAG, "addElement failed");
- return;
- }
-//发送消息
- conversation.sendMessage(msg, new TIMValueCallBack<TIMMessage>() {//发送消息回调
- @Override
- public void onError(int code, String desc) {//发送消息失败
- result.error(desc, String.valueOf(code), null);
- }
-
- @Override
- public void onSuccess(TIMMessage msg) {//发送消息成功
- Log.e(TAG, "Send location ok");
- result.success("sendLocation ok");
- }
- });
-
- } else if (call.method.equals("post_data_test")) {
- Log.e(TAG, "onMethodCall() called with: call = [" + call + "], result = [" + result + "]");
- eventSink.success("hahahahha I am from listener");
- } else if (call.method.equals("addFriend")) {
- //创建请求列表
- //添加好友请求
- String identifier = call.argument("identifier");
- TIMFriendRequest timFriendRequest = new TIMFriendRequest(identifier);
- timFriendRequest.setAddWording("请添加我!");
- timFriendRequest.setAddSource("android");
- TIMFriendshipManager.getInstance().addFriend(timFriendRequest, new TIMValueCallBack<TIMFriendResult>() {
- @Override
- public void onError(int code, String desc) {
- result.error(desc, String.valueOf(code), null);
- }
-
- @Override
- public void onSuccess(TIMFriendResult timFriendResult) {
- result.success("addFriend success");
- }
- });
- } else if (call.method.equals("delFriend")) {
- //双向删除好友 test_user
- String identifier = call.argument("identifier");
-
- List<String> identifiers = new ArrayList<>();
- identifiers.add(identifier);
- TIMFriendshipManager.getInstance().deleteFriends(identifiers, TIMDelFriendType.TIM_FRIEND_DEL_BOTH, new TIMValueCallBack<List<TIMFriendResult>>() {
- @Override
- public void onError(int code, String desc) {
- result.error(desc, String.valueOf(code), null);
- }
-
- @Override
- public void onSuccess(List<TIMFriendResult> timUserProfiles) {
- result.success("deleteFriends success");
- }
- });
- } else if (call.method.equals("listFriends")) {
- TIMFriendshipManager.getInstance().getFriendList(new TIMValueCallBack<List<TIMFriend>>() {
- @Override
- public void onError(int code, String desc) {
- result.error(desc, String.valueOf(code), null);
- }
-
- @Override
- public void onSuccess(List<TIMFriend> timFriends) {
- List<TIMUserProfile> userList = new ArrayList<>();
- for (TIMFriend timFriend : timFriends) {
- userList.add(timFriend.getTimUserProfile());
- }
- result.success(new Gson().toJson(userList, new TypeToken<Collection<TIMUserProfile>>() {
- }.getType()));
- }
- });
- } else if (call.method.equals("opFriend")) {//好友申请
- //获取好友列表
- String identifier = call.argument("identifier");
- String opTypeStr = call.argument("opTypeStr");
- TIMFriendResponse timFriendAddResponse = new TIMFriendResponse();
- timFriendAddResponse.setIdentifier(identifier);
- if (opTypeStr.toUpperCase().trim().equals("Y")) {
- timFriendAddResponse.setResponseType(TIMFriendResponse.TIM_FRIEND_RESPONSE_AGREE_AND_ADD);
- } else {
- timFriendAddResponse.setResponseType(TIMFriendResponse.TIM_FRIEND_RESPONSE_REJECT);
- }
- TIMFriendshipManager.getInstance().doResponse(timFriendAddResponse, new TIMValueCallBack<TIMFriendResult>() {
- @Override
- public void onError(int i, String s) {
- result.error(s, String.valueOf(i), null);
- }
-
- @Override
- public void onSuccess(TIMFriendResult timFriendResult) {
- result.success(timFriendResult.getIdentifier());
- }
- });
- } else if (call.method.equals("getUsersProfile")) {
- List<String> users = call.argument("users");
- //获取用户资料
- TIMFriendshipManager.getInstance().getUsersProfile(users, true, new TIMValueCallBack<List<TIMUserProfile>>() {
- @Override
- public void onError(int code, String desc) {
- //错误码 code 和错误描述 desc，可用于定位请求失败原因
- //错误码 code 列表请参见错误码表
- Log.e(TAG, "getUsersProfile failed: " + code + " desc");
- result.error(desc, String.valueOf(code), null);
- }
-
- @Override
- public void onSuccess(List<TIMUserProfile> timUserProfiles) {
- Log.e(TAG, "getUsersProfile succ");
- if (timUserProfiles != null && timUserProfiles.size() > 0) {
- result.success(new Gson().toJson(timUserProfiles, new TypeToken<Collection<TIMUserProfile>>() {
- }.getType()));
- } else {
- result.success("[]");
- }
-
- }
- });
- } else if (call.method.equals("setUsersProfile")) {
-
- String nick = call.argument("nick");
- int gender = call.argument("gender");
- String faceUrl = call.argument("faceUrl");
- HashMap<String, Object> profileMap = new HashMap<>();
- profileMap.put(TIMUserProfile.TIM_PROFILE_TYPE_KEY_NICK, nick);
- profileMap.put(TIMUserProfile.TIM_PROFILE_TYPE_KEY_GENDER, gender == 1 ? TIMFriendGenderType.GENDER_MALE : TIMFriendGenderType.GENDER_FEMALE);
- profileMap.put(TIMUserProfile.TIM_PROFILE_TYPE_KEY_FACEURL, faceUrl);
- TIMFriendshipManager.getInstance().modifySelfProfile(profileMap, new TIMCallBack() {
- @Override
- public void onError(int code, String desc) {
- Log.e(TAG, "modifySelfProfile failed: " + code + " desc" + desc);
- result.error(desc, String.valueOf(code), null);
- }
-
- @Override
- public void onSuccess() {
- Log.e(TAG, "modifySelfProfile success");
- result.success("setUsersProfile succ");
- }
- });
- } else if (call.method.equals("getCurrentLoginUser")) {
- result.success(TIMManager.getInstance().getLoginUser());
- } else if (call.method.equals("im_autoLogin")) {
- if (!TextUtils.isEmpty(TIMManager.getInstance().getLoginUser())) {
- result.error("login failed. ", "user is login", "user is already login ,you should login out first");
- return;
- }
- String identifier = call.argument("identifier");
- // identifier为用户名，userSig 为用户登录凭证
- TIMManager.getInstance().autoLogin(identifier, new TIMCallBack() {
- @Override
- public void onError(int code, String desc) {
- Log.e(TAG, "autoLogin failed: " + code + " desc" + desc);
- result.error(desc, String.valueOf(code), null);
- }
-
- @Override
- public void onSuccess() {
- Log.e(TAG, "autoLogin succ");
- result.success("autoLogin succ");
- }
- });
- } else if (call.method.equals("deleteConversationAndLocalMsg")) {
-
- int type = call.argument("type");
- String identifier = call.argument("identifier");
-
- TIMManager.getInstance().deleteConversationAndLocalMsgs(type == 1 ? TIMConversationType.C2C : TIMConversationType.Group, identifier);
- result.success("删除会话：" + identifier);
- } else if (call.method.equals("getUnreadMessageNum")) {
- int type = call.argument("type");
- String identifier = call.argument("identifier");
- //获取会话扩展实例
- TIMConversation con = TIMManager.getInstance().getConversation(type == 1 ? TIMConversationType.C2C : TIMConversationType.Group, identifier);
-//获取会话未读数
- long num = con.getUnreadMessageNum();
- Log.d(TAG, "unread msg num: " + num);
- result.success(num);
-
- } else if (call.method.equals("setReadMessage")) {
- int type = call.argument("type");
- String identifier = call.argument("identifier");
- TIMConversation conversation = TIMManager.getInstance().getConversation(
- type == 1 ? TIMConversationType.C2C : TIMConversationType.Group, //会话类型：单聊
- identifier); //会话对方用户帐号
-//将此会话的所有消息标记为已读
- conversation.setReadMessage(null, new TIMCallBack() {
- @Override
- public void onError(int code, String desc) {
- Log.e(TAG, "setReadMessage failed, code: " + code + "|desc: " + desc);
- result.error(desc, "error" + code, null);
- }
-
- @Override
- public void onSuccess() {
- Log.d(TAG, "setReadMessage succ");
- result.success("setReadMessage succ");
- }
- });
- } else if (call.method.equals("deleteGroup")) {
- String groupId = call.argument("groupId");
-
- //解散群组
- TIMGroupManager.getInstance().deleteGroup(groupId, new TIMCallBack() {
- @Override
- public void onError(int code, String desc) {
- //错误码 code 和错误描述 desc，可用于定位请求失败原因
- //错误码 code 列表请参见错误码表
- Log.d(TAG, "login failed. code: " + code + " errmsg: " + desc);
- result.error(desc, "login failed. code: " + code + " errmsg: ", null);
- }
-
- @Override
- public void onSuccess() {
- //解散群组成功
- result.success("解散群组成功");
- }
- });
- } else if (call.method.equals("modifyGroupName")) {
- String groupId = call.argument("groupId");
- String setGroupName = call.argument("setGroupName");
-
- TIMGroupManager.ModifyGroupInfoParam param = new TIMGroupManager.ModifyGroupInfoParam(groupId);
- param.setGroupName(setGroupName);
- TIMGroupManager.getInstance().modifyGroupInfo(param, new TIMCallBack() {
- @Override
- public void onError(int code, String desc) {
- Log.e(TAG, "modify group info failed, code:" + code + "|desc:" + desc);
- result.error(desc, "modify group info failed, code:" + code, null);
- }
-
- @Override
- public void onSuccess() {
- Log.e(TAG, "modify group info succ");
- result.success("modify group info succ");
- }
- });
- } else if (call.method.equals("modifyGroupIntroduction")) {
- String groupId = call.argument("groupId");
- String setIntroduction = call.argument("setIntroduction");
-
- TIMGroupManager.ModifyGroupInfoParam param = new TIMGroupManager.ModifyGroupInfoParam(groupId);
- param.setIntroduction(setIntroduction);
- TIMGroupManager.getInstance().modifyGroupInfo(param, new TIMCallBack() {
- @Override
- public void onError(int code, String desc) {
- Log.e(TAG, "modify group info failed, code:" + code + "|desc:" + desc);
- result.error(desc, "modify group info failed, code:" + code, null);
- }
-
- @Override
- public void onSuccess() {
- Log.e(TAG, "modify group info succ");
- result.success("modify group info succ");
- }
- });
- } else if (call.method.equals("modifyGroupNotification")) {
- String groupId = call.argument("groupId");
- String notification = call.argument("notification");
- String time = call.argument("time");
-
- TIMGroupManager.ModifyGroupInfoParam param = new TIMGroupManager.ModifyGroupInfoParam(groupId);
- param.setNotification(notification);
- param.setIntroduction(time);
- TIMGroupManager.getInstance().modifyGroupInfo(param, new TIMCallBack() {
- @Override
- public void onError(int code, String desc) {
- Log.e(TAG, "modify group info failed, code:" + code + "|desc:" + desc);
- result.error(desc, "modify group info failed, code:" + code, null);
- }
-
- @Override
- public void onSuccess() {
- Log.e(TAG, "modify group info succ");
- result.success("modify group info succ");
- }
- });
- } else if (call.method.equals("setReceiveMessageOption")) {
- String groupId = call.argument("groupId");
- String identifier = call.argument("identifier");
- int type = call.argument("type");
-
- TIMGroupManager.ModifyMemberInfoParam param = new TIMGroupManager.ModifyMemberInfoParam(groupId, identifier);
- param.setReceiveMessageOpt(type == 1 ? TIMGroupReceiveMessageOpt.ReceiveAndNotify : TIMGroupReceiveMessageOpt.ReceiveNotNotify);
-
- TIMGroupManager.getInstance().modifyMemberInfo(param, new TIMCallBack() {
- @Override
- public void onError(int code, String desc) {
- Log.e(TAG, "modifyMemberInfo failed, code:" + code + "|msg: " + desc);
- result.error(desc, "modifyMemberInfo failed, code:" + code, null);
- }
-
- @Override
- public void onSuccess() {
- Log.d(TAG, "modifyMemberInfo succ");
- result.success("modifyMemberInfo succ");
- }
- });
- } else if (call.method.equals("getPendencyList")) {
- final TIMFriendPendencyRequest timFriendPendencyRequest = new TIMFriendPendencyRequest();
- timFriendPendencyRequest.setTimPendencyGetType(TIMPendencyType.TIM_PENDENCY_COME_IN);
- timFriendPendencyRequest.setSeq(0);
- timFriendPendencyRequest.setTimestamp(0);
- timFriendPendencyRequest.setNumPerPage(10);
- TIMFriendshipManager.getInstance().getPendencyList(timFriendPendencyRequest, new TIMValueCallBack<TIMFriendPendencyResponse>() {
- @Override
- public void onError(int i, String s) {
- Log.e(TAG, "getPendencyList err code = " + i + ", desc = " + s);
- }
-
- @Override
- public void onSuccess(TIMFriendPendencyResponse timFriendPendencyResponse) {
- List<TIMFriendPendencyItem> items = timFriendPendencyResponse.getItems();
-
- List mData = new ArrayList<>();
-
- Iterator var3 = items.iterator();
-
- while (var3.hasNext()) {
- TIMFriendPendencyItem timFriendPendencyItem = (TIMFriendPendencyItem) var3.next();
- mData.add("{'id':'" + timFriendPendencyItem.getIdentifier() + "',"
- + "'addSource':'" + timFriendPendencyItem.getAddSource() + "',"
- + "'wording':'" + timFriendPendencyItem.getAddWording() + "',"
- + "'nickname':'" + timFriendPendencyItem.getNickname() + "',"
- + "'time':'" + timFriendPendencyItem.getAddTime() + "',"
- + "'type':'" + timFriendPendencyItem.getType() + "',"
- + "}"
- );
- }
- Log.i(TAG, "getPendencyList success result = " + timFriendPendencyResponse.toString());
- result.success(mData.toString());
- }
- });
- } else if (call.method.equals("getSelfProfile")) {
- //获取服务器保存的自己的资料
- TIMFriendshipManager.getInstance().getSelfProfile(new TIMValueCallBack<TIMUserProfile>() {
- @Override
- public void onError(int code, String desc) {
- //错误码 code 和错误描述 desc，可用于定位请求失败原因
- //错误码 code 列表请参见错误码表
- Log.e(TAG, "getSelfProfile failed: " + code + " desc");
- result.error(desc, "getSelfProfile failed, code:" + code, null);
- }
-
- @Override
- public void onSuccess(TIMUserProfile resultS) {
- Log.e(TAG, "getSelfProfile succ");
- Log.e(TAG, "identifier: " + resultS.getIdentifier() + " nickName: " + resultS.getNickName()
- + " allow: " + resultS.getAllowType());
- result.success("identifier: " + resultS.getIdentifier() + " nickName: " + resultS.getNickName()
- + " allow: " + resultS.getAllowType());
- }
- });
- } else if (call.method.equals("setAddMyWay")) {
- int type = call.argument("type");
- HashMap<String, Object> profileMap = new HashMap<>();
- profileMap.put(TIMUserProfile.TIM_PROFILE_TYPE_KEY_ALLOWTYPE, type == 1 ? TIMFriendAllowType.TIM_FRIEND_NEED_CONFIRM : TIMFriendAllowType.TIM_FRIEND_ALLOW_ANY);
- TIMFriendshipManager.getInstance().modifySelfProfile(profileMap, new TIMCallBack() {
- @Override
- public void onError(int code, String desc) {
- Log.e(TAG, "modifySelfProfile failed: " + code + " desc" + desc);
- result.error(desc, String.valueOf(code), null);
- }
-
- @Override
- public void onSuccess() {
- Log.e(TAG, "setAddMyWay success");
- result.success("setsetAddMyWay succ");
- }
- });
- } else if (call.method.equals("im_autoLogin")) {
- if (!TextUtils.isEmpty(TIMManager.getInstance().getLoginUser())) {
- result.error("login failed. ", "user is login", "user is already login ,you should login out first");
- return;
- }
- String identifier = call.argument("identifier");
- // identifier为用户名，userSig 为用户登录凭证
- TIMManager.getInstance().autoLogin(identifier, new TIMCallBack() {
- @Override
- public void onError(int code, String desc) {
- Log.e(TAG, "autoLogin failed: " + code + " desc" + desc);
- result.error(desc, String.valueOf(code), null);
- }
-
- @Override
- public void onSuccess() {
- Log.e(TAG, "autoLogin succ");
- result.success("autoLogin succ");
- }
- });
- } else if (call.method.equals("getLoginUser")) {
- if (!TextUtils.isEmpty(TIMManager.getInstance().getLoginUser())) {
- result.error("login failed. ", "user is login", "user is already login ,you should login out first");
- return;
- }
- result.success(TIMManager.getInstance().getLoginUser());
- } else if (call.method.equals("initStorage")) {
- String identifier = call.argument("identifier");
-
- TIMManager.getInstance().initStorage(identifier, new TIMCallBack() {
- @Override
- public void onError(int code, String desc) {
- Log.d(TAG, "initStorage failed. code: " + code + " errmsg: " + desc);
- result.error("initStorage", " failed. code: " + code, null);
- }
-
- @Override
- public void onSuccess() {
- result.success("initStorage success");
- }
- });
- } else if (call.method.equals("getSelfGroupNameCard")) {
- String groupId = call.argument("groupId");
-
- TIMGroupManager.getInstance().getSelfInfo(
- groupId, new TIMValueCallBack<TIMGroupSelfInfo>() {
- @Override
- public void onError(int i, String s) {
- Log.d(TAG, "getSelfGroupNameCard error. code: " + i + " errmsg: " + s);
- result.error("获取自己群名片信息失败", "代码：" + i, s);
- }
-
- @Override
- public void onSuccess(TIMGroupSelfInfo timGroupSelfInfo) {
- Log.d(TAG, "getSelfGroupNameCard success");
- result.success(timGroupSelfInfo.getNameCard());
- }
- }
- );
- } else if (call.method.equals("setGroupNameCard")) {
- String groupId = call.argument("groupId");
- String identifier = call.argument("identifier");
- String name = call.argument("name");
-
- TIMGroupManager.ModifyMemberInfoParam param = new TIMGroupManager.ModifyMemberInfoParam(groupId, identifier);
- param.setNameCard(name);
-
- TIMGroupManager.getInstance().modifyMemberInfo(param, new TIMCallBack() {
- @Override
- public void onError(int code, String desc) {
- Log.e(TAG, "modifyMemberInfo failed, code:" + code + "|msg: " + desc);
- }
-
- @Override
- public void onSuccess() {
- Log.d(TAG, "modifyMemberInfo succ");
- result.success("modifyMemberInfo succ");
- }
- });
- } else if (call.method.equals("revokeMessage")) {
- int type = call.argument("type");
- String conversationId = call.argument("conversationId");
-
- TIMConversation timConversation = TIMManager.getInstance().getConversation(type == 1 ? TIMConversationType.C2C : TIMConversationType.Group,
- conversationId);
- TIMMessage msg = new TIMMessage();
-// msg.setCustomInt();
- timConversation.revokeMessage(msg, new TIMCallBack() {
- @Override
- public void onError(int code, String desc) {
- Log.d(TAG, "revokeMessage failed. code: " + code + " errmsg: " + desc);
- result.error("撤回失败", "代码：" + code, desc);
- }
-
- @Override
- public void onSuccess() {
- Log.d(TAG, "撤回成功");
- result.success("撤回成功");
- }
- });
- } else if (call.method.equals("findMessages")) {
- int type = call.argument("type");
- String conversationId = call.argument("conversationId");
-
- TIMConversation timConversation = TIMManager.getInstance().getConversation(type == 1 ? TIMConversationType.C2C : TIMConversationType.Group,
- conversationId);
- List<TIMMessageLocator> locators = new ArrayList<>();
-// for(int i = 0;i< locators.size();i++) {
-// TIMMessageLocator timMessageLocator = locators.get(i);
-//
-// timMessageLocator.toString();
-// }
- timConversation.findMessages(locators, new TIMValueCallBack<List<TIMMessage>>() {
- @Override
- public void onError(int i, String s) {
-
- }
-
- @Override
- public void onSuccess(List<TIMMessage> timMessages) {
-
- }
- });
- } else if (call.method.equals("getGroupMembersInfo")) {
- String groupId = call.argument("groupId");
- List<String> userIDs = call.argument("userIDs");
-
- TIMGroupManager.getInstance().getGroupMembersInfo(
- groupId, userIDs, new TIMValueCallBack<List<TIMGroupMemberInfo>>() {
- @Override
- public void onError(int i, String s) {
- Log.d(TAG, "failed. code: " + i + " errmsg: " + s);
- result.error(null, "failed. code: ", i);
- }
-
- @Override
- public void onSuccess(List<TIMGroupMemberInfo> timGroupMemberInfos) {
- List<String> mData = new ArrayList<>();
- for (TIMGroupMemberInfo infoIM : timGroupMemberInfos) {
- mData.add("{'user':'" + infoIM.getUser() + "'," +
- "'joinTime':'" + infoIM.getJoinTime() + "'," +
- "'nameCard':'" + infoIM.getNameCard() + "'," +
- "'msgFlag':'" + infoIM.getMsgFlag() + "'," +
- "'msgSeq':'" + infoIM.getMsgSeq() + "'," +
- "'silenceSeconds':'" + infoIM.getSilenceSeconds() + "'," +
- "'tinyId':'" + infoIM.getTinyId() + "'," +
- "'role':'" + infoIM.getRole() + "'}");
- }
- result.success(mData.toString());
- }
- }
- );
- } else if (call.method.equals("getGroupInfoList")) {
- List<String> groupID = call.argument("groupID");
-
- TIMGroupManager.getInstance().getGroupInfo(groupID, new TIMValueCallBack<List<TIMGroupDetailInfoResult>>() {
- @Override
- public void onError(final int code, final String desc) {
- Log.e(TAG, "loadGroupPublicInfo failed, code: " + code + "|desc: " + desc);
- result.error(desc, "error Code" + code, null);
- }
-
- @Override
- public void onSuccess(final List<TIMGroupDetailInfoResult> timGroupDetailInfoResults) {
- List<String> mData = new ArrayList<>();
-
- if (timGroupDetailInfoResults.size() > 0) {
- TIMGroupDetailInfoResult info = timGroupDetailInfoResults.get(0);
- mData.add("{'faceUrl': " + "'" + info.getFaceUrl() + "'");
- mData.add("'groupId': " + "'" + info.getGroupId() + "'");
- mData.add("'groupIntroduction': " + "'" + info.getGroupIntroduction() + "'");
- mData.add("'groupName': " + "'" + info.getGroupName() + "'");
- mData.add("'groupNotification': " + "'" + info.getGroupNotification() + "'");
- mData.add("'groupOwner': " + "'" + info.getGroupOwner() + "'");
- mData.add("'groupType': " + "'" + info.getGroupType() + "'");
- mData.add("'lastInfoTime': " + "'" + info.getLastInfoTime() + "'");
- mData.add("'lastMsgTime': " + "'" + info.getLastMsgTime() + "'");
- mData.add("'createTime': " + "'" + info.getCreateTime() + "'");
- mData.add("'memberNum': " + "'" + info.getMemberNum() + "'");
- mData.add("'maxMemberNum': " + "'" + info.getMaxMemberNum() + "'");
- mData.add("'OnlineMemberNum': " + "'" + info.getOnlineMemberNum() + "'" + "}");
- }
- result.success(mData.toString());
- }
- });
- } else if (call.method.equals("getGroupList")) {
- //创建回调
- TIMValueCallBack<List<TIMGroupBaseInfo>> cb = new TIMValueCallBack<List<TIMGroupBaseInfo>>() {
- @Override
- public void onError(int code, String desc) {
- //错误码 code 和错误描述 desc，可用于定位请求失败原因
- //错误码 code 含义请参见错误码表·
- Log.e(TAG, "get gruop list failed: " + code + " desc");
-// result.error(desc, "error Code" + code, null);
- }
-
- @Override
- public void onSuccess(List<TIMGroupBaseInfo> timGroupInfos) {//参数返回各群组基本信息
- Log.d(TAG, "get gruop list succ");
- List<String> mData = new ArrayList<>();
- for (TIMGroupBaseInfo info : timGroupInfos) {
- mData.add("{'groupId':'" + info.getGroupId() + "',"
- + "'groupName':'" + info.getGroupName() + "',"
- + "'getFaceUrl':'" + info.getFaceUrl() + "'}");
-
- Log.d(TAG, "group id: " + info.getGroupId() +
- " group name: " + info.getGroupName() +
- " getFaceUrl: " + info.getFaceUrl());
-
- }
- result.success(mData.toString());
- }
- };
-
-//获取已加入的群组列表
- TIMGroupManager.getInstance().getGroupList(cb);
- } else if (call.method.equals("createGroupChat")) {
- String name = call.argument("name");
- List<String> personList = call.argument("personList");
-
- //创建公开群，且不自定义群 ID
- final TIMGroupManager.CreateGroupParam param = new TIMGroupManager.CreateGroupParam("Private", name);
- List<TIMGroupMemberInfo> infoS = new ArrayList<>();
-
- for (int i = 0; i < personList.size(); i++) {
- TIMGroupMemberInfo memberInfo = new TIMGroupMemberInfo(personList.get(i));
- infoS.add(memberInfo);
- }
-
- param.setMembers(infoS);
- param.setNotification("welcome to our group");
-
-// NineCellBitmapUtil nineCellBitmapUtil;
-//
-// String[] urlArray = {
-// "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1538451017&di=dd252d5e4594f786d34891fb6be826ff&imgtype=jpg&er=1&src=http%3A%2F%2Fimg5.duitang.com%2Fuploads%2Fitem%2F201311%2F28%2F20131128101128_JZUaM.jpeg",
-// "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1537856300317&di=e4aebfba49e34aa5bd8de8346b268229&imgtype=0&src=http%3A%2F%2Fs9.knowsky.com%2Fbizhi%2Fl%2F35001-45000%2F20095294542896291195.jpg",
-// "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1537856300315&di=8def4a51ac362ffa7602ca768d76c982&imgtype=0&src=http%3A%2F%2Fg.hiphotos.baidu.com%2Fzhidao%2Fpic%2Fitem%2Ff9198618367adab44ce126ab8bd4b31c8701e420.jpg",
-// "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1537345745067&di=d51264f2b354863c865a1da4b6672d90&imgtype=0&src=http%3A%2F%2Fpic40.nipic.com%2F20140426%2F6608733_175243397000_2.jpg",
-// "https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=3394638573,2701566035&fm=26&gp=0.jpg",
-// "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2758635669,3034136689&fm=26&gp=0.jpg",
-// "http://t.cn/EvHONPF",
-// "http://t.cn/EvHOTa9",
-// "http://t.cn/EvHO38y",
-// };
-// List<String> imgList = new ArrayList<>();
-// // 实例化这个这个工具类，默认聚合的图片尺寸是1000像素，每张图的间距是20像素
-// nineCellBitmapUtil = NineCellBitmapUtil.with().setBitmapSize(1000)
-// .setItemMargin(20).setPaddingSize(20).build();
-// imgList.add(urlArray[1]);
-// imgList.add(urlArray[2]);
-
-// nineCellBitmapUtil.collectBitmap(imgList, new NineCellBitmapUtil.BitmapCallBack() {
-// @Override
-// public void onLoadingFinish(Bitmap bitmap) {
-// }
-// });
-
-//创建群组
- TIMGroupManager.getInstance().createGroup(param, new TIMValueCallBack<String>() {
- @Override
- public void onError(int code, String desc) {
- Log.d(TAG, "create group failed. code: " + code + " errmsg: " + desc);
- result.error(desc, String.valueOf(code), null);
- }
-
- @Override
- public void onSuccess(String s) {
- Log.d(TAG, "create group succ, groupId:" + s);
- result.success("create group succ, groupId:" + s);
- }
- });
-
- } else if (call.method.equals("editFriendNotes")) {
- String identifier = call.argument("identifier");
- String remarks = call.argument("remarks");
- HashMap<String, Object> hashMap = new HashMap<>();
-// 修改好友备注
- hashMap.put(TIMFriend.TIM_FRIEND_PROFILE_TYPE_KEY_REMARK, remarks);
- TIMFriendshipManager.getInstance().modifyFriend(identifier, hashMap, new TIMCallBack() {
- @Override
- public void onError(int i, String s) {
- Log.e(TAG, "editFriendNotes err code = " + i + ", desc = " + s);
- result.error(s, String.valueOf(i), null);
- }
-
- @Override
- public void onSuccess() {
- Log.i(TAG, "editFriendNotes success");
- result.success("editFriendNotes success");
- }
- });
- } else if (call.method.equals("getRemark")) {
- try {
- String identifier = call.argument("identifier");
-// 获取好友备注
- TIMFriend friend = TIMFriendshipManager.getInstance().queryFriend(identifier);
- if (friend != null) {
- result.success(friend.getRemark());
- } else {
- result.error("获取状态：", "失败", null);
- }
- } catch (NullPointerException e) {
- System.out.println("字符为空!" + e);
- }
- } else if (call.method.equals("getGroupMembersList")) {
- String groupId = call.argument("groupId");
-
-// final List<String> userS = new ArrayList<>();
- final List<String> mData = new ArrayList<>();
-
- //创建回调
- TIMValueCallBack<List<TIMGroupMemberInfo>> cb = new TIMValueCallBack<List<TIMGroupMemberInfo>>() {
- @Override
- public void onError(int code, String desc) {
- Log.e(TAG, "getGroupMembersList onErr. code: " + code + " errmsg: " + desc);
- result.error(desc, "getGroupMembersList on Err code: " + code, null);
- }
-
- @Override
- public void onSuccess(List<TIMGroupMemberInfo> infoList) {//参数返回群组成员信息
-
- for (TIMGroupMemberInfo infoIM : infoList) {
-// userS.add(infoIM.getUser());
- mData.add("{'user':'" + infoIM.getUser() + "'");
- mData.add("'joinTime':'" + infoIM.getJoinTime() + "'," +
- "'nameCard':'" + infoIM.getNameCard() + "'," +
- "'msgFlag':'" + infoIM.getMsgFlag() + "'," +
- "'msgSeq':'" + infoIM.getMsgSeq() + "'," +
- "'silenceSeconds':'" + infoIM.getSilenceSeconds() + "'," +
- "'tinyId':'" + infoIM.getTinyId() + "'," +
- "'role':'" + infoIM.getRole() + "'}");
- }
- result.success(mData.toString());
- }
- };
-
-// TIMFriendshipManager.getInstance().getUsersProfile(userS, true, new TIMValueCallBack<List<TIMUserProfile>>() {
-// @Override
-// public void onError(int code, String desc) {
-// //错误码 code 和错误描述 desc，可用于定位请求失败原因
-// //错误码 code 列表请参见错误码表
-// Log.e(TAG, "getUsersProfile failed: " + code + " desc");
-// }
-//
-// @Override
-// public void onSuccess(List<TIMUserProfile> timUserProfiles) {
-// if (timUserProfiles != null && timUserProfiles.size() > 0) {
-// TIMUserProfile info = timUserProfiles.get(0);
-// mData.add("'nickName':'" + info.getNickName() + "'");
-// mData.add("'allowType':'" + info.getAllowType() + "'");
-// mData.add("'faceUrl':'" + info.getFaceUrl() + "'");
-// mData.add("'identifier':'" + info.getIdentifier() + "'");
-// } else {
-// mData.add("'info':" + "[]");
-// }
-//
-// }
-// });
-
-//获取群组成员信息
- TIMGroupManager.getInstance().getGroupMembers(
- groupId, cb); //回调
-
- } else if (call.method.equals("inviteGroupMember")) {
- //创建待加入群组的用户列表
- ArrayList list = call.argument("list");
- String groupId = call.argument("groupId");
-
- TIMGroupManager.getInstance().inviteGroupMember(groupId, list, new TIMValueCallBack<List<TIMGroupMemberResult>>() {
- @Override
- public void onError(int code, String desc) {
- Log.e(TAG, "addGroupMembers failed, code: " + code + "|desc: " + desc);
- result.error(desc, "code:" + code, null);
- }
-
- @Override
- public void onSuccess(List<TIMGroupMemberResult> timGroupMemberResults) {
- Log.e(TAG, "邀请执行完毕");
- final List<String> adds = new ArrayList<>();
-
- if (timGroupMemberResults.size() > 0) {
- for (int i = 0; i < timGroupMemberResults.size(); i++) {
- TIMGroupMemberResult res = timGroupMemberResults.get(i);
- if (res.getResult() == 3) {
-// result.success("邀请成功，等待对方接受");
- return;
- }
- if (res.getResult() > 0) {
- adds.add(res.getUser());
- }
- }
- Log.e(TAG, "邀请成功，等待对方接受");
- result.success("邀请成功");
- }
- if (adds.size() > 0) {
- Log.e(TAG, "adds.size() > 0");
- }
- }
- });
- } else if (call.method.equals("quitGroup")) {
-
- String groupId = call.argument("groupId");
-
- TIMGroupManager.getInstance().quitGroup(groupId, new TIMCallBack() {
- @Override
- public void onError(int code, String desc) {
- Log.e(TAG, "quitGroup failed, code: " + code + "|desc: " + desc);
- result.error(desc, "quitGroup failed, code: " + code, null);
- }
-
- @Override
- public void onSuccess() {
- Log.e(TAG, "quit group succ");
- result.success("quit group succ");
- }
- });
- } else if (call.method.equals("deleteGroupMember")) {
- String groupId = call.argument("groupId");
- ArrayList deleteList = call.argument("deleteList");
-
- TIMGroupManager.DeleteMemberParam param = new TIMGroupManager.DeleteMemberParam(groupId, deleteList);
- param.setReason("some reason");
-
- TIMGroupManager.getInstance().deleteGroupMember(param, new TIMValueCallBack<List<TIMGroupMemberResult>>() {
- @Override
- public void onError(int code, String desc) {
- Log.e(TAG, "deleteGroupMember onErr. code: " + code + " errmsg: " + desc);
- result.error(desc, "deleteGroup on Err code: " + code, null);
- }
-
- @Override
- public void onSuccess(List<TIMGroupMemberResult> results) { //群组成员操作结果
- List<String> mData = new ArrayList<>();
-
- for (TIMGroupMemberResult r : results) {
- Log.d(TAG, "result: " + r.getResult() //操作结果: 0：删除失败；1：删除成功；2：不是群组成员
- + " user: " + r.getUser()); //用户帐号
- mData.add("result:" + r.getResult()
- + "user:" + r.getUser());
- }
- result.success(mData.toString());
-
- }
- });
- } else {
- result.notImplemented();
- }
- }
-
- @Override
- public void onListen(Object o, EventChannel.EventSink eventSink) {
- this.eventSink = eventSink;
- }
-
- @Override
- public void onCancel(Object o) {
- Log.e(TAG, "onCancel() called with: o = [" + o + "]");
- }
-
-
- class Message {
- TIMUserProfile senderProfile;
- TIMConversation timConversation;
- TIMGroupMemberInfo timGroupMemberInfo;
- long timeStamp;
- TIMElem message;
-
- Message(TIMMessage timMessage) {
- timMessage.getSenderProfile(new TIMValueCallBack<TIMUserProfile>() {
- @Override
- public void onError(int i, String s) {
-
- }
-
- @Override
- public void onSuccess(TIMUserProfile timUserProfile) {
- senderProfile = timUserProfile;
- }
- });
- timConversation = timMessage.getConversation();
- message = timMessage.getElement(0);
- timeStamp = timMessage.timestamp();
- timGroupMemberInfo = timMessage.getSenderGroupMemberProfile();
- }
- }
-}
diff --git a/plugin/wechat_flutter_plugin/android/src/main/java/com/brzhang/flutter/dim/GenerateTestUserSig.java b/plugin/wechat_flutter_plugin/android/src/main/java/com/brzhang/flutter/dim/GenerateTestUserSig.java
deleted file mode 100644
index dfb9bca..0000000
--- a/plugin/wechat_flutter_plugin/android/src/main/java/com/brzhang/flutter/dim/GenerateTestUserSig.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.brzhang.flutter.dim;
-
-import android.text.TextUtils;
-import android.util.Base64;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.Charset;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.util.Arrays;
-import java.util.zip.Deflater;
-
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
-
-public class GenerateTestUserSig {
-
- public static final int SDKAPPID = 1400250651;
- private static final int EXPIRETIME = 66604800;
-
- private static final String SECRETKEY = "4236133554a57c8fa7ae748534177e97cac28b0750f57ca2edbb974a17a14544";
-
- public static String genTestUserSig(String userId) {
- return GenTLSSignature(SDKAPPID, userId, EXPIRETIME, null, SECRETKEY);
- }
-
- private static String GenTLSSignature(long sdkappid, String userId, long expire, byte[] userbuf, String priKeyContent) {
- if (TextUtils.isEmpty(priKeyContent)) {
- return "";
- }
- long currTime = System.currentTimeMillis() / 1000;
- JSONObject sigDoc = new JSONObject();
- try {
- sigDoc.put("TLS.ver", "2.0");
- sigDoc.put("TLS.identifier", userId);
- sigDoc.put("TLS.sdkappid", sdkappid);
- sigDoc.put("TLS.expire", expire);
- sigDoc.put("TLS.time", currTime);
- } catch (JSONException e) {
- e.printStackTrace();
- }
-
- String base64UserBuf = null;
- if (null != userbuf) {
- base64UserBuf = Base64.encodeToString(userbuf, Base64.NO_WRAP);
- try {
- sigDoc.put("TLS.userbuf", base64UserBuf);
- } catch (JSONException e) {
- e.printStackTrace();
- }
- }
- String sig = hmacsha256(sdkappid, userId, currTime, expire, priKeyContent, base64UserBuf);
- if (sig.length() == 0) {
- return "";
- }
- try {
- sigDoc.put("TLS.sig", sig);
- } catch (JSONException e) {
- e.printStackTrace();
- }
- Deflater compressor = new Deflater();
- compressor.setInput(sigDoc.toString().getBytes(Charset.forName("UTF-8")));
- compressor.finish();
- byte[] compressedBytes = new byte[2048];
- int compressedBytesLength = compressor.deflate(compressedBytes);
- compressor.end();
- return new String(base64EncodeUrl(Arrays.copyOfRange(compressedBytes, 0, compressedBytesLength)));
- }
-
-
- private static String hmacsha256(long sdkappid, String userId, long currTime, long expire, String priKeyContent, String base64Userbuf) {
- String contentToBeSigned = "TLS.identifier:" + userId + "\n"
- + "TLS.sdkappid:" + sdkappid + "\n"
- + "TLS.time:" + currTime + "\n"
- + "TLS.expire:" + expire + "\n";
- if (null != base64Userbuf) {
- contentToBeSigned += "TLS.userbuf:" + base64Userbuf + "\n";
- }
- try {
- byte[] byteKey = priKeyContent.getBytes("UTF-8");
- Mac hmac = Mac.getInstance("HmacSHA256");
- SecretKeySpec keySpec = new SecretKeySpec(byteKey, "HmacSHA256");
- hmac.init(keySpec);
- byte[] byteSig = hmac.doFinal(contentToBeSigned.getBytes("UTF-8"));
- return new String(Base64.encode(byteSig, Base64.NO_WRAP));
- } catch (UnsupportedEncodingException e) {
- return "";
- } catch (NoSuchAlgorithmException e) {
- return "";
- } catch (InvalidKeyException e) {
- return "";
- }
- }
-
- private static byte[] base64EncodeUrl(byte[] input) {
- byte[] base64 = new String(Base64.encode(input, Base64.NO_WRAP)).getBytes();
- for (int i = 0; i < base64.length; ++i)
- switch (base64[i]) {
- case '+':
- base64[i] = '*';
- break;
- case '/':
- base64[i] = '-';
- break;
- case '=':
- base64[i] = '_';
- break;
- default:
- break;
- }
- return base64;
- }
-
-}
diff --git a/plugin/wechat_flutter_plugin/example/.gitignore b/plugin/wechat_flutter_plugin/example/.gitignore
deleted file mode 100644
index dee655c..0000000
--- a/plugin/wechat_flutter_plugin/example/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-.DS_Store
-.dart_tool/
-
-.packages
-.pub/
-
-build/
-
-.flutter-plugins
diff --git a/plugin/wechat_flutter_plugin/example/.metadata b/plugin/wechat_flutter_plugin/example/.metadata
deleted file mode 100644
index 5e1fea3..0000000
--- a/plugin/wechat_flutter_plugin/example/.metadata
+++ /dev/null
@@ -1,8 +0,0 @@
-# This file tracks properties of this Flutter project.
-# Used by Flutter tool to assess capabilities and perform upgrades etc.
-#
-# This file should be version controlled and should not be manually edited.
-
-version:
- revision: 1cb2677234175e0d7e06742eef6e865a755f07ff
- channel: master
diff --git a/plugin/wechat_flutter_plugin/example/android/.gitignore b/plugin/wechat_flutter_plugin/example/android/.gitignore
deleted file mode 100644
index 65b7315..0000000
--- a/plugin/wechat_flutter_plugin/example/android/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-*.iml
-*.class
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
-/build
-/captures
-GeneratedPluginRegistrant.java
diff --git a/plugin/wechat_flutter_plugin/example/android/app/build.gradle b/plugin/wechat_flutter_plugin/example/android/app/build.gradle
deleted file mode 100644
index 76c49ff..0000000
--- a/plugin/wechat_flutter_plugin/example/android/app/build.gradle
+++ /dev/null
@@ -1,63 +0,0 @@
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
- localPropertiesFile.withReader('UTF-8') { reader ->
- localProperties.load(reader)
- }
-}
-
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
- throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
- throw new GradleException("versionCode not found. Define flutter.versionCode in the local.properties file.")
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
- throw new GradleException("versionName not found. Define flutter.versionName in the local.properties file.")
-}
-
-apply plugin: 'com.android.application'
-//apply plugin: 'kotlin-android'
-//apply plugin: 'com.android.application'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
-android {
- compileSdkVersion 27
-
- lintOptions {
- disable 'InvalidPackage'
- }
-
- defaultConfig {
- // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
- applicationId "com.brzhang.flutter.dimexample"
- minSdkVersion 16
- targetSdkVersion 27
- versionCode flutterVersionCode.toInteger()
- versionName flutterVersionName
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
- }
-
- buildTypes {
- release {
- // TODO: Add your own signing config for the release build.
- // Signing with the debug keys for now, so `flutter run --release` works.
- signingConfig signingConfigs.debug
- }
- }
-}
-
-flutter {
- source '../..'
-}
-
-dependencies {
- testImplementation 'junit:junit:4.12'
- androidTestImplementation 'com.android.support.test:runner:1.0.2'
- androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-}
diff --git a/plugin/wechat_flutter_plugin/example/android/app/src/main/AndroidManifest.xml b/plugin/wechat_flutter_plugin/example/android/app/src/main/AndroidManifest.xml
deleted file mode 100644
index 7b97d4a..0000000
--- a/plugin/wechat_flutter_plugin/example/android/app/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="com.brzhang.flutter.dimexample">
-
- <!-- The INTERNET permission is required for development. Specifically,
- flutter needs it to communicate with the running application
- to allow setting breakpoints, to provide hot reload, etc.
- -->
- <!-- io.flutter.app.FlutterApplication is an android.app.Application that
- calls FlutterMain.startInitialization(this); in its onCreate method.
- In most cases you can leave this as-is, but you if you want to provide
- additional functionality it is fine to subclass or reimplement
- FlutterApplication and put your custom class here. -->
- <application
- android:name="io.flutter.app.FlutterApplication"
- android:icon="@mipmap/ic_launcher">
- <activity
- android:name=".MainActivity"
- android:launchMode="singleTop"
- android:theme="@style/LaunchTheme"
- android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density"
- android:hardwareAccelerated="true"
- android:windowSoftInputMode="adjustResize">
- <!-- This keeps the window background of the activity showing
- until Flutter renders its first frame. It can be removed if
- there is no splash screen (such as the default splash screen
- defined in @style/LaunchTheme). -->
- <meta-data
- android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
- android:value="true" />
- <intent-filter>
- <action android:name="android.intent.action.MAIN"/>
- <category android:name="android.intent.category.LAUNCHER"/>
- </intent-filter>
- </activity>
- </application>
-</manifest>
diff --git a/plugin/wechat_flutter_plugin/example/android/app/src/main/java/com/brzhang/flutter/dimexample/MainActivity.java b/plugin/wechat_flutter_plugin/example/android/app/src/main/java/com/brzhang/flutter/dimexample/MainActivity.java
deleted file mode 100644
index 875ca5a..0000000
--- a/plugin/wechat_flutter_plugin/example/android/app/src/main/java/com/brzhang/flutter/dimexample/MainActivity.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.brzhang.flutter.dimexample;
-
-import android.os.Bundle;
-import io.flutter.app.FlutterActivity;
-import io.flutter.plugins.GeneratedPluginRegistrant;
-
-public class MainActivity extends FlutterActivity {
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- GeneratedPluginRegistrant.registerWith(this);
- }
-}
diff --git a/plugin/wechat_flutter_plugin/example/android/app/src/main/res/drawable/launch_background.xml b/plugin/wechat_flutter_plugin/example/android/app/src/main/res/drawable/launch_background.xml
deleted file mode 100644
index 304732f..0000000
--- a/plugin/wechat_flutter_plugin/example/android/app/src/main/res/drawable/launch_background.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Modify this file to customize your launch splash screen -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@android:color/white" />
-
- <!-- You can insert your own image assets here -->
- <!-- <item>
- <bitmap
- android:gravity="center"
- android:src="@mipmap/launch_image" />
- </item> -->
-</layer-list>
diff --git a/plugin/wechat_flutter_plugin/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/plugin/wechat_flutter_plugin/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index e69de29..0000000
diff --git a/plugin/wechat_flutter_plugin/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/plugin/wechat_flutter_plugin/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index e69de29..0000000
diff --git a/plugin/wechat_flutter_plugin/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/plugin/wechat_flutter_plugin/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index e69de29..0000000
diff --git a/plugin/wechat_flutter_plugin/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/plugin/wechat_flutter_plugin/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index e69de29..0000000
diff --git a/plugin/wechat_flutter_plugin/example/android/app/src/main/res/values/styles.xml b/plugin/wechat_flutter_plugin/example/android/app/src/main/res/values/styles.xml
deleted file mode 100644
index 00fa441..0000000
--- a/plugin/wechat_flutter_plugin/example/android/app/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
- <!-- Show a splash screen on the activity. Automatically removed when
- Flutter draws its first frame -->
- <item name="android:windowBackground">@drawable/launch_background</item>
- </style>
-</resources>
diff --git a/plugin/wechat_flutter_plugin/example/android/build.gradle b/plugin/wechat_flutter_plugin/example/android/build.gradle
deleted file mode 100644
index ae21629..0000000
--- a/plugin/wechat_flutter_plugin/example/android/build.gradle
+++ /dev/null
@@ -1,29 +0,0 @@
-buildscript {
- repositories {
- google()
- jcenter()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:3.1.4'
- }
-}
-
-allprojects {
- repositories {
- google()
- jcenter()
- }
-}
-
-rootProject.buildDir = '../build'
-subprojects {
- project.buildDir = "${rootProject.buildDir}/${project.name}"
-}
-subprojects {
- project.evaluationDependsOn(':app')
-}
-
-task clean(type: Delete) {
- delete rootProject.buildDir
-}
diff --git a/plugin/wechat_flutter_plugin/example/android/gradle.properties b/plugin/wechat_flutter_plugin/example/android/gradle.properties
deleted file mode 100644
index 8bd86f6..0000000
--- a/plugin/wechat_flutter_plugin/example/android/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-org.gradle.jvmargs=-Xmx1536M
diff --git a/plugin/wechat_flutter_plugin/example/android/gradle/wrapper/gradle-wrapper.properties b/plugin/wechat_flutter_plugin/example/android/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 9372d0f..0000000
--- a/plugin/wechat_flutter_plugin/example/android/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Fri Jun 23 08:50:38 CEST 2017
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/plugin/wechat_flutter_plugin/example/android/res/values/strings_en.arb b/plugin/wechat_flutter_plugin/example/android/res/values/strings_en.arb
deleted file mode 100644
index 9e26dfe..0000000
--- a/plugin/wechat_flutter_plugin/example/android/res/values/strings_en.arb
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/plugin/wechat_flutter_plugin/example/android/settings.gradle b/plugin/wechat_flutter_plugin/example/android/settings.gradle
deleted file mode 100644
index 5a2f14f..0000000
--- a/plugin/wechat_flutter_plugin/example/android/settings.gradle
+++ /dev/null
@@ -1,15 +0,0 @@
-include ':app'
-
-def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
-
-def plugins = new Properties()
-def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
-if (pluginsFile.exists()) {
- pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
-}
-
-plugins.each { name, path ->
- def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
- include ":$name"
- project(":$name").projectDir = pluginDirectory
-}
diff --git a/plugin/wechat_flutter_plugin/example/ios/.gitignore b/plugin/wechat_flutter_plugin/example/ios/.gitignore
deleted file mode 100644
index 79cc4da..0000000
--- a/plugin/wechat_flutter_plugin/example/ios/.gitignore
+++ /dev/null
@@ -1,45 +0,0 @@
-.idea/
-.vagrant/
-.sconsign.dblite
-.svn/
-
-.DS_Store
-*.swp
-profile
-
-DerivedData/
-build/
-GeneratedPluginRegistrant.h
-GeneratedPluginRegistrant.m
-
-.generated/
-
-*.pbxuser
-*.mode1v3
-*.mode2v3
-*.perspectivev3
-
-!default.pbxuser
-!default.mode1v3
-!default.mode2v3
-!default.perspectivev3
-
-xcuserdata
-
-*.moved-aside
-
-*.pyc
-*sync/
-Icon?
-.tags*
-
-/Flutter/app.flx
-/Flutter/app.zip
-/Flutter/flutter_assets/
-/Flutter/App.framework
-/Flutter/Flutter.framework
-/Flutter/Generated.xcconfig
-/ServiceDefinitions.json
-
-Pods/
-.symlinks/
diff --git a/plugin/wechat_flutter_plugin/example/ios/Frameworks/libstdc++.6.0.9.dylib b/plugin/wechat_flutter_plugin/example/ios/Frameworks/libstdc++.6.0.9.dylib
deleted file mode 100644
index e69de29..0000000
diff --git a/plugin/wechat_flutter_plugin/example/ios/Podfile b/plugin/wechat_flutter_plugin/example/ios/Podfile
deleted file mode 100644
index 442f9de..0000000
--- a/plugin/wechat_flutter_plugin/example/ios/Podfile
+++ /dev/null
@@ -1,69 +0,0 @@
-# Uncomment this line to define a global platform for your project
-# platform :ios, '9.0'
-
-# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
-ENV['COCOAPODS_DISABLE_STATS'] = 'true'
-
-project 'Runner', {
- 'Debug' => :debug,
- 'Profile' => :release,
- 'Release' => :release,
-}
-
-def parse_KV_file(file, separator='=')
- file_abs_path = File.expand_path(file)
- if !File.exists? file_abs_path
- return [];
- end
- pods_ary = []
- skip_line_start_symbols = ["#", "/"]
- File.foreach(file_abs_path) { |line|
- next if skip_line_start_symbols.any? { |symbol| line =~ /^\s*#{symbol}/ }
- plugin = line.split(pattern=separator)
- if plugin.length == 2
- podname = plugin[0].strip()
- path = plugin[1].strip()
- podpath = File.expand_path("#{path}", file_abs_path)
- pods_ary.push({:name => podname, :path => podpath});
- else
- puts "Invalid plugin specification: #{line}"
- end
- }
- return pods_ary
-end
-
-target 'Runner' do
- # Prepare symlinks folder. We use symlinks to avoid having Podfile.lock
- # referring to absolute paths on developers' machines.
- system('rm -rf .symlinks')
- system('mkdir -p .symlinks/plugins')
-
- # Flutter Pods
- generated_xcode_build_settings = parse_KV_file('./Flutter/Generated.xcconfig')
- if generated_xcode_build_settings.empty?
- puts "Generated.xcconfig must exist. If you're running pod install manually, make sure flutter packages get is executed first."
- end
- generated_xcode_build_settings.map { |p|
- if p[:name] == 'FLUTTER_FRAMEWORK_DIR'
- symlink = File.join('.symlinks', 'flutter')
- File.symlink(File.dirname(p[:path]), symlink)
- pod 'Flutter', :path => File.join(symlink, File.basename(p[:path]))
- end
- }
-
- # Plugin Pods
- plugin_pods = parse_KV_file('../.flutter-plugins')
- plugin_pods.map { |p|
- symlink = File.join('.symlinks', 'plugins', p[:name])
- File.symlink(p[:path], symlink)
- pod p[:name], :path => File.join(symlink, 'ios')
- }
-end
-
-post_install do |installer|
- installer.pods_project.targets.each do |target|
- target.build_configurations.each do |config|
- config.build_settings['ENABLE_BITCODE'] = 'NO'
- end
- end
-end
diff --git a/plugin/wechat_flutter_plugin/example/ios/Runner.xcodeproj/project.pbxproj b/plugin/wechat_flutter_plugin/example/ios/Runner.xcodeproj/project.pbxproj
deleted file mode 100644
index c701e01..0000000
--- a/plugin/wechat_flutter_plugin/example/ios/Runner.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,537 +0,0 @@
-// !$*UTF8*$!
-{
- archiveVersion = 1;
- classes = {
- };
- objectVersion = 46;
- objects = {
-
-/* Begin PBXBuildFile section */
- 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
- 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
- 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
- 3C15ACA622A24BE3003C43D6 /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
- 3C15ACA722A24BE3003C43D6 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
- 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
- 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
- 97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
- 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
- 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
- 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
- C98285B5217989FD5BDDF67A /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 35796FE62BEE201B6C6D4AFA /* libPods-Runner.a */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXCopyFilesBuildPhase section */
- 9705A1C41CF9048500538489 /* Embed Frameworks */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- dstPath = "";
- dstSubfolderSpec = 10;
- files = (
- 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */,
- 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */,
- );
- name = "Embed Frameworks";
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
- 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
- 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
- 35796FE62BEE201B6C6D4AFA /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
- 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
- 3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
- 3C218E46221A48DA003AAC4A /* libc++.1.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.1.tbd"; path = "usr/lib/libc++.1.tbd"; sourceTree = SDKROOT; };
- 411F62E6E4B1AD81E06A0A1C /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
- 53AEFCE64ECCB484E650958A /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
- 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
- 7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
- 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
- 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
- 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
- 9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = "<group>"; };
- 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
- 97C146F21CF9000F007C117D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
- 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
- 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
- 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
- 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
- FB3DA23121168E620047856F /* libstdc++.6.0.9.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libstdc++.6.0.9.dylib"; path = "Frameworks/libstdc++.6.0.9.dylib"; sourceTree = "<group>"; };
- FBD1B18A2115EBF400A149C2 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
- FBD1B18C2115EBFE00A149C2 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
- FBD1B18E2115EC4000A149C2 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; };
- FBD1B1902115EC4A00A149C2 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
- FBD1B1922115EC5700A149C2 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
- 97C146EB1CF9000F007C117D /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 3C15ACA622A24BE3003C43D6 /* App.framework in Frameworks */,
- 3C15ACA722A24BE3003C43D6 /* Flutter.framework in Frameworks */,
- C98285B5217989FD5BDDF67A /* libPods-Runner.a in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
- 6E4B875CC3B33BF1CAC69EA5 /* Pods */ = {
- isa = PBXGroup;
- children = (
- 53AEFCE64ECCB484E650958A /* Pods-Runner.debug.xcconfig */,
- 411F62E6E4B1AD81E06A0A1C /* Pods-Runner.release.xcconfig */,
- );
- name = Pods;
- sourceTree = "<group>";
- };
- 9740EEB11CF90186004384FC /* Flutter */ = {
- isa = PBXGroup;
- children = (
- 3B80C3931E831B6300D905FE /* App.framework */,
- 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
- 9740EEBA1CF902C7004384FC /* Flutter.framework */,
- 9740EEB21CF90195004384FC /* Debug.xcconfig */,
- 7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
- 9740EEB31CF90195004384FC /* Generated.xcconfig */,
- );
- name = Flutter;
- sourceTree = "<group>";
- };
- 97C146E51CF9000F007C117D = {
- isa = PBXGroup;
- children = (
- 9740EEB11CF90186004384FC /* Flutter */,
- 97C146F01CF9000F007C117D /* Runner */,
- 97C146EF1CF9000F007C117D /* Products */,
- 6E4B875CC3B33BF1CAC69EA5 /* Pods */,
- A9FCCDA67805A62246A310B9 /* Frameworks */,
- );
- sourceTree = "<group>";
- };
- 97C146EF1CF9000F007C117D /* Products */ = {
- isa = PBXGroup;
- children = (
- 97C146EE1CF9000F007C117D /* Runner.app */,
- );
- name = Products;
- sourceTree = "<group>";
- };
- 97C146F01CF9000F007C117D /* Runner */ = {
- isa = PBXGroup;
- children = (
- 7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */,
- 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */,
- 97C146FA1CF9000F007C117D /* Main.storyboard */,
- 97C146FD1CF9000F007C117D /* Assets.xcassets */,
- 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
- 97C147021CF9000F007C117D /* Info.plist */,
- 97C146F11CF9000F007C117D /* Supporting Files */,
- 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */,
- 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
- );
- path = Runner;
- sourceTree = "<group>";
- };
- 97C146F11CF9000F007C117D /* Supporting Files */ = {
- isa = PBXGroup;
- children = (
- 97C146F21CF9000F007C117D /* main.m */,
- );
- name = "Supporting Files";
- sourceTree = "<group>";
- };
- A9FCCDA67805A62246A310B9 /* Frameworks */ = {
- isa = PBXGroup;
- children = (
- 3C218E46221A48DA003AAC4A /* libc++.1.tbd */,
- FB3DA23121168E620047856F /* libstdc++.6.0.9.dylib */,
- FBD1B1922115EC5700A149C2 /* libc++.tbd */,
- FBD1B1902115EC4A00A149C2 /* libz.tbd */,
- FBD1B18E2115EC4000A149C2 /* libsqlite3.tbd */,
- FBD1B18C2115EBFE00A149C2 /* SystemConfiguration.framework */,
- FBD1B18A2115EBF400A149C2 /* CoreTelephony.framework */,
- 35796FE62BEE201B6C6D4AFA /* libPods-Runner.a */,
- );
- name = Frameworks;
- sourceTree = "<group>";
- };
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
- 97C146ED1CF9000F007C117D /* Runner */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
- buildPhases = (
- E75442B7FFB97737B6EB743D /* [CP] Check Pods Manifest.lock */,
- 9740EEB61CF901F6004384FC /* Run Script */,
- 97C146EA1CF9000F007C117D /* Sources */,
- 97C146EB1CF9000F007C117D /* Frameworks */,
- 97C146EC1CF9000F007C117D /* Resources */,
- 9705A1C41CF9048500538489 /* Embed Frameworks */,
- 3B06AD1E1E4923F5004D2608 /* Thin Binary */,
- 31075CAE428A080A8387E61D /* [CP] Embed Pods Frameworks */,
- );
- buildRules = (
- );
- dependencies = (
- );
- name = Runner;
- productName = Runner;
- productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
- productType = "com.apple.product-type.application";
- };
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
- 97C146E61CF9000F007C117D /* Project object */ = {
- isa = PBXProject;
- attributes = {
- LastUpgradeCheck = 1000;
- ORGANIZATIONNAME = "The Chromium Authors";
- TargetAttributes = {
- 97C146ED1CF9000F007C117D = {
- CreatedOnToolsVersion = 7.3.1;
- DevelopmentTeam = NJ84XW37VD;
- };
- };
- };
- buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
- compatibilityVersion = "Xcode 3.2";
- developmentRegion = English;
- hasScannedForEncodings = 0;
- knownRegions = (
- English,
- en,
- Base,
- );
- mainGroup = 97C146E51CF9000F007C117D;
- productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
- projectDirPath = "";
- projectRoot = "";
- targets = (
- 97C146ED1CF9000F007C117D /* Runner */,
- );
- };
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
- 97C146EC1CF9000F007C117D /* Resources */ = {
- isa = PBXResourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
- 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
- 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
- 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
- 31075CAE428A080A8387E61D /* [CP] Embed Pods Frameworks */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
- "${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
- "${PODS_ROOT}/TXIMSDK_iOS/ImSDK.framework",
- );
- name = "[CP] Embed Pods Frameworks";
- outputPaths = (
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ImSDK.framework",
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
- showEnvVarsInLog = 0;
- };
- 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- );
- name = "Thin Binary";
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin\n";
- };
- 9740EEB61CF901F6004384FC /* Run Script */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- );
- name = "Run Script";
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
- };
- E75442B7FFB97737B6EB743D /* [CP] Check Pods Manifest.lock */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- "${PODS_PODFILE_DIR_PATH}/Podfile.lock",
- "${PODS_ROOT}/Manifest.lock",
- );
- name = "[CP] Check Pods Manifest.lock";
- outputPaths = (
- "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
- showEnvVarsInLog = 0;
- };
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
- 97C146EA1CF9000F007C117D /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */,
- 97C146F31CF9000F007C117D /* main.m in Sources */,
- 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXVariantGroup section */
- 97C146FA1CF9000F007C117D /* Main.storyboard */ = {
- isa = PBXVariantGroup;
- children = (
- 97C146FB1CF9000F007C117D /* Base */,
- );
- name = Main.storyboard;
- sourceTree = "<group>";
- };
- 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = {
- isa = PBXVariantGroup;
- children = (
- 97C147001CF9000F007C117D /* Base */,
- );
- name = LaunchScreen.storyboard;
- sourceTree = "<group>";
- };
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
- 97C147031CF9000F007C117D /* Debug */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
- buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- CLANG_ANALYZER_NONNULL = YES;
- CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
- CLANG_CXX_LIBRARY = "libc++";
- CLANG_ENABLE_MODULES = YES;
- CLANG_ENABLE_OBJC_ARC = YES;
- CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
- CLANG_WARN_BOOL_CONVERSION = YES;
- CLANG_WARN_COMMA = YES;
- CLANG_WARN_CONSTANT_CONVERSION = YES;
- CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
- CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
- CLANG_WARN_EMPTY_BODY = YES;
- CLANG_WARN_ENUM_CONVERSION = YES;
- CLANG_WARN_INFINITE_RECURSION = YES;
- CLANG_WARN_INT_CONVERSION = YES;
- CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
- CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
- CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
- CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
- CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
- CLANG_WARN_STRICT_PROTOTYPES = YES;
- CLANG_WARN_SUSPICIOUS_MOVE = YES;
- CLANG_WARN_UNREACHABLE_CODE = YES;
- CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- COPY_PHASE_STRIP = NO;
- DEBUG_INFORMATION_FORMAT = dwarf;
- ENABLE_STRICT_OBJC_MSGSEND = YES;
- ENABLE_TESTABILITY = YES;
- GCC_C_LANGUAGE_STANDARD = gnu99;
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_NO_COMMON_BLOCKS = YES;
- GCC_OPTIMIZATION_LEVEL = 0;
- GCC_PREPROCESSOR_DEFINITIONS = (
- "DEBUG=1",
- "$(inherited)",
- );
- GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
- GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
- GCC_WARN_UNDECLARED_SELECTOR = YES;
- GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
- GCC_WARN_UNUSED_FUNCTION = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 8.0;
- MTL_ENABLE_DEBUG_INFO = YES;
- ONLY_ACTIVE_ARCH = YES;
- OTHER_LDFLAGS = (
- "$(inherited)",
- "-Objc",
- "-l\"dim\"",
- "-framework",
- "\"Flutter\"",
- );
- SDKROOT = iphoneos;
- TARGETED_DEVICE_FAMILY = "1,2";
- };
- name = Debug;
- };
- 97C147041CF9000F007C117D /* Release */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
- buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- CLANG_ANALYZER_NONNULL = YES;
- CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
- CLANG_CXX_LIBRARY = "libc++";
- CLANG_ENABLE_MODULES = YES;
- CLANG_ENABLE_OBJC_ARC = YES;
- CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
- CLANG_WARN_BOOL_CONVERSION = YES;
- CLANG_WARN_COMMA = YES;
- CLANG_WARN_CONSTANT_CONVERSION = YES;
- CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
- CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
- CLANG_WARN_EMPTY_BODY = YES;
- CLANG_WARN_ENUM_CONVERSION = YES;
- CLANG_WARN_INFINITE_RECURSION = YES;
- CLANG_WARN_INT_CONVERSION = YES;
- CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
- CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
- CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
- CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
- CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
- CLANG_WARN_STRICT_PROTOTYPES = YES;
- CLANG_WARN_SUSPICIOUS_MOVE = YES;
- CLANG_WARN_UNREACHABLE_CODE = YES;
- CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- COPY_PHASE_STRIP = NO;
- DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- ENABLE_NS_ASSERTIONS = NO;
- ENABLE_STRICT_OBJC_MSGSEND = YES;
- GCC_C_LANGUAGE_STANDARD = gnu99;
- GCC_NO_COMMON_BLOCKS = YES;
- GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
- GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
- GCC_WARN_UNDECLARED_SELECTOR = YES;
- GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
- GCC_WARN_UNUSED_FUNCTION = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 8.0;
- MTL_ENABLE_DEBUG_INFO = NO;
- OTHER_LDFLAGS = (
- "$(inherited)",
- "-Objc",
- "-l\"dim\"",
- "-framework",
- "\"Flutter\"",
- );
- SDKROOT = iphoneos;
- TARGETED_DEVICE_FAMILY = "1,2";
- VALIDATE_PRODUCT = YES;
- };
- name = Release;
- };
- 97C147061CF9000F007C117D /* Debug */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
- buildSettings = {
- ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
- CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
- DEVELOPMENT_TEAM = NJ84XW37VD;
- ENABLE_BITCODE = NO;
- FRAMEWORK_SEARCH_PATHS = (
- "$(inherited)",
- "$(PROJECT_DIR)/Flutter",
- );
- INFOPLIST_FILE = Runner/Info.plist;
- IPHONEOS_DEPLOYMENT_TARGET = 12.1;
- LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
- LIBRARY_SEARCH_PATHS = (
- "$(inherited)",
- "$(PROJECT_DIR)/Flutter",
- "$(PROJECT_DIR)/Frameworks",
- );
- LINK_WITH_STANDARD_LIBRARIES = YES;
- OTHER_LDFLAGS = "$(inherited)";
- PRODUCT_BUNDLE_IDENTIFIER = com.brzhang.flutter.dimExample;
- PRODUCT_NAME = "$(TARGET_NAME)";
- VERSIONING_SYSTEM = "apple-generic";
- };
- name = Debug;
- };
- 97C147071CF9000F007C117D /* Release */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
- buildSettings = {
- ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
- CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
- DEVELOPMENT_TEAM = NJ84XW37VD;
- ENABLE_BITCODE = NO;
- FRAMEWORK_SEARCH_PATHS = (
- "$(inherited)",
- "$(PROJECT_DIR)/Flutter",
- );
- INFOPLIST_FILE = Runner/Info.plist;
- IPHONEOS_DEPLOYMENT_TARGET = 12.1;
- LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
- LIBRARY_SEARCH_PATHS = (
- "$(inherited)",
- "$(PROJECT_DIR)/Flutter",
- "$(PROJECT_DIR)/Frameworks",
- );
- LINK_WITH_STANDARD_LIBRARIES = YES;
- OTHER_LDFLAGS = "$(inherited)";
- PRODUCT_BUNDLE_IDENTIFIER = com.brzhang.flutter.dimExample;
- PRODUCT_NAME = "$(TARGET_NAME)";
- VERSIONING_SYSTEM = "apple-generic";
- };
- name = Release;
- };
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
- 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 97C147031CF9000F007C117D /* Debug */,
- 97C147041CF9000F007C117D /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
- 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 97C147061CF9000F007C117D /* Debug */,
- 97C147071CF9000F007C117D /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
-/* End XCConfigurationList section */
- };
- rootObject = 97C146E61CF9000F007C117D /* Project object */;
-}
diff --git a/plugin/wechat_flutter_plugin/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/plugin/wechat_flutter_plugin/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 1d526a1..0000000
--- a/plugin/wechat_flutter_plugin/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
- version = "1.0">
- <FileRef
- location = "group:Runner.xcodeproj">
- </FileRef>
-</Workspace>
diff --git a/plugin/wechat_flutter_plugin/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/plugin/wechat_flutter_plugin/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
deleted file mode 100644
index ba1a982..0000000
--- a/plugin/wechat_flutter_plugin/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
- LastUpgradeVersion = "1000"
- version = "1.3">
- <BuildAction
- parallelizeBuildables = "YES"
- buildImplicitDependencies = "YES">
- <BuildActionEntries>
- <BuildActionEntry
- buildForTesting = "YES"
- buildForRunning = "YES"
- buildForProfiling = "YES"
- buildForArchiving = "YES"
- buildForAnalyzing = "YES">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "97C146ED1CF9000F007C117D"
- BuildableName = "Runner.app"
- BlueprintName = "Runner"
- ReferencedContainer = "container:Runner.xcodeproj">
- </BuildableReference>
- </BuildActionEntry>
- </BuildActionEntries>
- </BuildAction>
- <TestAction
- buildConfiguration = "Debug"
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- shouldUseLaunchSchemeArgsEnv = "YES">
- <Testables>
- </Testables>
- <MacroExpansion>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "97C146ED1CF9000F007C117D"
- BuildableName = "Runner.app"
- BlueprintName = "Runner"
- ReferencedContainer = "container:Runner.xcodeproj">
- </BuildableReference>
- </MacroExpansion>
- <AdditionalOptions>
- </AdditionalOptions>
- </TestAction>
- <LaunchAction
- buildConfiguration = "Debug"
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- launchStyle = "0"
- useCustomWorkingDirectory = "NO"
- ignoresPersistentStateOnLaunch = "NO"
- debugDocumentVersioning = "YES"
- debugServiceExtension = "internal"
- allowLocationSimulation = "YES">
- <BuildableProductRunnable
- runnableDebuggingMode = "0">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "97C146ED1CF9000F007C117D"
- BuildableName = "Runner.app"
- BlueprintName = "Runner"
- ReferencedContainer = "container:Runner.xcodeproj">
- </BuildableReference>
- </BuildableProductRunnable>
- <AdditionalOptions>
- </AdditionalOptions>
- </LaunchAction>
- <ProfileAction
- buildConfiguration = "Release"
- shouldUseLaunchSchemeArgsEnv = "YES"
- savedToolIdentifier = ""
- useCustomWorkingDirectory = "NO"
- debugDocumentVersioning = "YES">
- <BuildableProductRunnable
- runnableDebuggingMode = "0">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "97C146ED1CF9000F007C117D"
- BuildableName = "Runner.app"
- BlueprintName = "Runner"
- ReferencedContainer = "container:Runner.xcodeproj">
- </BuildableReference>
- </BuildableProductRunnable>
- </ProfileAction>
- <AnalyzeAction
- buildConfiguration = "Debug">
- </AnalyzeAction>
- <ArchiveAction
- buildConfiguration = "Release"
- revealArchiveInOrganizer = "YES">
- </ArchiveAction>
-</Scheme>
diff --git a/plugin/wechat_flutter_plugin/example/ios/Runner.xcworkspace/contents.xcworkspacedata b/plugin/wechat_flutter_plugin/example/ios/Runner.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 21a3cc1..0000000
--- a/plugin/wechat_flutter_plugin/example/ios/Runner.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
- version = "1.0">
- <FileRef
- location = "group:Runner.xcodeproj">
- </FileRef>
- <FileRef
- location = "group:Pods/Pods.xcodeproj">
- </FileRef>
-</Workspace>
diff --git a/plugin/wechat_flutter_plugin/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/plugin/wechat_flutter_plugin/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
deleted file mode 100644
index 18d9810..0000000
--- a/plugin/wechat_flutter_plugin/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>IDEDidComputeMac32BitWarning</key>
- <true/>
-</dict>
-</plist>
diff --git a/plugin/wechat_flutter_plugin/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/plugin/wechat_flutter_plugin/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
deleted file mode 100644
index 6b30c74..0000000
--- a/plugin/wechat_flutter_plugin/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>BuildSystemType</key>
- <string>Original</string>
- <key>PreviewsEnabled</key>
- <false/>
-</dict>
-</plist>
diff --git a/plugin/wechat_flutter_plugin/example/ios/Runner/AppDelegate.h b/plugin/wechat_flutter_plugin/example/ios/Runner/AppDelegate.h
deleted file mode 100644
index 36e21bb..0000000
--- a/plugin/wechat_flutter_plugin/example/ios/Runner/AppDelegate.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#import <Flutter/Flutter.h>
-#import <UIKit/UIKit.h>
-
-@interface AppDelegate : FlutterAppDelegate
-
-@end
diff --git a/plugin/wechat_flutter_plugin/example/ios/Runner/AppDelegate.m b/plugin/wechat_flutter_plugin/example/ios/Runner/AppDelegate.m
deleted file mode 100644
index 6ecb7d3..0000000
--- a/plugin/wechat_flutter_plugin/example/ios/Runner/AppDelegate.m
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "AppDelegate.h"
-#include "GeneratedPluginRegistrant.h"
-
-@implementation AppDelegate
-
-- (BOOL)application:(UIApplication *)application
- didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
- [GeneratedPluginRegistrant registerWithRegistry:self];
-
- // Override point for customization after application launch.
- return [super application:application didFinishLaunchingWithOptions:launchOptions];
-}
-
-@end
diff --git a/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
deleted file mode 100644
index d36b1fa..0000000
--- a/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ /dev/null
@@ -1,122 +0,0 @@
-{
- "images" : [
- {
- "size" : "20x20",
- "idiom" : "iphone",
- "filename" : "Icon-App-20x20@2x.png",
- "scale" : "2x"
- },
- {
- "size" : "20x20",
- "idiom" : "iphone",
- "filename" : "Icon-App-20x20@3x.png",
- "scale" : "3x"
- },
- {
- "size" : "29x29",
- "idiom" : "iphone",
- "filename" : "Icon-App-29x29@1x.png",
- "scale" : "1x"
- },
- {
- "size" : "29x29",
- "idiom" : "iphone",
- "filename" : "Icon-App-29x29@2x.png",
- "scale" : "2x"
- },
- {
- "size" : "29x29",
- "idiom" : "iphone",
- "filename" : "Icon-App-29x29@3x.png",
- "scale" : "3x"
- },
- {
- "size" : "40x40",
- "idiom" : "iphone",
- "filename" : "Icon-App-40x40@2x.png",
- "scale" : "2x"
- },
- {
- "size" : "40x40",
- "idiom" : "iphone",
- "filename" : "Icon-App-40x40@3x.png",
- "scale" : "3x"
- },
- {
- "size" : "60x60",
- "idiom" : "iphone",
- "filename" : "Icon-App-60x60@2x.png",
- "scale" : "2x"
- },
- {
- "size" : "60x60",
- "idiom" : "iphone",
- "filename" : "Icon-App-60x60@3x.png",
- "scale" : "3x"
- },
- {
- "size" : "20x20",
- "idiom" : "ipad",
- "filename" : "Icon-App-20x20@1x.png",
- "scale" : "1x"
- },
- {
- "size" : "20x20",
- "idiom" : "ipad",
- "filename" : "Icon-App-20x20@2x.png",
- "scale" : "2x"
- },
- {
- "size" : "29x29",
- "idiom" : "ipad",
- "filename" : "Icon-App-29x29@1x.png",
- "scale" : "1x"
- },
- {
- "size" : "29x29",
- "idiom" : "ipad",
- "filename" : "Icon-App-29x29@2x.png",
- "scale" : "2x"
- },
- {
- "size" : "40x40",
- "idiom" : "ipad",
- "filename" : "Icon-App-40x40@1x.png",
- "scale" : "1x"
- },
- {
- "size" : "40x40",
- "idiom" : "ipad",
- "filename" : "Icon-App-40x40@2x.png",
- "scale" : "2x"
- },
- {
- "size" : "76x76",
- "idiom" : "ipad",
- "filename" : "Icon-App-76x76@1x.png",
- "scale" : "1x"
- },
- {
- "size" : "76x76",
- "idiom" : "ipad",
- "filename" : "Icon-App-76x76@2x.png",
- "scale" : "2x"
- },
- {
- "size" : "83.5x83.5",
- "idiom" : "ipad",
- "filename" : "Icon-App-83.5x83.5@2x.png",
- "scale" : "2x"
- },
- {
- "size" : "1024x1024",
- "idiom" : "ios-marketing",
- "filename" : "Icon-App-1024x1024@1x.png",
- "scale" : "1x"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
diff --git a/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
deleted file mode 100644
index 0bedcf2..0000000
--- a/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "filename" : "LaunchImage.png",
- "scale" : "1x"
- },
- {
- "idiom" : "universal",
- "filename" : "LaunchImage@2x.png",
- "scale" : "2x"
- },
- {
- "idiom" : "universal",
- "filename" : "LaunchImage@3x.png",
- "scale" : "3x"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
diff --git a/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
deleted file mode 100644
index e69de29..0000000
diff --git a/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
deleted file mode 100644
index 89c2725..0000000
--- a/plugin/wechat_flutter_plugin/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Launch Screen Assets
-
-You can customize the launch screen with your own desired assets by replacing the image files in this directory.
-
-You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images.
\ No newline at end of file
diff --git a/plugin/wechat_flutter_plugin/example/ios/Runner/Base.lproj/LaunchScreen.storyboard b/plugin/wechat_flutter_plugin/example/ios/Runner/Base.lproj/LaunchScreen.storyboard
deleted file mode 100644
index f2e259c..0000000
--- a/plugin/wechat_flutter_plugin/example/ios/Runner/Base.lproj/LaunchScreen.storyboard
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
- <dependencies>
- <deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
- </dependencies>
- <scenes>
- <!--View Controller-->
- <scene sceneID="EHf-IW-A2E">
- <objects>
- <viewController id="01J-lp-oVM" sceneMemberID="viewController">
- <layoutGuides>
- <viewControllerLayoutGuide type="top" id="Ydg-fD-yQy"/>
- <viewControllerLayoutGuide type="bottom" id="xbc-2k-c8Z"/>
- </layoutGuides>
- <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
- <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <subviews>
- <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
- </imageView>
- </subviews>
- <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
- <constraints>
- <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="1a2-6s-vTC"/>
- <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="4X2-HB-R7a"/>
- </constraints>
- </view>
- </viewController>
- <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
- </objects>
- <point key="canvasLocation" x="53" y="375"/>
- </scene>
- </scenes>
- <resources>
- <image name="LaunchImage" width="168" height="185"/>
- </resources>
-</document>
diff --git a/plugin/wechat_flutter_plugin/example/ios/Runner/Base.lproj/Main.storyboard b/plugin/wechat_flutter_plugin/example/ios/Runner/Base.lproj/Main.storyboard
deleted file mode 100644
index f3c2851..0000000
--- a/plugin/wechat_flutter_plugin/example/ios/Runner/Base.lproj/Main.storyboard
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
- <dependencies>
- <deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
- </dependencies>
- <scenes>
- <!--Flutter View Controller-->
- <scene sceneID="tne-QT-ifu">
- <objects>
- <viewController id="BYZ-38-t0r" customClass="FlutterViewController" sceneMemberID="viewController">
- <layoutGuides>
- <viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
- <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
- </layoutGuides>
- <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
- <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
- </view>
- </viewController>
- <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
- </objects>
- </scene>
- </scenes>
-</document>
diff --git a/plugin/wechat_flutter_plugin/example/ios/Runner/Info.plist b/plugin/wechat_flutter_plugin/example/ios/Runner/Info.plist
deleted file mode 100644
index c9fb040..0000000
--- a/plugin/wechat_flutter_plugin/example/ios/Runner/Info.plist
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleDevelopmentRegion</key>
- <string>en</string>
- <key>CFBundleExecutable</key>
- <string>$(EXECUTABLE_NAME)</string>
- <key>CFBundleIdentifier</key>
- <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundleName</key>
- <string>dim_example</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleShortVersionString</key>
- <string>$(FLUTTER_BUILD_NAME)</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleVersion</key>
- <string>$(FLUTTER_BUILD_NUMBER)</string>
- <key>LSRequiresIPhoneOS</key>
- <true/>
- <key>UILaunchStoryboardName</key>
- <string>LaunchScreen</string>
- <key>UIMainStoryboardFile</key>
- <string>Main</string>
- <key>UISupportedInterfaceOrientations</key>
- <array>
- <string>UIInterfaceOrientationPortrait</string>
- <string>UIInterfaceOrientationLandscapeLeft</string>
- <string>UIInterfaceOrientationLandscapeRight</string>
- </array>
- <key>UISupportedInterfaceOrientations~ipad</key>
- <array>
- <string>UIInterfaceOrientationPortrait</string>
- <string>UIInterfaceOrientationPortraitUpsideDown</string>
- <string>UIInterfaceOrientationLandscapeLeft</string>
- <string>UIInterfaceOrientationLandscapeRight</string>
- </array>
- <key>UIViewControllerBasedStatusBarAppearance</key>
- <false/>
-</dict>
-</plist>
diff --git a/plugin/wechat_flutter_plugin/example/ios/Runner/main.m b/plugin/wechat_flutter_plugin/example/ios/Runner/main.m
deleted file mode 100644
index dff6597..0000000
--- a/plugin/wechat_flutter_plugin/example/ios/Runner/main.m
+++ /dev/null
@@ -1,9 +0,0 @@
-#import <Flutter/Flutter.h>
-#import <UIKit/UIKit.h>
-#import "AppDelegate.h"
-
-int main(int argc, char* argv[]) {
- @autoreleasepool {
- return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
- }
-}
diff --git a/plugin/wechat_flutter_plugin/example/lib/generated/i18n.dart b/plugin/wechat_flutter_plugin/example/lib/generated/i18n.dart
deleted file mode 100644
index 30fdb7a..0000000
--- a/plugin/wechat_flutter_plugin/example/lib/generated/i18n.dart
+++ /dev/null
@@ -1,126 +0,0 @@
-import 'dart:async';
-
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: camel_case_types
-// ignore_for_file: prefer_single_quotes
-
-// This file is automatically generated. DO NOT EDIT, all your changes would be lost.
-class S implements WidgetsLocalizations {
- const S();
-
- static S current;
-
- static const GeneratedLocalizationsDelegate delegate =
- GeneratedLocalizationsDelegate();
-
- static S of(BuildContext context) => Localizations.of<S>(context, S);
-
- @override
- TextDirection get textDirection => TextDirection.ltr;
-
-}
-
-class $en extends S {
- const $en();
-}
-
-class GeneratedLocalizationsDelegate extends LocalizationsDelegate<S> {
- const GeneratedLocalizationsDelegate();
-
- List<Locale> get supportedLocales {
- return const <Locale>[
- Locale("en", ""),
- ];
- }
-
- LocaleListResolutionCallback listResolution({Locale fallback, bool withCountry = true}) {
- return (List<Locale> locales, Iterable<Locale> supported) {
- if (locales == null || locales.isEmpty) {
- return fallback ?? supported.first;
- } else {
- return _resolve(locales.first, fallback, supported, withCountry);
- }
- };
- }
-
- LocaleResolutionCallback resolution({Locale fallback, bool withCountry = true}) {
- return (Locale locale, Iterable<Locale> supported) {
- return _resolve(locale, fallback, supported, withCountry);
- };
- }
-
- @override
- Future<S> load(Locale locale) {
- final String lang = getLang(locale);
- if (lang != null) {
- switch (lang) {
- case "en":
- S.current = const $en();
- return SynchronousFuture<S>(S.current);
- default:
- // NO-OP.
- }
- }
- S.current = const S();
- return SynchronousFuture<S>(S.current);
- }
-
- @override
- bool isSupported(Locale locale) => _isSupported(locale, true);
-
- @override
- bool shouldReload(GeneratedLocalizationsDelegate old) => false;
-
- ///
- /// Internal method to resolve a locale from a list of locales.
- ///
- Locale _resolve(Locale locale, Locale fallback, Iterable<Locale> supported, bool withCountry) {
- if (locale == null || !_isSupported(locale, withCountry)) {
- return fallback ?? supported.first;
- }
-
- final Locale languageLocale = Locale(locale.languageCode, "");
- if (supported.contains(locale)) {
- return locale;
- } else if (supported.contains(languageLocale)) {
- return languageLocale;
- } else {
- final Locale fallbackLocale = fallback ?? supported.first;
- return fallbackLocale;
- }
- }
-
- ///
- /// Returns true if the specified locale is supported, false otherwise.
- ///
- bool _isSupported(Locale locale, bool withCountry) {
- if (locale != null) {
- for (Locale supportedLocale in supportedLocales) {
- // Language must always match both locales.
- if (supportedLocale.languageCode != locale.languageCode) {
- continue;
- }
-
- // If country code matches, return this locale.
- if (supportedLocale.countryCode == locale.countryCode) {
- return true;
- }
-
- // If no country requirement is requested, check if this locale has no country.
- if (true != withCountry && (supportedLocale.countryCode == null || supportedLocale.countryCode.isEmpty)) {
- return true;
- }
- }
- }
- return false;
- }
-}
-
-String getLang(Locale l) => l == null
- ? null
- : l.countryCode != null && l.countryCode.isEmpty
- ? l.languageCode
- : l.toString();
diff --git a/plugin/wechat_flutter_plugin/example/lib/main.dart b/plugin/wechat_flutter_plugin/example/lib/main.dart
deleted file mode 100644
index 116ced9..0000000
--- a/plugin/wechat_flutter_plugin/example/lib/main.dart
+++ /dev/null
@@ -1,40 +0,0 @@
-import 'package:flutter/material.dart';
-
-void main() => runApp(new MyApp());
-
-class MyApp extends StatelessWidget {
- @override
- Widget build(BuildContext context) {
- return new MaterialApp(
- title: '微信',
- home: new Scaffold(
- body: new MyHome(),
- ),
- );
- }
-}
-
-class MyHome extends StatefulWidget {
- @override
- _MyHomeState createState() => _MyHomeState();
-}
-
-class _MyHomeState extends State<MyHome> {
- String tipsZh = '你应该去运行dim外面的那个example';
- String tipsEn = 'You should go to the example outside of dim';
-
- @override
- Widget build(BuildContext context) {
- return new Container(
- width: MediaQuery.of(context).size.width,
- child: new Column(
- crossAxisAlignment: CrossAxisAlignment.center,
- mainAxisAlignment: MainAxisAlignment.center,
- children: <Widget>[
- new Text(tipsZh),
- new Text(tipsEn),
- ],
- ),
- );
- }
-}
diff --git a/plugin/wechat_flutter_plugin/example/pubspec.yaml b/plugin/wechat_flutter_plugin/example/pubspec.yaml
deleted file mode 100644
index 14d9c77..0000000
--- a/plugin/wechat_flutter_plugin/example/pubspec.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-name: dim_example
-description: Demonstrates how to use the dim plugin.
-
-# The following defines the version and build number for your application.
-# A version number is three numbers separated by dots, like 1.2.43
-# followed by an optional build number separated by a +.
-# Both the version and the builder number may be overridden in flutter
-# build by specifying --build-name and --build-number, respectively.
-# Read more about versioning at semver.org.
-version: 1.0.0+1
-
-environment:
- sdk: '>=2.10.0 <3.0.0'
-
-dependencies:
- flutter:
- sdk: flutter
-
- # The following adds the Cupertino Icons font to your application.
- # Use with the CupertinoIcons class for iOS style icons.
- cupertino_icons: ^0.1.2
-
-dev_dependencies:
- flutter_test:
- sdk: flutter
-
- dim:
- path: ../
-
-# For information on the generic Dart part of this file, see the
-# following page: https://www.dartlang.org/tools/pub/pubspec
-
-# The following section is specific to Flutter.
-flutter:
-
- # The following line ensures that the Material Icons font is
- # included with your application, so that you can use the icons in
- # the material Icons class.
- uses-material-design: true
-
- # To add assets to your application, add an assets section, like this:
- # assets:
- # - images/a_dot_burr.jpeg
- # - images/a_dot_ham.jpeg
-
- # An image asset can refer to one or more resolution-specific "variants", see
- # https://flutter.io/assets-and-images/#resolution-aware.
-
- # For details regarding adding assets from package dependencies, see
- # https://flutter.io/assets-and-images/#from-packages
-
- # To add custom fonts to your application, add a fonts section here,
- # in this "flutter" section. Each entry in this list should have a
- # "family" key with the font family name, and a "fonts" key with a
- # list giving the asset and other descriptors for the font. For
- # example:
- # fonts:
- # - family: Schyler
- # fonts:
- # - asset: fonts/Schyler-Regular.ttf
- # - asset: fonts/Schyler-Italic.ttf
- # style: italic
- # - family: Trajan Pro
- # fonts:
- # - asset: fonts/TrajanPro.ttf
- # - asset: fonts/TrajanPro_Bold.ttf
- # weight: 700
- #
- # For details regarding fonts from package dependencies,
- # see https://flutter.io/custom-fonts/#from-packages
diff --git a/plugin/wechat_flutter_plugin/example/test/widget_test.dart b/plugin/wechat_flutter_plugin/example/test/widget_test.dart
deleted file mode 100644
index 5727ada..0000000
--- a/plugin/wechat_flutter_plugin/example/test/widget_test.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-// This is a basic Flutter widget test.
-// To perform an interaction with a widget in your test, use the WidgetTester utility that Flutter
-// provides. For example, you can send tap and scroll gestures. You can also use WidgetTester to
-// find child widgets in the widget tree, read text, and verify that the values of widget properties
-// are correct.
-
-//import 'package:flutter/material.dart';
-//import 'package:flutter_test/flutter_test.dart';
-//
-//import 'package:dim_example/main.dart';
-//
-//void main() {
-// testWidgets('Verify Platform version', (WidgetTester tester) async {
-// // Build our app and trigger a frame.
-// await tester.pumpWidget(new MyApp());
-//
-// // Verify that platform version is retrieved.
-// expect(
-// find.byWidgetPredicate(
-// (Widget widget) =>
-// widget is Text && widget.data.startsWith('Running on:'),
-// ),
-// findsOneWidget);
-// });
-//}
diff --git a/plugin/wechat_flutter_plugin/ios/.gitignore b/plugin/wechat_flutter_plugin/ios/.gitignore
deleted file mode 100644
index 710ec6c..0000000
--- a/plugin/wechat_flutter_plugin/ios/.gitignore
+++ /dev/null
@@ -1,36 +0,0 @@
-.idea/
-.vagrant/
-.sconsign.dblite
-.svn/
-
-.DS_Store
-*.swp
-profile
-
-DerivedData/
-build/
-GeneratedPluginRegistrant.h
-GeneratedPluginRegistrant.m
-
-.generated/
-
-*.pbxuser
-*.mode1v3
-*.mode2v3
-*.perspectivev3
-
-!default.pbxuser
-!default.mode1v3
-!default.mode2v3
-!default.perspectivev3
-
-xcuserdata
-
-*.moved-aside
-
-*.pyc
-*sync/
-Icon?
-.tags*
-
-/Flutter/Generated.xcconfig
diff --git a/plugin/wechat_flutter_plugin/ios/Assets/.gitkeep b/plugin/wechat_flutter_plugin/ios/Assets/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/plugin/wechat_flutter_plugin/ios/Classes/DimModel.h b/plugin/wechat_flutter_plugin/ios/Classes/DimModel.h
deleted file mode 100644
index a80b9a5..0000000
--- a/plugin/wechat_flutter_plugin/ios/Classes/DimModel.h
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// DimModel.h
-// dim
-//
-// Created by 飞鱼 on 2019/2/15.
-//
-
-#import <Foundation/Foundation.h>
-#import <ImSDK/ImSDK.h>
-NS_ASSUME_NONNULL_BEGIN
-//@class TIMUserProfile, TIMConversation, TIMMessage, TIMGroupMemberInfo, TIMElem;
-
-
-@interface DimUser : NSObject
-@property (nonatomic, copy) NSString *identifier;
-@property (nonatomic, copy) NSString *nickName;
-@property (nonatomic, copy) NSString *remark;
-@property (nonatomic, copy) NSString *faceURL;
-@property (nonatomic, copy) NSString *selfSignature;
-@property (nonatomic, assign) NSInteger gender;
-@property (nonatomic, assign) NSInteger birthday;
-@property (nonatomic, copy) NSString *location;
-
-+ (DimUser *)initWithTimUser:(TIMUserProfile *)timUserProfile;
-
-@end
-
-@interface DimConversation : NSObject
-@property(nonatomic,assign) TIMConversationType type;
-@property (nonatomic, copy) NSString *peer;
-
-+ (DimConversation *)initWithTIMConversation:(TIMConversation *)timConversation;
-@end
-
-@interface DimMessage : NSObject
-@property (nonatomic, strong) DimUser *senderProfile;
-@property (nonatomic, copy) NSString *sender;
-@property (nonatomic, strong) DimConversation *timConversation;
-@property (nonatomic, strong) TIMGroupMemberInfo *timGroupMemberInfo;
-@property (nonatomic, strong) TIMElem *message;
-@property (nonatomic, assign) NSTimeInterval timeStamp;
-
-+ (DimMessage *)initWithTIMMessage:(TIMMessage *)timMessage;
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/plugin/wechat_flutter_plugin/ios/Classes/DimModel.m b/plugin/wechat_flutter_plugin/ios/Classes/DimModel.m
deleted file mode 100644
index 26c5ca4..0000000
--- a/plugin/wechat_flutter_plugin/ios/Classes/DimModel.m
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// DimModel.m
-// dim
-//
-// Created by 飞鱼 on 2019/2/15.
-//
-
-#import "DimModel.h"
-
-@implementation DimUser
-
-+ (DimUser *)initWithTimUser:(TIMUserProfile *)timUserProfile {
- DimUser *dimUser = [[DimUser alloc]init];
- dimUser.identifier = timUserProfile.identifier;
- dimUser.nickName = timUserProfile.nickname;
- dimUser.faceURL = timUserProfile.faceURL;
- dimUser.selfSignature = [[NSString alloc]initWithData:timUserProfile.selfSignature encoding:NSUTF8StringEncoding];
- dimUser.gender = timUserProfile.gender ? timUserProfile.gender : 1;
- dimUser.birthday = timUserProfile.birthday;
- dimUser.location = [[NSString alloc]initWithData:timUserProfile.location encoding:NSUTF8StringEncoding];
- return dimUser;
-}
-
-@end
-
-@implementation DimConversation
-
-+ (DimConversation *)initWithTIMConversation:(TIMConversation *)timConversation {
- DimConversation *dimConversation = [[DimConversation alloc]init];
- dimConversation.type = timConversation.getType;
- dimConversation.peer = timConversation.getReceiver;
- return dimConversation;
-}
-@end
-
-@implementation DimMessage
-
-+ (DimMessage *)initWithTIMMessage:(TIMMessage *)timMessage {
- DimMessage *dimMessage = [[DimMessage alloc]init];
- dimMessage.sender = timMessage.sender;
- dimMessage.timConversation = [DimConversation initWithTIMConversation:timMessage.getConversation];
- dimMessage.timGroupMemberInfo = timMessage.getSenderGroupMemberProfile;
- dimMessage.message = [timMessage getElem:0];
- dimMessage.timeStamp = timMessage.timestamp.timeIntervalSince1970;
-
- return dimMessage;
-}
-@end
diff --git a/plugin/wechat_flutter_plugin/ios/Classes/DimPlugin.h b/plugin/wechat_flutter_plugin/ios/Classes/DimPlugin.h
deleted file mode 100644
index 4374423..0000000
--- a/plugin/wechat_flutter_plugin/ios/Classes/DimPlugin.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#import <Flutter/Flutter.h>
-
-@interface DimPlugin : NSObject<FlutterPlugin>
-
-
-@end
diff --git a/plugin/wechat_flutter_plugin/ios/Classes/DimPlugin.m b/plugin/wechat_flutter_plugin/ios/Classes/DimPlugin.m
deleted file mode 100644
index e23f286..0000000
--- a/plugin/wechat_flutter_plugin/ios/Classes/DimPlugin.m
+++ /dev/null
@@ -1,360 +0,0 @@
-#import "DimPlugin.h"
-#import <ImSDK/ImSDK.h>
-#import "YYModel.h"
-#import "DimModel.h"
-#import "MJExtension.h"
-#import "MyGenerateTestUserSig.h"
-
-@interface DimPlugin() <TIMConnListener, TIMUserStatusListener, TIMRefreshListener, TIMMessageListener, FlutterStreamHandler>
-@property (nonatomic, strong) FlutterEventSink eventSink;
-
-@end
-
-@implementation DimPlugin
-+ (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
- FlutterMethodChannel *channel = [FlutterMethodChannel
- methodChannelWithName:@"dim_method"
- binaryMessenger:[registrar messenger]];
- DimPlugin* instance = [[DimPlugin alloc] init];
- [registrar addMethodCallDelegate:instance channel:channel];
-
- FlutterEventChannel *eventChannel = [FlutterEventChannel eventChannelWithName:@"dim_event" binaryMessenger:[registrar messenger]];
- [eventChannel setStreamHandler:instance];
-}
-
-- (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
-
- if ([@"getPlatformVersion" isEqualToString:call.method]) {
- result([@"iOS " stringByAppendingString:[[UIDevice currentDevice] systemVersion]]);
- }else if([ @"init" isEqualToString:call.method] ){
- int appidInt = [call.arguments[@"appid"] intValue];
- //初始化 SDK 基本配置
- TIMSdkConfig *config = [[TIMSdkConfig alloc] init];
- config.sdkAppId = appidInt;
- config.connListener = self;
-
- //初始化 SDK
- int code = [[TIMManager sharedInstance] initSdk:config];
- NSLog(@"initSdk:result is %d", code);
- //将用户配置与通讯管理器进行绑定
- TIMUserConfig *userConfig = [[TIMUserConfig alloc] init];
- userConfig.userStatusListener = self;
- userConfig.refreshListener = self;
- [[TIMManager sharedInstance] setUserConfig:userConfig];
- [[TIMManager sharedInstance] removeMessageListener:self];
- [[TIMManager sharedInstance] addMessageListener:self];
- result(@"init Succ");
- } else if ([ @"im_logout" isEqualToString:call.method] ){
- [[TIMManager sharedInstance] logout:^{
- result(@"Logout Succ");
- } fail:^(int code, NSString *msg) {
- result([NSString stringWithFormat:@"Login Failed: %d->%@", code, msg]);
- }];
- }else if([@"im_login" isEqualToString:call.method]) {
-
- NSString *identifier = call.arguments[@"identifier"];
-// NSString *userSig = call.arguments[@"userSig"];
- NSString *userSig = [MyGenerateTestUserSig myGenTestUserSig:identifier];
- NSLog(@"identifier-->userSig:%@-->%@", identifier,userSig);
- TIMLoginParam *param = [[TIMLoginParam alloc ]init];
-
-// if(userSig == nil||userSig ==NULL){
-// userSig = [MyGenerateTestUserSig myGenTestUserSig:identifier];
-// }
-
- param.identifier = identifier;
- param.userSig = userSig;
-
- [[TIMManager sharedInstance] login: param succ:^(){
- result(@"Login Succ");
- } fail:^(int code, NSString * err) {
- NSLog(@"Login Failed: %d->%@", code, err);
- result([NSString stringWithFormat:@"Login Failed: %d->%@", code, err]);
- }];
- }else if([@"sdkLogout" isEqualToString:call.method]){
- [[TIMManager sharedInstance] logout:^{
- result(@"logout success");
- } fail:^(int code, NSString *msg) {
- [NSString stringWithFormat:@"logout failed. code %d desc %@", code, msg];
- }];
- }else if([@"getConversations" isEqualToString:call.method]){
-
- NSArray *conversationList = [[TIMManager sharedInstance] getConversationList];
- if (conversationList!=nil && conversationList.count>0) {
- NSMutableArray *dictArray = [[NSMutableArray alloc]init];
- for (TIMConversation *conversation in conversationList) {
- DimConversation *dimConversation = [DimConversation initWithTIMConversation:conversation ];
- [dictArray addObject:dimConversation];
- }
- NSString *jsonString = [dictArray yy_modelToJSONString];
- result(jsonString);
- }else{
- result(@"[]");
- }
- }else if([@"delConversation" isEqualToString:call.method]){
- NSString *identifier = call.arguments[@"identifier"];
- [[TIMManager sharedInstance] deleteConversation:TIM_C2C receiver:identifier];
- result(@"delConversation success");
- }else if([@"getMessages" isEqualToString:call.method]){
- NSString *identifier = call.arguments[@"identifier"];
- int count = [call.arguments[@"count"] intValue];
- int ctype = [call.arguments[@"ctype"] intValue];
- //TIMMessage *lastMsg = call.arguments[@"lastMsg"];
- TIMConversation *con = [[TIMManager sharedInstance] getConversation: ctype==2 ? TIM_GROUP:TIM_C2C receiver:identifier];
- [con getMessage:count last:NULL succ:^(NSArray *msgs) {
- if(msgs != nil && msgs.count > 0){
- NSMutableArray *dictArray = [[NSMutableArray alloc]init];
- for (TIMMessage *message in msgs) {
- DimMessage *dimMessage = [DimMessage initWithTIMMessage:message];
- [dictArray addObject:dimMessage];
- }
- NSString *jsonString = [dictArray yy_modelToJSONString];
- result(jsonString);
- }else{
- result(@"[]");
- }
- } fail:^(int code, NSString *msg) {
- result([NSString stringWithFormat:@"get message failed. code: %d msg: %@", code, msg]);
- }];
- }else if([@"sendTextMessages" isEqualToString:call.method]){
- NSString *identifier = call.arguments[@"identifier"];
- NSString *content = call.arguments[@"content"];
- TIMMessage *msg = [TIMMessage new];
-
- //添加文本内容
- TIMTextElem *elem = [TIMTextElem new];
- elem.text = content;
-
- //将elem添加到消息
- if([msg addElem:elem] != 0){
- NSLog(@"addElement failed");
- return;
- }
- TIMConversation *conversation = [[TIMManager sharedInstance] getConversation:TIM_C2C receiver:identifier];
- //发送消息
- [conversation sendMessage:msg succ:^{
- result(@"send message ok");
- } fail:^(int code, NSString *msg) {
- result([NSString stringWithFormat:@"send message failed. code: %d desc:%@", code, msg]);
- }];
- }else if([@"sendImageMessages" isEqualToString:call.method]){
- NSString *identifier = call.arguments[@"identifier"];
- NSString *iamgePath = call.arguments[@"image_path"];
- //构造一条消息
- TIMMessage *msg = [TIMMessage new];
-
- //添加图片
- TIMImageElem *elem = [TIMImageElem new];
- elem.path = iamgePath;
- if([msg addElem:elem] != 0){
- NSLog(@"addElement failed");
- }
-
- TIMConversation *conversation = [[TIMManager sharedInstance] getConversation:TIM_C2C receiver:identifier];
- [conversation sendMessage:msg succ:^{
- result(@"SendMsg ok");
- } fail:^(int code, NSString *msg) {
- result([NSString stringWithFormat:@"send message failed. code: %d desc:%@", code, msg]);
- }];
-
- }else if([@"sendSoundMessages" isEqualToString:call.method]){
- NSString *identifier = call.arguments[@"identifier"];
- NSString *soundpath = call.arguments[@"sound_path"];
- int duration = [call.arguments[@"duration"] intValue];
- //构造一条消息
- TIMMessage *msg = [TIMMessage new];
-
- //添加声音
- TIMSoundElem *elem = [TIMSoundElem new];
- elem.path = soundpath;
- elem.second = duration;
- if([msg addElem:elem] != 0){
- NSLog(@"addElement failed");
- }
-
- TIMConversation *conversation = [[TIMManager sharedInstance] getConversation:TIM_C2C receiver:identifier];
- [conversation sendMessage:msg succ:^{
- result(@"SendMsg ok");
- } fail:^(int code, NSString *msg) {
- result([NSString stringWithFormat:@"send message failed. code: %d desc:%@", code, msg]);
- }];
-
- }else if([@"sendLocation" isEqualToString:call.method]){
- NSString *identifier = call.arguments[@"identifier"];
- double lat = [call.arguments[@"lat"] doubleValue];
- double lng = [call.arguments[@"lng"] doubleValue];
- NSString *desc = call.arguments[@"desc"];
- //构造一条消息
- TIMMessage *msg = [TIMMessage new];
-
- //添加图片
- TIMLocationElem *elem = [TIMLocationElem new];
- elem.latitude = lat;
- elem.longitude = lng;
- elem.desc = desc;
- if([msg addElem:elem] != 0){
- NSLog(@"addElement failed");
- }
-
- TIMConversation *conversation = [[TIMManager sharedInstance] getConversation:TIM_C2C receiver:identifier];
- [conversation sendMessage:msg succ:^{
- result(@"SendMsg ok");
- } fail:^(int code, NSString *msg) {
- result([NSString stringWithFormat:@"send message failed. code: %d desc:%@", code, msg]);
- }];
-
- }
- else if([@"post_data_test" isEqualToString:call.method]){
-
- NSLog(@"post_data_test invoke");
- self.eventSink(@"hahahahha I am from listener");
-
- }else if([@"addFriend" isEqualToString:call.method]){
-
- NSString *identifier = call.arguments[@"identifier"];
-
- TIMFriendRequest *req = [[TIMFriendRequest alloc] init];
- req.identifier = identifier;
- req.addWording =@"请添加我";
- req.addSource = @"AddSource_Type_iOS";
- [[TIMFriendshipManager sharedInstance] addFriend:req succ:^(TIMFriendResult *addResult) {
- if (addResult.result_code == 0)
- result(@"添加成功");
- else
- result([NSString stringWithFormat:@"异常：%ld, %@", (long)addResult.result_code, addResult.result_info]);
- } fail:^(int code, NSString *msg) {
- result([NSString stringWithFormat:@"失败：%d, %@", code, msg]);
- }];
-
- }else if([@"delFriend" isEqualToString:call.method]){
-
-
- NSMutableArray * del_users = [[NSMutableArray alloc] init];
- // 删除好友 iOS_002
- [del_users addObject: (NSString *)call.arguments[@"identifier"]];
- // TIM_FRIEND_DEL_BOTH 指定删除双向好友
- [[TIMFriendshipManager sharedInstance] deleteFriends:del_users delType:TIM_FRIEND_DEL_BOTH succ:^(NSArray<TIMFriendResult *> *results) {
- for (TIMFriendResult * res in results) {
- if (res.result_code != TIM_FRIEND_STATUS_SUCC) {
- result([NSString stringWithFormat:@"deleteFriends failed: user=%@ status=%ld", res.identifier, (long)res.result_code]);
- }
- else {
- result([NSString stringWithFormat:@"deleteFriends succ: user=%@ status=%ld", res.identifier, (long)res.result_code]);
- }
- }
- } fail:^(int code, NSString * err) {
- result([NSString stringWithFormat:@"deleteFriends failed: code=%d err=%@", code, err]);
- }];
-
- }else if([@"listFriends" isEqualToString:call.method]){
-
- [[TIMFriendshipManager sharedInstance] getFriendList:^(NSArray * arr) {
- NSString *jsonString = [arr yy_modelToJSONString];
- result(jsonString);
- }fail:^(int code, NSString * err) {
- result([NSString stringWithFormat:@"GetFriendList fail: code=%d err=%@", code, err]);
- }];
-
- }else if([@"opFriend" isEqualToString:call.method]){
-
- NSString *identifier = call.arguments[@"identifier"];
- NSString *opTypeStr = call.arguments[@"opTypeStr"];
- TIMFriendResponse *response = [[TIMFriendResponse alloc] init];
- response.identifier = identifier;
- if([opTypeStr isEqualToString:@"Y"]){
- response.responseType = TIM_FRIEND_RESPONSE_AGREE_AND_ADD;
- }else{
- response.responseType = TIM_FRIEND_RESPONSE_REJECT;
- }
- [[TIMFriendshipManager sharedInstance] doResponse:response succ:^(TIMFriendResult *res) {
- if (res.result_code != TIM_FRIEND_STATUS_SUCC) {
- result([NSString stringWithFormat:@"deleteFriends failed: user=%@ status=%ld", res.identifier, (long)res.result_code]);
- }
- else {
- result([NSString stringWithFormat:@"deleteFriends succ: user=%@ status=%ld", res.identifier, (long)res.result_code]);
- }
- } fail:^(int code, NSString *err) {
- result([NSString stringWithFormat:@"opFriend fail: code=%d err=%@", code, err]);
- }];
-
- }
- else if([@"getUsersProfile" isEqualToString:call.method]){
-
- NSArray *arr1 = call.arguments[@"users"];
-
-
- [[TIMFriendshipManager sharedInstance] getUsersProfile:arr1 forceUpdate:YES succ:^(NSArray * arr) {
-// for (TIMUserProfile * profile in arr) {
-// NSLog(@"user=%@", profile);
-// }
- if (arr !=NULL && arr.count >0) {
- NSString *jsonString = [arr yy_modelToJSONString];
- result(jsonString);
- }else{
- result(@"[]");
- }
- }fail:^(int code, NSString * err) {
-
- result([NSString stringWithFormat:@"getUsersProfile fail: code=%d err=%@", code, err]);
- }];
- }
- else if([@"setUsersProfile" isEqualToString:call.method]){
- NSString *nick = call.arguments[@"nick"];
- NSInteger gender = (NSInteger)call.arguments[@"gender"];
- NSString *faceUrl = call.arguments[@"faceUrl"];
- [[TIMFriendshipManager sharedInstance]modifySelfProfile:@{TIMProfileTypeKey_Nick:nick,TIMProfileTypeKey_FaceUrl:faceUrl,TIMProfileTypeKey_Gender:[NSNumber numberWithInt:gender==1?TIM_GENDER_MALE:TIM_GENDER_FEMALE]} succ:^{
- result(@"setUsersProfile succ");
- } fail:^(int code, NSString *err) {
- result([NSString stringWithFormat:@"GetFriendList fail: code=%d err=%@", code, err]);
- }];
- }
- else {
- result(FlutterMethodNotImplemented);
- }
-}
-
-
-#pragma mark - FlutterStreamHandler
-- (FlutterError*)onListenWithArguments:(id)arguments
- eventSink:(FlutterEventSink)eventSink {
- self.eventSink = eventSink;
- // [[UIDevice currentDevice] setBatteryMonitoringEnabled:YES];
- // [self sendBatteryStateEvent];
- // [[NSNotificationCenter defaultCenter]
- // addObserver:self
- // selector:@selector(onBatteryStateDidChange:)
- // name:UIDeviceBatteryStateDidChangeNotification
- // object:nil];
- return nil;
-}
-
-- (FlutterError* _Nullable)onCancelWithArguments:(id _Nullable)arguments{
- return nil;
-}
-
-#pragma mark - TIMMessageListener
-/**
- * 新消息回调通知
- *
- * @param msgs 新消息列表，TIMMessage 类型数组
- */
-- (void)onNewMessage:(NSArray*)msgs{
- if(msgs != nil && msgs.count > 0){
- NSMutableArray *dictArray = [[NSMutableArray alloc]init];
- for (TIMMessage *message in msgs) {
- DimMessage *dimMessage = [DimMessage initWithTIMMessage:message];
- [dictArray addObject:dimMessage];
- }
- NSString *jsonString = [dictArray yy_modelToJSONString];
- self.eventSink(jsonString);
- }
-}
-
-#pragma mark - TIMRefreshListener
-/**
- * 会话列表变动
- */
-- (void)onRefresh{
- self.eventSink(@"[]");
-}
-@end
diff --git a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/MJExtension.h b/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/MJExtension.h
deleted file mode 100644
index ad35d09..0000000
--- a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/MJExtension.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-// MJExtension.h
-// MJExtension
-//
-// Created by mj on 14-1-15.
-// Copyright (c) 2014年 小码哥. All rights reserved.
-// 代码地址:https://github.com/CoderMJLee/MJExtension
-// 代码地址:http://code4app.com/ios/%E5%AD%97%E5%85%B8-JSON-%E4%B8%8E%E6%A8%A1%E5%9E%8B%E7%9A%84%E8%BD%AC%E6%8D%A2/5339992a933bf062608b4c57
-
-#import "NSObject+MJCoding.h"
-#import "NSObject+MJProperty.h"
-#import "NSObject+MJClass.h"
-#import "NSObject+MJKeyValue.h"
-#import "NSString+MJExtension.h"
-#import "MJExtensionConst.h"
\ No newline at end of file
diff --git a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/MJExtensionConst.h b/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/MJExtensionConst.h
deleted file mode 100644
index f5cf2aa..0000000
--- a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/MJExtensionConst.h
+++ /dev/null
@@ -1,102 +0,0 @@
-
-#ifndef __MJExtensionConst__H__
-#define __MJExtensionConst__H__
-
-#import <Foundation/Foundation.h>
-
-// 信号量
-#define MJExtensionSemaphoreCreate \
-static dispatch_semaphore_t signalSemaphore; \
-static dispatch_once_t onceTokenSemaphore; \
-dispatch_once(&onceTokenSemaphore, ^{ \
- signalSemaphore = dispatch_semaphore_create(1); \
-});
-
-#define MJExtensionSemaphoreWait \
-dispatch_semaphore_wait(signalSemaphore, DISPATCH_TIME_FOREVER);
-
-#define MJExtensionSemaphoreSignal \
-dispatch_semaphore_signal(signalSemaphore);
-
-// 过期
-#define MJExtensionDeprecated(instead) NS_DEPRECATED(2_0, 2_0, 2_0, 2_0, instead)
-
-// 构建错误
-#define MJExtensionBuildError(clazz, msg) \
-NSError *error = [NSError errorWithDomain:msg code:250 userInfo:nil]; \
-[clazz setMj_error:error];
-
-// 日志输出
-#ifdef DEBUG
-#define MJExtensionLog(...) NSLog(__VA_ARGS__)
-#else
-#define MJExtensionLog(...)
-#endif
-
-/**
- * 断言
- * @param condition 条件
- * @param returnValue 返回值
- */
-#define MJExtensionAssertError(condition, returnValue, clazz, msg) \
-[clazz setMj_error:nil]; \
-if ((condition) == NO) { \
- MJExtensionBuildError(clazz, msg); \
- return returnValue;\
-}
-
-#define MJExtensionAssert2(condition, returnValue) \
-if ((condition) == NO) return returnValue;
-
-/**
- * 断言
- * @param condition 条件
- */
-#define MJExtensionAssert(condition) MJExtensionAssert2(condition, )
-
-/**
- * 断言
- * @param param 参数
- * @param returnValue 返回值
- */
-#define MJExtensionAssertParamNotNil2(param, returnValue) \
-MJExtensionAssert2((param) != nil, returnValue)
-
-/**
- * 断言
- * @param param 参数
- */
-#define MJExtensionAssertParamNotNil(param) MJExtensionAssertParamNotNil2(param, )
-
-/**
- * 打印所有的属性
- */
-#define MJLogAllIvars \
--(NSString *)description \
-{ \
- return [self mj_keyValues].description; \
-}
-#define MJExtensionLogAllProperties MJLogAllIvars
-
-/**
- * 类型（属性类型）
- */
-extern NSString *const MJPropertyTypeInt;
-extern NSString *const MJPropertyTypeShort;
-extern NSString *const MJPropertyTypeFloat;
-extern NSString *const MJPropertyTypeDouble;
-extern NSString *const MJPropertyTypeLong;
-extern NSString *const MJPropertyTypeLongLong;
-extern NSString *const MJPropertyTypeChar;
-extern NSString *const MJPropertyTypeBOOL1;
-extern NSString *const MJPropertyTypeBOOL2;
-extern NSString *const MJPropertyTypePointer;
-
-extern NSString *const MJPropertyTypeIvar;
-extern NSString *const MJPropertyTypeMethod;
-extern NSString *const MJPropertyTypeBlock;
-extern NSString *const MJPropertyTypeClass;
-extern NSString *const MJPropertyTypeSEL;
-extern NSString *const MJPropertyTypeId;
-
-#endif
diff --git a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/MJExtensionConst.m b/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/MJExtensionConst.m
deleted file mode 100644
index 24bcca5..0000000
--- a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/MJExtensionConst.m
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef __MJExtensionConst__M__
-#define __MJExtensionConst__M__
-
-#import <Foundation/Foundation.h>
-
-/**
- * 成员变量类型（属性类型）
- */
-NSString *const MJPropertyTypeInt = @"i";
-NSString *const MJPropertyTypeShort = @"s";
-NSString *const MJPropertyTypeFloat = @"f";
-NSString *const MJPropertyTypeDouble = @"d";
-NSString *const MJPropertyTypeLong = @"l";
-NSString *const MJPropertyTypeLongLong = @"q";
-NSString *const MJPropertyTypeChar = @"c";
-NSString *const MJPropertyTypeBOOL1 = @"c";
-NSString *const MJPropertyTypeBOOL2 = @"b";
-NSString *const MJPropertyTypePointer = @"*";
-
-NSString *const MJPropertyTypeIvar = @"^{objc_ivar=}";
-NSString *const MJPropertyTypeMethod = @"^{objc_method=}";
-NSString *const MJPropertyTypeBlock = @"@?";
-NSString *const MJPropertyTypeClass = @"#";
-NSString *const MJPropertyTypeSEL = @":";
-NSString *const MJPropertyTypeId = @"@";
-
-#endif
\ No newline at end of file
diff --git a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/MJFoundation.h b/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/MJFoundation.h
deleted file mode 100644
index 8a0e457..0000000
--- a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/MJFoundation.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// MJFoundation.h
-// MJExtensionExample
-//
-// Created by MJ Lee on 14/7/16.
-// Copyright (c) 2014年 小码哥. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface MJFoundation : NSObject
-+ (BOOL)isClassFromFoundation:(Class)c;
-@end
diff --git a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/MJFoundation.m b/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/MJFoundation.m
deleted file mode 100644
index 3adc842..0000000
--- a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/MJFoundation.m
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// MJFoundation.m
-// MJExtensionExample
-//
-// Created by MJ Lee on 14/7/16.
-// Copyright (c) 2014年 小码哥. All rights reserved.
-//
-
-#import "MJFoundation.h"
-#import "MJExtensionConst.h"
-#import <CoreData/CoreData.h>
-
-@implementation MJFoundation
-
-+ (BOOL)isClassFromFoundation:(Class)c
-{
- if (c == [NSObject class] || c == [NSManagedObject class]) return YES;
-
- static NSSet *foundationClasses;
- static dispatch_once_t onceToken;
- dispatch_once(&onceToken, ^{
- // 集合中没有NSObject，因为几乎所有的类都是继承自NSObject，具体是不是NSObject需要特殊判断
- foundationClasses = [NSSet setWithObjects:
- [NSURL class],
- [NSDate class],
- [NSValue class],
- [NSData class],
- [NSError class],
- [NSArray class],
- [NSDictionary class],
- [NSString class],
- [NSAttributedString class], nil];
- });
-
- __block BOOL result = NO;
- [foundationClasses enumerateObjectsUsingBlock:^(Class foundationClass, BOOL *stop) {
- if ([c isSubclassOfClass:foundationClass]) {
- result = YES;
- *stop = YES;
- }
- }];
- return result;
-}
-@end
diff --git a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/MJProperty.h b/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/MJProperty.h
deleted file mode 100644
index 90ac6bc..0000000
--- a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/MJProperty.h
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// MJProperty.h
-// MJExtensionExample
-//
-// Created by MJ Lee on 15/4/17.
-// Copyright (c) 2015年 小码哥. All rights reserved.
-// 包装一个成员属性
-
-#import <Foundation/Foundation.h>
-#import <objc/runtime.h>
-#import "MJPropertyType.h"
-#import "MJPropertyKey.h"
-
-/**
- * 包装一个成员
- */
-@interface MJProperty : NSObject
-/** 成员属性 */
-@property (nonatomic, assign) objc_property_t property;
-/** 成员属性的名字 */
-@property (nonatomic, readonly) NSString *name;
-
-/** 成员属性的类型 */
-@property (nonatomic, readonly) MJPropertyType *type;
-/** 成员属性来源于哪个类（可能是父类） */
-@property (nonatomic, assign) Class srcClass;
-
-/**** 同一个成员属性 - 父类和子类的行为可能不一致（originKey、propertyKeys、objectClassInArray） ****/
-/** 设置最原始的key */
-- (void)setOriginKey:(id)originKey forClass:(Class)c;
-/** 对应着字典中的多级key（里面存放的数组，数组里面都是MJPropertyKey对象） */
-- (NSArray *)propertyKeysForClass:(Class)c;
-
-/** 模型数组中的模型类型 */
-- (void)setObjectClassInArray:(Class)objectClass forClass:(Class)c;
-- (Class)objectClassInArrayForClass:(Class)c;
-/**** 同一个成员变量 - 父类和子类的行为可能不一致（key、keys、objectClassInArray） ****/
-
-/**
- * 设置object的成员变量值
- */
-- (void)setValue:(id)value forObject:(id)object;
-/**
- * 得到object的成员属性值
- */
-- (id)valueForObject:(id)object;
-
-/**
- * 初始化
- */
-+ (instancetype)cachedPropertyWithProperty:(objc_property_t)property;
-
-@end
diff --git a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/MJProperty.m b/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/MJProperty.m
deleted file mode 100644
index ff57c6c..0000000
--- a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/MJProperty.m
+++ /dev/null
@@ -1,191 +0,0 @@
-//
-// MJProperty.m
-// MJExtensionExample
-//
-// Created by MJ Lee on 15/4/17.
-// Copyright (c) 2015年 小码哥. All rights reserved.
-//
-
-#import "MJProperty.h"
-#import "MJFoundation.h"
-#import "MJExtensionConst.h"
-#import <objc/message.h>
-
-@interface MJProperty()
-@property (strong, nonatomic) NSMutableDictionary *propertyKeysDict;
-@property (strong, nonatomic) NSMutableDictionary *objectClassInArrayDict;
-@end
-
-@implementation MJProperty
-
-#pragma mark - 初始化
-- (instancetype)init
-{
- if (self = [super init]) {
- _propertyKeysDict = [NSMutableDictionary dictionary];
- _objectClassInArrayDict = [NSMutableDictionary dictionary];
- }
- return self;
-}
-
-#pragma mark - 缓存
-+ (instancetype)cachedPropertyWithProperty:(objc_property_t)property
-{
- MJExtensionSemaphoreCreate
- MJExtensionSemaphoreWait
- MJProperty *propertyObj = objc_getAssociatedObject(self, property);
- if (propertyObj == nil) {
- propertyObj = [[self alloc] init];
- propertyObj.property = property;
- objc_setAssociatedObject(self, property, propertyObj, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
- }
- MJExtensionSemaphoreSignal
- return propertyObj;
-}
-
-#pragma mark - 公共方法
-- (void)setProperty:(objc_property_t)property
-{
- _property = property;
-
- MJExtensionAssertParamNotNil(property);
-
- // 1.属性名
- _name = @(property_getName(property));
-
- // 2.成员类型
- NSString *attrs = @(property_getAttributes(property));
- NSUInteger dotLoc = [attrs rangeOfString:@","].location;
- NSString *code = nil;
- NSUInteger loc = 1;
- if (dotLoc == NSNotFound) { // 没有,
- code = [attrs substringFromIndex:loc];
- } else {
- code = [attrs substringWithRange:NSMakeRange(loc, dotLoc - loc)];
- }
- _type = [MJPropertyType cachedTypeWithCode:code];
-}
-
-/**
- * 获得成员变量的值
- */
-- (id)valueForObject:(id)object
-{
- if (self.type.KVCDisabled) return [NSNull null];
- return [object valueForKey:self.name];
-}
-
-/**
- * 设置成员变量的值
- */
-- (void)setValue:(id)value forObject:(id)object
-{
- if (self.type.KVCDisabled || value == nil) return;
- [object setValue:value forKey:self.name];
-}
-
-/**
- * 通过字符串key创建对应的keys
- */
-- (NSArray *)propertyKeysWithStringKey:(NSString *)stringKey
-{
- if (stringKey.length == 0) return nil;
-
- NSMutableArray *propertyKeys = [NSMutableArray array];
- // 如果有多级映射
- NSArray *oldKeys = [stringKey componentsSeparatedByString:@"."];
-
- for (NSString *oldKey in oldKeys) {
- NSUInteger start = [oldKey rangeOfString:@"["].location;
- if (start != NSNotFound) { // 有索引的key
- NSString *prefixKey = [oldKey substringToIndex:start];
- NSString *indexKey = prefixKey;
- if (prefixKey.length) {
- MJPropertyKey *propertyKey = [[MJPropertyKey alloc] init];
- propertyKey.name = prefixKey;
- [propertyKeys addObject:propertyKey];
-
- indexKey = [oldKey stringByReplacingOccurrencesOfString:prefixKey withString:@""];
- }
-
- /** 解析索引 **/
- // 元素
- NSArray *cmps = [[indexKey stringByReplacingOccurrencesOfString:@"[" withString:@""] componentsSeparatedByString:@"]"];
- for (NSInteger i = 0; i<cmps.count - 1; i++) {
- MJPropertyKey *subPropertyKey = [[MJPropertyKey alloc] init];
- subPropertyKey.type = MJPropertyKeyTypeArray;
- subPropertyKey.name = cmps[i];
- [propertyKeys addObject:subPropertyKey];
- }
- } else { // 没有索引的key
- MJPropertyKey *propertyKey = [[MJPropertyKey alloc] init];
- propertyKey.name = oldKey;
- [propertyKeys addObject:propertyKey];
- }
- }
-
- return propertyKeys;
-}
-
-/** 对应着字典中的key */
-- (void)setOriginKey:(id)originKey forClass:(Class)c
-{
- if ([originKey isKindOfClass:[NSString class]]) { // 字符串类型的key
- NSArray *propertyKeys = [self propertyKeysWithStringKey:originKey];
- if (propertyKeys.count) {
- [self setPorpertyKeys:@[propertyKeys] forClass:c];
- }
- } else if ([originKey isKindOfClass:[NSArray class]]) {
- NSMutableArray *keyses = [NSMutableArray array];
- for (NSString *stringKey in originKey) {
- NSArray *propertyKeys = [self propertyKeysWithStringKey:stringKey];
- if (propertyKeys.count) {
- [keyses addObject:propertyKeys];
- }
- }
- if (keyses.count) {
- [self setPorpertyKeys:keyses forClass:c];
- }
- }
-}
-
-/** 对应着字典中的多级key */
-- (void)setPorpertyKeys:(NSArray *)propertyKeys forClass:(Class)c
-{
- if (propertyKeys.count == 0) return;
- NSString *key = NSStringFromClass(c);
- if (!key) return;
-
- MJExtensionSemaphoreCreate
- MJExtensionSemaphoreWait
- self.propertyKeysDict[key] = propertyKeys;
- MJExtensionSemaphoreSignal
-}
-
-- (NSArray *)propertyKeysForClass:(Class)c
-{
- NSString *key = NSStringFromClass(c);
- if (!key) return nil;
- return self.propertyKeysDict[key];
-}
-
-/** 模型数组中的模型类型 */
-- (void)setObjectClassInArray:(Class)objectClass forClass:(Class)c
-{
- if (!objectClass) return;
- NSString *key = NSStringFromClass(c);
- if (!key) return;
-
- MJExtensionSemaphoreCreate
- MJExtensionSemaphoreWait
- self.objectClassInArrayDict[key] = objectClass;
- MJExtensionSemaphoreSignal
-}
-
-- (Class)objectClassInArrayForClass:(Class)c
-{
- NSString *key = NSStringFromClass(c);
- if (!key) return nil;
- return self.objectClassInArrayDict[key];
-}
-@end
diff --git a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/MJPropertyKey.h b/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/MJPropertyKey.h
deleted file mode 100644
index 3cb254b..0000000
--- a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/MJPropertyKey.h
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-// MJPropertyKey.h
-// MJExtensionExample
-//
-// Created by MJ Lee on 15/8/11.
-// Copyright (c) 2015年 小码哥. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-typedef enum {
- MJPropertyKeyTypeDictionary = 0, // 字典的key
- MJPropertyKeyTypeArray // 数组的key
-} MJPropertyKeyType;
-
-/**
- * 属性的key
- */
-@interface MJPropertyKey : NSObject
-/** key的名字 */
-@property (copy, nonatomic) NSString *name;
-/** key的种类，可能是@"10"，可能是@"age" */
-@property (assign, nonatomic) MJPropertyKeyType type;
-
-/**
- * 根据当前的key，也就是name，从object（字典或者数组）中取值
- */
-- (id)valueInObject:(id)object;
-
-@end
diff --git a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/MJPropertyKey.m b/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/MJPropertyKey.m
deleted file mode 100644
index 438d019..0000000
--- a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/MJPropertyKey.m
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-// MJPropertyKey.m
-// MJExtensionExample
-//
-// Created by MJ Lee on 15/8/11.
-// Copyright (c) 2015年 小码哥. All rights reserved.
-//
-
-#import "MJPropertyKey.h"
-
-@implementation MJPropertyKey
-
-- (id)valueInObject:(id)object
-{
- if ([object isKindOfClass:[NSDictionary class]] && self.type == MJPropertyKeyTypeDictionary) {
- return object[self.name];
- } else if ([object isKindOfClass:[NSArray class]] && self.type == MJPropertyKeyTypeArray) {
- NSArray *array = object;
- NSUInteger index = self.name.intValue;
- if (index < array.count) return array[index];
- return nil;
- }
- return nil;
-}
-@end
diff --git a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/MJPropertyType.h b/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/MJPropertyType.h
deleted file mode 100644
index 8c53f27..0000000
--- a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/MJPropertyType.h
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// MJPropertyType.h
-// MJExtension
-//
-// Created by mj on 14-1-15.
-// Copyright (c) 2014年 小码哥. All rights reserved.
-// 包装一种类型
-
-#import <Foundation/Foundation.h>
-
-/**
- * 包装一种类型
- */
-@interface MJPropertyType : NSObject
-/** 类型标识符 */
-@property (nonatomic, copy) NSString *code;
-
-/** 是否为id类型 */
-@property (nonatomic, readonly, getter=isIdType) BOOL idType;
-
-/** 是否为基本数字类型：int、float等 */
-@property (nonatomic, readonly, getter=isNumberType) BOOL numberType;
-
-/** 是否为BOOL类型 */
-@property (nonatomic, readonly, getter=isBoolType) BOOL boolType;
-
-/** 对象类型（如果是基本数据类型，此值为nil） */
-@property (nonatomic, readonly) Class typeClass;
-
-/** 类型是否来自于Foundation框架，比如NSString、NSArray */
-@property (nonatomic, readonly, getter = isFromFoundation) BOOL fromFoundation;
-/** 类型是否不支持KVC */
-@property (nonatomic, readonly, getter = isKVCDisabled) BOOL KVCDisabled;
-
-/**
- * 获得缓存的类型对象
- */
-+ (instancetype)cachedTypeWithCode:(NSString *)code;
-@end
\ No newline at end of file
diff --git a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/MJPropertyType.m b/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/MJPropertyType.m
deleted file mode 100644
index 012b448..0000000
--- a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/MJPropertyType.m
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// MJPropertyType.m
-// MJExtension
-//
-// Created by mj on 14-1-15.
-// Copyright (c) 2014年 小码哥. All rights reserved.
-//
-
-#import "MJPropertyType.h"
-#import "MJExtension.h"
-#import "MJFoundation.h"
-#import "MJExtensionConst.h"
-
-@implementation MJPropertyType
-
-+ (instancetype)cachedTypeWithCode:(NSString *)code
-{
- MJExtensionAssertParamNotNil2(code, nil);
-
- static NSMutableDictionary *types;
- static dispatch_once_t onceToken;
- dispatch_once(&onceToken, ^{
- types = [NSMutableDictionary dictionary];
- });
-
- MJExtensionSemaphoreCreate
- MJExtensionSemaphoreWait
- MJPropertyType *type = types[code];
- if (type == nil) {
- type = [[self alloc] init];
- type.code = code;
- types[code] = type;
- }
- MJExtensionSemaphoreSignal
- return type;
-}
-
-#pragma mark - 公共方法
-- (void)setCode:(NSString *)code
-{
- _code = code;
-
- MJExtensionAssertParamNotNil(code);
-
- if ([code isEqualToString:MJPropertyTypeId]) {
- _idType = YES;
- } else if (code.length == 0) {
- _KVCDisabled = YES;
- } else if (code.length > 3 && [code hasPrefix:@"@\""]) {
- // 去掉@"和"，截取中间的类型名称
- _code = [code substringWithRange:NSMakeRange(2, code.length - 3)];
- _typeClass = NSClassFromString(_code);
- _fromFoundation = [MJFoundation isClassFromFoundation:_typeClass];
- _numberType = [_typeClass isSubclassOfClass:[NSNumber class]];
-
- } else if ([code isEqualToString:MJPropertyTypeSEL] ||
- [code isEqualToString:MJPropertyTypeIvar] ||
- [code isEqualToString:MJPropertyTypeMethod]) {
- _KVCDisabled = YES;
- }
-
- // 是否为数字类型
- NSString *lowerCode = _code.lowercaseString;
- NSArray *numberTypes = @[MJPropertyTypeInt, MJPropertyTypeShort, MJPropertyTypeBOOL1, MJPropertyTypeBOOL2, MJPropertyTypeFloat, MJPropertyTypeDouble, MJPropertyTypeLong, MJPropertyTypeLongLong, MJPropertyTypeChar];
- if ([numberTypes containsObject:lowerCode]) {
- _numberType = YES;
-
- if ([lowerCode isEqualToString:MJPropertyTypeBOOL1]
- || [lowerCode isEqualToString:MJPropertyTypeBOOL2]) {
- _boolType = YES;
- }
- }
-}
-@end
diff --git a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/NSObject+MJClass.h b/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/NSObject+MJClass.h
deleted file mode 100644
index 260c8fc..0000000
--- a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/NSObject+MJClass.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// NSObject+MJClass.h
-// MJExtensionExample
-//
-// Created by MJ Lee on 15/8/11.
-// Copyright (c) 2015年 小码哥. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-/**
- * 遍历所有类的block（父类）
- */
-typedef void (^MJClassesEnumeration)(Class c, BOOL *stop);
-
-/** 这个数组中的属性名才会进行字典和模型的转换 */
-typedef NSArray * (^MJAllowedPropertyNames)(void);
-/** 这个数组中的属性名才会进行归档 */
-typedef NSArray * (^MJAllowedCodingPropertyNames)(void);
-
-/** 这个数组中的属性名将会被忽略：不进行字典和模型的转换 */
-typedef NSArray * (^MJIgnoredPropertyNames)(void);
-/** 这个数组中的属性名将会被忽略：不进行归档 */
-typedef NSArray * (^MJIgnoredCodingPropertyNames)(void);
-
-/**
- * 类相关的扩展
- */
-@interface NSObject (MJClass)
-/**
- * 遍历所有的类
- */
-+ (void)mj_enumerateClasses:(MJClassesEnumeration)enumeration;
-+ (void)mj_enumerateAllClasses:(MJClassesEnumeration)enumeration;
-
-#pragma mark - 属性白名单配置
-/**
- * 这个数组中的属性名才会进行字典和模型的转换
- *
- * @param allowedPropertyNames 这个数组中的属性名才会进行字典和模型的转换
- */
-+ (void)mj_setupAllowedPropertyNames:(MJAllowedPropertyNames)allowedPropertyNames;
-
-/**
- * 这个数组中的属性名才会进行字典和模型的转换
- */
-+ (NSMutableArray *)mj_totalAllowedPropertyNames;
-
-#pragma mark - 属性黑名单配置
-/**
- * 这个数组中的属性名将会被忽略：不进行字典和模型的转换
- *
- * @param ignoredPropertyNames 这个数组中的属性名将会被忽略：不进行字典和模型的转换
- */
-+ (void)mj_setupIgnoredPropertyNames:(MJIgnoredPropertyNames)ignoredPropertyNames;
-
-/**
- * 这个数组中的属性名将会被忽略：不进行字典和模型的转换
- */
-+ (NSMutableArray *)mj_totalIgnoredPropertyNames;
-
-#pragma mark - 归档属性白名单配置
-/**
- * 这个数组中的属性名才会进行归档
- *
- * @param allowedCodingPropertyNames 这个数组中的属性名才会进行归档
- */
-+ (void)mj_setupAllowedCodingPropertyNames:(MJAllowedCodingPropertyNames)allowedCodingPropertyNames;
-
-/**
- * 这个数组中的属性名才会进行字典和模型的转换
- */
-+ (NSMutableArray *)mj_totalAllowedCodingPropertyNames;
-
-#pragma mark - 归档属性黑名单配置
-/**
- * 这个数组中的属性名将会被忽略：不进行归档
- *
- * @param ignoredCodingPropertyNames 这个数组中的属性名将会被忽略：不进行归档
- */
-+ (void)mj_setupIgnoredCodingPropertyNames:(MJIgnoredCodingPropertyNames)ignoredCodingPropertyNames;
-
-/**
- * 这个数组中的属性名将会被忽略：不进行归档
- */
-+ (NSMutableArray *)mj_totalIgnoredCodingPropertyNames;
-
-#pragma mark - 内部使用
-+ (void)mj_setupBlockReturnValue:(id (^)(void))block key:(const char *)key;
-@end
diff --git a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/NSObject+MJClass.m b/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/NSObject+MJClass.m
deleted file mode 100644
index a978890..0000000
--- a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/NSObject+MJClass.m
+++ /dev/null
@@ -1,178 +0,0 @@
-//
-// NSObject+MJClass.m
-// MJExtensionExample
-//
-// Created by MJ Lee on 15/8/11.
-// Copyright (c) 2015年 小码哥. All rights reserved.
-//
-
-#import "NSObject+MJClass.h"
-#import "NSObject+MJCoding.h"
-#import "NSObject+MJKeyValue.h"
-#import "MJFoundation.h"
-#import <objc/runtime.h>
-
-static const char MJAllowedPropertyNamesKey = '\0';
-static const char MJIgnoredPropertyNamesKey = '\0';
-static const char MJAllowedCodingPropertyNamesKey = '\0';
-static const char MJIgnoredCodingPropertyNamesKey = '\0';
-
-@implementation NSObject (MJClass)
-
-+ (NSMutableDictionary *)classDictForKey:(const void *)key
-{
- static NSMutableDictionary *allowedPropertyNamesDict;
- static NSMutableDictionary *ignoredPropertyNamesDict;
- static NSMutableDictionary *allowedCodingPropertyNamesDict;
- static NSMutableDictionary *ignoredCodingPropertyNamesDict;
-
- static dispatch_once_t onceToken;
- dispatch_once(&onceToken, ^{
- allowedPropertyNamesDict = [NSMutableDictionary dictionary];
- ignoredPropertyNamesDict = [NSMutableDictionary dictionary];
- allowedCodingPropertyNamesDict = [NSMutableDictionary dictionary];
- ignoredCodingPropertyNamesDict = [NSMutableDictionary dictionary];
- });
-
- if (key == &MJAllowedPropertyNamesKey) return allowedPropertyNamesDict;
- if (key == &MJIgnoredPropertyNamesKey) return ignoredPropertyNamesDict;
- if (key == &MJAllowedCodingPropertyNamesKey) return allowedCodingPropertyNamesDict;
- if (key == &MJIgnoredCodingPropertyNamesKey) return ignoredCodingPropertyNamesDict;
- return nil;
-}
-
-+ (void)mj_enumerateClasses:(MJClassesEnumeration)enumeration
-{
- // 1.没有block就直接返回
- if (enumeration == nil) return;
-
- // 2.停止遍历的标记
- BOOL stop = NO;
-
- // 3.当前正在遍历的类
- Class c = self;
-
- // 4.开始遍历每一个类
- while (c && !stop) {
- // 4.1.执行操作
- enumeration(c, &stop);
-
- // 4.2.获得父类
- c = class_getSuperclass(c);
-
- if ([MJFoundation isClassFromFoundation:c]) break;
- }
-}
-
-+ (void)mj_enumerateAllClasses:(MJClassesEnumeration)enumeration
-{
- // 1.没有block就直接返回
- if (enumeration == nil) return;
-
- // 2.停止遍历的标记
- BOOL stop = NO;
-
- // 3.当前正在遍历的类
- Class c = self;
-
- // 4.开始遍历每一个类
- while (c && !stop) {
- // 4.1.执行操作
- enumeration(c, &stop);
-
- // 4.2.获得父类
- c = class_getSuperclass(c);
- }
-}
-
-#pragma mark - 属性黑名单配置
-+ (void)mj_setupIgnoredPropertyNames:(MJIgnoredPropertyNames)ignoredPropertyNames
-{
- [self mj_setupBlockReturnValue:ignoredPropertyNames key:&MJIgnoredPropertyNamesKey];
-}
-
-+ (NSMutableArray *)mj_totalIgnoredPropertyNames
-{
- return [self mj_totalObjectsWithSelector:@selector(mj_ignoredPropertyNames) key:&MJIgnoredPropertyNamesKey];
-}
-
-#pragma mark - 归档属性黑名单配置
-+ (void)mj_setupIgnoredCodingPropertyNames:(MJIgnoredCodingPropertyNames)ignoredCodingPropertyNames
-{
- [self mj_setupBlockReturnValue:ignoredCodingPropertyNames key:&MJIgnoredCodingPropertyNamesKey];
-}
-
-+ (NSMutableArray *)mj_totalIgnoredCodingPropertyNames
-{
- return [self mj_totalObjectsWithSelector:@selector(mj_ignoredCodingPropertyNames) key:&MJIgnoredCodingPropertyNamesKey];
-}
-
-#pragma mark - 属性白名单配置
-+ (void)mj_setupAllowedPropertyNames:(MJAllowedPropertyNames)allowedPropertyNames;
-{
- [self mj_setupBlockReturnValue:allowedPropertyNames key:&MJAllowedPropertyNamesKey];
-}
-
-+ (NSMutableArray *)mj_totalAllowedPropertyNames
-{
- return [self mj_totalObjectsWithSelector:@selector(mj_allowedPropertyNames) key:&MJAllowedPropertyNamesKey];
-}
-
-#pragma mark - 归档属性白名单配置
-+ (void)mj_setupAllowedCodingPropertyNames:(MJAllowedCodingPropertyNames)allowedCodingPropertyNames
-{
- [self mj_setupBlockReturnValue:allowedCodingPropertyNames key:&MJAllowedCodingPropertyNamesKey];
-}
-
-+ (NSMutableArray *)mj_totalAllowedCodingPropertyNames
-{
- return [self mj_totalObjectsWithSelector:@selector(mj_allowedCodingPropertyNames) key:&MJAllowedCodingPropertyNamesKey];
-}
-
-#pragma mark - block和方法处理:存储block的返回值
-+ (void)mj_setupBlockReturnValue:(id (^)(void))block key:(const char *)key
-{
- if (block) {
- objc_setAssociatedObject(self, key, block(), OBJC_ASSOCIATION_RETAIN_NONATOMIC);
- } else {
- objc_setAssociatedObject(self, key, nil, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
- }
-
- // 清空数据
- MJExtensionSemaphoreCreate
- MJExtensionSemaphoreWait
- [[self classDictForKey:key] removeAllObjects];
- MJExtensionSemaphoreSignal
-}
-
-+ (NSMutableArray *)mj_totalObjectsWithSelector:(SEL)selector key:(const char *)key
-{
- MJExtensionSemaphoreCreate
- MJExtensionSemaphoreWait
-
- NSMutableArray *array = [self classDictForKey:key][NSStringFromClass(self)];
- if (array == nil) {
- // 创建、存储
- [self classDictForKey:key][NSStringFromClass(self)] = array = [NSMutableArray array];
-
- if ([self respondsToSelector:selector]) {
- #pragma clang diagnostic push
- #pragma clang diagnostic ignored "-Warc-performSelector-leaks"
- NSArray *subArray = [self performSelector:selector];
- #pragma clang diagnostic pop
- if (subArray) {
- [array addObjectsFromArray:subArray];
- }
- }
-
- [self mj_enumerateAllClasses:^(__unsafe_unretained Class c, BOOL *stop) {
- NSArray *subArray = objc_getAssociatedObject(c, key);
- [array addObjectsFromArray:subArray];
- }];
- }
-
- MJExtensionSemaphoreSignal
-
- return array;
-}
-@end
diff --git a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/NSObject+MJCoding.h b/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/NSObject+MJCoding.h
deleted file mode 100644
index d4327dd..0000000
--- a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/NSObject+MJCoding.h
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// NSObject+MJCoding.h
-// MJExtension
-//
-// Created by mj on 14-1-15.
-// Copyright (c) 2014年 小码哥. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "MJExtensionConst.h"
-
-/**
- * Codeing协议
- */
-@protocol MJCoding <NSObject>
-@optional
-/**
- * 这个数组中的属性名才会进行归档
- */
-+ (NSArray *)mj_allowedCodingPropertyNames;
-/**
- * 这个数组中的属性名将会被忽略：不进行归档
- */
-+ (NSArray *)mj_ignoredCodingPropertyNames;
-@end
-
-@interface NSObject (MJCoding) <MJCoding>
-/**
- * 解码（从文件中解析对象）
- */
-- (void)mj_decode:(NSCoder *)decoder;
-/**
- * 编码（将对象写入文件中）
- */
-- (void)mj_encode:(NSCoder *)encoder;
-@end
-
-/**
- 归档的实现
- */
-#define MJCodingImplementation \
-- (id)initWithCoder:(NSCoder *)decoder \
-{ \
-if (self = [super init]) { \
-[self mj_decode:decoder]; \
-} \
-return self; \
-} \
-\
-- (void)encodeWithCoder:(NSCoder *)encoder \
-{ \
-[self mj_encode:encoder]; \
-}
-
-#define MJExtensionCodingImplementation MJCodingImplementation
\ No newline at end of file
diff --git a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/NSObject+MJCoding.m b/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/NSObject+MJCoding.m
deleted file mode 100644
index 27ae8ee..0000000
--- a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/NSObject+MJCoding.m
+++ /dev/null
@@ -1,54 +0,0 @@
-//
-// NSObject+MJCoding.m
-// MJExtension
-//
-// Created by mj on 14-1-15.
-// Copyright (c) 2014年 小码哥. All rights reserved.
-//
-
-#import "NSObject+MJCoding.h"
-#import "NSObject+MJClass.h"
-#import "NSObject+MJProperty.h"
-#import "MJProperty.h"
-
-@implementation NSObject (MJCoding)
-
-- (void)mj_encode:(NSCoder *)encoder
-{
- Class clazz = [self class];
-
- NSArray *allowedCodingPropertyNames = [clazz mj_totalAllowedCodingPropertyNames];
- NSArray *ignoredCodingPropertyNames = [clazz mj_totalIgnoredCodingPropertyNames];
-
- [clazz mj_enumerateProperties:^(MJProperty *property, BOOL *stop) {
- // 检测是否被忽略
- if (allowedCodingPropertyNames.count && ![allowedCodingPropertyNames containsObject:property.name]) return;
- if ([ignoredCodingPropertyNames containsObject:property.name]) return;
-
- id value = [property valueForObject:self];
- if (value == nil) return;
- [encoder encodeObject:value forKey:property.name];
- }];
-}
-
-- (void)mj_decode:(NSCoder *)decoder
-{
- Class clazz = [self class];
-
- NSArray *allowedCodingPropertyNames = [clazz mj_totalAllowedCodingPropertyNames];
- NSArray *ignoredCodingPropertyNames = [clazz mj_totalIgnoredCodingPropertyNames];
-
- [clazz mj_enumerateProperties:^(MJProperty *property, BOOL *stop) {
- // 检测是否被忽略
- if (allowedCodingPropertyNames.count && ![allowedCodingPropertyNames containsObject:property.name]) return;
- if ([ignoredCodingPropertyNames containsObject:property.name]) return;
-
- id value = [decoder decodeObjectForKey:property.name];
- if (value == nil) { // 兼容以前的MJExtension版本
- value = [decoder decodeObjectForKey:[@"_" stringByAppendingString:property.name]];
- }
- if (value == nil) return;
- [property setValue:value forObject:self];
- }];
-}
-@end
diff --git a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/NSObject+MJKeyValue.h b/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/NSObject+MJKeyValue.h
deleted file mode 100644
index 45bea86..0000000
--- a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/NSObject+MJKeyValue.h
+++ /dev/null
@@ -1,226 +0,0 @@
-//
-// NSObject+MJKeyValue.h
-// MJExtension
-//
-// Created by mj on 13-8-24.
-// Copyright (c) 2013年 小码哥. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "MJExtensionConst.h"
-#import <CoreData/CoreData.h>
-#import "MJProperty.h"
-
-/**
- * KeyValue协议
- */
-@protocol MJKeyValue <NSObject>
-@optional
-/**
- * 只有这个数组中的属性名才允许进行字典和模型的转换
- */
-+ (NSArray *)mj_allowedPropertyNames;
-
-/**
- * 这个数组中的属性名将会被忽略：不进行字典和模型的转换
- */
-+ (NSArray *)mj_ignoredPropertyNames;
-
-/**
- * 将属性名换为其他key去字典中取值
- *
- * @return 字典中的key是属性名，value是从字典中取值用的key
- */
-+ (NSDictionary *)mj_replacedKeyFromPropertyName;
-
-/**
- * 将属性名换为其他key去字典中取值
- *
- * @return 从字典中取值用的key
- */
-+ (id)mj_replacedKeyFromPropertyName121:(NSString *)propertyName;
-
-/**
- * 数组中需要转换的模型类
- *
- * @return 字典中的key是数组属性名，value是数组中存放模型的Class（Class类型或者NSString类型）
- */
-+ (NSDictionary *)mj_objectClassInArray;
-
-/**
- * 旧值换新值，用于过滤字典中的值
- *
- * @param oldValue 旧值
- *
- * @return 新值
- */
-- (id)mj_newValueFromOldValue:(id)oldValue property:(MJProperty *)property;
-
-/**
- * 当字典转模型完毕时调用
- */
-- (void)mj_keyValuesDidFinishConvertingToObject;
-- (void)mj_keyValuesDidFinishConvertingToObject:(NSDictionary *)keyValues;
-
-/**
- * 当模型转字典完毕时调用
- */
-- (void)mj_objectDidFinishConvertingToKeyValues;
-@end
-
-@interface NSObject (MJKeyValue) <MJKeyValue>
-#pragma mark - 类方法
-/**
- * 字典转模型过程中遇到的错误
- */
-+ (NSError *)mj_error;
-
-/**
- * 模型转字典时，字典的key是否参考replacedKeyFromPropertyName等方法（父类设置了，子类也会继承下来）
- */
-+ (void)mj_referenceReplacedKeyWhenCreatingKeyValues:(BOOL)reference;
-
-#pragma mark - 对象方法
-/**
- * 将字典的键值对转成模型属性
- * @param keyValues 字典(可以是NSDictionary、NSData、NSString)
- */
-- (instancetype)mj_setKeyValues:(id)keyValues;
-
-/**
- * 将字典的键值对转成模型属性
- * @param keyValues 字典(可以是NSDictionary、NSData、NSString)
- * @param context CoreData上下文
- */
-- (instancetype)mj_setKeyValues:(id)keyValues context:(NSManagedObjectContext *)context;
-
-/**
- * 将模型转成字典
- * @return 字典
- */
-- (NSMutableDictionary *)mj_keyValues;
-- (NSMutableDictionary *)mj_keyValuesWithKeys:(NSArray *)keys;
-- (NSMutableDictionary *)mj_keyValuesWithIgnoredKeys:(NSArray *)ignoredKeys;
-
-/**
- * 通过模型数组来创建一个字典数组
- * @param objectArray 模型数组
- * @return 字典数组
- */
-+ (NSMutableArray *)mj_keyValuesArrayWithObjectArray:(NSArray *)objectArray;
-+ (NSMutableArray *)mj_keyValuesArrayWithObjectArray:(NSArray *)objectArray keys:(NSArray *)keys;
-+ (NSMutableArray *)mj_keyValuesArrayWithObjectArray:(NSArray *)objectArray ignoredKeys:(NSArray *)ignoredKeys;
-
-#pragma mark - 字典转模型
-/**
- * 通过字典来创建一个模型
- * @param keyValues 字典(可以是NSDictionary、NSData、NSString)
- * @return 新建的对象
- */
-+ (instancetype)mj_objectWithKeyValues:(id)keyValues;
-
-/**
- * 通过字典来创建一个CoreData模型
- * @param keyValues 字典(可以是NSDictionary、NSData、NSString)
- * @param context CoreData上下文
- * @return 新建的对象
- */
-+ (instancetype)mj_objectWithKeyValues:(id)keyValues context:(NSManagedObjectContext *)context;
-
-/**
- * 通过plist来创建一个模型
- * @param filename 文件名(仅限于mainBundle中的文件)
- * @return 新建的对象
- */
-+ (instancetype)mj_objectWithFilename:(NSString *)filename;
-
-/**
- * 通过plist来创建一个模型
- * @param file 文件全路径
- * @return 新建的对象
- */
-+ (instancetype)mj_objectWithFile:(NSString *)file;
-
-#pragma mark - 字典数组转模型数组
-/**
- * 通过字典数组来创建一个模型数组
- * @param keyValuesArray 字典数组(可以是NSDictionary、NSData、NSString)
- * @return 模型数组
- */
-+ (NSMutableArray *)mj_objectArrayWithKeyValuesArray:(id)keyValuesArray;
-
-/**
- * 通过字典数组来创建一个模型数组
- * @param keyValuesArray 字典数组(可以是NSDictionary、NSData、NSString)
- * @param context CoreData上下文
- * @return 模型数组
- */
-+ (NSMutableArray *)mj_objectArrayWithKeyValuesArray:(id)keyValuesArray context:(NSManagedObjectContext *)context;
-
-/**
- * 通过plist来创建一个模型数组
- * @param filename 文件名(仅限于mainBundle中的文件)
- * @return 模型数组
- */
-+ (NSMutableArray *)mj_objectArrayWithFilename:(NSString *)filename;
-
-/**
- * 通过plist来创建一个模型数组
- * @param file 文件全路径
- * @return 模型数组
- */
-+ (NSMutableArray *)mj_objectArrayWithFile:(NSString *)file;
-
-#pragma mark - 转换为JSON
-/**
- * 转换为JSON Data
- */
-- (NSData *)mj_JSONData;
-/**
- * 转换为字典或者数组
- */
-- (id)mj_JSONObject;
-/**
- * 转换为JSON 字符串
- */
-- (NSString *)mj_JSONString;
-@end
-
-@interface NSObject (MJKeyValueDeprecated_v_2_5_16)
-- (instancetype)setKeyValues:(id)keyValue MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-- (instancetype)setKeyValues:(id)keyValues error:(NSError **)error MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-- (instancetype)setKeyValues:(id)keyValues context:(NSManagedObjectContext *)context MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-- (instancetype)setKeyValues:(id)keyValues context:(NSManagedObjectContext *)context error:(NSError **)error MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-+ (void)referenceReplacedKeyWhenCreatingKeyValues:(BOOL)reference MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-- (NSMutableDictionary *)keyValues MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-- (NSMutableDictionary *)keyValuesWithError:(NSError **)error MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-- (NSMutableDictionary *)keyValuesWithKeys:(NSArray *)keys MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-- (NSMutableDictionary *)keyValuesWithKeys:(NSArray *)keys error:(NSError **)error MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-- (NSMutableDictionary *)keyValuesWithIgnoredKeys:(NSArray *)ignoredKeys MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-- (NSMutableDictionary *)keyValuesWithIgnoredKeys:(NSArray *)ignoredKeys error:(NSError **)error MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-+ (NSMutableArray *)keyValuesArrayWithObjectArray:(NSArray *)objectArray MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-+ (NSMutableArray *)keyValuesArrayWithObjectArray:(NSArray *)objectArray error:(NSError **)error MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-+ (NSMutableArray *)keyValuesArrayWithObjectArray:(NSArray *)objectArray keys:(NSArray *)keys MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-+ (NSMutableArray *)keyValuesArrayWithObjectArray:(NSArray *)objectArray keys:(NSArray *)keys error:(NSError **)error MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-+ (NSMutableArray *)keyValuesArrayWithObjectArray:(NSArray *)objectArray ignoredKeys:(NSArray *)ignoredKeys MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-+ (NSMutableArray *)keyValuesArrayWithObjectArray:(NSArray *)objectArray ignoredKeys:(NSArray *)ignoredKeys error:(NSError **)error MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-+ (instancetype)objectWithKeyValues:(id)keyValues MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-+ (instancetype)objectWithKeyValues:(id)keyValues error:(NSError **)error MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-+ (instancetype)objectWithKeyValues:(id)keyValues context:(NSManagedObjectContext *)context MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-+ (instancetype)objectWithKeyValues:(id)keyValues context:(NSManagedObjectContext *)context error:(NSError **)error MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-+ (instancetype)objectWithFilename:(NSString *)filename MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-+ (instancetype)objectWithFilename:(NSString *)filename error:(NSError **)error MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-+ (instancetype)objectWithFile:(NSString *)file MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-+ (instancetype)objectWithFile:(NSString *)file error:(NSError **)error MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-+ (NSMutableArray *)objectArrayWithKeyValuesArray:(id)keyValuesArray MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-+ (NSMutableArray *)objectArrayWithKeyValuesArray:(id)keyValuesArray error:(NSError **)error MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-+ (NSMutableArray *)objectArrayWithKeyValuesArray:(id)keyValuesArray context:(NSManagedObjectContext *)context MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-+ (NSMutableArray *)objectArrayWithKeyValuesArray:(id)keyValuesArray context:(NSManagedObjectContext *)context error:(NSError **)error MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-+ (NSMutableArray *)objectArrayWithFilename:(NSString *)filename MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-+ (NSMutableArray *)objectArrayWithFilename:(NSString *)filename error:(NSError **)error MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-+ (NSMutableArray *)objectArrayWithFile:(NSString *)file MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-+ (NSMutableArray *)objectArrayWithFile:(NSString *)file error:(NSError **)error MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-- (NSData *)JSONData MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-- (id)JSONObject MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-- (NSString *)JSONString MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-@end
diff --git a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/NSObject+MJKeyValue.m b/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/NSObject+MJKeyValue.m
deleted file mode 100644
index 3d91e84..0000000
--- a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/NSObject+MJKeyValue.m
+++ /dev/null
@@ -1,717 +0,0 @@
-//
-// NSObject+MJKeyValue.m
-// MJExtension
-//
-// Created by mj on 13-8-24.
-// Copyright (c) 2013年 小码哥. All rights reserved.
-//
-
-#import "NSObject+MJKeyValue.h"
-#import "NSObject+MJProperty.h"
-#import "NSString+MJExtension.h"
-#import "MJProperty.h"
-#import "MJPropertyType.h"
-#import "MJExtensionConst.h"
-#import "MJFoundation.h"
-#import "NSString+MJExtension.h"
-#import "NSObject+MJClass.h"
-
-@implementation NSObject (MJKeyValue)
-
-#pragma mark - 错误
-static const char MJErrorKey = '\0';
-+ (NSError *)mj_error
-{
- return objc_getAssociatedObject(self, &MJErrorKey);
-}
-
-+ (void)setMj_error:(NSError *)error
-{
- objc_setAssociatedObject(self, &MJErrorKey, error, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-}
-
-#pragma mark - 模型 -> 字典时的参考
-/** 模型转字典时，字典的key是否参考replacedKeyFromPropertyName等方法（父类设置了，子类也会继承下来） */
-static const char MJReferenceReplacedKeyWhenCreatingKeyValuesKey = '\0';
-
-+ (void)mj_referenceReplacedKeyWhenCreatingKeyValues:(BOOL)reference
-{
- objc_setAssociatedObject(self, &MJReferenceReplacedKeyWhenCreatingKeyValuesKey, @(reference), OBJC_ASSOCIATION_ASSIGN);
-}
-
-+ (BOOL)mj_isReferenceReplacedKeyWhenCreatingKeyValues
-{
- __block id value = objc_getAssociatedObject(self, &MJReferenceReplacedKeyWhenCreatingKeyValuesKey);
- if (!value) {
- [self mj_enumerateAllClasses:^(__unsafe_unretained Class c, BOOL *stop) {
- value = objc_getAssociatedObject(c, &MJReferenceReplacedKeyWhenCreatingKeyValuesKey);
-
- if (value) *stop = YES;
- }];
- }
- return [value boolValue];
-}
-
-#pragma mark - --常用的对象--
-static NSNumberFormatter *numberFormatter_;
-+ (void)load
-{
- numberFormatter_ = [[NSNumberFormatter alloc] init];
-
- // 默认设置
- [self mj_referenceReplacedKeyWhenCreatingKeyValues:YES];
-}
-
-#pragma mark - --公共方法--
-#pragma mark - 字典 -> 模型
-- (instancetype)mj_setKeyValues:(id)keyValues
-{
- return [self mj_setKeyValues:keyValues context:nil];
-}
-
-/**
- 核心代码：
- */
-- (instancetype)mj_setKeyValues:(id)keyValues context:(NSManagedObjectContext *)context
-{
- // 获得JSON对象
- keyValues = [keyValues mj_JSONObject];
-
- MJExtensionAssertError([keyValues isKindOfClass:[NSDictionary class]], self, [self class], @"keyValues参数不是一个字典");
-
- Class clazz = [self class];
- NSArray *allowedPropertyNames = [clazz mj_totalAllowedPropertyNames];
- NSArray *ignoredPropertyNames = [clazz mj_totalIgnoredPropertyNames];
-
- //通过封装的方法回调一个通过运行时编写的，用于返回属性列表的方法。
- [clazz mj_enumerateProperties:^(MJProperty *property, BOOL *stop) {
- @try {
- // 0.检测是否被忽略
- if (allowedPropertyNames.count && ![allowedPropertyNames containsObject:property.name]) return;
- if ([ignoredPropertyNames containsObject:property.name]) return;
-
- // 1.取出属性值
- id value;
- NSArray *propertyKeyses = [property propertyKeysForClass:clazz];
- for (NSArray *propertyKeys in propertyKeyses) {
- value = keyValues;
- for (MJPropertyKey *propertyKey in propertyKeys) {
- value = [propertyKey valueInObject:value];
- }
- if (value) break;
- }
-
- // 值的过滤
- id newValue = [clazz mj_getNewValueFromObject:self oldValue:value property:property];
- if (newValue != value) { // 有过滤后的新值
- [property setValue:newValue forObject:self];
- return;
- }
-
- // 如果没有值，就直接返回
- if (!value || value == [NSNull null]) return;
-
- // 2.复杂处理
- MJPropertyType *type = property.type;
- Class propertyClass = type.typeClass;
- Class objectClass = [property objectClassInArrayForClass:[self class]];
-
- // 不可变 -> 可变处理
- if (propertyClass == [NSMutableArray class] && [value isKindOfClass:[NSArray class]]) {
- value = [NSMutableArray arrayWithArray:value];
- } else if (propertyClass == [NSMutableDictionary class] && [value isKindOfClass:[NSDictionary class]]) {
- value = [NSMutableDictionary dictionaryWithDictionary:value];
- } else if (propertyClass == [NSMutableString class] && [value isKindOfClass:[NSString class]]) {
- value = [NSMutableString stringWithString:value];
- } else if (propertyClass == [NSMutableData class] && [value isKindOfClass:[NSData class]]) {
- value = [NSMutableData dataWithData:value];
- }
-
- if (!type.isFromFoundation && propertyClass) { // 模型属性
- value = [propertyClass mj_objectWithKeyValues:value context:context];
- } else if (objectClass) {
- if (objectClass == [NSURL class] && [value isKindOfClass:[NSArray class]]) {
- // string array -> url array
- NSMutableArray *urlArray = [NSMutableArray array];
- for (NSString *string in value) {
- if (![string isKindOfClass:[NSString class]]) continue;
- [urlArray addObject:string.mj_url];
- }
- value = urlArray;
- } else { // 字典数组-->模型数组
- value = [objectClass mj_objectArrayWithKeyValuesArray:value context:context];
- }
- } else {
- if (propertyClass == [NSString class]) {
- if ([value isKindOfClass:[NSNumber class]]) {
- // NSNumber -> NSString
- value = [value description];
- } else if ([value isKindOfClass:[NSURL class]]) {
- // NSURL -> NSString
- value = [value absoluteString];
- }
- } else if ([value isKindOfClass:[NSString class]]) {
- if (propertyClass == [NSURL class]) {
- // NSString -> NSURL
- // 字符串转码
- value = [value mj_url];
- } else if (type.isNumberType) {
- NSString *oldValue = value;
-
- // NSString -> NSNumber
- if (type.typeClass == [NSDecimalNumber class]) {
- value = [NSDecimalNumber decimalNumberWithString:oldValue];
- } else {
- value = [numberFormatter_ numberFromString:oldValue];
- }
-
- // 如果是BOOL
- if (type.isBoolType) {
- // 字符串转BOOL（字符串没有charValue方法）
- // 系统会调用字符串的charValue转为BOOL类型
- NSString *lower = [oldValue lowercaseString];
- if ([lower isEqualToString:@"yes"] || [lower isEqualToString:@"true"]) {
- value = @YES;
- } else if ([lower isEqualToString:@"no"] || [lower isEqualToString:@"false"]) {
- value = @NO;
- }
- }
- }
- } else if ([value isKindOfClass:[NSNumber class]] && propertyClass == [NSDecimalNumber class]){
- // 过滤 NSDecimalNumber类型
- if (![value isKindOfClass:[NSDecimalNumber class]]) {
- value = [NSDecimalNumber decimalNumberWithDecimal:[((NSNumber *)value) decimalValue]];
- }
- }
-
- // value和property类型不匹配
- if (propertyClass && ![value isKindOfClass:propertyClass]) {
- value = nil;
- }
- }
-
- // 3.赋值
- [property setValue:value forObject:self];
- } @catch (NSException *exception) {
- MJExtensionBuildError([self class], exception.reason);
- MJExtensionLog(@"%@", exception);
- }
- }];
-
- // 转换完毕
- if ([self respondsToSelector:@selector(mj_keyValuesDidFinishConvertingToObject)]) {
- [self mj_keyValuesDidFinishConvertingToObject];
- }
- if ([self respondsToSelector:@selector(mj_keyValuesDidFinishConvertingToObject:)]) {
- [self mj_keyValuesDidFinishConvertingToObject:keyValues];
- }
- return self;
-}
-
-+ (instancetype)mj_objectWithKeyValues:(id)keyValues
-{
- return [self mj_objectWithKeyValues:keyValues context:nil];
-}
-
-+ (instancetype)mj_objectWithKeyValues:(id)keyValues context:(NSManagedObjectContext *)context
-{
- // 获得JSON对象
- keyValues = [keyValues mj_JSONObject];
- MJExtensionAssertError([keyValues isKindOfClass:[NSDictionary class]], nil, [self class], @"keyValues参数不是一个字典");
-
- if ([self isSubclassOfClass:[NSManagedObject class]] && context) {
- NSString *entityName = [NSStringFromClass(self) componentsSeparatedByString:@"."].lastObject;
- return [[NSEntityDescription insertNewObjectForEntityForName:entityName inManagedObjectContext:context] mj_setKeyValues:keyValues context:context];
- }
- return [[[self alloc] init] mj_setKeyValues:keyValues];
-}
-
-+ (instancetype)mj_objectWithFilename:(NSString *)filename
-{
- MJExtensionAssertError(filename != nil, nil, [self class], @"filename参数为nil");
-
- return [self mj_objectWithFile:[[NSBundle mainBundle] pathForResource:filename ofType:nil]];
-}
-
-+ (instancetype)mj_objectWithFile:(NSString *)file
-{
- MJExtensionAssertError(file != nil, nil, [self class], @"file参数为nil");
-
- return [self mj_objectWithKeyValues:[NSDictionary dictionaryWithContentsOfFile:file]];
-}
-
-#pragma mark - 字典数组 -> 模型数组
-+ (NSMutableArray *)mj_objectArrayWithKeyValuesArray:(NSArray *)keyValuesArray
-{
- return [self mj_objectArrayWithKeyValuesArray:keyValuesArray context:nil];
-}
-
-+ (NSMutableArray *)mj_objectArrayWithKeyValuesArray:(id)keyValuesArray context:(NSManagedObjectContext *)context
-{
- // 如果是JSON字符串
- keyValuesArray = [keyValuesArray mj_JSONObject];
-
- // 1.判断真实性
- MJExtensionAssertError([keyValuesArray isKindOfClass:[NSArray class]], nil, [self class], @"keyValuesArray参数不是一个数组");
-
- // 如果数组里面放的是NSString、NSNumber等数据
- if ([MJFoundation isClassFromFoundation:self]) return [NSMutableArray arrayWithArray:keyValuesArray];
-
-
- // 2.创建数组
- NSMutableArray *modelArray = [NSMutableArray array];
-
- // 3.遍历
- for (NSDictionary *keyValues in keyValuesArray) {
- if ([keyValues isKindOfClass:[NSArray class]]){
- [modelArray addObject:[self mj_objectArrayWithKeyValuesArray:keyValues context:context]];
- } else {
- id model = [self mj_objectWithKeyValues:keyValues context:context];
- if (model) [modelArray addObject:model];
- }
- }
-
- return modelArray;
-}
-
-+ (NSMutableArray *)mj_objectArrayWithFilename:(NSString *)filename
-{
- MJExtensionAssertError(filename != nil, nil, [self class], @"filename参数为nil");
-
- return [self mj_objectArrayWithFile:[[NSBundle mainBundle] pathForResource:filename ofType:nil]];
-}
-
-+ (NSMutableArray *)mj_objectArrayWithFile:(NSString *)file
-{
- MJExtensionAssertError(file != nil, nil, [self class], @"file参数为nil");
-
- return [self mj_objectArrayWithKeyValuesArray:[NSArray arrayWithContentsOfFile:file]];
-}
-
-#pragma mark - 模型 -> 字典
-- (NSMutableDictionary *)mj_keyValues
-{
- return [self mj_keyValuesWithKeys:nil ignoredKeys:nil];
-}
-
-- (NSMutableDictionary *)mj_keyValuesWithKeys:(NSArray *)keys
-{
- return [self mj_keyValuesWithKeys:keys ignoredKeys:nil];
-}
-
-- (NSMutableDictionary *)mj_keyValuesWithIgnoredKeys:(NSArray *)ignoredKeys
-{
- return [self mj_keyValuesWithKeys:nil ignoredKeys:ignoredKeys];
-}
-
-- (NSMutableDictionary *)mj_keyValuesWithKeys:(NSArray *)keys ignoredKeys:(NSArray *)ignoredKeys
-{
- // 如果自己不是模型类, 那就返回自己
- MJExtensionAssertError(![MJFoundation isClassFromFoundation:[self class]], (NSMutableDictionary *)self, [self class], @"不是自定义的模型类")
-
- id keyValues = [NSMutableDictionary dictionary];
-
- Class clazz = [self class];
- NSArray *allowedPropertyNames = [clazz mj_totalAllowedPropertyNames];
- NSArray *ignoredPropertyNames = [clazz mj_totalIgnoredPropertyNames];
-
- [clazz mj_enumerateProperties:^(MJProperty *property, BOOL *stop) {
- @try {
- // 0.检测是否被忽略
- if (allowedPropertyNames.count && ![allowedPropertyNames containsObject:property.name]) return;
- if ([ignoredPropertyNames containsObject:property.name]) return;
- if (keys.count && ![keys containsObject:property.name]) return;
- if ([ignoredKeys containsObject:property.name]) return;
-
- // 1.取出属性值
- id value = [property valueForObject:self];
- if (!value) return;
-
- // 2.如果是模型属性
- MJPropertyType *type = property.type;
- Class propertyClass = type.typeClass;
- if (!type.isFromFoundation && propertyClass) {
- value = [value mj_keyValues];
- } else if ([value isKindOfClass:[NSArray class]]) {
- // 3.处理数组里面有模型的情况
- value = [NSObject mj_keyValuesArrayWithObjectArray:value];
- } else if (propertyClass == [NSURL class]) {
- value = [value absoluteString];
- }
-
- // 4.赋值
- if ([clazz mj_isReferenceReplacedKeyWhenCreatingKeyValues]) {
- NSArray *propertyKeys = [[property propertyKeysForClass:clazz] firstObject];
- NSUInteger keyCount = propertyKeys.count;
- // 创建字典
- __block id innerContainer = keyValues;
- [propertyKeys enumerateObjectsUsingBlock:^(MJPropertyKey *propertyKey, NSUInteger idx, BOOL *stop) {
- // 下一个属性
- MJPropertyKey *nextPropertyKey = nil;
- if (idx != keyCount - 1) {
- nextPropertyKey = propertyKeys[idx + 1];
- }
-
- if (nextPropertyKey) { // 不是最后一个key
- // 当前propertyKey对应的字典或者数组
- id tempInnerContainer = [propertyKey valueInObject:innerContainer];
- if (tempInnerContainer == nil || [tempInnerContainer isKindOfClass:[NSNull class]]) {
- if (nextPropertyKey.type == MJPropertyKeyTypeDictionary) {
- tempInnerContainer = [NSMutableDictionary dictionary];
- } else {
- tempInnerContainer = [NSMutableArray array];
- }
- if (propertyKey.type == MJPropertyKeyTypeDictionary) {
- innerContainer[propertyKey.name] = tempInnerContainer;
- } else {
- innerContainer[propertyKey.name.intValue] = tempInnerContainer;
- }
- }
-
- if ([tempInnerContainer isKindOfClass:[NSMutableArray class]]) {
- NSMutableArray *tempInnerContainerArray = tempInnerContainer;
- int index = nextPropertyKey.name.intValue;
- while (tempInnerContainerArray.count < index + 1) {
- [tempInnerContainerArray addObject:[NSNull null]];
- }
- }
-
- innerContainer = tempInnerContainer;
- } else { // 最后一个key
- if (propertyKey.type == MJPropertyKeyTypeDictionary) {
- innerContainer[propertyKey.name] = value;
- } else {
- innerContainer[propertyKey.name.intValue] = value;
- }
- }
- }];
- } else {
- keyValues[property.name] = value;
- }
- } @catch (NSException *exception) {
- MJExtensionBuildError([self class], exception.reason);
- MJExtensionLog(@"%@", exception);
- }
- }];
-
- // 转换完毕
- if ([self respondsToSelector:@selector(mj_objectDidFinishConvertingToKeyValues)]) {
- [self mj_objectDidFinishConvertingToKeyValues];
- }
-
- return keyValues;
-}
-#pragma mark - 模型数组 -> 字典数组
-+ (NSMutableArray *)mj_keyValuesArrayWithObjectArray:(NSArray *)objectArray
-{
- return [self mj_keyValuesArrayWithObjectArray:objectArray keys:nil ignoredKeys:nil];
-}
-
-+ (NSMutableArray *)mj_keyValuesArrayWithObjectArray:(NSArray *)objectArray keys:(NSArray *)keys
-{
- return [self mj_keyValuesArrayWithObjectArray:objectArray keys:keys ignoredKeys:nil];
-}
-
-+ (NSMutableArray *)mj_keyValuesArrayWithObjectArray:(NSArray *)objectArray ignoredKeys:(NSArray *)ignoredKeys
-{
- return [self mj_keyValuesArrayWithObjectArray:objectArray keys:nil ignoredKeys:ignoredKeys];
-}
-
-+ (NSMutableArray *)mj_keyValuesArrayWithObjectArray:(NSArray *)objectArray keys:(NSArray *)keys ignoredKeys:(NSArray *)ignoredKeys
-{
- // 0.判断真实性
- MJExtensionAssertError([objectArray isKindOfClass:[NSArray class]], nil, [self class], @"objectArray参数不是一个数组");
-
- // 1.创建数组
- NSMutableArray *keyValuesArray = [NSMutableArray array];
- for (id object in objectArray) {
- if (keys) {
- [keyValuesArray addObject:[object mj_keyValuesWithKeys:keys]];
- } else {
- [keyValuesArray addObject:[object mj_keyValuesWithIgnoredKeys:ignoredKeys]];
- }
- }
- return keyValuesArray;
-}
-
-#pragma mark - 转换为JSON
-- (NSData *)mj_JSONData
-{
- if ([self isKindOfClass:[NSString class]]) {
- return [((NSString *)self) dataUsingEncoding:NSUTF8StringEncoding];
- } else if ([self isKindOfClass:[NSData class]]) {
- return (NSData *)self;
- }
-
- return [NSJSONSerialization dataWithJSONObject:[self mj_JSONObject] options:kNilOptions error:nil];
-}
-
-- (id)mj_JSONObject
-{
- if ([self isKindOfClass:[NSString class]]) {
- return [NSJSONSerialization JSONObjectWithData:[((NSString *)self) dataUsingEncoding:NSUTF8StringEncoding] options:kNilOptions error:nil];
- } else if ([self isKindOfClass:[NSData class]]) {
- return [NSJSONSerialization JSONObjectWithData:(NSData *)self options:kNilOptions error:nil];
- }
-
- return self.mj_keyValues;
-}
-
-- (NSString *)mj_JSONString
-{
- if ([self isKindOfClass:[NSString class]]) {
- return (NSString *)self;
- } else if ([self isKindOfClass:[NSData class]]) {
- return [[NSString alloc] initWithData:(NSData *)self encoding:NSUTF8StringEncoding];
- }
-
- return [[NSString alloc] initWithData:[self mj_JSONData] encoding:NSUTF8StringEncoding];
-}
-@end
-
-@implementation NSObject (MJKeyValueDeprecated_v_2_5_16)
-- (instancetype)setKeyValues:(id)keyValues
-{
- return [self mj_setKeyValues:keyValues];
-}
-
-- (instancetype)setKeyValues:(id)keyValues error:(NSError **)error
-{
- id value = [self mj_setKeyValues:keyValues];
- if (error != NULL) {
- *error = [self.class mj_error];
- }
- return value;
-
-}
-
-- (instancetype)setKeyValues:(id)keyValues context:(NSManagedObjectContext *)context
-{
- return [self mj_setKeyValues:keyValues context:context];
-}
-
-- (instancetype)setKeyValues:(id)keyValues context:(NSManagedObjectContext *)context error:(NSError **)error
-{
- id value = [self mj_setKeyValues:keyValues context:context];
- if (error != NULL) {
- *error = [self.class mj_error];
- }
- return value;
-}
-
-+ (void)referenceReplacedKeyWhenCreatingKeyValues:(BOOL)reference
-{
- [self mj_referenceReplacedKeyWhenCreatingKeyValues:reference];
-}
-
-- (NSMutableDictionary *)keyValues
-{
- return [self mj_keyValues];
-}
-
-- (NSMutableDictionary *)keyValuesWithError:(NSError **)error
-{
- id value = [self mj_keyValues];
- if (error != NULL) {
- *error = [self.class mj_error];
- }
- return value;
-}
-
-- (NSMutableDictionary *)keyValuesWithKeys:(NSArray *)keys
-{
- return [self mj_keyValuesWithKeys:keys];
-}
-
-- (NSMutableDictionary *)keyValuesWithKeys:(NSArray *)keys error:(NSError **)error
-{
- id value = [self mj_keyValuesWithKeys:keys];
- if (error != NULL) {
- *error = [self.class mj_error];
- }
- return value;
-}
-
-- (NSMutableDictionary *)keyValuesWithIgnoredKeys:(NSArray *)ignoredKeys
-{
- return [self mj_keyValuesWithIgnoredKeys:ignoredKeys];
-}
-
-- (NSMutableDictionary *)keyValuesWithIgnoredKeys:(NSArray *)ignoredKeys error:(NSError **)error
-{
- id value = [self mj_keyValuesWithIgnoredKeys:ignoredKeys];
- if (error != NULL) {
- *error = [self.class mj_error];
- }
- return value;
-}
-
-+ (NSMutableArray *)keyValuesArrayWithObjectArray:(NSArray *)objectArray
-{
- return [self mj_keyValuesArrayWithObjectArray:objectArray];
-}
-
-+ (NSMutableArray *)keyValuesArrayWithObjectArray:(NSArray *)objectArray error:(NSError **)error
-{
- id value = [self mj_keyValuesArrayWithObjectArray:objectArray];
- if (error != NULL) {
- *error = [self mj_error];
- }
- return value;
-}
-
-+ (NSMutableArray *)keyValuesArrayWithObjectArray:(NSArray *)objectArray keys:(NSArray *)keys
-{
- return [self mj_keyValuesArrayWithObjectArray:objectArray keys:keys];
-}
-
-+ (NSMutableArray *)keyValuesArrayWithObjectArray:(NSArray *)objectArray keys:(NSArray *)keys error:(NSError **)error
-{
- id value = [self mj_keyValuesArrayWithObjectArray:objectArray keys:keys];
- if (error != NULL) {
- *error = [self mj_error];
- }
- return value;
-}
-
-+ (NSMutableArray *)keyValuesArrayWithObjectArray:(NSArray *)objectArray ignoredKeys:(NSArray *)ignoredKeys
-{
- return [self mj_keyValuesArrayWithObjectArray:objectArray ignoredKeys:ignoredKeys];
-}
-
-+ (NSMutableArray *)keyValuesArrayWithObjectArray:(NSArray *)objectArray ignoredKeys:(NSArray *)ignoredKeys error:(NSError **)error
-{
- id value = [self mj_keyValuesArrayWithObjectArray:objectArray ignoredKeys:ignoredKeys];
- if (error != NULL) {
- *error = [self mj_error];
- }
- return value;
-}
-
-+ (instancetype)objectWithKeyValues:(id)keyValues
-{
- return [self mj_objectWithKeyValues:keyValues];
-}
-
-+ (instancetype)objectWithKeyValues:(id)keyValues error:(NSError **)error
-{
- id value = [self mj_objectWithKeyValues:keyValues];
- if (error != NULL) {
- *error = [self mj_error];
- }
- return value;
-}
-
-+ (instancetype)objectWithKeyValues:(id)keyValues context:(NSManagedObjectContext *)context
-{
- return [self mj_objectWithKeyValues:keyValues context:context];
-}
-
-+ (instancetype)objectWithKeyValues:(id)keyValues context:(NSManagedObjectContext *)context error:(NSError **)error
-{
- id value = [self mj_objectWithKeyValues:keyValues context:context];
- if (error != NULL) {
- *error = [self mj_error];
- }
- return value;
-}
-
-+ (instancetype)objectWithFilename:(NSString *)filename
-{
- return [self mj_objectWithFilename:filename];
-}
-
-+ (instancetype)objectWithFilename:(NSString *)filename error:(NSError **)error
-{
- id value = [self mj_objectWithFilename:filename];
- if (error != NULL) {
- *error = [self mj_error];
- }
- return value;
-}
-
-+ (instancetype)objectWithFile:(NSString *)file
-{
- return [self mj_objectWithFile:file];
-}
-
-+ (instancetype)objectWithFile:(NSString *)file error:(NSError **)error
-{
- id value = [self mj_objectWithFile:file];
- if (error != NULL) {
- *error = [self mj_error];
- }
- return value;
-}
-
-+ (NSMutableArray *)objectArrayWithKeyValuesArray:(id)keyValuesArray
-{
- return [self mj_objectArrayWithKeyValuesArray:keyValuesArray];
-}
-
-+ (NSMutableArray *)objectArrayWithKeyValuesArray:(id)keyValuesArray error:(NSError **)error
-{
- id value = [self mj_objectArrayWithKeyValuesArray:keyValuesArray];
- if (error != NULL) {
- *error = [self mj_error];
- }
- return value;
-}
-
-+ (NSMutableArray *)objectArrayWithKeyValuesArray:(id)keyValuesArray context:(NSManagedObjectContext *)context
-{
- return [self mj_objectArrayWithKeyValuesArray:keyValuesArray context:context];
-}
-
-+ (NSMutableArray *)objectArrayWithKeyValuesArray:(id)keyValuesArray context:(NSManagedObjectContext *)context error:(NSError **)error
-{
- id value = [self mj_objectArrayWithKeyValuesArray:keyValuesArray context:context];
- if (error != NULL) {
- *error = [self mj_error];
- }
- return value;
-}
-
-+ (NSMutableArray *)objectArrayWithFilename:(NSString *)filename
-{
- return [self mj_objectArrayWithFilename:filename];
-}
-
-+ (NSMutableArray *)objectArrayWithFilename:(NSString *)filename error:(NSError **)error
-{
- id value = [self mj_objectArrayWithFilename:filename];
- if (error != NULL) {
- *error = [self mj_error];
- }
- return value;
-}
-
-+ (NSMutableArray *)objectArrayWithFile:(NSString *)file
-{
- return [self mj_objectArrayWithFile:file];
-}
-
-+ (NSMutableArray *)objectArrayWithFile:(NSString *)file error:(NSError **)error
-{
- id value = [self mj_objectArrayWithFile:file];
- if (error != NULL) {
- *error = [self mj_error];
- }
- return value;
-}
-
-- (NSData *)JSONData
-{
- return [self mj_JSONData];
-}
-
-- (id)JSONObject
-{
- return [self mj_JSONObject];
-}
-
-- (NSString *)JSONString
-{
- return [self mj_JSONString];
-}
-@end
diff --git a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/NSObject+MJProperty.h b/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/NSObject+MJProperty.h
deleted file mode 100644
index 88c9039..0000000
--- a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/NSObject+MJProperty.h
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-// NSObject+MJProperty.h
-// MJExtensionExample
-//
-// Created by MJ Lee on 15/4/17.
-// Copyright (c) 2015年 小码哥. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "MJExtensionConst.h"
-
-@class MJProperty;
-
-/**
- * 遍历成员变量用的block
- *
- * @param property 成员的包装对象
- * @param stop YES代表停止遍历，NO代表继续遍历
- */
-typedef void (^MJPropertiesEnumeration)(MJProperty *property, BOOL *stop);
-
-/** 将属性名换为其他key去字典中取值 */
-typedef NSDictionary * (^MJReplacedKeyFromPropertyName)(void);
-typedef id (^MJReplacedKeyFromPropertyName121)(NSString *propertyName);
-/** 数组中需要转换的模型类 */
-typedef NSDictionary * (^MJObjectClassInArray)(void);
-/** 用于过滤字典中的值 */
-typedef id (^MJNewValueFromOldValue)(id object, id oldValue, MJProperty *property);
-
-/**
- * 成员属性相关的扩展
- */
-@interface NSObject (MJProperty)
-#pragma mark - 遍历
-/**
- * 遍历所有的成员
- */
-+ (void)mj_enumerateProperties:(MJPropertiesEnumeration)enumeration;
-
-#pragma mark - 新值配置
-/**
- * 用于过滤字典中的值
- *
- * @param newValueFormOldValue 用于过滤字典中的值
- */
-+ (void)mj_setupNewValueFromOldValue:(MJNewValueFromOldValue)newValueFormOldValue;
-+ (id)mj_getNewValueFromObject:(__unsafe_unretained id)object oldValue:(__unsafe_unretained id)oldValue property:(__unsafe_unretained MJProperty *)property;
-
-#pragma mark - key配置
-/**
- * 将属性名换为其他key去字典中取值
- *
- * @param replacedKeyFromPropertyName 将属性名换为其他key去字典中取值
- */
-+ (void)mj_setupReplacedKeyFromPropertyName:(MJReplacedKeyFromPropertyName)replacedKeyFromPropertyName;
-/**
- * 将属性名换为其他key去字典中取值
- *
- * @param replacedKeyFromPropertyName121 将属性名换为其他key去字典中取值
- */
-+ (void)mj_setupReplacedKeyFromPropertyName121:(MJReplacedKeyFromPropertyName121)replacedKeyFromPropertyName121;
-
-#pragma mark - array model class配置
-/**
- * 数组中需要转换的模型类
- *
- * @param objectClassInArray 数组中需要转换的模型类
- */
-+ (void)mj_setupObjectClassInArray:(MJObjectClassInArray)objectClassInArray;
-@end
-
-@interface NSObject (MJPropertyDeprecated_v_2_5_16)
-+ (void)enumerateProperties:(MJPropertiesEnumeration)enumeration MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-+ (void)setupNewValueFromOldValue:(MJNewValueFromOldValue)newValueFormOldValue MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-+ (id)getNewValueFromObject:(__unsafe_unretained id)object oldValue:(__unsafe_unretained id)oldValue property:(__unsafe_unretained MJProperty *)property MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-+ (void)setupReplacedKeyFromPropertyName:(MJReplacedKeyFromPropertyName)replacedKeyFromPropertyName MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-+ (void)setupReplacedKeyFromPropertyName121:(MJReplacedKeyFromPropertyName121)replacedKeyFromPropertyName121 MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-+ (void)setupObjectClassInArray:(MJObjectClassInArray)objectClassInArray MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-@end
diff --git a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/NSObject+MJProperty.m b/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/NSObject+MJProperty.m
deleted file mode 100644
index 222b575..0000000
--- a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/NSObject+MJProperty.m
+++ /dev/null
@@ -1,282 +0,0 @@
-//
-// NSObject+MJProperty.m
-// MJExtensionExample
-//
-// Created by MJ Lee on 15/4/17.
-// Copyright (c) 2015年 小码哥. All rights reserved.
-//
-
-#import "NSObject+MJProperty.h"
-#import "NSObject+MJKeyValue.h"
-#import "NSObject+MJCoding.h"
-#import "NSObject+MJClass.h"
-#import "MJProperty.h"
-#import "MJFoundation.h"
-#import <objc/runtime.h>
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wundeclared-selector"
-#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
-
-static const char MJReplacedKeyFromPropertyNameKey = '\0';
-static const char MJReplacedKeyFromPropertyName121Key = '\0';
-static const char MJNewValueFromOldValueKey = '\0';
-static const char MJObjectClassInArrayKey = '\0';
-
-static const char MJCachedPropertiesKey = '\0';
-
-@implementation NSObject (Property)
-
-+ (NSMutableDictionary *)propertyDictForKey:(const void *)key
-{
- static NSMutableDictionary *replacedKeyFromPropertyNameDict;
- static NSMutableDictionary *replacedKeyFromPropertyName121Dict;
- static NSMutableDictionary *newValueFromOldValueDict;
- static NSMutableDictionary *objectClassInArrayDict;
- static NSMutableDictionary *cachedPropertiesDict;
-
- static dispatch_once_t onceToken;
- dispatch_once(&onceToken, ^{
- replacedKeyFromPropertyNameDict = [NSMutableDictionary dictionary];
- replacedKeyFromPropertyName121Dict = [NSMutableDictionary dictionary];
- newValueFromOldValueDict = [NSMutableDictionary dictionary];
- objectClassInArrayDict = [NSMutableDictionary dictionary];
- cachedPropertiesDict = [NSMutableDictionary dictionary];
- });
-
- if (key == &MJReplacedKeyFromPropertyNameKey) return replacedKeyFromPropertyNameDict;
- if (key == &MJReplacedKeyFromPropertyName121Key) return replacedKeyFromPropertyName121Dict;
- if (key == &MJNewValueFromOldValueKey) return newValueFromOldValueDict;
- if (key == &MJObjectClassInArrayKey) return objectClassInArrayDict;
- if (key == &MJCachedPropertiesKey) return cachedPropertiesDict;
- return nil;
-}
-
-#pragma mark - --私有方法--
-+ (id)propertyKey:(NSString *)propertyName
-{
- MJExtensionAssertParamNotNil2(propertyName, nil);
-
- __block id key = nil;
- // 查看有没有需要替换的key
- if ([self respondsToSelector:@selector(mj_replacedKeyFromPropertyName121:)]) {
- key = [self mj_replacedKeyFromPropertyName121:propertyName];
- }
- // 兼容旧版本
- if ([self respondsToSelector:@selector(replacedKeyFromPropertyName121:)]) {
- key = [self performSelector:@selector(replacedKeyFromPropertyName121) withObject:propertyName];
- }
-
- // 调用block
- if (!key) {
- [self mj_enumerateAllClasses:^(__unsafe_unretained Class c, BOOL *stop) {
- MJReplacedKeyFromPropertyName121 block = objc_getAssociatedObject(c, &MJReplacedKeyFromPropertyName121Key);
- if (block) {
- key = block(propertyName);
- }
- if (key) *stop = YES;
- }];
- }
-
- // 查看有没有需要替换的key
- if ((!key || [key isEqual:propertyName]) && [self respondsToSelector:@selector(mj_replacedKeyFromPropertyName)]) {
- key = [self mj_replacedKeyFromPropertyName][propertyName];
- }
- // 兼容旧版本
- if ((!key || [key isEqual:propertyName]) && [self respondsToSelector:@selector(replacedKeyFromPropertyName)]) {
- key = [self performSelector:@selector(replacedKeyFromPropertyName)][propertyName];
- }
-
- if (!key || [key isEqual:propertyName]) {
- [self mj_enumerateAllClasses:^(__unsafe_unretained Class c, BOOL *stop) {
- NSDictionary *dict = objc_getAssociatedObject(c, &MJReplacedKeyFromPropertyNameKey);
- if (dict) {
- key = dict[propertyName];
- }
- if (key && ![key isEqual:propertyName]) *stop = YES;
- }];
- }
-
- // 2.用属性名作为key
- if (!key) key = propertyName;
-
- return key;
-}
-
-+ (Class)propertyObjectClassInArray:(NSString *)propertyName
-{
- __block id clazz = nil;
- if ([self respondsToSelector:@selector(mj_objectClassInArray)]) {
- clazz = [self mj_objectClassInArray][propertyName];
- }
- // 兼容旧版本
- if ([self respondsToSelector:@selector(objectClassInArray)]) {
- clazz = [self performSelector:@selector(objectClassInArray)][propertyName];
- }
-
- if (!clazz) {
- [self mj_enumerateAllClasses:^(__unsafe_unretained Class c, BOOL *stop) {
- NSDictionary *dict = objc_getAssociatedObject(c, &MJObjectClassInArrayKey);
- if (dict) {
- clazz = dict[propertyName];
- }
- if (clazz) *stop = YES;
- }];
- }
-
- // 如果是NSString类型
- if ([clazz isKindOfClass:[NSString class]]) {
- clazz = NSClassFromString(clazz);
- }
- return clazz;
-}
-
-#pragma mark - --公共方法--
-+ (void)mj_enumerateProperties:(MJPropertiesEnumeration)enumeration
-{
- // 获得成员变量
- NSArray *cachedProperties = [self properties];
-
- // 遍历成员变量
- BOOL stop = NO;
- for (MJProperty *property in cachedProperties) {
- enumeration(property, &stop);
- if (stop) break;
- }
-}
-
-#pragma mark - 公共方法
-+ (NSMutableArray *)properties
-{
- NSMutableArray *cachedProperties = [self propertyDictForKey:&MJCachedPropertiesKey][NSStringFromClass(self)];
-
- if (cachedProperties == nil) {
- MJExtensionSemaphoreCreate
- MJExtensionSemaphoreWait
-
- if (cachedProperties == nil) {
- cachedProperties = [NSMutableArray array];
-
- [self mj_enumerateClasses:^(__unsafe_unretained Class c, BOOL *stop) {
- // 1.获得所有的成员变量
- unsigned int outCount = 0;
- objc_property_t *properties = class_copyPropertyList(c, &outCount);
-
- // 2.遍历每一个成员变量
- for (unsigned int i = 0; i<outCount; i++) {
- MJProperty *property = [MJProperty cachedPropertyWithProperty:properties[i]];
- // 过滤掉Foundation框架类里面的属性
- if ([MJFoundation isClassFromFoundation:property.srcClass]) continue;
- property.srcClass = c;
- [property setOriginKey:[self propertyKey:property.name] forClass:self];
- [property setObjectClassInArray:[self propertyObjectClassInArray:property.name] forClass:self];
- [cachedProperties addObject:property];
- }
-
- // 3.释放内存
- free(properties);
- }];
-
- [self propertyDictForKey:&MJCachedPropertiesKey][NSStringFromClass(self)] = cachedProperties;
- }
-
- MJExtensionSemaphoreSignal
- }
-
- return cachedProperties;
-}
-
-#pragma mark - 新值配置
-+ (void)mj_setupNewValueFromOldValue:(MJNewValueFromOldValue)newValueFormOldValue
-{
- objc_setAssociatedObject(self, &MJNewValueFromOldValueKey, newValueFormOldValue, OBJC_ASSOCIATION_COPY_NONATOMIC);
-}
-
-+ (id)mj_getNewValueFromObject:(__unsafe_unretained id)object oldValue:(__unsafe_unretained id)oldValue property:(MJProperty *__unsafe_unretained)property{
- // 如果有实现方法
- if ([object respondsToSelector:@selector(mj_newValueFromOldValue:property:)]) {
- return [object mj_newValueFromOldValue:oldValue property:property];
- }
- // 兼容旧版本
- if ([self respondsToSelector:@selector(newValueFromOldValue:property:)]) {
- return [self performSelector:@selector(newValueFromOldValue:property:) withObject:oldValue withObject:property];
- }
-
- // 查看静态设置
- __block id newValue = oldValue;
- [self mj_enumerateAllClasses:^(__unsafe_unretained Class c, BOOL *stop) {
- MJNewValueFromOldValue block = objc_getAssociatedObject(c, &MJNewValueFromOldValueKey);
- if (block) {
- newValue = block(object, oldValue, property);
- *stop = YES;
- }
- }];
- return newValue;
-}
-
-#pragma mark - array model class配置
-+ (void)mj_setupObjectClassInArray:(MJObjectClassInArray)objectClassInArray
-{
- [self mj_setupBlockReturnValue:objectClassInArray key:&MJObjectClassInArrayKey];
-
- MJExtensionSemaphoreCreate
- MJExtensionSemaphoreWait
- [[self propertyDictForKey:&MJCachedPropertiesKey] removeAllObjects];
- MJExtensionSemaphoreSignal
-}
-
-#pragma mark - key配置
-+ (void)mj_setupReplacedKeyFromPropertyName:(MJReplacedKeyFromPropertyName)replacedKeyFromPropertyName
-{
- [self mj_setupBlockReturnValue:replacedKeyFromPropertyName key:&MJReplacedKeyFromPropertyNameKey];
-
- MJExtensionSemaphoreCreate
- MJExtensionSemaphoreWait
- [[self propertyDictForKey:&MJCachedPropertiesKey] removeAllObjects];
- MJExtensionSemaphoreSignal
-}
-
-+ (void)mj_setupReplacedKeyFromPropertyName121:(MJReplacedKeyFromPropertyName121)replacedKeyFromPropertyName121
-{
- objc_setAssociatedObject(self, &MJReplacedKeyFromPropertyName121Key, replacedKeyFromPropertyName121, OBJC_ASSOCIATION_COPY_NONATOMIC);
-
- MJExtensionSemaphoreCreate
- MJExtensionSemaphoreWait
- [[self propertyDictForKey:&MJCachedPropertiesKey] removeAllObjects];
- MJExtensionSemaphoreSignal
-}
-@end
-
-@implementation NSObject (MJPropertyDeprecated_v_2_5_16)
-+ (void)enumerateProperties:(MJPropertiesEnumeration)enumeration
-{
- [self mj_enumerateProperties:enumeration];
-}
-
-+ (void)setupNewValueFromOldValue:(MJNewValueFromOldValue)newValueFormOldValue
-{
- [self mj_setupNewValueFromOldValue:newValueFormOldValue];
-}
-
-+ (id)getNewValueFromObject:(__unsafe_unretained id)object oldValue:(__unsafe_unretained id)oldValue property:(__unsafe_unretained MJProperty *)property
-{
- return [self mj_getNewValueFromObject:object oldValue:oldValue property:property];
-}
-
-+ (void)setupReplacedKeyFromPropertyName:(MJReplacedKeyFromPropertyName)replacedKeyFromPropertyName
-{
- [self mj_setupReplacedKeyFromPropertyName:replacedKeyFromPropertyName];
-}
-
-+ (void)setupReplacedKeyFromPropertyName121:(MJReplacedKeyFromPropertyName121)replacedKeyFromPropertyName121
-{
- [self mj_setupReplacedKeyFromPropertyName121:replacedKeyFromPropertyName121];
-}
-
-+ (void)setupObjectClassInArray:(MJObjectClassInArray)objectClassInArray
-{
- [self mj_setupObjectClassInArray:objectClassInArray];
-}
-@end
-
-#pragma clang diagnostic pop
diff --git a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/NSString+MJExtension.h b/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/NSString+MJExtension.h
deleted file mode 100644
index 40add04..0000000
--- a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/NSString+MJExtension.h
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// NSString+MJExtension.h
-// MJExtensionExample
-//
-// Created by MJ Lee on 15/6/7.
-// Copyright (c) 2015年 小码哥. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "MJExtensionConst.h"
-
-@interface NSString (MJExtension)
-/**
- * 驼峰转下划线（loveYou -> love_you）
- */
-- (NSString *)mj_underlineFromCamel;
-/**
- * 下划线转驼峰（love_you -> loveYou）
- */
-- (NSString *)mj_camelFromUnderline;
-/**
- * 首字母变大写
- */
-- (NSString *)mj_firstCharUpper;
-/**
- * 首字母变小写
- */
-- (NSString *)mj_firstCharLower;
-
-- (BOOL)mj_isPureInt;
-
-- (NSURL *)mj_url;
-@end
-
-@interface NSString (MJExtensionDeprecated_v_2_5_16)
-- (NSString *)underlineFromCamel MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-- (NSString *)camelFromUnderline MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-- (NSString *)firstCharUpper MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-- (NSString *)firstCharLower MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-- (BOOL)isPureInt MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-- (NSURL *)url MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
-@end
diff --git a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/NSString+MJExtension.m b/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/NSString+MJExtension.m
deleted file mode 100644
index 569c310..0000000
--- a/plugin/wechat_flutter_plugin/ios/Classes/MJExtension/NSString+MJExtension.m
+++ /dev/null
@@ -1,112 +0,0 @@
-//
-// NSString+MJExtension.m
-// MJExtensionExample
-//
-// Created by MJ Lee on 15/6/7.
-// Copyright (c) 2015年 小码哥. All rights reserved.
-//
-
-#import "NSString+MJExtension.h"
-
-@implementation NSString (MJExtension)
-- (NSString *)mj_underlineFromCamel
-{
- if (self.length == 0) return self;
- NSMutableString *string = [NSMutableString string];
- for (NSUInteger i = 0; i<self.length; i++) {
- unichar c = [self characterAtIndex:i];
- NSString *cString = [NSString stringWithFormat:@"%c", c];
- NSString *cStringLower = [cString lowercaseString];
- if ([cString isEqualToString:cStringLower]) {
- [string appendString:cStringLower];
- } else {
- [string appendString:@"_"];
- [string appendString:cStringLower];
- }
- }
- return string;
-}
-
-- (NSString *)mj_camelFromUnderline
-{
- if (self.length == 0) return self;
- NSMutableString *string = [NSMutableString string];
- NSArray *cmps = [self componentsSeparatedByString:@"_"];
- for (NSUInteger i = 0; i<cmps.count; i++) {
- NSString *cmp = cmps[i];
- if (i && cmp.length) {
- [string appendString:[NSString stringWithFormat:@"%c", [cmp characterAtIndex:0]].uppercaseString];
- if (cmp.length >= 2) [string appendString:[cmp substringFromIndex:1]];
- } else {
- [string appendString:cmp];
- }
- }
- return string;
-}
-
-- (NSString *)mj_firstCharLower
-{
- if (self.length == 0) return self;
- NSMutableString *string = [NSMutableString string];
- [string appendString:[NSString stringWithFormat:@"%c", [self characterAtIndex:0]].lowercaseString];
- if (self.length >= 2) [string appendString:[self substringFromIndex:1]];
- return string;
-}
-
-- (NSString *)mj_firstCharUpper
-{
- if (self.length == 0) return self;
- NSMutableString *string = [NSMutableString string];
- [string appendString:[NSString stringWithFormat:@"%c", [self characterAtIndex:0]].uppercaseString];
- if (self.length >= 2) [string appendString:[self substringFromIndex:1]];
- return string;
-}
-
-- (BOOL)mj_isPureInt
-{
- NSScanner *scan = [NSScanner scannerWithString:self];
- int val;
- return [scan scanInt:&val] && [scan isAtEnd];
-}
-
-- (NSURL *)mj_url
-{
-// [self stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet characterSetWithCharactersInString:@"!$&'()*+,-./:;=?@_~%#[]"]];
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored"-Wdeprecated-declarations"
- return [NSURL URLWithString:(NSString *)CFBridgingRelease(CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault, (CFStringRef)self, (CFStringRef)@"!$&'()*+,-./:;=?@_~%#[]", NULL,kCFStringEncodingUTF8))];
-#pragma clang diagnostic pop
-}
-@end
-
-@implementation NSString (MJExtensionDeprecated_v_2_5_16)
-- (NSString *)underlineFromCamel
-{
- return self.mj_underlineFromCamel;
-}
-
-- (NSString *)camelFromUnderline
-{
- return self.mj_camelFromUnderline;
-}
-
-- (NSString *)firstCharLower
-{
- return self.mj_firstCharLower;
-}
-
-- (NSString *)firstCharUpper
-{
- return self.mj_firstCharUpper;
-}
-
-- (BOOL)isPureInt
-{
- return self.mj_isPureInt;
-}
-
-- (NSURL *)url
-{
- return self.mj_url;
-}
-@end
diff --git a/plugin/wechat_flutter_plugin/ios/Classes/MyGenerateTestUserSig.h b/plugin/wechat_flutter_plugin/ios/Classes/MyGenerateTestUserSig.h
deleted file mode 100644
index e5f7ce9..0000000
--- a/plugin/wechat_flutter_plugin/ios/Classes/MyGenerateTestUserSig.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Module: GenerateTestUserSig
- *
- * Function: 用于生成测试用的 UserSig，UserSig 是腾讯云为其云服务设计的一种安全保护签名。
- * 其计算方法是对 SDKAppID、UserID 和 EXPIRETIME 进行加密，加密算法为 HMAC-SHA256。
- *
- * Attention: 请不要将如下代码发布到您的线上正式版本的 App 中，原因如下：
- *
- * 本文件中的代码虽然能够正确计算出 UserSig，但仅适合快速调通 SDK 的基本功能，不适合线上产品，
- * 这是因为客户端代码中的 SECRETKEY 很容易被反编译逆向破解，尤其是 Web 端的代码被破解的难度几乎为零。
- * 一旦您的密钥泄露，攻击者就可以计算出正确的 UserSig 来盗用您的腾讯云流量。
- *
- * 正确的做法是将 UserSig 的计算代码和加密密钥放在您的业务服务器上，然后由 App 按需向您的服务器获取实时算出的 UserSig。
- * 由于破解服务器的成本要高于破解客户端 App，所以服务器计算的方案能够更好地保护您的加密密钥。
- *
- * Reference：https://cloud.tencent.com/document/product/269/32688#Server
- */
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * 腾讯云 SDKAppId，需要替换为您自己账号下的 SDKAppId。
- *
- * 进入腾讯云云通信[控制台](https://console.cloud.tencent.com/avc) 创建应用，即可看到 SDKAppId，
- * 它是腾讯云用于区分客户的唯一标识。
- */
-static const int SDKAPPID = 1400250651;
-
-/**
- * 签名过期时间，建议不要设置的过短
- *
- * 时间单位：秒
- * 默认时间：7 x 24 x 60 x 60 = 604800 = 7 天
- */
-static const int EXPIRETIME = 604800;
-
-/**
- * 计算签名用的加密密钥，获取步骤如下：
- *
- * step1. 进入腾讯云云通信[控制台](https://console.cloud.tencent.com/avc) ，如果还没有应用就创建一个，
- * step2. 单击“应用配置”进入基础配置页面，并进一步找到“帐号体系集成”部分。
- * step3. 点击“查看密钥”按钮，就可以看到计算 UserSig 使用的加密的密钥了，请将其拷贝并复制到如下的变量中
- *
- * 注意：该方案仅适用于调试Demo，正式上线前请将 UserSig 计算代码和密钥迁移到您的后台服务器上，以避免加密密钥泄露导致的流量盗用。
- * 文档：https://cloud.tencent.com/document/product/269/32688#Server
- */
-static NSString * const SECRETKEY = @"4236133554a57c8fa7ae748534177e97cac28b0750f57ca2edbb974a17a14544";
-
-
-@interface MyGenerateTestUserSig : NSObject
-/**
- * 计算 UserSig 签名
- *
- * 函数内部使用 HMAC-SHA256 非对称加密算法，对 SDKAPPID、userId 和 EXPIRETIME 进行加密。
- *
- * @note: 请不要将如下代码发布到您的线上正式版本的 App 中，原因如下：
- *
- * 本文件中的代码虽然能够正确计算出 UserSig，但仅适合快速调通 SDK 的基本功能，不适合线上产品，
- * 这是因为客户端代码中的 SECRETKEY 很容易被反编译逆向破解，尤其是 Web 端的代码被破解的难度几乎为零。
- * 一旦您的密钥泄露，攻击者就可以计算出正确的 UserSig 来盗用您的腾讯云流量。
- *
- * 正确的做法是将 UserSig 的计算代码和加密密钥放在您的业务服务器上，然后由 App 按需向您的服务器获取实时算出的 UserSig。
- * 由于破解服务器的成本要高于破解客户端 App，所以服务器计算的方案能够更好地保护您的加密密钥。
- *
- * 文档：https://cloud.tencent.com/document/product/269/32688#Server
- */
-+ (NSString *)myGenTestUserSig:(NSString *)identifier;
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/plugin/wechat_flutter_plugin/ios/Classes/MyGenerateTestUserSig.m b/plugin/wechat_flutter_plugin/ios/Classes/MyGenerateTestUserSig.m
deleted file mode 100644
index 27b8670..0000000
--- a/plugin/wechat_flutter_plugin/ios/Classes/MyGenerateTestUserSig.m
+++ /dev/null
@@ -1,90 +0,0 @@
-#import "MyGenerateTestUserSig.h"
-#import <CommonCrypto/CommonCrypto.h>
-#import <zlib.h>
-
-@implementation MyGenerateTestUserSig
-
-+ (NSString *)myGenTestUserSig:(NSString *)identifier
-{
- CFTimeInterval current = CFAbsoluteTimeGetCurrent() + kCFAbsoluteTimeIntervalSince1970;
- long TLSTime = floor(current);
- NSMutableDictionary *obj = [@{@"TLS.ver": @"2.0",
- @"TLS.identifier": identifier,
- @"TLS.sdkappid": @(SDKAPPID),
- @"TLS.expire": @(EXPIRETIME),
- @"TLS.time": @(TLSTime)} mutableCopy];
- NSMutableString *stringToSign = [[NSMutableString alloc] init];
- NSArray *keyOrder = @[@"TLS.identifier",
- @"TLS.sdkappid",
- @"TLS.time",
- @"TLS.expire"];
- for (NSString *key in keyOrder) {
- [stringToSign appendFormat:@"%@:%@\n", key, obj[key]];
- }
- NSLog(@"%@", stringToSign);
- //NSString *sig = [self sigString:stringToSign];
- NSString *sig = [self hmac:stringToSign];
-
- obj[@"TLS.sig"] = sig;
- NSLog(@"sig: %@", sig);
- NSError *error = nil;
- NSData *jsonToZipData = [NSJSONSerialization dataWithJSONObject:obj options:0 error:&error];
- if (error) {
- NSLog(@"[Error] json serialization failed: %@", error);
- return @"";
- }
-
- const Bytef* zipsrc = (const Bytef*)[jsonToZipData bytes];
- uLongf srcLen = jsonToZipData.length;
- uLong upperBound = compressBound(srcLen);
- Bytef *dest = (Bytef*)malloc(upperBound);
- uLongf destLen = upperBound;
- int ret = compress2(dest, &destLen, (const Bytef*)zipsrc, srcLen, Z_BEST_SPEED);
- if (ret != Z_OK) {
- NSLog(@"[Error] Compress Error %d, upper bound: %lu", ret, upperBound);
- free(dest);
- return @"";
- }
- NSString *result = [self base64URL: [NSData dataWithBytesNoCopy:dest length:destLen]];
- return result;
-}
-
-+ (NSString *)hmac:(NSString *)plainText
-{
- const char *cKey = [SECRETKEY cStringUsingEncoding:NSASCIIStringEncoding];
- const char *cData = [plainText cStringUsingEncoding:NSASCIIStringEncoding];
-
- unsigned char cHMAC[CC_SHA256_DIGEST_LENGTH];
-
- CCHmac(kCCHmacAlgSHA256, cKey, strlen(cKey), cData, strlen(cData), cHMAC);
-
- NSData *HMACData = [[NSData alloc] initWithBytes:cHMAC length:sizeof(cHMAC)];
- return [HMACData base64EncodedStringWithOptions:0];
-}
-
-+ (NSString *)base64URL:(NSData *)data
-{
- NSString *result = [data base64EncodedStringWithOptions:0];
- NSMutableString *final = [[NSMutableString alloc] init];
- const char *cString = [result cStringUsingEncoding:NSUTF8StringEncoding];
- for (int i = 0; i < result.length; ++ i) {
- char x = cString[i];
- switch(x){
- case '+':
- [final appendString:@"*"];
- break;
- case '/':
- [final appendString:@"-"];
- break;
- case '=':
- [final appendString:@"_"];
- break;
- default:
- [final appendFormat:@"%c", x];
- break;
- }
- }
- return final;
-}
-
-@end
diff --git a/plugin/wechat_flutter_plugin/ios/dim.podspec b/plugin/wechat_flutter_plugin/ios/dim.podspec
deleted file mode 100644
index 14f6a15..0000000
--- a/plugin/wechat_flutter_plugin/ios/dim.podspec
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html
-#
-Pod::Spec.new do |s|
- s.name = 'dim'
- s.version = '0.2.7'
- s.summary = 'TIMSDK for flutter'
- s.description = <<-DESC
-A new flutter plugin project.
- DESC
- s.homepage = 'https://gitee.com/gameOverFlow/dim'
- s.license = { :file => '../LICENSE' }
- s.author = { 'brzhang' => '1595819400@qq.com' }
- s.source = { :path => '.' }
- s.source_files = 'Classes/**/*'
- s.public_header_files = 'Classes/**/*.h'
- s.dependency 'Flutter'
- s.dependency 'YYModel'
- s.dependency 'TXIMSDK_iOS'
- s.ios.deployment_target = '8.0'
-end
-
diff --git a/plugin/wechat_flutter_plugin/lib/commom/route.dart b/plugin/wechat_flutter_plugin/lib/commom/route.dart
deleted file mode 100644
index 1c92c43..0000000
--- a/plugin/wechat_flutter_plugin/lib/commom/route.dart
+++ /dev/null
@@ -1,95 +0,0 @@
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:dim/route/fade_route.dart';
-import 'package:dim/route/rotation_route.dart';
-
-typedef VoidCallbackWithType = void Function(String type);
-typedef VoidCallbackConfirm = void Function(bool isOk);
-typedef VoidCallbackWithMap = void Function(Map item);
-
-final navGK = new GlobalKey<NavigatorState>();
-GlobalKey<ScaffoldState> scaffoldGK;
-
-Future<dynamic> routePush(Widget widget) {
- final route = new CupertinoPageRoute(
- builder: (BuildContext context) => widget,
- settings: new RouteSettings(
- name: widget.toStringShort(),
- ),
- );
- return navGK.currentState.push(route);
-}
-
-Future<dynamic> routePushReplace(Widget widget) {
- final route = new CupertinoPageRoute(
- builder: (BuildContext context) => widget,
- settings: new RouteSettings(
- name: widget.toStringShort(),
- ),
- );
- return navGK.currentState.pushReplacement(route);
-}
-
-Future<dynamic> routeMaterialPush(Widget widget) {
- final route = new MaterialPageRoute(
- builder: (BuildContext context) => widget,
- settings: new RouteSettings(
- name: widget.toStringShort(),
- ),
- );
- return navGK.currentState.push(route);
-}
-
-Future<dynamic> routeFadePush(Widget widget) {
- final route = new FadeRoute(widget);
- return navGK.currentState.push(route);
-}
-
-Future<dynamic> routeRotationPush(Widget widget) {
- final route = new RotationRoute(widget);
- return navGK.currentState.push(route);
-}
-
-Future<dynamic> routePushAndRemove(Widget widget) {
- final route = new CupertinoPageRoute(
- builder: (BuildContext context) => widget,
- settings: new RouteSettings(
- name: widget.toStringShort(),
- ),
- );
- return navGK.currentState.pushAndRemoveUntil(route, (route) => route == null);
-}
-
-pushAndRemoveUntilPage(Widget page) {
- navGK.currentState.pushAndRemoveUntil(new MaterialPageRoute<dynamic>(
- builder: (BuildContext context) {
- return page;
- },
- ), (Route<dynamic> route) => false);
-}
-
-pushReplacement(Widget page) {
- navGK.currentState.pushReplacement(new MaterialPageRoute<dynamic>(
- builder: (BuildContext context) {
- return page;
- },
- ));
-}
-
-popToRootPage() {
- navGK.currentState.popUntil(ModalRoute.withName('/'));
-}
-
-popToPage(Widget page) {
- try {
- navGK.currentState.popUntil(ModalRoute.withName(page.toStringShort()));
- } catch (e) {
- print('pop路由出现错误:::${e.toString()}');
- }
-}
-
-popToHomePage() {
- navGK.currentState.maybePop();
- navGK.currentState.maybePop();
- navGK.currentState.maybePop();
-}
diff --git a/plugin/wechat_flutter_plugin/lib/commom/win_media.dart b/plugin/wechat_flutter_plugin/lib/commom/win_media.dart
deleted file mode 100644
index a0ed4fb..0000000
--- a/plugin/wechat_flutter_plugin/lib/commom/win_media.dart
+++ /dev/null
@@ -1,44 +0,0 @@
-
-import 'dart:ui';
-
-import 'package:flutter/material.dart';
-
-double winWidth(BuildContext context) {
- return MediaQuery.of(context).size.width;
-}
-
-double winHeight(BuildContext context) {
- return MediaQuery.of(context).size.height;
-}
-
-double winTop(BuildContext context) {
- return MediaQuery.of(context).padding.top;
-}
-
-double winBottom(BuildContext context) {
- return MediaQuery.of(context).padding.bottom;
-}
-
-double winLeft(BuildContext context) {
- return MediaQuery.of(context).padding.left;
-}
-
-double winRight(BuildContext context) {
- return MediaQuery.of(context).padding.right;
-}
-
-double winKeyHeight(BuildContext context) {
- return MediaQuery.of(context).viewInsets.bottom;
-}
-
-double statusBarHeight(BuildContext context) {
- return MediaQueryData.fromWindow(window).padding.top;
-}
-
-double navigationBarHeight(BuildContext context) {
- return kToolbarHeight;
-}
-
-double topBarHeight(BuildContext context) {
- return kToolbarHeight + MediaQueryData.fromWindow(window).padding.top;
-}
diff --git a/plugin/wechat_flutter_plugin/lib/dim.dart b/plugin/wechat_flutter_plugin/lib/dim.dart
deleted file mode 100644
index bb1e892..0000000
--- a/plugin/wechat_flutter_plugin/lib/dim.dart
+++ /dev/null
@@ -1,439 +0,0 @@
-import 'dart:async';
-import 'package:flutter/services.dart';
-
-export 'package:dim/commom/check.dart';
-export 'package:dim/commom/route.dart';
-export 'package:dim/commom/ui.dart';
-export 'package:dim/commom/win_media.dart';
-export 'package:dim/pinyin/chinese_helper.dart';
-export 'package:dim/pinyin/dict_data.dart';
-export 'package:dim/pinyin/pinyin_exception.dart';
-export 'package:dim/pinyin/pinyin_format.dart';
-export 'package:dim/pinyin/chinese_helper.dart';
-export 'package:dim/pinyin/pinyin_resourece.dart';
-export 'package:dim/time/time_util.dart';
-
-class Dim {
- factory Dim() {
- if (_instance == null) {
- final MethodChannel methodChannel = const MethodChannel('dim_method');
- final EventChannel eventChannel = const EventChannel('dim_event');
- _instance = new Dim.private(methodChannel, eventChannel);
- }
- return _instance;
- }
-
- Dim.private(this._methodChannel, this._eventChannel);
-
- final MethodChannel _methodChannel;
-
- final EventChannel _eventChannel;
-
- Future<String> get platformVersion async {
- final String version =
- await _methodChannel.invokeMethod('getPlatformVersion');
- return version;
- }
-
- static Dim _instance;
-
- Stream<dynamic> _listener;
-
- Stream<dynamic> get onMessage {
- if (_listener == null) {
- _listener = _eventChannel
- .receiveBroadcastStream()
- .map((dynamic event) => _parseBatteryState(event));
- }
- return _listener;
- }
-
- ///im初始化
- Future<dynamic> init(int appid) async {
- return await _methodChannel.invokeMethod("init", <String, dynamic>{
- 'appid': appid,
- });
- }
-
- ///im登录
- Future<dynamic> imLogin(String identifier, String sig) async {
- return await _methodChannel.invokeMethod("im_login", <String, dynamic>{
- 'identifier': identifier,
-// 'userSig': sig,
- });
- }
-
- ///im登出
- Future<dynamic> imLogout() async {
- return await _methodChannel.invokeMethod("im_logout");
- }
-
- ///获取会话列表
- Future<dynamic> getConversations() async {
- return await _methodChannel.invokeMethod('getConversations');
- }
-
- ///删除会话
- ///Delete session
- Future<dynamic> delConversation(String identifier, int type) async {
- return await _methodChannel.invokeMethod('delConversation',
- <String, dynamic>{'identifier': identifier, 'type': type});
- }
-
- ///获取一个会话的消息，暂不支持流式查询
- ///identifier 会话id
- ///count 获取消息数量 ,默认50条
- ///ctype 1 私信，2群聊 ,默认是私信
- Future<dynamic> getMessages(String identifier,
- [int count = 50, int ctype = 1]) async {
- return await _methodChannel.invokeMethod('getMessages', <String, dynamic>{
- 'identifier': identifier,
- 'count': count,
- 'ctype': ctype
- });
- }
-
- ///发送文本消息
- ///Send a text message
- Future<dynamic> sendTextMessages(String identifier, String content,
- {int type}) async {
- return await _methodChannel
- .invokeMethod('sendTextMessages', <String, dynamic>{
- 'identifier': identifier,
- 'content': content,
- 'type': type ?? 1,
- });
- }
-
- ///发送图片消息
- ///imagePath eg for android : Environment.getExternalStorageDirectory() + "/DCIM/Camera/1.jpg"
- Future<dynamic> sendImageMessages(String identifier, String imagePath,
- {int type}) async {
- return await _methodChannel
- .invokeMethod('sendImageMessages', <String, dynamic>{
- 'identifier': identifier,
- 'image_path': imagePath,
- 'type': type ?? 1,
- });
- }
-
- ///发送语音消息
- ///soundPath eg for android : Environment.getExternalStorageDirectory() + "/sound.mp3"
- Future<dynamic> sendSoundMessages(
- String identifier, String soundPath, int type,
- [int duration = 10]) async {
- return await _methodChannel
- .invokeMethod('sendSoundMessages', <String, dynamic>{
- 'identifier': identifier,
- 'sound_path': soundPath,
- 'duration': duration,
- 'type': type ?? 1,
- });
- }
-
- ///发送视频消息 （封面和视频必须是在本地存在的，不能直接放网络远程的文件，否则7006）duration为毫秒1秒等于1000毫秒
- ///Send video messages (cover and video must be local, can not directly put the network remote file, otherwise 7006)
- ///duration is milliseconds 1 second equals 1000 milliseconds
- Future<dynamic> buildVideoMessage(
- String identifier, String videoPath, int width, int height, int type,
- [int duration = 10]) async {
- return await _methodChannel
- .invokeMethod('buildVideoMessage', <String, dynamic>{
- 'identifier': identifier,
- 'videoPath': videoPath,
- 'width': width,
- 'height': height,
- 'duration': duration,
- 'type': type ?? 1,
- });
- }
-
- ///发送位置消息
- ///eg：
- ///lat 113.93
- ///lng 22.54
- ///desc 腾讯大厦
- Future<dynamic> sendLocationMessages(
- String identifier, double lat, double lng, String desc) async {
- return await _methodChannel.invokeMethod('sendLocation', <String, dynamic>{
- 'identifier': identifier,
- 'lat': lat,
- 'lng': lng,
- 'desc': desc,
- });
- }
-
- ///添加好友
- ///
- Future<dynamic> addFriend(String identifier) async {
- return await _methodChannel
- .invokeMethod("addFriend", <String, dynamic>{'identifier': identifier});
- }
-
- ///删除好友
- ///
- Future<dynamic> delFriend(String identifier) async {
- return await _methodChannel
- .invokeMethod("delFriend", <String, dynamic>{'identifier': identifier});
- }
-
- ///获取好友列表
- ///
- Future<dynamic> listFriends(String identifier) async {
- return await _methodChannel.invokeMethod(
- "listFriends", <String, dynamic>{'identifier': identifier});
- }
-
- ///处理好友的请求，接受/拒绝
- ///opTypeStr 接受传 Y
- ///opTypeStr 拒绝传 N
- Future<dynamic> opFriend(String identifier, String opTypeStr) async {
- return await _methodChannel.invokeMethod("opFriend",
- <String, dynamic>{'identifier': identifier, 'opTypeStr': opTypeStr});
- }
-
- ///获取用户资料
- ///param user is a list ["usersf1","jiofoea2"]
- Future<dynamic> getUsersProfile(List<String> users) async {
- return await _methodChannel
- .invokeMethod("getUsersProfile", <String, dynamic>{'users': users});
- }
-
- ///设置个人资料
- Future<dynamic> setUsersProfile(
- int gender, String nick, String faceUrl) async {
- return await _methodChannel.invokeMethod("setUsersProfile",
- <String, dynamic>{'gender': gender, 'nick': nick, 'faceUrl': faceUrl});
- }
-
- ///测试使用eventChannel推送数据过来
- Future<dynamic> postDataTest() async {
- return await _methodChannel.invokeMethod("post_data_test");
- }
-
- ///========================以下IOS端的开发中
- ///
- ///
- ///
- ///获取当前登录用户
- ///getCurrentLoginUser
- Future<dynamic> getCurrentLoginUser() async {
- return await _methodChannel.invokeMethod('getCurrentLoginUser');
- }
-
- ///自动登录
- ///im_autoLogin
- Future<dynamic> imAutoLogin(String identifier) async {
- return await _methodChannel.invokeMethod(
- 'im_autoLogin', <String, dynamic>{'identifier': identifier});
- }
-
- ///删除会话和记录
- ///deleteConversationAndLocalMsg
- Future<dynamic> deleteConversationAndLocalMsg(
- int type, String identifier) async {
- return await _methodChannel.invokeMethod('deleteConversationAndLocalMsg',
- <String, dynamic>{'type': type, 'identifier': identifier});
- }
-
- ///获取未读消息数量
- ///getUnreadMessageNum
- Future<dynamic> getUnreadMessageNum(int type, String identifier) async {
- return await _methodChannel.invokeMethod('getUnreadMessageNum',
- <String, dynamic>{'type': type, 'identifier': identifier});
- }
-
- ///设置消息为已读
- ///setReadMessage
- Future<dynamic> setReadMessage(int type, String identifier) async {
- return await _methodChannel.invokeMethod('setReadMessage',
- <String, dynamic>{'type': type, 'identifier': identifier});
- }
-
-
- ///解散群组
- ///deleteGroup
- Future<dynamic> deleteGroup(String groupId) async {
- return await _methodChannel.invokeMethod('deleteGroup', <String, dynamic>{
- 'groupId': groupId,
- });
- }
-
- ///修改群名
- ///modifyGroupName
- Future<dynamic> modifyGroupName(String groupId, String setGroupName) async {
- return await _methodChannel.invokeMethod('modifyGroupName',
- <String, dynamic>{'groupId': groupId, 'setGroupName': setGroupName});
- }
-
- ///修改群简介
- ///modifyGroupIntroduction
- Future<dynamic> modifyGroupIntroduction(
- String groupId, String setIntroduction) async {
- return await _methodChannel.invokeMethod(
- 'modifyGroupIntroduction', <String, dynamic>{
- 'groupId': groupId,
- 'setIntroduction': setIntroduction
- });
- }
-
- ///修改群公告
- ///modifyGroupNotification
- Future<dynamic> modifyGroupNotification(
- String groupId, String notification, String time) async {
- return await _methodChannel
- .invokeMethod('modifyGroupNotification', <String, dynamic>{
- 'groupId': groupId,
- 'notification': notification,
- 'time': time,
- });
- }
-
- ///修改群消息提醒选项
- ///setReceiveMessageOption
- Future<dynamic> setReceiveMessageOption(
- String groupId, String identifier, int type) async {
- return await _methodChannel
- .invokeMethod('setReceiveMessageOption', <String, dynamic>{
- 'groupId': groupId,
- 'identifier': identifier,
- 'type': type,
- });
- }
-
- ///获取未决消息列表
- ///getPendencyList
- Future<dynamic> getPendencyList() async {
- return await _methodChannel.invokeMethod('getPendencyList');
- }
-
- ///获取网络保存的自己资料 主要获取加我的方式
- ///getSelfProfile
- Future<dynamic> getSelfProfile() async {
- return await _methodChannel.invokeMethod('getSelfProfile');
- }
-
- ///设置增加我的方式 1为需要认证 2为无需认证
- ///setAddMyWay
- Future<dynamic> setAddMyWay(int type) async {
- return await _methodChannel
- .invokeMethod('setAddMyWay', <String, dynamic>{'type': type});
- }
-
- ///获取登录的用户
- ///getLoginUser
- Future<dynamic> getLoginUser() async {
- return await _methodChannel.invokeMethod('getLoginUser');
- }
-
- ///未登录情况下加载本地缓存
- ///initStorage
- Future<dynamic> initStorage(String identifier) async {
- return await _methodChannel.invokeMethod(
- 'initStorage', <String, dynamic>{'identifier': identifier});
- }
-
- ///校验好友关系
- ///checkFriends
- Future<dynamic> checkFriends(List<String> users) async {
- return await _methodChannel
- .invokeMethod('checkFriends', <String, dynamic>{'users': users});
- }
-
- ///获取群内自己群名片
- ///getSelfGroupNameCard
- Future<dynamic> getSelfGroupNameCard(String groupId) async {
- return await _methodChannel.invokeMethod(
- 'getSelfGroupNameCard', <String, dynamic>{'groupId': groupId});
- }
-
- ///修改群名片
- ///modifyMemberInfo
- Future<dynamic> setGroupNameCard(
- String groupId, String identifier, String name) async {
- return await _methodChannel
- .invokeMethod('setGroupNameCard', <String, dynamic>{
- 'groupId': groupId,
- 'identifier': identifier,
- 'name': name,
- });
- }
-
- ///获取群内指定会员信息
- ///getGroupMembersInfo
- Future<dynamic> getGroupMembersInfo(
- String groupId, List<String> userIDs) async {
- return await _methodChannel.invokeMethod('getGroupMembersInfo',
- <String, dynamic>{'groupId': groupId, 'userIDs': userIDs});
- }
-
- ///获取网络群资料列表
- ///getGroupInfoList
- Future<dynamic> getGroupInfoList(List<String> groupID) async {
- return await _methodChannel.invokeMethod(
- 'getGroupInfoList', <String, dynamic>{'groupID': groupID});
- }
-
- ///获取群列表
- ///getGroupList
- Future<dynamic> getGroupList() async {
- return await _methodChannel.invokeMethod('getGroupList');
- }
-
- ///发起群聊
- ///createGroupChat commit up
- Future<dynamic> createGroupChat(
- {String name, List<String> personList}) async {
- return await _methodChannel.invokeMethod(
- "createGroupChat", <String, dynamic>{
- 'name': name ?? personList[0] + 'name',
- 'personList': personList
- });
- }
-
- ///修改好友备注
- ///Edit friend notes
- Future<dynamic> editFriendNotes(String identifier, String remarks) async {
- return await _methodChannel.invokeMethod('editFriendNotes',
- <String, dynamic>{'identifier': identifier, 'remarks': remarks});
- }
-
- ///获取好友备注
- ///getRemark
- Future<dynamic> getRemark(String identifier) async {
- return await _methodChannel
- .invokeMethod('getRemark', <String, dynamic>{'identifier': identifier});
- }
-
- ///获取群成员列表
- ///getGroupMembersList
- Future<dynamic> getGroupMembersList(String groupId) async {
- return await _methodChannel.invokeMethod(
- 'getGroupMembersList', <String, dynamic>{'groupId': groupId});
- }
-
- ///邀请群成员进群
- ///inviteGroupMember
- Future<dynamic> inviteGroupMember(List list, String groupId) async {
- return await _methodChannel.invokeMethod('inviteGroupMember',
- <String, dynamic>{'list': list, 'groupId': groupId});
- }
-
- ///退出群聊
- ///quitGroup
- Future<dynamic> quitGroup(String groupId) async {
- return await _methodChannel
- .invokeMethod('quitGroup', <String, dynamic>{'groupId': groupId});
- }
-
- ///删除群成员
- ///deleteGroupMember
- Future<dynamic> deleteGroupMember(String groupId, List deleteList) async {
- return await _methodChannel.invokeMethod('deleteGroupMember',
- <String, dynamic>{'groupId': groupId, 'deleteList': deleteList});
- }
-
- dynamic _parseBatteryState(event) {
- return event;
- }
-}
diff --git a/plugin/wechat_flutter_plugin/lib/manger.dart b/plugin/wechat_flutter_plugin/lib/manger.dart
deleted file mode 100644
index eed7988..0000000
--- a/plugin/wechat_flutter_plugin/lib/manger.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-class Manger {
- static final Manger _singleton = new Manger._internal();
-
- factory Manger() {
- return _singleton;
- }
-
- Manger._internal() {
- // initialization logic here
- }
-// rest of the class
-}
-
-abstract class MessageListener {
- void makePeopleLaugh();
-}
diff --git a/plugin/wechat_flutter_plugin/lib/pinyin/chinese_helper.dart b/plugin/wechat_flutter_plugin/lib/pinyin/chinese_helper.dart
deleted file mode 100644
index 3cb47b3..0000000
--- a/plugin/wechat_flutter_plugin/lib/pinyin/chinese_helper.dart
+++ /dev/null
@@ -1,129 +0,0 @@
-
-import 'package:dim/pinyin/pinyin_resourece.dart';
-
-/// Chinese Helper.
-class ChineseHelper {
- static final String chineseRegex = "[\\u4e00-\\u9fa5]";
- static final RegExp chineseRegexp = new RegExp(chineseRegex);
- static final Map<String, String> chineseMap =
- PinyinResource.getChineseResource();
-
- /**
- *判断某个字符是否为汉字
- * @return 是汉字返回true，否则返回false
- */
-
- ///
- static bool isChinese(String c) {
- return '〇' == c || chineseRegexp.hasMatch(c);
- }
-
- /**
- * 判断某个字符是否为繁体字
- *
- * @param c 需要判断的字符
- *
- * @return 是繁体字返回true，否则返回false
- */
-
- ///
- static bool isTraditionalChinese(String c) {
- return chineseMap.containsKey(c);
- }
-
- /**
- * 判断字符串中是否包含中文
- *
- * @param str 字符串
- *
- * @return 包含汉字返回true，否则返回false
- */
-
- ///
- static bool containsChinese(String str) {
- for (int i = 0, len = str.length; i < len; i++) {
- if (isChinese(str[i])) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * 将单个繁体字转换为简体字
- *
- * @param c 需要转换的繁体字
- *
- * @return 转换后的简体字
- */
-
- ///
- static String convertCharToSimplifiedChinese(String c) {
- String simplifiedChinese = chineseMap[c];
- if (simplifiedChinese != null) {
- return simplifiedChinese;
- }
- return c;
- }
-
- /**
- * 将单个简体字转换为繁体字
- *
- * @param c 需要转换的简体字
- *
- * @return 转换后的繁字体
- */
-
- ///
- static String convertCharToTraditionalChinese(String c) {
- if (chineseMap.containsValue(c)) {
- Iterable<MapEntry<String, String>> iterable = chineseMap.entries;
- for (int i = 0, length = iterable.length; i < length; i++) {
- MapEntry<String, String> entry = iterable.elementAt(i);
- if (entry.value == c) {
- return entry.key;
- }
- }
- }
- return c;
- }
-
- /**
- * 将繁体字转换为简体字
- *
- * @param str 需要转换的繁体字
- *
- * @return 转换后的简体字
- */
-
- ///
- static String convertToSimplifiedChinese(String str) {
- StringBuffer sb = new StringBuffer();
- for (int i = 0, len = str.length; i < len; i++) {
- sb.write(convertCharToSimplifiedChinese(str[i]));
- }
- return sb.toString();
- }
-
- /**
- * 将简体字转换为繁体字
- *
- * @param str
- * 需要转换的简体字
- * @return 转换后的繁字体
- */
-
- ///
- static String convertToTraditionalChinese(String str) {
- StringBuffer sb = new StringBuffer();
- for (int i = 0, len = str.length; i < len; i++) {
- sb.write(convertCharToTraditionalChinese(str[i]));
- }
- return sb.toString();
- }
-
- ///添加繁体字字典
- static void addChineseDict(List<String> list) {
- chineseMap.addAll(PinyinResource.getResource(list));
- }
-}
diff --git a/plugin/wechat_flutter_plugin/lib/pinyin/dict_data.dart b/plugin/wechat_flutter_plugin/lib/pinyin/dict_data.dart
deleted file mode 100644
index cb0cf7c..0000000
--- a/plugin/wechat_flutter_plugin/lib/pinyin/dict_data.dart
+++ /dev/null
@@ -1,24269 +0,0 @@
-const List<String> PINYIN_DICT = const [
- '耀=yào',
- '老=lǎo',
- '耂=lǎo',
- '考=kǎo',
- '耄=mào',
- '者=zhě',
- '耆=qí,shì',
- '耇=gǒu',
- '耈=gǒu',
- '耉=gǒu',
- '耊=dié',
- '耋=dié',
- '而=ér',
- '耍=shuǎ',
- '耎=ruǎn,nuò',
- '耏=ér,nài',
- '耐=nài',
- '耑=duān,zhuān',
- '耒=lěi',
- '耓=tīng',
- '耔=zǐ',
- '耕=gēng',
- '耖=chào',
- '耗=hào',
- '耘=yún',
- '耙=bà,pá',
- '耚=pī',
- '耛=sì,chí',
- '耜=sì',
- '耝=qù,chú',
- '耞=jiā',
- '耟=jù',
- '耠=huō',
- '耡=chú',
- '耢=lào',
- '耣=lún,lǔn',
- '耤=jí,jiè',
- '耥=tǎng',
- '耦=ǒu',
- '耧=lóu',
- '耨=nòu',
- '耩=jiǎng',
- '耪=pǎng',
- '耫=zhá,zé',
- '耬=lóu',
- '耭=jī',
- '耮=lào',
- '耯=huò',
- '耰=yōu',
- '耱=mò',
- '耲=huái',
- '耳=ěr',
- '耴=yì',
- '耵=dīng',
- '耶=yé,yē',
- '耷=dā',
- '耸=sǒng',
- '耹=qín',
- '耺=yún,yíng',
- '耻=chǐ',
- '耼=dān',
- '耽=dān',
- '耾=hóng',
- '耿=gěng',
- '聀=zhí',
- '聁=pàn',
- '聂=niè',
- '聃=dān',
- '聄=zhěn',
- '聅=chè',
- '聆=líng',
- '聇=zhēng',
- '聈=yǒu',
- '聉=wà,tuǐ,zhuó',
- '聊=liáo',
- '聋=lóng',
- '职=zhí',
- '聍=níng',
- '聎=tiāo',
- '聏=ér,nǜ',
- '聐=yà',
- '聑=tiē,zhé',
- '聒=guō',
- '聓=xù',
- '联=lián',
- '聕=hào',
- '聖=shèng',
- '聗=liè',
- '聘=pìn',
- '聙=jīng',
- '聚=jù',
- '聛=bǐ',
- '聜=dǐ,zhì',
- '聝=guó',
- '聞=wén',
- '聟=xù',
- '聠=pīng',
- '聡=cōng',
- '聢=dìng',
- '聣=ní',
- '聤=tíng',
- '聥=jǔ',
- '聦=cōng',
- '聧=kuī',
- '聨=lián',
- '聩=kuì',
- '聪=cōng',
- '聫=lián',
- '聬=wēng',
- '聭=kuì',
- '聮=lián',
- '聯=lián',
- '聰=cōng',
- '聱=áo',
- '聲=shēng',
- '聳=sǒng',
- '聴=tīng',
- '聵=kuì',
- '聶=niè',
- '職=zhí',
- '聸=dān',
- '聹=níng',
- '聺=qié',
- '聻=nǐ,jiàn',
- '聼=tīng',
- '聽=tīng',
- '聾=lóng',
- '聿=yù',
- '肀=yù',
- '肁=zhào',
- '肂=sì',
- '肃=sù',
- '肄=yì',
- '肅=sù',
- '肆=sì',
- '肇=zhào',
- '肈=zhào',
- '肉=ròu',
- '肊=yì',
- '肋=lèi,lē',
- '肌=jī',
- '肍=qiú',
- '肎=kěn',
- '肏=cào',
- '肐=gē',
- '肑=bó,dí',
- '肒=huàn',
- '肓=huāng',
- '肔=chǐ',
- '肕=rèn',
- '肖=xiāo,xiào',
- '肗=rǔ',
- '肘=zhǒu',
- '肙=yuān',
- '肚=dù,dǔ',
- '肛=gāng',
- '肜=róng,chēn',
- '肝=gān',
- '肞=chāi',
- '肟=wò',
- '肠=cháng',
- '股=gǔ',
- '肢=zhī',
- '肣=qín,hán,hàn',
- '肤=fū',
- '肥=féi',
- '肦=bān',
- '肧=pēi',
- '肨=pàng,pán,pàn',
- '肩=jiān',
- '肪=fáng',
- '肫=zhūn,chún',
- '肬=yóu',
- '肭=nà',
- '肮=āng',
- '肯=kěn',
- '肰=rán',
- '肱=gōng',
- '育=yù',
- '肳=wěn',
- '肴=yáo',
- '肵=qí',
- '肶=pí,bǐ,bì',
- '肷=qiǎn',
- '肸=xī',
- '肹=xī',
- '肺=fèi',
- '肻=kěn',
- '肼=jǐng',
- '肽=tài',
- '肾=shèn',
- '肿=zhǒng',
- '胀=zhàng',
- '胁=xié',
- '胂=shèn',
- '胃=wèi',
- '胄=zhòu',
- '胅=dié',
- '胆=dǎn',
- '胇=fèi,bì',
- '胈=bá',
- '胉=bó',
- '胊=qú',
- '胋=tián',
- '背=bēi,bèi',
- '胍=guā',
- '胎=tāi',
- '胏=zǐ,fèi',
- '胐=fěi,kū',
- '胑=zhī',
- '胒=nì',
- '胓=píng,pēng',
- '胔=zì',
- '胕=fū,fú,zhǒu',
- '胖=pàng,pán,pàn',
- '胗=zhēn',
- '胘=xián',
- '胙=zuò',
- '胚=pēi',
- '胛=jiǎ',
- '胜=shèng',
- '胝=zhī',
- '胞=bāo',
- '胟=mǔ',
- '胠=qū',
- '胡=hú',
- '胢=qià',
- '胣=chǐ',
- '胤=yìn',
- '胥=xū',
- '胦=yāng',
- '胧=lóng',
- '胨=dòng',
- '胩=kǎ',
- '胪=lú',
- '胫=jìng',
- '胬=nǔ',
- '胭=yān',
- '胮=pāng',
- '胯=kuà',
- '胰=yí',
- '胱=guāng',
- '胲=hǎi',
- '胳=gē,gé',
- '胴=dòng',
- '胵=chī',
- '胶=jiāo',
- '胷=xiōng',
- '胸=xiōng',
- '胹=ér',
- '胺=àn',
- '胻=héng',
- '胼=pián',
- '能=néng,nài',
- '胾=zì',
- '胿=guī,kuì',
- '脀=zhēng',
- '脁=tiǎo',
- '脂=zhī',
- '脃=cuì',
- '脄=méi',
- '脅=xié',
- '脆=cuì',
- '脇=xié',
- '脈=mài',
- '脉=mài,mò',
- '脊=jǐ',
- '脋=xié',
- '脌=nín',
- '脍=kuài',
- '脎=sà',
- '脏=zàng',
- '脐=qí',
- '脑=nǎo',
- '脒=mǐ',
- '脓=nóng',
- '脔=luán',
- '脕=wàn',
- '脖=bó',
- '脗=wěn',
- '脘=wǎn',
- '脙=xiū',
- '脚=jiǎo',
- '脛=jìng',
- '脜=róu',
- '脝=hēng',
- '脞=cuǒ',
- '脟=liè',
- '脠=shān',
- '脡=tǐng',
- '脢=méi',
- '脣=chún',
- '脤=shèn',
- '脥=jiá',
- '脦=tè',
- '脧=juān',
- '脨=cù',
- '脩=xiū',
- '脪=xìn',
- '脫=tuō',
- '脬=pāo',
- '脭=chéng',
- '脮=něi',
- '脯=fǔ,pú',
- '脰=dòu',
- '脱=tuō',
- '脲=niào',
- '脳=nǎo',
- '脴=pǐ',
- '脵=gǔ',
- '脶=luó',
- '脷=lì',
- '脸=liǎn',
- '脹=zhàng',
- '脺=cuī',
- '脻=jiē',
- '脼=liǎng',
- '脽=shuí',
- '脾=pí',
- '脿=biāo',
- '腀=lún',
- '腁=pián',
- '腂=guò',
- '腃=juàn',
- '腄=chuí',
- '腅=dàn',
- '腆=tiǎn',
- '腇=něi',
- '腈=jīng',
- '腉=nái',
- '腊=là,xī',
- '腋=yè',
- '腌=ā,yān',
- '腍=rèn',
- '腎=shèn',
- '腏=zhuì',
- '腐=fǔ',
- '腑=fǔ',
- '腒=jū',
- '腓=féi',
- '腔=qiāng',
- '腕=wàn',
- '腖=dòng',
- '腗=pí',
- '腘=guó',
- '腙=zōng',
- '腚=dìng',
- '腛=wò',
- '腜=méi',
- '腝=ruǎn',
- '腞=zhuàn',
- '腟=chì',
- '腠=còu',
- '腡=luó',
- '腢=ǒu',
- '腣=dì',
- '腤=ān',
- '腥=xīng',
- '腦=nǎo',
- '腧=shù',
- '腨=shuàn',
- '腩=nǎn',
- '腪=yùn',
- '腫=zhǒng',
- '腬=róu',
- '腭=è',
- '腮=sāi',
- '腯=tú',
- '腰=yāo',
- '腱=jiàn',
- '腲=wěi',
- '腳=jiǎo',
- '腴=yú',
- '腵=jiā',
- '腶=duàn',
- '腷=bì',
- '腸=cháng',
- '腹=fù',
- '腺=xiàn',
- '腻=nì',
- '腼=miǎn',
- '腽=wà',
- '腾=téng',
- '腿=tuǐ',
- '膀=bǎng',
- '膁=qiǎn',
- '膂=lǚ',
- '膃=wà',
- '膄=shòu',
- '膅=táng',
- '膆=sù',
- '膇=zhuì',
- '膈=gé',
- '膉=yì',
- '膊=bó',
- '膋=liáo',
- '膌=jí',
- '膍=pí',
- '膎=xié',
- '膏=gāo,gào',
- '膐=lǚ',
- '膑=bìn',
- '膒=ōu',
- '膓=cháng',
- '膔=lù,biāo',
- '膕=guó',
- '膖=pāng',
- '膗=chuái',
- '膘=biāo',
- '膙=jiǎng',
- '膚=fū',
- '膛=táng',
- '膜=mó',
- '膝=xī',
- '膞=zhuān,chuán,chún,zhuǎn',
- '膟=lǜ',
- '膠=jiāo',
- '膡=yìng',
- '膢=lǘ',
- '膣=zhì',
- '膤=xuě',
- '膥=cūn',
- '膦=lìn',
- '膧=tóng',
- '膨=péng',
- '膩=nì',
- '膪=chuài',
- '膫=liáo',
- '膬=cuì',
- '膭=kuì',
- '膮=xiāo',
- '膯=tēng',
- '膰=fán,pán',
- '膱=zhí',
- '膲=jiāo',
- '膳=shàn',
- '膴=hū,wǔ',
- '膵=cuì',
- '膶=rùn',
- '膷=xiāng',
- '膸=suǐ',
- '膹=fèn',
- '膺=yīng',
- '膻=shān,dàn',
- '膼=zhuā',
- '膽=dǎn',
- '膾=kuài',
- '膿=nóng',
- '臀=tún',
- '臁=lián',
- '臂=bì,bei',
- '臃=yōng',
- '臄=jué',
- '臅=chù',
- '臆=yì',
- '臇=juǎn',
- '臈=là,gé',
- '臉=liǎn',
- '臊=sāo,sào',
- '臋=tún',
- '臌=gǔ',
- '臍=qí',
- '臎=cuì',
- '臏=bìn',
- '臐=xūn',
- '臑=nào',
- '臒=wò,yuè',
- '臓=zàng',
- '臔=xiàn',
- '臕=biāo',
- '臖=xìng',
- '臗=kuān',
- '臘=là',
- '臙=yān',
- '臚=lú',
- '臛=huò',
- '臜=zā',
- '臝=luǒ',
- '臞=qú',
- '臟=zàng',
- '臠=luán',
- '臡=ní,luán',
- '臢=zā',
- '臣=chén',
- '臤=qiān,xián',
- '臥=wò',
- '臦=guàng,jiǒng',
- '臧=zāng,zàng,cáng',
- '臨=lín',
- '臩=guǎng,jiǒng',
- '自=zì',
- '臫=jiǎo',
- '臬=niè',
- '臭=chòu,xiù',
- '臮=jì',
- '臯=gāo',
- '臰=chòu',
- '臱=mián,biān',
- '臲=niè',
- '至=zhì',
- '致=zhì',
- '臵=gé',
- '臶=jiàn',
- '臷=dié,zhí',
- '臸=zhī,jìn',
- '臹=xiū',
- '臺=tái',
- '臻=zhēn',
- '臼=jiù',
- '臽=xiàn',
- '臾=yú',
- '臿=chā',
- '舀=yǎo',
- '舁=yú',
- '舂=chōng',
- '舃=xì',
- '舄=xì',
- '舅=jiù',
- '舆=yú',
- '與=yǔ',
- '興=xīng',
- '舉=jǔ',
- '舊=jiù',
- '舋=xìn',
- '舌=shé',
- '舍=shě,shè',
- '舎=shè',
- '舏=jiǔ',
- '舐=shì',
- '舑=tān',
- '舒=shū',
- '舓=shì',
- '舔=tiǎn',
- '舕=tàn',
- '舖=pù',
- '舗=pù',
- '舘=guǎn',
- '舙=huà',
- '舚=tiàn',
- '舛=chuǎn',
- '舜=shùn',
- '舝=xiá',
- '舞=wǔ',
- '舟=zhōu',
- '舠=dāo',
- '舡=chuán',
- '舢=shān',
- '舣=yǐ',
- '舤=fán',
- '舥=pā',
- '舦=tài',
- '舧=fán',
- '舨=bǎn',
- '舩=chuán',
- '航=háng',
- '舫=fǎng',
- '般=bān',
- '舭=bǐ',
- '舮=lú',
- '舯=zhōng',
- '舰=jiàn',
- '舱=cāng',
- '舲=líng',
- '舳=zhú',
- '舴=zé',
- '舵=duò',
- '舶=bó',
- '舷=xián',
- '舸=gě',
- '船=chuán',
- '舺=xiá',
- '舻=lú',
- '舼=qióng',
- '舽=páng',
- '舾=xī',
- '舿=kuā',
- '艀=fú',
- '艁=zào',
- '艂=féng',
- '艃=lí',
- '艄=shāo',
- '艅=yú',
- '艆=láng',
- '艇=tǐng',
- '艈=yù',
- '艉=wěi',
- '艊=bó',
- '艋=měng',
- '艌=niàn',
- '艍=jū',
- '艎=huáng',
- '艏=shǒu',
- '艐=kè',
- '艑=biàn',
- '艒=mù',
- '艓=dié',
- '艔=dào',
- '艕=bàng',
- '艖=chā',
- '艗=yì',
- '艘=sōu',
- '艙=cāng',
- '艚=cáo',
- '艛=lóu',
- '艜=dài',
- '艝=xuě',
- '艞=yào',
- '艟=chōng',
- '艠=dēng',
- '艡=dāng',
- '艢=qiáng',
- '艣=lǔ',
- '艤=yǐ',
- '艥=jí',
- '艦=jiàn',
- '艧=huò',
- '艨=méng',
- '艩=qí',
- '艪=lǔ',
- '艫=lú',
- '艬=chán',
- '艭=shuāng',
- '艮=gèn',
- '良=liáng',
- '艰=jiān',
- '艱=jiān',
- '色=sè',
- '艳=yàn',
- '艴=fú',
- '艵=pīng',
- '艶=yàn',
- '艷=yàn',
- '艸=cǎo',
- '艹=ǎo',
- '艺=yì',
- '艻=lè',
- '艼=dǐng',
- '艽=jiāo,qiú',
- '艾=ài,yì',
- '艿=nǎi',
- '芀=tiáo',
- '芁=qiú',
- '节=jié,jiē',
- '芃=péng',
- '芄=wán',
- '芅=yì',
- '芆=chāi,chā',
- '芇=mián',
- '芈=mǐ',
- '芉=gǎn',
- '芊=qiān',
- '芋=yù',
- '芌=yù',
- '芍=sháo',
- '芎=xiōng',
- '芏=dù',
- '芐=hù,xià',
- '芑=qǐ',
- '芒=máng',
- '芓=zì,zǐ',
- '芔=huì,hū',
- '芕=suī',
- '芖=zhì',
- '芗=xiāng',
- '芘=bì,pí',
- '芙=fú',
- '芚=tún,chūn',
- '芛=wěi',
- '芜=wú',
- '芝=zhī',
- '芞=qì',
- '芟=shān',
- '芠=wén',
- '芡=qiàn',
- '芢=rén',
- '芣=fú',
- '芤=kōu',
- '芥=jiè,gài',
- '芦=lú',
- '芧=xù,zhù',
- '芨=jī',
- '芩=qín',
- '芪=qí',
- '芫=yuán,yán',
- '芬=fēn',
- '芭=bā',
- '芮=ruì',
- '芯=xīn,xìn',
- '芰=jì',
- '花=huā',
- '芲=lún,huā',
- '芳=fāng',
- '芴=wù,hū',
- '芵=jué',
- '芶=gōu,gǒu',
- '芷=zhǐ',
- '芸=yún',
- '芹=qín',
- '芺=ǎo',
- '芻=chú',
- '芼=máo,mào',
- '芽=yá',
- '芾=fèi,fú',
- '芿=réng',
- '苀=háng',
- '苁=cōng',
- '苂=chán,yín',
- '苃=yǒu',
- '苄=biàn',
- '苅=yì',
- '苆=qiē',
- '苇=wěi',
- '苈=lì',
- '苉=pǐ',
- '苊=è',
- '苋=xiàn',
- '苌=cháng',
- '苍=cāng',
- '苎=zhù',
- '苏=sū,sù',
- '苐=dì,tí',
- '苑=yuàn',
- '苒=rǎn',
- '苓=líng',
- '苔=tái,tāi',
- '苕=tiáo,sháo',
- '苖=dí',
- '苗=miáo',
- '苘=qǐng',
- '苙=lì,jī',
- '苚=yòng',
- '苛=kē,hē',
- '苜=mù',
- '苝=bèi',
- '苞=bāo',
- '苟=gǒu',
- '苠=mín',
- '苡=yǐ',
- '苢=yǐ',
- '苣=jù,qǔ',
- '苤=piě',
- '若=ruò,rě',
- '苦=kǔ',
- '苧=zhù,níng',
- '苨=nǐ',
- '苩=pā,bó',
- '苪=bǐng',
- '苫=shān,shàn',
- '苬=xiú',
- '苭=yǎo',
- '苮=xiān',
- '苯=běn',
- '苰=hóng',
- '英=yīng',
- '苲=zuó,zhǎ',
- '苳=dōng',
- '苴=jū,chá',
- '苵=dié',
- '苶=nié',
- '苷=gān',
- '苸=hū',
- '苹=píng,pēng',
- '苺=méi',
- '苻=fú',
- '苼=shēng,ruí',
- '苽=gū',
- '苾=bì',
- '苿=wèi',
- '茀=fú',
- '茁=zhuó',
- '茂=mào',
- '范=fàn',
- '茄=qié',
- '茅=máo',
- '茆=máo',
- '茇=bá',
- '茈=zǐ',
- '茉=mò',
- '茊=zī',
- '茋=zhǐ',
- '茌=chí',
- '茍=jì',
- '茎=jīng',
- '茏=lóng',
- '茐=cōng',
- '茑=niǎo',
- '茒=yuán',
- '茓=xué',
- '茔=yíng',
- '茕=qióng',
- '茖=gè',
- '茗=míng',
- '茘=lì',
- '茙=róng',
- '茚=yìn',
- '茛=gèn',
- '茜=qiàn',
- '茝=chǎi',
- '茞=chén',
- '茟=yù',
- '茠=hāo',
- '茡=zì',
- '茢=liè',
- '茣=wú',
- '茤=jì',
- '茥=guī',
- '茦=cì',
- '茧=jiǎn',
- '茨=cí',
- '茩=hòu',
- '茪=guāng',
- '茫=máng',
- '茬=chá',
- '茭=jiāo',
- '茮=jiāo',
- '茯=fú',
- '茰=yú',
- '茱=zhū',
- '茲=zī',
- '茳=jiāng',
- '茴=huí',
- '茵=yīn',
- '茶=chá',
- '茷=fá',
- '茸=róng',
- '茹=rú',
- '茺=chōng',
- '茻=mǎng',
- '茼=tóng',
- '茽=zhòng',
- '茾=qiān',
- '茿=zhú',
- '荀=xún',
- '荁=huán',
- '荂=fū',
- '荃=quán',
- '荄=gāi',
- '荅=dá',
- '荆=jīng',
- '荇=xìng',
- '荈=chuǎn',
- '草=cǎo',
- '荊=jīng',
- '荋=ér',
- '荌=àn',
- '荍=qiáo',
- '荎=chí',
- '荏=rěn',
- '荐=jiàn',
- '荑=yí,tí',
- '荒=huāng',
- '荓=píng',
- '荔=lì',
- '荕=jīn',
- '荖=lǎo',
- '荗=shù',
- '荘=zhuāng',
- '荙=dá',
- '荚=jiá',
- '荛=ráo',
- '荜=bì',
- '荝=cè',
- '荞=qiáo',
- '荟=huì',
- '荠=jì,qí',
- '荡=dàng',
- '荢=zì',
- '荣=róng',
- '荤=hūn',
- '荥=xíng,yīng',
- '荦=luò',
- '荧=yíng',
- '荨=qián,xún',
- '荩=jìn',
- '荪=sūn',
- '荫=yīn,yìn',
- '荬=mǎi',
- '荭=hóng',
- '荮=zhòu',
- '药=yào',
- '荰=dù',
- '荱=wěi',
- '荲=lí',
- '荳=dòu',
- '荴=fū',
- '荵=rěn',
- '荶=yín',
- '荷=hé,hè',
- '荸=bí',
- '荹=bù',
- '荺=yǔn',
- '荻=dí',
- '荼=tú',
- '荽=suī',
- '荾=suī',
- '荿=chéng',
- '莀=chén',
- '莁=wú',
- '莂=bié',
- '莃=xī',
- '莄=gěng',
- '莅=lì',
- '莆=pú',
- '莇=zhù',
- '莈=mò',
- '莉=lì',
- '莊=zhuāng',
- '莋=zuó',
- '莌=tuō',
- '莍=qiú',
- '莎=suō,shā',
- '莏=suō',
- '莐=chén',
- '莑=péng,fēng',
- '莒=jǔ',
- '莓=méi',
- '莔=méng',
- '莕=xìng',
- '莖=jìng',
- '莗=chē',
- '莘=shēn,xīn',
- '莙=jūn',
- '莚=yán',
- '莛=tíng',
- '莜=yóu',
- '莝=cuò',
- '莞=wǎn,guǎn,guān',
- '莟=hàn',
- '莠=yǒu',
- '莡=cuò',
- '莢=jiá',
- '莣=wáng',
- '莤=sù,yóu',
- '莥=niǔ',
- '莦=shāo,xiāo',
- '莧=xiàn',
- '莨=làng,liáng',
- '莩=fú,piǎo',
- '莪=é',
- '莫=mò,mù',
- '莬=wèn,wǎn,miǎn',
- '莭=jié',
- '莮=nán',
- '莯=mù',
- '莰=kǎn',
- '莱=lái',
- '莲=lián',
- '莳=shì,shí',
- '莴=wō',
- '莵=tù,tú',
- '莶=xiān,liǎn',
- '获=huò',
- '莸=yóu',
- '莹=yíng',
- '莺=yīng',
- '莻=null',
- '莼=chún',
- '莽=mǎng',
- '莾=mǎng',
- '莿=cì',
- '菀=wǎn,yùn',
- '菁=jīng',
- '菂=dì',
- '菃=qú',
- '菄=dōng',
- '菅=jiān',
- '菆=zōu,chù',
- '菇=gū',
- '菈=lā',
- '菉=lù',
- '菊=jú',
- '菋=wèi',
- '菌=jūn,jùn',
- '菍=niè,rěn',
- '菎=kūn',
- '菏=hé',
- '菐=pú',
- '菑=zī,zì,zāi',
- '菒=gǎo',
- '菓=guǒ',
- '菔=fú',
- '菕=lún',
- '菖=chāng',
- '菗=chóu',
- '菘=sōng',
- '菙=chuí',
- '菚=zhàn',
- '菛=mén',
- '菜=cài',
- '菝=bá',
- '菞=lí',
- '菟=tù,tú',
- '菠=bō',
- '菡=hàn',
- '菢=bào',
- '菣=qìn',
- '菤=juǎn',
- '菥=xī',
- '菦=qín',
- '菧=dǐ',
- '菨=jiē,shà',
- '菩=pú',
- '菪=dàng',
- '菫=jǐn',
- '菬=qiáo,zhǎo',
- '菭=tái,zhī,chí',
- '菮=gēng',
- '華=huá,huà,huā',
- '菰=gū',
- '菱=líng',
- '菲=fēi,fěi',
- '菳=qín,qīn,jīn',
- '菴=ān',
- '菵=wǎng',
- '菶=běng',
- '菷=zhǒu',
- '菸=yān',
- '菹=zū',
- '菺=jiān',
- '菻=lǐn,má',
- '菼=tǎn',
- '菽=shū',
- '菾=tián,tiàn',
- '菿=dào',
- '萀=hǔ',
- '萁=qí',
- '萂=hé',
- '萃=cuì',
- '萄=táo',
- '萅=chūn',
- '萆=bì',
- '萇=cháng',
- '萈=huán',
- '萉=fèi',
- '萊=lái',
- '萋=qī',
- '萌=méng',
- '萍=píng',
- '萎=wěi',
- '萏=dàn',
- '萐=shà',
- '萑=huán',
- '萒=yǎn',
- '萓=yí',
- '萔=tiáo',
- '萕=qí',
- '萖=wǎn',
- '萗=cè',
- '萘=nài',
- '萙=zhěn',
- '萚=tuò',
- '萛=jiū',
- '萜=tiē',
- '萝=luó',
- '萞=bì',
- '萟=yì',
- '萠=pān',
- '萡=bó',
- '萢=pāo',
- '萣=dìng',
- '萤=yíng',
- '营=yíng',
- '萦=yíng',
- '萧=xiāo',
- '萨=sà',
- '萩=qiū',
- '萪=kē',
- '萫=xiāng',
- '萬=wàn',
- '萭=yǔ',
- '萮=yú',
- '萯=fù',
- '萰=liàn',
- '萱=xuān',
- '萲=xuān',
- '萳=nǎn',
- '萴=cè',
- '萵=wō',
- '萶=chǔn',
- '萷=shāo',
- '萸=yú',
- '萹=biān',
- '萺=mào',
- '萻=ān',
- '萼=è',
- '落=luò,là,lào',
- '萾=yíng',
- '萿=kuò',
- '葀=kuò',
- '葁=jiāng',
- '葂=miǎn',
- '葃=zuò',
- '葄=zuò',
- '葅=zū',
- '葆=bǎo',
- '葇=róu',
- '葈=xǐ',
- '葉=yè',
- '葊=ān',
- '葋=qú',
- '葌=jiān',
- '葍=fú',
- '葎=lǜ',
- '葏=jīng',
- '葐=pén',
- '葑=fēng',
- '葒=hóng',
- '葓=hóng',
- '葔=hóu',
- '葕=xìng',
- '葖=tū',
- '著=zhù,zhuó,zhe',
- '葘=zī',
- '葙=xiāng',
- '葚=shèn',
- '葛=gé,gě',
- '葜=qiā',
- '葝=qíng',
- '葞=mǐ',
- '葟=huáng',
- '葠=shēn',
- '葡=pú',
- '葢=gài',
- '董=dǒng',
- '葤=zhòu',
- '葥=qián',
- '葦=wěi',
- '葧=bó',
- '葨=wēi',
- '葩=pā',
- '葪=jì',
- '葫=hú',
- '葬=zàng',
- '葭=jiā',
- '葮=duàn',
- '葯=yào',
- '葰=jùn',
- '葱=cōng',
- '葲=quán',
- '葳=wēi',
- '葴=zhēn',
- '葵=kuí',
- '葶=tíng',
- '葷=hūn',
- '葸=xǐ',
- '葹=shī',
- '葺=qì',
- '葻=lán',
- '葼=zōng',
- '葽=yāo',
- '葾=yuān',
- '葿=méi',
- '蒀=yūn',
- '蒁=shù',
- '蒂=dì',
- '蒃=zhuàn',
- '蒄=guān',
- '蒅=rǎn',
- '蒆=xuē',
- '蒇=chǎn',
- '蒈=kǎi',
- '蒉=kuì,kuài',
- '蒊=huā',
- '蒋=jiǎng',
- '蒌=lóu',
- '蒍=wěi',
- '蒎=pài',
- '蒏=yòng',
- '蒐=sōu',
- '蒑=yīn',
- '蒒=shī',
- '蒓=chún',
- '蒔=shì,shí',
- '蒕=yūn',
- '蒖=zhēn',
- '蒗=làng',
- '蒘=rú,ná',
- '蒙=mēng,méng,měng',
- '蒚=lì',
- '蒛=quē',
- '蒜=suàn',
- '蒝=yuán,huán',
- '蒞=lì',
- '蒟=jǔ',
- '蒠=xī',
- '蒡=bàng',
- '蒢=chú',
- '蒣=xú,shú',
- '蒤=tú',
- '蒥=liú',
- '蒦=huò',
- '蒧=diǎn',
- '蒨=qiàn',
- '蒩=zū,jù',
- '蒪=pò',
- '蒫=cuó',
- '蒬=yuān',
- '蒭=chú',
- '蒮=yù',
- '蒯=kuǎi',
- '蒰=pán',
- '蒱=pú',
- '蒲=pú',
- '蒳=nà',
- '蒴=shuò',
- '蒵=xí,xì',
- '蒶=fén',
- '蒷=yún',
- '蒸=zhēng',
- '蒹=jiān',
- '蒺=jí',
- '蒻=ruò',
- '蒼=cāng',
- '蒽=ēn',
- '蒾=mí',
- '蒿=hāo',
- '蓀=sūn',
- '蓁=zhēn',
- '蓂=míng',
- '蓃=sōu,sǒu',
- '蓄=xù',
- '蓅=liú',
- '蓆=xí',
- '蓇=gū',
- '蓈=láng',
- '蓉=róng',
- '蓊=wěng',
- '蓋=gài,gě,hé',
- '蓌=cuò',
- '蓍=shī',
- '蓎=táng',
- '蓏=luǒ',
- '蓐=rù',
- '蓑=suō',
- '蓒=xuān',
- '蓓=bèi',
- '蓔=yǎo,zhuó',
- '蓕=guì',
- '蓖=bì',
- '蓗=zǒng',
- '蓘=gǔn',
- '蓙=zuò',
- '蓚=tiáo',
- '蓛=cè',
- '蓜=pèi',
- '蓝=lán',
- '蓞=dàn',
- '蓟=jì',
- '蓠=lí',
- '蓡=shēn',
- '蓢=lǎng',
- '蓣=yù',
- '蓤=líng',
- '蓥=yíng',
- '蓦=mò',
- '蓧=diào,tiáo,dí',
- '蓨=tiáo',
- '蓩=mǎo',
- '蓪=tōng',
- '蓫=zhú',
- '蓬=péng',
- '蓭=ān',
- '蓮=lián',
- '蓯=cōng',
- '蓰=xǐ',
- '蓱=píng',
- '蓲=qiū,xū,fū',
- '蓳=jǐn',
- '蓴=chún',
- '蓵=jié',
- '蓶=wéi',
- '蓷=tuī',
- '蓸=cáo',
- '蓹=yù',
- '蓺=yì',
- '蓻=zí,jú',
- '蓼=liǎo,lù',
- '蓽=bì',
- '蓾=lǔ',
- '蓿=xù',
- '蔀=bù',
- '蔁=zhāng',
- '蔂=léi',
- '蔃=qiáng',
- '蔄=màn',
- '蔅=yán',
- '蔆=líng',
- '蔇=jì',
- '蔈=biāo',
- '蔉=gǔn',
- '蔊=hàn',
- '蔋=dí',
- '蔌=sù',
- '蔍=lù',
- '蔎=shè',
- '蔏=shāng',
- '蔐=dí',
- '蔑=miè',
- '蔒=hūn',
- '蔓=màn,wàn',
- '蔔=bo',
- '蔕=dì',
- '蔖=cuó',
- '蔗=zhè',
- '蔘=shēn',
- '蔙=xuàn',
- '蔚=wèi',
- '蔛=hú',
- '蔜=áo',
- '蔝=mǐ',
- '蔞=lóu',
- '蔟=cù',
- '蔠=zhōng',
- '蔡=cài',
- '蔢=pó',
- '蔣=jiǎng',
- '蔤=mì',
- '蔥=cōng',
- '蔦=niǎo',
- '蔧=huì',
- '蔨=juàn',
- '蔩=yín',
- '蔪=jiān',
- '蔫=niān',
- '蔬=shū',
- '蔭=yīn',
- '蔮=guó',
- '蔯=chén',
- '蔰=hù',
- '蔱=shā',
- '蔲=kòu',
- '蔳=qiàn',
- '蔴=má',
- '蔵=zàng',
- '蔶=zé',
- '蔷=qiáng',
- '蔸=dōu',
- '蔹=liǎn',
- '蔺=lìn',
- '蔻=kòu',
- '蔼=ǎi',
- '蔽=bì',
- '蔾=lí',
- '蔿=wěi',
- '蕀=jí',
- '蕁=qián,xún',
- '蕂=shèng',
- '蕃=fán',
- '蕄=méng',
- '蕅=ǒu',
- '蕆=chǎn',
- '蕇=diǎn',
- '蕈=xùn',
- '蕉=jiāo',
- '蕊=ruǐ',
- '蕋=ruǐ',
- '蕌=lěi',
- '蕍=yú',
- '蕎=qiáo',
- '蕏=zhū',
- '蕐=huá',
- '蕑=jiān',
- '蕒=mǎi',
- '蕓=yún',
- '蕔=bāo',
- '蕕=yóu',
- '蕖=qú',
- '蕗=lù',
- '蕘=ráo',
- '蕙=huì',
- '蕚=è',
- '蕛=tí',
- '蕜=fěi',
- '蕝=jué',
- '蕞=zuì',
- '蕟=fà',
- '蕠=rú',
- '蕡=fén',
- '蕢=kuì',
- '蕣=shùn',
- '蕤=ruí',
- '蕥=yǎ',
- '蕦=xū',
- '蕧=fù',
- '蕨=jué',
- '蕩=dàng',
- '蕪=wú',
- '蕫=dǒng',
- '蕬=sī',
- '蕭=xiāo',
- '蕮=xì',
- '蕯=sà',
- '蕰=yùn',
- '蕱=shāo',
- '蕲=qí',
- '蕳=jiān',
- '蕴=yùn',
- '蕵=sūn',
- '蕶=líng',
- '蕷=yù',
- '蕸=xiá',
- '蕹=wèng',
- '蕺=jí',
- '蕻=hòng',
- '蕼=sì',
- '蕽=nóng',
- '蕾=lěi',
- '蕿=xuān',
- '薀=yùn',
- '薁=yù',
- '薂=xí,xiào',
- '薃=hào',
- '薄=báo,bó,bò',
- '薅=hāo',
- '薆=ài',
- '薇=wēi',
- '薈=huì',
- '薉=huì',
- '薊=jì',
- '薋=cí,zī',
- '薌=xiāng',
- '薍=wàn,luàn',
- '薎=miè',
- '薏=yì',
- '薐=léng',
- '薑=jiāng',
- '薒=càn',
- '薓=shēn',
- '薔=qiáng,sè',
- '薕=lián',
- '薖=kē',
- '薗=yuán',
- '薘=dá',
- '薙=tì',
- '薚=tāng',
- '薛=xuē',
- '薜=bì',
- '薝=zhān',
- '薞=sūn',
- '薟=xiān,liǎn',
- '薠=fán',
- '薡=dǐng',
- '薢=xiè',
- '薣=gǔ',
- '薤=xiè',
- '薥=shǔ',
- '薦=jiàn',
- '薧=hāo,kǎo',
- '薨=hōng',
- '薩=sà',
- '薪=xīn',
- '薫=xūn',
- '薬=yào',
- '薭=bài',
- '薮=sǒu',
- '薯=shǔ',
- '薰=xūn',
- '薱=duì',
- '薲=pín',
- '薳=yuǎn,wěi',
- '薴=níng',
- '薵=chóu,zhòu',
- '薶=mái,wō',
- '薷=rú',
- '薸=piáo',
- '薹=tái',
- '薺=jì,qí',
- '薻=zǎo',
- '薼=chén',
- '薽=zhēn',
- '薾=ěr',
- '薿=nǐ',
- '藀=yíng',
- '藁=gǎo',
- '藂=cóng',
- '藃=xiāo,hào',
- '藄=qí',
- '藅=fá',
- '藆=jiǎn',
- '藇=xù,yù,xū',
- '藈=kuí',
- '藉=jiè,jí',
- '藊=biǎn',
- '藋=diào,zhuó',
- '藌=mí',
- '藍=lán',
- '藎=jìn',
- '藏=cáng,zàng',
- '藐=miǎo',
- '藑=qióng',
- '藒=qì',
- '藓=xiǎn',
- '藔=liáo',
- '藕=ǒu',
- '藖=xián',
- '藗=sù',
- '藘=lǘ',
- '藙=yì',
- '藚=xù',
- '藛=xiě',
- '藜=lí',
- '藝=yì',
- '藞=lǎ',
- '藟=lěi',
- '藠=jiào',
- '藡=dí',
- '藢=zhǐ',
- '藣=bēi',
- '藤=téng',
- '藥=yào',
- '藦=mò',
- '藧=huàn',
- '藨=biāo,pāo',
- '藩=fān',
- '藪=sǒu',
- '藫=tán',
- '藬=tuī',
- '藭=qióng',
- '藮=qiáo',
- '藯=wèi',
- '藰=liú,liǔ',
- '藱=huì,huí',
- '藲=ōu',
- '藳=gǎo',
- '藴=yùn',
- '藵=bǎo',
- '藶=lì',
- '藷=shǔ',
- '藸=zhū,chú',
- '藹=ǎi',
- '藺=lìn',
- '藻=zǎo',
- '藼=xuān',
- '藽=qìn',
- '藾=lài',
- '藿=huò',
- '蘀=tuò',
- '蘁=wù',
- '蘂=ruǐ',
- '蘃=ruǐ',
- '蘄=qí',
- '蘅=héng',
- '蘆=lú',
- '蘇=sū',
- '蘈=tuí',
- '蘉=máng',
- '蘊=yùn',
- '蘋=pín,píng',
- '蘌=yù',
- '蘍=xūn',
- '蘎=jì',
- '蘏=jiōng',
- '蘐=xuān',
- '蘑=mó',
- '蘒=qiū',
- '蘓=sū',
- '蘔=jiōng',
- '蘕=péng',
- '蘖=niè',
- '蘗=bò',
- '蘘=ráng',
- '蘙=yì',
- '蘚=xiǎn',
- '蘛=yú',
- '蘜=jú',
- '蘝=liǎn',
- '蘞=liǎn',
- '蘟=yǐn',
- '蘠=qiáng',
- '蘡=yīng',
- '蘢=lóng',
- '蘣=tǒu',
- '蘤=huā',
- '蘥=yuè',
- '蘦=lìng',
- '蘧=qú',
- '蘨=yáo',
- '蘩=fán',
- '蘪=mí',
- '蘫=lán',
- '蘬=guī',
- '蘭=lán',
- '蘮=jì',
- '蘯=dàng',
- '蘰=màn',
- '蘱=lèi',
- '蘲=léi',
- '蘳=huī',
- '蘴=fēng',
- '蘵=zhī',
- '蘶=wèi',
- '蘷=kuí',
- '蘸=zhàn',
- '蘹=huái',
- '蘺=lí',
- '蘻=jì',
- '蘼=mí',
- '蘽=lěi',
- '蘾=huài',
- '蘿=luó',
- '虀=jī',
- '虁=kuí',
- '虂=lù',
- '虃=jiān',
- '虄=null',
- '虅=téng',
- '虆=léi',
- '虇=quǎn',
- '虈=xiāo',
- '虉=yì',
- '虊=luán',
- '虋=mén',
- '虌=biē',
- '虍=hū',
- '虎=hǔ',
- '虏=lǔ',
- '虐=nüè',
- '虑=lǜ',
- '虒=sī',
- '虓=xiāo',
- '虔=qián',
- '處=chǔ',
- '虖=hū',
- '虗=xū',
- '虘=cuó',
- '虙=fú',
- '虚=xū',
- '虛=xū',
- '虜=lǔ',
- '虝=hǔ',
- '虞=yú',
- '號=hào,háo',
- '虠=jiāo',
- '虡=jù',
- '虢=guó',
- '虣=bào',
- '虤=yán',
- '虥=zhàn',
- '虦=zhàn',
- '虧=kuī',
- '虨=bīn',
- '虩=xì',
- '虪=shù',
- '虫=chóng',
- '虬=qiú',
- '虭=diāo',
- '虮=jǐ',
- '虯=qiú',
- '虰=dīng',
- '虱=shī',
- '虲=xiā',
- '虳=jué',
- '虴=zhé',
- '虵=shé',
- '虶=yú',
- '虷=hán',
- '虸=zǐ',
- '虹=hóng',
- '虺=huǐ,huī',
- '虻=méng',
- '虼=gè',
- '虽=suī',
- '虾=xiā,hā',
- '虿=chài',
- '蚀=shí',
- '蚁=yǐ',
- '蚂=mǎ,mā,mà',
- '蚃=xiǎng',
- '蚄=fāng,bàng',
- '蚅=è',
- '蚆=bā',
- '蚇=chǐ',
- '蚈=qiān',
- '蚉=wén',
- '蚊=wén',
- '蚋=ruì',
- '蚌=bàng,bèng',
- '蚍=pí',
- '蚎=yuè',
- '蚏=yuè',
- '蚐=jūn',
- '蚑=qí',
- '蚒=tóng',
- '蚓=yǐn',
- '蚔=qí,zhǐ',
- '蚕=cán',
- '蚖=yuán,wán',
- '蚗=jué,quē',
- '蚘=huí',
- '蚙=qín,qián',
- '蚚=qí',
- '蚛=zhòng',
- '蚜=yá',
- '蚝=háo',
- '蚞=mù',
- '蚟=wáng',
- '蚠=fén',
- '蚡=fén',
- '蚢=háng',
- '蚣=gōng,zhōng',
- '蚤=zǎo',
- '蚥=fù,fǔ',
- '蚦=rán',
- '蚧=jiè',
- '蚨=fú',
- '蚩=chī',
- '蚪=dǒu',
- '蚫=bào',
- '蚬=xiǎn',
- '蚭=ní',
- '蚮=dài,dé',
- '蚯=qiū',
- '蚰=yóu',
- '蚱=zhà',
- '蚲=píng',
- '蚳=chí',
- '蚴=yòu',
- '蚵=kē',
- '蚶=hān',
- '蚷=jù',
- '蚸=lì',
- '蚹=fù',
- '蚺=rán',
- '蚻=zhá',
- '蚼=gǒu,qú,xù',
- '蚽=pí',
- '蚾=pí,bǒ',
- '蚿=xián',
- '蛀=zhù',
- '蛁=diāo',
- '蛂=bié',
- '蛃=bīng',
- '蛄=gū',
- '蛅=zhān',
- '蛆=qū',
- '蛇=shé,yí',
- '蛈=tiě',
- '蛉=líng',
- '蛊=gǔ',
- '蛋=dàn',
- '蛌=tún',
- '蛍=yíng',
- '蛎=lì',
- '蛏=chēng',
- '蛐=qū',
- '蛑=móu',
- '蛒=gé,luò',
- '蛓=cì',
- '蛔=huí',
- '蛕=huí',
- '蛖=máng,bàng',
- '蛗=fù',
- '蛘=yáng',
- '蛙=wā',
- '蛚=liè',
- '蛛=zhū',
- '蛜=yī',
- '蛝=xián',
- '蛞=kuò',
- '蛟=jiāo',
- '蛠=lì',
- '蛡=yì,xǔ',
- '蛢=píng',
- '蛣=jié',
- '蛤=gé,há',
- '蛥=shé',
- '蛦=yí',
- '蛧=wǎng',
- '蛨=mò',
- '蛩=qióng',
- '蛪=qiè,ní',
- '蛫=guǐ',
- '蛬=qióng',
- '蛭=zhì',
- '蛮=mán',
- '蛯=lǎo',
- '蛰=zhé',
- '蛱=jiá',
- '蛲=náo',
- '蛳=sī',
- '蛴=qí',
- '蛵=xíng',
- '蛶=jiè',
- '蛷=qiú',
- '蛸=xiāo',
- '蛹=yǒng',
- '蛺=jiá',
- '蛻=tuì',
- '蛼=chē',
- '蛽=bèi',
- '蛾=é,yǐ',
- '蛿=hàn',
- '蜀=shǔ',
- '蜁=xuán',
- '蜂=fēng',
- '蜃=shèn',
- '蜄=shèn',
- '蜅=fǔ',
- '蜆=xiǎn',
- '蜇=zhé',
- '蜈=wú',
- '蜉=fú',
- '蜊=lì',
- '蜋=láng',
- '蜌=bì',
- '蜍=chú',
- '蜎=yuān',
- '蜏=yǒu',
- '蜐=jié',
- '蜑=dàn',
- '蜒=yán',
- '蜓=tíng',
- '蜔=diàn',
- '蜕=tuì',
- '蜖=huí',
- '蜗=wō',
- '蜘=zhī',
- '蜙=zhōng',
- '蜚=fēi',
- '蜛=jū',
- '蜜=mì',
- '蜝=qí',
- '蜞=qí',
- '蜟=yù',
- '蜠=jùn',
- '蜡=là',
- '蜢=měng',
- '蜣=qiāng',
- '蜤=sī',
- '蜥=xī',
- '蜦=lún',
- '蜧=lì',
- '蜨=dié',
- '蜩=tiáo',
- '蜪=táo',
- '蜫=kūn',
- '蜬=hán',
- '蜭=hàn',
- '蜮=yù',
- '蜯=bàng',
- '蜰=féi',
- '蜱=pí',
- '蜲=wēi',
- '蜳=dūn',
- '蜴=yì',
- '蜵=yuān',
- '蜶=suò',
- '蜷=quán',
- '蜸=qiǎn',
- '蜹=ruì',
- '蜺=ní',
- '蜻=qīng',
- '蜼=wèi',
- '蜽=liǎng',
- '蜾=guǒ',
- '蜿=wān',
- '蝀=dōng',
- '蝁=è',
- '蝂=bǎn',
- '蝃=dì',
- '蝄=wǎng',
- '蝅=cán',
- '蝆=yǎng',
- '蝇=yíng',
- '蝈=guō',
- '蝉=chán',
- '蝊=dìng',
- '蝋=là',
- '蝌=kē',
- '蝍=jí',
- '蝎=xiē',
- '蝏=tíng',
- '蝐=mào',
- '蝑=xū',
- '蝒=mián',
- '蝓=yú',
- '蝔=jiē',
- '蝕=shí',
- '蝖=xuān',
- '蝗=huáng',
- '蝘=yǎn',
- '蝙=biān',
- '蝚=róu',
- '蝛=wēi',
- '蝜=fù',
- '蝝=yuán',
- '蝞=mèi',
- '蝟=wèi',
- '蝠=fú',
- '蝡=rú',
- '蝢=xié',
- '蝣=yóu',
- '蝤=qiú',
- '蝥=máo',
- '蝦=xiā,hā',
- '蝧=yīng',
- '蝨=shī',
- '蝩=chóng',
- '蝪=tāng',
- '蝫=zhū',
- '蝬=zōng',
- '蝭=dì',
- '蝮=fù',
- '蝯=yuán',
- '蝰=kuí',
- '蝱=méng',
- '蝲=là',
- '蝳=dài',
- '蝴=hú',
- '蝵=qiū',
- '蝶=dié',
- '蝷=lì',
- '蝸=wō',
- '蝹=yūn',
- '蝺=qǔ',
- '蝻=nǎn',
- '蝼=lóu',
- '蝽=chūn',
- '蝾=róng',
- '蝿=yíng',
- '螀=jiāng',
- '螁=tuì',
- '螂=láng',
- '螃=páng',
- '螄=sī',
- '螅=xī',
- '螆=cì',
- '螇=xī,qī',
- '螈=yuán',
- '螉=wēng',
- '螊=lián',
- '螋=sōu',
- '螌=bān',
- '融=róng',
- '螎=róng',
- '螏=jí',
- '螐=wū',
- '螑=xiù',
- '螒=hàn',
- '螓=qín',
- '螔=yí',
- '螕=bī,pí',
- '螖=huá',
- '螗=táng',
- '螘=yǐ',
- '螙=dù',
- '螚=nài,něng',
- '螛=hé,xiá',
- '螜=hú',
- '螝=guì,huǐ',
- '螞=mǎ,mā,mà',
- '螟=míng',
- '螠=yì',
- '螡=wén',
- '螢=yíng',
- '螣=téng',
- '螤=zhōng',
- '螥=cāng',
- '螦=sāo',
- '螧=qí',
- '螨=mǎn',
- '螩=dāo',
- '螪=shāng',
- '螫=shì,zhē',
- '螬=cáo',
- '螭=chī',
- '螮=dì',
- '螯=áo',
- '螰=lù',
- '螱=wèi',
- '螲=dié,zhì',
- '螳=táng',
- '螴=chén',
- '螵=piāo',
- '螶=qú,jù',
- '螷=pí',
- '螸=yú',
- '螹=chán,jiàn',
- '螺=luó',
- '螻=lóu',
- '螼=qǐn',
- '螽=zhōng',
- '螾=yǐn',
- '螿=jiāng',
- '蟀=shuài',
- '蟁=wén',
- '蟂=xiāo',
- '蟃=wàn',
- '蟄=zhé',
- '蟅=zhè',
- '蟆=má,mò',
- '蟇=má',
- '蟈=guō',
- '蟉=liú',
- '蟊=máo',
- '蟋=xī',
- '蟌=cōng',
- '蟍=lí',
- '蟎=mǎn',
- '蟏=xiāo',
- '蟐=chán',
- '蟑=zhāng',
- '蟒=mǎng,měng',
- '蟓=xiàng',
- '蟔=mò',
- '蟕=zuī',
- '蟖=sī',
- '蟗=qiū',
- '蟘=tè',
- '蟙=zhí',
- '蟚=péng',
- '蟛=péng',
- '蟜=jiǎo',
- '蟝=qú',
- '蟞=biē,bié',
- '蟟=liáo',
- '蟠=pán',
- '蟡=guǐ',
- '蟢=xǐ',
- '蟣=jǐ',
- '蟤=zhuān',
- '蟥=huáng',
- '蟦=fèi,bēn',
- '蟧=láo,liáo',
- '蟨=jué',
- '蟩=jué',
- '蟪=huì',
- '蟫=yín,xún',
- '蟬=chán',
- '蟭=jiāo',
- '蟮=shàn',
- '蟯=náo',
- '蟰=xiāo',
- '蟱=wú',
- '蟲=chóng',
- '蟳=xún',
- '蟴=sī',
- '蟵=chú',
- '蟶=chēng',
- '蟷=dāng',
- '蟸=lí',
- '蟹=xiè',
- '蟺=shàn',
- '蟻=yǐ',
- '蟼=jǐng',
- '蟽=dá',
- '蟾=chán',
- '蟿=qì',
- '蠀=cī',
- '蠁=xiǎng',
- '蠂=shè',
- '蠃=luǒ',
- '蠄=qín',
- '蠅=yíng',
- '蠆=chài',
- '蠇=lì',
- '蠈=zéi',
- '蠉=xuān',
- '蠊=lián',
- '蠋=zhú',
- '蠌=zé',
- '蠍=xiē',
- '蠎=mǎng',
- '蠏=xiè',
- '蠐=qí',
- '蠑=róng',
- '蠒=jiǎn',
- '蠓=měng',
- '蠔=háo',
- '蠕=rú',
- '蠖=huò',
- '蠗=zhuó',
- '蠘=jié',
- '蠙=pín',
- '蠚=hē',
- '蠛=miè',
- '蠜=fán',
- '蠝=lěi',
- '蠞=jié',
- '蠟=là',
- '蠠=mǐn',
- '蠡=lǐ',
- '蠢=chǔn',
- '蠣=lì',
- '蠤=qiū',
- '蠥=niè',
- '蠦=lú',
- '蠧=dù',
- '蠨=xiāo',
- '蠩=zhū',
- '蠪=lóng',
- '蠫=lí',
- '蠬=lóng',
- '蠭=fēng',
- '蠮=yē',
- '蠯=pí',
- '蠰=náng',
- '蠱=gǔ',
- '蠲=juān',
- '蠳=yīng',
- '蠴=shǔ',
- '蠵=xī',
- '蠶=cán',
- '蠷=qú',
- '蠸=quán',
- '蠹=dù',
- '蠺=cán',
- '蠻=mán',
- '蠼=qú',
- '蠽=jié',
- '蠾=zhú',
- '蠿=zhuó',
- '血=xiě,xuè',
- '衁=huāng',
- '衂=nǜ',
- '衃=pēi',
- '衄=nǜ',
- '衅=xìn',
- '衆=zhòng',
- '衇=mài',
- '衈=ěr',
- '衉=kè',
- '衊=miè',
- '衋=xì',
- '行=xíng,háng',
- '衍=yǎn',
- '衎=kàn',
- '衏=yuàn',
- '衐=qú',
- '衑=líng',
- '衒=xuàn',
- '術=shù',
- '衔=xián',
- '衕=tòng',
- '衖=xiàng',
- '街=jiē',
- '衘=xián',
- '衙=yá',
- '衚=hú',
- '衛=wèi',
- '衜=dào',
- '衝=chōng',
- '衞=wèi',
- '衟=dào',
- '衠=zhūn',
- '衡=héng',
- '衢=qú',
- '衣=yī',
- '衤=yī',
- '补=bǔ',
- '衦=gǎn',
- '衧=yú',
- '表=biǎo',
- '衩=chà',
- '衪=yì',
- '衫=shān',
- '衬=chèn',
- '衭=fū',
- '衮=gǔn',
- '衯=fēn',
- '衰=shuāi,cuī',
- '衱=jié',
- '衲=nà',
- '衳=zhōng',
- '衴=dǎn',
- '衵=rì',
- '衶=zhòng',
- '衷=zhōng',
- '衸=jiè',
- '衹=zhǐ',
- '衺=xié',
- '衻=rán',
- '衼=zhī',
- '衽=rèn',
- '衾=qīn',
- '衿=jīn',
- '袀=jūn',
- '袁=yuán',
- '袂=mèi',
- '袃=chài',
- '袄=ǎo',
- '袅=niǎo',
- '袆=huī',
- '袇=rán',
- '袈=jiā',
- '袉=tuó,tuō',
- '袊=lǐng,líng',
- '袋=dài',
- '袌=bào,páo,pào',
- '袍=páo',
- '袎=yào',
- '袏=zuò',
- '袐=bì',
- '袑=shào',
- '袒=tǎn',
- '袓=jù,jiē',
- '袔=hè,kè',
- '袕=xué',
- '袖=xiù',
- '袗=zhěn',
- '袘=yí,yì',
- '袙=pà',
- '袚=fú',
- '袛=dī',
- '袜=wà',
- '袝=fù',
- '袞=gǔn',
- '袟=zhì',
- '袠=zhì',
- '袡=rán',
- '袢=pàn',
- '袣=yì',
- '袤=mào',
- '袥=tuō',
- '袦=nà,jué',
- '袧=gōu',
- '袨=xuàn',
- '袩=zhé',
- '袪=qū',
- '被=bèi,pī',
- '袬=yù',
- '袭=xí',
- '袮=mí',
- '袯=bó',
- '袰=bō',
- '袱=fú',
- '袲=chǐ,nuǒ',
- '袳=chǐ,qǐ,duǒ,nuǒ',
- '袴=kù',
- '袵=rèn',
- '袶=péng',
- '袷=jiá,jié,qiā',
- '袸=jiàn,zùn',
- '袹=bó,mò',
- '袺=jié',
- '袻=ér',
- '袼=gē',
- '袽=rú',
- '袾=zhū',
- '袿=guī,guà',
- '裀=yīn',
- '裁=cái',
- '裂=liè,liě',
- '裃=kǎ',
- '裄=háng',
- '装=zhuāng',
- '裆=dāng',
- '裇=xū',
- '裈=kūn',
- '裉=kèn',
- '裊=niǎo',
- '裋=shù',
- '裌=jiá',
- '裍=kǔn',
- '裎=chéng,chěng',
- '裏=lǐ',
- '裐=juān',
- '裑=shēn',
- '裒=póu',
- '裓=gé,jiē',
- '裔=yì',
- '裕=yù',
- '裖=zhěn',
- '裗=liú',
- '裘=qiú',
- '裙=qún',
- '裚=jì',
- '裛=yì',
- '補=bǔ',
- '裝=zhuāng',
- '裞=shuì',
- '裟=shā',
- '裠=qún',
- '裡=lǐ',
- '裢=lián',
- '裣=liǎn',
- '裤=kù',
- '裥=jiǎn',
- '裦=bāo',
- '裧=chān',
- '裨=pí,bì',
- '裩=kūn',
- '裪=táo',
- '裫=yuàn',
- '裬=líng',
- '裭=chǐ',
- '裮=chāng',
- '裯=chóu,dāo',
- '裰=duō',
- '裱=biǎo',
- '裲=liǎng',
- '裳=cháng,shang',
- '裴=péi',
- '裵=péi',
- '裶=fēi',
- '裷=yuān,gǔn',
- '裸=luǒ',
- '裹=guǒ',
- '裺=yǎn,ān',
- '裻=dú',
- '裼=xī,tì',
- '製=zhì',
- '裾=jū',
- '裿=yǐ',
- '褀=qí',
- '褁=guǒ',
- '褂=guà',
- '褃=kèn',
- '褄=qī',
- '褅=tì',
- '褆=tí',
- '複=fù',
- '褈=chóng',
- '褉=xiè',
- '褊=biǎn',
- '褋=dié',
- '褌=kūn',
- '褍=duān',
- '褎=xiù',
- '褏=xiù',
- '褐=hè',
- '褑=yuàn',
- '褒=bāo',
- '褓=bǎo',
- '褔=fù,fú',
- '褕=yú',
- '褖=tuàn',
- '褗=yǎn',
- '褘=huī',
- '褙=bèi',
- '褚=zhǔ,chǔ',
- '褛=lǚ',
- '褜=páo',
- '褝=dān',
- '褞=yùn',
- '褟=tā',
- '褠=gōu',
- '褡=dā',
- '褢=huái',
- '褣=róng',
- '褤=yuán',
- '褥=rù',
- '褦=nài',
- '褧=jiǒng',
- '褨=suǒ',
- '褩=bān',
- '褪=tuì,tùn',
- '褫=chǐ',
- '褬=sǎng',
- '褭=niǎo',
- '褮=yīng',
- '褯=jiè',
- '褰=qiān',
- '褱=huái',
- '褲=kù',
- '褳=lián',
- '褴=lán',
- '褵=lí',
- '褶=zhě',
- '褷=shī',
- '褸=lǚ',
- '褹=yì',
- '褺=diē',
- '褻=xiè',
- '褼=xiān',
- '褽=wèi',
- '褾=biǎo',
- '褿=cáo',
- '襀=jì',
- '襁=qiǎng',
- '襂=sēn',
- '襃=bāo',
- '襄=xiāng',
- '襅=bì',
- '襆=fú',
- '襇=jiǎn',
- '襈=zhuàn',
- '襉=jiǎn',
- '襊=cuì',
- '襋=jí',
- '襌=dān',
- '襍=zá',
- '襎=fán',
- '襏=bó',
- '襐=xiàng',
- '襑=xín',
- '襒=bié',
- '襓=ráo',
- '襔=mǎn',
- '襕=lán',
- '襖=ǎo',
- '襗=zé',
- '襘=guì',
- '襙=cào',
- '襚=suì',
- '襛=nóng',
- '襜=chān',
- '襝=liǎn',
- '襞=bì',
- '襟=jīn',
- '襠=dāng',
- '襡=shǔ',
- '襢=tǎn',
- '襣=bì',
- '襤=lán',
- '襥=fú',
- '襦=rú',
- '襧=zhǐ',
- '襨=null',
- '襩=shǔ',
- '襪=wà',
- '襫=shì',
- '襬=bǎi',
- '襭=xié',
- '襮=bó',
- '襯=chèn',
- '襰=lǎi',
- '襱=lóng',
- '襲=xí',
- '襳=xiān',
- '襴=lán',
- '襵=zhě',
- '襶=dài',
- '襷=jǔ',
- '襸=zàn',
- '襹=shī',
- '襺=jiǎn',
- '襻=pàn',
- '襼=yì',
- '襽=lán',
- '襾=yà',
- '西=xī',
- '覀=yà',
- '要=yào,yāo',
- '覂=fěng',
- '覃=tán,qín',
- '覄=fù',
- '覅=fiào',
- '覆=fù',
- '覇=bà',
- '覈=hé',
- '覉=jī',
- '覊=jī',
- '見=jiàn,xiàn',
- '覌=guān,guàn',
- '覍=biàn',
- '覎=yàn',
- '規=guī',
- '覐=jué,jiào',
- '覑=piǎn',
- '覒=mào',
- '覓=mì',
- '覔=mì',
- '覕=piē,miè',
- '視=shì',
- '覗=sì',
- '覘=chān',
- '覙=zhěn',
- '覚=jué,jiào',
- '覛=mì',
- '覜=tiào',
- '覝=lián',
- '覞=yào',
- '覟=zhì',
- '覠=jūn',
- '覡=xī',
- '覢=shǎn',
- '覣=wēi',
- '覤=xì',
- '覥=tiǎn',
- '覦=yú',
- '覧=lǎn',
- '覨=è',
- '覩=dǔ',
- '親=qīn,qìng',
- '覫=pǎng',
- '覬=jì',
- '覭=míng',
- '覮=yíng,yǐng',
- '覯=gòu',
- '覰=qū,qù',
- '覱=zhàn,zhān',
- '覲=jìn',
- '観=guān,guàn',
- '覴=dèng',
- '覵=jiàn,biǎn',
- '覶=luó,luǎn',
- '覷=qù,qū',
- '覸=jiàn',
- '覹=wéi',
- '覺=jué,jiào',
- '覻=qù,qū',
- '覼=luó',
- '覽=lǎn',
- '覾=shěn',
- '覿=dí',
- '觀=guān,guàn',
- '见=jiàn,xiàn',
- '观=guān,guàn',
- '觃=yàn',
- '规=guī',
- '觅=mì',
- '视=shì',
- '觇=chān',
- '览=lǎn',
- '觉=jué,jiào',
- '觊=jì',
- '觋=xí',
- '觌=dí',
- '觍=tiǎn',
- '觎=yú',
- '觏=gòu',
- '觐=jìn',
- '觑=qù,qū',
- '角=jiǎo,jué',
- '觓=qiú',
- '觔=jīn',
- '觕=cū',
- '觖=jué',
- '觗=zhì',
- '觘=chào',
- '觙=jí',
- '觚=gū',
- '觛=dàn',
- '觜=zī,zuǐ',
- '觝=dǐ',
- '觞=shāng',
- '觟=huà,xiè',
- '觠=quán',
- '觡=gé',
- '觢=shì',
- '解=jiě,jiè,xiè',
- '觤=guǐ',
- '觥=gōng',
- '触=chù',
- '觧=jiě,jiè,xiè',
- '觨=hùn',
- '觩=qiú',
- '觪=xīng',
- '觫=sù',
- '觬=ní',
- '觭=jī,qí',
- '觮=jué',
- '觯=zhì',
- '觰=zhā',
- '觱=bì',
- '觲=xīng',
- '觳=hú',
- '觴=shāng',
- '觵=gōng',
- '觶=zhì',
- '觷=xué,hù',
- '觸=chù',
- '觹=xī',
- '觺=yí',
- '觻=lì,lù',
- '觼=jué',
- '觽=xī',
- '觾=yàn',
- '觿=xī',
- '言=yán',
- '訁=yán',
- '訂=dìng',
- '訃=fù',
- '訄=qiú',
- '訅=qiú',
- '訆=jiào',
- '訇=hōng',
- '計=jì',
- '訉=fàn',
- '訊=xùn',
- '訋=diào',
- '訌=hòng',
- '訍=chài',
- '討=tǎo',
- '訏=xū',
- '訐=jié',
- '訑=dàn',
- '訒=rèn',
- '訓=xùn',
- '訔=yín',
- '訕=shàn',
- '訖=qì',
- '託=tuō',
- '記=jì',
- '訙=xùn',
- '訚=yín',
- '訛=é',
- '訜=fēn',
- '訝=yà',
- '訞=yāo',
- '訟=sòng',
- '訠=shěn',
- '訡=yín',
- '訢=xīn',
- '訣=jué',
- '訤=xiáo',
- '訥=nè',
- '訦=chén',
- '訧=yóu',
- '訨=zhǐ',
- '訩=xiōng',
- '訪=fǎng',
- '訫=xìn',
- '訬=chāo',
- '設=shè',
- '訮=yán',
- '訯=sǎ',
- '訰=zhùn',
- '許=xū',
- '訲=yì',
- '訳=yì',
- '訴=sù',
- '訵=chī',
- '訶=hē',
- '訷=shēn',
- '訸=hé',
- '訹=xù',
- '診=zhěn',
- '註=zhù',
- '証=zhèng',
- '訽=gòu',
- '訾=zī',
- '訿=zǐ',
- '詀=zhān',
- '詁=gǔ',
- '詂=fù',
- '詃=jiǎn',
- '詄=dié',
- '詅=líng',
- '詆=dǐ',
- '詇=yàng',
- '詈=lì',
- '詉=náo',
- '詊=pàn',
- '詋=zhòu',
- '詌=gàn',
- '詍=yì',
- '詎=jù',
- '詏=yào',
- '詐=zhà',
- '詑=tuó',
- '詒=yí,dài',
- '詓=qǔ',
- '詔=zhào',
- '評=píng',
- '詖=bì',
- '詗=xiòng',
- '詘=qū',
- '詙=bá',
- '詚=dá',
- '詛=zǔ',
- '詜=tāo',
- '詝=zhǔ',
- '詞=cí',
- '詟=zhé',
- '詠=yǒng',
- '詡=xǔ',
- '詢=xún',
- '詣=yì',
- '詤=huǎng',
- '詥=hé',
- '試=shì',
- '詧=chá',
- '詨=xiào',
- '詩=shī',
- '詪=hěn',
- '詫=chà',
- '詬=gòu',
- '詭=guǐ',
- '詮=quán',
- '詯=huì',
- '詰=jié',
- '話=huà',
- '該=gāi',
- '詳=xiáng',
- '詴=wēi',
- '詵=shēn',
- '詶=chóu',
- '詷=tóng',
- '詸=mí',
- '詹=zhān',
- '詺=míng',
- '詻=luò',
- '詼=huī',
- '詽=yán',
- '詾=xiōng',
- '詿=guà',
- '誀=èr',
- '誁=bìng',
- '誂=tiǎo,diào',
- '誃=yí,chǐ,chì',
- '誄=lěi',
- '誅=zhū',
- '誆=kuāng',
- '誇=kuā,kuà',
- '誈=wū',
- '誉=yù',
- '誊=téng',
- '誋=jì',
- '誌=zhì',
- '認=rèn',
- '誎=cù',
- '誏=lǎng,làng',
- '誐=é',
- '誑=kuáng',
- '誒=ēi,éi,ěi,èi,xī',
- '誓=shì',
- '誔=tǐng',
- '誕=dàn',
- '誖=bèi,bó',
- '誗=chán',
- '誘=yòu',
- '誙=kēng',
- '誚=qiào',
- '誛=qīn',
- '誜=shuà',
- '誝=ān',
- '語=yǔ,yù',
- '誟=xiào',
- '誠=chéng',
- '誡=jiè',
- '誢=xiàn',
- '誣=wū',
- '誤=wù',
- '誥=gào',
- '誦=sòng',
- '誧=bū',
- '誨=huì',
- '誩=jìng',
- '說=shuō,shuì,yuè',
- '誫=zhèn',
- '説=shuō,shuì,yuè',
- '読=dú',
- '誮=huā',
- '誯=chàng',
- '誰=shuí,shéi',
- '誱=jié',
- '課=kè',
- '誳=qū,juè',
- '誴=cóng',
- '誵=xiáo',
- '誶=suì',
- '誷=wǎng',
- '誸=xián',
- '誹=fěi',
- '誺=chī,lài',
- '誻=tà',
- '誼=yì',
- '誽=nì,ná',
- '誾=yín',
- '調=diào,tiáo',
- '諀=pǐ,bēi',
- '諁=zhuó',
- '諂=chǎn',
- '諃=chēn',
- '諄=zhūn',
- '諅=jì,jī',
- '諆=qī',
- '談=tán',
- '諈=zhuì',
- '諉=wěi',
- '諊=jū',
- '請=qǐng',
- '諌=dǒng',
- '諍=zhèng',
- '諎=zé,zuò,zhǎ,cuò',
- '諏=zōu',
- '諐=qiān',
- '諑=zhuó',
- '諒=liàng',
- '諓=jiàn',
- '諔=chù,jí',
- '諕=xià,háo',
- '論=lùn,lún',
- '諗=shěn',
- '諘=biǎo',
- '諙=huà',
- '諚=biàn',
- '諛=yú',
- '諜=dié',
- '諝=xū',
- '諞=piǎn',
- '諟=shì,dì',
- '諠=xuān',
- '諡=shì',
- '諢=hùn',
- '諣=huà,guā',
- '諤=è',
- '諥=zhòng',
- '諦=dì',
- '諧=xié',
- '諨=fú',
- '諩=pǔ',
- '諪=tíng',
- '諫=jiàn',
- '諬=qǐ',
- '諭=yù',
- '諮=zī',
- '諯=zhuān',
- '諰=xǐ,shāi,āi',
- '諱=huì',
- '諲=yīn',
- '諳=ān',
- '諴=xián',
- '諵=nán,nàn',
- '諶=chén',
- '諷=fěng',
- '諸=zhū',
- '諹=yáng',
- '諺=yàn',
- '諻=huáng',
- '諼=xuān',
- '諽=gé',
- '諾=nuò',
- '諿=xǔ',
- '謀=móu',
- '謁=yè',
- '謂=wèi',
- '謃=xīng',
- '謄=téng',
- '謅=zhōu',
- '謆=shàn',
- '謇=jiǎn',
- '謈=bó',
- '謉=kuì',
- '謊=huǎng',
- '謋=huò',
- '謌=gē',
- '謍=yíng',
- '謎=mí',
- '謏=xiǎo',
- '謐=mì',
- '謑=xǐ',
- '謒=qiāng',
- '謓=chēn',
- '謔=xuè',
- '謕=tí',
- '謖=sù',
- '謗=bàng',
- '謘=chí',
- '謙=qiān',
- '謚=shì',
- '講=jiǎng',
- '謜=yuán',
- '謝=xiè',
- '謞=hè',
- '謟=tāo',
- '謠=yáo',
- '謡=yáo',
- '謢=lū',
- '謣=yú',
- '謤=biāo',
- '謥=còng',
- '謦=qǐng',
- '謧=lí',
- '謨=mó',
- '謩=mó',
- '謪=shāng',
- '謫=zhé',
- '謬=miù',
- '謭=jiǎn',
- '謮=zé',
- '謯=jiē',
- '謰=lián',
- '謱=lóu',
- '謲=càn',
- '謳=ōu',
- '謴=gùn',
- '謵=xí',
- '謶=zhuó',
- '謷=áo',
- '謸=áo',
- '謹=jǐn',
- '謺=zhé',
- '謻=yí',
- '謼=hū',
- '謽=jiàng',
- '謾=mán',
- '謿=cháo',
- '譀=hàn',
- '譁=huá',
- '譂=chǎn',
- '譃=xū',
- '譄=zēng',
- '譅=sè',
- '譆=xī',
- '譇=zhā',
- '譈=duì',
- '證=zhèng',
- '譊=náo',
- '譋=lán',
- '譌=é',
- '譍=yīng',
- '譎=jué',
- '譏=jī',
- '譐=zǔn',
- '譑=jiǎo',
- '譒=bò',
- '譓=huì',
- '譔=zhuàn',
- '譕=wú',
- '譖=zèn',
- '譗=zhá',
- '識=shí',
- '譙=qiáo',
- '譚=tán',
- '譛=jiàn',
- '譜=pǔ',
- '譝=shéng',
- '譞=xuān',
- '譟=zào',
- '譠=tán',
- '譡=dǎng',
- '譢=suì',
- '譣=xiǎn',
- '譤=jī',
- '譥=jiào',
- '警=jǐng',
- '譧=zhàn',
- '譨=nóng',
- '譩=yī',
- '譪=ǎi',
- '譫=zhān',
- '譬=pì',
- '譭=huǐ',
- '譮=huà',
- '譯=yì',
- '議=yì',
- '譱=shàn',
- '譲=ràng',
- '譳=ròu',
- '譴=qiǎn',
- '譵=duì',
- '譶=tà',
- '護=hù',
- '譸=zhōu',
- '譹=háo',
- '譺=ài',
- '譻=yīng',
- '譼=jiān',
- '譽=yù',
- '譾=jiǎn',
- '譿=huì',
- '讀=dú',
- '讁=zhé',
- '讂=juàn,xuān',
- '讃=zàn',
- '讄=lěi',
- '讅=shěn',
- '讆=wèi',
- '讇=chǎn',
- '讈=lì',
- '讉=yí,tuī',
- '變=biàn',
- '讋=zhé',
- '讌=yàn',
- '讍=è',
- '讎=chóu',
- '讏=wèi',
- '讐=chóu',
- '讑=yào',
- '讒=chán',
- '讓=ràng',
- '讔=yǐn',
- '讕=lán',
- '讖=chèn',
- '讗=xié',
- '讘=niè',
- '讙=huān',
- '讚=zàn',
- '讛=yì',
- '讜=dǎng',
- '讝=zhán',
- '讞=yàn',
- '讟=dú',
- '讠=yán',
- '计=jì',
- '订=dìng',
- '讣=fù',
- '认=rèn',
- '讥=jī',
- '讦=jié',
- '讧=hòng',
- '讨=tǎo',
- '让=ràng',
- '讪=shàn',
- '讫=qì',
- '讬=tuō',
- '训=xùn',
- '议=yì',
- '讯=xùn',
- '记=jì',
- '讱=rèn',
- '讲=jiǎng',
- '讳=huì',
- '讴=ōu',
- '讵=jù',
- '讶=yà',
- '讷=nè',
- '许=xǔ,hǔ',
- '讹=é',
- '论=lùn,lún',
- '讻=xiōng',
- '讼=sòng',
- '讽=fěng',
- '设=shè',
- '访=fǎng',
- '诀=jué',
- '证=zhèng',
- '诂=gǔ',
- '诃=hē',
- '评=píng',
- '诅=zǔ',
- '识=shí,zhì',
- '诇=xiòng',
- '诈=zhà',
- '诉=sù',
- '诊=zhěn',
- '诋=dǐ',
- '诌=zhōu',
- '词=cí',
- '诎=qū',
- '诏=zhào',
- '诐=bì',
- '译=yì',
- '诒=yí,dài',
- '诓=kuāng',
- '诔=lěi',
- '试=shì',
- '诖=guà',
- '诗=shī',
- '诘=jié,jí',
- '诙=huī',
- '诚=chéng',
- '诛=zhū',
- '诜=shēn',
- '话=huà',
- '诞=dàn',
- '诟=gòu',
- '诠=quán',
- '诡=guǐ',
- '询=xún',
- '诣=yì',
- '诤=zhèng',
- '该=gāi',
- '详=xiáng,yáng',
- '诧=chà',
- '诨=hùn',
- '诩=xǔ',
- '诪=zhōu,chóu',
- '诫=jiè',
- '诬=wū',
- '语=yǔ,yù',
- '诮=qiào',
- '误=wù',
- '诰=gào',
- '诱=yòu',
- '诲=huì',
- '诳=kuáng',
- '说=shuō,shuì,yuè',
- '诵=sòng',
- '诶=ēi,éi,ěi,èi,xī',
- '请=qǐng',
- '诸=zhū',
- '诹=zōu',
- '诺=nuò',
- '读=dú,dòu',
- '诼=zhuó',
- '诽=fěi',
- '课=kè',
- '诿=wěi',
- '谀=yú',
- '谁=shuí',
- '谂=shěn',
- '调=tiáo,diào,zhōu',
- '谄=chǎn',
- '谅=liàng',
- '谆=zhūn',
- '谇=suì',
- '谈=tán',
- '谉=shěn',
- '谊=yì',
- '谋=móu',
- '谌=chén,shèn',
- '谍=dié',
- '谎=huǎng',
- '谏=jiàn',
- '谐=xié',
- '谑=xuè',
- '谒=yè',
- '谓=wèi',
- '谔=è',
- '谕=yù',
- '谖=xuān',
- '谗=chán',
- '谘=zī',
- '谙=ān',
- '谚=yàn',
- '谛=dì',
- '谜=mí',
- '谝=piǎn',
- '谞=xū',
- '谟=mó',
- '谠=dǎng',
- '谡=sù',
- '谢=xiè',
- '谣=yáo',
- '谤=bàng',
- '谥=shì',
- '谦=qiān',
- '谧=mì',
- '谨=jǐn',
- '谩=mán',
- '谪=zhé',
- '谫=jiǎn',
- '谬=miù',
- '谭=tán',
- '谮=zèn',
- '谯=qiáo',
- '谰=lán',
- '谱=pǔ',
- '谲=jué',
- '谳=yàn',
- '谴=qiǎn',
- '谵=zhān',
- '谶=chèn',
- '谷=gǔ',
- '谸=qiān',
- '谹=hóng',
- '谺=xiā',
- '谻=jí',
- '谼=hóng',
- '谽=hān',
- '谾=hōng',
- '谿=xī',
- '豀=xī',
- '豁=huō,huò,huá',
- '豂=liáo',
- '豃=hǎn',
- '豄=dú',
- '豅=lóng',
- '豆=dòu',
- '豇=jiāng',
- '豈=qǐ,kǎi',
- '豉=chǐ',
- '豊=lǐ',
- '豋=dēng',
- '豌=wān',
- '豍=bī',
- '豎=shù',
- '豏=xiàn',
- '豐=fēng',
- '豑=zhì',
- '豒=zhì',
- '豓=yàn',
- '豔=yàn',
- '豕=shǐ',
- '豖=chù',
- '豗=huī',
- '豘=tún',
- '豙=yì',
- '豚=tún',
- '豛=yì',
- '豜=jiān',
- '豝=bā',
- '豞=hòu',
- '豟=è',
- '豠=chú',
- '象=xiàng',
- '豢=huàn',
- '豣=jiān,yàn',
- '豤=kěn',
- '豥=gāi',
- '豦=jù',
- '豧=fú',
- '豨=xī',
- '豩=bīn',
- '豪=háo',
- '豫=yù',
- '豬=zhū',
- '豭=jiā',
- '豮=fén',
- '豯=xī',
- '豰=hù',
- '豱=wēn',
- '豲=huán',
- '豳=bīn',
- '豴=dí',
- '豵=zōng',
- '豶=fén',
- '豷=yì',
- '豸=zhì',
- '豹=bào',
- '豺=chái',
- '豻=àn',
- '豼=pí',
- '豽=nà',
- '豾=pī',
- '豿=gǒu',
- '貀=nà',
- '貁=yòu',
- '貂=diāo',
- '貃=mò',
- '貄=sì',
- '貅=xiū',
- '貆=huán,huān',
- '貇=kěn,kūn',
- '貈=hé,mò',
- '貉=hé,háo,mò',
- '貊=mò',
- '貋=àn',
- '貌=mào',
- '貍=lí',
- '貎=ní',
- '貏=bǐ',
- '貐=yǔ',
- '貑=jiā',
- '貒=tuān,tuàn',
- '貓=māo,máo',
- '貔=pí',
- '貕=xī',
- '貖=yì',
- '貗=jù,lóu',
- '貘=mò',
- '貙=chū',
- '貚=tán',
- '貛=huān',
- '貜=jué',
- '貝=bèi',
- '貞=zhēn',
- '貟=yuán,yún,yùn',
- '負=fù',
- '財=cái',
- '貢=gòng',
- '貣=dài',
- '貤=yì,yí',
- '貥=háng',
- '貦=wán',
- '貧=pín',
- '貨=huò',
- '販=fàn',
- '貪=tān',
- '貫=guàn',
- '責=zé,zhài',
- '貭=zhì',
- '貮=èr',
- '貯=zhù',
- '貰=shì',
- '貱=bì',
- '貲=zī',
- '貳=èr',
- '貴=guì',
- '貵=piǎn',
- '貶=biǎn',
- '買=mǎi',
- '貸=dài',
- '貹=shèng',
- '貺=kuàng',
- '費=fèi',
- '貼=tiē',
- '貽=yí',
- '貾=chí',
- '貿=mào',
- '賀=hè',
- '賁=bì,bēn',
- '賂=lù',
- '賃=lìn',
- '賄=huì',
- '賅=gāi',
- '賆=pián',
- '資=zī',
- '賈=jiǎ,gǔ,jià',
- '賉=xù',
- '賊=zéi',
- '賋=jiǎo',
- '賌=gāi',
- '賍=zāng',
- '賎=jiàn',
- '賏=yīng',
- '賐=jùn',
- '賑=zhèn',
- '賒=shē',
- '賓=bīn',
- '賔=bīn',
- '賕=qiú',
- '賖=shē',
- '賗=chuàn',
- '賘=zāng',
- '賙=zhōu',
- '賚=lài',
- '賛=zàn',
- '賜=cì',
- '賝=chēn',
- '賞=shǎng',
- '賟=tiǎn',
- '賠=péi',
- '賡=gēng',
- '賢=xián',
- '賣=mài',
- '賤=jiàn',
- '賥=suì',
- '賦=fù',
- '賧=dǎn',
- '賨=cóng',
- '賩=cóng',
- '質=zhì',
- '賫=jī',
- '賬=zhàng',
- '賭=dǔ',
- '賮=jìn',
- '賯=xiōng,mín',
- '賰=chǔn',
- '賱=yǔn',
- '賲=bǎo',
- '賳=zāi',
- '賴=lài',
- '賵=fèng',
- '賶=càng',
- '賷=jī',
- '賸=shèng',
- '賹=ài',
- '賺=zhuàn,zuàn',
- '賻=fù',
- '購=gòu',
- '賽=sài',
- '賾=zé',
- '賿=liáo',
- '贀=yì',
- '贁=bài',
- '贂=chěn',
- '贃=wàn,zhuàn',
- '贄=zhì',
- '贅=zhuì',
- '贆=biāo',
- '贇=yūn',
- '贈=zèng',
- '贉=dàn',
- '贊=zàn',
- '贋=yàn',
- '贌=pú',
- '贍=shàn',
- '贎=wàn',
- '贏=yíng',
- '贐=jìn',
- '贑=gàn',
- '贒=xián',
- '贓=zāng',
- '贔=bì',
- '贕=dú',
- '贖=shú',
- '贗=yàn',
- '贘=shǎng',
- '贙=xuàn',
- '贚=lòng',
- '贛=gàn',
- '贜=zāng',
- '贝=bèi',
- '贞=zhēn',
- '负=fù',
- '贠=yuán,yùn',
- '贡=gòng',
- '财=cái',
- '责=zé,zhài',
- '贤=xián',
- '败=bài',
- '账=zhàng',
- '货=huò',
- '质=zhì',
- '贩=fàn',
- '贪=tān',
- '贫=pín',
- '贬=biǎn',
- '购=gòu',
- '贮=zhù',
- '贯=guàn',
- '贰=èr',
- '贱=jiàn',
- '贲=bì,bēn',
- '贳=shì',
- '贴=tiē',
- '贵=guì',
- '贶=kuàng',
- '贷=dài',
- '贸=mào',
- '费=fèi',
- '贺=hè',
- '贻=yí',
- '贼=zéi',
- '贽=zhì',
- '贾=jiǎ,gǔ',
- '贿=huì',
- '赀=zī',
- '赁=lìn',
- '赂=lù',
- '赃=zāng',
- '资=zī',
- '赅=gāi',
- '赆=jìn',
- '赇=qiú',
- '赈=zhèn',
- '赉=lài',
- '赊=shē',
- '赋=fù',
- '赌=dǔ',
- '赍=jī',
- '赎=shú',
- '赏=shǎng',
- '赐=cì',
- '赑=bì',
- '赒=zhōu',
- '赓=gēng',
- '赔=péi',
- '赕=dǎn',
- '赖=lài',
- '赗=fèng',
- '赘=zhuì',
- '赙=fù',
- '赚=zhuàn',
- '赛=sài',
- '赜=zé',
- '赝=yàn',
- '赞=zàn',
- '赟=yūn',
- '赠=zèng',
- '赡=shàn',
- '赢=yíng',
- '赣=gàn',
- '赤=chì',
- '赥=xī',
- '赦=shè',
- '赧=nǎn',
- '赨=tóng',
- '赩=xì',
- '赪=chēng',
- '赫=hè',
- '赬=chēng',
- '赭=zhě',
- '赮=xiá',
- '赯=táng',
- '走=zǒu',
- '赱=zǒu',
- '赲=lì',
- '赳=jiū',
- '赴=fù',
- '赵=zhào',
- '赶=gǎn',
- '起=qǐ',
- '赸=shàn',
- '赹=qióng',
- '赺=yǐn',
- '赻=xiǎn',
- '赼=zī',
- '赽=jué',
- '赾=qǐn',
- '赿=chí',
- '趀=cī',
- '趁=chèn',
- '趂=chèn',
- '趃=dié,tú',
- '趄=qiè,jū',
- '超=chāo',
- '趆=dī',
- '趇=xì',
- '趈=zhān',
- '趉=jué',
- '越=yuè',
- '趋=qū,cù',
- '趌=jí,jié',
- '趍=qū',
- '趎=chú',
- '趏=guā,huó',
- '趐=xuè',
- '趑=zī',
- '趒=tiào',
- '趓=duǒ',
- '趔=liè',
- '趕=gǎn',
- '趖=suō',
- '趗=cù',
- '趘=xí',
- '趙=zhào',
- '趚=sù',
- '趛=yǐn',
- '趜=jú',
- '趝=jiàn',
- '趞=què,qì,jí',
- '趟=tàng,tāng',
- '趠=chuō,zhuó',
- '趡=cuǐ',
- '趢=lù',
- '趣=qù,cù',
- '趤=dàng',
- '趥=qiū',
- '趦=zī',
- '趧=tí',
- '趨=qū,cù',
- '趩=chì',
- '趪=huáng',
- '趫=qiáo',
- '趬=qiāo',
- '趭=jiào',
- '趮=zào',
- '趯=tì,yuè',
- '趰=ěr',
- '趱=zǎn',
- '趲=zǎn',
- '足=zú',
- '趴=pā',
- '趵=bào,bō',
- '趶=kuà,wù',
- '趷=kē',
- '趸=dǔn',
- '趹=jué,guì',
- '趺=fū',
- '趻=chěn',
- '趼=jiǎn',
- '趽=fāng,fàng,páng',
- '趾=zhǐ',
- '趿=tā',
- '跀=yuè',
- '跁=bà,páo',
- '跂=qí,qǐ',
- '跃=yuè',
- '跄=qiāng,qiàng',
- '跅=tuò',
- '跆=tái',
- '跇=yì',
- '跈=jiàn,chén',
- '跉=líng',
- '跊=mèi',
- '跋=bá',
- '跌=diē',
- '跍=kū',
- '跎=tuó',
- '跏=jiā',
- '跐=cī,cǐ',
- '跑=pǎo,páo',
- '跒=qiǎ',
- '跓=zhù',
- '跔=jū',
- '跕=diǎn,tiē,dié',
- '跖=zhí',
- '跗=fū',
- '跘=pán,bàn',
- '跙=jū,jù,qiè',
- '跚=shān',
- '跛=bǒ',
- '跜=ní',
- '距=jù',
- '跞=lì,luò',
- '跟=gēn',
- '跠=yí',
- '跡=jì',
- '跢=dài,duò,duō,chí',
- '跣=xiǎn',
- '跤=jiāo',
- '跥=duò',
- '跦=zhū',
- '跧=quán',
- '跨=kuà',
- '跩=zhuǎi',
- '跪=guì',
- '跫=qióng',
- '跬=kuǐ',
- '跭=xiáng',
- '跮=dié',
- '路=lù',
- '跰=pián,bèng',
- '跱=zhì',
- '跲=jié',
- '跳=tiào,táo',
- '跴=cǎi',
- '践=jiàn',
- '跶=dá',
- '跷=qiāo',
- '跸=bì',
- '跹=xiān',
- '跺=duò',
- '跻=jī',
- '跼=jú',
- '跽=jì',
- '跾=shū,chōu',
- '跿=tú',
- '踀=chuò',
- '踁=jìng',
- '踂=niè',
- '踃=xiāo',
- '踄=bù',
- '踅=xué',
- '踆=qūn',
- '踇=mǔ',
- '踈=shū',
- '踉=liáng,liàng',
- '踊=yǒng',
- '踋=jiǎo',
- '踌=chóu',
- '踍=qiāo',
- '踎=móu',
- '踏=tà',
- '踐=jiàn',
- '踑=jī',
- '踒=wō',
- '踓=wěi',
- '踔=chuō',
- '踕=jié',
- '踖=jí',
- '踗=niè',
- '踘=jū',
- '踙=niè',
- '踚=lún',
- '踛=lù',
- '踜=lèng',
- '踝=huái',
- '踞=jù',
- '踟=chí',
- '踠=wǎn',
- '踡=quán',
- '踢=tī',
- '踣=bó',
- '踤=zú',
- '踥=qiè',
- '踦=qī',
- '踧=cù',
- '踨=zōng',
- '踩=cǎi',
- '踪=zōng',
- '踫=pèng',
- '踬=zhì',
- '踭=zhēng',
- '踮=diǎn',
- '踯=zhí',
- '踰=yú',
- '踱=duó',
- '踲=dùn',
- '踳=chuǎn',
- '踴=yǒng',
- '踵=zhǒng',
- '踶=dì',
- '踷=zhě',
- '踸=chěn',
- '踹=chuài',
- '踺=jiàn',
- '踻=guā',
- '踼=táng',
- '踽=jǔ',
- '踾=fú',
- '踿=cù',
- '蹀=dié',
- '蹁=pián',
- '蹂=róu',
- '蹃=nuò',
- '蹄=tí',
- '蹅=chǎ',
- '蹆=tuǐ',
- '蹇=jiǎn',
- '蹈=dǎo',
- '蹉=cuō',
- '蹊=qī,xī',
- '蹋=tà',
- '蹌=qiāng',
- '蹍=niǎn',
- '蹎=diān',
- '蹏=tí',
- '蹐=jí',
- '蹑=niè',
- '蹒=pán',
- '蹓=liū',
- '蹔=zàn',
- '蹕=bì',
- '蹖=chōng',
- '蹗=lù',
- '蹘=liáo',
- '蹙=cù',
- '蹚=tāng',
- '蹛=dài',
- '蹜=sù',
- '蹝=xǐ',
- '蹞=kuǐ',
- '蹟=jì',
- '蹠=zhí',
- '蹡=qiāng',
- '蹢=dí',
- '蹣=pán',
- '蹤=zōng',
- '蹥=lián',
- '蹦=bèng',
- '蹧=zāo',
- '蹨=niǎn',
- '蹩=bié',
- '蹪=tuí',
- '蹫=jú',
- '蹬=dēng',
- '蹭=cèng',
- '蹮=xiān',
- '蹯=fán',
- '蹰=chú',
- '蹱=zhōng',
- '蹲=dūn',
- '蹳=bō',
- '蹴=cù',
- '蹵=cù',
- '蹶=jué,juě',
- '蹷=jué',
- '蹸=lìn',
- '蹹=tà',
- '蹺=qiāo',
- '蹻=qiāo',
- '蹼=pǔ',
- '蹽=liāo',
- '蹾=dūn',
- '蹿=cuān',
- '躀=guàn',
- '躁=zào',
- '躂=tà',
- '躃=bì',
- '躄=bì',
- '躅=zhú',
- '躆=jù',
- '躇=chú',
- '躈=qiào',
- '躉=dǔn',
- '躊=chóu',
- '躋=jī',
- '躌=wǔ',
- '躍=yuè',
- '躎=niǎn',
- '躏=lìn',
- '躐=liè',
- '躑=zhí',
- '躒=lì,luò',
- '躓=zhì',
- '躔=chán',
- '躕=chú',
- '躖=duàn',
- '躗=wèi',
- '躘=lóng,lǒng',
- '躙=lìn',
- '躚=xiān',
- '躛=wèi',
- '躜=zuān',
- '躝=lán',
- '躞=xiè',
- '躟=ráng',
- '躠=sǎ,xiè',
- '躡=niè',
- '躢=tà',
- '躣=qú',
- '躤=jí',
- '躥=cuān',
- '躦=zuān',
- '躧=xǐ',
- '躨=kuí',
- '躩=jué',
- '躪=lìn',
- '身=shēn',
- '躬=gōng',
- '躭=dān',
- '躮=fēn',
- '躯=qū',
- '躰=tǐ',
- '躱=duǒ',
- '躲=duǒ',
- '躳=gōng',
- '躴=láng',
- '躵=rěn',
- '躶=luǒ',
- '躷=ǎi',
- '躸=jī',
- '躹=jū',
- '躺=tǎng',
- '躻=kōng',
- '躼=lào',
- '躽=yǎn',
- '躾=měi',
- '躿=kāng',
- '軀=qū',
- '軁=lóu',
- '軂=lào',
- '軃=duǒ',
- '軄=zhí',
- '軅=yàn',
- '軆=tǐ',
- '軇=dào',
- '軈=yīng',
- '軉=yù',
- '車=chē,jū',
- '軋=yà,zhá,gá',
- '軌=guǐ',
- '軍=jūn',
- '軎=wèi',
- '軏=yuè',
- '軐=xìn,xiàn',
- '軑=dài',
- '軒=xuān',
- '軓=fàn,guǐ',
- '軔=rèn',
- '軕=shān',
- '軖=kuáng',
- '軗=shū',
- '軘=tún',
- '軙=chén',
- '軚=dài',
- '軛=è',
- '軜=nà',
- '軝=qí',
- '軞=máo',
- '軟=ruǎn',
- '軠=kuáng',
- '軡=qián',
- '転=zhuàn,zhuǎn',
- '軣=hōng',
- '軤=hū',
- '軥=qú',
- '軦=kuàng',
- '軧=dǐ',
- '軨=líng',
- '軩=dài',
- '軪=āo,ào',
- '軫=zhěn',
- '軬=fàn',
- '軭=kuāng',
- '軮=yǎng',
- '軯=pēng',
- '軰=bèi',
- '軱=gū',
- '軲=gū',
- '軳=páo',
- '軴=zhù',
- '軵=rǒng',
- '軶=è',
- '軷=bá',
- '軸=zhóu,zhòu',
- '軹=zhǐ',
- '軺=yáo',
- '軻=kē,kě',
- '軼=yì,dié',
- '軽=qīng',
- '軾=shì',
- '軿=píng',
- '輀=ér',
- '輁=gǒng',
- '輂=jú',
- '較=jiào',
- '輄=guāng',
- '輅=lù',
- '輆=kǎi',
- '輇=quán',
- '輈=zhōu',
- '載=zài',
- '輊=zhì',
- '輋=shē',
- '輌=liàng',
- '輍=yù',
- '輎=shāo',
- '輏=yóu',
- '輐=wàn',
- '輑=yǐn',
- '輒=zhé',
- '輓=wǎn',
- '輔=fǔ',
- '輕=qīng',
- '輖=zhōu',
- '輗=ní',
- '輘=líng',
- '輙=zhé',
- '輚=hàn',
- '輛=liàng',
- '輜=zī',
- '輝=huī',
- '輞=wǎng',
- '輟=chuò',
- '輠=guǒ',
- '輡=kǎn',
- '輢=yǐ',
- '輣=péng',
- '輤=qiàn',
- '輥=gǔn',
- '輦=niǎn',
- '輧=píng',
- '輨=guǎn',
- '輩=bèi',
- '輪=lún',
- '輫=pái',
- '輬=liáng',
- '輭=ruǎn',
- '輮=róu',
- '輯=jí',
- '輰=yáng',
- '輱=xián',
- '輲=chuán',
- '輳=còu',
- '輴=chūn',
- '輵=gé',
- '輶=yóu',
- '輷=hōng',
- '輸=shū',
- '輹=fù',
- '輺=zī',
- '輻=fú',
- '輼=wēn',
- '輽=fàn',
- '輾=zhǎn',
- '輿=yú',
- '轀=wēn',
- '轁=tāo',
- '轂=gǔ',
- '轃=zhēn',
- '轄=xiá',
- '轅=yuán',
- '轆=lù',
- '轇=jiāo',
- '轈=cháo',
- '轉=zhuǎn',
- '轊=wèi',
- '轋=hūn',
- '轌=xuě',
- '轍=zhé',
- '轎=jiào',
- '轏=zhàn',
- '轐=bú',
- '轑=lǎo',
- '轒=fén',
- '轓=fān',
- '轔=lín',
- '轕=gé',
- '轖=sè',
- '轗=kǎn',
- '轘=huàn',
- '轙=yǐ',
- '轚=jí',
- '轛=duì',
- '轜=ér',
- '轝=yú',
- '轞=jiàn',
- '轟=hōng',
- '轠=léi',
- '轡=pèi',
- '轢=lì',
- '轣=lì',
- '轤=lú',
- '轥=lìn',
- '车=chē,jū',
- '轧=yà,zhá',
- '轨=guǐ',
- '轩=xuān',
- '轪=dài',
- '轫=rèn',
- '转=zhuǎn,zhuàn,zhuǎi',
- '轭=è',
- '轮=lún',
- '软=ruǎn',
- '轰=hōng',
- '轱=gū',
- '轲=kē',
- '轳=lú',
- '轴=zhóu,zhòu',
- '轵=zhǐ',
- '轶=yì',
- '轷=hū',
- '轸=zhěn',
- '轹=lì',
- '轺=yáo',
- '轻=qīng',
- '轼=shì',
- '载=zài,zǎi',
- '轾=zhì',
- '轿=jiào',
- '辀=zhōu',
- '辁=quán',
- '辂=lù',
- '较=jiào',
- '辄=zhé',
- '辅=fǔ',
- '辆=liàng',
- '辇=niǎn',
- '辈=bèi',
- '辉=huī',
- '辊=gǔn',
- '辋=wǎng',
- '辌=liáng',
- '辍=chuò',
- '辎=zī',
- '辏=còu',
- '辐=fú',
- '辑=jí',
- '辒=wēn',
- '输=shū',
- '辔=pèi',
- '辕=yuán',
- '辖=xiá',
- '辗=zhǎn,niǎn',
- '辘=lù',
- '辙=zhé',
- '辚=lín',
- '辛=xīn',
- '辜=gū',
- '辝=cí',
- '辞=cí',
- '辟=pì,bì',
- '辠=zuì',
- '辡=biàn',
- '辢=là',
- '辣=là',
- '辤=cí',
- '辥=xuē',
- '辦=bàn',
- '辧=biàn',
- '辨=biàn',
- '辩=biàn',
- '辪=xuē',
- '辫=biàn',
- '辬=bān',
- '辭=cí',
- '辮=biàn',
- '辯=biàn',
- '辰=chén',
- '辱=rǔ',
- '農=nóng',
- '辳=nóng',
- '辴=zhěn',
- '辵=chuò',
- '辶=chuò',
- '辷=yī',
- '辸=réng',
- '边=biān',
- '辺=dào,biān',
- '辻=shi',
- '込=yū',
- '辽=liáo',
- '达=dá',
- '辿=chān',
- '迀=gān',
- '迁=qiān',
- '迂=yū',
- '迃=yū',
- '迄=qì',
- '迅=xùn',
- '迆=yǐ,yí',
- '过=guò,guo,guō',
- '迈=mài',
- '迉=qī',
- '迊=zā',
- '迋=wàng,kuāng',
- '迌=tù',
- '迍=zhūn',
- '迎=yíng',
- '迏=dá',
- '运=yùn',
- '近=jìn',
- '迒=háng',
- '迓=yà',
- '返=fǎn',
- '迕=wǔ',
- '迖=dá',
- '迗=é',
- '还=hái,huán',
- '这=zhè,zhèi',
- '迚=dá',
- '进=jìn',
- '远=yuǎn,yuàn',
- '违=wéi',
- '连=lián',
- '迟=chí',
- '迠=chè',
- '迡=chí',
- '迢=tiáo',
- '迣=zhì,lì',
- '迤=yǐ,yí',
- '迥=jiǒng',
- '迦=jiā',
- '迧=chén',
- '迨=dài',
- '迩=ěr',
- '迪=dí',
- '迫=pò,pǎi',
- '迬=zhù,wǎng',
- '迭=dié',
- '迮=zé',
- '迯=táo',
- '述=shù',
- '迱=yǐ,yí',
- '迲=null',
- '迳=jìng',
- '迴=huí',
- '迵=dòng',
- '迶=yòu',
- '迷=mí',
- '迸=bèng',
- '迹=jì',
- '迺=nǎi',
- '迻=yí',
- '迼=jié',
- '追=zhuī,duī',
- '迾=liè',
- '迿=xùn',
- '退=tuì',
- '送=sòng',
- '适=shì',
- '逃=táo',
- '逄=páng',
- '逅=hòu',
- '逆=nì',
- '逇=dùn',
- '逈=jiǒng',
- '选=xuǎn',
- '逊=xùn',
- '逋=bū',
- '逌=yōu',
- '逍=xiāo',
- '逎=qiú',
- '透=tòu',
- '逐=zhú',
- '逑=qiú',
- '递=dì',
- '逓=dì',
- '途=tú',
- '逕=jìng',
- '逖=tì',
- '逗=dòu',
- '逘=yǐ',
- '這=zhè',
- '通=tōng',
- '逛=guàng',
- '逜=wǔ',
- '逝=shì',
- '逞=chěng',
- '速=sù',
- '造=zào',
- '逡=qūn',
- '逢=féng',
- '連=lián',
- '逤=suò',
- '逥=huí',
- '逦=lǐ',
- '逧=gǔ',
- '逨=lái',
- '逩=bèn',
- '逪=cuò',
- '逫=zhú',
- '逬=bèng',
- '逭=huàn',
- '逮=dài',
- '逯=lù',
- '逰=yóu',
- '週=zhōu',
- '進=jìn',
- '逳=yù',
- '逴=chuō',
- '逵=kuí',
- '逶=wēi',
- '逷=tì',
- '逸=yì',
- '逹=dá',
- '逺=yuǎn',
- '逻=luó',
- '逼=bī',
- '逽=nuò',
- '逾=yú',
- '逿=dàng',
- '遀=suí',
- '遁=dùn',
- '遂=suì',
- '遃=yǎn',
- '遄=chuán',
- '遅=chí',
- '遆=dì,tí',
- '遇=yù',
- '遈=shí',
- '遉=zhēn',
- '遊=yóu',
- '運=yùn',
- '遌=è',
- '遍=biàn',
- '過=guò',
- '遏=è',
- '遐=xiá',
- '遑=huáng',
- '遒=qiú',
- '道=dào',
- '達=dá',
- '違=wéi',
- '遖=nán',
- '遗=yí',
- '遘=gòu',
- '遙=yáo',
- '遚=chòu',
- '遛=liù',
- '遜=xùn',
- '遝=tà',
- '遞=dì',
- '遟=chí',
- '遠=yuǎn',
- '遡=sù',
- '遢=tà',
- '遣=qiǎn',
- '遤=mǎ',
- '遥=yáo',
- '遦=guàn',
- '遧=zhāng',
- '遨=áo',
- '適=shì',
- '遪=cà',
- '遫=chì',
- '遬=sù',
- '遭=zāo',
- '遮=zhē',
- '遯=dùn',
- '遰=dì',
- '遱=lóu',
- '遲=chí',
- '遳=cuō',
- '遴=lín',
- '遵=zūn',
- '遶=rào',
- '遷=qiān',
- '選=xuǎn',
- '遹=yù',
- '遺=yí',
- '遻=è',
- '遼=liáo',
- '遽=jù',
- '遾=shì',
- '避=bì',
- '邀=yāo',
- '邁=mài',
- '邂=xiè',
- '邃=suì',
- '還=huán,hái',
- '邅=zhān',
- '邆=téng',
- '邇=ěr',
- '邈=miǎo',
- '邉=biān',
- '邊=biān',
- '邋=lā',
- '邌=lí,chí',
- '邍=yuán',
- '邎=yáo',
- '邏=luó',
- '邐=lǐ',
- '邑=yì',
- '邒=tíng',
- '邓=dèng',
- '邔=qǐ',
- '邕=yōng',
- '邖=shān',
- '邗=hán',
- '邘=yú',
- '邙=máng',
- '邚=rú',
- '邛=qióng',
- '邜=xī',
- '邝=kuàng',
- '邞=fū',
- '邟=kàng,háng',
- '邠=bīn',
- '邡=fāng',
- '邢=xíng',
- '那=nà,nǎ,nèi,nā',
- '邤=xīn',
- '邥=shěn',
- '邦=bāng',
- '邧=yuán',
- '邨=cūn',
- '邩=huǒ',
- '邪=xié,yá,yé,yú,xú',
- '邫=bāng',
- '邬=wū',
- '邭=jù',
- '邮=yóu',
- '邯=hán',
- '邰=tái',
- '邱=qiū',
- '邲=bì',
- '邳=pī',
- '邴=bǐng',
- '邵=shào',
- '邶=bèi',
- '邷=wǎ',
- '邸=dǐ',
- '邹=zōu',
- '邺=yè',
- '邻=lín',
- '邼=kuāng',
- '邽=guī',
- '邾=zhū',
- '邿=shī',
- '郀=kū',
- '郁=yù',
- '郂=gāi,hái',
- '郃=hé',
- '郄=qiè,xì',
- '郅=zhì',
- '郆=jí',
- '郇=xún,huán',
- '郈=hòu',
- '郉=xíng',
- '郊=jiāo',
- '郋=xí',
- '郌=guī',
- '郍=nà',
- '郎=láng,làng',
- '郏=jiá',
- '郐=kuài',
- '郑=zhèng',
- '郒=láng',
- '郓=yùn',
- '郔=yán',
- '郕=chéng',
- '郖=dòu',
- '郗=xī',
- '郘=lǚ',
- '郙=fǔ',
- '郚=wú',
- '郛=fú',
- '郜=gào',
- '郝=hǎo',
- '郞=láng',
- '郟=jiá',
- '郠=gěng',
- '郡=jùn',
- '郢=yǐng',
- '郣=bó',
- '郤=xì',
- '郥=bèi',
- '郦=lì,zhí',
- '郧=yún',
- '部=bù',
- '郩=xiáo,ǎo',
- '郪=qī',
- '郫=pí',
- '郬=qīng',
- '郭=guō',
- '郮=zhōu',
- '郯=tán',
- '郰=zōu',
- '郱=píng',
- '郲=lái',
- '郳=ní',
- '郴=chēn',
- '郵=yóu',
- '郶=bù',
- '郷=xiāng',
- '郸=dān',
- '郹=jú',
- '郺=yōng',
- '郻=qiāo',
- '郼=yī',
- '都=dōu,dū',
- '郾=yǎn',
- '郿=méi',
- '鄀=ruò',
- '鄁=bèi',
- '鄂=è',
- '鄃=shū',
- '鄄=juàn',
- '鄅=yǔ',
- '鄆=yùn',
- '鄇=hóu',
- '鄈=kuí',
- '鄉=xiāng',
- '鄊=xiāng',
- '鄋=sōu',
- '鄌=táng',
- '鄍=míng',
- '鄎=xī',
- '鄏=rǔ',
- '鄐=chù',
- '鄑=zī',
- '鄒=zōu',
- '鄓=yì',
- '鄔=wū',
- '鄕=xiāng',
- '鄖=yún',
- '鄗=hào',
- '鄘=yōng',
- '鄙=bǐ',
- '鄚=mào',
- '鄛=cháo',
- '鄜=fū',
- '鄝=liǎo',
- '鄞=yín',
- '鄟=zhuān',
- '鄠=hù',
- '鄡=qiāo',
- '鄢=yān',
- '鄣=zhāng',
- '鄤=màn',
- '鄥=qiāo',
- '鄦=xǔ',
- '鄧=dèng',
- '鄨=bì',
- '鄩=xún',
- '鄪=bì',
- '鄫=zēng',
- '鄬=wéi',
- '鄭=zhèng',
- '鄮=mào',
- '鄯=shàn',
- '鄰=lín',
- '鄱=pó',
- '鄲=dān',
- '鄳=méng',
- '鄴=yè',
- '鄵=cào',
- '鄶=kuài',
- '鄷=fēng',
- '鄸=méng',
- '鄹=zōu',
- '鄺=kuàng',
- '鄻=liǎn',
- '鄼=zàn',
- '鄽=chán',
- '鄾=yōu',
- '鄿=qí',
- '酀=yàn',
- '酁=chán',
- '酂=cuó,zàn',
- '酃=líng',
- '酄=huān',
- '酅=xī',
- '酆=fēng',
- '酇=cuó,zàn',
- '酈=lì',
- '酉=yǒu',
- '酊=dīng,dǐng',
- '酋=qiú',
- '酌=zhuó',
- '配=pèi',
- '酎=zhòu',
- '酏=yǐ',
- '酐=gān',
- '酑=yú',
- '酒=jiǔ',
- '酓=yǎn',
- '酔=zuì',
- '酕=máo',
- '酖=dān',
- '酗=xù',
- '酘=dòu',
- '酙=zhēn',
- '酚=fēn',
- '酛=yuán',
- '酜=fū',
- '酝=yùn',
- '酞=tài',
- '酟=tiān',
- '酠=qiǎ',
- '酡=tuó',
- '酢=zuò',
- '酣=hān',
- '酤=gū',
- '酥=sū',
- '酦=pō',
- '酧=chóu',
- '酨=zài',
- '酩=mǐng',
- '酪=lào',
- '酫=chuò',
- '酬=chóu',
- '酭=yòu',
- '酮=tóng',
- '酯=zhǐ',
- '酰=xiān',
- '酱=jiàng',
- '酲=chéng',
- '酳=yìn',
- '酴=tú',
- '酵=jiào',
- '酶=méi',
- '酷=kù',
- '酸=suān',
- '酹=lèi',
- '酺=pú',
- '酻=zuì',
- '酼=hǎi',
- '酽=yàn',
- '酾=shī',
- '酿=niàng',
- '醀=wéi',
- '醁=lù',
- '醂=lǎn',
- '醃=yān',
- '醄=táo',
- '醅=pēi',
- '醆=zhǎn',
- '醇=chún',
- '醈=tán,dàn',
- '醉=zuì',
- '醊=zhuì',
- '醋=cù',
- '醌=kūn',
- '醍=tí,tǐ',
- '醎=xián',
- '醏=dū',
- '醐=hú',
- '醑=xǔ',
- '醒=xǐng',
- '醓=tǎn',
- '醔=qiú,chōu',
- '醕=chún',
- '醖=yùn',
- '醗=pō,fā',
- '醘=kē',
- '醙=sōu',
- '醚=mí',
- '醛=quán',
- '醜=chǒu',
- '醝=cuō',
- '醞=yùn',
- '醟=yòng',
- '醠=àng',
- '醡=zhà',
- '醢=hǎi',
- '醣=táng',
- '醤=jiàng',
- '醥=piǎo',
- '醦=chǎn,chěn',
- '醧=yù',
- '醨=lí',
- '醩=zāo',
- '醪=láo',
- '醫=yī',
- '醬=jiàng',
- '醭=bú',
- '醮=jiào',
- '醯=xī',
- '醰=tán',
- '醱=pō,fā',
- '醲=nóng',
- '醳=yì,shì',
- '醴=lǐ',
- '醵=jù',
- '醶=yàn,liǎn,xiān',
- '醷=yì',
- '醸=niàng',
- '醹=rú',
- '醺=xūn',
- '醻=chóu',
- '醼=yàn',
- '醽=líng',
- '醾=mí',
- '醿=mí',
- '釀=niàng,niáng',
- '釁=xìn',
- '釂=jiào',
- '釃=shī',
- '釄=mí',
- '釅=yàn',
- '釆=biàn',
- '采=cǎi,cài',
- '釈=shì',
- '釉=yòu',
- '释=shì',
- '釋=shì',
- '里=lǐ',
- '重=zhòng,chóng',
- '野=yě',
- '量=liàng,liáng,liang',
- '釐=lí,xǐ,xī',
- '金=jīn',
- '釒=jīn',
- '釓=gá',
- '釔=yǐ',
- '釕=liǎo,liào',
- '釖=dāo',
- '釗=zhāo',
- '釘=dīng,dìng',
- '釙=pō',
- '釚=qiú',
- '釛=hé',
- '釜=fǔ',
- '針=zhēn',
- '釞=zhí',
- '釟=bā',
- '釠=luàn',
- '釡=fǔ',
- '釢=nǎi',
- '釣=diào',
- '釤=shān,shàn',
- '釥=qiǎo,jiǎo',
- '釦=kòu',
- '釧=chuàn',
- '釨=zǐ',
- '釩=fán',
- '釪=huá,yú',
- '釫=huá,wū',
- '釬=hàn',
- '釭=gāng',
- '釮=qí',
- '釯=máng',
- '釰=rì,rèn,jiàn',
- '釱=dì,dài',
- '釲=sì',
- '釳=xì',
- '釴=yì',
- '釵=chāi',
- '釶=shī,yí',
- '釷=tǔ',
- '釸=xī',
- '釹=nǚ',
- '釺=qiān',
- '釻=qiú',
- '釼=rì,rèn,jiàn',
- '釽=pī,zhāo',
- '釾=yé,yá',
- '釿=jīn',
- '鈀=bǎ',
- '鈁=fāng',
- '鈂=chén',
- '鈃=xíng',
- '鈄=dǒu',
- '鈅=yuè',
- '鈆=qiān',
- '鈇=fū',
- '鈈=bù',
- '鈉=nà',
- '鈊=xīn',
- '鈋=é',
- '鈌=jué',
- '鈍=dùn',
- '鈎=gōu',
- '鈏=yǐn',
- '鈐=qián',
- '鈑=bǎn',
- '鈒=sà',
- '鈓=rèn',
- '鈔=chāo',
- '鈕=niǔ',
- '鈖=fēn',
- '鈗=yǔn',
- '鈘=yǐ',
- '鈙=qín',
- '鈚=pī',
- '鈛=guō',
- '鈜=hóng',
- '鈝=yín',
- '鈞=jūn',
- '鈟=diào',
- '鈠=yì',
- '鈡=zhōng',
- '鈢=xǐ',
- '鈣=gài',
- '鈤=rì',
- '鈥=huǒ',
- '鈦=tài',
- '鈧=kàng',
- '鈨=yuán',
- '鈩=lú',
- '鈪=è',
- '鈫=qín',
- '鈬=duó',
- '鈭=zī',
- '鈮=ní',
- '鈯=tú',
- '鈰=shì',
- '鈱=mín',
- '鈲=gū',
- '鈳=kē',
- '鈴=líng',
- '鈵=bǐng',
- '鈶=sì',
- '鈷=gǔ',
- '鈸=bó',
- '鈹=pí',
- '鈺=yù',
- '鈻=sì',
- '鈼=zuó',
- '鈽=bū',
- '鈾=yóu',
- '鈿=diàn',
- '鉀=jiǎ',
- '鉁=zhēn',
- '鉂=shǐ',
- '鉃=shì',
- '鉄=tiě',
- '鉅=jù',
- '鉆=zuān',
- '鉇=shī',
- '鉈=tā,tuó',
- '鉉=xuàn',
- '鉊=zhāo',
- '鉋=bào,páo',
- '鉌=hé',
- '鉍=bì',
- '鉎=shēng',
- '鉏=chú',
- '鉐=shí',
- '鉑=bó',
- '鉒=zhù',
- '鉓=chì',
- '鉔=zā',
- '鉕=pǒ',
- '鉖=tóng',
- '鉗=qián',
- '鉘=fú',
- '鉙=zhǎi',
- '鉚=mǎo',
- '鉛=qiān',
- '鉜=fú',
- '鉝=lì',
- '鉞=yuè',
- '鉟=pī',
- '鉠=yāng',
- '鉡=bàn',
- '鉢=bō',
- '鉣=jié',
- '鉤=gōu',
- '鉥=shù',
- '鉦=zhēng',
- '鉧=mǔ',
- '鉨=xǐ',
- '鉩=xǐ',
- '鉪=dì',
- '鉫=jiā',
- '鉬=mù',
- '鉭=tǎn',
- '鉮=shén',
- '鉯=yǐ',
- '鉰=sī',
- '鉱=kuàng',
- '鉲=kǎ',
- '鉳=běi',
- '鉴=jiàn',
- '鉵=tóng',
- '鉶=xíng',
- '鉷=hóng',
- '鉸=jiǎo',
- '鉹=chǐ',
- '鉺=ěr',
- '鉻=gè',
- '鉼=bǐng,píng',
- '鉽=shì',
- '鉾=máo',
- '鉿=hā,kē',
- '銀=yín',
- '銁=jūn',
- '銂=zhōu',
- '銃=chòng',
- '銄=xiǎng,jiōng',
- '銅=tóng',
- '銆=mò',
- '銇=lèi',
- '銈=jī',
- '銉=yù,sì',
- '銊=xù,huì',
- '銋=rén,rěn',
- '銌=zùn',
- '銍=zhì',
- '銎=qióng',
- '銏=shàn,shuò',
- '銐=chì,lì',
- '銑=xiǎn,xǐ',
- '銒=xíng',
- '銓=quán',
- '銔=pī',
- '銕=tiě',
- '銖=zhū',
- '銗=hóu,xiàng',
- '銘=míng',
- '銙=kuǎ',
- '銚=diào,tiáo,yáo',
- '銛=xiān,kuò,tiǎn,guā',
- '銜=xián',
- '銝=xiū',
- '銞=jūn',
- '銟=chā',
- '銠=lǎo',
- '銡=jí',
- '銢=pǐ',
- '銣=rú',
- '銤=mǐ',
- '銥=yī',
- '銦=yīn',
- '銧=guāng',
- '銨=ǎn',
- '銩=diū',
- '銪=yǒu',
- '銫=sè',
- '銬=kào',
- '銭=qián',
- '銮=luán',
- '銯=sī',
- '銰=āi',
- '銱=diào',
- '銲=hàn',
- '銳=ruì',
- '銴=shì,zhì',
- '銵=kēng',
- '銶=qiú',
- '銷=xiāo',
- '銸=zhé,niè',
- '銹=xiù',
- '銺=zàng',
- '銻=tī',
- '銼=cuò',
- '銽=xiān,kuò,tiǎn,guā',
- '銾=hòng,gǒng',
- '銿=zhōng,yōng',
- '鋀=tōu,tù,dòu',
- '鋁=lǚ',
- '鋂=méi,méng',
- '鋃=láng',
- '鋄=wàn,jiǎn',
- '鋅=xīn',
- '鋆=yún',
- '鋇=bèi',
- '鋈=wù',
- '鋉=sù',
- '鋊=yù',
- '鋋=chán',
- '鋌=tǐng,dìng',
- '鋍=bó',
- '鋎=hàn',
- '鋏=jiá',
- '鋐=hóng',
- '鋑=juān,jiān,cuān',
- '鋒=fēng',
- '鋓=chān',
- '鋔=wǎn',
- '鋕=zhì',
- '鋖=sī,tuó',
- '鋗=xuān,juān,juàn',
- '鋘=huá,wú,wū',
- '鋙=wú',
- '鋚=tiáo',
- '鋛=kuàng',
- '鋜=zhuó,chuò',
- '鋝=lüè',
- '鋞=xíng,xìng,jīng',
- '鋟=qǐn',
- '鋠=shèn',
- '鋡=hán',
- '鋢=lüè',
- '鋣=yé',
- '鋤=chú',
- '鋥=zèng',
- '鋦=jū,jú',
- '鋧=xiàn',
- '鋨=é',
- '鋩=máng',
- '鋪=pū,pù',
- '鋫=lí',
- '鋬=pàn',
- '鋭=ruì',
- '鋮=chéng',
- '鋯=gào',
- '鋰=lǐ',
- '鋱=tè',
- '鋲=bīng',
- '鋳=zhù',
- '鋴=zhèn',
- '鋵=tū',
- '鋶=liǔ',
- '鋷=zuì,niè',
- '鋸=jù,jū',
- '鋹=chǎng',
- '鋺=yuǎn,yuān,wǎn,wān',
- '鋻=jiān,jiàn',
- '鋼=gāng,gàng',
- '鋽=diào',
- '鋾=táo',
- '鋿=shǎng',
- '錀=lún',
- '錁=kè',
- '錂=líng',
- '錃=pī',
- '錄=lù',
- '錅=lí',
- '錆=qīng',
- '錇=péi',
- '錈=juǎn',
- '錉=mín',
- '錊=zuì',
- '錋=péng',
- '錌=àn',
- '錍=pī',
- '錎=xiàn',
- '錏=yā',
- '錐=zhuī',
- '錑=lèi',
- '錒=ā',
- '錓=kōng',
- '錔=tà',
- '錕=kūn',
- '錖=dú',
- '錗=nèi',
- '錘=chuí',
- '錙=zī',
- '錚=zhēng',
- '錛=bēn',
- '錜=niè',
- '錝=cóng',
- '錞=chún',
- '錟=tán',
- '錠=dìng',
- '錡=qí',
- '錢=qián',
- '錣=zhuì',
- '錤=jī',
- '錥=yù',
- '錦=jǐn',
- '錧=guǎn',
- '錨=máo',
- '錩=chāng',
- '錪=tiǎn',
- '錫=xī',
- '錬=liàn',
- '錭=diāo',
- '錮=gù',
- '錯=cuò',
- '錰=shù',
- '錱=zhēn',
- '録=lù',
- '錳=měng',
- '錴=lù',
- '錵=huā',
- '錶=biǎo',
- '錷=gá',
- '錸=lái',
- '錹=kěn',
- '錺=fāng',
- '錻=bū',
- '錼=nài',
- '錽=wàn',
- '錾=zàn',
- '錿=hǔ',
- '鍀=dé',
- '鍁=xiān',
- '鍂=piān',
- '鍃=huò',
- '鍄=liàng',
- '鍅=fǎ',
- '鍆=mén',
- '鍇=kǎi',
- '鍈=yāng',
- '鍉=chí',
- '鍊=liàn',
- '鍋=guō',
- '鍌=xiǎn',
- '鍍=dù',
- '鍎=tú',
- '鍏=wéi',
- '鍐=zōng',
- '鍑=fù',
- '鍒=róu',
- '鍓=jí',
- '鍔=è',
- '鍕=jūn',
- '鍖=chěn',
- '鍗=tí',
- '鍘=zhá',
- '鍙=hù',
- '鍚=yáng',
- '鍛=duàn',
- '鍜=xiá',
- '鍝=yú',
- '鍞=kēng',
- '鍟=shēng',
- '鍠=huáng',
- '鍡=wěi',
- '鍢=fù',
- '鍣=zhāo',
- '鍤=chā',
- '鍥=qiè',
- '鍦=shī',
- '鍧=hōng',
- '鍨=kuí',
- '鍩=nuò',
- '鍪=móu',
- '鍫=qiāo',
- '鍬=qiāo',
- '鍭=hóu',
- '鍮=tōu',
- '鍯=cōng',
- '鍰=huán',
- '鍱=yè',
- '鍲=mín',
- '鍳=jiàn',
- '鍴=duān',
- '鍵=jiàn',
- '鍶=sī',
- '鍷=kuí',
- '鍸=hú',
- '鍹=xuān',
- '鍺=zhě',
- '鍻=jié',
- '鍼=zhēn',
- '鍽=biān',
- '鍾=zhōng',
- '鍿=zī',
- '鎀=xiū',
- '鎁=yé',
- '鎂=měi',
- '鎃=pài',
- '鎄=āi',
- '鎅=jiè',
- '鎆=qián',
- '鎇=méi',
- '鎈=cuō,chā',
- '鎉=dā,tà',
- '鎊=bàng',
- '鎋=xiá',
- '鎌=lián',
- '鎍=suǒ,sè',
- '鎎=kài',
- '鎏=liú',
- '鎐=yáo,zú',
- '鎑=yè,tà,gé',
- '鎒=nòu',
- '鎓=wēng',
- '鎔=róng',
- '鎕=táng',
- '鎖=suǒ',
- '鎗=qiāng,chēng',
- '鎘=gé,lì',
- '鎙=shuò',
- '鎚=chuí',
- '鎛=bó',
- '鎜=pán',
- '鎝=dā',
- '鎞=bī,bì,pī',
- '鎟=sǎng',
- '鎠=gāng',
- '鎡=zī',
- '鎢=wū',
- '鎣=yíng',
- '鎤=huàng',
- '鎥=tiáo',
- '鎦=liú,liù',
- '鎧=kǎi',
- '鎨=sǔn',
- '鎩=shā',
- '鎪=sōu',
- '鎫=wàn,jiǎn',
- '鎬=gǎo,hào',
- '鎭=zhèn',
- '鎮=zhèn',
- '鎯=láng',
- '鎰=yì',
- '鎱=yuán',
- '鎲=tǎng',
- '鎳=niè',
- '鎴=xí',
- '鎵=jiā',
- '鎶=gē',
- '鎷=mǎ',
- '鎸=juān',
- '鎹=sòng',
- '鎺=zǔ',
- '鎻=suǒ',
- '鎼=xià',
- '鎽=fēng',
- '鎾=wēn',
- '鎿=ná',
- '鏀=lǔ',
- '鏁=suǒ',
- '鏂=ōu',
- '鏃=zú,chuò',
- '鏄=tuán',
- '鏅=xiū,xiù',
- '鏆=guàn',
- '鏇=xuàn',
- '鏈=liàn',
- '鏉=shòu,sōu',
- '鏊=ào',
- '鏋=mǎn',
- '鏌=mò',
- '鏍=luó',
- '鏎=bì',
- '鏏=wèi',
- '鏐=liú',
- '鏑=dí,dī',
- '鏒=sǎn,qiāo,càn',
- '鏓=cōng',
- '鏔=yí',
- '鏕=lù,áo',
- '鏖=áo',
- '鏗=kēng',
- '鏘=qiāng',
- '鏙=cuī',
- '鏚=qī',
- '鏛=shǎng',
- '鏜=tāng,táng',
- '鏝=màn',
- '鏞=yōng',
- '鏟=chǎn',
- '鏠=fēng',
- '鏡=jìng',
- '鏢=biāo',
- '鏣=shù',
- '鏤=lòu',
- '鏥=xiù',
- '鏦=cōng',
- '鏧=lóng',
- '鏨=zàn',
- '鏩=jiàn,zàn',
- '鏪=cáo',
- '鏫=lí',
- '鏬=xià',
- '鏭=xī',
- '鏮=kāng',
- '鏯=shuǎng',
- '鏰=bèng',
- '鏱=zhāng',
- '鏲=qiān',
- '鏳=zhēng',
- '鏴=lù',
- '鏵=huá',
- '鏶=jí',
- '鏷=pú',
- '鏸=huì,suì,ruì',
- '鏹=qiǎng,qiāng',
- '鏺=pō',
- '鏻=lín',
- '鏼=sè',
- '鏽=xiù',
- '鏾=sǎn,xiàn,sà',
- '鏿=chēng',
- '鐀=guì',
- '鐁=sī',
- '鐂=liú',
- '鐃=náo',
- '鐄=huáng',
- '鐅=piě',
- '鐆=suì',
- '鐇=fán',
- '鐈=qiáo',
- '鐉=quān',
- '鐊=xī',
- '鐋=tàng',
- '鐌=xiàng',
- '鐍=jué',
- '鐎=jiāo',
- '鐏=zūn',
- '鐐=liào',
- '鐑=qì',
- '鐒=láo',
- '鐓=duī',
- '鐔=xín',
- '鐕=zān',
- '鐖=jī',
- '鐗=jiǎn',
- '鐘=zhōng',
- '鐙=dèng',
- '鐚=yā',
- '鐛=yǐng',
- '鐜=duī',
- '鐝=jué',
- '鐞=nòu',
- '鐟=zān',
- '鐠=pǔ',
- '鐡=tiě',
- '鐢=fán',
- '鐣=chēng',
- '鐤=dǐng',
- '鐥=shàn',
- '鐦=kāi',
- '鐧=jiǎn',
- '鐨=fèi',
- '鐩=suì',
- '鐪=lǔ',
- '鐫=juān',
- '鐬=huì',
- '鐭=yù',
- '鐮=lián',
- '鐯=zhuō',
- '鐰=qiāo',
- '鐱=jiàn',
- '鐲=zhuó',
- '鐳=léi',
- '鐴=bì',
- '鐵=tiě',
- '鐶=huán',
- '鐷=yè',
- '鐸=duó',
- '鐹=guò',
- '鐺=dāng,chēng',
- '鐻=jù',
- '鐼=fén',
- '鐽=dá',
- '鐾=bèi',
- '鐿=yì',
- '鑀=ài',
- '鑁=zōng',
- '鑂=xùn',
- '鑃=diào',
- '鑄=zhù',
- '鑅=héng',
- '鑆=zhuì',
- '鑇=jī',
- '鑈=niè',
- '鑉=hé',
- '鑊=huò',
- '鑋=qīng',
- '鑌=bīn',
- '鑍=yīng',
- '鑎=guì',
- '鑏=níng',
- '鑐=xū',
- '鑑=jiàn',
- '鑒=jiàn',
- '鑓=qiǎn',
- '鑔=chǎ',
- '鑕=zhì',
- '鑖=miè',
- '鑗=lí',
- '鑘=léi',
- '鑙=jī',
- '鑚=zuān',
- '鑛=kuàng',
- '鑜=shǎng',
- '鑝=péng',
- '鑞=là',
- '鑟=dú',
- '鑠=shuò',
- '鑡=chuò',
- '鑢=lǜ',
- '鑣=biāo',
- '鑤=bào',
- '鑥=lǔ',
- '鑦=xián',
- '鑧=kuān',
- '鑨=lóng',
- '鑩=è',
- '鑪=lú',
- '鑫=xīn',
- '鑬=jiàn',
- '鑭=lán',
- '鑮=bó',
- '鑯=jiān',
- '鑰=yuè',
- '鑱=chán',
- '鑲=xiāng',
- '鑳=jiàn',
- '鑴=xī',
- '鑵=guàn',
- '鑶=cáng',
- '鑷=niè',
- '鑸=lěi',
- '鑹=cuān',
- '鑺=qú',
- '鑻=pàn',
- '鑼=luó',
- '鑽=zuān',
- '鑾=luán',
- '鑿=záo',
- '钀=niè',
- '钁=jué',
- '钂=tǎng',
- '钃=zhú',
- '钄=làn',
- '钅=jīn',
- '钆=gá',
- '钇=yǐ',
- '针=zhēn',
- '钉=dīng,dìng',
- '钊=zhāo',
- '钋=pō',
- '钌=liǎo,liào',
- '钍=tǔ',
- '钎=qiān',
- '钏=chuàn',
- '钐=shān,shàn',
- '钑=sà,xì',
- '钒=fán',
- '钓=diào',
- '钔=mén',
- '钕=nǚ',
- '钖=yáng',
- '钗=chāi',
- '钘=xíng',
- '钙=gài',
- '钚=bù',
- '钛=tài',
- '钜=jù',
- '钝=dùn',
- '钞=chāo',
- '钟=zhōng',
- '钠=nà',
- '钡=bèi',
- '钢=gāng,gàng',
- '钣=bǎn',
- '钤=qián',
- '钥=yuè,yào',
- '钦=qīn',
- '钧=jūn',
- '钨=wū',
- '钩=gōu',
- '钪=kàng',
- '钫=fāng',
- '钬=huǒ',
- '钭=dǒu',
- '钮=niǔ',
- '钯=bǎ,pá',
- '钰=yù',
- '钱=qián',
- '钲=zhēng,zhèng',
- '钳=qián',
- '钴=gǔ',
- '钵=bō',
- '钶=kē',
- '钷=pǒ',
- '钸=bū',
- '钹=bó',
- '钺=yuè',
- '钻=zuān,zuàn',
- '钼=mù',
- '钽=tǎn',
- '钾=jiǎ',
- '钿=diàn,tián',
- '铀=yóu',
- '铁=tiě',
- '铂=bó',
- '铃=líng',
- '铄=shuò',
- '铅=qiān,yán',
- '铆=mǎo',
- '铇=bào,páo',
- '铈=shì',
- '铉=xuàn',
- '铊=tā,tuó',
- '铋=bì',
- '铌=ní',
- '铍=pí,pī',
- '铎=duó',
- '铏=xíng',
- '铐=kào',
- '铑=lǎo',
- '铒=ěr',
- '铓=máng',
- '铔=yā,yà',
- '铕=yǒu',
- '铖=chéng',
- '铗=jiá',
- '铘=yé',
- '铙=náo',
- '铚=zhì',
- '铛=dāng,chēng',
- '铜=tóng',
- '铝=lǚ',
- '铞=diào',
- '铟=yīn',
- '铠=kǎi',
- '铡=zhá',
- '铢=zhū',
- '铣=xiǎn,xǐ',
- '铤=tǐng,dìng',
- '铥=diū',
- '铦=xiān,kuò,tiǎn,guā',
- '铧=huá',
- '铨=quán',
- '铩=shā',
- '铪=hā,kē',
- '铫=diào,tiáo,yáo',
- '铬=gè',
- '铭=míng',
- '铮=zhēng',
- '铯=sè',
- '铰=jiǎo',
- '铱=yī',
- '铲=chǎn',
- '铳=chòng',
- '铴=tàng,tāng',
- '铵=ǎn',
- '银=yín',
- '铷=rú',
- '铸=zhù',
- '铹=láo',
- '铺=pū,pù',
- '铻=wú',
- '铼=lái',
- '铽=tè',
- '链=liàn',
- '铿=kēng',
- '销=xiāo',
- '锁=suǒ',
- '锂=lǐ',
- '锃=zèng',
- '锄=chú',
- '锅=guō',
- '锆=gào',
- '锇=é',
- '锈=xiù',
- '锉=cuò',
- '锊=lüè',
- '锋=fēng',
- '锌=xīn',
- '锍=liǔ',
- '锎=kāi',
- '锏=jiǎn',
- '锐=ruì',
- '锑=tī',
- '锒=láng',
- '锓=qǐn',
- '锔=jū',
- '锕=ā',
- '锖=qiāng',
- '锗=zhě',
- '锘=nuò',
- '错=cuò',
- '锚=máo',
- '锛=bēn',
- '锜=qí',
- '锝=dé',
- '锞=kè',
- '锟=kūn',
- '锠=chāng',
- '锡=xī',
- '锢=gù',
- '锣=luó',
- '锤=chuí',
- '锥=zhuī',
- '锦=jǐn',
- '锧=zhì',
- '锨=xiān',
- '锩=juǎn',
- '锪=huò',
- '锫=péi',
- '锬=tán',
- '锭=dìng',
- '键=jiàn',
- '锯=jù',
- '锰=měng',
- '锱=zī',
- '锲=qiè',
- '锳=yīng',
- '锴=kǎi',
- '锵=qiāng',
- '锶=sī',
- '锷=è',
- '锸=chā',
- '锹=qiāo',
- '锺=zhōng',
- '锻=duàn',
- '锼=sōu',
- '锽=huáng',
- '锾=huán',
- '锿=āi',
- '镀=dù',
- '镁=měi',
- '镂=lòu',
- '镃=zī',
- '镄=fèi',
- '镅=méi',
- '镆=mò',
- '镇=zhèn',
- '镈=bó',
- '镉=gé,lì',
- '镊=niè',
- '镋=tǎng',
- '镌=juān',
- '镍=niè',
- '镎=ná',
- '镏=liú',
- '镐=gǎo,hào',
- '镑=bàng',
- '镒=yì',
- '镓=jiā',
- '镔=bīn',
- '镕=róng',
- '镖=biāo',
- '镗=tāng',
- '镘=màn',
- '镙=luó',
- '镚=bèng',
- '镛=yōng',
- '镜=jìng',
- '镝=dí',
- '镞=zú',
- '镟=xuàn',
- '镠=liú',
- '镡=xín',
- '镢=jué',
- '镣=liào',
- '镤=pú',
- '镥=lǔ',
- '镦=duī',
- '镧=lán',
- '镨=pǔ',
- '镩=cuān',
- '镪=qiǎng',
- '镫=dèng',
- '镬=huò',
- '镭=léi',
- '镮=huán',
- '镯=zhuó',
- '镰=lián',
- '镱=yì',
- '镲=chǎ',
- '镳=biāo',
- '镴=là',
- '镵=chán',
- '镶=xiāng',
- '長=cháng,zhǎng',
- '镸=cháng',
- '镹=jiǔ',
- '镺=ǎo',
- '镻=dié',
- '镼=jié',
- '镽=liǎo',
- '镾=mí',
- '长=cháng,zhǎng',
- '門=mén',
- '閁=mà',
- '閂=shuān',
- '閃=shǎn',
- '閄=huò,shǎn',
- '閅=mén',
- '閆=yán',
- '閇=bì',
- '閈=hàn,bì',
- '閉=bì',
- '閊=shān',
- '開=kāi',
- '閌=kāng,kàng',
- '閍=bēng',
- '閎=hóng',
- '閏=rùn',
- '閐=sàn',
- '閑=xián',
- '閒=xián,jiān,jiàn',
- '間=jiān,jiàn',
- '閔=mǐn',
- '閕=xiā,xiǎ',
- '閖=shuǐ',
- '閗=dòu',
- '閘=zhá',
- '閙=nào',
- '閚=zhān',
- '閛=pēng,pèng',
- '閜=xiǎ,kě',
- '閝=líng',
- '閞=biàn,guān',
- '閟=bì',
- '閠=rùn',
- '閡=hé',
- '関=guān',
- '閣=gé',
- '閤=hé,gé',
- '閥=fá',
- '閦=chù',
- '閧=hòng,xiàng',
- '閨=guī',
- '閩=mǐn',
- '閪=sē,xī',
- '閫=kǔn',
- '閬=làng',
- '閭=lǘ',
- '閮=tíng,tǐng',
- '閯=shà',
- '閰=jú',
- '閱=yuè',
- '閲=yuè',
- '閳=chǎn',
- '閴=qù',
- '閵=lìn',
- '閶=chāng',
- '閷=shā',
- '閸=kǔn',
- '閹=yān',
- '閺=wén',
- '閻=yán',
- '閼=è,yān',
- '閽=hūn',
- '閾=yù',
- '閿=wén',
- '闀=hòng',
- '闁=bāo',
- '闂=hòng,juǎn,xiàng',
- '闃=qù',
- '闄=yǎo',
- '闅=wén',
- '闆=bǎn,pàn',
- '闇=àn',
- '闈=wéi',
- '闉=yīn',
- '闊=kuò',
- '闋=què',
- '闌=lán',
- '闍=dū,shé',
- '闎=quán',
- '闏=null',
- '闐=tián',
- '闑=niè',
- '闒=tà',
- '闓=kǎi',
- '闔=hé',
- '闕=què,quē',
- '闖=chuǎng',
- '闗=guān',
- '闘=dòu',
- '闙=qǐ',
- '闚=kuī',
- '闛=táng,tāng,chāng',
- '關=guān',
- '闝=piáo',
- '闞=kàn,hǎn',
- '闟=xì,sè,tà',
- '闠=huì',
- '闡=chǎn',
- '闢=pì',
- '闣=dāng,dàng',
- '闤=huán',
- '闥=tà',
- '闦=wén',
- '闧=tā',
- '门=mén',
- '闩=shuān',
- '闪=shǎn',
- '闫=yán',
- '闬=hàn,bì',
- '闭=bì',
- '问=wèn',
- '闯=chuǎng',
- '闰=rùn',
- '闱=wéi',
- '闲=xián',
- '闳=hóng',
- '间=jiān,jiàn',
- '闵=mǐn',
- '闶=kàng,kāng',
- '闷=mèn,mēn',
- '闸=zhá',
- '闹=nào',
- '闺=guī',
- '闻=wén',
- '闼=tà',
- '闽=mǐn',
- '闾=lǘ',
- '闿=kǎi',
- '阀=fá',
- '阁=gé',
- '阂=hé',
- '阃=kǔn',
- '阄=jiū',
- '阅=yuè',
- '阆=làng',
- '阇=dū,shé',
- '阈=yù',
- '阉=yān',
- '阊=chāng',
- '阋=xì',
- '阌=wén',
- '阍=hūn',
- '阎=yán',
- '阏=è',
- '阐=chǎn',
- '阑=lán',
- '阒=qù',
- '阓=huì',
- '阔=kuò',
- '阕=què',
- '阖=hé',
- '阗=tián',
- '阘=tà',
- '阙=quē,què',
- '阚=kàn',
- '阛=huán',
- '阜=fù',
- '阝=fǔ',
- '阞=lè',
- '队=duì',
- '阠=xìn',
- '阡=qiān',
- '阢=wù',
- '阣=yì',
- '阤=tuó',
- '阥=yīn',
- '阦=yáng',
- '阧=dǒu',
- '阨=è',
- '阩=shēng',
- '阪=bǎn',
- '阫=péi',
- '阬=kēng',
- '阭=yǔn',
- '阮=ruǎn',
- '阯=zhǐ',
- '阰=pí',
- '阱=jǐng',
- '防=fáng',
- '阳=yáng',
- '阴=yīn',
- '阵=zhèn',
- '阶=jiē',
- '阷=chēng',
- '阸=è',
- '阹=qū',
- '阺=dǐ',
- '阻=zǔ',
- '阼=zuò',
- '阽=diàn',
- '阾=lín',
- '阿=ā,ē',
- '陀=tuó',
- '陁=tuó',
- '陂=bēi,pí,pō',
- '陃=bǐng',
- '附=fù',
- '际=jì',
- '陆=lù',
- '陇=lǒng',
- '陈=chén',
- '陉=xíng',
- '陊=duò',
- '陋=lòu',
- '陌=mò',
- '降=jiàng,xiáng',
- '陎=shū',
- '陏=duò',
- '限=xiàn',
- '陑=ér',
- '陒=guǐ',
- '陓=yū',
- '陔=gāi',
- '陕=shǎn',
- '陖=jùn',
- '陗=qiào',
- '陘=xíng',
- '陙=chún',
- '陚=wǔ',
- '陛=bì',
- '陜=xiá',
- '陝=shǎn',
- '陞=shēng',
- '陟=zhì',
- '陠=pū',
- '陡=dǒu',
- '院=yuàn',
- '陣=zhèn',
- '除=chú',
- '陥=xiàn',
- '陦=dǎo',
- '陧=niè',
- '陨=yǔn',
- '险=xiǎn',
- '陪=péi',
- '陫=fèi',
- '陬=zōu',
- '陭=qí',
- '陮=duì',
- '陯=lún',
- '陰=yīn',
- '陱=jū',
- '陲=chuí',
- '陳=chén',
- '陴=pī',
- '陵=líng',
- '陶=táo',
- '陷=xiàn',
- '陸=lù',
- '陹=shēng',
- '険=xiǎn',
- '陻=yīn',
- '陼=zhǔ',
- '陽=yáng',
- '陾=réng',
- '陿=xiá',
- '隀=chóng',
- '隁=yàn,yǎn',
- '隂=yīn',
- '隃=yú,yáo,shù',
- '隄=dī',
- '隅=yú',
- '隆=lóng',
- '隇=wēi',
- '隈=wēi',
- '隉=niè',
- '隊=duì,zhuì',
- '隋=suí,duò',
- '隌=àn',
- '隍=huáng',
- '階=jiē',
- '随=suí',
- '隐=yǐn,yìn',
- '隑=qí,gāi,ái',
- '隒=yǎn',
- '隓=huī,duò',
- '隔=gé',
- '隕=yǔn',
- '隖=wù',
- '隗=wěi,kuí',
- '隘=ài',
- '隙=xì',
- '隚=táng',
- '際=jì',
- '障=zhàng',
- '隝=dǎo',
- '隞=áo',
- '隟=xì',
- '隠=yǐn,yìn',
- '隡=sà',
- '隢=rǎo',
- '隣=lín',
- '隤=tuí',
- '隥=dèng',
- '隦=pí',
- '隧=suì',
- '隨=suí',
- '隩=ào,yù',
- '險=xiǎn',
- '隫=fén',
- '隬=nǐ',
- '隭=ér',
- '隮=jī',
- '隯=dǎo',
- '隰=xí',
- '隱=yǐn,yìn',
- '隲=zhì',
- '隳=huī,duò',
- '隴=lǒng',
- '隵=xī',
- '隶=lì',
- '隷=lì',
- '隸=lì',
- '隹=zhuī,cuī,wéi',
- '隺=hú,hè',
- '隻=zhī',
- '隼=sǔn',
- '隽=jùn,juàn',
- '难=nán,nàn,nuó',
- '隿=yì',
- '雀=què,qiāo,qiǎo',
- '雁=yàn',
- '雂=qín',
- '雃=jiān',
- '雄=xióng',
- '雅=yǎ',
- '集=jí',
- '雇=gù',
- '雈=huán',
- '雉=zhì',
- '雊=gòu',
- '雋=jùn,juàn',
- '雌=cí',
- '雍=yōng',
- '雎=jū',
- '雏=chú',
- '雐=hū',
- '雑=zá',
- '雒=luò',
- '雓=yú',
- '雔=chóu',
- '雕=diāo',
- '雖=suī',
- '雗=hàn',
- '雘=huò',
- '雙=shuāng',
- '雚=guàn,huán',
- '雛=chú',
- '雜=zá',
- '雝=yōng',
- '雞=jī',
- '雟=guī,xī',
- '雠=chóu',
- '雡=liù',
- '離=lí',
- '難=nán,nàn,nuó',
- '雤=yù',
- '雥=zá',
- '雦=chóu',
- '雧=jí',
- '雨=yǔ,yù',
- '雩=yú',
- '雪=xuě',
- '雫=nǎ',
- '雬=fǒu',
- '雭=sè,xí',
- '雮=mù',
- '雯=wén',
- '雰=fēn',
- '雱=pāng',
- '雲=yún',
- '雳=lì',
- '雴=chì',
- '雵=yāng',
- '零=líng',
- '雷=léi',
- '雸=án',
- '雹=báo',
- '雺=wù,méng',
- '電=diàn',
- '雼=dàng',
- '雽=hū,hù',
- '雾=wù',
- '雿=diào',
- '需=xū',
- '霁=jì',
- '霂=mù',
- '霃=chén',
- '霄=xiāo',
- '霅=zhá',
- '霆=tíng',
- '震=zhèn',
- '霈=pèi',
- '霉=méi',
- '霊=líng',
- '霋=qī',
- '霌=zhōu',
- '霍=huò',
- '霎=shà',
- '霏=fēi',
- '霐=hóng',
- '霑=zhān',
- '霒=yīn',
- '霓=ní',
- '霔=shù',
- '霕=tún',
- '霖=lín',
- '霗=líng',
- '霘=dòng',
- '霙=yīng',
- '霚=wù',
- '霛=líng',
- '霜=shuāng',
- '霝=líng',
- '霞=xiá',
- '霟=hóng',
- '霠=yīn',
- '霡=mài',
- '霢=mài',
- '霣=yǔn',
- '霤=liù',
- '霥=mèng',
- '霦=bīn',
- '霧=wù',
- '霨=wèi',
- '霩=kuò',
- '霪=yín',
- '霫=xí',
- '霬=yì',
- '霭=ǎi',
- '霮=dàn',
- '霯=tèng',
- '霰=xiàn',
- '霱=yù',
- '露=lòu,lù',
- '霳=lóng',
- '霴=dài',
- '霵=jí',
- '霶=pāng',
- '霷=yáng',
- '霸=bà',
- '霹=pī',
- '霺=wēi',
- '霻=fēng',
- '霼=xì',
- '霽=jì',
- '霾=mái',
- '霿=méng',
- '靀=méng',
- '靁=léi',
- '靂=lì',
- '靃=huò',
- '靄=ǎi',
- '靅=fèi',
- '靆=dài',
- '靇=lóng',
- '靈=lìng',
- '靉=ài',
- '靊=fēng',
- '靋=lì',
- '靌=bǎo',
- '靍=hè',
- '靎=hè',
- '靏=hè',
- '靐=bìng',
- '靑=qīng',
- '青=qīng',
- '靓=jìng,liàng',
- '靔=tiān',
- '靕=zhèng',
- '靖=jìng',
- '靗=chēng',
- '靘=qìng',
- '静=jìng',
- '靚=jìng',
- '靛=diàn',
- '靜=jìng',
- '靝=tiān',
- '非=fēi',
- '靟=fēi',
- '靠=kào',
- '靡=mí',
- '面=miàn',
- '靣=miàn',
- '靤=pào',
- '靥=yè',
- '靦=miǎn',
- '靧=huì',
- '靨=yè',
- '革=gé',
- '靪=dīng',
- '靫=chá',
- '靬=jiān',
- '靭=rèn',
- '靮=dí',
- '靯=dù',
- '靰=wù',
- '靱=rèn',
- '靲=qín',
- '靳=jìn',
- '靴=xuē',
- '靵=niǔ',
- '靶=bǎ',
- '靷=yǐn',
- '靸=sǎ',
- '靹=nà',
- '靺=mò',
- '靻=zǔ',
- '靼=dá',
- '靽=bàn',
- '靾=xiè',
- '靿=yào',
- '鞀=táo',
- '鞁=bèi',
- '鞂=jiē',
- '鞃=hóng',
- '鞄=páo',
- '鞅=yāng,yàng',
- '鞆=bǐng',
- '鞇=yīn',
- '鞈=gé,tà,sǎ',
- '鞉=táo',
- '鞊=jié,jí',
- '鞋=xié',
- '鞌=ān',
- '鞍=ān',
- '鞎=hén',
- '鞏=gǒng',
- '鞐=qiǎ',
- '鞑=dá',
- '鞒=qiáo',
- '鞓=tīng',
- '鞔=mán,mèn',
- '鞕=biān,yìng',
- '鞖=suī',
- '鞗=tiáo',
- '鞘=qiào,shāo',
- '鞙=xuān,juān',
- '鞚=kòng',
- '鞛=běng',
- '鞜=tà',
- '鞝=shàng,zhǎng',
- '鞞=bǐng,pí,bì,bēi',
- '鞟=kuò',
- '鞠=jū',
- '鞡=la',
- '鞢=xiè,dié',
- '鞣=róu',
- '鞤=bāng',
- '鞥=ēng',
- '鞦=qiū',
- '鞧=qiū',
- '鞨=hé',
- '鞩=qiào',
- '鞪=mù,móu',
- '鞫=jū',
- '鞬=jiàn,jiān',
- '鞭=biān',
- '鞮=dī',
- '鞯=jiān',
- '鞰=wēn,yùn',
- '鞱=tāo',
- '鞲=gōu',
- '鞳=tà',
- '鞴=bèi',
- '鞵=xié',
- '鞶=pán',
- '鞷=gé',
- '鞸=bì,bǐng',
- '鞹=kuò',
- '鞺=tāng',
- '鞻=lóu',
- '鞼=guì',
- '鞽=qiáo',
- '鞾=xuē',
- '鞿=jī',
- '韀=jiān',
- '韁=jiāng',
- '韂=chàn',
- '韃=dá',
- '韄=huò',
- '韅=xiǎn',
- '韆=qiān',
- '韇=dú',
- '韈=wā',
- '韉=jiān',
- '韊=lán',
- '韋=wéi',
- '韌=rèn',
- '韍=fú',
- '韎=mèi,wà',
- '韏=quàn',
- '韐=gé',
- '韑=wěi',
- '韒=qiào',
- '韓=hán',
- '韔=chàng',
- '韕=kuò',
- '韖=rǒu',
- '韗=yùn',
- '韘=shè,xiè',
- '韙=wěi',
- '韚=gé',
- '韛=bài',
- '韜=tāo',
- '韝=gōu',
- '韞=yùn',
- '韟=gāo',
- '韠=bì',
- '韡=wěi',
- '韢=suì',
- '韣=dú',
- '韤=wà',
- '韥=dú',
- '韦=wéi',
- '韧=rèn',
- '韨=fú',
- '韩=hán',
- '韪=wěi',
- '韫=yùn,wēn',
- '韬=tāo',
- '韭=jiǔ',
- '韮=jiǔ',
- '韯=xiān',
- '韰=xiè',
- '韱=xiān',
- '韲=jī',
- '音=yīn',
- '韴=zá',
- '韵=yùn',
- '韶=sháo',
- '韷=lè',
- '韸=péng',
- '韹=huáng',
- '韺=yīng',
- '韻=yùn',
- '韼=péng',
- '韽=ān',
- '韾=yīn',
- '響=xiǎng',
- '頀=hù',
- '頁=yè',
- '頂=dǐng',
- '頃=qǐng',
- '頄=qiú',
- '項=xiàng',
- '順=shùn',
- '頇=hān',
- '須=xū',
- '頉=yí',
- '頊=xù',
- '頋=ě',
- '頌=sòng',
- '頍=kuǐ',
- '頎=qí',
- '頏=háng',
- '預=yù',
- '頑=wán',
- '頒=bān',
- '頓=dùn',
- '頔=dí',
- '頕=dān',
- '頖=pàn',
- '頗=pō',
- '領=lǐng',
- '頙=chè',
- '頚=jǐng',
- '頛=lèi',
- '頜=hé',
- '頝=qiāo',
- '頞=è',
- '頟=é',
- '頠=wěi',
- '頡=jié',
- '頢=kuò',
- '頣=shěn',
- '頤=yí',
- '頥=yí',
- '頦=kē',
- '頧=duǐ',
- '頨=yǔ',
- '頩=pīng',
- '頪=lèi',
- '頫=fǔ',
- '頬=jiá',
- '頭=tóu',
- '頮=huì',
- '頯=kuí',
- '頰=jiá',
- '頱=luō',
- '頲=tǐng',
- '頳=chēng',
- '頴=yǐng',
- '頵=jūn',
- '頶=hú',
- '頷=hàn',
- '頸=jǐng',
- '頹=tuí',
- '頺=tuí',
- '頻=bīn',
- '頼=lài',
- '頽=tuí',
- '頾=zī',
- '頿=zī',
- '顀=chuí',
- '顁=dìng',
- '顂=lài',
- '顃=tán',
- '顄=hàn',
- '顅=qiān',
- '顆=kē',
- '顇=cuì',
- '顈=jiǒng',
- '顉=qīn',
- '顊=yí',
- '顋=sāi',
- '題=tí',
- '額=é',
- '顎=è',
- '顏=yán',
- '顐=wèn',
- '顑=kǎn',
- '顒=yóng',
- '顓=zhuān',
- '顔=yán',
- '顕=xiǎn',
- '顖=xìn',
- '顗=yǐ',
- '願=yuàn',
- '顙=sǎng',
- '顚=diān',
- '顛=diān',
- '顜=jiǎng',
- '顝=kuī',
- '類=lèi',
- '顟=láo',
- '顠=piǎo',
- '顡=wài',
- '顢=mān',
- '顣=cù',
- '顤=yáo',
- '顥=hào',
- '顦=qiáo',
- '顧=gù',
- '顨=xùn',
- '顩=yǎn',
- '顪=huì',
- '顫=chàn',
- '顬=rú',
- '顭=méng',
- '顮=bīn',
- '顯=xiǎn',
- '顰=pín',
- '顱=lú',
- '顲=lǎn',
- '顳=niè',
- '顴=quán',
- '页=yè',
- '顶=dǐng',
- '顷=qǐng',
- '顸=hān',
- '项=xiàng',
- '顺=shùn',
- '须=xū',
- '顼=xū',
- '顽=wán',
- '顾=gù',
- '顿=dùn',
- '颀=qí',
- '颁=bān',
- '颂=sòng',
- '颃=háng',
- '预=yù',
- '颅=lú',
- '领=lǐng',
- '颇=pō',
- '颈=jǐng,gěng',
- '颉=jié,xié,jiá',
- '颊=jiá',
- '颋=tǐng',
- '颌=hé,gé',
- '颍=yǐng',
- '颎=jiǒng',
- '颏=kē',
- '颐=yí',
- '频=pín,bīn',
- '颒=huì',
- '颓=tuí',
- '颔=hàn',
- '颕=yǐng',
- '颖=yǐng',
- '颗=kē',
- '题=tí',
- '颙=yóng',
- '颚=è',
- '颛=zhuān',
- '颜=yán',
- '额=é',
- '颞=niè',
- '颟=mān',
- '颠=diān',
- '颡=sǎng',
- '颢=hào',
- '颣=lèi',
- '颤=chàn,zhàn',
- '颥=rú',
- '颦=pín',
- '颧=quán',
- '風=fēng,fěng',
- '颩=biāo,diū',
- '颪=guā',
- '颫=fú',
- '颬=xiā',
- '颭=zhǎn',
- '颮=biāo',
- '颯=sà',
- '颰=bá,fú',
- '颱=tái',
- '颲=liè',
- '颳=guā',
- '颴=xuàn',
- '颵=xiāo',
- '颶=jù',
- '颷=biāo',
- '颸=sī',
- '颹=wěi',
- '颺=yáng',
- '颻=yáo',
- '颼=sōu',
- '颽=kǎi',
- '颾=sāo,sōu',
- '颿=fān',
- '飀=liú',
- '飁=xí',
- '飂=liù,liáo',
- '飃=piāo',
- '飄=piāo',
- '飅=liú',
- '飆=biāo',
- '飇=biāo',
- '飈=biāo',
- '飉=liáo',
- '飊=biāo',
- '飋=sè',
- '飌=fēng',
- '飍=xiū',
- '风=fēng,fěng',
- '飏=yáng',
- '飐=zhǎn',
- '飑=biāo',
- '飒=sà',
- '飓=jù',
- '飔=sī',
- '飕=sōu',
- '飖=yáo',
- '飗=liú',
- '飘=piāo',
- '飙=biāo',
- '飚=biāo',
- '飛=fēi',
- '飜=fān',
- '飝=fēi',
- '飞=fēi',
- '食=shí,sì,yì',
- '飠=shí',
- '飡=cān',
- '飢=jī',
- '飣=dìng',
- '飤=sì',
- '飥=tuō',
- '飦=zhān',
- '飧=sūn',
- '飨=xiǎng',
- '飩=tún',
- '飪=rèn',
- '飫=yù',
- '飬=yǎng,juàn',
- '飭=chì',
- '飮=yǐn,yìn',
- '飯=fàn',
- '飰=fàn',
- '飱=sūn',
- '飲=yǐn,yìn',
- '飳=zhù,tǒu',
- '飴=yí,sì',
- '飵=zuò,zé,zhā',
- '飶=bì',
- '飷=jiě',
- '飸=tāo',
- '飹=bǎo',
- '飺=cí',
- '飻=tiè',
- '飼=sì',
- '飽=bǎo',
- '飾=shì',
- '飿=duò',
- '餀=hài',
- '餁=rèn',
- '餂=tiǎn',
- '餃=jiǎo',
- '餄=hé',
- '餅=bǐng',
- '餆=yáo',
- '餇=tóng',
- '餈=cí',
- '餉=xiǎng',
- '養=yǎng',
- '餋=juàn',
- '餌=ěr',
- '餍=yàn',
- '餎=lè',
- '餏=xī',
- '餐=cān',
- '餑=bō',
- '餒=něi',
- '餓=è',
- '餔=bū',
- '餕=jùn',
- '餖=dòu',
- '餗=sù',
- '餘=yú',
- '餙=shì',
- '餚=yáo',
- '餛=hún',
- '餜=guǒ',
- '餝=shì',
- '餞=jiàn',
- '餟=chuò',
- '餠=bǐng',
- '餡=xiàn',
- '餢=bù',
- '餣=yè',
- '餤=dàn',
- '餥=fēi',
- '餦=zhāng',
- '餧=wèi',
- '館=guǎn',
- '餩=è',
- '餪=nuǎn',
- '餫=yùn',
- '餬=hú',
- '餭=huáng',
- '餮=tiè',
- '餯=huì',
- '餰=jiān',
- '餱=hóu',
- '餲=ài',
- '餳=xíng',
- '餴=fēn',
- '餵=wèi',
- '餶=gǔ',
- '餷=chā',
- '餸=sòng',
- '餹=táng',
- '餺=bó',
- '餻=gāo',
- '餼=xì',
- '餽=kuì',
- '餾=liù',
- '餿=sōu',
- '饀=táo',
- '饁=yè',
- '饂=wēn',
- '饃=mó',
- '饄=táng',
- '饅=mán',
- '饆=bì',
- '饇=yù',
- '饈=xiū',
- '饉=jǐn',
- '饊=sǎn',
- '饋=kuì',
- '饌=zhuàn',
- '饍=shàn',
- '饎=xī',
- '饏=dàn',
- '饐=yì',
- '饑=jī',
- '饒=ráo',
- '饓=chēng',
- '饔=yōng',
- '饕=tāo',
- '饖=wèi',
- '饗=xiǎng',
- '饘=zhān',
- '饙=fēn',
- '饚=hài',
- '饛=méng',
- '饜=yàn',
- '饝=mó',
- '饞=chán',
- '饟=xiǎng,náng',
- '饠=luó',
- '饡=zàn',
- '饢=náng',
- '饣=shí',
- '饤=dìng',
- '饥=jī',
- '饦=tuō',
- '饧=xíng',
- '饨=tún',
- '饩=xì',
- '饪=rèn',
- '饫=yù',
- '饬=chì',
- '饭=fàn',
- '饮=yǐn',
- '饯=jiàn',
- '饰=shì',
- '饱=bǎo',
- '饲=sì',
- '饳=duò',
- '饴=yí',
- '饵=ěr',
- '饶=ráo',
- '饷=xiǎng',
- '饸=hé',
- '饹=gē,le',
- '饺=jiǎo',
- '饻=xī',
- '饼=bǐng',
- '饽=bō',
- '饾=dòu',
- '饿=è',
- '馀=yú',
- '馁=něi',
- '馂=jùn',
- '馃=guǒ',
- '馄=hún',
- '馅=xiàn',
- '馆=guǎn',
- '馇=chā',
- '馈=kuì',
- '馉=gǔ',
- '馊=sōu',
- '馋=chán',
- '馌=yè',
- '馍=mó',
- '馎=bó',
- '馏=liù,liú',
- '馐=xiū',
- '馑=jǐn',
- '馒=mán',
- '馓=sǎn',
- '馔=zhuàn',
- '馕=náng,nǎng',
- '首=shǒu',
- '馗=kuí',
- '馘=guó',
- '香=xiāng',
- '馚=fēn',
- '馛=bó',
- '馜=ní',
- '馝=bì',
- '馞=bó',
- '馟=tú',
- '馠=hān',
- '馡=fēi',
- '馢=jiān',
- '馣=ān',
- '馤=ài',
- '馥=fù',
- '馦=xiān',
- '馧=yūn,wò',
- '馨=xīn',
- '馩=fén',
- '馪=pīn',
- '馫=xīn',
- '馬=mǎ',
- '馭=yù',
- '馮=féng,píng',
- '馯=hàn,hán',
- '馰=dí',
- '馱=tuó,duò',
- '馲=tuō,zhé',
- '馳=chí',
- '馴=xùn',
- '馵=zhù',
- '馶=zhī,shì',
- '馷=pèi',
- '馸=xìn,jìn',
- '馹=rì',
- '馺=sà',
- '馻=yǔn',
- '馼=wén',
- '馽=zhí',
- '馾=dǎn,dàn',
- '馿=lú',
- '駀=yóu',
- '駁=bó',
- '駂=bǎo',
- '駃=jué,kuài',
- '駄=tuó,duò',
- '駅=yì',
- '駆=qū',
- '駇=wén',
- '駈=qū',
- '駉=jiōng',
- '駊=pǒ',
- '駋=zhāo',
- '駌=yuān',
- '駍=pēng',
- '駎=zhòu',
- '駏=jù',
- '駐=zhù',
- '駑=nú',
- '駒=jū',
- '駓=pī',
- '駔=zǎng',
- '駕=jià',
- '駖=líng',
- '駗=zhěn',
- '駘=tái,dài',
- '駙=fù',
- '駚=yǎng',
- '駛=shǐ',
- '駜=bì',
- '駝=tuó',
- '駞=tuó',
- '駟=sì',
- '駠=liú',
- '駡=mà',
- '駢=pián',
- '駣=táo',
- '駤=zhì',
- '駥=róng',
- '駦=téng',
- '駧=dòng',
- '駨=xún,xuān',
- '駩=quán',
- '駪=shēn',
- '駫=jiōng',
- '駬=ěr',
- '駭=hài',
- '駮=bó',
- '駯=zhū',
- '駰=yīn',
- '駱=luò',
- '駲=zhōu',
- '駳=dàn',
- '駴=hài',
- '駵=liú',
- '駶=jú',
- '駷=sǒng',
- '駸=qīn',
- '駹=máng',
- '駺=liáng,láng',
- '駻=hàn',
- '駼=tú',
- '駽=xuān',
- '駾=tuì',
- '駿=jùn',
- '騀=ě',
- '騁=chěng',
- '騂=xīng',
- '騃=sì',
- '騄=lù',
- '騅=zhuī',
- '騆=zhōu',
- '騇=shè',
- '騈=pián',
- '騉=kūn',
- '騊=táo',
- '騋=lái',
- '騌=zōng',
- '騍=kè',
- '騎=qí',
- '騏=qí',
- '騐=yàn',
- '騑=fēi',
- '騒=sāo',
- '験=yàn',
- '騔=gé',
- '騕=yǎo',
- '騖=wù',
- '騗=piàn',
- '騘=cōng',
- '騙=piàn',
- '騚=qián',
- '騛=fēi',
- '騜=huáng',
- '騝=qián',
- '騞=huō',
- '騟=yú',
- '騠=tí',
- '騡=quán',
- '騢=xiá',
- '騣=zōng',
- '騤=kuí',
- '騥=róu',
- '騦=sī',
- '騧=guā',
- '騨=tuó',
- '騩=guī',
- '騪=sōu',
- '騫=qiān',
- '騬=chéng',
- '騭=zhì',
- '騮=liú',
- '騯=péng',
- '騰=téng',
- '騱=xí',
- '騲=cǎo',
- '騳=dú',
- '騴=yàn',
- '騵=yuán',
- '騶=zōu',
- '騷=sāo',
- '騸=shàn',
- '騹=qí',
- '騺=zhì',
- '騻=shuāng',
- '騼=lù',
- '騽=xí',
- '騾=luó',
- '騿=zhāng',
- '驀=mò',
- '驁=ào',
- '驂=cān',
- '驃=piào',
- '驄=cōng',
- '驅=qū',
- '驆=bì',
- '驇=zhì',
- '驈=yù',
- '驉=xū',
- '驊=huá',
- '驋=bō',
- '驌=sù',
- '驍=xiāo',
- '驎=lín',
- '驏=zhàn',
- '驐=dūn',
- '驑=liú',
- '驒=tuó',
- '驓=céng',
- '驔=diàn',
- '驕=jiāo',
- '驖=tiě',
- '驗=yàn',
- '驘=luó',
- '驙=zhān',
- '驚=jīng',
- '驛=yì',
- '驜=yè',
- '驝=tuó',
- '驞=pīn',
- '驟=zhòu',
- '驠=yàn',
- '驡=lóng',
- '驢=lǘ',
- '驣=téng',
- '驤=xiāng',
- '驥=jì',
- '驦=shuāng',
- '驧=jú',
- '驨=xí',
- '驩=huān',
- '驪=lí',
- '驫=biāo',
- '马=mǎ',
- '驭=yù',
- '驮=tuó',
- '驯=xùn',
- '驰=chí',
- '驱=qū',
- '驲=rì',
- '驳=bó',
- '驴=lǘ',
- '驵=zǎng',
- '驶=shǐ',
- '驷=sì',
- '驸=fù',
- '驹=jū',
- '驺=zōu',
- '驻=zhù',
- '驼=tuó',
- '驽=nú',
- '驾=jià',
- '驿=yì',
- '骀=tái',
- '骁=xiāo',
- '骂=mà',
- '骃=yīn',
- '骄=jiāo',
- '骅=huá',
- '骆=luò',
- '骇=hài',
- '骈=pián',
- '骉=biāo',
- '骊=lí',
- '骋=chěng',
- '验=yàn',
- '骍=xīng',
- '骎=qīn',
- '骏=jùn',
- '骐=qí',
- '骑=qí',
- '骒=kè',
- '骓=zhuī',
- '骔=zōng',
- '骕=sù',
- '骖=cān',
- '骗=piàn',
- '骘=zhì',
- '骙=kuí',
- '骚=sāo,sǎo',
- '骛=wù',
- '骜=áo',
- '骝=liú',
- '骞=qiān',
- '骟=shàn',
- '骠=biāo,piào',
- '骡=luó',
- '骢=cōng',
- '骣=chǎn',
- '骤=zhòu',
- '骥=jì',
- '骦=shuāng',
- '骧=xiāng',
- '骨=gǔ,gū',
- '骩=wěi',
- '骪=wěi',
- '骫=wěi',
- '骬=yú',
- '骭=gàn',
- '骮=yì',
- '骯=āng',
- '骰=tóu',
- '骱=jiè',
- '骲=bào',
- '骳=bèi,mó',
- '骴=cī',
- '骵=tǐ',
- '骶=dǐ',
- '骷=kū',
- '骸=hái',
- '骹=qiāo,xiāo',
- '骺=hóu',
- '骻=kuà',
- '骼=gé',
- '骽=tuǐ',
- '骾=gěng',
- '骿=pián',
- '髀=bì',
- '髁=kē',
- '髂=qià',
- '髃=yú',
- '髄=suí',
- '髅=lóu',
- '髆=bó',
- '髇=xiāo',
- '髈=bǎng',
- '髉=bó,jué',
- '髊=cī',
- '髋=kuān',
- '髌=bìn',
- '髍=mó',
- '髎=liáo',
- '髏=lóu',
- '髐=xiāo',
- '髑=dú',
- '髒=zāng',
- '髓=suǐ',
- '體=tǐ,tī',
- '髕=bìn',
- '髖=kuān',
- '髗=lú',
- '高=gāo',
- '髙=gāo',
- '髚=qiào',
- '髛=kāo',
- '髜=qiǎo',
- '髝=láo',
- '髞=sào',
- '髟=biāo',
- '髠=kūn',
- '髡=kūn',
- '髢=dí',
- '髣=fǎng',
- '髤=xiū',
- '髥=rán',
- '髦=máo',
- '髧=dàn',
- '髨=kūn',
- '髩=bìn',
- '髪=fà',
- '髫=tiáo',
- '髬=pī',
- '髭=zī',
- '髮=fà',
- '髯=rán',
- '髰=tì',
- '髱=bào',
- '髲=bì,pǒ',
- '髳=máo,méng',
- '髴=fú',
- '髵=ér',
- '髶=èr',
- '髷=qū',
- '髸=gōng',
- '髹=xiū',
- '髺=kuò,yuè',
- '髻=jì',
- '髼=péng',
- '髽=zhuā',
- '髾=shāo',
- '髿=shā',
- '鬀=tì',
- '鬁=lì',
- '鬂=bìn',
- '鬃=zōng',
- '鬄=tì',
- '鬅=péng',
- '鬆=sōng',
- '鬇=zhēng',
- '鬈=quán',
- '鬉=zōng',
- '鬊=shùn',
- '鬋=jiǎn',
- '鬌=duǒ',
- '鬍=hú',
- '鬎=là',
- '鬏=jiū',
- '鬐=qí',
- '鬑=lián',
- '鬒=zhěn',
- '鬓=bìn',
- '鬔=péng',
- '鬕=mà',
- '鬖=sān',
- '鬗=mán',
- '鬘=mán',
- '鬙=sēng',
- '鬚=xū',
- '鬛=liè',
- '鬜=qiān',
- '鬝=qiān',
- '鬞=nóng',
- '鬟=huán',
- '鬠=kuò',
- '鬡=níng',
- '鬢=bìn',
- '鬣=liè',
- '鬤=ráng',
- '鬥=dòu',
- '鬦=dòu',
- '鬧=nào',
- '鬨=hòng',
- '鬩=xì',
- '鬪=dòu',
- '鬫=kàn',
- '鬬=dòu',
- '鬭=dòu',
- '鬮=jiū',
- '鬯=chàng',
- '鬰=yù',
- '鬱=yù',
- '鬲=gé,lì',
- '鬳=yàn',
- '鬴=fǔ',
- '鬵=zèng',
- '鬶=guī',
- '鬷=zōng',
- '鬸=liù',
- '鬹=guī',
- '鬺=shāng',
- '鬻=yù',
- '鬼=guǐ',
- '鬽=mèi',
- '鬾=jì',
- '鬿=qí',
- '魀=gà',
- '魁=kuí',
- '魂=hún',
- '魃=bá',
- '魄=pò',
- '魅=mèi',
- '魆=xū',
- '魇=yǎn',
- '魈=xiāo',
- '魉=liǎng',
- '魊=yù',
- '魋=tuí',
- '魌=qī',
- '魍=wǎng',
- '魎=liǎng',
- '魏=wèi',
- '魐=gān',
- '魑=chī',
- '魒=piāo',
- '魓=bì',
- '魔=mó',
- '魕=jī',
- '魖=xū',
- '魗=chǒu',
- '魘=yǎn',
- '魙=zhān',
- '魚=yú',
- '魛=dāo',
- '魜=rén',
- '魝=jì',
- '魞=bā,bà',
- '魟=hóng',
- '魠=tuō',
- '魡=diào',
- '魢=jǐ',
- '魣=yú',
- '魤=é',
- '魥=jì',
- '魦=shā',
- '魧=háng',
- '魨=tún',
- '魩=mò',
- '魪=jiè',
- '魫=shěn',
- '魬=bǎn',
- '魭=yuán',
- '魮=pí',
- '魯=lǔ',
- '魰=wén',
- '魱=hú',
- '魲=lú',
- '魳=zā',
- '魴=fáng',
- '魵=fén',
- '魶=nà',
- '魷=yóu',
- '魸=piàn',
- '魹=mó',
- '魺=hé',
- '魻=xiá',
- '魼=qū',
- '魽=hān',
- '魾=pī',
- '魿=líng',
- '鮀=tuó',
- '鮁=bà',
- '鮂=qiú',
- '鮃=píng',
- '鮄=fú',
- '鮅=bì',
- '鮆=cǐ,jì',
- '鮇=wèi',
- '鮈=jū',
- '鮉=diāo',
- '鮊=bó,bà',
- '鮋=yóu',
- '鮌=gǔn',
- '鮍=pí',
- '鮎=nián',
- '鮏=xīng',
- '鮐=tái',
- '鮑=bào',
- '鮒=fù',
- '鮓=zhǎ,zhà',
- '鮔=jù',
- '鮕=gū',
- '鮖=shí',
- '鮗=dōng',
- '鮘=chou,dài',
- '鮙=tǎ',
- '鮚=jié',
- '鮛=shū',
- '鮜=hòu',
- '鮝=xiǎng',
- '鮞=ér',
- '鮟=ān',
- '鮠=wéi',
- '鮡=zhào',
- '鮢=zhū',
- '鮣=yìn',
- '鮤=liè',
- '鮥=luò,gé',
- '鮦=tóng',
- '鮧=yí',
- '鮨=yì',
- '鮩=bìng',
- '鮪=wěi',
- '鮫=jiāo',
- '鮬=kū',
- '鮭=guī,xié',
- '鮮=xiān,xiǎn',
- '鮯=gé',
- '鮰=huí',
- '鮱=lǎo',
- '鮲=fú',
- '鮳=kào',
- '鮴=xiū',
- '鮵=tuō',
- '鮶=jūn',
- '鮷=tí',
- '鮸=miǎn',
- '鮹=shāo',
- '鮺=zhǎ',
- '鮻=suō',
- '鮼=qīn',
- '鮽=yú',
- '鮾=něi',
- '鮿=zhé',
- '鯀=gǔn',
- '鯁=gěng',
- '鯂=sū',
- '鯃=wú',
- '鯄=qiú',
- '鯅=shān',
- '鯆=pū,bū',
- '鯇=huàn',
- '鯈=tiáo',
- '鯉=lǐ',
- '鯊=shā',
- '鯋=shā',
- '鯌=kào',
- '鯍=méng',
- '鯎=chéng',
- '鯏=lí',
- '鯐=zǒu',
- '鯑=xī',
- '鯒=yǒng',
- '鯓=shēn',
- '鯔=zī',
- '鯕=qí',
- '鯖=qīng',
- '鯗=xiǎng',
- '鯘=něi',
- '鯙=chún',
- '鯚=jì',
- '鯛=diāo',
- '鯜=qiè',
- '鯝=gù',
- '鯞=zhǒu',
- '鯟=dōng',
- '鯠=lái',
- '鯡=fēi',
- '鯢=ní',
- '鯣=yì,sī',
- '鯤=kūn',
- '鯥=lù',
- '鯦=jiù',
- '鯧=chāng',
- '鯨=jīng',
- '鯩=lún',
- '鯪=líng',
- '鯫=zōu',
- '鯬=lí',
- '鯭=měng',
- '鯮=zōng',
- '鯯=zhì',
- '鯰=nián',
- '鯱=hǔ',
- '鯲=yú',
- '鯳=dǐ',
- '鯴=shī',
- '鯵=shēn',
- '鯶=huàn',
- '鯷=tí',
- '鯸=hóu',
- '鯹=xīng',
- '鯺=zhū',
- '鯻=là',
- '鯼=zōng',
- '鯽=jì',
- '鯾=biān',
- '鯿=biān',
- '鰀=huàn',
- '鰁=quán',
- '鰂=zéi',
- '鰃=wēi',
- '鰄=wēi',
- '鰅=yú',
- '鰆=chūn',
- '鰇=róu',
- '鰈=dié',
- '鰉=huáng',
- '鰊=liàn',
- '鰋=yǎn',
- '鰌=qiū',
- '鰍=qiū',
- '鰎=jiǎn',
- '鰏=bī',
- '鰐=è',
- '鰑=yáng',
- '鰒=fù',
- '鰓=sāi,xǐ',
- '鰔=jiān',
- '鰕=xiā',
- '鰖=tuǒ',
- '鰗=hú',
- '鰘=shì',
- '鰙=ruò',
- '鰚=xuān',
- '鰛=wēn',
- '鰜=jiān',
- '鰝=hào',
- '鰞=wū',
- '鰟=páng',
- '鰠=sāo',
- '鰡=liú',
- '鰢=mǎ',
- '鰣=shí',
- '鰤=shī',
- '鰥=guān',
- '鰦=zī',
- '鰧=téng',
- '鰨=tǎ',
- '鰩=yáo',
- '鰪=è',
- '鰫=yóng',
- '鰬=qián',
- '鰭=qí',
- '鰮=wēn',
- '鰯=ruò',
- '鰰=shén',
- '鰱=lián',
- '鰲=áo',
- '鰳=lè',
- '鰴=huī',
- '鰵=mǐn',
- '鰶=jì',
- '鰷=tiáo',
- '鰸=qū',
- '鰹=jiān',
- '鰺=shēn',
- '鰻=mán',
- '鰼=xí',
- '鰽=qiú',
- '鰾=piào',
- '鰿=jì',
- '鱀=jì',
- '鱁=zhú',
- '鱂=jiāng',
- '鱃=xiū',
- '鱄=zhuān',
- '鱅=yōng',
- '鱆=zhāng',
- '鱇=kāng',
- '鱈=xuě',
- '鱉=biē',
- '鱊=yù',
- '鱋=qū',
- '鱌=xiàng',
- '鱍=bō',
- '鱎=jiǎo',
- '鱏=xún',
- '鱐=sù',
- '鱑=huáng',
- '鱒=zūn',
- '鱓=shàn',
- '鱔=shàn',
- '鱕=fān',
- '鱖=guì',
- '鱗=lín',
- '鱘=xún',
- '鱙=yáo',
- '鱚=xǐ',
- '鱛=zēng',
- '鱜=xiāng',
- '鱝=fèn',
- '鱞=guān',
- '鱟=hòu',
- '鱠=kuài',
- '鱡=zéi',
- '鱢=sāo',
- '鱣=zhān',
- '鱤=gǎn',
- '鱥=guì',
- '鱦=yìng',
- '鱧=lǐ',
- '鱨=cháng',
- '鱩=léi',
- '鱪=shǔ',
- '鱫=ài',
- '鱬=rú',
- '鱭=jì',
- '鱮=xù',
- '鱯=hù',
- '鱰=shǔ',
- '鱱=lǐ',
- '鱲=liè',
- '鱳=lè',
- '鱴=miè',
- '鱵=zhēn',
- '鱶=xiǎng',
- '鱷=è',
- '鱸=lú',
- '鱹=guàn',
- '鱺=lí',
- '鱻=xiān',
- '鱼=yú',
- '鱽=dāo',
- '鱾=jǐ',
- '鱿=yóu',
- '鲀=tún',
- '鲁=lǔ',
- '鲂=fáng',
- '鲃=bā,bà',
- '鲄=hé,gě',
- '鲅=bà',
- '鲆=píng',
- '鲇=nián',
- '鲈=lú',
- '鲉=yóu',
- '鲊=zhǎ,zhà',
- '鲋=fù',
- '鲌=bó,bà',
- '鲍=bào',
- '鲎=hòu',
- '鲏=pí',
- '鲐=tái',
- '鲑=guī,xié',
- '鲒=jié',
- '鲓=kào',
- '鲔=wěi',
- '鲕=ér',
- '鲖=tóng',
- '鲗=zéi',
- '鲘=hòu',
- '鲙=kuài',
- '鲚=jì',
- '鲛=jiāo',
- '鲜=xiān,xiǎn',
- '鲝=zhǎ',
- '鲞=xiǎng',
- '鲟=xún',
- '鲠=gěng',
- '鲡=lí',
- '鲢=lián',
- '鲣=jiān',
- '鲤=lǐ',
- '鲥=shí',
- '鲦=tiáo',
- '鲧=gǔn',
- '鲨=shā',
- '鲩=huàn',
- '鲪=jūn',
- '鲫=jì',
- '鲬=yǒng',
- '鲭=qīng',
- '鲮=líng',
- '鲯=qí',
- '鲰=zōu',
- '鲱=fēi',
- '鲲=kūn',
- '鲳=chāng',
- '鲴=gù',
- '鲵=ní',
- '鲶=nián',
- '鲷=diāo',
- '鲸=jīng',
- '鲹=shēn',
- '鲺=shī',
- '鲻=zī',
- '鲼=fèn',
- '鲽=dié',
- '鲾=bī',
- '鲿=cháng',
- '鳀=tí',
- '鳁=wēn',
- '鳂=wēi',
- '鳃=sāi,xǐ',
- '鳄=è',
- '鳅=qiū',
- '鳆=fù',
- '鳇=huáng',
- '鳈=quán',
- '鳉=jiāng',
- '鳊=biān',
- '鳋=sāo',
- '鳌=áo',
- '鳍=qí',
- '鳎=tǎ',
- '鳏=guān',
- '鳐=yáo',
- '鳑=páng',
- '鳒=jiān',
- '鳓=lè',
- '鳔=biào',
- '鳕=xuě',
- '鳖=biē',
- '鳗=mán',
- '鳘=mǐn',
- '鳙=yōng',
- '鳚=wèi',
- '鳛=xí',
- '鳜=guì,jué',
- '鳝=shàn',
- '鳞=lín',
- '鳟=zūn',
- '鳠=hù',
- '鳡=gǎn',
- '鳢=lǐ',
- '鳣=zhān,shàn',
- '鳤=guǎn',
- '鳥=niǎo,diǎo',
- '鳦=yǐ',
- '鳧=fú',
- '鳨=lì',
- '鳩=jiū',
- '鳪=bú',
- '鳫=yàn',
- '鳬=fú',
- '鳭=diāo,zhāo',
- '鳮=jī',
- '鳯=fèng',
- '鳰=rù',
- '鳱=gān,hàn,yàn',
- '鳲=shī',
- '鳳=fèng',
- '鳴=míng',
- '鳵=bǎo',
- '鳶=yuān',
- '鳷=zhī',
- '鳸=hù',
- '鳹=qín',
- '鳺=fū,guī',
- '鳻=bān,fén',
- '鳼=wén',
- '鳽=jiān,qiān,zhān',
- '鳾=shī',
- '鳿=yù',
- '鴀=fǒu',
- '鴁=yāo',
- '鴂=jué',
- '鴃=jué',
- '鴄=pǐ',
- '鴅=huān',
- '鴆=zhèn',
- '鴇=bǎo',
- '鴈=yàn',
- '鴉=yā',
- '鴊=zhèng',
- '鴋=fāng',
- '鴌=fèng',
- '鴍=wén',
- '鴎=ōu',
- '鴏=dài',
- '鴐=jiā',
- '鴑=rú',
- '鴒=líng',
- '鴓=miè',
- '鴔=fú',
- '鴕=tuó',
- '鴖=mín',
- '鴗=lì',
- '鴘=biǎn',
- '鴙=zhì',
- '鴚=gē',
- '鴛=yuān',
- '鴜=cí',
- '鴝=qú',
- '鴞=xiāo',
- '鴟=chī',
- '鴠=dàn',
- '鴡=jū',
- '鴢=yāo',
- '鴣=gū',
- '鴤=zhōng',
- '鴥=yù',
- '鴦=yāng',
- '鴧=yù',
- '鴨=yā',
- '鴩=dié',
- '鴪=yù',
- '鴫=tián',
- '鴬=yīng',
- '鴭=duī',
- '鴮=wū',
- '鴯=ér',
- '鴰=guā',
- '鴱=ài',
- '鴲=zhī',
- '鴳=yàn',
- '鴴=héng',
- '鴵=xiāo',
- '鴶=jiá',
- '鴷=liè',
- '鴸=zhū',
- '鴹=yáng',
- '鴺=yí',
- '鴻=hóng',
- '鴼=lù',
- '鴽=rú',
- '鴾=móu',
- '鴿=gē',
- '鵀=rén',
- '鵁=jiāo',
- '鵂=xiū',
- '鵃=zhōu',
- '鵄=chī',
- '鵅=luò',
- '鵆=héng',
- '鵇=nián',
- '鵈=ě',
- '鵉=luán',
- '鵊=jiá',
- '鵋=jì',
- '鵌=tú',
- '鵍=huān',
- '鵎=tuǒ',
- '鵏=bū',
- '鵐=wú',
- '鵑=jiān',
- '鵒=yù',
- '鵓=bó',
- '鵔=jùn',
- '鵕=jùn',
- '鵖=bī',
- '鵗=xī',
- '鵘=jùn',
- '鵙=jú',
- '鵚=tū',
- '鵛=jìng',
- '鵜=tí',
- '鵝=é',
- '鵞=é',
- '鵟=kuáng',
- '鵠=hú',
- '鵡=wǔ',
- '鵢=shēn',
- '鵣=lài',
- '鵤=zān',
- '鵥=pàn',
- '鵦=lù',
- '鵧=pí',
- '鵨=shū',
- '鵩=fú',
- '鵪=ān',
- '鵫=zhuó',
- '鵬=péng',
- '鵭=qín',
- '鵮=qiān',
- '鵯=bēi',
- '鵰=diāo',
- '鵱=lù',
- '鵲=què',
- '鵳=jiān',
- '鵴=jú',
- '鵵=tù',
- '鵶=yā',
- '鵷=yuān',
- '鵸=qí',
- '鵹=lí',
- '鵺=yè',
- '鵻=zhuī',
- '鵼=kōng',
- '鵽=duò',
- '鵾=kūn',
- '鵿=shēng',
- '鶀=qí',
- '鶁=jīng',
- '鶂=yì',
- '鶃=yì',
- '鶄=jīng',
- '鶅=zī',
- '鶆=lái',
- '鶇=dōng',
- '鶈=qī',
- '鶉=chún',
- '鶊=gēng',
- '鶋=jū',
- '鶌=qū',
- '鶍=yì',
- '鶎=zūn',
- '鶏=jī',
- '鶐=shù',
- '鶑=yīng',
- '鶒=chì',
- '鶓=miáo',
- '鶔=róu',
- '鶕=ān',
- '鶖=qiū',
- '鶗=tí,chí',
- '鶘=hú',
- '鶙=tí,chí',
- '鶚=è',
- '鶛=jiē',
- '鶜=máo',
- '鶝=fú,bì',
- '鶞=chūn',
- '鶟=tú',
- '鶠=yǎn',
- '鶡=hé,jiè',
- '鶢=yuán',
- '鶣=piān,biǎn',
- '鶤=kūn',
- '鶥=méi',
- '鶦=hú',
- '鶧=yīng',
- '鶨=chuàn,zhì',
- '鶩=wù',
- '鶪=jú',
- '鶫=dōng',
- '鶬=cāng,qiāng',
- '鶭=fǎng',
- '鶮=hè,hú',
- '鶯=yīng',
- '鶰=yuán',
- '鶱=xiān',
- '鶲=wēng',
- '鶳=shī',
- '鶴=hè',
- '鶵=chú',
- '鶶=táng',
- '鶷=xiá',
- '鶸=ruò',
- '鶹=liú',
- '鶺=jī',
- '鶻=gǔ,hú',
- '鶼=jiān',
- '鶽=sǔn,xùn',
- '鶾=hàn',
- '鶿=cí',
- '鷀=cí',
- '鷁=yì',
- '鷂=yào',
- '鷃=yàn',
- '鷄=jī',
- '鷅=lì',
- '鷆=tián',
- '鷇=kòu',
- '鷈=tī',
- '鷉=tī',
- '鷊=yì',
- '鷋=tú',
- '鷌=mǎ',
- '鷍=xiāo',
- '鷎=gāo',
- '鷏=tián',
- '鷐=chén',
- '鷑=jì',
- '鷒=tuán',
- '鷓=zhè',
- '鷔=áo',
- '鷕=yǎo',
- '鷖=yī',
- '鷗=ōu',
- '鷘=chì',
- '鷙=zhì',
- '鷚=liù',
- '鷛=yōng',
- '鷜=lóu,lǚ',
- '鷝=bì',
- '鷞=shuāng',
- '鷟=zhuó',
- '鷠=yú',
- '鷡=wú',
- '鷢=jué',
- '鷣=yín',
- '鷤=tí',
- '鷥=sī',
- '鷦=jiāo',
- '鷧=yì',
- '鷨=huá',
- '鷩=bì',
- '鷪=yīng',
- '鷫=sù',
- '鷬=huáng',
- '鷭=fán',
- '鷮=jiāo',
- '鷯=liáo',
- '鷰=yàn',
- '鷱=gāo',
- '鷲=jiù',
- '鷳=xián',
- '鷴=xián',
- '鷵=tú',
- '鷶=mǎi',
- '鷷=zūn',
- '鷸=yù',
- '鷹=yīng',
- '鷺=lù',
- '鷻=tuán',
- '鷼=xián',
- '鷽=xué',
- '鷾=yì',
- '鷿=pì',
- '鸀=zhǔ',
- '鸁=luó',
- '鸂=xī',
- '鸃=yì',
- '鸄=jī',
- '鸅=zé',
- '鸆=yú',
- '鸇=zhān',
- '鸈=yè',
- '鸉=yáng',
- '鸊=pì',
- '鸋=níng',
- '鸌=hù',
- '鸍=mí',
- '鸎=yīng',
- '鸏=méng',
- '鸐=dí',
- '鸑=yuè',
- '鸒=yù',
- '鸓=lěi',
- '鸔=bǔ',
- '鸕=lú',
- '鸖=hè',
- '鸗=lóng',
- '鸘=shuāng',
- '鸙=yuè',
- '鸚=yīng',
- '鸛=guàn',
- '鸜=qú',
- '鸝=lí',
- '鸞=luán',
- '鸟=niǎo',
- '鸠=jiū',
- '鸡=jī',
- '鸢=yuān',
- '鸣=míng',
- '鸤=shī',
- '鸥=ōu',
- '鸦=yā',
- '鸧=cāng',
- '鸨=bǎo',
- '鸩=zhèn',
- '鸪=gū',
- '鸫=dōng',
- '鸬=lú',
- '鸭=yā',
- '鸮=xiāo',
- '鸯=yāng',
- '鸰=líng',
- '鸱=chī',
- '鸲=qú',
- '鸳=yuān',
- '鸴=xué',
- '鸵=tuó',
- '鸶=sī',
- '鸷=zhì',
- '鸸=ér',
- '鸹=guā',
- '鸺=xiū',
- '鸻=héng',
- '鸼=zhōu',
- '鸽=gē',
- '鸾=luán',
- '鸿=hóng',
- '鹀=wú',
- '鹁=bó',
- '鹂=lí',
- '鹃=juān',
- '鹄=hú',
- '鹅=é',
- '鹆=yù',
- '鹇=xián',
- '鹈=tí',
- '鹉=wǔ',
- '鹊=què',
- '鹋=miáo',
- '鹌=ān',
- '鹍=kūn',
- '鹎=bēi',
- '鹏=péng',
- '鹐=qiān',
- '鹑=chún',
- '鹒=gēng',
- '鹓=yuān',
- '鹔=sù',
- '鹕=hú',
- '鹖=hé',
- '鹗=è',
- '鹘=gǔ',
- '鹙=qiū',
- '鹚=cí',
- '鹛=méi',
- '鹜=wù',
- '鹝=yì',
- '鹞=yào',
- '鹟=wēng',
- '鹠=liú',
- '鹡=jī',
- '鹢=yì',
- '鹣=jiān',
- '鹤=hè',
- '鹥=yī',
- '鹦=yīng',
- '鹧=zhè',
- '鹨=liù',
- '鹩=liáo',
- '鹪=jiāo',
- '鹫=jiù',
- '鹬=yù',
- '鹭=lù',
- '鹮=huán',
- '鹯=zhān',
- '鹰=yīng',
- '鹱=hù',
- '鹲=méng',
- '鹳=guàn',
- '鹴=shuāng',
- '鹵=lǔ',
- '鹶=jīn',
- '鹷=líng',
- '鹸=jiǎn',
- '鹹=xián',
- '鹺=cuó',
- '鹻=jiǎn',
- '鹼=jiǎn',
- '鹽=yán',
- '鹾=cuó',
- '鹿=lù',
- '麀=yōu',
- '麁=cū',
- '麂=jǐ',
- '麃=páo,biāo',
- '麄=cū',
- '麅=páo',
- '麆=zhù,cū',
- '麇=jūn,qún',
- '麈=zhǔ',
- '麉=jiān',
- '麊=mí',
- '麋=mí',
- '麌=yǔ',
- '麍=liú',
- '麎=chén',
- '麏=jūn',
- '麐=lín',
- '麑=ní',
- '麒=qí',
- '麓=lù',
- '麔=jiù',
- '麕=jūn',
- '麖=jīng',
- '麗=lì,lí',
- '麘=xiāng',
- '麙=xián',
- '麚=jiā',
- '麛=mí',
- '麜=lì',
- '麝=shè',
- '麞=zhāng',
- '麟=lín',
- '麠=jīng',
- '麡=qí',
- '麢=líng',
- '麣=yán',
- '麤=cū',
- '麥=mài',
- '麦=mài',
- '麧=hé',
- '麨=chǎo',
- '麩=fū',
- '麪=miàn',
- '麫=miàn',
- '麬=fū',
- '麭=pào',
- '麮=qù',
- '麯=qū',
- '麰=móu',
- '麱=fū',
- '麲=xiàn',
- '麳=lái',
- '麴=qū',
- '麵=miàn',
- '麶=chi',
- '麷=fēng',
- '麸=fū',
- '麹=qū',
- '麺=miàn',
- '麻=má',
- '麼=me,mó',
- '麽=me,mó',
- '麾=huī',
- '麿=mí',
- '黀=zōu',
- '黁=nún',
- '黂=fén',
- '黃=huáng',
- '黄=huáng',
- '黅=jīn',
- '黆=guāng',
- '黇=tiān',
- '黈=tǒu',
- '黉=hóng',
- '黊=huà',
- '黋=kuàng',
- '黌=hóng',
- '黍=shǔ',
- '黎=lí',
- '黏=nián',
- '黐=chī',
- '黑=hēi',
- '黒=hēi',
- '黓=yì',
- '黔=qián',
- '黕=dǎn',
- '黖=xì',
- '黗=tún',
- '默=mò',
- '黙=mò',
- '黚=qián',
- '黛=dài',
- '黜=chù',
- '黝=yǒu',
- '點=diǎn',
- '黟=yī',
- '黠=xiá',
- '黡=yǎn',
- '黢=qū',
- '黣=měi',
- '黤=yǎn',
- '黥=qíng',
- '黦=yuè',
- '黧=lí',
- '黨=dǎng',
- '黩=dú',
- '黪=cǎn',
- '黫=yān',
- '黬=yǎn',
- '黭=yǎn',
- '黮=dàn,shèn',
- '黯=àn',
- '黰=zhěn,yān',
- '黱=dài',
- '黲=cǎn',
- '黳=yī',
- '黴=méi',
- '黵=dǎn,zhǎn',
- '黶=yǎn',
- '黷=dú',
- '黸=lú',
- '黹=zhǐ',
- '黺=fěn',
- '黻=fú',
- '黼=fǔ',
- '黽=mǐn,miǎn,měng',
- '黾=mǐn,miǎn,měng',
- '黿=yuán',
- '鼀=cù',
- '鼁=qù',
- '鼂=cháo',
- '鼃=wā',
- '鼄=zhū',
- '鼅=zhī',
- '鼆=měng',
- '鼇=áo',
- '鼈=biē',
- '鼉=tuó',
- '鼊=bì',
- '鼋=yuán',
- '鼌=cháo',
- '鼍=tuó',
- '鼎=dǐng',
- '鼏=mì',
- '鼐=nài',
- '鼑=dǐng',
- '鼒=zī',
- '鼓=gǔ',
- '鼔=gǔ',
- '鼕=dōng',
- '鼖=fén',
- '鼗=táo',
- '鼘=yuān',
- '鼙=pí',
- '鼚=chāng',
- '鼛=gāo',
- '鼜=cào',
- '鼝=yuān',
- '鼞=tāng',
- '鼟=tēng',
- '鼠=shǔ',
- '鼡=shǔ',
- '鼢=fén',
- '鼣=fèi',
- '鼤=wén',
- '鼥=bá',
- '鼦=diāo',
- '鼧=tuó',
- '鼨=zhōng',
- '鼩=qú',
- '鼪=shēng',
- '鼫=shí',
- '鼬=yòu',
- '鼭=shí',
- '鼮=tíng',
- '鼯=wú',
- '鼰=jú',
- '鼱=jīng',
- '鼲=hún',
- '鼳=jú',
- '鼴=yǎn',
- '鼵=tū',
- '鼶=sī',
- '鼷=xī',
- '鼸=xiàn',
- '鼹=yǎn',
- '鼺=léi',
- '鼻=bí',
- '鼼=yào',
- '鼽=qiú',
- '鼾=hān',
- '鼿=wù',
- '齀=wù',
- '齁=hōu',
- '齂=xiè',
- '齃=è',
- '齄=zhā',
- '齅=xiù',
- '齆=wèng',
- '齇=zhā',
- '齈=nòng',
- '齉=nàng',
- '齊=qí',
- '齋=zhāi',
- '齌=jì',
- '齍=zī',
- '齎=jí',
- '齏=jī',
- '齐=qí',
- '齑=jī',
- '齒=chǐ',
- '齓=chèn',
- '齔=chèn',
- '齕=hé',
- '齖=yá',
- '齗=yīn',
- '齘=xiè',
- '齙=bāo',
- '齚=zé',
- '齛=xiè',
- '齜=zī',
- '齝=chī',
- '齞=yàn',
- '齟=jǔ',
- '齠=tiáo',
- '齡=líng',
- '齢=líng',
- '齣=chū',
- '齤=quán',
- '齥=xiè',
- '齦=yín',
- '齧=niè',
- '齨=jiù',
- '齩=yǎo',
- '齪=chuò',
- '齫=yǔn',
- '齬=yǔ',
- '齭=chǔ',
- '齮=yǐ',
- '齯=ní',
- '齰=zé',
- '齱=zōu',
- '齲=qǔ',
- '齳=yǔn',
- '齴=yǎn',
- '齵=yú',
- '齶=è',
- '齷=wò',
- '齸=yì',
- '齹=cī',
- '齺=zōu',
- '齻=diān',
- '齼=chǔ',
- '齽=jìn',
- '齾=yà',
- '齿=chǐ',
- '龀=chèn',
- '龁=hé',
- '龂=yín,kěn',
- '龃=jǔ',
- '龄=líng',
- '龅=bāo',
- '龆=tiáo',
- '龇=zī',
- '龈=yín,kěn',
- '龉=yǔ',
- '龊=chuò',
- '龋=qǔ',
- '龌=wò',
- '龍=lóng,lǒng',
- '龎=páng',
- '龏=gōng,wò',
- '龐=páng',
- '龑=yǎn',
- '龒=lóng',
- '龓=lóng,lǒng',
- '龔=gōng',
- '龕=kān',
- '龖=dá',
- '龗=líng',
- '龘=dá',
- '龙=lóng',
- '龚=gōng',
- '龛=kān',
- '龜=guī,jūn,qiū',
- '龝=qiū',
- '龞=biē',
- '龟=guī,jūn,qiū',
- '龠=yuè',
- '龡=chuī',
- '龢=hé',
- '龣=jiǎo',
- '龤=xié',
- '龥=yuè',
- '〇=líng',
- '一=yī',
- '丁=dīng,zhēng',
- '丂=kǎo,qiǎo,yú',
- '七=qī',
- '丄=shàng',
- '丅=xià',
- '丆=hǎn',
- '万=wàn,mò',
- '丈=zhàng',
- '三=sān',
- '上=shàng,shǎng',
- '下=xià',
- '丌=qí,jī',
- '不=bù,fǒu',
- '与=yǔ,yù,yú',
- '丏=miǎn',
- '丐=gài',
- '丑=chǒu',
- '丒=chǒu',
- '专=zhuān',
- '且=qiě,jū',
- '丕=pī',
- '世=shì',
- '丗=shì',
- '丘=qiū',
- '丙=bǐng',
- '业=yè',
- '丛=cóng',
- '东=dōng',
- '丝=sī',
- '丞=chéng',
- '丟=diū',
- '丠=qiū',
- '両=liǎng',
- '丢=diū',
- '丣=yǒu',
- '两=liǎng',
- '严=yán',
- '並=bìng',
- '丧=sàng,sāng',
- '丨=gǔn',
- '丩=jiū',
- '个=gè,gě',
- '丫=yā',
- '丬=pán',
- '中=zhōng,zhòng',
- '丮=jǐ',
- '丯=jiè',
- '丰=fēng',
- '丱=guàn,kuàng',
- '串=chuàn',
- '丳=chǎn',
- '临=lín',
- '丵=zhuó',
- '丶=zhǔ',
- '丷=bā',
- '丸=wán',
- '丹=dān',
- '为=wèi,wéi',
- '主=zhǔ',
- '丼=jǐng',
- '丽=lì,lí',
- '举=jǔ',
- '丿=piě',
- '乀=fú',
- '乁=yí,jí',
- '乂=yì',
- '乃=nǎi',
- '乄=wǔ',
- '久=jiǔ',
- '乆=jiǔ',
- '乇=tuō,zhé',
- '么=me,mó,ma,yāo',
- '义=yì',
- '乊=yī',
- '之=zhī',
- '乌=wū',
- '乍=zhà',
- '乎=hū',
- '乏=fá',
- '乐=lè,yuè,yào,lào',
- '乑=yín',
- '乒=pīng',
- '乓=pāng',
- '乔=qiáo',
- '乕=hǔ',
- '乖=guāi',
- '乗=chéng,shèng',
- '乘=chéng,shèng',
- '乙=yǐ',
- '乚=háo,yǐ',
- '乛=yǐ',
- '乜=miē,niè',
- '九=jiǔ',
- '乞=qǐ',
- '也=yě',
- '习=xí',
- '乡=xiāng',
- '乢=gài',
- '乣=jiǔ',
- '乤=xià',
- '乥=null',
- '书=shū',
- '乧=dǒu',
- '乨=shǐ',
- '乩=jī',
- '乪=náng',
- '乫=jiā',
- '乬=jù',
- '乭=shí',
- '乮=mǎo',
- '乯=hū',
- '买=mǎi',
- '乱=luàn',
- '乲=null',
- '乳=rǔ',
- '乴=xué',
- '乵=yǎn',
- '乶=fǔ',
- '乷=shā',
- '乸=nǎ',
- '乹=qián',
- '乺=suǒ',
- '乻=yú',
- '乼=zhù',
- '乽=zhě',
- '乾=qián,gān',
- '乿=zhì,luàn',
- '亀=guī',
- '亁=qián',
- '亂=luàn',
- '亃=lǐn,lìn',
- '亄=yì',
- '亅=jué',
- '了=le,liǎo',
- '亇=gè,mā',
- '予=yú,yǔ',
- '争=zhēng',
- '亊=shì',
- '事=shì',
- '二=èr',
- '亍=chù',
- '于=yú',
- '亏=kuī',
- '亐=yú',
- '云=yún',
- '互=hù',
- '亓=qí',
- '五=wǔ',
- '井=jǐng',
- '亖=sì',
- '亗=suì',
- '亘=gèn',
- '亙=gèn',
- '亚=yà',
- '些=xiē,suò',
- '亜=yà',
- '亝=qí,zhāi',
- '亞=yà,yā',
- '亟=jí,qì',
- '亠=tóu',
- '亡=wáng,wú',
- '亢=kàng',
- '亣=dà',
- '交=jiāo',
- '亥=hài',
- '亦=yì',
- '产=chǎn',
- '亨=hēng,pēng',
- '亩=mǔ',
- '亪=ye',
- '享=xiǎng',
- '京=jīng',
- '亭=tíng',
- '亮=liàng',
- '亯=xiǎng',
- '亰=jīng',
- '亱=yè',
- '亲=qīn,qìng',
- '亳=bó',
- '亴=yòu',
- '亵=xiè',
- '亶=dǎn,dàn',
- '亷=lián',
- '亸=duǒ',
- '亹=wěi,mén',
- '人=rén',
- '亻=rén',
- '亼=jí',
- '亽=jí',
- '亾=wáng',
- '亿=yì',
- '什=shén,shí',
- '仁=rén',
- '仂=lè',
- '仃=dīng',
- '仄=zè',
- '仅=jǐn,jìn',
- '仆=pū,pú',
- '仇=chóu,qiú',
- '仈=bā',
- '仉=zhǎng',
- '今=jīn',
- '介=jiè',
- '仌=bīng',
- '仍=réng',
- '从=cóng,zòng',
- '仏=fó',
- '仐=jīn,sǎn',
- '仑=lún',
- '仒=bīng',
- '仓=cāng',
- '仔=zǐ,zī,zǎi',
- '仕=shì',
- '他=tā',
- '仗=zhàng',
- '付=fù',
- '仙=xiān',
- '仚=xiān',
- '仛=tuō,chà,duó',
- '仜=hóng',
- '仝=tóng',
- '仞=rèn',
- '仟=qiān',
- '仠=gǎn,hàn',
- '仡=yì,gē',
- '仢=bó',
- '代=dài',
- '令=lìng,líng,lǐng',
- '以=yǐ',
- '仦=chào',
- '仧=cháng,zhǎng',
- '仨=sā',
- '仩=cháng',
- '仪=yí',
- '仫=mù',
- '们=mén',
- '仭=rèn',
- '仮=fǎn',
- '仯=chào,miǎo',
- '仰=yǎng,áng',
- '仱=qián',
- '仲=zhòng',
- '仳=pǐ,pí',
- '仴=wò',
- '仵=wǔ',
- '件=jiàn',
- '价=jià,jiè,jie',
- '仸=yǎo,fó',
- '仹=fēng',
- '仺=cāng',
- '任=rèn,rén',
- '仼=wáng',
- '份=fèn,bīn',
- '仾=dī',
- '仿=fǎng',
- '伀=zhōng',
- '企=qǐ',
- '伂=pèi',
- '伃=yú',
- '伄=diào',
- '伅=dùn',
- '伆=wěn',
- '伇=yì',
- '伈=xǐn',
- '伉=kàng',
- '伊=yī',
- '伋=jí',
- '伌=ài',
- '伍=wǔ',
- '伎=jì,qí',
- '伏=fú',
- '伐=fá',
- '休=xiū,xǔ',
- '伒=jìn,yín',
- '伓=pī',
- '伔=dǎn',
- '伕=fū',
- '伖=tǎng',
- '众=zhòng',
- '优=yōu',
- '伙=huǒ',
- '会=huì,kuài',
- '伛=yǔ',
- '伜=cuì',
- '伝=yún',
- '伞=sǎn',
- '伟=wěi',
- '传=chuán,zhuàn',
- '伡=chē,jū',
- '伢=yá',
- '伣=qiàn',
- '伤=shāng',
- '伥=chāng',
- '伦=lún',
- '伧=cāng,chen',
- '伨=xùn',
- '伩=xìn',
- '伪=wěi',
- '伫=zhù',
- '伬=chǐ',
- '伭=xián,xuán',
- '伮=nú,nǔ',
- '伯=bó,bǎi,bà',
- '估=gū,gù',
- '伱=nǐ',
- '伲=nǐ,nì',
- '伳=xiè',
- '伴=bàn',
- '伵=xù',
- '伶=líng',
- '伷=zhòu',
- '伸=shēn',
- '伹=qū',
- '伺=cì,sì',
- '伻=bēng',
- '似=sì,shì',
- '伽=jiā,qié,gā',
- '伾=pī',
- '伿=yì',
- '佀=sì',
- '佁=yǐ,chì',
- '佂=zhēng',
- '佃=diàn,tián',
- '佄=hān,gàn',
- '佅=mài',
- '但=dàn',
- '佇=zhù',
- '佈=bù',
- '佉=qū',
- '佊=bǐ',
- '佋=zhāo,shào',
- '佌=cǐ',
- '位=wèi',
- '低=dī',
- '住=zhù',
- '佐=zuǒ',
- '佑=yòu',
- '佒=yǎng',
- '体=tǐ,tī',
- '佔=zhàn,diān',
- '何=hé,hē,hè',
- '佖=bì',
- '佗=tuó',
- '佘=shé',
- '余=yú',
- '佚=yì,dié',
- '佛=fó,fú,bì,bó',
- '作=zuò',
- '佝=gōu,kòu',
- '佞=nìng',
- '佟=tóng',
- '你=nǐ',
- '佡=xiān',
- '佢=qú',
- '佣=yōng,yòng',
- '佤=wǎ',
- '佥=qiān',
- '佦=yòu',
- '佧=kǎ',
- '佨=bāo',
- '佩=pèi',
- '佪=huí,huái',
- '佫=gé',
- '佬=lǎo',
- '佭=xiáng',
- '佮=gé',
- '佯=yáng',
- '佰=bǎi',
- '佱=fǎ',
- '佲=mǐng',
- '佳=jiā',
- '佴=èr,nài',
- '併=bìng',
- '佶=jí',
- '佷=hěn',
- '佸=huó',
- '佹=guǐ',
- '佺=quán',
- '佻=tiāo',
- '佼=jiǎo',
- '佽=cì',
- '佾=yì',
- '使=shǐ',
- '侀=xíng',
- '侁=shēn',
- '侂=tuō',
- '侃=kǎn',
- '侄=zhí',
- '侅=gāi',
- '來=lái',
- '侇=yí',
- '侈=chǐ',
- '侉=kuǎ',
- '侊=gōng',
- '例=lì',
- '侌=yīn',
- '侍=shì',
- '侎=mǐ',
- '侏=zhū',
- '侐=xù',
- '侑=yòu',
- '侒=ān',
- '侓=lù',
- '侔=móu',
- '侕=ér',
- '侖=lún',
- '侗=dòng,tóng,tǒng',
- '侘=chà',
- '侙=chì',
- '侚=xùn',
- '供=gòng,gōng',
- '侜=zhōu',
- '依=yī',
- '侞=rú',
- '侟=cún,jiàn',
- '侠=xiá',
- '価=sì',
- '侢=dài',
- '侣=lǚ',
- '侤=ta',
- '侥=jiǎo,yáo',
- '侦=zhēn',
- '侧=cè,zè,zhāi',
- '侨=qiáo',
- '侩=kuài',
- '侪=chái',
- '侫=nìng',
- '侬=nóng',
- '侭=jǐn',
- '侮=wǔ',
- '侯=hóu,hòu',
- '侰=jiǒng',
- '侱=chěng,tǐng',
- '侲=zhèn,zhēn',
- '侳=zuò',
- '侴=hào',
- '侵=qīn',
- '侶=lǚ',
- '侷=jú',
- '侸=shù,dōu',
- '侹=tǐng',
- '侺=shèn',
- '侻=tuó,tuì',
- '侼=bó',
- '侽=nán',
- '侾=xiāo',
- '便=biàn,pián',
- '俀=tuǐ',
- '俁=yǔ',
- '係=xì',
- '促=cù',
- '俄=é',
- '俅=qiú',
- '俆=xú',
- '俇=guàng',
- '俈=kù',
- '俉=wù',
- '俊=jùn',
- '俋=yì',
- '俌=fǔ',
- '俍=liáng',
- '俎=zǔ',
- '俏=qiào,xiào',
- '俐=lì',
- '俑=yǒng',
- '俒=hùn',
- '俓=jìng',
- '俔=qiàn',
- '俕=sàn',
- '俖=pěi',
- '俗=sú',
- '俘=fú',
- '俙=xī',
- '俚=lǐ',
- '俛=fǔ',
- '俜=pīng',
- '保=bǎo',
- '俞=yú,yù,shù',
- '俟=sì,qí',
- '俠=xiá',
- '信=xìn,shēn',
- '俢=xiū',
- '俣=yǔ',
- '俤=dì',
- '俥=chē,jū',
- '俦=chóu',
- '俧=zhì',
- '俨=yǎn',
- '俩=liǎng,liǎ',
- '俪=lì',
- '俫=lái',
- '俬=sī',
- '俭=jiǎn',
- '修=xiū',
- '俯=fǔ',
- '俰=huò',
- '俱=jù',
- '俲=xiào',
- '俳=pái',
- '俴=jiàn',
- '俵=biào',
- '俶=chù,tì',
- '俷=fèi',
- '俸=fèng',
- '俹=yà',
- '俺=ǎn',
- '俻=bèi',
- '俼=yù',
- '俽=xīn',
- '俾=bǐ',
- '俿=hǔ,chí',
- '倀=chāng',
- '倁=zhī',
- '倂=bìng',
- '倃=jiù',
- '倄=yáo',
- '倅=cuì,zú',
- '倆=liǎng,liǎ',
- '倇=wǎn',
- '倈=lái',
- '倉=cāng',
- '倊=zǒng',
- '個=gè,gě',
- '倌=guān',
- '倍=bèi',
- '倎=tiǎn',
- '倏=shū',
- '倐=shū',
- '們=mén',
- '倒=dǎo,dào',
- '倓=tán,tàn',
- '倔=juè,jué',
- '倕=chuí',
- '倖=xìng',
- '倗=péng',
- '倘=tǎng,cháng',
- '候=hòu',
- '倚=yǐ',
- '倛=qī',
- '倜=tì',
- '倝=gàn',
- '倞=liàng,jìng',
- '借=jiè',
- '倠=suī',
- '倡=chàng,chāng',
- '倢=jié',
- '倣=fǎng',
- '値=zhí',
- '倥=kōng,kǒng',
- '倦=juàn',
- '倧=zōng',
- '倨=jù',
- '倩=qiàn',
- '倪=ní',
- '倫=lún',
- '倬=zhuō',
- '倭=wō,wēi',
- '倮=luǒ',
- '倯=sōng',
- '倰=lèng',
- '倱=hùn',
- '倲=dōng',
- '倳=zì',
- '倴=bèn',
- '倵=wǔ',
- '倶=jù',
- '倷=nǎi',
- '倸=cǎi',
- '倹=jiǎn',
- '债=zhài',
- '倻=yē',
- '值=zhí',
- '倽=shà',
- '倾=qīng',
- '倿=nìng',
- '偀=yīng',
- '偁=chēng,chèn',
- '偂=qián',
- '偃=yǎn',
- '偄=ruǎn',
- '偅=zhòng,tóng',
- '偆=chǔn',
- '假=jiǎ,jià',
- '偈=jì,jié',
- '偉=wěi',
- '偊=yǔ',
- '偋=bǐng,bìng',
- '偌=ruò',
- '偍=tí',
- '偎=wēi',
- '偏=piān',
- '偐=yàn',
- '偑=fēng',
- '偒=tǎng,dàng',
- '偓=wò',
- '偔=è',
- '偕=xié',
- '偖=chě',
- '偗=shěng',
- '偘=kǎn',
- '偙=dì',
- '做=zuò',
- '偛=chā',
- '停=tíng',
- '偝=bèi',
- '偞=xiè',
- '偟=huáng',
- '偠=yǎo',
- '偡=zhàn',
- '偢=chǒu,qiào',
- '偣=ān',
- '偤=yóu',
- '健=jiàn',
- '偦=xū',
- '偧=zhā',
- '偨=cī',
- '偩=fù',
- '偪=bī',
- '偫=zhì',
- '偬=zǒng',
- '偭=miǎn',
- '偮=jí',
- '偯=yǐ',
- '偰=xiè',
- '偱=xún',
- '偲=cāi,sī',
- '偳=duān',
- '側=cè,zè,zhāi',
- '偵=zhēn',
- '偶=ǒu',
- '偷=tōu',
- '偸=tōu',
- '偹=bèi',
- '偺=zán,zá,zǎ',
- '偻=lǚ,lóu',
- '偼=jié',
- '偽=wěi',
- '偾=fèn',
- '偿=cháng',
- '傀=kuǐ,guī',
- '傁=sǒu',
- '傂=zhì,sī',
- '傃=sù',
- '傄=xiā',
- '傅=fù',
- '傆=yuàn,yuán',
- '傇=rǒng',
- '傈=lì',
- '傉=nù',
- '傊=yùn',
- '傋=jiǎng,gòu',
- '傌=mà',
- '傍=bàng',
- '傎=diān',
- '傏=táng',
- '傐=hào',
- '傑=jié',
- '傒=xī,xì',
- '傓=shān',
- '傔=qiàn,jiān',
- '傕=què,jué',
- '傖=cāng,chen',
- '傗=chù',
- '傘=sǎn',
- '備=bèi',
- '傚=xiào',
- '傛=róng',
- '傜=yáo',
- '傝=tà,tàn',
- '傞=suō',
- '傟=yǎng',
- '傠=fá',
- '傡=bìng',
- '傢=jiā',
- '傣=dǎi',
- '傤=zài',
- '傥=tǎng',
- '傦=gǔ',
- '傧=bīn',
- '储=chǔ',
- '傩=nuó',
- '傪=cān,càn',
- '傫=lěi',
- '催=cuī',
- '傭=yōng',
- '傮=zāo,cáo',
- '傯=zǒng',
- '傰=péng',
- '傱=sǒng',
- '傲=ào',
- '傳=chuán,zhuàn',
- '傴=yǔ',
- '債=zhài',
- '傶=qī,còu',
- '傷=shāng',
- '傸=chuǎng',
- '傹=jìng',
- '傺=chì',
- '傻=shǎ',
- '傼=hàn',
- '傽=zhāng',
- '傾=qīng',
- '傿=yān,yàn',
- '僀=dì',
- '僁=xiè',
- '僂=lǚ,lóu',
- '僃=bèi',
- '僄=piào,biāo',
- '僅=jǐn,jìn',
- '僆=liàn',
- '僇=lù',
- '僈=màn',
- '僉=qiān',
- '僊=xiān',
- '僋=tǎn,tàn',
- '僌=yíng',
- '働=dòng',
- '僎=zhuàn',
- '像=xiàng',
- '僐=shàn',
- '僑=qiáo',
- '僒=jiǒng',
- '僓=tuǐ,tuí',
- '僔=zǔn',
- '僕=pú',
- '僖=xī',
- '僗=láo',
- '僘=chǎng',
- '僙=guāng',
- '僚=liáo',
- '僛=qī',
- '僜=chēng,dēng',
- '僝=zhàn,zhuàn,chán',
- '僞=wěi',
- '僟=jī',
- '僠=bō',
- '僡=huì',
- '僢=chuǎn',
- '僣=tiě,jiàn',
- '僤=dàn',
- '僥=jiǎo,yáo',
- '僦=jiù',
- '僧=sēng',
- '僨=fèn',
- '僩=xiàn',
- '僪=yù,jú',
- '僫=è,wù,wū',
- '僬=jiāo',
- '僭=jiàn',
- '僮=tóng,zhuàng',
- '僯=lǐn',
- '僰=bó',
- '僱=gù',
- '僲=xiān',
- '僳=sù',
- '僴=xiàn',
- '僵=jiāng',
- '僶=mǐn',
- '僷=yè',
- '僸=jìn',
- '價=jià,jie',
- '僺=qiào',
- '僻=pì',
- '僼=fēng',
- '僽=zhòu',
- '僾=ài',
- '僿=sài',
- '儀=yí',
- '儁=jùn',
- '儂=nóng',
- '儃=chán,tǎn,shàn',
- '億=yì',
- '儅=dāng,dàng',
- '儆=jǐng',
- '儇=xuān',
- '儈=kuài',
- '儉=jiǎn',
- '儊=chù',
- '儋=dān,dàn',
- '儌=jiǎo',
- '儍=shǎ',
- '儎=zài',
- '儏=càn',
- '儐=bīn,bìn',
- '儑=án,àn',
- '儒=rú',
- '儓=tái',
- '儔=chóu',
- '儕=chái',
- '儖=lán',
- '儗=nǐ,yì',
- '儘=jǐn',
- '儙=qiàn',
- '儚=méng',
- '儛=wǔ',
- '儜=níng',
- '儝=qióng',
- '儞=nǐ',
- '償=cháng',
- '儠=liè',
- '儡=lěi',
- '儢=lǚ',
- '儣=kuǎng',
- '儤=bào',
- '儥=yù',
- '儦=biāo',
- '儧=zǎn',
- '儨=zhì',
- '儩=sì',
- '優=yōu',
- '儫=háo',
- '儬=qìng',
- '儭=chèn',
- '儮=lì',
- '儯=téng',
- '儰=wěi',
- '儱=lǒng,lóng,lòng',
- '儲=chǔ',
- '儳=chán,chàn',
- '儴=ráng,xiāng',
- '儵=shū',
- '儶=huì,xié',
- '儷=lì',
- '儸=luó',
- '儹=zǎn',
- '儺=nuó',
- '儻=tǎng',
- '儼=yǎn',
- '儽=léi',
- '儾=nàng,nāng',
- '儿=ér',
- '兀=wù',
- '允=yǔn',
- '兂=zān',
- '元=yuán',
- '兄=xiōng',
- '充=chōng',
- '兆=zhào',
- '兇=xiōng',
- '先=xiān',
- '光=guāng',
- '兊=duì,ruì,yuè',
- '克=kè',
- '兌=duì,ruì,yuè',
- '免=miǎn',
- '兎=tù',
- '兏=cháng,zhǎng',
- '児=ér',
- '兑=duì,ruì,yuè',
- '兒=ér',
- '兓=qīn',
- '兔=tù',
- '兕=sì',
- '兖=yǎn',
- '兗=yǎn',
- '兘=shǐ',
- '兙=null',
- '党=dǎng',
- '兛=null',
- '兜=dōu',
- '兝=null',
- '兞=null',
- '兟=shēn',
- '兠=dōu',
- '兡=null',
- '兢=jīng',
- '兣=null',
- '兤=huǎng',
- '入=rù',
- '兦=wáng',
- '內=nèi',
- '全=quán',
- '兩=liǎng',
- '兪=yú,shù',
- '八=bā',
- '公=gōng',
- '六=liù,lù',
- '兮=xī',
- '兯=han',
- '兰=lán',
- '共=gòng,gōng',
- '兲=tiān',
- '关=guān',
- '兴=xìng,xīng',
- '兵=bīng',
- '其=qí,jī',
- '具=jù',
- '典=diǎn',
- '兹=zī,cí',
- '兺=būn',
- '养=yǎng',
- '兼=jiān',
- '兽=shòu',
- '兾=jì',
- '兿=yì',
- '冀=jì',
- '冁=chǎn',
- '冂=jiōng',
- '冃=mào',
- '冄=rǎn',
- '内=nèi,nà',
- '円=yuán',
- '冇=mǎo',
- '冈=gāng',
- '冉=rǎn',
- '冊=cè',
- '冋=jiōng',
- '册=cè',
- '再=zài',
- '冎=guǎ',
- '冏=jiǒng',
- '冐=mào',
- '冑=zhòu',
- '冒=mào,mò',
- '冓=gòu',
- '冔=xú',
- '冕=miǎn',
- '冖=mì',
- '冗=rǒng',
- '冘=yín,yóu',
- '写=xiě',
- '冚=kǎn',
- '军=jūn',
- '农=nóng',
- '冝=yí',
- '冞=mí',
- '冟=shì',
- '冠=guàn,guān',
- '冡=měng',
- '冢=zhǒng',
- '冣=zuì',
- '冤=yuān',
- '冥=míng',
- '冦=kòu',
- '冧=lín',
- '冨=fù',
- '冩=xiě',
- '冪=mì',
- '冫=bīng',
- '冬=dōng',
- '冭=tài',
- '冮=gāng',
- '冯=féng,píng',
- '冰=bīng',
- '冱=hù',
- '冲=chōng,chòng',
- '决=jué',
- '冴=yà',
- '况=kuàng',
- '冶=yě',
- '冷=lěng',
- '冸=pàn',
- '冹=fā',
- '冺=mǐn',
- '冻=dòng',
- '冼=xiǎn',
- '冽=liè',
- '冾=qià',
- '冿=jiān',
- '净=jìng,chēng',
- '凁=sōu',
- '凂=měi',
- '凃=tú',
- '凄=qī',
- '凅=gù',
- '准=zhǔn',
- '凇=sōng',
- '凈=jìng,chēng',
- '凉=liáng,liàng',
- '凊=qìng',
- '凋=diāo',
- '凌=líng',
- '凍=dòng',
- '凎=gàn',
- '减=jiǎn',
- '凐=yīn',
- '凑=còu',
- '凒=ái',
- '凓=lì',
- '凔=cāng',
- '凕=mǐng',
- '凖=zhǔn',
- '凗=cuī',
- '凘=sī',
- '凙=duó',
- '凚=jìn',
- '凛=lǐn',
- '凜=lǐn',
- '凝=níng',
- '凞=xī',
- '凟=dú',
- '几=jǐ,jī',
- '凡=fán',
- '凢=fán',
- '凣=fán',
- '凤=fèng',
- '凥=jū',
- '処=chù,chǔ',
- '凧=zhēng',
- '凨=fēng',
- '凩=mù',
- '凪=zhǐ',
- '凫=fú',
- '凬=fēng',
- '凭=píng',
- '凮=fēng',
- '凯=kǎi',
- '凰=huáng',
- '凱=kǎi',
- '凲=gān',
- '凳=dèng',
- '凴=píng',
- '凵=kǎn,qiǎn',
- '凶=xiōng',
- '凷=kuài',
- '凸=tū',
- '凹=āo,wā',
- '出=chū',
- '击=jī',
- '凼=dàng',
- '函=hán',
- '凾=hán',
- '凿=záo',
- '刀=dāo',
- '刁=diāo',
- '刂=dāo',
- '刃=rèn',
- '刄=rèn',
- '刅=chuāng',
- '分=fēn,fèn',
- '切=qiē,qiè',
- '刈=yì',
- '刉=jī',
- '刊=kān',
- '刋=qiàn',
- '刌=cǔn',
- '刍=chú',
- '刎=wěn',
- '刏=jī',
- '刐=dǎn',
- '刑=xíng',
- '划=huá,huà',
- '刓=wán',
- '刔=jué',
- '刕=lí',
- '刖=yuè',
- '列=liè',
- '刘=liú',
- '则=zé',
- '刚=gāng',
- '创=chuàng,chuāng',
- '刜=fú',
- '初=chū',
- '刞=qù',
- '刟=diāo',
- '删=shān',
- '刡=mǐn',
- '刢=líng',
- '刣=zhōng',
- '判=pàn',
- '別=bié,biè',
- '刦=jié',
- '刧=jié',
- '刨=páo,bào',
- '利=lì',
- '刪=shān',
- '别=bié,biè',
- '刬=chǎn,chàn',
- '刭=jǐng',
- '刮=guā',
- '刯=gēng',
- '到=dào',
- '刱=chuàng',
- '刲=kuī',
- '刳=kū',
- '刴=duò',
- '刵=èr',
- '制=zhì',
- '刷=shuā,shuà',
- '券=quàn,xuàn',
- '刹=chà,shā',
- '刺=cì,cī',
- '刻=kè',
- '刼=jié',
- '刽=guì',
- '刾=cì',
- '刿=guì',
- '剀=kǎi',
- '剁=duò',
- '剂=jì',
- '剃=tì',
- '剄=jǐng',
- '剅=lóu',
- '剆=luǒ',
- '則=zé',
- '剈=yuān',
- '剉=cuò',
- '削=xiāo,xuē',
- '剋=kēi,kè',
- '剌=là,lá',
- '前=qián',
- '剎=chà,shā',
- '剏=chuàng',
- '剐=guǎ',
- '剑=jiàn',
- '剒=cuò',
- '剓=lí',
- '剔=tī',
- '剕=fèi',
- '剖=pōu',
- '剗=chǎn,chàn',
- '剘=qí',
- '剙=chuàng',
- '剚=zì',
- '剛=gāng',
- '剜=wān',
- '剝=bāo,bō',
- '剞=jī',
- '剟=duō',
- '剠=qíng',
- '剡=yǎn,shàn',
- '剢=dū,zhuó',
- '剣=jiàn',
- '剤=jì',
- '剥=bō,bāo',
- '剦=yān',
- '剧=jù',
- '剨=huò',
- '剩=shèng',
- '剪=jiǎn',
- '剫=duó',
- '剬=zhì,duān',
- '剭=wū',
- '剮=guǎ',
- '副=fù,pì',
- '剰=shèng',
- '剱=jiàn',
- '割=gē',
- '剳=dá,zhá',
- '剴=kǎi',
- '創=chuàng,chuāng',
- '剶=chuán',
- '剷=chǎn',
- '剸=tuán,zhuān',
- '剹=lù,jiū',
- '剺=lí',
- '剻=pēng',
- '剼=shān',
- '剽=piāo',
- '剾=kōu',
- '剿=jiǎo,chāo',
- '劀=guā',
- '劁=qiāo',
- '劂=jué',
- '劃=huá,huà',
- '劄=zhā,zhá',
- '劅=zhuó',
- '劆=lián',
- '劇=jù',
- '劈=pī,pǐ',
- '劉=liú',
- '劊=guì',
- '劋=jiǎo,chāo',
- '劌=guì',
- '劍=jiàn',
- '劎=jiàn',
- '劏=tāng',
- '劐=huō',
- '劑=jì',
- '劒=jiàn',
- '劓=yì',
- '劔=jiàn',
- '劕=zhì',
- '劖=chán',
- '劗=zuān',
- '劘=mó',
- '劙=lí',
- '劚=zhú',
- '力=lì',
- '劜=yà',
- '劝=quàn',
- '办=bàn',
- '功=gōng',
- '加=jiā',
- '务=wù',
- '劢=mài',
- '劣=liè',
- '劤=jìn,jìng',
- '劥=kēng',
- '劦=xié,liè',
- '劧=zhǐ',
- '动=dòng',
- '助=zhù,chú',
- '努=nǔ',
- '劫=jié',
- '劬=qú',
- '劭=shào',
- '劮=yì',
- '劯=zhǔ',
- '劰=miǎo',
- '励=lì',
- '劲=jìn,jìng',
- '劳=láo',
- '労=láo',
- '劵=juàn',
- '劶=kǒu',
- '劷=yáng',
- '劸=wā',
- '効=xiào',
- '劺=móu',
- '劻=kuāng',
- '劼=jié',
- '劽=liè',
- '劾=hé',
- '势=shì',
- '勀=kè',
- '勁=jìn,jìng',
- '勂=gào',
- '勃=bó,bèi',
- '勄=mǐn',
- '勅=chì',
- '勆=láng',
- '勇=yǒng',
- '勈=yǒng',
- '勉=miǎn',
- '勊=kè',
- '勋=xūn',
- '勌=juàn,juān',
- '勍=qíng',
- '勎=lù',
- '勏=bù',
- '勐=měng',
- '勑=chì',
- '勒=lè,lēi',
- '勓=kài',
- '勔=miǎn',
- '動=dòng',
- '勖=xù',
- '勗=xù',
- '勘=kān',
- '務=wù',
- '勚=yì',
- '勛=xūn',
- '勜=wěng,yǎng',
- '勝=shèng',
- '勞=láo',
- '募=mù',
- '勠=lù',
- '勡=piāo',
- '勢=shì',
- '勣=jì',
- '勤=qín',
- '勥=jiàng',
- '勦=jiǎo,chāo',
- '勧=quàn',
- '勨=xiàng',
- '勩=yì',
- '勪=qiāo',
- '勫=fān',
- '勬=juān',
- '勭=tóng,dòng',
- '勮=jù',
- '勯=dān',
- '勰=xié',
- '勱=mài',
- '勲=xūn',
- '勳=xūn',
- '勴=lǜ',
- '勵=lì',
- '勶=chè',
- '勷=ráng,xiāng',
- '勸=quàn',
- '勹=bāo',
- '勺=sháo',
- '勻=yún',
- '勼=jiū',
- '勽=bào',
- '勾=gōu,gòu',
- '勿=wù',
- '匀=yún',
- '匁=null',
- '匂=xiōng',
- '匃=gài',
- '匄=gài',
- '包=bāo',
- '匆=cōng',
- '匇=yì',
- '匈=xiōng',
- '匉=pēng',
- '匊=jū',
- '匋=táo,yáo',
- '匌=gé',
- '匍=pú',
- '匎=è',
- '匏=páo',
- '匐=fú',
- '匑=gōng',
- '匒=dá',
- '匓=jiù',
- '匔=gōng',
- '匕=bǐ',
- '化=huà,huā',
- '北=běi,bèi',
- '匘=nǎo',
- '匙=chí,shi',
- '匚=fāng',
- '匛=jiù',
- '匜=yí',
- '匝=zā',
- '匞=jiàng',
- '匟=kàng',
- '匠=jiàng',
- '匡=kuāng',
- '匢=hū',
- '匣=xiá',
- '匤=qū',
- '匥=fán',
- '匦=guǐ',
- '匧=qiè',
- '匨=zāng,cáng',
- '匩=kuāng',
- '匪=fěi',
- '匫=hū',
- '匬=yǔ',
- '匭=guǐ',
- '匮=kuì,guì',
- '匯=huì',
- '匰=dān',
- '匱=kuì,guì',
- '匲=lián',
- '匳=lián',
- '匴=suǎn',
- '匵=dú',
- '匶=jiù',
- '匷=jué',
- '匸=xì',
- '匹=pǐ',
- '区=qū,ōu',
- '医=yī',
- '匼=kē,qià',
- '匽=yǎn,yàn',
- '匾=biǎn',
- '匿=nì',
- '區=qū,ōu',
- '十=shí',
- '卂=xùn',
- '千=qiān',
- '卄=niàn',
- '卅=sà',
- '卆=zú',
- '升=shēng',
- '午=wǔ',
- '卉=huì',
- '半=bàn',
- '卋=shì',
- '卌=xì',
- '卍=wàn',
- '华=huá,huà,huā',
- '协=xié',
- '卐=wàn',
- '卑=bēi',
- '卒=zú,cù',
- '卓=zhuó',
- '協=xié',
- '单=dān,shàn,chán',
- '卖=mài',
- '南=nán,nā',
- '単=dān',
- '卙=jí',
- '博=bó',
- '卛=shuài,lǜ',
- '卜=bǔ,bo',
- '卝=guàn,kuàng',
- '卞=biàn',
- '卟=bǔ',
- '占=zhàn,zhān',
- '卡=kǎ,qiǎ',
- '卢=lú',
- '卣=yǒu',
- '卤=lǔ',
- '卥=xī',
- '卦=guà',
- '卧=wò',
- '卨=xiè',
- '卩=jié',
- '卪=jié',
- '卫=wèi',
- '卬=yǎng,áng',
- '卭=qióng',
- '卮=zhī',
- '卯=mǎo',
- '印=yìn',
- '危=wēi',
- '卲=shào',
- '即=jí',
- '却=què',
- '卵=luǎn',
- '卶=chǐ',
- '卷=juǎn,juàn',
- '卸=xiè',
- '卹=xù',
- '卺=jǐn',
- '卻=què',
- '卼=wù',
- '卽=jí',
- '卾=è',
- '卿=qīng',
- '厀=xī',
- '厁=sān',
- '厂=chǎng,ān,hàn',
- '厃=wēi,yán',
- '厄=è',
- '厅=tīng',
- '历=lì',
- '厇=zhé,zhái',
- '厈=hàn,àn',
- '厉=lì',
- '厊=yǎ',
- '压=yā,yà',
- '厌=yàn',
- '厍=shè',
- '厎=dǐ',
- '厏=zhǎ,zhǎi',
- '厐=páng',
- '厑=yá',
- '厒=qiè',
- '厓=yá',
- '厔=zhì,shī',
- '厕=cè',
- '厖=máng',
- '厗=tí',
- '厘=lí',
- '厙=shè',
- '厚=hòu',
- '厛=tīng',
- '厜=zuī',
- '厝=cuò',
- '厞=fèi',
- '原=yuán',
- '厠=cè',
- '厡=yuán',
- '厢=xiāng',
- '厣=yǎn',
- '厤=lì',
- '厥=jué',
- '厦=shà,xià',
- '厧=diān',
- '厨=chú',
- '厩=jiù',
- '厪=jǐn',
- '厫=áo',
- '厬=guǐ',
- '厭=yàn',
- '厮=sī',
- '厯=lì',
- '厰=chǎng',
- '厱=qiān,lán',
- '厲=lì',
- '厳=yán',
- '厴=yǎn',
- '厵=yuán',
- '厶=sī,mǒu',
- '厷=gōng,hóng',
- '厸=lín,miǎo',
- '厹=róu,qiú',
- '厺=qù',
- '去=qù',
- '厼=null',
- '厽=lěi',
- '厾=dū',
- '县=xiàn,xuán',
- '叀=zhuān',
- '叁=sān',
- '参=cān,shēn,cēn,sān',
- '參=cān,shēn,cēn,sān',
- '叄=cān,shēn,cēn,sān',
- '叅=cān,shēn,cēn,sān',
- '叆=ài',
- '叇=dài',
- '又=yòu',
- '叉=chā,chá,chǎ',
- '及=jí',
- '友=yǒu',
- '双=shuāng',
- '反=fǎn',
- '収=shōu',
- '叏=guái',
- '叐=bá',
- '发=fā,fà',
- '叒=ruò',
- '叓=lì',
- '叔=shū',
- '叕=zhuó,yǐ,lì,jué',
- '取=qǔ',
- '受=shòu',
- '变=biàn',
- '叙=xù',
- '叚=jiǎ',
- '叛=pàn',
- '叜=sǒu',
- '叝=jí',
- '叞=wèi,yù',
- '叟=sǒu',
- '叠=dié',
- '叡=ruì',
- '叢=cóng',
- '口=kǒu',
- '古=gǔ',
- '句=jù,gōu',
- '另=lìng',
- '叧=guǎ',
- '叨=dāo,tāo',
- '叩=kòu',
- '只=zhǐ,zhī',
- '叫=jiào',
- '召=zhào,shào',
- '叭=bā',
- '叮=dīng',
- '可=kě,kè',
- '台=tái,tāi',
- '叱=chì',
- '史=shǐ',
- '右=yòu',
- '叴=qiú',
- '叵=pǒ',
- '叶=yè,xié',
- '号=hào,háo',
- '司=sī',
- '叹=tàn',
- '叺=chǐ',
- '叻=lè',
- '叼=diāo',
- '叽=jī',
- '叾=null',
- '叿=hōng,hóng',
- '吀=miē',
- '吁=xū,yù',
- '吂=máng',
- '吃=chī',
- '各=gè,gě',
- '吅=xuān,sòng',
- '吆=yāo',
- '吇=zǐ',
- '合=hé,gě',
- '吉=jí',
- '吊=diào',
- '吋=dòu,cùn',
- '同=tóng,tòng',
- '名=míng',
- '后=hòu',
- '吏=lì',
- '吐=tǔ,tù',
- '向=xiàng',
- '吒=zhà,zhā',
- '吓=xià,hè',
- '吔=yē',
- '吕=lǚ',
- '吖=yā,ā',
- '吗=ma,má,mǎ',
- '吘=ǒu',
- '吙=huō',
- '吚=yī',
- '君=jūn',
- '吜=chǒu',
- '吝=lìn',
- '吞=tūn',
- '吟=yín',
- '吠=fèi',
- '吡=pǐ,bǐ',
- '吢=qìn',
- '吣=qìn',
- '吤=jiè,gè',
- '吥=bù',
- '否=fǒu,pǐ',
- '吧=bā,ba',
- '吨=dūn',
- '吩=fēn',
- '吪=é,huā',
- '含=hán',
- '听=tīng',
- '吭=háng,kēng',
- '吮=shǔn',
- '启=qǐ',
- '吰=hóng',
- '吱=zhī,zī',
- '吲=yǐn,shěn',
- '吳=wú',
- '吴=wú',
- '吵=chǎo,chāo',
- '吶=nà,nè',
- '吷=xuè,chuò,jué',
- '吸=xī',
- '吹=chuī',
- '吺=dōu,rú',
- '吻=wěn',
- '吼=hǒu',
- '吽=hǒu,hōng,ōu',
- '吾=wú,yù',
- '吿=gào',
- '呀=yā,ya',
- '呁=jùn',
- '呂=lǚ',
- '呃=è',
- '呄=gé',
- '呅=wěn',
- '呆=dāi',
- '呇=qǐ',
- '呈=chéng',
- '呉=wú',
- '告=gào',
- '呋=fū',
- '呌=jiào',
- '呍=hōng',
- '呎=chǐ',
- '呏=shēng',
- '呐=nà,nè',
- '呑=tūn,tiān',
- '呒=fǔ',
- '呓=yì',
- '呔=dāi',
- '呕=ǒu,ōu,òu',
- '呖=lì',
- '呗=bei,bài',
- '员=yuán,yún,yùn',
- '呙=wāi,hé,wǒ,wā,guǎ,guō',
- '呚=huá,qì',
- '呛=qiāng,qiàng',
- '呜=wū',
- '呝=è',
- '呞=shī',
- '呟=juǎn',
- '呠=pěn',
- '呡=wěn,mǐn',
- '呢=ne,ní',
- '呣=móu',
- '呤=líng',
- '呥=rán',
- '呦=yōu',
- '呧=dǐ',
- '周=zhōu',
- '呩=shì',
- '呪=zhòu',
- '呫=tiè,chè',
- '呬=xì',
- '呭=yì',
- '呮=qì,zhī',
- '呯=píng',
- '呰=zǐ,cī',
- '呱=guā,gū,guǎ',
- '呲=zī,cī',
- '味=wèi',
- '呴=xǔ,hǒu,gòu',
- '呵=hē,a,kē',
- '呶=náo',
- '呷=xiā',
- '呸=pēi',
- '呹=yì',
- '呺=xiāo,háo',
- '呻=shēn',
- '呼=hū',
- '命=mìng',
- '呾=dá,dàn',
- '呿=qū',
- '咀=jǔ,zuǐ',
- '咁=xián,gān',
- '咂=zā',
- '咃=tuō',
- '咄=duō',
- '咅=pǒu',
- '咆=páo',
- '咇=bì',
- '咈=fú',
- '咉=yǎng',
- '咊=hé,hè',
- '咋=zǎ,zé,zhā',
- '和=hé,hè,huó,huò,hú',
- '咍=hāi',
- '咎=jiù',
- '咏=yǒng',
- '咐=fù',
- '咑=dā',
- '咒=zhòu',
- '咓=wǎ',
- '咔=kǎ',
- '咕=gū',
- '咖=kā,gā',
- '咗=zuo',
- '咘=bù',
- '咙=lóng',
- '咚=dōng',
- '咛=níng',
- '咜=tuō',
- '咝=sī',
- '咞=xiàn,xián',
- '咟=huò',
- '咠=qì',
- '咡=èr',
- '咢=è',
- '咣=guāng',
- '咤=zhà',
- '咥=dié,xī',
- '咦=yí',
- '咧=liē,liě,lié,lie',
- '咨=zī',
- '咩=miē',
- '咪=mī',
- '咫=zhǐ',
- '咬=yǎo',
- '咭=jī,xī,qià',
- '咮=zhòu',
- '咯=kǎ,luò,lo,gē',
- '咰=shù,xún',
- '咱=zán,zá,zǎ',
- '咲=xiào',
- '咳=ké,hāi',
- '咴=huī',
- '咵=kuā',
- '咶=huài,shì',
- '咷=táo',
- '咸=xián',
- '咹=è,àn',
- '咺=xuǎn,xuān',
- '咻=xiū',
- '咼=wāi,hé,wǒ,wā,guǎ,guō',
- '咽=yàn,yān,yè',
- '咾=lǎo',
- '咿=yī',
- '哀=āi',
- '品=pǐn',
- '哂=shěn',
- '哃=tóng',
- '哄=hōng,hǒng,hòng',
- '哅=xiōng',
- '哆=duō',
- '哇=wā,wa',
- '哈=hā,hǎ,hà',
- '哉=zāi',
- '哊=yòu',
- '哋=diè,dì',
- '哌=pài',
- '响=xiǎng',
- '哎=āi',
- '哏=gén,hěn',
- '哐=kuāng',
- '哑=yǎ,yā',
- '哒=dā',
- '哓=xiāo',
- '哔=bì',
- '哕=yuě,huì',
- '哖=nián',
- '哗=huá,huā',
- '哘=xíng',
- '哙=kuài',
- '哚=duǒ',
- '哛=ppun',
- '哜=jì,jiē,zhāi',
- '哝=nóng',
- '哞=mōu',
- '哟=yō,yo',
- '哠=hào',
- '員=yuán,yún,yùn',
- '哢=lòng',
- '哣=pǒu',
- '哤=máng',
- '哥=gē',
- '哦=ò,ó,é',
- '哧=chī',
- '哨=shào',
- '哩=li,lǐ,lī',
- '哪=nǎ,něi,na,né',
- '哫=zú',
- '哬=hè',
- '哭=kū',
- '哮=xiào',
- '哯=xiàn',
- '哰=láo',
- '哱=pò,bā,bō',
- '哲=zhé',
- '哳=zhā',
- '哴=liàng,láng',
- '哵=bā',
- '哶=miē',
- '哷=liè,lǜ',
- '哸=suī',
- '哹=fú',
- '哺=bǔ',
- '哻=hān',
- '哼=hēng',
- '哽=gěng',
- '哾=chuò,yuè',
- '哿=gě,jiā',
- '唀=yòu',
- '唁=yàn',
- '唂=gū',
- '唃=gū',
- '唄=bei,bài',
- '唅=hán,hàn',
- '唆=suō',
- '唇=chún',
- '唈=yì',
- '唉=āi,ài',
- '唊=jiá,qiǎn',
- '唋=tǔ,tù',
- '唌=dàn,xián,yán',
- '唍=wǎn',
- '唎=lì',
- '唏=xī',
- '唐=táng',
- '唑=zuò',
- '唒=qiú',
- '唓=chē',
- '唔=wù,wú',
- '唕=zào',
- '唖=yǎ',
- '唗=dōu',
- '唘=qǐ',
- '唙=dí',
- '唚=qìn',
- '唛=mài',
- '唜=null',
- '唝=gòng,hǒng,gǒng',
- '唞=dóu',
- '唟=null',
- '唠=lào,láo',
- '唡=liǎng',
- '唢=suǒ',
- '唣=zào',
- '唤=huàn',
- '唥=léng',
- '唦=shā',
- '唧=jī',
- '唨=zǔ',
- '唩=wō,wěi',
- '唪=fěng',
- '唫=jìn,yín',
- '唬=hǔ,xià',
- '唭=qì',
- '售=shòu',
- '唯=wéi',
- '唰=shuā',
- '唱=chàng',
- '唲=ér,wā',
- '唳=lì',
- '唴=qiàng',
- '唵=ǎn',
- '唶=jiè,zé,jí',
- '唷=yō',
- '唸=niàn',
- '唹=yū',
- '唺=tiǎn',
- '唻=lài',
- '唼=shà',
- '唽=xī',
- '唾=tuò',
- '唿=hū',
- '啀=ái',
- '啁=zhōu,zhāo,tiào',
- '啂=gòu',
- '啃=kěn',
- '啄=zhuó',
- '啅=zhuó,zhào',
- '商=shāng',
- '啇=dí',
- '啈=hèng',
- '啉=lán,lín',
- '啊=ā,á,ǎ,à,a',
- '啋=cǎi',
- '啌=qiāng',
- '啍=zhūn,tūn,xiāng,duǐ',
- '啎=wǔ',
- '問=wèn',
- '啐=cuì,qi',
- '啑=shà,jié,dié,tì',
- '啒=gǔ',
- '啓=qǐ',
- '啔=qǐ',
- '啕=táo',
- '啖=dàn',
- '啗=dàn',
- '啘=yuē,wā',
- '啙=zǐ,cǐ',
- '啚=bǐ,tú',
- '啛=cuì',
- '啜=chuò,chuài',
- '啝=hé',
- '啞=yǎ,yā',
- '啟=qǐ',
- '啠=zhé',
- '啡=fēi',
- '啢=liǎng',
- '啣=xián',
- '啤=pí',
- '啥=shá',
- '啦=lā,la',
- '啧=zé',
- '啨=qíng,yīng',
- '啩=guà',
- '啪=pā',
- '啫=zé,shì',
- '啬=sè',
- '啭=zhuàn',
- '啮=niè',
- '啯=guō',
- '啰=luō,luó,luo',
- '啱=yán',
- '啲=dī',
- '啳=quán',
- '啴=tān,chǎn,tuō',
- '啵=bo',
- '啶=dìng',
- '啷=lāng',
- '啸=xiào',
- '啹=jú',
- '啺=táng',
- '啻=chì',
- '啼=tí',
- '啽=ān,án',
- '啾=jiū',
- '啿=dàn',
- '喀=kā',
- '喁=yóng',
- '喂=wèi',
- '喃=nán',
- '善=shàn',
- '喅=yù',
- '喆=zhé',
- '喇=lǎ',
- '喈=jiē',
- '喉=hóu',
- '喊=hǎn',
- '喋=dié,zhá',
- '喌=zhōu',
- '喍=chái',
- '喎=wāi',
- '喏=nuò,rě',
- '喐=huò,guó,xù',
- '喑=yīn',
- '喒=zán,zá,zǎ',
- '喓=yāo',
- '喔=ō,wō',
- '喕=miǎn',
- '喖=hú',
- '喗=yǔn',
- '喘=chuǎn',
- '喙=huì',
- '喚=huàn',
- '喛=huàn,yuán,xuǎn,hé',
- '喜=xǐ',
- '喝=hē,hè,yè',
- '喞=jī',
- '喟=kuì',
- '喠=zhǒng,chuáng',
- '喡=wéi,wèi',
- '喢=shà',
- '喣=xǔ',
- '喤=huáng',
- '喥=duó,zhà',
- '喦=yán',
- '喧=xuān',
- '喨=liàng',
- '喩=yù',
- '喪=sàng,sāng',
- '喫=chī',
- '喬=qiáo,jiāo',
- '喭=yàn',
- '單=dān,shàn,chán',
- '喯=bēn,pèn',
- '喰=cān,sūn,qī',
- '喱=lí',
- '喲=yō,yo',
- '喳=zhā,chā',
- '喴=wēi',
- '喵=miāo',
- '営=yíng',
- '喷=pēn,pèn',
- '喸=null',
- '喹=kuí',
- '喺=xí',
- '喻=yù',
- '喼=jiē',
- '喽=lóu,lou',
- '喾=kù',
- '喿=zào,qiāo',
- '嗀=hù',
- '嗁=tí',
- '嗂=yáo',
- '嗃=hè,xiāo,xiào,hù',
- '嗄=shà,á',
- '嗅=xiù',
- '嗆=qiāng,qiàng',
- '嗇=sè',
- '嗈=yōng',
- '嗉=sù',
- '嗊=gòng,hǒng,gǒng',
- '嗋=xié',
- '嗌=yì,ài',
- '嗍=suō',
- '嗎=ma,má,mǎ',
- '嗏=chā',
- '嗐=hài',
- '嗑=kē,kè',
- '嗒=dā,tà',
- '嗓=sǎng',
- '嗔=chēn',
- '嗕=rù',
- '嗖=sōu',
- '嗗=wā,gǔ',
- '嗘=jī',
- '嗙=bēng,pǎng',
- '嗚=wū',
- '嗛=xián,qiàn,qiè',
- '嗜=shì',
- '嗝=gé',
- '嗞=zī',
- '嗟=jiē',
- '嗠=lào',
- '嗡=wēng',
- '嗢=wà',
- '嗣=sì',
- '嗤=chī',
- '嗥=háo',
- '嗦=suō',
- '嗧=null',
- '嗨=hāi,hēi',
- '嗩=suǒ',
- '嗪=qín',
- '嗫=niè',
- '嗬=hē',
- '嗭=zi',
- '嗮=sǎi',
- '嗯=èn',
- '嗰=gě',
- '嗱=ná',
- '嗲=diǎ',
- '嗳=ài,ǎi,āi',
- '嗴=qiāng',
- '嗵=tōng',
- '嗶=bì',
- '嗷=áo',
- '嗸=áo',
- '嗹=lián',
- '嗺=zuī,suī',
- '嗻=zhē,zhè,zhù,zhe',
- '嗼=mò',
- '嗽=sòu',
- '嗾=sǒu',
- '嗿=tǎn',
- '嘀=dí',
- '嘁=qī',
- '嘂=jiào',
- '嘃=chōng',
- '嘄=jiào,dǎo',
- '嘅=kǎi,gě',
- '嘆=tàn',
- '嘇=shān,càn',
- '嘈=cáo',
- '嘉=jiā',
- '嘊=ái',
- '嘋=xiào',
- '嘌=piāo',
- '嘍=lóu,lou',
- '嘎=gā,gá,gǎ',
- '嘏=gǔ',
- '嘐=xiāo,jiāo',
- '嘑=hū',
- '嘒=huì',
- '嘓=guō',
- '嘔=ǒu,ōu,òu',
- '嘕=xiān',
- '嘖=zé',
- '嘗=cháng',
- '嘘=xū,shī',
- '嘙=pó',
- '嘚=dē,dēi',
- '嘛=má,ma',
- '嘜=mà',
- '嘝=hú',
- '嘞=lei,lē',
- '嘟=dū',
- '嘠=gā,gá,gǎ',
- '嘡=tāng',
- '嘢=yě',
- '嘣=bēng',
- '嘤=yīng',
- '嘥=sāi',
- '嘦=jiào',
- '嘧=mì',
- '嘨=xiào',
- '嘩=huá,huā',
- '嘪=mǎi',
- '嘫=rán',
- '嘬=zuō',
- '嘭=pēng',
- '嘮=lào,láo',
- '嘯=xiào',
- '嘰=jī',
- '嘱=zhǔ',
- '嘲=cháo,zhāo',
- '嘳=kuì',
- '嘴=zuǐ',
- '嘵=xiāo',
- '嘶=sī',
- '嘷=háo',
- '嘸=fǔ',
- '嘹=liáo',
- '嘺=qiáo,qiào',
- '嘻=xī',
- '嘼=shòu,chù,xù',
- '嘽=tān,chǎn',
- '嘾=dàn,tán',
- '嘿=hēi,mò',
- '噀=xùn',
- '噁=ě',
- '噂=zūn',
- '噃=fān,bo',
- '噄=chī',
- '噅=huī',
- '噆=zǎn',
- '噇=chuáng',
- '噈=cù,zā,hé',
- '噉=dàn',
- '噊=jué',
- '噋=tūn,kuò',
- '噌=cēng',
- '噍=jiào',
- '噎=yē',
- '噏=xī',
- '噐=qì',
- '噑=háo',
- '噒=lián',
- '噓=xū,shī',
- '噔=dēng',
- '噕=huī',
- '噖=yín',
- '噗=pū',
- '噘=juē',
- '噙=qín',
- '噚=xún',
- '噛=niè',
- '噜=lū',
- '噝=sī',
- '噞=yǎn',
- '噟=yīng',
- '噠=dā',
- '噡=zhān',
- '噢=ō',
- '噣=zhòu,zhuó',
- '噤=jìn',
- '噥=nóng',
- '噦=yuě,huì',
- '噧=xiè',
- '器=qì',
- '噩=è',
- '噪=zào',
- '噫=yī',
- '噬=shì',
- '噭=jiào,qiào,chī',
- '噮=yuàn',
- '噯=ài,ǎi,āi',
- '噰=yōng,yǒng',
- '噱=jué,xué',
- '噲=kuài',
- '噳=yǔ',
- '噴=pēn,pèn',
- '噵=dào',
- '噶=gá',
- '噷=xīn,hěn,hèn',
- '噸=dūn',
- '噹=dāng',
- '噺=xīn',
- '噻=sāi',
- '噼=pī',
- '噽=pǐ',
- '噾=yīn',
- '噿=zuǐ',
- '嚀=níng',
- '嚁=dí',
- '嚂=làn',
- '嚃=tà',
- '嚄=huò,ǒ',
- '嚅=rú',
- '嚆=hāo',
- '嚇=hè,xià',
- '嚈=yàn',
- '嚉=duō',
- '嚊=xiù,pì',
- '嚋=zhōu,chóu',
- '嚌=jì,jiē,zhāi',
- '嚍=jìn',
- '嚎=háo',
- '嚏=tì',
- '嚐=cháng',
- '嚑=xūn',
- '嚒=mē',
- '嚓=cā,chā',
- '嚔=tì',
- '嚕=lū',
- '嚖=huì',
- '嚗=bào,bó,pào',
- '嚘=yōu',
- '嚙=niè',
- '嚚=yín',
- '嚛=hù',
- '嚜=mèi,me,mò',
- '嚝=hōng',
- '嚞=zhé',
- '嚟=lí',
- '嚠=liú',
- '嚡=xié,hái',
- '嚢=náng',
- '嚣=xiāo',
- '嚤=mō',
- '嚥=yàn',
- '嚦=lì',
- '嚧=lú',
- '嚨=lóng',
- '嚩=pó',
- '嚪=dàn',
- '嚫=chèn',
- '嚬=pín',
- '嚭=pǐ',
- '嚮=xiàng',
- '嚯=huò',
- '嚰=mè',
- '嚱=xī',
- '嚲=duǒ',
- '嚳=kù',
- '嚴=yán',
- '嚵=chán',
- '嚶=yīng',
- '嚷=rǎng,rāng',
- '嚸=diǎn',
- '嚹=lá',
- '嚺=tà',
- '嚻=xiāo',
- '嚼=jiáo,jué,jiào',
- '嚽=chuò',
- '嚾=huàn,huān',
- '嚿=huò',
- '囀=zhuàn',
- '囁=niè',
- '囂=xiāo',
- '囃=zá,cà',
- '囄=lí',
- '囅=chǎn',
- '囆=chài',
- '囇=lì',
- '囈=yì',
- '囉=luō,luó,luo',
- '囊=náng,nāng',
- '囋=zàn,zá,cān',
- '囌=sū',
- '囍=xǐ',
- '囎=zèng',
- '囏=jiān',
- '囐=yàn,zá,niè',
- '囑=zhǔ',
- '囒=lán',
- '囓=niè',
- '囔=nāng',
- '囕=null',
- '囖=luó,luō,luo',
- '囗=wéi,guó',
- '囘=huí',
- '囙=yīn',
- '囚=qiú',
- '四=sì',
- '囜=nín',
- '囝=jiǎn,nān',
- '回=huí',
- '囟=xìn',
- '因=yīn',
- '囡=nān',
- '团=tuán',
- '団=tuán',
- '囤=tún,dùn',
- '囥=kàng',
- '囦=yuān',
- '囧=jiǒng',
- '囨=piān',
- '囩=yún',
- '囪=cōng',
- '囫=hú',
- '囬=huí',
- '园=yuán',
- '囮=é',
- '囯=guó',
- '困=kùn',
- '囱=cōng',
- '囲=wéi,tōng',
- '図=tú',
- '围=wéi',
- '囵=lún',
- '囶=guó',
- '囷=qūn',
- '囸=rì',
- '囹=líng',
- '固=gù',
- '囻=guó',
- '囼=tāi',
- '国=guó',
- '图=tú',
- '囿=yòu',
- '圀=guó',
- '圁=yín',
- '圂=hùn',
- '圃=pǔ',
- '圄=yǔ',
- '圅=hán',
- '圆=yuán',
- '圇=lún',
- '圈=quān,juàn,juān',
- '圉=yǔ',
- '圊=qīng',
- '國=guó',
- '圌=chuán,chuí',
- '圍=wéi',
- '圎=yuán',
- '圏=quān,juàn,juān',
- '圐=kū',
- '圑=pǔ',
- '園=yuán',
- '圓=yuán',
- '圔=yà',
- '圕=tuān',
- '圖=tú',
- '圗=tú',
- '團=tuán',
- '圙=lüè',
- '圚=huì',
- '圛=yì',
- '圜=huán,yuán',
- '圝=luán',
- '圞=luán',
- '土=tǔ',
- '圠=yà',
- '圡=tǔ',
- '圢=tǐng',
- '圣=shèng',
- '圤=pú',
- '圥=lù',
- '圦=kuài',
- '圧=yā',
- '在=zài',
- '圩=xū,wéi',
- '圪=gē',
- '圫=yù,zhūn',
- '圬=wū',
- '圭=guī',
- '圮=pǐ',
- '圯=yí',
- '地=dì,de',
- '圱=qiān,sú',
- '圲=qiān',
- '圳=zhèn',
- '圴=zhuó',
- '圵=dàng',
- '圶=qià',
- '圷=xià',
- '圸=shān',
- '圹=kuàng',
- '场=chǎng,cháng',
- '圻=qí,yín',
- '圼=niè',
- '圽=mò',
- '圾=jī',
- '圿=jiá',
- '址=zhǐ',
- '坁=zhǐ,zhì',
- '坂=bǎn',
- '坃=xūn',
- '坄=yì',
- '坅=qǐn',
- '坆=méi,fén',
- '均=jūn',
- '坈=rǒng,kēng',
- '坉=tún,dùn',
- '坊=fāng,fáng',
- '坋=bèn,fèn',
- '坌=bèn',
- '坍=tān',
- '坎=kǎn',
- '坏=huài',
- '坐=zuò',
- '坑=kēng',
- '坒=bì',
- '坓=jǐng',
- '坔=dì,làn',
- '坕=jīng',
- '坖=jì',
- '块=kuài',
- '坘=dǐ',
- '坙=jīng',
- '坚=jiān',
- '坛=tán',
- '坜=lì',
- '坝=bà',
- '坞=wù',
- '坟=fén',
- '坠=zhuì',
- '坡=pō',
- '坢=bàn,pǎn',
- '坣=táng',
- '坤=kūn',
- '坥=qū',
- '坦=tǎn',
- '坧=zhǐ',
- '坨=tuó',
- '坩=gān',
- '坪=píng',
- '坫=diàn',
- '坬=guà',
- '坭=ní',
- '坮=tái',
- '坯=pī',
- '坰=jiōng',
- '坱=yǎng',
- '坲=fó',
- '坳=ào',
- '坴=lù',
- '坵=qiū',
- '坶=mù,mǔ',
- '坷=kě,kē',
- '坸=gòu',
- '坹=xuè',
- '坺=fá',
- '坻=dǐ,chí',
- '坼=chè',
- '坽=líng',
- '坾=zhù',
- '坿=fù',
- '垀=hū',
- '垁=zhì',
- '垂=chuí',
- '垃=lā',
- '垄=lǒng',
- '垅=lǒng',
- '垆=lú',
- '垇=ào',
- '垈=dài',
- '垉=páo',
- '垊=mín',
- '型=xíng',
- '垌=dòng,tóng',
- '垍=jì',
- '垎=hè',
- '垏=lǜ',
- '垐=cí',
- '垑=chǐ',
- '垒=lěi',
- '垓=gāi',
- '垔=yīn',
- '垕=hòu',
- '垖=duī',
- '垗=zhào',
- '垘=fú',
- '垙=guāng',
- '垚=yáo',
- '垛=duǒ,duò',
- '垜=duǒ,duò',
- '垝=guǐ',
- '垞=chá',
- '垟=yáng',
- '垠=yín',
- '垡=fá',
- '垢=gòu',
- '垣=yuán',
- '垤=dié',
- '垥=xié',
- '垦=kěn',
- '垧=shǎng',
- '垨=shǒu',
- '垩=è',
- '垪=bìng',
- '垫=diàn',
- '垬=hóng',
- '垭=yā',
- '垮=kuǎ',
- '垯=dá',
- '垰=kǎ',
- '垱=dàng',
- '垲=kǎi',
- '垳=háng',
- '垴=nǎo',
- '垵=ǎn',
- '垶=xīng',
- '垷=xiàn',
- '垸=yuàn,huán',
- '垹=bāng',
- '垺=póu,fú',
- '垻=bà',
- '垼=yì',
- '垽=yìn',
- '垾=hàn',
- '垿=xù',
- '埀=chuí',
- '埁=cén',
- '埂=gěng',
- '埃=āi',
- '埄=běng,fēng',
- '埅=dì,fáng',
- '埆=què,jué',
- '埇=yǒng',
- '埈=jùn',
- '埉=xiá,jiā',
- '埊=dì',
- '埋=mái,mán',
- '埌=làng',
- '埍=juǎn',
- '城=chéng',
- '埏=yán,shān',
- '埐=qín,jīn',
- '埑=zhé',
- '埒=liè',
- '埓=liè',
- '埔=pǔ,bù',
- '埕=chéng',
- '埖=huā',
- '埗=bù',
- '埘=shí',
- '埙=xūn',
- '埚=guō',
- '埛=jiōng',
- '埜=yě',
- '埝=niàn',
- '埞=dī',
- '域=yù',
- '埠=bù',
- '埡=yà',
- '埢=quán',
- '埣=suì,sù',
- '埤=pí,pì',
- '埥=qīng,zhēng',
- '埦=wǎn,wān',
- '埧=jù',
- '埨=lǔn',
- '埩=zhēng,chéng',
- '埪=kōng',
- '埫=chǒng,shǎng',
- '埬=dōng',
- '埭=dài',
- '埮=tán,tàn',
- '埯=ǎn',
- '埰=cǎi,cài',
- '埱=chù,tòu',
- '埲=běng',
- '埳=xiàn,kǎn',
- '埴=zhí',
- '埵=duǒ',
- '埶=yì,shì',
- '執=zhí',
- '埸=yì',
- '培=péi',
- '基=jī',
- '埻=zhǔn',
- '埼=qí',
- '埽=sào,sǎo',
- '埾=jù',
- '埿=ní',
- '堀=kū',
- '堁=kè',
- '堂=táng',
- '堃=kūn',
- '堄=nì',
- '堅=jiān',
- '堆=duī',
- '堇=jīn',
- '堈=gāng',
- '堉=yù',
- '堊=è',
- '堋=péng,bèng',
- '堌=gù',
- '堍=tù',
- '堎=lèng',
- '堏=fāng',
- '堐=yá',
- '堑=qiàn,jiàn',
- '堒=kūn',
- '堓=àn',
- '堔=shēn',
- '堕=duò,huī',
- '堖=nǎo',
- '堗=tū',
- '堘=chéng',
- '堙=yīn',
- '堚=huán',
- '堛=bì',
- '堜=liàn',
- '堝=guō',
- '堞=dié',
- '堟=zhuàn',
- '堠=hòu',
- '堡=bǎo,bǔ,pù',
- '堢=bǎo',
- '堣=yú',
- '堤=dī',
- '堥=máo,móu,wǔ',
- '堦=jiē',
- '堧=ruán',
- '堨=è,ài,yè',
- '堩=gèng',
- '堪=kān',
- '堫=zōng',
- '堬=yú',
- '堭=huáng',
- '堮=è',
- '堯=yáo',
- '堰=yàn',
- '報=bào',
- '堲=jí',
- '堳=méi',
- '場=chǎng,cháng',
- '堵=dǔ',
- '堶=tuó',
- '堷=yìn',
- '堸=féng',
- '堹=zhòng',
- '堺=jiè',
- '堻=jīn',
- '堼=fēng',
- '堽=gāng',
- '堾=chuǎn',
- '堿=jiǎn',
- '塀=píng',
- '塁=lěi',
- '塂=jiǎng',
- '塃=huāng',
- '塄=léng',
- '塅=duàn',
- '塆=wān',
- '塇=xuān',
- '塈=jì',
- '塉=jí',
- '塊=kuài',
- '塋=yíng',
- '塌=tā',
- '塍=chéng',
- '塎=yǒng',
- '塏=kǎi',
- '塐=sù',
- '塑=sù',
- '塒=shí',
- '塓=mì',
- '塔=tǎ',
- '塕=wěng',
- '塖=chéng',
- '塗=tú',
- '塘=táng',
- '塙=què',
- '塚=zhǒng',
- '塛=lì',
- '塜=péng',
- '塝=bàng',
- '塞=sāi,sài,sè',
- '塟=zàng',
- '塠=duī',
- '塡=tián',
- '塢=wù',
- '塣=zhèng',
- '塤=xūn',
- '塥=gé',
- '塦=zhèn',
- '塧=ài',
- '塨=gōng',
- '塩=yán',
- '塪=xiàn',
- '填=tián,zhèn',
- '塬=yuán',
- '塭=wēn',
- '塮=xiè',
- '塯=liù',
- '塰=hǎi',
- '塱=lǎng',
- '塲=cháng,chǎng',
- '塳=péng',
- '塴=bèng',
- '塵=chén',
- '塶=lù',
- '塷=lǔ',
- '塸=ōu,qiū',
- '塹=qiàn',
- '塺=méi',
- '塻=mò',
- '塼=zhuān,tuán',
- '塽=shuǎng',
- '塾=shú',
- '塿=lǒu',
- '墀=chí',
- '墁=màn',
- '墂=biāo',
- '境=jìng',
- '墄=qī',
- '墅=shù',
- '墆=zhì,dì',
- '墇=zhàng',
- '墈=kàn',
- '墉=yōng',
- '墊=diàn',
- '墋=chěn',
- '墌=zhǐ,zhuó',
- '墍=xì',
- '墎=guō',
- '墏=qiǎng',
- '墐=jìn',
- '墑=dì',
- '墒=shāng',
- '墓=mù',
- '墔=cuī',
- '墕=yàn',
- '墖=tǎ',
- '増=zēng',
- '墘=qián',
- '墙=qiáng',
- '墚=liáng',
- '墛=wèi',
- '墜=zhuì',
- '墝=qiāo',
- '增=zēng',
- '墟=xū',
- '墠=shàn',
- '墡=shàn',
- '墢=fá',
- '墣=pú',
- '墤=kuài,tuí',
- '墥=tuǎn,dǒng',
- '墦=fán',
- '墧=qiáo,què',
- '墨=mò',
- '墩=dūn',
- '墪=dūn',
- '墫=zūn,dūn',
- '墬=dì',
- '墭=shèng',
- '墮=duò,huī',
- '墯=duò',
- '墰=tán',
- '墱=dèng',
- '墲=wú',
- '墳=fén',
- '墴=huáng',
- '墵=tán',
- '墶=dā',
- '墷=yè',
- '墸=zhù',
- '墹=jiàn',
- '墺=ào',
- '墻=qiáng',
- '墼=jī',
- '墽=qiāo,áo',
- '墾=kěn',
- '墿=yì,tú',
- '壀=pí',
- '壁=bì',
- '壂=diàn',
- '壃=jiāng',
- '壄=yě',
- '壅=yōng',
- '壆=xué,bó,jué',
- '壇=tán',
- '壈=lǎn',
- '壉=jù',
- '壊=huài',
- '壋=dàng',
- '壌=rǎng',
- '壍=qiàn',
- '壎=xūn',
- '壏=xiàn,làn',
- '壐=xǐ',
- '壑=hè',
- '壒=ài',
- '壓=yā,yà',
- '壔=dǎo',
- '壕=háo',
- '壖=ruán',
- '壗=jìn',
- '壘=lěi',
- '壙=kuàng',
- '壚=lú',
- '壛=yán',
- '壜=tán',
- '壝=wéi',
- '壞=huài',
- '壟=lǒng',
- '壠=lǒng',
- '壡=ruǐ',
- '壢=lì',
- '壣=lín',
- '壤=rǎng',
- '壥=chán',
- '壦=xūn',
- '壧=yán',
- '壨=lěi',
- '壩=bà',
- '壪=wān',
- '士=shì',
- '壬=rén',
- '壭=san',
- '壮=zhuàng',
- '壯=zhuàng',
- '声=shēng',
- '壱=yī',
- '売=mài',
- '壳=ké,qiào',
- '壴=zhù',
- '壵=zhuàng',
- '壶=hú',
- '壷=hú',
- '壸=kǔn',
- '壹=yī',
- '壺=hú',
- '壻=xù',
- '壼=kǔn',
- '壽=shòu',
- '壾=mǎng',
- '壿=cún',
- '夀=shòu',
- '夁=yī',
- '夂=zhǐ,zhōng',
- '夃=gǔ,yíng',
- '处=chù,chǔ',
- '夅=jiàng,xiáng',
- '夆=féng,fēng,páng',
- '备=bèi',
- '夈=zhāi',
- '変=biàn',
- '夊=suī',
- '夋=qūn',
- '夌=líng',
- '复=fù',
- '夎=cuò',
- '夏=xià',
- '夐=xiòng,xuàn',
- '夑=xiè',
- '夒=náo',
- '夓=xià',
- '夔=kuí',
- '夕=xī',
- '外=wài',
- '夗=yuàn,wǎn,wān,yuān',
- '夘=mǎo,wǎn',
- '夙=sù',
- '多=duō',
- '夛=duō',
- '夜=yè',
- '夝=qíng',
- '夞=null',
- '够=gòu',
- '夠=gòu',
- '夡=qì',
- '夢=mèng',
- '夣=mèng',
- '夤=yín',
- '夥=huǒ',
- '夦=chěn',
- '大=dà,dài,tài',
- '夨=cè',
- '天=tiān',
- '太=tài',
- '夫=fū,fú',
- '夬=guài',
- '夭=yāo',
- '央=yāng',
- '夯=hāng,bèn',
- '夰=gǎo',
- '失=shī',
- '夲=tāo,běn',
- '夳=tài',
- '头=tóu,tou',
- '夵=yǎn,tāo',
- '夶=bǐ',
- '夷=yí',
- '夸=kuā,kuà',
- '夹=jiá,jiā,gā',
- '夺=duó',
- '夻=huà',
- '夼=kuǎng',
- '夽=yǔn',
- '夾=jiá,jiā,gā',
- '夿=bā',
- '奀=ēn',
- '奁=lián',
- '奂=huàn',
- '奃=dī,tì',
- '奄=yǎn,yān',
- '奅=pào',
- '奆=juàn',
- '奇=qí,jī',
- '奈=nài',
- '奉=fèng',
- '奊=xié',
- '奋=fèn',
- '奌=diǎn',
- '奍=quān,juàn',
- '奎=kuí',
- '奏=zòu',
- '奐=huàn',
- '契=qì,qiè,xiè',
- '奒=kāi',
- '奓=shē,chǐ,zhà',
- '奔=bēn,bèn',
- '奕=yì',
- '奖=jiǎng',
- '套=tào',
- '奘=zàng,zhuǎng',
- '奙=běn',
- '奚=xī',
- '奛=huǎng',
- '奜=fěi',
- '奝=diāo',
- '奞=xùn,zhuì',
- '奟=bēng',
- '奠=diàn',
- '奡=ào',
- '奢=shē',
- '奣=wěng',
- '奤=pò,hǎ,tǎi',
- '奥=ào,yù',
- '奦=wù',
- '奧=ào,yù',
- '奨=jiǎng',
- '奩=lián',
- '奪=duó',
- '奫=yūn',
- '奬=jiǎng',
- '奭=shì',
- '奮=fèn',
- '奯=huò',
- '奰=bì',
- '奱=luán',
- '奲=duǒ,chě',
- '女=nǚ,rǔ',
- '奴=nú',
- '奵=dǐng,dīng,tiǎn',
- '奶=nǎi',
- '奷=qiān',
- '奸=jiān',
- '她=tā,jiě',
- '奺=jiǔ',
- '奻=nuán',
- '奼=chà',
- '好=hǎo,hào',
- '奾=xiān',
- '奿=fàn',
- '妀=jǐ',
- '妁=shuò',
- '如=rú',
- '妃=fēi,pèi',
- '妄=wàng',
- '妅=hóng',
- '妆=zhuāng',
- '妇=fù',
- '妈=mā',
- '妉=dān',
- '妊=rèn',
- '妋=fū,yōu',
- '妌=jìng',
- '妍=yán',
- '妎=hài,jiè',
- '妏=wèn',
- '妐=zhōng',
- '妑=pā',
- '妒=dù',
- '妓=jì',
- '妔=kēng,háng',
- '妕=zhòng',
- '妖=yāo',
- '妗=jìn',
- '妘=yún',
- '妙=miào',
- '妚=fǒu,pēi,pī',
- '妛=chī',
- '妜=yuè,jué',
- '妝=zhuāng',
- '妞=niū',
- '妟=yàn',
- '妠=nà,nàn',
- '妡=xīn',
- '妢=fén',
- '妣=bǐ',
- '妤=yú',
- '妥=tuǒ',
- '妦=fēng',
- '妧=wàn,yuán',
- '妨=fáng',
- '妩=wǔ',
- '妪=yù',
- '妫=guī',
- '妬=dù',
- '妭=bá',
- '妮=nī',
- '妯=zhóu',
- '妰=zhuó',
- '妱=zhāo',
- '妲=dá',
- '妳=nǐ,nǎi',
- '妴=yuàn',
- '妵=tǒu',
- '妶=xián,xuán,xù',
- '妷=zhí,yì',
- '妸=ē',
- '妹=mèi',
- '妺=mò',
- '妻=qī,qì',
- '妼=bì',
- '妽=shēn',
- '妾=qiè',
- '妿=ē',
- '姀=hé',
- '姁=xǔ,xū',
- '姂=fá',
- '姃=zhēng',
- '姄=mín',
- '姅=bàn',
- '姆=mǔ',
- '姇=fū,fú',
- '姈=líng',
- '姉=zǐ',
- '姊=zǐ',
- '始=shǐ',
- '姌=rǎn',
- '姍=shān,shàn',
- '姎=yāng',
- '姏=mán',
- '姐=jiě',
- '姑=gū',
- '姒=sì',
- '姓=xìng',
- '委=wěi,wēi',
- '姕=zī',
- '姖=jù',
- '姗=shān,shàn',
- '姘=pīn',
- '姙=rèn',
- '姚=yáo',
- '姛=dòng',
- '姜=jiāng',
- '姝=shū',
- '姞=jí',
- '姟=gāi',
- '姠=xiàng',
- '姡=huá,huó',
- '姢=juān',
- '姣=jiāo,xiáo',
- '姤=gòu,dù',
- '姥=lǎo,mǔ',
- '姦=jiān',
- '姧=jiān',
- '姨=yí',
- '姩=nián,niàn',
- '姪=zhí',
- '姫=zhěn',
- '姬=jī',
- '姭=xiàn',
- '姮=héng',
- '姯=guāng',
- '姰=xún,jūn',
- '姱=kuā,hù',
- '姲=yàn',
- '姳=mǐng',
- '姴=liè',
- '姵=pèi',
- '姶=è,yà',
- '姷=yòu',
- '姸=yán',
- '姹=chà',
- '姺=shēn,xiān',
- '姻=yīn',
- '姼=shí',
- '姽=guǐ',
- '姾=quán',
- '姿=zī',
- '娀=sōng',
- '威=wēi',
- '娂=hóng',
- '娃=wá',
- '娄=lóu',
- '娅=yà',
- '娆=ráo,rǎo',
- '娇=jiāo',
- '娈=luán',
- '娉=pīng',
- '娊=xiàn',
- '娋=shào,shāo',
- '娌=lǐ',
- '娍=chéng,shèng',
- '娎=xiē',
- '娏=máng',
- '娐=fū',
- '娑=suō',
- '娒=wǔ,mǔ',
- '娓=wěi',
- '娔=kè',
- '娕=chuò,lài',
- '娖=chuò',
- '娗=tǐng',
- '娘=niáng',
- '娙=xíng',
- '娚=nán',
- '娛=yú',
- '娜=nuó,nà',
- '娝=pōu,bǐ',
- '娞=něi,suī',
- '娟=juān',
- '娠=shēn',
- '娡=zhì',
- '娢=hán',
- '娣=dì',
- '娤=zhuāng',
- '娥=é',
- '娦=pín',
- '娧=tuì',
- '娨=mǎn',
- '娩=miǎn',
- '娪=wú,wù,yú',
- '娫=yán',
- '娬=wǔ',
- '娭=xī,āi',
- '娮=yán',
- '娯=yú',
- '娰=sì',
- '娱=yú',
- '娲=wā',
- '娳=lì',
- '娴=xián',
- '娵=jū',
- '娶=qǔ',
- '娷=zhuì,shuì',
- '娸=qī',
- '娹=xián',
- '娺=zhuó',
- '娻=dōng,dòng',
- '娼=chāng',
- '娽=lù',
- '娾=ǎi,ái,è',
- '娿=ē,ě',
- '婀=ē',
- '婁=lóu',
- '婂=mián',
- '婃=cóng',
- '婄=péi,pǒu,bù',
- '婅=jú',
- '婆=pó',
- '婇=cǎi',
- '婈=líng',
- '婉=wǎn',
- '婊=biǎo',
- '婋=xiāo',
- '婌=shū',
- '婍=qǐ',
- '婎=huī',
- '婏=fù,fàn',
- '婐=wǒ',
- '婑=wǒ',
- '婒=tán',
- '婓=fēi',
- '婔=fēi',
- '婕=jié',
- '婖=tiān',
- '婗=ní,nǐ',
- '婘=juàn,quán',
- '婙=jìng',
- '婚=hūn',
- '婛=jīng',
- '婜=qiān,jǐn',
- '婝=diàn',
- '婞=xìng',
- '婟=hù',
- '婠=wān,wà',
- '婡=lái,lài',
- '婢=bì',
- '婣=yīn',
- '婤=zhōu,chōu',
- '婥=chuò,nào',
- '婦=fù',
- '婧=jìng',
- '婨=lún',
- '婩=nüè',
- '婪=lán',
- '婫=hùn,kūn',
- '婬=yín',
- '婭=yà',
- '婮=jū',
- '婯=lì',
- '婰=diǎn',
- '婱=xián',
- '婲=huā',
- '婳=huà',
- '婴=yīng',
- '婵=chán',
- '婶=shěn',
- '婷=tíng',
- '婸=dàng,yáng',
- '婹=yǎo',
- '婺=wù',
- '婻=nàn',
- '婼=ruò,chuò',
- '婽=jiǎ',
- '婾=tōu,yú',
- '婿=xù',
- '媀=yú,yù',
- '媁=wéi,wěi',
- '媂=dì,tí',
- '媃=róu',
- '媄=měi',
- '媅=dān',
- '媆=ruǎn,nèn',
- '媇=qīn',
- '媈=huī',
- '媉=wò',
- '媊=qián',
- '媋=chūn',
- '媌=miáo',
- '媍=fù',
- '媎=jiě',
- '媏=duān',
- '媐=yí,pèi',
- '媑=zhòng',
- '媒=méi',
- '媓=huáng',
- '媔=mián,miǎn',
- '媕=ān',
- '媖=yīng',
- '媗=xuān',
- '媘=jiē',
- '媙=wēi',
- '媚=mèi',
- '媛=yuàn,yuán',
- '媜=zhēng',
- '媝=qiū',
- '媞=tí',
- '媟=xiè',
- '媠=tuó,duò',
- '媡=liàn',
- '媢=mào',
- '媣=rǎn',
- '媤=sī',
- '媥=piān',
- '媦=wèi',
- '媧=wā',
- '媨=cù',
- '媩=hú',
- '媪=ǎo',
- '媫=jié',
- '媬=bǎo',
- '媭=xū',
- '媮=tōu,yú',
- '媯=guī',
- '媰=chú,zòu',
- '媱=yáo',
- '媲=pì',
- '媳=xí',
- '媴=yuán',
- '媵=yìng',
- '媶=róng',
- '媷=rù',
- '媸=chī',
- '媹=liú',
- '媺=měi',
- '媻=pán',
- '媼=ǎo',
- '媽=mā',
- '媾=gòu',
- '媿=kuì',
- '嫀=qín,shēn',
- '嫁=jià',
- '嫂=sǎo',
- '嫃=zhēn,zhěn',
- '嫄=yuán',
- '嫅=jiē,suǒ',
- '嫆=róng',
- '嫇=míng,mǐng',
- '嫈=yīng',
- '嫉=jí',
- '嫊=sù',
- '嫋=niǎo',
- '嫌=xián',
- '嫍=tāo',
- '嫎=páng',
- '嫏=láng',
- '嫐=nǎo',
- '嫑=biáo',
- '嫒=ài',
- '嫓=pì',
- '嫔=pín',
- '嫕=yì',
- '嫖=piáo,piāo',
- '嫗=yù',
- '嫘=léi',
- '嫙=xuán',
- '嫚=màn',
- '嫛=yī',
- '嫜=zhāng',
- '嫝=kāng',
- '嫞=yōng',
- '嫟=nì',
- '嫠=lí',
- '嫡=dí',
- '嫢=guī',
- '嫣=yān',
- '嫤=jǐn,jìn',
- '嫥=zhuān',
- '嫦=cháng',
- '嫧=zé',
- '嫨=hān,nǎn',
- '嫩=nèn',
- '嫪=lào',
- '嫫=mó',
- '嫬=zhē',
- '嫭=hù',
- '嫮=hù',
- '嫯=ào',
- '嫰=nèn',
- '嫱=qiáng',
- '嫲=mā,má',
- '嫳=piè',
- '嫴=gū',
- '嫵=wǔ',
- '嫶=qiáo',
- '嫷=tuǒ',
- '嫸=zhǎn',
- '嫹=miáo',
- '嫺=xián',
- '嫻=xián',
- '嫼=mò',
- '嫽=liáo',
- '嫾=lián',
- '嫿=huà',
- '嬀=guī',
- '嬁=dēng',
- '嬂=zhí',
- '嬃=xū',
- '嬄=yī',
- '嬅=huà',
- '嬆=xī',
- '嬇=kuì',
- '嬈=ráo,rǎo',
- '嬉=xī',
- '嬊=yàn',
- '嬋=chán',
- '嬌=jiāo',
- '嬍=měi',
- '嬎=fàn',
- '嬏=fān',
- '嬐=xiān,yǎn,jìn',
- '嬑=yì',
- '嬒=huì',
- '嬓=jiào',
- '嬔=fù',
- '嬕=shì',
- '嬖=bì',
- '嬗=shàn',
- '嬘=suì',
- '嬙=qiáng',
- '嬚=liǎn',
- '嬛=huán,xuān,qióng',
- '嬜=xīn',
- '嬝=niǎo',
- '嬞=dǒng',
- '嬟=yǐ',
- '嬠=cān',
- '嬡=ài',
- '嬢=niáng',
- '嬣=níng',
- '嬤=mó',
- '嬥=tiǎo',
- '嬦=chóu',
- '嬧=jìn',
- '嬨=cí',
- '嬩=yú',
- '嬪=pín',
- '嬫=róng',
- '嬬=rú',
- '嬭=nǎi',
- '嬮=yān,yàn',
- '嬯=tái',
- '嬰=yīng',
- '嬱=qiàn',
- '嬲=niǎo',
- '嬳=yuè',
- '嬴=yíng',
- '嬵=mián',
- '嬶=bí',
- '嬷=mó',
- '嬸=shěn',
- '嬹=xìng',
- '嬺=nì',
- '嬻=dú',
- '嬼=liǔ',
- '嬽=yuān',
- '嬾=lǎn',
- '嬿=yàn',
- '孀=shuāng',
- '孁=líng',
- '孂=jiǎo',
- '孃=niáng',
- '孄=lǎn',
- '孅=xiān,qiān',
- '孆=yīng',
- '孇=shuāng',
- '孈=xié,huī',
- '孉=huān,quán',
- '孊=mǐ',
- '孋=lì,lí',
- '孌=luán',
- '孍=yǎn',
- '孎=zhú,chuò',
- '孏=lǎn',
- '子=zǐ',
- '孑=jié',
- '孒=jué',
- '孓=jué',
- '孔=kǒng',
- '孕=yùn',
- '孖=zī,mā',
- '字=zì',
- '存=cún',
- '孙=sūn,xùn',
- '孚=fú',
- '孛=bèi',
- '孜=zī',
- '孝=xiào',
- '孞=xìn',
- '孟=mèng',
- '孠=sì',
- '孡=tāi',
- '孢=bāo',
- '季=jì',
- '孤=gū',
- '孥=nú',
- '学=xué',
- '孧=yòu,niū',
- '孨=zhuǎn',
- '孩=hái',
- '孪=luán',
- '孫=sūn,xùn',
- '孬=nāo',
- '孭=miē',
- '孮=cóng',
- '孯=qiān',
- '孰=shú',
- '孱=chán,càn',
- '孲=yā',
- '孳=zī',
- '孴=nǐ',
- '孵=fū',
- '孶=zī',
- '孷=lí',
- '學=xué',
- '孹=bò',
- '孺=rú',
- '孻=nái',
- '孼=niè',
- '孽=niè',
- '孾=yīng',
- '孿=luán',
- '宀=mián',
- '宁=níng,nìng,zhù',
- '宂=rǒng',
- '它=tā',
- '宄=guǐ',
- '宅=zhái',
- '宆=qióng',
- '宇=yǔ',
- '守=shǒu',
- '安=ān',
- '宊=tū,jiā',
- '宋=sòng',
- '完=wán',
- '宍=ròu',
- '宎=yǎo',
- '宏=hóng',
- '宐=yí',
- '宑=jǐng',
- '宒=zhūn',
- '宓=mì,fú',
- '宔=zhǔ',
- '宕=dàng',
- '宖=hóng',
- '宗=zōng',
- '官=guān',
- '宙=zhòu',
- '定=dìng',
- '宛=wǎn,yuān',
- '宜=yí',
- '宝=bǎo',
- '实=shí',
- '実=shí',
- '宠=chǒng',
- '审=shěn',
- '客=kè',
- '宣=xuān',
- '室=shì',
- '宥=yòu',
- '宦=huàn',
- '宧=yí',
- '宨=tiǎo',
- '宩=shǐ',
- '宪=xiàn',
- '宫=gōng',
- '宬=chéng',
- '宭=qún',
- '宮=gōng',
- '宯=xiāo',
- '宰=zǎi',
- '宱=zhà',
- '宲=bǎo,shí',
- '害=hài',
- '宴=yàn',
- '宵=xiāo',
- '家=jiā,jia,jie',
- '宷=shěn',
- '宸=chén',
- '容=róng',
- '宺=huāng,huǎng',
- '宻=mì',
- '宼=kòu',
- '宽=kuān',
- '宾=bīn',
- '宿=sù,xiǔ,xiù',
- '寀=cǎi,cài',
- '寁=zǎn',
- '寂=jì',
- '寃=yuān',
- '寄=jì',
- '寅=yín',
- '密=mì',
- '寇=kòu',
- '寈=qīng',
- '寉=hè',
- '寊=zhēn',
- '寋=jiàn',
- '富=fù',
- '寍=níng,nìng',
- '寎=bǐng,bìng',
- '寏=huán',
- '寐=mèi',
- '寑=qǐn',
- '寒=hán',
- '寓=yù',
- '寔=shí',
- '寕=níng,nìng',
- '寖=qǐn,jìn',
- '寗=níng,nìng',
- '寘=zhì',
- '寙=yǔ',
- '寚=bǎo',
- '寛=kuān',
- '寜=níng,nìng',
- '寝=qǐn',
- '寞=mò',
- '察=chá',
- '寠=jù,lóu',
- '寡=guǎ',
- '寢=qǐn',
- '寣=hū',
- '寤=wù',
- '寥=liáo',
- '實=shí',
- '寧=níng,nìng',
- '寨=zhài',
- '審=shěn',
- '寪=wěi',
- '寫=xiě,xiè',
- '寬=kuān',
- '寭=huì',
- '寮=liáo',
- '寯=jùn',
- '寰=huán',
- '寱=yì',
- '寲=yí',
- '寳=bǎo',
- '寴=qīn,qìn',
- '寵=chǒng',
- '寶=bǎo',
- '寷=fēng',
- '寸=cùn',
- '对=duì',
- '寺=sì',
- '寻=xún',
- '导=dǎo',
- '寽=lüè,luó',
- '対=duì',
- '寿=shòu',
- '尀=pǒ',
- '封=fēng',
- '専=zhuān',
- '尃=fū',
- '射=shè,yè,yì',
- '尅=kè,kēi',
- '将=jiāng,jiàng',
- '將=jiāng,jiàng',
- '專=zhuān',
- '尉=wèi,yù',
- '尊=zūn',
- '尋=xún',
- '尌=shù,zhù',
- '對=duì',
- '導=dǎo',
- '小=xiǎo',
- '尐=jié,jí',
- '少=shǎo,shào',
- '尒=ěr',
- '尓=ěr',
- '尔=ěr',
- '尕=gǎ',
- '尖=jiān',
- '尗=shú',
- '尘=chén',
- '尙=shàng',
- '尚=shàng',
- '尛=mó',
- '尜=gá',
- '尝=cháng',
- '尞=liáo',
- '尟=xiǎn',
- '尠=xiǎn',
- '尡=hùn',
- '尢=yóu',
- '尣=wāng',
- '尤=yóu',
- '尥=liào',
- '尦=liào',
- '尧=yáo',
- '尨=lóng,máng,méng,páng',
- '尩=wāng',
- '尪=wāng',
- '尫=wāng',
- '尬=gà',
- '尭=yáo',
- '尮=duò',
- '尯=kuì,kuǐ',
- '尰=zhǒng',
- '就=jiù',
- '尲=gān',
- '尳=gǔ',
- '尴=gān',
- '尵=tuí',
- '尶=gān',
- '尷=gān',
- '尸=shī',
- '尹=yǐn',
- '尺=chǐ,chě',
- '尻=kāo',
- '尼=ní',
- '尽=jìn,jǐn',
- '尾=wěi,yǐ',
- '尿=niào,suī',
- '局=jú',
- '屁=pì',
- '层=céng',
- '屃=xì',
- '屄=bī',
- '居=jū',
- '屆=jiè',
- '屇=tián',
- '屈=qū',
- '屉=tì',
- '届=jiè',
- '屋=wū',
- '屌=diǎo',
- '屍=shī',
- '屎=shǐ',
- '屏=píng,bǐng',
- '屐=jī',
- '屑=xiè',
- '屒=zhěn',
- '屓=xì',
- '屔=ní',
- '展=zhǎn',
- '屖=xī',
- '屗=wěi',
- '屘=mǎn',
- '屙=ē',
- '屚=lòu',
- '屛=pǐng,bǐng',
- '屜=tì',
- '屝=fèi',
- '属=shǔ,zhǔ',
- '屟=xiè,tì',
- '屠=tú',
- '屡=lǚ',
- '屢=lǚ',
- '屣=xǐ',
- '層=céng',
- '履=lǚ',
- '屦=jù',
- '屧=xiè',
- '屨=jù',
- '屩=juē',
- '屪=liáo',
- '屫=juē',
- '屬=shǔ,zhǔ',
- '屭=xì',
- '屮=chè,cǎo',
- '屯=tún,zhūn',
- '屰=nì,jǐ',
- '山=shān',
- '屲=wā',
- '屳=xiān',
- '屴=lì',
- '屵=àn',
- '屶=huì',
- '屷=huì',
- '屸=hóng,lóng',
- '屹=yì',
- '屺=qǐ',
- '屻=rèn',
- '屼=wù',
- '屽=hàn,àn',
- '屾=shēn',
- '屿=yǔ',
- '岀=chū',
- '岁=suì',
- '岂=qǐ,kǎi',
- '岃=rèn',
- '岄=yuè',
- '岅=bǎn',
- '岆=yǎo',
- '岇=áng',
- '岈=yá',
- '岉=wù',
- '岊=jié',
- '岋=è',
- '岌=jí',
- '岍=qiān',
- '岎=fén',
- '岏=wán',
- '岐=qí',
- '岑=cén',
- '岒=qián',
- '岓=qí',
- '岔=chà',
- '岕=jiè',
- '岖=qū',
- '岗=gǎng',
- '岘=xiàn',
- '岙=ào',
- '岚=lán',
- '岛=dǎo',
- '岜=bā',
- '岝=zuò',
- '岞=zuò',
- '岟=yǎng',
- '岠=jù',
- '岡=gāng',
- '岢=kě',
- '岣=gǒu',
- '岤=xuè',
- '岥=pō',
- '岦=lì',
- '岧=tiáo',
- '岨=jū,jǔ',
- '岩=yán',
- '岪=fú',
- '岫=xiù',
- '岬=jiǎ',
- '岭=lǐng,líng',
- '岮=tuó',
- '岯=pī',
- '岰=ào',
- '岱=dài',
- '岲=kuàng',
- '岳=yuè',
- '岴=qū',
- '岵=hù',
- '岶=pò',
- '岷=mín',
- '岸=àn',
- '岹=tiáo',
- '岺=lǐng,líng',
- '岻=dī',
- '岼=píng',
- '岽=dōng',
- '岾=zhān',
- '岿=kuī',
- '峀=xiù',
- '峁=mǎo',
- '峂=tóng',
- '峃=xué',
- '峄=yì',
- '峅=biàn',
- '峆=hé',
- '峇=kè,bā',
- '峈=luò',
- '峉=é',
- '峊=fù,niè',
- '峋=xún',
- '峌=dié',
- '峍=lù',
- '峎=ěn',
- '峏=ér',
- '峐=gāi',
- '峑=quán',
- '峒=tóng,dòng',
- '峓=yí',
- '峔=mǔ',
- '峕=shí',
- '峖=ān',
- '峗=wéi',
- '峘=huán',
- '峙=zhì,shì',
- '峚=mì',
- '峛=lǐ',
- '峜=fǎ',
- '峝=tóng',
- '峞=wéi',
- '峟=yòu',
- '峠=qiǎ',
- '峡=xiá',
- '峢=lǐ',
- '峣=yáo',
- '峤=qiáo,jiào',
- '峥=zhēng',
- '峦=luán',
- '峧=jiāo',
- '峨=é',
- '峩=é',
- '峪=yù',
- '峫=xié,yé',
- '峬=bū',
- '峭=qiào',
- '峮=qún',
- '峯=fēng',
- '峰=fēng',
- '峱=náo',
- '峲=lǐ',
- '峳=yōu',
- '峴=xiàn',
- '峵=róng',
- '島=dǎo',
- '峷=shēn',
- '峸=chéng',
- '峹=tú',
- '峺=gěng',
- '峻=jùn',
- '峼=gào',
- '峽=xiá',
- '峾=yín',
- '峿=wú',
- '崀=lǎng',
- '崁=kàn',
- '崂=láo',
- '崃=lái',
- '崄=xiǎn',
- '崅=què',
- '崆=kōng',
- '崇=chóng',
- '崈=chóng',
- '崉=tà',
- '崊=lín',
- '崋=huà',
- '崌=jū',
- '崍=lái',
- '崎=qí',
- '崏=mín',
- '崐=kūn',
- '崑=kūn',
- '崒=zú,cuì',
- '崓=gù',
- '崔=cuī',
- '崕=yá',
- '崖=yá',
- '崗=gǎng,gāng',
- '崘=lún',
- '崙=lún',
- '崚=líng,léng',
- '崛=jué',
- '崜=duǒ',
- '崝=zhēng',
- '崞=guō',
- '崟=yín',
- '崠=dōng,dòng',
- '崡=hán',
- '崢=zhēng',
- '崣=wěi',
- '崤=xiáo',
- '崥=pí,bǐ',
- '崦=yān',
- '崧=sōng',
- '崨=jié',
- '崩=bēng',
- '崪=zú',
- '崫=jué',
- '崬=dōng',
- '崭=zhǎn,chán',
- '崮=gù',
- '崯=yín',
- '崰=zī',
- '崱=zè',
- '崲=huáng',
- '崳=yú',
- '崴=wēi,wǎi',
- '崵=yáng,dàng',
- '崶=fēng',
- '崷=qiú',
- '崸=yáng',
- '崹=tí',
- '崺=yǐ',
- '崻=zhì,shì',
- '崼=shì,dié',
- '崽=zǎi',
- '崾=yǎo',
- '崿=è',
- '嵀=zhù',
- '嵁=kān,zhàn',
- '嵂=lǜ',
- '嵃=yǎn',
- '嵄=měi',
- '嵅=hán',
- '嵆=jī',
- '嵇=jī',
- '嵈=huàn',
- '嵉=tíng',
- '嵊=shèng',
- '嵋=méi',
- '嵌=qiàn,kàn',
- '嵍=wù,máo',
- '嵎=yú',
- '嵏=zōng',
- '嵐=lán',
- '嵑=kě,jié',
- '嵒=yán',
- '嵓=yán',
- '嵔=wēi,wěi',
- '嵕=zōng',
- '嵖=chá',
- '嵗=suì',
- '嵘=róng',
- '嵙=kē',
- '嵚=qīn',
- '嵛=yú',
- '嵜=qí',
- '嵝=lǒu',
- '嵞=tú',
- '嵟=cuī',
- '嵠=xī',
- '嵡=wěng',
- '嵢=cāng',
- '嵣=táng,dàng',
- '嵤=róng,yíng',
- '嵥=jié',
- '嵦=kǎi,ái',
- '嵧=liú',
- '嵨=wù',
- '嵩=sōng',
- '嵪=kāo,qiāo',
- '嵫=zī',
- '嵬=wéi',
- '嵭=bēng',
- '嵮=diān',
- '嵯=cuó',
- '嵰=qīn,qiǎn',
- '嵱=yǒng',
- '嵲=niè',
- '嵳=cuó',
- '嵴=jǐ',
- '嵵=shí',
- '嵶=ruò',
- '嵷=sǒng',
- '嵸=zǒng',
- '嵹=jiàng',
- '嵺=liáo',
- '嵻=kāng',
- '嵼=chǎn',
- '嵽=dié,dì',
- '嵾=cēn',
- '嵿=dǐng',
- '嶀=tū',
- '嶁=lǒu',
- '嶂=zhàng',
- '嶃=zhǎn,chán',
- '嶄=zhǎn,chán',
- '嶅=áo,ào',
- '嶆=cáo',
- '嶇=qū',
- '嶈=qiāng',
- '嶉=wěi',
- '嶊=zuǐ',
- '嶋=dǎo',
- '嶌=dǎo',
- '嶍=xí',
- '嶎=yù',
- '嶏=pǐ,pèi',
- '嶐=lóng',
- '嶑=xiàng',
- '嶒=céng',
- '嶓=bō',
- '嶔=qīn',
- '嶕=jiāo',
- '嶖=yān',
- '嶗=láo',
- '嶘=zhàn',
- '嶙=lín',
- '嶚=liáo',
- '嶛=liáo',
- '嶜=qín',
- '嶝=dèng',
- '嶞=tuò',
- '嶟=zūn',
- '嶠=jiào,qiáo',
- '嶡=jué,guì',
- '嶢=yáo',
- '嶣=jiāo',
- '嶤=yáo',
- '嶥=jué',
- '嶦=zhān,shàn',
- '嶧=yì',
- '嶨=xué',
- '嶩=náo',
- '嶪=yè',
- '嶫=yè',
- '嶬=yí',
- '嶭=niè',
- '嶮=xiǎn',
- '嶯=jí',
- '嶰=xiè,jiè',
- '嶱=kě,jié',
- '嶲=guī,xī,juàn',
- '嶳=dì',
- '嶴=ào',
- '嶵=zuì',
- '嶶=wēi',
- '嶷=yí',
- '嶸=róng',
- '嶹=dǎo',
- '嶺=lǐng',
- '嶻=jié',
- '嶼=yǔ',
- '嶽=yuè',
- '嶾=yǐn',
- '嶿=rū',
- '巀=jié',
- '巁=lì,liè',
- '巂=guī,xī,juàn',
- '巃=lóng',
- '巄=lóng',
- '巅=diān',
- '巆=yíng,hōng',
- '巇=xī',
- '巈=jú',
- '巉=chán',
- '巊=yǐng',
- '巋=kuī',
- '巌=yán',
- '巍=wēi',
- '巎=náo',
- '巏=quán',
- '巐=chǎo',
- '巑=cuán',
- '巒=luán',
- '巓=diān',
- '巔=diān',
- '巕=niè',
- '巖=yán',
- '巗=yán',
- '巘=yǎn',
- '巙=kuí',
- '巚=yǎn',
- '巛=chuān',
- '巜=kuài',
- '川=chuān',
- '州=zhōu',
- '巟=huāng',
- '巠=jīng,xíng',
- '巡=xún',
- '巢=cháo',
- '巣=cháo',
- '巤=liè',
- '工=gōng',
- '左=zuǒ',
- '巧=qiǎo',
- '巨=jù',
- '巩=gǒng',
- '巪=jù',
- '巫=wū',
- '巬=gū',
- '巭=gū',
- '差=chà,chā,chāi,cī',
- '巯=qiú',
- '巰=qiú',
- '己=jǐ',
- '已=yǐ',
- '巳=sì',
- '巴=bā',
- '巵=zhī',
- '巶=zhāo',
- '巷=xiàng,hàng',
- '巸=yí',
- '巹=jǐn',
- '巺=xùn',
- '巻=juǎn,juàn',
- '巼=null',
- '巽=xùn',
- '巾=jīn',
- '巿=fú',
- '帀=zā',
- '币=bì',
- '市=shì',
- '布=bù',
- '帄=dīng',
- '帅=shuài',
- '帆=fān',
- '帇=niè',
- '师=shī',
- '帉=fēn',
- '帊=pà',
- '帋=zhǐ',
- '希=xī',
- '帍=hù',
- '帎=dàn',
- '帏=wéi',
- '帐=zhàng',
- '帑=nú,tǎng',
- '帒=dài',
- '帓=mò,wà',
- '帔=pèi',
- '帕=pà',
- '帖=tiě,tiè,tiē',
- '帗=fú',
- '帘=lián',
- '帙=zhì',
- '帚=zhǒu',
- '帛=bó',
- '帜=zhì',
- '帝=dì',
- '帞=mò',
- '帟=yì',
- '帠=yì',
- '帡=píng',
- '帢=qià',
- '帣=juàn,juǎn',
- '帤=rú',
- '帥=shuài',
- '带=dài',
- '帧=zhēn',
- '帨=shuì',
- '帩=qiāo',
- '帪=zhēn',
- '師=shī',
- '帬=qún',
- '席=xí',
- '帮=bāng',
- '帯=dài',
- '帰=guī',
- '帱=chóu,dào',
- '帲=píng',
- '帳=zhàng',
- '帴=jiǎn,jiān,sàn',
- '帵=wān',
- '帶=dài',
- '帷=wéi',
- '常=cháng',
- '帹=shà,qiè',
- '帺=qí,jì',
- '帻=zé',
- '帼=guó',
- '帽=mào',
- '帾=zhǔ',
- '帿=hóu',
- '幀=zhēn',
- '幁=zhèng',
- '幂=mì',
- '幃=wéi',
- '幄=wò',
- '幅=fú',
- '幆=yì',
- '幇=bāng',
- '幈=píng',
- '幉=dié',
- '幊=gōng',
- '幋=pán',
- '幌=huǎng',
- '幍=tāo',
- '幎=mì',
- '幏=jià',
- '幐=téng',
- '幑=huī',
- '幒=zhōng',
- '幓=shān,qiāo,shēn',
- '幔=màn',
- '幕=mù',
- '幖=biāo',
- '幗=guó',
- '幘=zé',
- '幙=mù',
- '幚=bāng',
- '幛=zhàng',
- '幜=jǐng',
- '幝=chǎn,chàn',
- '幞=fú',
- '幟=zhì',
- '幠=hū',
- '幡=fān',
- '幢=chuáng,zhuàng',
- '幣=bì',
- '幤=bì',
- '幥=zhǎng',
- '幦=mì',
- '幧=qiāo',
- '幨=chān,chàn',
- '幩=fén',
- '幪=méng',
- '幫=bāng',
- '幬=chóu,dào',
- '幭=miè',
- '幮=chú',
- '幯=jié',
- '幰=xiǎn',
- '幱=lán',
- '干=gān,gàn',
- '平=píng',
- '年=nián',
- '幵=jiān',
- '并=bìng,bīng',
- '幷=bìng,bīng',
- '幸=xìng',
- '幹=gàn',
- '幺=yāo',
- '幻=huàn',
- '幼=yòu',
- '幽=yōu',
- '幾=jǐ,jī',
- '广=guǎng,ān',
- '庀=pǐ',
- '庁=tīng',
- '庂=zè',
- '広=guǎng',
- '庄=zhuāng',
- '庅=mó,mā,me',
- '庆=qìng',
- '庇=bì',
- '庈=qín',
- '庉=dùn,tún',
- '床=chuáng',
- '庋=guǐ',
- '庌=yǎ',
- '庍=bài,tīng',
- '庎=jiè',
- '序=xù',
- '庐=lú',
- '庑=wǔ',
- '庒=zhuāng',
- '库=kù',
- '应=yīng,yìng',
- '底=dǐ,de',
- '庖=páo',
- '店=diàn',
- '庘=yā',
- '庙=miào',
- '庚=gēng',
- '庛=cì',
- '府=fǔ',
- '庝=tóng',
- '庞=páng',
- '废=fèi',
- '庠=xiáng',
- '庡=yǐ',
- '庢=zhì',
- '庣=tiāo',
- '庤=zhì',
- '庥=xiū',
- '度=dù,duó',
- '座=zuò',
- '庨=xiāo',
- '庩=tú',
- '庪=guǐ',
- '庫=kù',
- '庬=páng,máng,méng',
- '庭=tíng',
- '庮=yóu',
- '庯=bū',
- '庰=bìng,píng',
- '庱=chěng',
- '庲=lái',
- '庳=bēi',
- '庴=cuò,jī',
- '庵=ān',
- '庶=shù',
- '康=kāng',
- '庸=yōng',
- '庹=tuǒ',
- '庺=sōng',
- '庻=shù',
- '庼=qǐng',
- '庽=yù',
- '庾=yǔ',
- '庿=miào',
- '廀=sōu',
- '廁=cè',
- '廂=xiāng',
- '廃=fèi',
- '廄=jiù',
- '廅=è',
- '廆=guī,wěi,huì',
- '廇=liù',
- '廈=shà,xià',
- '廉=lián',
- '廊=láng',
- '廋=sōu',
- '廌=zhì',
- '廍=bù',
- '廎=qǐng',
- '廏=jiù',
- '廐=jiù',
- '廑=jǐn,qín',
- '廒=áo',
- '廓=kuò',
- '廔=lóu',
- '廕=yìn',
- '廖=liào',
- '廗=dài',
- '廘=lù',
- '廙=yì',
- '廚=chú',
- '廛=chán',
- '廜=tú',
- '廝=sī',
- '廞=xīn',
- '廟=miào',
- '廠=chǎng',
- '廡=wǔ',
- '廢=fèi',
- '廣=guǎng',
- '廤=kù',
- '廥=kuài',
- '廦=bì',
- '廧=qiáng,sè',
- '廨=xiè',
- '廩=lǐn',
- '廪=lǐn',
- '廫=liáo',
- '廬=lú',
- '廭=jì',
- '廮=yǐng',
- '廯=xiān',
- '廰=tīng',
- '廱=yōng',
- '廲=lí',
- '廳=tīng',
- '廴=yǐn,yìn',
- '廵=xún',
- '延=yán',
- '廷=tíng',
- '廸=dí',
- '廹=pò,pǎi',
- '建=jiàn',
- '廻=huí',
- '廼=nǎi',
- '廽=huí',
- '廾=gǒng',
- '廿=niàn',
- '开=kāi',
- '弁=biàn',
- '异=yì',
- '弃=qì',
- '弄=nòng,lòng',
- '弅=fèn',
- '弆=jǔ',
- '弇=yǎn',
- '弈=yì',
- '弉=zàng',
- '弊=bì',
- '弋=yì',
- '弌=yī',
- '弍=èr',
- '弎=sān',
- '式=shì',
- '弐=èr',
- '弑=shì',
- '弒=shì',
- '弓=gōng',
- '弔=diào',
- '引=yǐn',
- '弖=hù',
- '弗=fú',
- '弘=hóng',
- '弙=wū',
- '弚=tuí',
- '弛=chí',
- '弜=jiàng',
- '弝=bà',
- '弞=shěn',
- '弟=dì,tì,tuí',
- '张=zhāng',
- '弡=jué,zhāng',
- '弢=tāo',
- '弣=fǔ',
- '弤=dǐ',
- '弥=mí,mǐ',
- '弦=xián',
- '弧=hú',
- '弨=chāo',
- '弩=nǔ',
- '弪=jìng',
- '弫=zhěn',
- '弬=yi',
- '弭=mǐ',
- '弮=juàn,quān',
- '弯=wān',
- '弰=shāo',
- '弱=ruò',
- '弲=xuān,yuān',
- '弳=jìng',
- '弴=diāo',
- '張=zhāng',
- '弶=jiàng',
- '強=qiáng,qiǎng,jiàng',
- '弸=péng',
- '弹=tán,dàn',
- '强=qiáng,qiǎng,jiàng',
- '弻=bì',
- '弼=bì',
- '弽=shè',
- '弾=tán,dàn',
- '弿=jiǎn',
- '彀=gòu',
- '彁=gē',
- '彂=fā',
- '彃=bì',
- '彄=kōu',
- '彅=jiǎn',
- '彆=biè',
- '彇=xiāo',
- '彈=tán,dàn',
- '彉=guō',
- '彊=qiáng,qiǎng,jiàng',
- '彋=hóng',
- '彌=mí,mǐ',
- '彍=guō',
- '彎=wān',
- '彏=jué',
- '彐=jì,xuě',
- '彑=jì',
- '归=guī',
- '当=dāng,dàng',
- '彔=lù',
- '录=lù',
- '彖=tuàn',
- '彗=huì',
- '彘=zhì',
- '彙=huì',
- '彚=huì',
- '彛=yí',
- '彜=yí',
- '彝=yí',
- '彞=yí',
- '彟=huò',
- '彠=huò',
- '彡=shān,xiǎn',
- '形=xíng',
- '彣=wén',
- '彤=tóng',
- '彥=yàn',
- '彦=yàn',
- '彧=yù',
- '彨=chī',
- '彩=cǎi',
- '彪=biāo',
- '彫=diāo',
- '彬=bīn',
- '彭=péng,bāng',
- '彮=yǒng',
- '彯=piāo,piào',
- '彰=zhāng',
- '影=yǐng',
- '彲=chī',
- '彳=chì',
- '彴=zhuó,bó',
- '彵=tuǒ,yí',
- '彶=jí',
- '彷=páng,fǎng',
- '彸=zhōng',
- '役=yì',
- '彺=wǎng',
- '彻=chè',
- '彼=bǐ',
- '彽=dī',
- '彾=líng',
- '彿=fù',
- '往=wǎng',
- '征=zhēng',
- '徂=cú',
- '徃=wǎng',
- '径=jìng',
- '待=dài,dāi',
- '徆=xī',
- '徇=xùn',
- '很=hěn',
- '徉=yáng',
- '徊=huái',
- '律=lǜ',
- '後=hòu',
- '徍=jiā,wàng,wā',
- '徎=chěng,zhèng',
- '徏=zhì',
- '徐=xú',
- '徑=jìng',
- '徒=tú',
- '従=cóng',
- '徔=cóng',
- '徕=lái,lài',
- '徖=cóng',
- '得=dé,děi,de',
- '徘=pái',
- '徙=xǐ',
- '徚=dōng',
- '徛=jì',
- '徜=cháng',
- '徝=zhì',
- '從=cóng,zòng',
- '徟=zhōu',
- '徠=lái,lài',
- '御=yù',
- '徢=xiè',
- '徣=jiè',
- '徤=jiàn',
- '徥=shì,tǐ',
- '徦=jiǎ,xiá',
- '徧=biàn',
- '徨=huáng',
- '復=fù',
- '循=xún',
- '徫=wěi',
- '徬=páng',
- '徭=yáo',
- '微=wēi',
- '徯=xī',
- '徰=zhēng',
- '徱=piào',
- '徲=tí,chí',
- '徳=dé',
- '徴=zhēng,zhǐ',
- '徵=zhēng,zhǐ',
- '徶=bié',
- '德=dé',
- '徸=zhǒng,chōng',
- '徹=chè',
- '徺=jiǎo,yáo',
- '徻=huì',
- '徼=jiǎo,jiào',
- '徽=huī',
- '徾=méi',
- '徿=lòng,lǒng',
- '忀=xiāng',
- '忁=bào',
- '忂=qú,jù',
- '心=xīn',
- '忄=xīn',
- '必=bì',
- '忆=yì',
- '忇=lè',
- '忈=rén',
- '忉=dāo',
- '忊=dìng,tìng',
- '忋=gǎi',
- '忌=jì',
- '忍=rěn',
- '忎=rén',
- '忏=chàn',
- '忐=tǎn',
- '忑=tè',
- '忒=tè,tuī',
- '忓=gān,hàn',
- '忔=yì,qì',
- '忕=shì,tài',
- '忖=cǔn',
- '志=zhì',
- '忘=wàng',
- '忙=máng',
- '忚=xī,liě',
- '忛=fān',
- '応=yīng,yìng',
- '忝=tiǎn',
- '忞=mǐn,wěn,mín',
- '忟=mǐn,wěn,mín',
- '忠=zhōng',
- '忡=chōng',
- '忢=wù',
- '忣=jí',
- '忤=wǔ',
- '忥=xì',
- '忦=jiá',
- '忧=yōu',
- '忨=wán',
- '忩=cōng',
- '忪=sōng,zhōng',
- '快=kuài',
- '忬=yù,shū',
- '忭=biàn',
- '忮=zhì',
- '忯=qí,shì',
- '忰=cuì',
- '忱=chén',
- '忲=tài',
- '忳=tún,zhūn,dùn',
- '忴=qián,qín',
- '念=niàn',
- '忶=hún',
- '忷=xiōng',
- '忸=niǔ',
- '忹=kuáng,wǎng',
- '忺=xiān',
- '忻=xīn',
- '忼=kāng,hàng',
- '忽=hū',
- '忾=kài,xì',
- '忿=fèn',
- '怀=huái',
- '态=tài',
- '怂=sǒng',
- '怃=wǔ',
- '怄=òu',
- '怅=chàng',
- '怆=chuàng',
- '怇=jù',
- '怈=yì',
- '怉=bǎo,bào',
- '怊=chāo',
- '怋=mín,mén',
- '怌=pēi',
- '怍=zuò,zhà',
- '怎=zěn',
- '怏=yàng',
- '怐=kòu,jù',
- '怑=bàn',
- '怒=nù',
- '怓=náo,niú',
- '怔=zhēng',
- '怕=pà',
- '怖=bù',
- '怗=tiē,zhān',
- '怘=hù,gù',
- '怙=hù',
- '怚=cū,jù,zū',
- '怛=dá',
- '怜=lián',
- '思=sī,sāi',
- '怞=yóu,chóu',
- '怟=dì',
- '怠=dài',
- '怡=yí',
- '怢=tū,dié',
- '怣=yóu',
- '怤=fū',
- '急=jí',
- '怦=pēng',
- '性=xìng',
- '怨=yuàn',
- '怩=ní',
- '怪=guài',
- '怫=fú',
- '怬=xì',
- '怭=bì',
- '怮=yōu,yào',
- '怯=qiè',
- '怰=xuàn',
- '怱=cōng',
- '怲=bǐng',
- '怳=huǎng',
- '怴=xù,xuè',
- '怵=chù',
- '怶=bì,pī',
- '怷=shù',
- '怸=xī,shù',
- '怹=tān',
- '怺=yǒng',
- '总=zǒng',
- '怼=duì',
- '怽=mì',
- '怾=gi',
- '怿=yì',
- '恀=shì',
- '恁=nèn,nín',
- '恂=xún',
- '恃=shì',
- '恄=xì',
- '恅=lǎo',
- '恆=héng',
- '恇=kuāng',
- '恈=móu',
- '恉=zhǐ',
- '恊=xié',
- '恋=liàn',
- '恌=tiāo,yáo',
- '恍=huǎng',
- '恎=dié',
- '恏=hào',
- '恐=kǒng',
- '恑=guǐ',
- '恒=héng',
- '恓=xī,qī,xù',
- '恔=xiào,jiǎo',
- '恕=shù',
- '恖=sī',
- '恗=hū,kuā',
- '恘=qiū',
- '恙=yàng',
- '恚=huì',
- '恛=huí',
- '恜=chì',
- '恝=jiá',
- '恞=yí',
- '恟=xiōng',
- '恠=guài',
- '恡=lìn',
- '恢=huī',
- '恣=zì',
- '恤=xù',
- '恥=chǐ',
- '恦=shàng',
- '恧=nǜ',
- '恨=hèn',
- '恩=ēn',
- '恪=kè',
- '恫=dòng',
- '恬=tián',
- '恭=gōng',
- '恮=quán,zhuān',
- '息=xī',
- '恰=qià',
- '恱=yuè',
- '恲=pēng',
- '恳=kěn',
- '恴=dé',
- '恵=huì',
- '恶=è,wù,ě,wū',
- '恷=qiū',
- '恸=tòng',
- '恹=yān',
- '恺=kǎi',
- '恻=cè',
- '恼=nǎo',
- '恽=yùn',
- '恾=máng',
- '恿=yǒng',
- '悀=yǒng',
- '悁=yuān,juàn',
- '悂=pī,pǐ',
- '悃=kǔn',
- '悄=qiāo,qiǎo',
- '悅=yuè',
- '悆=yù,shū',
- '悇=tú',
- '悈=jiè,kè',
- '悉=xī',
- '悊=zhé',
- '悋=lìn',
- '悌=tì',
- '悍=hàn',
- '悎=hào,jiào',
- '悏=qiè',
- '悐=tì',
- '悑=bù',
- '悒=yì',
- '悓=qiàn',
- '悔=huǐ',
- '悕=xī',
- '悖=bèi',
- '悗=mán,mèn',
- '悘=yī,yì',
- '悙=hēng,hèng',
- '悚=sǒng',
- '悛=quān',
- '悜=chěng',
- '悝=kuī,lǐ',
- '悞=wù',
- '悟=wù',
- '悠=yōu',
- '悡=lí',
- '悢=liàng',
- '患=huàn',
- '悤=cōng',
- '悥=yì,niàn',
- '悦=yuè',
- '悧=lì',
- '您=nín',
- '悩=nǎo',
- '悪=è',
- '悫=què',
- '悬=xuán',
- '悭=qiān',
- '悮=wù',
- '悯=mǐn',
- '悰=cóng',
- '悱=fěi',
- '悲=bēi',
- '悳=dé',
- '悴=cuì',
- '悵=chàng',
- '悶=mèn,mēn',
- '悷=lì',
- '悸=jì',
- '悹=guàn',
- '悺=guàn',
- '悻=xìng',
- '悼=dào',
- '悽=qī',
- '悾=kōng,kǒng',
- '悿=tiǎn',
- '惀=lǔn,lùn',
- '惁=xī',
- '惂=kǎn',
- '惃=gǔn',
- '惄=nì',
- '情=qíng',
- '惆=chóu',
- '惇=dūn',
- '惈=guǒ',
- '惉=zhān',
- '惊=jīng',
- '惋=wǎn',
- '惌=yuān,wǎn',
- '惍=jīn',
- '惎=jì',
- '惏=lán,lín',
- '惐=yù,xù',
- '惑=huò',
- '惒=hé,hè',
- '惓=juàn,quán',
- '惔=tán,dàn',
- '惕=tì',
- '惖=tì',
- '惗=niàn',
- '惘=wǎng',
- '惙=chuò,chuì',
- '惚=hū',
- '惛=hūn,mèn',
- '惜=xī',
- '惝=chǎng',
- '惞=xīn',
- '惟=wéi',
- '惠=huì',
- '惡=è,wù,ě,wū',
- '惢=ruǐ,suǒ',
- '惣=zǒng',
- '惤=jiān',
- '惥=yǒng',
- '惦=diàn',
- '惧=jù',
- '惨=cǎn',
- '惩=chéng',
- '惪=dé',
- '惫=bèi',
- '惬=qiè',
- '惭=cán',
- '惮=dàn,dá',
- '惯=guàn',
- '惰=duò',
- '惱=nǎo',
- '惲=yùn',
- '想=xiǎng',
- '惴=zhuì',
- '惵=dié',
- '惶=huáng',
- '惷=chǔn',
- '惸=qióng',
- '惹=rě',
- '惺=xīng',
- '惻=cè',
- '惼=biǎn',
- '惽=mǐn',
- '惾=zōng',
- '惿=tí,shì',
- '愀=qiǎo',
- '愁=chóu',
- '愂=bèi',
- '愃=xuān',
- '愄=wēi',
- '愅=gé',
- '愆=qiān',
- '愇=wěi',
- '愈=yù',
- '愉=yú,tōu',
- '愊=bì',
- '愋=xuān',
- '愌=huàn',
- '愍=mǐn',
- '愎=bì',
- '意=yì',
- '愐=miǎn',
- '愑=yǒng',
- '愒=qì,kài',
- '愓=dàng,shāng,táng,yáng',
- '愔=yīn',
- '愕=è',
- '愖=chén,xìn,dān',
- '愗=mào',
- '愘=kè,qià',
- '愙=kè',
- '愚=yú',
- '愛=ài',
- '愜=qiè',
- '愝=yǎn',
- '愞=nuò',
- '感=gǎn',
- '愠=yùn',
- '愡=còng,sōng',
- '愢=sāi,sī,sǐ',
- '愣=lèng',
- '愤=fèn',
- '愥=yīng',
- '愦=kuì',
- '愧=kuì',
- '愨=què',
- '愩=gōng,gòng,hǒng',
- '愪=yún',
- '愫=sù',
- '愬=sù,shuò',
- '愭=qí',
- '愮=yáo,yào',
- '愯=sǒng',
- '愰=huàng',
- '愱=jí',
- '愲=gǔ',
- '愳=jù',
- '愴=chuàng',
- '愵=nì',
- '愶=xié',
- '愷=kǎi',
- '愸=zhěng',
- '愹=yǒng',
- '愺=cǎo',
- '愻=xùn',
- '愼=shèn',
- '愽=bó',
- '愾=kài,xì',
- '愿=yuàn',
- '慀=xì,xié',
- '慁=hùn',
- '慂=yǒng',
- '慃=yǎng',
- '慄=lì',
- '慅=sāo,cǎo',
- '慆=tāo',
- '慇=yīn',
- '慈=cí',
- '慉=xù,chù',
- '慊=qiàn,qiè',
- '態=tài',
- '慌=huāng',
- '慍=yùn',
- '慎=shèn',
- '慏=mǐng',
- '慐=gōng,gòng,hǒng',
- '慑=shè',
- '慒=cáo,cóng',
- '慓=piāo',
- '慔=mù',
- '慕=mù',
- '慖=guó',
- '慗=chì',
- '慘=cǎn',
- '慙=cán',
- '慚=cán',
- '慛=cuī',
- '慜=mín',
- '慝=tè',
- '慞=zhāng',
- '慟=tòng',
- '慠=áo,ào',
- '慡=shuǎng',
- '慢=màn',
- '慣=guàn',
- '慤=què',
- '慥=zào',
- '慦=jiù',
- '慧=huì',
- '慨=kǎi',
- '慩=lián,liǎn',
- '慪=òu',
- '慫=sǒng',
- '慬=jǐn,qín,jìn',
- '慭=yìn',
- '慮=lǜ',
- '慯=shāng',
- '慰=wèi',
- '慱=tuán',
- '慲=mán',
- '慳=qiān',
- '慴=shè',
- '慵=yōng',
- '慶=qìng',
- '慷=kāng',
- '慸=dì,chì',
- '慹=zhí,zhé',
- '慺=lǚ,lóu',
- '慻=juàn',
- '慼=qī',
- '慽=qī',
- '慾=yù',
- '慿=píng',
- '憀=liáo',
- '憁=còng',
- '憂=yōu',
- '憃=chōng',
- '憄=zhī,zhì',
- '憅=tòng',
- '憆=chēng',
- '憇=qì',
- '憈=qū',
- '憉=péng',
- '憊=bèi',
- '憋=biē',
- '憌=qióng',
- '憍=jiāo',
- '憎=zēng',
- '憏=chì',
- '憐=lián',
- '憑=píng',
- '憒=kuì',
- '憓=huì',
- '憔=qiáo',
- '憕=chéng,dèng,zhèng',
- '憖=yìn',
- '憗=yìn',
- '憘=xǐ,xī',
- '憙=xǐ',
- '憚=dàn,dá',
- '憛=tán',
- '憜=duò',
- '憝=duì',
- '憞=duì,dùn,tūn',
- '憟=sù',
- '憠=jué',
- '憡=cè',
- '憢=xiāo,jiāo',
- '憣=fān',
- '憤=fèn',
- '憥=láo',
- '憦=lào,láo',
- '憧=chōng',
- '憨=hān',
- '憩=qì',
- '憪=xián,xiàn',
- '憫=mǐn',
- '憬=jǐng',
- '憭=liǎo,liáo',
- '憮=wǔ',
- '憯=cǎn',
- '憰=jué',
- '憱=cù',
- '憲=xiàn',
- '憳=tǎn',
- '憴=shéng',
- '憵=pī',
- '憶=yì',
- '憷=chù',
- '憸=xiān',
- '憹=náo,nǎo,náng',
- '憺=dàn',
- '憻=tǎn',
- '憼=jǐng,jìng',
- '憽=sōng',
- '憾=hàn',
- '憿=jiǎo,jǐ',
- '懀=wèi',
- '懁=xuān,huān',
- '懂=dǒng',
- '懃=qín',
- '懄=qín',
- '懅=jù',
- '懆=cǎo,sāo,sào',
- '懇=kěn',
- '懈=xiè',
- '應=yīng,yìng',
- '懊=ào',
- '懋=mào',
- '懌=yì',
- '懍=lǐn',
- '懎=sè',
- '懏=jùn',
- '懐=huái',
- '懑=mèn',
- '懒=lǎn',
- '懓=ài',
- '懔=lǐn',
- '懕=yān',
- '懖=guō',
- '懗=xià',
- '懘=chì',
- '懙=yǔ,yú',
- '懚=yìn',
- '懛=dāi',
- '懜=mèng,méng,měng',
- '懝=ài,yì,nǐ',
- '懞=méng,měng',
- '懟=duì',
- '懠=qí,jī,jì',
- '懡=mǒ',
- '懢=lán,xiàn',
- '懣=mèn',
- '懤=chóu',
- '懥=zhì',
- '懦=nuò',
- '懧=nuò',
- '懨=yān',
- '懩=yǎng',
- '懪=bó',
- '懫=zhì',
- '懬=kuàng',
- '懭=kuǎng',
- '懮=yōu,yǒu',
- '懯=fū',
- '懰=liú,liǔ',
- '懱=miè',
- '懲=chéng',
- '懳=huì',
- '懴=chàn',
- '懵=měng',
- '懶=lǎn',
- '懷=huái',
- '懸=xuán',
- '懹=ràng',
- '懺=chàn',
- '懻=jì',
- '懼=jù',
- '懽=huān',
- '懾=shè',
- '懿=yì',
- '戀=liàn',
- '戁=nǎn',
- '戂=mí,mó',
- '戃=tǎng',
- '戄=jué',
- '戅=gàng,zhuàng',
- '戆=gàng,zhuàng',
- '戇=gàng,zhuàng',
- '戈=gē',
- '戉=yuè',
- '戊=wù',
- '戋=jiān',
- '戌=xū',
- '戍=shù',
- '戎=róng',
- '戏=xì,hū',
- '成=chéng',
- '我=wǒ',
- '戒=jiè',
- '戓=gē',
- '戔=jiān',
- '戕=qiāng',
- '或=huò',
- '戗=qiāng,qiàng',
- '战=zhàn',
- '戙=dòng',
- '戚=qī',
- '戛=jiá',
- '戜=dié',
- '戝=zéi',
- '戞=jiá',
- '戟=jǐ',
- '戠=zhí',
- '戡=kān',
- '戢=jí',
- '戣=kuí',
- '戤=gài',
- '戥=děng',
- '戦=zhàn',
- '戧=qiāng,qiàng',
- '戨=gē',
- '戩=jiǎn',
- '截=jié',
- '戫=yù',
- '戬=jiǎn',
- '戭=yǎn',
- '戮=lù',
- '戯=xì,hū',
- '戰=zhàn',
- '戱=xì,hū',
- '戲=xì,hū',
- '戳=chuō',
- '戴=dài',
- '戵=qú',
- '戶=hù',
- '户=hù',
- '戸=hù',
- '戹=è',
- '戺=shì',
- '戻=tì',
- '戼=mǎo',
- '戽=hù',
- '戾=lì',
- '房=fáng',
- '所=suǒ',
- '扁=biǎn,piān',
- '扂=diàn',
- '扃=jiōng',
- '扄=shǎng,jiōng',
- '扅=yí',
- '扆=yǐ',
- '扇=shàn,shān',
- '扈=hù',
- '扉=fēi',
- '扊=yǎn',
- '手=shǒu',
- '扌=shǒu',
- '才=cái',
- '扎=zā,zhā,zhá',
- '扏=qiú',
- '扐=lè,lì,cái',
- '扑=pū',
- '扒=bā,pá',
- '打=dǎ,dá',
- '扔=rēng',
- '払=fǎn,fú',
- '扖=rù',
- '扗=zài',
- '托=tuō',
- '扙=zhàng',
- '扚=diǎo,dí,yuē,lì',
- '扛=káng,gāng',
- '扜=yū,wū',
- '扝=yū,wū,kū',
- '扞=hàn',
- '扟=shēn',
- '扠=chā',
- '扡=tuō,chǐ,yǐ',
- '扢=gǔ,xì,gē,jié',
- '扣=kòu',
- '扤=wù',
- '扥=dèn',
- '扦=qiān',
- '执=zhí',
- '扨=rèn',
- '扩=kuò',
- '扪=mén',
- '扫=sǎo,sào',
- '扬=yáng',
- '扭=niǔ',
- '扮=bàn',
- '扯=chě',
- '扰=rǎo',
- '扱=xī,chā,qì',
- '扲=qián,qín',
- '扳=bān',
- '扴=jiá',
- '扵=yú',
- '扶=fú',
- '扷=bā,ào',
- '扸=xī,zhé',
- '批=pī',
- '扺=zhǐ',
- '扻=zhì,sǔn,kǎn',
- '扼=è',
- '扽=dèn',
- '找=zhǎo',
- '承=chéng',
- '技=jì',
- '抁=yǎn',
- '抂=kuáng,wǎng,zài',
- '抃=biàn',
- '抄=chāo',
- '抅=jū',
- '抆=wěn',
- '抇=hú,gǔ',
- '抈=yuè',
- '抉=jué',
- '把=bǎ,bà',
- '抋=qìn',
- '抌=dǎn,shěn',
- '抍=zhěng',
- '抎=yǔn',
- '抏=wán',
- '抐=nè,nì,ruì,nà',
- '抑=yì',
- '抒=shū',
- '抓=zhuā',
- '抔=póu',
- '投=tóu',
- '抖=dǒu',
- '抗=kàng',
- '折=zhé,zhē,shé',
- '抙=póu,pōu,fū',
- '抚=fǔ',
- '抛=pāo',
- '抜=bá',
- '抝=ǎo,ào,niù',
- '択=zé',
- '抟=tuán',
- '抠=kōu',
- '抡=lūn,lún',
- '抢=qiǎng,qiāng,chēng',
- '抣=yún',
- '护=hù',
- '报=bào',
- '抦=bǐng',
- '抧=zhǐ,zhǎi',
- '抨=pēng',
- '抩=nán',
- '抪=bù,pū',
- '披=pī',
- '抬=tái',
- '抭=yǎo,tāo',
- '抮=zhěn',
- '抯=zhā',
- '抰=yāng',
- '抱=bào',
- '抲=hē,hè,qiā',
- '抳=nǐ,ní',
- '抴=yè',
- '抵=dǐ',
- '抶=chì',
- '抷=pī,pēi',
- '抸=jiā',
- '抹=mǒ,mò,mā',
- '抺=mèi',
- '抻=chēn',
- '押=yā',
- '抽=chōu',
- '抾=qū',
- '抿=mǐn',
- '拀=zhù',
- '拁=jiā,yá',
- '拂=fú,bì',
- '拃=zhǎ',
- '拄=zhǔ',
- '担=dān,dàn,dǎn',
- '拆=chāi,cā',
- '拇=mǔ',
- '拈=niān',
- '拉=lā,lá',
- '拊=fǔ',
- '拋=pāo',
- '拌=bàn,pàn',
- '拍=pāi',
- '拎=līn',
- '拏=ná',
- '拐=guǎi',
- '拑=qián',
- '拒=jù',
- '拓=tuò,tà,zhí',
- '拔=bá',
- '拕=tuō',
- '拖=tuō',
- '拗=ào,niù,ǎo',
- '拘=jū,gōu',
- '拙=zhuō',
- '拚=pīn,pàn,fān',
- '招=zhāo',
- '拜=bài',
- '拝=bài',
- '拞=dǐ',
- '拟=nǐ',
- '拠=jù',
- '拡=kuò',
- '拢=lǒng',
- '拣=jiǎn',
- '拤=qiǎ',
- '拥=yōng',
- '拦=lán',
- '拧=nǐng,níng,nìng',
- '拨=bō',
- '择=zé,zhái',
- '拪=qiān',
- '拫=hén',
- '括=kuò,guā',
- '拭=shì',
- '拮=jié,jiá',
- '拯=zhěng',
- '拰=nǐn',
- '拱=gǒng',
- '拲=gǒng',
- '拳=quán',
- '拴=shuān',
- '拵=cún,zùn',
- '拶=zā,zǎn',
- '拷=kǎo',
- '拸=yí,chǐ,hài',
- '拹=xié',
- '拺=cè,sè,chuò',
- '拻=huī',
- '拼=pīn',
- '拽=zhuài,zhuāi,yè',
- '拾=shí,shè',
- '拿=ná',
- '挀=bāi',
- '持=chí',
- '挂=guà',
- '挃=zhì',
- '挄=kuò,guāng',
- '挅=duò',
- '挆=duǒ,duò',
- '指=zhǐ',
- '挈=qiè',
- '按=àn',
- '挊=nòng',
- '挋=zhèn',
- '挌=gé',
- '挍=jiào',
- '挎=kuà,kū',
- '挏=dòng',
- '挐=rú,ná',
- '挑=tiāo,tiǎo',
- '挒=liè',
- '挓=zhā',
- '挔=lǚ',
- '挕=dié,shè',
- '挖=wā',
- '挗=jué',
- '挘=liě',
- '挙=jǔ',
- '挚=zhì',
- '挛=luán',
- '挜=yà,yǎ',
- '挝=wō,zhuā',
- '挞=tà',
- '挟=xié,jiā',
- '挠=náo',
- '挡=dǎng,dàng',
- '挢=jiǎo',
- '挣=zhèng,zhēng',
- '挤=jǐ',
- '挥=huī',
- '挦=xián',
- '挧=yǔ',
- '挨=āi,ái',
- '挩=tuō,shuì',
- '挪=nuó',
- '挫=cuò',
- '挬=bó',
- '挭=gěng',
- '挮=tǐ,tì',
- '振=zhèn',
- '挰=chéng',
- '挱=suō,shā',
- '挲=suō,shā',
- '挳=kēng,qiān',
- '挴=měi',
- '挵=nòng',
- '挶=jú',
- '挷=bàng,péng',
- '挸=jiǎn',
- '挹=yì',
- '挺=tǐng',
- '挻=shān',
- '挼=ruó',
- '挽=wǎn',
- '挾=xié,jiā',
- '挿=chā',
- '捀=péng',
- '捁=jiǎo,kù',
- '捂=wǔ',
- '捃=jùn',
- '捄=jiù',
- '捅=tǒng',
- '捆=kǔn',
- '捇=huò,chì',
- '捈=tú,shū,chá',
- '捉=zhuō',
- '捊=póu,pōu,fū',
- '捋=luō,lǚ',
- '捌=bā',
- '捍=hàn',
- '捎=shāo,shào',
- '捏=niē',
- '捐=juān',
- '捑=zè',
- '捒=shù,sǒng,sōu',
- '捓=yé,yú',
- '捔=jué,zhuó',
- '捕=bǔ',
- '捖=wán',
- '捗=bù,pú,zhì',
- '捘=zùn',
- '捙=yè',
- '捚=zhāi',
- '捛=lǚ',
- '捜=sōu',
- '捝=tuō,shuì',
- '捞=lāo',
- '损=sǔn',
- '捠=bāng',
- '捡=jiǎn',
- '换=huàn',
- '捣=dǎo',
- '捤=wěi',
- '捥=wàn,wǎn,wān,yù',
- '捦=qín',
- '捧=pěng',
- '捨=shě',
- '捩=liè',
- '捪=mín',
- '捫=mén',
- '捬=fǔ,fù,bǔ',
- '捭=bǎi',
- '据=jù,jū',
- '捯=dáo',
- '捰=wǒ,luò,luǒ',
- '捱=ái',
- '捲=juǎn,quán',
- '捳=yuè',
- '捴=zǒng',
- '捵=chēn',
- '捶=chuí',
- '捷=jié',
- '捸=tū',
- '捹=bèn',
- '捺=nà',
- '捻=niǎn,niē',
- '捼=ruó,wěi,ré',
- '捽=zuó',
- '捾=wò,xiá',
- '捿=qī',
- '掀=xiān',
- '掁=chéng',
- '掂=diān',
- '掃=sǎo,sào',
- '掄=lūn,lún',
- '掅=qìng,qiàn',
- '掆=gāng',
- '掇=duō',
- '授=shòu',
- '掉=diào',
- '掊=pǒu,póu',
- '掋=dǐ',
- '掌=zhǎng',
- '掍=hùn',
- '掎=jǐ',
- '掏=tāo',
- '掐=qiā',
- '掑=qí',
- '排=pái,pǎi',
- '掓=shū',
- '掔=qiān,wàn',
- '掕=líng',
- '掖=yè,yē',
- '掗=yà,yǎ',
- '掘=jué',
- '掙=zhēng,zhèng',
- '掚=liǎng',
- '掛=guà',
- '掜=nǐ,niè,yì',
- '掝=huò,xù',
- '掞=shàn,yàn,yǎn',
- '掟=zhěng,dìng',
- '掠=lüè',
- '採=cǎi',
- '探=tàn',
- '掣=chè',
- '掤=bīng',
- '接=jiē',
- '掦=tì',
- '控=kòng',
- '推=tuī',
- '掩=yǎn',
- '措=cuò',
- '掫=zōu,zhōu,chōu',
- '掬=jū',
- '掭=tiàn',
- '掮=qián',
- '掯=kèn',
- '掰=bāi',
- '掱=pá',
- '掲=jiē',
- '掳=lǔ',
- '掴=guó',
- '掵=mìng',
- '掶=jié',
- '掷=zhì',
- '掸=dǎn,shàn',
- '掹=mēng',
- '掺=chān,xiān,càn,shǎn',
- '掻=sāo',
- '掼=guàn',
- '掽=pèng',
- '掾=yuàn',
- '掿=nuò',
- '揀=jiǎn',
- '揁=zhēng,kēng',
- '揂=jiū,yóu',
- '揃=jiǎn,jiān',
- '揄=yú',
- '揅=yán',
- '揆=kuí',
- '揇=nǎn',
- '揈=hōng',
- '揉=róu',
- '揊=pì,chè',
- '揋=wēi',
- '揌=sāi',
- '揍=zòu',
- '揎=xuān',
- '描=miáo',
- '提=tí,dī,dǐ',
- '揑=niē',
- '插=chā',
- '揓=shì',
- '揔=zǒng,sōng',
- '揕=zhèn,zhēn',
- '揖=yī',
- '揗=xún',
- '揘=huáng,yóng',
- '揙=biǎn',
- '揚=yáng',
- '換=huàn',
- '揜=yǎn',
- '揝=zǎn,zuàn',
- '揞=ǎn',
- '揟=xū,jū',
- '揠=yà',
- '握=wò',
- '揢=ké,qiā',
- '揣=chuài,chuǎi,chuāi,tuán,zhuī',
- '揤=jí',
- '揥=tì,dì',
- '揦=là,lá',
- '揧=là',
- '揨=chéng',
- '揩=kāi',
- '揪=jiū',
- '揫=jiū',
- '揬=tú',
- '揭=jiē,qì',
- '揮=huī',
- '揯=gèn',
- '揰=chòng,dǒng',
- '揱=xiāo',
- '揲=shé,dié,yè',
- '揳=xiē',
- '援=yuán',
- '揵=qián,jiàn,jiǎn',
- '揶=yé',
- '揷=chā',
- '揸=zhā',
- '揹=bēi',
- '揺=yáo',
- '揻=wēi',
- '揼=bèng',
- '揽=lǎn',
- '揾=wèn',
- '揿=qìn',
- '搀=chān',
- '搁=gē,gé',
- '搂=lǒu,lōu',
- '搃=zǒng',
- '搄=gèn',
- '搅=jiǎo',
- '搆=gòu',
- '搇=qìn',
- '搈=róng',
- '搉=què',
- '搊=chōu,zǒu',
- '搋=chuāi',
- '搌=zhǎn',
- '損=sǔn',
- '搎=sūn',
- '搏=bó',
- '搐=chù',
- '搑=róng,náng,nǎng',
- '搒=bàng,péng',
- '搓=cuō',
- '搔=sāo',
- '搕=kē,è',
- '搖=yáo',
- '搗=dǎo',
- '搘=zhī',
- '搙=nù,nuò,nòu',
- '搚=lā,xié,xiàn',
- '搛=jiān',
- '搜=sōu',
- '搝=qiǔ',
- '搞=gǎo',
- '搟=xiǎn,xiān',
- '搠=shuò',
- '搡=sǎng',
- '搢=jìn',
- '搣=miè',
- '搤=è',
- '搥=chuí',
- '搦=nuò',
- '搧=shān',
- '搨=tà',
- '搩=jié,zhé',
- '搪=táng',
- '搫=pán,bān,pó',
- '搬=bān',
- '搭=dā',
- '搮=lì',
- '搯=tāo',
- '搰=hú',
- '搱=zhì,nái',
- '搲=wā,wǎ,wà',
- '搳=huá',
- '搴=qiān',
- '搵=wèn',
- '搶=qiāng,qiǎng,chēng',
- '搷=tián,shēn',
- '搸=zhēn',
- '搹=è',
- '携=xié',
- '搻=ná,nuò',
- '搼=quán',
- '搽=chá',
- '搾=zhà',
- '搿=gé',
- '摀=wǔ',
- '摁=èn',
- '摂=shè',
- '摃=gāng',
- '摄=shè,niè',
- '摅=shū',
- '摆=bǎi',
- '摇=yáo',
- '摈=bìn',
- '摉=sōu',
- '摊=tān',
- '摋=sà,shā,shǎi',
- '摌=chǎn,sùn',
- '摍=suō',
- '摎=jiū,liú,liáo,jiǎo,náo',
- '摏=chōng',
- '摐=chuāng',
- '摑=guó',
- '摒=bìng',
- '摓=féng,pěng',
- '摔=shuāi',
- '摕=dì,tú,zhí',
- '摖=qì,jì,chá',
- '摗=sōu,sǒng',
- '摘=zhāi',
- '摙=liǎn,liàn',
- '摚=chēng',
- '摛=chī',
- '摜=guàn',
- '摝=lù',
- '摞=luò',
- '摟=lǒu,lōu',
- '摠=zǒng',
- '摡=gài,xì',
- '摢=hù,chū',
- '摣=zhā',
- '摤=qiāng',
- '摥=tàng',
- '摦=huà',
- '摧=cuī',
- '摨=zhì,nái',
- '摩=mó,mā',
- '摪=jiāng,qiàng',
- '摫=guī',
- '摬=yǐng',
- '摭=zhí',
- '摮=áo,qiáo',
- '摯=zhì',
- '摰=niè,chè',
- '摱=mán,màn',
- '摲=chàn,cán',
- '摳=kōu',
- '摴=chū',
- '摵=sè,mí,sù',
- '摶=tuán',
- '摷=jiǎo,chāo',
- '摸=mō',
- '摹=mó',
- '摺=zhé',
- '摻=chān,xiān,càn,shǎn',
- '摼=kēng,qiān',
- '摽=biào,biāo',
- '摾=jiàng',
- '摿=yáo',
- '撀=gòu',
- '撁=qiān',
- '撂=liào',
- '撃=jī',
- '撄=yīng',
- '撅=juē,jué',
- '撆=piē',
- '撇=piē,piě',
- '撈=lāo',
- '撉=dūn',
- '撊=xiàn',
- '撋=ruán',
- '撌=guì',
- '撍=zǎn,zān,zēn,qián',
- '撎=yī',
- '撏=xián',
- '撐=chēng',
- '撑=chēng',
- '撒=sā,sǎ',
- '撓=náo',
- '撔=hòng',
- '撕=sī',
- '撖=hàn',
- '撗=héng,guàng',
- '撘=dā',
- '撙=zǔn',
- '撚=niǎn',
- '撛=lǐn',
- '撜=zhěng,chéng',
- '撝=huī,wéi',
- '撞=zhuàng',
- '撟=jiǎo',
- '撠=jǐ',
- '撡=cāo',
- '撢=dǎn',
- '撣=dǎn,shàn',
- '撤=chè',
- '撥=bō',
- '撦=chě',
- '撧=juē',
- '撨=xiāo,sōu',
- '撩=liāo,liáo',
- '撪=bèn',
- '撫=fǔ',
- '撬=qiào',
- '播=bō',
- '撮=cuō,zuǒ',
- '撯=zhuó',
- '撰=zhuàn',
- '撱=wěi,tuǒ',
- '撲=pū',
- '撳=qìn',
- '撴=dūn',
- '撵=niǎn',
- '撶=huá',
- '撷=xié',
- '撸=lū',
- '撹=jiǎo',
- '撺=cuān',
- '撻=tà',
- '撼=hàn',
- '撽=qiào,yāo,jī',
- '撾=zhuā,wō',
- '撿=jiǎn',
- '擀=gǎn',
- '擁=yōng',
- '擂=léi,lèi',
- '擃=nǎng',
- '擄=lǔ',
- '擅=shàn',
- '擆=zhuó',
- '擇=zé,zhái',
- '擈=pǔ',
- '擉=chuò',
- '擊=jī',
- '擋=dǎng,dàng',
- '擌=sè',
- '操=cāo',
- '擎=qíng',
- '擏=qíng,jǐng',
- '擐=huàn',
- '擑=jiē',
- '擒=qín',
- '擓=kuǎi',
- '擔=dān,dàn',
- '擕=xié',
- '擖=qiā,jiā,yè',
- '擗=pǐ,bò',
- '擘=bò,bāi',
- '擙=ào',
- '據=jù,jū',
- '擛=yè',
- '擜=è',
- '擝=mēng',
- '擞=sòu,sǒu',
- '擟=mí',
- '擠=jǐ',
- '擡=tái',
- '擢=zhuó',
- '擣=dǎo',
- '擤=xǐng',
- '擥=lǎn',
- '擦=cā',
- '擧=jǔ',
- '擨=yē',
- '擩=rǔ',
- '擪=yè',
- '擫=yè',
- '擬=nǐ',
- '擭=huò',
- '擮=jié',
- '擯=bìn',
- '擰=níng,nǐng,nìng',
- '擱=gē,gé',
- '擲=zhì',
- '擳=zhì,jié',
- '擴=kuò',
- '擵=mó',
- '擶=jiàn',
- '擷=xié',
- '擸=liè,là',
- '擹=tān',
- '擺=bǎi',
- '擻=sǒu,sòu',
- '擼=lū',
- '擽=lì,luò,yuè',
- '擾=rǎo',
- '擿=tī,zhì,zhāi',
- '攀=pān',
- '攁=yǎng',
- '攂=léi,lèi',
- '攃=cā,sǎ',
- '攄=shū',
- '攅=zǎn',
- '攆=niǎn',
- '攇=xiǎn',
- '攈=jùn,pèi',
- '攉=huō',
- '攊=lì,luò',
- '攋=là,lài',
- '攌=huàn',
- '攍=yíng',
- '攎=lú,luó',
- '攏=lǒng',
- '攐=qiān',
- '攑=qiān',
- '攒=zǎn,cuán',
- '攓=qiān',
- '攔=lán',
- '攕=xiān,jiān',
- '攖=yīng',
- '攗=méi',
- '攘=rǎng',
- '攙=chān',
- '攚=wěng',
- '攛=cuān',
- '攜=xié',
- '攝=shè,niè',
- '攞=luó',
- '攟=jùn',
- '攠=mí,mǐ,mó',
- '攡=chī',
- '攢=zǎn,cuán',
- '攣=luán',
- '攤=tān',
- '攥=zuàn',
- '攦=lì,shài',
- '攧=diān',
- '攨=wā',
- '攩=dǎng',
- '攪=jiǎo',
- '攫=jué',
- '攬=lǎn',
- '攭=lì,luǒ',
- '攮=nǎng',
- '支=zhī',
- '攰=guì',
- '攱=guǐ,guì',
- '攲=qī,yǐ,jī',
- '攳=xún',
- '攴=pū',
- '攵=pū',
- '收=shōu',
- '攷=kǎo',
- '攸=yōu',
- '改=gǎi',
- '攺=yǐ',
- '攻=gōng',
- '攼=gān,hàn',
- '攽=bān',
- '放=fàng',
- '政=zhèng',
- '敀=pò',
- '敁=diān',
- '敂=kòu',
- '敃=mǐn',
- '敄=wù,móu',
- '故=gù',
- '敆=hé',
- '敇=cè',
- '效=xiào',
- '敉=mǐ',
- '敊=chù,shōu',
- '敋=gé,guó,è',
- '敌=dí',
- '敍=xù',
- '敎=jiào,jiāo',
- '敏=mǐn',
- '敐=chén',
- '救=jiù',
- '敒=shēn',
- '敓=duó,duì',
- '敔=yǔ',
- '敕=chì',
- '敖=áo',
- '敗=bài',
- '敘=xù',
- '教=jiào,jiāo',
- '敚=duó,duì',
- '敛=liǎn',
- '敜=niè',
- '敝=bì',
- '敞=chǎng',
- '敟=diǎn',
- '敠=duō,què',
- '敡=yì',
- '敢=gǎn',
- '散=sàn,sǎn',
- '敤=kě',
- '敥=yàn',
- '敦=dūn,duì',
- '敧=qī,yǐ,jī',
- '敨=tǒu',
- '敩=xiào,xué',
- '敪=duō,què',
- '敫=jiǎo',
- '敬=jìng',
- '敭=yáng',
- '敮=xiá',
- '敯=mǐn',
- '数=shǔ,shù,shuò',
- '敱=ái,zhú',
- '敲=qiāo',
- '敳=ái',
- '整=zhěng',
- '敵=dí',
- '敶=chén',
- '敷=fū',
- '數=shǔ,shù,shuò',
- '敹=liáo',
- '敺=qū',
- '敻=xiòng,xuàn',
- '敼=yǐ',
- '敽=jiǎo',
- '敾=shàn',
- '敿=jiǎo',
- '斀=zhuó,zhú',
- '斁=yì,dù',
- '斂=liǎn',
- '斃=bì',
- '斄=lí,tái',
- '斅=xiào',
- '斆=xiào',
- '文=wén',
- '斈=xué',
- '斉=qí',
- '斊=qí',
- '斋=zhāi',
- '斌=bīn',
- '斍=jué,jiào',
- '斎=zhāi',
- '斏=láng',
- '斐=fěi,fēi',
- '斑=bān',
- '斒=bān',
- '斓=lán',
- '斔=yǔ,zhōng',
- '斕=lán',
- '斖=wěi,mén',
- '斗=dòu,dǒu',
- '斘=shēng',
- '料=liào',
- '斚=jiǎ',
- '斛=hú',
- '斜=xié',
- '斝=jiǎ',
- '斞=yǔ',
- '斟=zhēn',
- '斠=jiào',
- '斡=wò,guǎn',
- '斢=tǒu,tiǎo',
- '斣=dòu',
- '斤=jīn',
- '斥=chì',
- '斦=yín,zhì',
- '斧=fǔ',
- '斨=qiāng',
- '斩=zhǎn',
- '斪=qú',
- '斫=zhuó',
- '斬=zhǎn',
- '断=duàn',
- '斮=zhuó',
- '斯=sī',
- '新=xīn',
- '斱=zhuó',
- '斲=zhuó',
- '斳=qín',
- '斴=lín',
- '斵=zhuó',
- '斶=chù',
- '斷=duàn',
- '斸=zhú',
- '方=fāng',
- '斺=chǎn,jiè',
- '斻=háng',
- '於=yú,wū',
- '施=shī',
- '斾=pèi',
- '斿=liú,yóu',
- '旀=mèi',
- '旁=páng,bàng',
- '旂=qí',
- '旃=zhān',
- '旄=máo,mào',
- '旅=lǚ',
- '旆=pèi',
- '旇=pī,bì',
- '旈=liú',
- '旉=fū',
- '旊=fǎng',
- '旋=xuán,xuàn',
- '旌=jīng',
- '旍=jīng',
- '旎=nǐ',
- '族=zú',
- '旐=zhào',
- '旑=yǐ',
- '旒=liú',
- '旓=shāo',
- '旔=jiàn',
- '旕=null',
- '旖=yǐ',
- '旗=qí',
- '旘=zhì',
- '旙=fān',
- '旚=piāo',
- '旛=fān',
- '旜=zhān',
- '旝=kuài',
- '旞=suì',
- '旟=yú',
- '无=wú',
- '旡=jì',
- '既=jì',
- '旣=jì',
- '旤=huò',
- '日=rì',
- '旦=dàn',
- '旧=jiù',
- '旨=zhǐ',
- '早=zǎo',
- '旪=xié',
- '旫=tiāo',
- '旬=xún',
- '旭=xù',
- '旮=gā',
- '旯=lá',
- '旰=gàn,hàn',
- '旱=hàn',
- '旲=tái,yīng',
- '旳=dì,dí,de',
- '旴=xū,xù',
- '旵=chǎn',
- '时=shí',
- '旷=kuàng',
- '旸=yáng',
- '旹=shí',
- '旺=wàng',
- '旻=mín',
- '旼=mín',
- '旽=tūn,zhùn',
- '旾=chūn',
- '旿=wù,wǔ',
- '昀=yún',
- '昁=bèi',
- '昂=áng',
- '昃=zè',
- '昄=bǎn',
- '昅=jié',
- '昆=kūn',
- '昇=shēng',
- '昈=hù',
- '昉=fǎng',
- '昊=hào',
- '昋=guì',
- '昌=chāng',
- '昍=xuān',
- '明=míng',
- '昏=hūn',
- '昐=fēn',
- '昑=qǐn',
- '昒=hū',
- '易=yì',
- '昔=xī',
- '昕=xīn',
- '昖=yán',
- '昗=zè',
- '昘=fǎng',
- '昙=tán',
- '昚=shèn',
- '昛=jù',
- '昜=yáng',
- '昝=zǎn',
- '昞=bǐng',
- '星=xīng',
- '映=yìng',
- '昡=xuàn',
- '昢=pò',
- '昣=zhěn',
- '昤=líng',
- '春=chūn',
- '昦=hào',
- '昧=mèi',
- '昨=zuó',
- '昩=mò',
- '昪=biàn',
- '昫=xù',
- '昬=hūn',
- '昭=zhāo',
- '昮=zòng',
- '是=shì',
- '昰=shì',
- '昱=yù',
- '昲=fèi',
- '昳=dié,yì',
- '昴=mǎo',
- '昵=nì',
- '昶=chǎng',
- '昷=wēn',
- '昸=dōng',
- '昹=ǎi',
- '昺=bǐng',
- '昻=áng',
- '昼=zhòu',
- '昽=lóng',
- '显=xiǎn',
- '昿=kuàng',
- '晀=tiǎo',
- '晁=cháo',
- '時=shí',
- '晃=huǎng,huàng',
- '晄=huǎng',
- '晅=xuān',
- '晆=kuí',
- '晇=xù,kuā',
- '晈=jiǎo',
- '晉=jìn',
- '晊=zhì',
- '晋=jìn',
- '晌=shǎng',
- '晍=tóng',
- '晎=hǒng',
- '晏=yàn',
- '晐=gāi',
- '晑=xiǎng',
- '晒=shài',
- '晓=xiǎo',
- '晔=yè',
- '晕=yūn,yùn',
- '晖=huī',
- '晗=hán',
- '晘=hàn',
- '晙=jùn',
- '晚=wǎn',
- '晛=xiàn',
- '晜=kūn',
- '晝=zhòu',
- '晞=xī',
- '晟=shèng,chéng',
- '晠=shèng',
- '晡=bū',
- '晢=zhé',
- '晣=zhé',
- '晤=wù',
- '晥=wǎn',
- '晦=huì',
- '晧=hào',
- '晨=chén',
- '晩=wǎn',
- '晪=tiǎn',
- '晫=zhuó',
- '晬=zuì',
- '晭=zhǒu',
- '普=pǔ',
- '景=jǐng,yǐng',
- '晰=xī',
- '晱=shǎn',
- '晲=nǐ',
- '晳=xī',
- '晴=qíng',
- '晵=qǐ,dù',
- '晶=jīng',
- '晷=guǐ',
- '晸=zhěng',
- '晹=yì',
- '智=zhì',
- '晻=àn,ǎn,yǎn',
- '晼=wǎn',
- '晽=lín',
- '晾=liàng',
- '晿=chēng',
- '暀=wǎng,wàng',
- '暁=xiǎo',
- '暂=zàn',
- '暃=fēi',
- '暄=xuān',
- '暅=xuǎn',
- '暆=yí',
- '暇=xiá',
- '暈=yūn,yùn',
- '暉=huī',
- '暊=xǔ',
- '暋=mǐn,mín',
- '暌=kuí',
- '暍=yē',
- '暎=yìng',
- '暏=shǔ,dǔ',
- '暐=wěi',
- '暑=shǔ',
- '暒=qíng',
- '暓=mào',
- '暔=nán',
- '暕=jiǎn,lán',
- '暖=nuǎn',
- '暗=àn',
- '暘=yáng',
- '暙=chūn',
- '暚=yáo',
- '暛=suǒ',
- '暜=pǔ',
- '暝=míng',
- '暞=jiǎo',
- '暟=kǎi',
- '暠=hào',
- '暡=wěng',
- '暢=chàng',
- '暣=qì',
- '暤=hào',
- '暥=yàn',
- '暦=lì',
- '暧=ài',
- '暨=jì',
- '暩=jì',
- '暪=mèn',
- '暫=zàn',
- '暬=xiè',
- '暭=hào',
- '暮=mù',
- '暯=mù',
- '暰=cōng',
- '暱=nì',
- '暲=zhāng',
- '暳=huì',
- '暴=bào,pù',
- '暵=hàn',
- '暶=xuán',
- '暷=chuán',
- '暸=liáo',
- '暹=xiān',
- '暺=tǎn',
- '暻=jǐng',
- '暼=piē',
- '暽=lín',
- '暾=tūn',
- '暿=xī,xǐ',
- '曀=yì',
- '曁=jì',
- '曂=huàng',
- '曃=dài',
- '曄=yè',
- '曅=yè',
- '曆=lì',
- '曇=tán',
- '曈=tóng',
- '曉=xiǎo',
- '曊=fèi',
- '曋=shěn',
- '曌=zhào',
- '曍=hào',
- '曎=yì',
- '曏=xiàng',
- '曐=xīng',
- '曑=shēn',
- '曒=jiǎo',
- '曓=bào',
- '曔=jìng',
- '曕=yàn',
- '曖=ài',
- '曗=yè',
- '曘=rú',
- '曙=shǔ',
- '曚=méng',
- '曛=xūn',
- '曜=yào',
- '曝=pù,bào',
- '曞=lì',
- '曟=chén',
- '曠=kuàng',
- '曡=dié',
- '曢=liǎo',
- '曣=yàn',
- '曤=huò',
- '曥=lú',
- '曦=xī',
- '曧=róng',
- '曨=lóng',
- '曩=nǎng',
- '曪=luǒ',
- '曫=luán',
- '曬=shài',
- '曭=tǎng',
- '曮=yǎn',
- '曯=zhú',
- '曰=yuē',
- '曱=yuē',
- '曲=qǔ,qū',
- '曳=yè',
- '更=gèng,gēng',
- '曵=yè',
- '曶=hū,hù',
- '曷=hé',
- '書=shū',
- '曹=cáo',
- '曺=cáo',
- '曻=shēng',
- '曼=màn',
- '曽=céng,zēng',
- '曾=céng,zēng',
- '替=tì',
- '最=zuì',
- '朁=cǎn,qián,jiàn',
- '朂=xù',
- '會=huì,kuài',
- '朄=yǐn',
- '朅=hé,qiè',
- '朆=fēn',
- '朇=bì,pí',
- '月=yuè',
- '有=yǒu,yòu',
- '朊=ruǎn',
- '朋=péng',
- '朌=fén,bān',
- '服=fú,fù',
- '朎=líng',
- '朏=fěi,kū',
- '朐=qú,xù,chǔn',
- '朑=tì',
- '朒=nǜ,gǎ',
- '朓=tiǎo',
- '朔=shuò',
- '朕=zhèn',
- '朖=lǎng',
- '朗=lǎng',
- '朘=juān,zuī',
- '朙=míng',
- '朚=huāng,máng,wáng',
- '望=wàng',
- '朜=tūn',
- '朝=cháo,zhāo',
- '朞=jī',
- '期=qī,jī',
- '朠=yīng',
- '朡=zōng',
- '朢=wàng',
- '朣=tóng,chuáng',
- '朤=lǎng',
- '朥=láo',
- '朦=méng',
- '朧=lóng',
- '木=mù',
- '朩=pìn',
- '未=wèi',
- '末=mò',
- '本=běn',
- '札=zhá',
- '朮=shù,shú,zhú',
- '术=shù,shú,zhú',
- '朰=null',
- '朱=zhū,shú',
- '朲=rén',
- '朳=bā',
- '朴=pǔ,pò,pō,piáo',
- '朵=duǒ',
- '朶=duǒ',
- '朷=dāo,tiáo,mù',
- '朸=lì',
- '朹=qiú,guǐ',
- '机=jī',
- '朻=jiū',
- '朼=bǐ',
- '朽=xiǔ',
- '朾=chéng,chēng',
- '朿=cì',
- '杀=shā',
- '杁=rù',
- '杂=zá',
- '权=quán',
- '杄=qiān',
- '杅=yú,wū',
- '杆=gān,gǎn',
- '杇=wū',
- '杈=chā,chà',
- '杉=shān,shā',
- '杊=xún',
- '杋=fán',
- '杌=wù',
- '杍=zǐ',
- '李=lǐ',
- '杏=xìng',
- '材=cái',
- '村=cūn',
- '杒=rèn,ér',
- '杓=sháo,biāo',
- '杔=tuō,zhé',
- '杕=dì,duò',
- '杖=zhàng',
- '杗=máng',
- '杘=chì',
- '杙=yì',
- '杚=gū,gài',
- '杛=gōng',
- '杜=dù',
- '杝=yí,lì,lí,duò,tuò',
- '杞=qǐ',
- '束=shù',
- '杠=gàng,gāng',
- '条=tiáo,tiāo',
- '杢=jié',
- '杣=mián',
- '杤=wàn',
- '来=lái',
- '杦=jiǔ',
- '杧=máng',
- '杨=yáng',
- '杩=mǎ,mà',
- '杪=miǎo',
- '杫=sì,zhǐ,xǐ',
- '杬=yuán,wán',
- '杭=háng',
- '杮=fèi,bèi',
- '杯=bēi',
- '杰=jié',
- '東=dōng',
- '杲=gǎo',
- '杳=yǎo',
- '杴=xiān',
- '杵=chǔ',
- '杶=chūn',
- '杷=pá',
- '杸=shū,duì',
- '杹=huà',
- '杺=xīn',
- '杻=niǔ,chǒu',
- '杼=zhù',
- '杽=chǒu',
- '松=sōng',
- '板=bǎn',
- '枀=sōng',
- '极=jí',
- '枂=wò,yuè',
- '枃=jìn',
- '构=gòu',
- '枅=jī',
- '枆=máo',
- '枇=pí',
- '枈=pī,mì',
- '枉=wǎng',
- '枊=àng',
- '枋=fāng,bìng',
- '枌=fén',
- '枍=yì',
- '枎=fú,fū',
- '枏=nán',
- '析=xī',
- '枑=hù,dǐ',
- '枒=yā',
- '枓=dōu',
- '枔=xín',
- '枕=zhěn',
- '枖=yǎo,yāo',
- '林=lín',
- '枘=ruì',
- '枙=ě,è',
- '枚=méi',
- '枛=zhào',
- '果=guǒ',
- '枝=zhī,qí',
- '枞=cōng,zōng',
- '枟=yùn',
- '枠=huà',
- '枡=shēng',
- '枢=shū',
- '枣=zǎo',
- '枤=dì,duò',
- '枥=lì',
- '枦=lú',
- '枧=jiǎn',
- '枨=chéng',
- '枩=sōng',
- '枪=qiāng',
- '枫=fēng',
- '枬=zhān',
- '枭=xiāo',
- '枮=xiān,zhēn',
- '枯=kū',
- '枰=píng',
- '枱=sì,tái',
- '枲=xǐ',
- '枳=zhǐ',
- '枴=guǎi',
- '枵=xiāo',
- '架=jià',
- '枷=jiā',
- '枸=gǒu,jǔ',
- '枹=bāo,fú',
- '枺=mò',
- '枻=yì,xiè',
- '枼=yè',
- '枽=yè',
- '枾=shì',
- '枿=niè',
- '柀=bǐ',
- '柁=tuó,duò',
- '柂=yí,duò,lí',
- '柃=líng',
- '柄=bǐng',
- '柅=nǐ,chì',
- '柆=lā',
- '柇=hé',
- '柈=pán,bàn',
- '柉=fán',
- '柊=zhōng',
- '柋=dài',
- '柌=cí',
- '柍=yǎng,yàng,yāng,yīng',
- '柎=fū,fǔ,fù',
- '柏=bǎi,bó,bò',
- '某=mǒu',
- '柑=gān',
- '柒=qī',
- '染=rǎn',
- '柔=róu',
- '柕=mào',
- '柖=sháo,shào',
- '柗=sōng',
- '柘=zhè',
- '柙=xiá',
- '柚=yòu,yóu',
- '柛=shēn',
- '柜=guì,jǔ',
- '柝=tuò',
- '柞=zuò,zhà',
- '柟=nán',
- '柠=níng',
- '柡=yǒng',
- '柢=dǐ,chí',
- '柣=zhì,dié',
- '柤=zhā,zǔ,zū',
- '查=chá,zhā',
- '柦=dàn',
- '柧=gū',
- '柨=bù,pū',
- '柩=jiù',
- '柪=āo,ào',
- '柫=fú',
- '柬=jiǎn',
- '柭=bā,fú,pèi,bó,biē',
- '柮=duò,zuó,wù',
- '柯=kē',
- '柰=nài',
- '柱=zhù',
- '柲=bì,bié',
- '柳=liǔ',
- '柴=chái',
- '柵=shān',
- '柶=sì',
- '柷=zhù',
- '柸=bēi,pēi',
- '柹=shì,fèi',
- '柺=guǎi',
- '査=chá,zhā',
- '柼=yǎo',
- '柽=chēng',
- '柾=jiù',
- '柿=shì',
- '栀=zhī',
- '栁=liǔ',
- '栂=méi',
- '栃=lì',
- '栄=róng',
- '栅=zhà,shān,shi,cè',
- '栆=zǎo',
- '标=biāo',
- '栈=zhàn',
- '栉=zhì',
- '栊=lóng',
- '栋=dòng',
- '栌=lú',
- '栍=null',
- '栎=lì,yuè',
- '栏=lán',
- '栐=yǒng',
- '树=shù',
- '栒=xún',
- '栓=shuān',
- '栔=qì,qiè',
- '栕=chén',
- '栖=qī,xī',
- '栗=lì',
- '栘=yí',
- '栙=xiáng',
- '栚=zhèn',
- '栛=lì',
- '栜=sè',
- '栝=guā,tiǎn',
- '栞=kān',
- '栟=bēn,bīng',
- '栠=rěn',
- '校=xiào,jiào',
- '栢=bǎi',
- '栣=rěn',
- '栤=bìng',
- '栥=zī',
- '栦=chóu',
- '栧=yì,xiè',
- '栨=cì',
- '栩=xǔ',
- '株=zhū',
- '栫=jiàn,zùn',
- '栬=zuì',
- '栭=ér',
- '栮=ěr',
- '栯=yǒu,yù',
- '栰=fá',
- '栱=gǒng',
- '栲=kǎo',
- '栳=lǎo',
- '栴=zhān',
- '栵=liè',
- '栶=yīn',
- '样=yàng',
- '核=hé,hú',
- '根=gēn',
- '栺=zhī,yì',
- '栻=shì',
- '格=gé',
- '栽=zāi',
- '栾=luán',
- '栿=fú',
- '桀=jié',
- '桁=héng,háng',
- '桂=guì',
- '桃=táo',
- '桄=guāng,guàng',
- '桅=wéi',
- '框=kuàng',
- '桇=rú',
- '案=àn',
- '桉=ān',
- '桊=juàn',
- '桋=yí,tí',
- '桌=zhuō',
- '桍=kū',
- '桎=zhì',
- '桏=qióng',
- '桐=tóng',
- '桑=sāng',
- '桒=sāng',
- '桓=huán',
- '桔=jié,jú',
- '桕=jiù',
- '桖=xuè',
- '桗=duò',
- '桘=chuí',
- '桙=yú,móu',
- '桚=zā,zǎn',
- '桛=null',
- '桜=yīng',
- '桝=jié',
- '桞=liǔ',
- '桟=zhàn',
- '桠=yā',
- '桡=ráo,náo',
- '桢=zhēn',
- '档=dàng',
- '桤=qī',
- '桥=qiáo',
- '桦=huà',
- '桧=guì,huì',
- '桨=jiǎng',
- '桩=zhuāng',
- '桪=xún',
- '桫=suō',
- '桬=shā',
- '桭=chén,zhèn',
- '桮=bēi',
- '桯=tīng,yíng',
- '桰=guā',
- '桱=jìng',
- '桲=bó',
- '桳=bèn,fàn',
- '桴=fú',
- '桵=ruí',
- '桶=tǒng',
- '桷=jué',
- '桸=xī',
- '桹=láng',
- '桺=liǔ',
- '桻=fēng,fèng',
- '桼=qī',
- '桽=wěn',
- '桾=jūn',
- '桿=gǎn',
- '梀=sù,yìn',
- '梁=liáng',
- '梂=qiú',
- '梃=tǐng,tìng',
- '梄=yǒu',
- '梅=méi',
- '梆=bāng',
- '梇=lòng',
- '梈=pēng',
- '梉=zhuāng',
- '梊=dì',
- '梋=xuān,juān,xié',
- '梌=tú,chá',
- '梍=zào',
- '梎=āo,yòu',
- '梏=gù',
- '梐=bì',
- '梑=dí',
- '梒=hán',
- '梓=zǐ',
- '梔=zhī',
- '梕=rèn,ér',
- '梖=bèi',
- '梗=gěng',
- '梘=jiǎn',
- '梙=huàn',
- '梚=wǎn',
- '梛=nuó',
- '梜=jiā',
- '條=tiáo,tiāo',
- '梞=jì',
- '梟=xiāo',
- '梠=lǚ',
- '梡=kuǎn',
- '梢=shāo,sào',
- '梣=chén',
- '梤=fēn',
- '梥=sōng',
- '梦=mèng',
- '梧=wú',
- '梨=lí',
- '梩=sì,qǐ',
- '梪=dòu',
- '梫=qǐn',
- '梬=yǐng',
- '梭=suō',
- '梮=jū',
- '梯=tī',
- '械=xiè',
- '梱=kǔn',
- '梲=zhuō',
- '梳=shū',
- '梴=chān,yán',
- '梵=fàn',
- '梶=wěi',
- '梷=jìng',
- '梸=lí',
- '梹=bīn,bīng',
- '梺=xià',
- '梻=fó',
- '梼=chóu,táo,dào',
- '梽=zhì',
- '梾=lái',
- '梿=lián,liǎn',
- '检=jiǎn',
- '棁=zhuō',
- '棂=líng',
- '棃=lí',
- '棄=qì',
- '棅=bǐng',
- '棆=lún',
- '棇=cōng,sōng',
- '棈=qiàn',
- '棉=mián',
- '棊=qí',
- '棋=qí',
- '棌=cǎi',
- '棍=gùn,hùn',
- '棎=chán',
- '棏=dé,zhé',
- '棐=fěi',
- '棑=pái,bèi,pèi',
- '棒=bàng',
- '棓=bàng,pǒu,bèi,bēi',
- '棔=hūn',
- '棕=zōng',
- '棖=chéng',
- '棗=zǎo',
- '棘=jí',
- '棙=lì,liè',
- '棚=péng',
- '棛=yù',
- '棜=yù',
- '棝=gù',
- '棞=jùn',
- '棟=dòng',
- '棠=táng',
- '棡=gāng',
- '棢=wǎng',
- '棣=dì,dài,tì',
- '棤=què',
- '棥=fán',
- '棦=chēng',
- '棧=zhàn',
- '棨=qǐ',
- '棩=yuān',
- '棪=yǎn,yàn',
- '棫=yù',
- '棬=quān,juàn',
- '棭=yì',
- '森=sēn',
- '棯=rěn,shěn',
- '棰=chuí',
- '棱=léng,lēng,líng',
- '棲=qī',
- '棳=zhuō',
- '棴=fú,sù',
- '棵=kē',
- '棶=lái',
- '棷=zōu,sǒu',
- '棸=zōu',
- '棹=zhào,zhuō',
- '棺=guān',
- '棻=fēn',
- '棼=fén',
- '棽=chēn,shēn',
- '棾=qíng',
- '棿=ní,nǐ',
- '椀=wǎn',
- '椁=guǒ',
- '椂=lù',
- '椃=háo',
- '椄=jiē,qiè',
- '椅=yǐ,yī',
- '椆=chóu,zhòu,diāo',
- '椇=jǔ',
- '椈=jú',
- '椉=chéng,shèng',
- '椊=zú,cuì',
- '椋=liáng',
- '椌=qiāng,kōng',
- '植=zhí',
- '椎=zhuī,chuí',
- '椏=yā',
- '椐=jū',
- '椑=bēi',
- '椒=jiāo',
- '椓=zhuó',
- '椔=zī',
- '椕=bīn',
- '椖=péng',
- '椗=dìng',
- '椘=chǔ',
- '椙=chāng',
- '椚=mēn',
- '椛=huā',
- '検=jiǎn',
- '椝=guī',
- '椞=xì',
- '椟=dú',
- '椠=qiàn',
- '椡=dào',
- '椢=guì',
- '椣=diǎn',
- '椤=luó',
- '椥=zhī',
- '椦=quān,juàn,quán',
- '椧=null',
- '椨=fǔ',
- '椩=gēng',
- '椪=pèng',
- '椫=shàn',
- '椬=yí',
- '椭=tuǒ',
- '椮=sēn',
- '椯=duǒ,chuán',
- '椰=yē',
- '椱=fù',
- '椲=wěi,huī',
- '椳=wēi',
- '椴=duàn',
- '椵=jiǎ,jiā',
- '椶=zōng',
- '椷=jiān,hán',
- '椸=yí',
- '椹=zhēn,shèn',
- '椺=xí',
- '椻=yàn,yà',
- '椼=yǎn',
- '椽=chuán',
- '椾=jiān',
- '椿=chūn',
- '楀=yǔ',
- '楁=hé',
- '楂=zhā,chá',
- '楃=wò',
- '楄=piān',
- '楅=bī',
- '楆=yāo',
- '楇=guō,kuǎ',
- '楈=xū',
- '楉=ruò',
- '楊=yáng',
- '楋=là',
- '楌=yán',
- '楍=běn',
- '楎=huī',
- '楏=kuí',
- '楐=jiè',
- '楑=kuí',
- '楒=sī',
- '楓=fēng',
- '楔=xiē',
- '楕=tuǒ',
- '楖=jí,zhì',
- '楗=jiàn',
- '楘=mù',
- '楙=máo',
- '楚=chǔ',
- '楛=kǔ,hù',
- '楜=hú',
- '楝=liàn',
- '楞=léng',
- '楟=tíng',
- '楠=nán',
- '楡=yú',
- '楢=yóu,yǒu',
- '楣=méi',
- '楤=sǒng,cōng',
- '楥=xuàn,yuán',
- '楦=xuàn',
- '楧=yǎng,yàng,yīng',
- '楨=zhēn',
- '楩=pián',
- '楪=dié,yè',
- '楫=jí',
- '楬=jiē',
- '業=yè',
- '楮=chǔ',
- '楯=shǔn,dùn',
- '楰=yú',
- '楱=còu,zòu',
- '楲=wēi',
- '楳=méi',
- '楴=dì,dǐ,shì',
- '極=jí',
- '楶=jié',
- '楷=kǎi,jiē',
- '楸=qiū',
- '楹=yíng',
- '楺=róu,ròu',
- '楻=huáng',
- '楼=lóu',
- '楽=lè,yuè',
- '楾=quán',
- '楿=xiāng',
- '榀=pǐn',
- '榁=shǐ',
- '概=gài',
- '榃=tán',
- '榄=lǎn',
- '榅=wēn,yùn',
- '榆=yú',
- '榇=chèn',
- '榈=lǘ',
- '榉=jǔ',
- '榊=shén',
- '榋=chū',
- '榌=bī,pi',
- '榍=xiè',
- '榎=jiǎ',
- '榏=yì',
- '榐=zhǎn,niǎn,zhèn',
- '榑=fú,fù,bó',
- '榒=nuò',
- '榓=mì',
- '榔=láng',
- '榕=róng',
- '榖=gǔ',
- '榗=jiàn,jìn',
- '榘=jǔ',
- '榙=tā',
- '榚=yǎo',
- '榛=zhēn',
- '榜=bǎng,bàng',
- '榝=shā,xiè',
- '榞=yuán',
- '榟=zǐ',
- '榠=míng',
- '榡=sù',
- '榢=jià',
- '榣=yáo',
- '榤=jié',
- '榥=huàng',
- '榦=gàn',
- '榧=fěi',
- '榨=zhà',
- '榩=qián',
- '榪=mà,mā',
- '榫=sǔn',
- '榬=yuán',
- '榭=xiè',
- '榮=róng',
- '榯=shí',
- '榰=zhī',
- '榱=cuī',
- '榲=wēn',
- '榳=tíng',
- '榴=liú',
- '榵=róng',
- '榶=táng',
- '榷=què',
- '榸=zhāi',
- '榹=sì',
- '榺=shèng',
- '榻=tà',
- '榼=kē',
- '榽=xī',
- '榾=gù',
- '榿=qī',
- '槀=gǎo',
- '槁=gǎo',
- '槂=sūn',
- '槃=pán',
- '槄=tāo',
- '槅=gé',
- '槆=chūn',
- '槇=diān',
- '槈=nòu',
- '槉=jí',
- '槊=shuò',
- '構=gòu',
- '槌=chuí',
- '槍=qiāng',
- '槎=chá',
- '槏=qiǎn,lián,xiàn',
- '槐=huái',
- '槑=méi',
- '槒=xù',
- '槓=gàng',
- '槔=gāo',
- '槕=zhuō',
- '槖=tuó',
- '槗=qiáo',
- '様=yàng',
- '槙=diān,zhěn,zhēn',
- '槚=jiǎ',
- '槛=jiàn,kǎn',
- '槜=zuì',
- '槝=dǎo',
- '槞=lóng',
- '槟=bīn,bīng',
- '槠=zhū',
- '槡=sāng',
- '槢=xí,dié',
- '槣=jī,guī',
- '槤=lián,liǎn',
- '槥=huì',
- '槦=róng,yōng',
- '槧=qiàn',
- '槨=guǒ',
- '槩=gài',
- '槪=gài',
- '槫=tuán,shuàn,quán',
- '槬=huà',
- '槭=qì,sè',
- '槮=sēn',
- '槯=cuī,zhǐ',
- '槰=pèng',
- '槱=yǒu,chǎo',
- '槲=hú',
- '槳=jiǎng',
- '槴=hù',
- '槵=huàn',
- '槶=guì',
- '槷=niè',
- '槸=yì',
- '槹=gāo',
- '槺=kāng',
- '槻=guī',
- '槼=guī',
- '槽=cáo',
- '槾=màn,wàn',
- '槿=jǐn',
- '樀=dī',
- '樁=zhuāng',
- '樂=lè,yuè,yào,lào',
- '樃=láng',
- '樄=chén',
- '樅=cōng,zōng',
- '樆=lí,chī',
- '樇=xiū',
- '樈=qíng',
- '樉=shǎng',
- '樊=fán',
- '樋=tōng',
- '樌=guàn',
- '樍=zé',
- '樎=sù',
- '樏=léi,lěi',
- '樐=lǔ',
- '樑=liáng',
- '樒=mì',
- '樓=lóu',
- '樔=cháo,jiǎo,chāo',
- '樕=sù',
- '樖=kē',
- '樗=chū',
- '樘=táng',
- '標=biāo',
- '樚=lù',
- '樛=jiū,liáo',
- '樜=zhè',
- '樝=zhā',
- '樞=shū',
- '樟=zhāng',
- '樠=mán',
- '模=mó,mú',
- '樢=niǎo,mù',
- '樣=yàng',
- '樤=tiáo',
- '樥=péng',
- '樦=zhù',
- '樧=shā,xiè',
- '樨=xī',
- '権=quán',
- '横=héng,hèng',
- '樫=jiān',
- '樬=cōng',
- '樭=jī',
- '樮=yān',
- '樯=qiáng',
- '樰=xuě',
- '樱=yīng',
- '樲=èr',
- '樳=xún',
- '樴=zhí',
- '樵=qiáo',
- '樶=zuī',
- '樷=cóng',
- '樸=pǔ',
- '樹=shù',
- '樺=huà',
- '樻=guì',
- '樼=zhēn',
- '樽=zūn',
- '樾=yuè',
- '樿=shàn',
- '橀=xī',
- '橁=chūn',
- '橂=diàn',
- '橃=fá,fèi',
- '橄=gǎn',
- '橅=mó',
- '橆=wú',
- '橇=qiāo',
- '橈=ráo,náo',
- '橉=lìn',
- '橊=liú',
- '橋=qiáo',
- '橌=xiàn',
- '橍=rùn',
- '橎=fǎn',
- '橏=zhǎn,jiǎn',
- '橐=tuó',
- '橑=liáo',
- '橒=yún',
- '橓=shùn',
- '橔=tuí,dūn',
- '橕=chēng',
- '橖=táng,chēng',
- '橗=méng',
- '橘=jú',
- '橙=chéng',
- '橚=sù,qiū',
- '橛=jué',
- '橜=jué',
- '橝=tán,diàn',
- '橞=huì',
- '機=jī',
- '橠=nuó',
- '橡=xiàng',
- '橢=tuǒ',
- '橣=níng',
- '橤=ruǐ',
- '橥=zhū',
- '橦=tóng,chuáng',
- '橧=zēng,céng',
- '橨=fén,fèn,fèi',
- '橩=qióng',
- '橪=rǎn,yān',
- '橫=héng,hèng',
- '橬=qián',
- '橭=gū',
- '橮=liǔ',
- '橯=lào',
- '橰=gāo',
- '橱=chú',
- '橲=xǐ',
- '橳=shèng',
- '橴=zǐ',
- '橵=zān',
- '橶=jǐ',
- '橷=dōu',
- '橸=jīng',
- '橹=lǔ',
- '橺=xiàn',
- '橻=cū,chu',
- '橼=yuán',
- '橽=tà',
- '橾=shū,qiāo',
- '橿=jiāng',
- '檀=tán',
- '檁=lǐn',
- '檂=nóng',
- '檃=yǐn',
- '檄=xí',
- '檅=huì',
- '檆=shān',
- '檇=zuì',
- '檈=xuán',
- '檉=chēng',
- '檊=gàn',
- '檋=jū',
- '檌=zuì',
- '檍=yì',
- '檎=qín',
- '檏=pǔ',
- '檐=yán',
- '檑=léi',
- '檒=fēng',
- '檓=huǐ',
- '檔=dàng',
- '檕=jì',
- '檖=suì',
- '檗=bò',
- '檘=píng,bò',
- '檙=chéng',
- '檚=chǔ',
- '檛=zhuā',
- '檜=guì,huì',
- '檝=jí',
- '檞=jiě',
- '檟=jiǎ',
- '檠=qíng',
- '檡=zhái,shì,tú',
- '檢=jiǎn',
- '檣=qiáng',
- '檤=dào',
- '檥=yǐ',
- '檦=biāo,biǎo',
- '檧=sōng',
- '檨=shē',
- '檩=lǐn',
- '檪=lì',
- '檫=chá',
- '檬=méng',
- '檭=yín',
- '檮=chóu,táo,dǎo',
- '檯=tái',
- '檰=mián',
- '檱=qí',
- '檲=tuán',
- '檳=bīn,bīng',
- '檴=huò',
- '檵=jì',
- '檶=qiān,lián',
- '檷=nǐ,mí',
- '檸=níng',
- '檹=yī',
- '檺=gǎo',
- '檻=jiàn,kǎn',
- '檼=yǐn',
- '檽=nòu,ruǎn,rú',
- '檾=qǐng',
- '檿=yǎn',
- '櫀=qí',
- '櫁=mì',
- '櫂=zhào',
- '櫃=guì',
- '櫄=chūn',
- '櫅=jī,jì',
- '櫆=kuí',
- '櫇=pó',
- '櫈=dèng',
- '櫉=chú',
- '櫊=gé',
- '櫋=mián',
- '櫌=yōu',
- '櫍=zhì',
- '櫎=huǎng,guǒ,gǔ',
- '櫏=qiān',
- '櫐=lěi',
- '櫑=léi,lěi',
- '櫒=sà',
- '櫓=lǔ',
- '櫔=lì',
- '櫕=cuán',
- '櫖=lǜ,chū',
- '櫗=miè,mèi',
- '櫘=huì',
- '櫙=ōu',
- '櫚=lǘ',
- '櫛=zhì',
- '櫜=gāo',
- '櫝=dú',
- '櫞=yuán',
- '櫟=lì,yuè',
- '櫠=fèi',
- '櫡=zhuó,zhù',
- '櫢=sǒu',
- '櫣=lián,liǎn',
- '櫤=jiàng',
- '櫥=chú',
- '櫦=qìng',
- '櫧=zhū',
- '櫨=lú',
- '櫩=yán',
- '櫪=lì',
- '櫫=zhū',
- '櫬=chèn',
- '櫭=jué,jì',
- '櫮=è',
- '櫯=sū',
- '櫰=huái,guī',
- '櫱=niè',
- '櫲=yù',
- '櫳=lóng',
- '櫴=là,lài',
- '櫵=qiáo',
- '櫶=xiǎn',
- '櫷=guī',
- '櫸=jǔ',
- '櫹=xiāo',
- '櫺=líng',
- '櫻=yīng',
- '櫼=jiān',
- '櫽=yǐn',
- '櫾=yòu,yóu',
- '櫿=yíng',
- '欀=xiāng',
- '欁=nóng',
- '欂=bó',
- '欃=chán,zhàn',
- '欄=lán',
- '欅=jǔ',
- '欆=shuāng',
- '欇=shè',
- '欈=wéi,zuì',
- '欉=cóng',
- '權=quán',
- '欋=qú',
- '欌=cáng',
- '欍=jiù',
- '欎=yù',
- '欏=luó',
- '欐=lì',
- '欑=cuán',
- '欒=luán',
- '欓=dǎng',
- '欔=qú',
- '欕=yán',
- '欖=lǎn',
- '欗=lán',
- '欘=zhú',
- '欙=léi',
- '欚=lǐ',
- '欛=bà',
- '欜=náng',
- '欝=yù',
- '欞=líng',
- '欟=guàn',
- '欠=qiàn',
- '次=cì',
- '欢=huān',
- '欣=xīn',
- '欤=yú',
- '欥=yù,yì',
- '欦=qiān,xiān',
- '欧=ōu',
- '欨=xū',
- '欩=chāo',
- '欪=chù,qù,xì',
- '欫=qì',
- '欬=kài,ài',
- '欭=yì,yīn',
- '欮=jué',
- '欯=xì,kài',
- '欰=xù',
- '欱=hē',
- '欲=yù',
- '欳=kuài',
- '欴=láng',
- '欵=kuǎn',
- '欶=shuò,sòu',
- '欷=xī',
- '欸=èi,ěi,ǎi',
- '欹=qī',
- '欺=qī',
- '欻=xū,chuā',
- '欼=chǐ,chuài',
- '欽=qīn',
- '款=kuǎn',
- '欿=kǎn,qiàn',
- '歀=kuǎn',
- '歁=kǎn,kè',
- '歂=chuǎn,chuán',
- '歃=shà',
- '歄=guā',
- '歅=yān,yīn',
- '歆=xīn',
- '歇=xiē',
- '歈=yú',
- '歉=qiàn',
- '歊=xiāo',
- '歋=yē',
- '歌=gē',
- '歍=wū',
- '歎=tàn',
- '歏=jìn,qūn',
- '歐=ōu',
- '歑=hū',
- '歒=tì',
- '歓=huān',
- '歔=xū',
- '歕=pēn',
- '歖=xǐ',
- '歗=xiào',
- '歘=xū',
- '歙=xī,shè',
- '歚=shàn',
- '歛=liǎn,hān',
- '歜=chù',
- '歝=yì',
- '歞=è',
- '歟=yú',
- '歠=chuò',
- '歡=huān',
- '止=zhǐ',
- '正=zhèng,zhēng',
- '此=cǐ',
- '步=bù',
- '武=wǔ',
- '歧=qí',
- '歨=bù',
- '歩=bù',
- '歪=wāi',
- '歫=jù',
- '歬=qián',
- '歭=zhì,chí',
- '歮=sè',
- '歯=chǐ',
- '歰=sè,shà',
- '歱=zhǒng',
- '歲=suì',
- '歳=suì',
- '歴=lì',
- '歵=zé',
- '歶=yú',
- '歷=lì',
- '歸=guī',
- '歹=dǎi',
- '歺=è',
- '死=sǐ',
- '歼=jiān',
- '歽=zhé',
- '歾=mò,wěn',
- '歿=mò',
- '殀=yāo',
- '殁=mò',
- '殂=cú',
- '殃=yāng',
- '殄=tiǎn',
- '殅=shēng',
- '殆=dài',
- '殇=shāng',
- '殈=xù',
- '殉=xùn',
- '殊=shū',
- '残=cán',
- '殌=jǐng',
- '殍=piǎo',
- '殎=qià',
- '殏=qiú',
- '殐=sù',
- '殑=qíng,jìng',
- '殒=yǔn',
- '殓=liàn',
- '殔=yì',
- '殕=fǒu,bó',
- '殖=zhí,shi',
- '殗=yè,yān,yàn',
- '殘=cán',
- '殙=hūn,mèi',
- '殚=dān',
- '殛=jí',
- '殜=dié',
- '殝=zhēn',
- '殞=yǔn',
- '殟=wēn',
- '殠=chòu',
- '殡=bìn',
- '殢=tì',
- '殣=jìn',
- '殤=shāng',
- '殥=yín',
- '殦=chī',
- '殧=jiù',
- '殨=kuì,huì',
- '殩=cuàn',
- '殪=yì',
- '殫=dān',
- '殬=dù',
- '殭=jiāng',
- '殮=liàn',
- '殯=bìn',
- '殰=dú',
- '殱=jiān',
- '殲=jiān',
- '殳=shū',
- '殴=ōu',
- '段=duàn',
- '殶=zhù',
- '殷=yīn,yān,yǐn',
- '殸=qìng,kēng,shēng',
- '殹=yì',
- '殺=shā',
- '殻=ké,qiào',
- '殼=ké,qiào',
- '殽=xiáo,yáo,xiào',
- '殾=xùn',
- '殿=diàn',
- '毀=huǐ',
- '毁=huǐ',
- '毂=gǔ',
- '毃=qiāo',
- '毄=jī',
- '毅=yì',
- '毆=ōu',
- '毇=huǐ',
- '毈=duàn',
- '毉=yī',
- '毊=xiāo',
- '毋=wú',
- '毌=guàn,wān',
- '母=mǔ',
- '毎=měi',
- '每=měi',
- '毐=ǎi',
- '毑=jiě',
- '毒=dú,dài',
- '毓=yù',
- '比=bǐ',
- '毕=bì',
- '毖=bì',
- '毗=pí',
- '毘=pí',
- '毙=bì',
- '毚=chán',
- '毛=máo',
- '毜=háo',
- '毝=cǎi',
- '毞=bǐ',
- '毟=liě',
- '毠=jiā',
- '毡=zhān',
- '毢=sāi',
- '毣=mù',
- '毤=tuò',
- '毥=xún,xùn',
- '毦=ěr',
- '毧=róng',
- '毨=xiǎn',
- '毩=jū',
- '毪=mú',
- '毫=háo',
- '毬=qiú',
- '毭=dòu,nuò',
- '毮=shā',
- '毯=tǎn',
- '毰=péi',
- '毱=jū',
- '毲=duō',
- '毳=cuì',
- '毴=bī',
- '毵=sān',
- '毶=sān',
- '毷=mào',
- '毸=sāi,suī',
- '毹=shū',
- '毺=shū',
- '毻=tuò',
- '毼=hé',
- '毽=jiàn',
- '毾=tà',
- '毿=sān',
- '氀=lǘ',
- '氁=mú',
- '氂=máo',
- '氃=tóng',
- '氄=rǒng',
- '氅=chǎng',
- '氆=pǔ',
- '氇=lǔ',
- '氈=zhān',
- '氉=sào',
- '氊=zhān',
- '氋=méng',
- '氌=lǔ',
- '氍=qú',
- '氎=dié',
- '氏=shì,zhī',
- '氐=dī,dǐ',
- '民=mín',
- '氒=jué',
- '氓=méng,máng',
- '气=qì',
- '氕=piē',
- '氖=nǎi',
- '気=qì',
- '氘=dāo',
- '氙=xiān',
- '氚=chuān',
- '氛=fēn',
- '氜=yáng,rì',
- '氝=nèi',
- '氞=nèi',
- '氟=fú',
- '氠=shēn',
- '氡=dōng',
- '氢=qīng',
- '氣=qì',
- '氤=yīn',
- '氥=xī',
- '氦=hài',
- '氧=yǎng',
- '氨=ān',
- '氩=yà',
- '氪=kè',
- '氫=qīng',
- '氬=yà',
- '氭=dōng',
- '氮=dàn',
- '氯=lǜ',
- '氰=qíng',
- '氱=yǎng',
- '氲=yūn',
- '氳=yūn',
- '水=shuǐ',
- '氵=shuǐ',
- '氶=zhěng,chéng,zhèng',
- '氷=bīng',
- '永=yǒng',
- '氹=dàng',
- '氺=shuǐ',
- '氻=lè',
- '氼=nì',
- '氽=tǔn',
- '氾=fàn',
- '氿=guǐ,jiǔ',
- '汀=tīng',
- '汁=zhī',
- '求=qiú',
- '汃=bīn,pà,pā',
- '汄=zè',
- '汅=miǎn',
- '汆=cuān',
- '汇=huì',
- '汈=diāo',
- '汉=hàn',
- '汊=chà',
- '汋=zhuó,què',
- '汌=chuàn',
- '汍=wán',
- '汎=fàn',
- '汏=tài,dà',
- '汐=xī',
- '汑=tuō',
- '汒=máng',
- '汓=qiú',
- '汔=qì',
- '汕=shàn',
- '汖=pìn',
- '汗=hàn,hán',
- '汘=qiān',
- '汙=wū',
- '汚=wū',
- '汛=xùn',
- '汜=sì',
- '汝=rǔ',
- '汞=gǒng',
- '江=jiāng',
- '池=chí',
- '污=wū',
- '汢=tu',
- '汣=jiǔ',
- '汤=tāng,shāng',
- '汥=zhī,jì',
- '汦=zhǐ',
- '汧=qiān',
- '汨=mì',
- '汩=gǔ,yù',
- '汪=wāng',
- '汫=jǐng',
- '汬=jǐng',
- '汭=ruì',
- '汮=jūn',
- '汯=hóng',
- '汰=tài',
- '汱=tài',
- '汲=jí',
- '汳=biàn',
- '汴=biàn',
- '汵=gàn,hán,cén',
- '汶=wèn,mén',
- '汷=zhōng',
- '汸=fāng,pāng',
- '汹=xiōng',
- '決=jué',
- '汻=hǔ,huǎng',
- '汼=niú,yóu',
- '汽=qì',
- '汾=fén',
- '汿=xù',
- '沀=xù',
- '沁=qìn',
- '沂=yí',
- '沃=wò',
- '沄=yún',
- '沅=yuán',
- '沆=hàng',
- '沇=yǎn',
- '沈=shěn,chén',
- '沉=chén',
- '沊=dàn',
- '沋=yóu',
- '沌=dùn',
- '沍=hù',
- '沎=huò',
- '沏=qī',
- '沐=mù',
- '沑=nǜ,niǔ',
- '沒=méi,mò',
- '沓=tà,dá',
- '沔=miǎn',
- '沕=mì,wù',
- '沖=chōng',
- '沗=hóng,pāng',
- '沘=bǐ',
- '沙=shā,shà',
- '沚=zhǐ',
- '沛=pèi',
- '沜=pàn',
- '沝=zhuǐ,zǐ',
- '沞=zā',
- '沟=gōu',
- '沠=pài',
- '没=méi,mò',
- '沢=zé',
- '沣=fēng',
- '沤=òu,ōu',
- '沥=lì',
- '沦=lún',
- '沧=cāng',
- '沨=fēng',
- '沩=wéi',
- '沪=hù',
- '沫=mò',
- '沬=mèi',
- '沭=shù',
- '沮=jǔ,jù',
- '沯=zá',
- '沰=tuō,duó',
- '沱=tuó',
- '沲=tuó,duò',
- '河=hé',
- '沴=lì',
- '沵=mǐ,lì',
- '沶=yí,chí',
- '沷=fā',
- '沸=fèi',
- '油=yóu',
- '沺=tián',
- '治=zhì',
- '沼=zhǎo',
- '沽=gū',
- '沾=zhān',
- '沿=yán',
- '泀=sī',
- '況=kuàng',
- '泂=jiǒng',
- '泃=jū',
- '泄=xiè,yì',
- '泅=qiú',
- '泆=yì,dié',
- '泇=jiā',
- '泈=zhōng',
- '泉=quán',
- '泊=bó,pō',
- '泋=huì',
- '泌=mì,bì',
- '泍=bēn,bèn',
- '泎=zé',
- '泏=chù,shè',
- '泐=lè',
- '泑=yōu,yòu,āo',
- '泒=gū',
- '泓=hóng',
- '泔=gān',
- '法=fǎ',
- '泖=mǎo',
- '泗=sì',
- '泘=hū',
- '泙=pēng,píng',
- '泚=cǐ',
- '泛=fàn',
- '泜=zhī',
- '泝=sù',
- '泞=nìng',
- '泟=chēng',
- '泠=líng',
- '泡=pào,pāo',
- '波=bō',
- '泣=qì',
- '泤=sì',
- '泥=ní,nì',
- '泦=jú',
- '泧=yuè,sà',
- '注=zhù',
- '泩=shēng',
- '泪=lèi',
- '泫=xuàn',
- '泬=jué,xuè',
- '泭=fú',
- '泮=pàn',
- '泯=mǐn',
- '泰=tài',
- '泱=yāng',
- '泲=jǐ',
- '泳=yǒng',
- '泴=guàn',
- '泵=bèng',
- '泶=xué',
- '泷=lóng,shuāng',
- '泸=lú',
- '泹=dàn',
- '泺=luò,pō',
- '泻=xiè',
- '泼=pō',
- '泽=zé,shì',
- '泾=jīng',
- '泿=yín',
- '洀=pán',
- '洁=jié',
- '洂=yè',
- '洃=huī',
- '洄=huí',
- '洅=zài',
- '洆=chéng',
- '洇=yīn',
- '洈=wéi',
- '洉=hòu',
- '洊=jiàn',
- '洋=yáng',
- '洌=liè',
- '洍=sì',
- '洎=jì',
- '洏=ér',
- '洐=xíng',
- '洑=fú,fù',
- '洒=sǎ,xǐ',
- '洓=sè,qì,zì',
- '洔=zhǐ',
- '洕=yìn',
- '洖=wú',
- '洗=xǐ,xiǎn',
- '洘=kǎo,kào',
- '洙=zhū',
- '洚=jiàng',
- '洛=luò',
- '洜=luò',
- '洝=àn,yàn,è',
- '洞=dòng',
- '洟=yí',
- '洠=sì',
- '洡=lěi,lèi',
- '洢=yī',
- '洣=mǐ',
- '洤=quán',
- '津=jīn',
- '洦=pò',
- '洧=wěi',
- '洨=xiáo',
- '洩=xiè',
- '洪=hóng',
- '洫=xù',
- '洬=sù,shuò',
- '洭=kuāng',
- '洮=táo',
- '洯=qiè,jié',
- '洰=jù',
- '洱=ěr',
- '洲=zhōu',
- '洳=rù',
- '洴=píng',
- '洵=xún',
- '洶=xiōng',
- '洷=zhì',
- '洸=guāng',
- '洹=huán',
- '洺=míng',
- '活=huó',
- '洼=wā',
- '洽=qià',
- '派=pài',
- '洿=wū',
- '浀=qū',
- '流=liú',
- '浂=yì',
- '浃=jiā',
- '浄=jìng',
- '浅=qiǎn,jiān',
- '浆=jiāng,jiàng',
- '浇=jiāo',
- '浈=zhēn',
- '浉=shī',
- '浊=zhuó',
- '测=cè',
- '浌=fá',
- '浍=kuài,huì',
- '济=jì,jǐ',
- '浏=liú',
- '浐=chǎn',
- '浑=hún',
- '浒=hǔ,xǔ',
- '浓=nóng',
- '浔=xún',
- '浕=jìn',
- '浖=liè',
- '浗=qiú',
- '浘=wěi',
- '浙=zhè',
- '浚=jùn,xùn',
- '浛=hán',
- '浜=bāng',
- '浝=máng',
- '浞=zhuó',
- '浟=yōu,dí',
- '浠=xī',
- '浡=bó',
- '浢=dòu',
- '浣=huàn',
- '浤=hóng',
- '浥=yì',
- '浦=pǔ',
- '浧=yǐng,chéng,yíng',
- '浨=lǎn',
- '浩=hào',
- '浪=làng',
- '浫=hǎn',
- '浬=lǐ',
- '浭=gēng',
- '浮=fú',
- '浯=wú',
- '浰=lì',
- '浱=chún',
- '浲=féng,hóng',
- '浳=yì',
- '浴=yù',
- '浵=tóng',
- '浶=láo',
- '海=hǎi',
- '浸=jìn',
- '浹=jiā',
- '浺=chōng',
- '浻=jiǒng,jiōng',
- '浼=měi',
- '浽=suī,něi',
- '浾=chēng',
- '浿=pèi',
- '涀=xiàn',
- '涁=shèn',
- '涂=tú',
- '涃=kùn',
- '涄=pīng',
- '涅=niè',
- '涆=hàn',
- '涇=jīng',
- '消=xiāo',
- '涉=shè',
- '涊=niǎn',
- '涋=tū',
- '涌=yǒng,chōng',
- '涍=xiào',
- '涎=xián',
- '涏=tǐng',
- '涐=é',
- '涑=sù',
- '涒=tūn,yūn',
- '涓=juān',
- '涔=cén',
- '涕=tì',
- '涖=lì',
- '涗=shuì',
- '涘=sì',
- '涙=lèi',
- '涚=shuì',
- '涛=tāo',
- '涜=dú',
- '涝=lào',
- '涞=lái',
- '涟=lián',
- '涠=wéi',
- '涡=wō,guō',
- '涢=yún',
- '涣=huàn',
- '涤=dí',
- '涥=hēng',
- '润=rùn',
- '涧=jiàn',
- '涨=zhǎng,zhàng',
- '涩=sè',
- '涪=fú',
- '涫=guān',
- '涬=xìng',
- '涭=shòu,tāo',
- '涮=shuàn',
- '涯=yá',
- '涰=chuò',
- '涱=zhàng',
- '液=yè',
- '涳=kōng,náng',
- '涴=wǎn,wò,yuān',
- '涵=hán',
- '涶=tuō,tuò',
- '涷=dōng',
- '涸=hé',
- '涹=wō',
- '涺=jū',
- '涻=shè',
- '涼=liáng,liàng',
- '涽=hūn',
- '涾=tà',
- '涿=zhuō',
- '淀=diàn',
- '淁=qiè,jí',
- '淂=dé',
- '淃=juàn',
- '淄=zī',
- '淅=xī',
- '淆=xiáo',
- '淇=qí',
- '淈=gǔ',
- '淉=guǒ,guàn',
- '淊=yān',
- '淋=lín,lìn',
- '淌=tǎng,chǎng',
- '淍=zhōu',
- '淎=pěng',
- '淏=hào',
- '淐=chāng',
- '淑=shū',
- '淒=qī',
- '淓=fāng',
- '淔=zhí',
- '淕=lù',
- '淖=nào,chuò,zhuō',
- '淗=jú',
- '淘=táo',
- '淙=cóng',
- '淚=lèi',
- '淛=zhè',
- '淜=píng,péng',
- '淝=féi',
- '淞=sōng',
- '淟=tiǎn',
- '淠=pì,pèi',
- '淡=dàn',
- '淢=yù,xù',
- '淣=ní',
- '淤=yū',
- '淥=lù',
- '淦=gàn',
- '淧=mì',
- '淨=jìng,chēng',
- '淩=líng',
- '淪=lún',
- '淫=yín',
- '淬=cuì',
- '淭=qú',
- '淮=huái',
- '淯=yù',
- '淰=niǎn,shěn',
- '深=shēn',
- '淲=biāo,hǔ',
- '淳=chún,zhūn',
- '淴=hū',
- '淵=yuān',
- '淶=lái',
- '混=hùn,hún',
- '淸=qīng',
- '淹=yān',
- '淺=qiǎn',
- '添=tiān',
- '淼=miǎo',
- '淽=zhǐ',
- '淾=yǐn',
- '淿=bó',
- '渀=bèn',
- '渁=yuān',
- '渂=wèn,mín',
- '渃=ruò,rè,luò',
- '渄=fēi',
- '清=qīng',
- '渆=yuān',
- '渇=kě',
- '済=jì,jǐ',
- '渉=shè',
- '渊=yuān',
- '渋=sè',
- '渌=lù',
- '渍=zì',
- '渎=dú,dòu',
- '渏=yī',
- '渐=jiàn,jiān',
- '渑=miǎn,shéng',
- '渒=pài',
- '渓=xī',
- '渔=yú',
- '渕=yuān',
- '渖=shěn',
- '渗=shèn',
- '渘=róu',
- '渙=huàn',
- '渚=zhǔ',
- '減=jiǎn',
- '渜=nuǎn,nuán',
- '渝=yú',
- '渞=qiú,wù',
- '渟=tíng,tīng',
- '渠=qú,jù',
- '渡=dù',
- '渢=fēng',
- '渣=zhā',
- '渤=bó',
- '渥=wò',
- '渦=wō,guō',
- '渧=tí,dī,dì',
- '渨=wěi',
- '温=wēn',
- '渪=rú',
- '渫=xiè',
- '測=cè',
- '渭=wèi',
- '渮=hé',
- '港=gǎng,jiǎng',
- '渰=yān,yǎn',
- '渱=hóng',
- '渲=xuàn',
- '渳=mǐ',
- '渴=kě',
- '渵=máo',
- '渶=yīng',
- '渷=yǎn',
- '游=yóu',
- '渹=hōng,qìng',
- '渺=miǎo',
- '渻=shěng',
- '渼=měi',
- '渽=zāi',
- '渾=hún',
- '渿=nài',
- '湀=guǐ',
- '湁=chì',
- '湂=è',
- '湃=pài',
- '湄=méi',
- '湅=liàn',
- '湆=qì',
- '湇=qì',
- '湈=méi',
- '湉=tián',
- '湊=còu',
- '湋=wéi',
- '湌=cān',
- '湍=tuān',
- '湎=miǎn',
- '湏=huì,mǐn,xū',
- '湐=pò',
- '湑=xǔ,xū',
- '湒=jí',
- '湓=pén',
- '湔=jiān',
- '湕=jiǎn',
- '湖=hú',
- '湗=fèng',
- '湘=xiāng',
- '湙=yì',
- '湚=yìn',
- '湛=zhàn',
- '湜=shí',
- '湝=jiē',
- '湞=zhēn',
- '湟=huáng',
- '湠=tàn',
- '湡=yú',
- '湢=bì',
- '湣=mǐn,hūn',
- '湤=shī',
- '湥=tū',
- '湦=shēng',
- '湧=yǒng',
- '湨=jú',
- '湩=dòng',
- '湪=tuàn,nuǎn',
- '湫=qiū,jiǎo',
- '湬=qiū,jiǎo',
- '湭=qiú',
- '湮=yān,yīn',
- '湯=tāng,shāng',
- '湰=lóng',
- '湱=huò',
- '湲=yuán',
- '湳=nǎn',
- '湴=bàn,pán',
- '湵=yǒu',
- '湶=quán',
- '湷=zhuāng,hún',
- '湸=liàng',
- '湹=chán',
- '湺=xián',
- '湻=chún',
- '湼=niè',
- '湽=zī',
- '湾=wān',
- '湿=shī',
- '満=mǎn',
- '溁=yíng',
- '溂=là',
- '溃=kuì,huì',
- '溄=féng,hóng',
- '溅=jiàn,jiān',
- '溆=xù',
- '溇=lóu',
- '溈=wéi',
- '溉=gài',
- '溊=bō',
- '溋=yíng',
- '溌=pō',
- '溍=jìn',
- '溎=yàn,guì',
- '溏=táng',
- '源=yuán',
- '溑=suǒ',
- '溒=yuán',
- '溓=lián,liǎn,nián,xián,xiàn',
- '溔=yǎo',
- '溕=méng',
- '準=zhǔn',
- '溗=chéng',
- '溘=kè',
- '溙=tài',
- '溚=dá,tǎ',
- '溛=wā',
- '溜=liū,liù',
- '溝=gōu',
- '溞=sāo',
- '溟=míng',
- '溠=zhà',
- '溡=shí',
- '溢=yì',
- '溣=lùn',
- '溤=mǎ',
- '溥=pǔ',
- '溦=wēi',
- '溧=lì',
- '溨=zāi',
- '溩=wù',
- '溪=xī',
- '溫=wēn',
- '溬=qiāng',
- '溭=zé',
- '溮=shī',
- '溯=sù',
- '溰=ái',
- '溱=zhēn,qín',
- '溲=sōu',
- '溳=yún',
- '溴=xiù',
- '溵=yīn',
- '溶=róng',
- '溷=hùn',
- '溸=sù',
- '溹=suò',
- '溺=nì,niào',
- '溻=tā',
- '溼=shī',
- '溽=rù',
- '溾=āi',
- '溿=pàn',
- '滀=chù,xù',
- '滁=chú',
- '滂=pāng',
- '滃=wěng,wēng',
- '滄=cāng',
- '滅=miè',
- '滆=gé',
- '滇=diān',
- '滈=hào,xuè',
- '滉=huàng',
- '滊=qì,xì,xiē',
- '滋=zī',
- '滌=dí',
- '滍=zhì',
- '滎=xíng,yíng',
- '滏=fǔ',
- '滐=jié',
- '滑=huá',
- '滒=gē',
- '滓=zǐ',
- '滔=tāo',
- '滕=téng',
- '滖=suī',
- '滗=bì',
- '滘=jiào',
- '滙=huì',
- '滚=gǔn',
- '滛=yín',
- '滜=zé,hào',
- '滝=lóng',
- '滞=zhì',
- '滟=yàn',
- '滠=shè',
- '满=mǎn',
- '滢=yíng',
- '滣=chún',
- '滤=lǜ',
- '滥=làn',
- '滦=luán',
- '滧=yáo',
- '滨=bīn',
- '滩=tān',
- '滪=yù',
- '滫=xiǔ',
- '滬=hù',
- '滭=bì',
- '滮=biāo',
- '滯=zhì',
- '滰=jiàng',
- '滱=kòu',
- '滲=shèn',
- '滳=shāng',
- '滴=dī',
- '滵=mì',
- '滶=áo',
- '滷=lǔ',
- '滸=hǔ,xǔ',
- '滹=hū',
- '滺=yōu',
- '滻=chǎn',
- '滼=fàn',
- '滽=yōng',
- '滾=gǔn',
- '滿=mǎn',
- '漀=qǐng',
- '漁=yú',
- '漂=piāo,piǎo,piào',
- '漃=jì',
- '漄=yá',
- '漅=cháo',
- '漆=qī',
- '漇=xǐ',
- '漈=jì',
- '漉=lù',
- '漊=lóu',
- '漋=lóng',
- '漌=jǐn',
- '漍=guó',
- '漎=cóng,sǒng',
- '漏=lòu',
- '漐=zhí',
- '漑=gài',
- '漒=qiáng',
- '漓=lí',
- '演=yǎn',
- '漕=cáo',
- '漖=jiào',
- '漗=cōng',
- '漘=chún',
- '漙=tuán,zhuān',
- '漚=òu,ōu',
- '漛=téng',
- '漜=yě',
- '漝=xí',
- '漞=mì',
- '漟=táng',
- '漠=mò',
- '漡=shāng',
- '漢=hàn',
- '漣=lián',
- '漤=lǎn',
- '漥=wā',
- '漦=chí',
- '漧=gān',
- '漨=féng,péng',
- '漩=xuán',
- '漪=yī',
- '漫=màn',
- '漬=zì',
- '漭=mǎng',
- '漮=kāng',
- '漯=luò,tà',
- '漰=bēn,pēng',
- '漱=shù',
- '漲=zhǎng,zhàng',
- '漳=zhāng',
- '漴=chóng,zhuàng',
- '漵=xù',
- '漶=huàn',
- '漷=huǒ,huò,kuò',
- '漸=jiàn,jiān',
- '漹=yān',
- '漺=shuǎng',
- '漻=liáo,liú',
- '漼=cuǐ,cuī',
- '漽=tí',
- '漾=yàng',
- '漿=jiāng,jiàng',
- '潀=cóng,zǒng',
- '潁=yǐng',
- '潂=hóng',
- '潃=xiǔ',
- '潄=shù',
- '潅=guàn',
- '潆=yíng',
- '潇=xiāo',
- '潈=cóng,zōng',
- '潉=kūn',
- '潊=xù',
- '潋=liàn',
- '潌=zhì',
- '潍=wéi',
- '潎=pì,piē',
- '潏=yù',
- '潐=jiào,qiáo',
- '潑=pō',
- '潒=dàng,xiàng',
- '潓=huì',
- '潔=jié',
- '潕=wǔ',
- '潖=pá',
- '潗=jí',
- '潘=pān',
- '潙=wéi',
- '潚=sù',
- '潛=qián',
- '潜=qián',
- '潝=xī,yà',
- '潞=lù',
- '潟=xì',
- '潠=xùn',
- '潡=dùn',
- '潢=huáng,guāng',
- '潣=mǐn',
- '潤=rùn',
- '潥=sù',
- '潦=lǎo,lào,liáo',
- '潧=zhēn',
- '潨=cōng,zòng',
- '潩=yì',
- '潪=zhí,zhì',
- '潫=wān',
- '潬=tān,shàn',
- '潭=tán',
- '潮=cháo',
- '潯=xún',
- '潰=kuì,huì',
- '潱=yē',
- '潲=shào',
- '潳=tú,zhā',
- '潴=zhū',
- '潵=sàn,sǎ',
- '潶=hēi',
- '潷=bì',
- '潸=shān',
- '潹=chán',
- '潺=chán',
- '潻=shǔ',
- '潼=tóng',
- '潽=pū',
- '潾=lín',
- '潿=wéi',
- '澀=sè',
- '澁=sè',
- '澂=chéng',
- '澃=jiǒng',
- '澄=chéng,dèng',
- '澅=huà',
- '澆=jiāo',
- '澇=lào',
- '澈=chè',
- '澉=gǎn',
- '澊=cūn,cún',
- '澋=jǐng',
- '澌=sī',
- '澍=shù,zhù',
- '澎=péng',
- '澏=hán',
- '澐=yún',
- '澑=liū,liù',
- '澒=hòng,gǒng',
- '澓=fú',
- '澔=hào',
- '澕=hé',
- '澖=xián',
- '澗=jiàn',
- '澘=shān',
- '澙=xì',
- '澚=ào,yù',
- '澛=lǔ',
- '澜=lán',
- '澝=nìng',
- '澞=yú',
- '澟=lǐn',
- '澠=miǎn,shéng',
- '澡=zǎo',
- '澢=dāng',
- '澣=huàn',
- '澤=zé,shì',
- '澥=xiè',
- '澦=yù',
- '澧=lǐ',
- '澨=shì',
- '澩=xué',
- '澪=líng',
- '澫=wàn,màn',
- '澬=zī',
- '澭=yōng,yǒng',
- '澮=kuài,huì',
- '澯=càn',
- '澰=liàn',
- '澱=diàn',
- '澲=yè',
- '澳=ào',
- '澴=huán',
- '澵=zhēn',
- '澶=chán',
- '澷=màn',
- '澸=gǎn',
- '澹=dàn,tán',
- '澺=yì',
- '澻=suì',
- '澼=pì',
- '澽=jù',
- '澾=tà',
- '澿=qín',
- '激=jī',
- '濁=zhuó',
- '濂=lián',
- '濃=nóng',
- '濄=guō,wō',
- '濅=jìn',
- '濆=fén,pēn',
- '濇=sè',
- '濈=jí,shà',
- '濉=suī',
- '濊=huì,huò',
- '濋=chǔ',
- '濌=tà',
- '濍=sōng',
- '濎=dǐng,tìng',
- '濏=sè',
- '濐=zhǔ',
- '濑=lài',
- '濒=bīn',
- '濓=lián',
- '濔=mǐ,nǐ',
- '濕=shī',
- '濖=shù',
- '濗=mì',
- '濘=nìng',
- '濙=yíng',
- '濚=yíng',
- '濛=méng',
- '濜=jìn',
- '濝=qí',
- '濞=bì,pì',
- '濟=jì,jǐ',
- '濠=háo',
- '濡=rú',
- '濢=cuì,zuǐ',
- '濣=wò',
- '濤=tāo',
- '濥=yǐn',
- '濦=yīn',
- '濧=duì',
- '濨=cí',
- '濩=huò,hù',
- '濪=qìng',
- '濫=làn',
- '濬=jùn,xùn',
- '濭=ǎi,kài,kè',
- '濮=pú',
- '濯=zhuó,zhào',
- '濰=wéi',
- '濱=bīn',
- '濲=gǔ',
- '濳=qián',
- '濴=yíng',
- '濵=bīn',
- '濶=kuò',
- '濷=fèi',
- '濸=cāng',
- '濹=mè',
- '濺=jiàn,jiān',
- '濻=wěi,duì',
- '濼=luò,pō',
- '濽=zàn,cuán',
- '濾=lǜ',
- '濿=lì',
- '瀀=yōu',
- '瀁=yǎng,yàng',
- '瀂=lǔ',
- '瀃=sì',
- '瀄=zhì',
- '瀅=yíng',
- '瀆=dú,dòu',
- '瀇=wǎng,wāng',
- '瀈=huī',
- '瀉=xiè',
- '瀊=pán',
- '瀋=shěn',
- '瀌=biāo',
- '瀍=chán',
- '瀎=miè,mò',
- '瀏=liú',
- '瀐=jiān',
- '瀑=pù,bào',
- '瀒=sè',
- '瀓=chéng,dèng',
- '瀔=gǔ',
- '瀕=bīn',
- '瀖=huò',
- '瀗=xiàn',
- '瀘=lú',
- '瀙=qìn',
- '瀚=hàn',
- '瀛=yíng',
- '瀜=róng',
- '瀝=lì',
- '瀞=jìng',
- '瀟=xiāo',
- '瀠=yíng',
- '瀡=suǐ',
- '瀢=wěi,duì',
- '瀣=xiè',
- '瀤=huái,wāi',
- '瀥=xuè',
- '瀦=zhū',
- '瀧=lóng,shuāng',
- '瀨=lài',
- '瀩=duì',
- '瀪=fàn',
- '瀫=hú',
- '瀬=lài',
- '瀭=shū',
- '瀮=lián',
- '瀯=yíng',
- '瀰=mí',
- '瀱=jì',
- '瀲=liàn',
- '瀳=jiàn,zùn',
- '瀴=yīng,yǐng,yìng',
- '瀵=fèn',
- '瀶=lín',
- '瀷=yì',
- '瀸=jiān',
- '瀹=yuè',
- '瀺=chán',
- '瀻=dài',
- '瀼=ráng,nǎng',
- '瀽=jiǎn',
- '瀾=lán',
- '瀿=fán',
- '灀=shuàng',
- '灁=yuān',
- '灂=zhuó,jiào,zé',
- '灃=fēng',
- '灄=shè',
- '灅=lěi',
- '灆=lán',
- '灇=cóng',
- '灈=qú',
- '灉=yōng',
- '灊=qián',
- '灋=fǎ',
- '灌=guàn',
- '灍=jué',
- '灎=yàn',
- '灏=hào',
- '灐=yíng',
- '灑=sǎ',
- '灒=zàn,cuán',
- '灓=luán,luàn',
- '灔=yàn',
- '灕=lí',
- '灖=mǐ',
- '灗=shàn',
- '灘=tān',
- '灙=dǎng,tǎng',
- '灚=jiǎo',
- '灛=chǎn',
- '灜=yíng',
- '灝=hào',
- '灞=bà',
- '灟=zhú',
- '灠=lǎn',
- '灡=lán',
- '灢=nǎng',
- '灣=wān',
- '灤=luán',
- '灥=xún,quán,quàn',
- '灦=xiǎn',
- '灧=yàn',
- '灨=gàn',
- '灩=yàn',
- '灪=yù',
- '火=huǒ',
- '灬=huǒ,biāo',
- '灭=miè',
- '灮=guāng',
- '灯=dēng',
- '灰=huī',
- '灱=xiāo',
- '灲=xiāo',
- '灳=huī',
- '灴=hōng',
- '灵=líng',
- '灶=zào',
- '灷=zhuàn',
- '灸=jiǔ',
- '灹=zhà,yù',
- '灺=xiè',
- '灻=chì',
- '灼=zhuó',
- '災=zāi',
- '灾=zāi',
- '灿=càn',
- '炀=yáng',
- '炁=qì',
- '炂=zhōng',
- '炃=fén,bèn',
- '炄=niǔ',
- '炅=jiǒng,guì',
- '炆=wén',
- '炇=pū',
- '炈=yì',
- '炉=lú',
- '炊=chuī',
- '炋=pī',
- '炌=kài',
- '炍=pàn',
- '炎=yán',
- '炏=yán',
- '炐=pàng,fēng',
- '炑=mù',
- '炒=chǎo',
- '炓=liào',
- '炔=quē',
- '炕=kàng',
- '炖=dùn',
- '炗=guāng',
- '炘=xìn',
- '炙=zhì',
- '炚=guāng',
- '炛=guāng',
- '炜=wěi',
- '炝=qiàng',
- '炞=biān',
- '炟=dá',
- '炠=xiá',
- '炡=zhēng',
- '炢=zhú',
- '炣=kě',
- '炤=zhào,zhāo',
- '炥=fú',
- '炦=bá',
- '炧=xiè',
- '炨=xiè',
- '炩=lìng',
- '炪=zhuō,chù',
- '炫=xuàn',
- '炬=jù',
- '炭=tàn',
- '炮=pào,páo,bāo',
- '炯=jiǒng',
- '炰=páo,fǒu',
- '炱=tái',
- '炲=tái',
- '炳=bǐng',
- '炴=yǎng',
- '炵=tōng',
- '炶=shǎn,qián,shān',
- '炷=zhù',
- '炸=zhà,zhá',
- '点=diǎn',
- '為=wéi,wèi',
- '炻=shí',
- '炼=liàn',
- '炽=chì',
- '炾=huǎng',
- '炿=zhōu',
- '烀=hū',
- '烁=shuò',
- '烂=làn',
- '烃=tīng',
- '烄=jiǎo,yào',
- '烅=xù',
- '烆=héng',
- '烇=quǎn',
- '烈=liè',
- '烉=huàn',
- '烊=yáng,yàng',
- '烋=xiāo',
- '烌=xiū',
- '烍=xiǎn',
- '烎=yín',
- '烏=wū',
- '烐=zhōu',
- '烑=yáo',
- '烒=shì',
- '烓=wēi',
- '烔=tóng,dòng',
- '烕=miè',
- '烖=zāi',
- '烗=kài',
- '烘=hōng',
- '烙=lào,luò',
- '烚=xiá',
- '烛=zhú',
- '烜=xuǎn',
- '烝=zhēng',
- '烞=pò',
- '烟=yān',
- '烠=huí,huǐ',
- '烡=guāng',
- '烢=chè',
- '烣=huī',
- '烤=kǎo',
- '烥=jù',
- '烦=fán',
- '烧=shāo',
- '烨=yè',
- '烩=huì',
- '烪=null',
- '烫=tàng',
- '烬=jìn',
- '热=rè',
- '烮=liè',
- '烯=xī',
- '烰=fú,páo',
- '烱=jiǒng',
- '烲=xiè,chè',
- '烳=pǔ',
- '烴=tīng',
- '烵=zhuó',
- '烶=tǐng',
- '烷=wán',
- '烸=hǎi',
- '烹=pēng',
- '烺=lǎng',
- '烻=yàn',
- '烼=xù',
- '烽=fēng',
- '烾=chì',
- '烿=róng',
- '焀=hú',
- '焁=xī',
- '焂=shū',
- '焃=hè',
- '焄=xūn,hūn',
- '焅=kù',
- '焆=juān,yè',
- '焇=xiāo',
- '焈=xī',
- '焉=yān',
- '焊=hàn',
- '焋=zhuàng',
- '焌=qū,jùn',
- '焍=dì',
- '焎=xiè,chè',
- '焏=jí,qì',
- '焐=wù',
- '焑=yān',
- '焒=lǚ',
- '焓=hán',
- '焔=yàn',
- '焕=huàn',
- '焖=mèn',
- '焗=jú',
- '焘=dào',
- '焙=bèi',
- '焚=fén',
- '焛=lìn',
- '焜=kūn',
- '焝=hùn',
- '焞=tūn',
- '焟=xī',
- '焠=cuì',
- '無=wú',
- '焢=hōng',
- '焣=chǎo,jù',
- '焤=fǔ',
- '焥=wò,ài',
- '焦=jiāo',
- '焧=zǒng,cōng',
- '焨=fèng',
- '焩=píng',
- '焪=qióng',
- '焫=ruò',
- '焬=xī,yì',
- '焭=qióng',
- '焮=xìn',
- '焯=zhuō,chāo',
- '焰=yàn',
- '焱=yàn',
- '焲=yì',
- '焳=jué',
- '焴=yù',
- '焵=gàng',
- '然=rán',
- '焷=pí',
- '焸=xiǒng,yīng',
- '焹=gàng',
- '焺=shēng',
- '焻=chàng',
- '焼=shāo',
- '焽=xiǒng,yīng',
- '焾=niǎn',
- '焿=gēng',
- '煀=qū',
- '煁=chén',
- '煂=hè',
- '煃=kuǐ',
- '煄=zhǒng',
- '煅=duàn',
- '煆=xiā',
- '煇=huī,yùn,xūn',
- '煈=fèng',
- '煉=liàn',
- '煊=xuān',
- '煋=xīng',
- '煌=huáng',
- '煍=jiǎo,qiāo',
- '煎=jiān',
- '煏=bì',
- '煐=yīng',
- '煑=zhǔ',
- '煒=wěi',
- '煓=tuān',
- '煔=shǎn,qián,shān',
- '煕=xī,yí',
- '煖=nuǎn',
- '煗=nuǎn',
- '煘=chán',
- '煙=yān',
- '煚=jiǒng',
- '煛=jiǒng',
- '煜=yù',
- '煝=mèi',
- '煞=shā,shà',
- '煟=wèi',
- '煠=yè,zhá',
- '煡=jìn',
- '煢=qióng',
- '煣=róu',
- '煤=méi',
- '煥=huàn',
- '煦=xù',
- '照=zhào',
- '煨=wēi',
- '煩=fán',
- '煪=qiú',
- '煫=suì',
- '煬=yáng,yàng',
- '煭=liè',
- '煮=zhǔ',
- '煯=jiē',
- '煰=zào',
- '煱=guā',
- '煲=bāo',
- '煳=hú',
- '煴=yūn,yǔn',
- '煵=nǎn',
- '煶=shì',
- '煷=huǒ',
- '煸=biān',
- '煹=gòu',
- '煺=tuì',
- '煻=táng',
- '煼=chǎo',
- '煽=shān',
- '煾=ēn,yūn',
- '煿=bó',
- '熀=huǎng',
- '熁=xié',
- '熂=xì',
- '熃=wù',
- '熄=xī',
- '熅=yūn,yǔn',
- '熆=hé',
- '熇=hè,xiāo',
- '熈=xī',
- '熉=yún',
- '熊=xióng',
- '熋=xióng',
- '熌=shǎn',
- '熍=qióng',
- '熎=yào',
- '熏=xūn,xùn',
- '熐=mì',
- '熑=lián',
- '熒=yíng',
- '熓=wǔ',
- '熔=róng',
- '熕=gòng',
- '熖=yàn',
- '熗=qiàng',
- '熘=liū',
- '熙=xī',
- '熚=bì',
- '熛=biāo',
- '熜=cōng,zǒng',
- '熝=lù,āo',
- '熞=jiān',
- '熟=shú',
- '熠=yì',
- '熡=lóu',
- '熢=péng,fēng',
- '熣=suī,cuǐ',
- '熤=yì',
- '熥=tēng',
- '熦=jué',
- '熧=zōng',
- '熨=yùn,yù',
- '熩=hù',
- '熪=yí',
- '熫=zhì',
- '熬=āo,áo',
- '熭=wèi',
- '熮=liǔ',
- '熯=hàn,rǎn',
- '熰=ōu,ǒu',
- '熱=rè',
- '熲=jiǒng',
- '熳=màn',
- '熴=kūn',
- '熵=shāng',
- '熶=cuàn',
- '熷=zèng',
- '熸=jiān',
- '熹=xī',
- '熺=xī',
- '熻=xī',
- '熼=yì',
- '熽=xiào',
- '熾=chì',
- '熿=huáng,huǎng',
- '燀=chǎn,dǎn,chàn',
- '燁=yè',
- '燂=tán',
- '燃=rán',
- '燄=yàn',
- '燅=xún',
- '燆=qiāo',
- '燇=jùn',
- '燈=dēng',
- '燉=dùn',
- '燊=shēn',
- '燋=jiāo,qiáo,jué,zhuó',
- '燌=fén',
- '燍=sī',
- '燎=liáo,liǎo',
- '燏=yù',
- '燐=lín',
- '燑=tóng,dòng',
- '燒=shāo',
- '燓=fén',
- '燔=fán',
- '燕=yàn,yān',
- '燖=xún',
- '燗=làn',
- '燘=měi',
- '燙=tàng',
- '燚=yì',
- '燛=jiǒng',
- '燜=mèn',
- '燝=zhǔ',
- '燞=jiǎo',
- '營=yíng',
- '燠=yù',
- '燡=yì',
- '燢=xué',
- '燣=lán',
- '燤=tài,liè',
- '燥=zào',
- '燦=càn',
- '燧=suì',
- '燨=xī',
- '燩=què',
- '燪=zǒng',
- '燫=lián',
- '燬=huǐ',
- '燭=zhú',
- '燮=xiè',
- '燯=líng',
- '燰=wēi',
- '燱=yì',
- '燲=xié',
- '燳=zhào',
- '燴=huì',
- '燵=dá',
- '燶=nóng',
- '燷=lán',
- '燸=xū',
- '燹=xiǎn',
- '燺=hè',
- '燻=xūn',
- '燼=jìn',
- '燽=chóu',
- '燾=dào',
- '燿=yào',
- '爀=hè',
- '爁=làn',
- '爂=biāo',
- '爃=róng,yíng',
- '爄=lì,liè',
- '爅=mò',
- '爆=bào',
- '爇=ruò',
- '爈=lǜ',
- '爉=là,liè',
- '爊=āo',
- '爋=xūn,xùn',
- '爌=kuàng,huǎng',
- '爍=shuò',
- '爎=liáo,liǎo',
- '爏=lì',
- '爐=lú',
- '爑=jué',
- '爒=liáo,liǎo',
- '爓=yàn,xún',
- '爔=xī',
- '爕=xiè',
- '爖=lóng',
- '爗=yè',
- '爘=cān',
- '爙=rǎng',
- '爚=yuè',
- '爛=làn',
- '爜=cóng',
- '爝=jué',
- '爞=chóng',
- '爟=guàn',
- '爠=qú',
- '爡=chè',
- '爢=mí',
- '爣=tǎng',
- '爤=làn',
- '爥=zhú',
- '爦=lǎn,làn',
- '爧=líng',
- '爨=cuàn',
- '爩=yù',
- '爪=zhǎo,zhuǎ',
- '爫=zhǎo,zhuǎ',
- '爬=pá',
- '爭=zhēng',
- '爮=páo',
- '爯=chēng,chèn',
- '爰=yuán',
- '爱=ài',
- '爲=wéi,wèi',
- '爳=han',
- '爴=jué',
- '爵=jué',
- '父=fù,fǔ',
- '爷=yé',
- '爸=bà',
- '爹=diē',
- '爺=yé',
- '爻=yáo',
- '爼=zǔ',
- '爽=shuǎng',
- '爾=ěr',
- '爿=pán',
- '牀=chuáng',
- '牁=kē',
- '牂=zāng',
- '牃=dié',
- '牄=qiāng',
- '牅=yōng',
- '牆=qiáng',
- '片=piàn,piān',
- '版=bǎn',
- '牉=pàn',
- '牊=cháo',
- '牋=jiān',
- '牌=pái',
- '牍=dú',
- '牎=chuāng',
- '牏=yú',
- '牐=zhá',
- '牑=biān,miàn',
- '牒=dié',
- '牓=bǎng',
- '牔=bó',
- '牕=chuāng',
- '牖=yǒu',
- '牗=yǒu,yōng',
- '牘=dú',
- '牙=yá',
- '牚=chēng,chèng',
- '牛=niú',
- '牜=niú',
- '牝=pìn',
- '牞=jiū,lè',
- '牟=móu,mù',
- '牠=tā',
- '牡=mǔ',
- '牢=láo',
- '牣=rèn',
- '牤=māng',
- '牥=fāng',
- '牦=máo',
- '牧=mù',
- '牨=gāng',
- '物=wù',
- '牪=yàn',
- '牫=gē,qiú',
- '牬=bèi',
- '牭=sì',
- '牮=jiàn',
- '牯=gǔ',
- '牰=yòu,chōu',
- '牱=kē',
- '牲=shēng',
- '牳=mǔ',
- '牴=dǐ',
- '牵=qiān',
- '牶=quàn',
- '牷=quán',
- '牸=zì',
- '特=tè',
- '牺=xī',
- '牻=máng',
- '牼=kēng',
- '牽=qiān',
- '牾=wǔ',
- '牿=gù',
- '犀=xī',
- '犁=lí',
- '犂=lí',
- '犃=pǒu',
- '犄=jī',
- '犅=gāng',
- '犆=zhí,tè',
- '犇=bēn',
- '犈=quán',
- '犉=chún',
- '犊=dú',
- '犋=jù',
- '犌=jiā',
- '犍=jiān,qián',
- '犎=fēng',
- '犏=piān',
- '犐=kē',
- '犑=jú',
- '犒=kào',
- '犓=chú',
- '犔=xì',
- '犕=bèi',
- '犖=luò',
- '犗=jiè',
- '犘=má',
- '犙=sān',
- '犚=wèi',
- '犛=máo,lí',
- '犜=dūn',
- '犝=tóng',
- '犞=qiáo',
- '犟=jiàng',
- '犠=xī',
- '犡=lì',
- '犢=dú',
- '犣=liè',
- '犤=pái',
- '犥=piāo',
- '犦=bào',
- '犧=xī',
- '犨=chōu',
- '犩=wéi',
- '犪=kuí',
- '犫=chōu',
- '犬=quǎn',
- '犭=quǎn',
- '犮=quǎn,bá',
- '犯=fàn',
- '犰=qiú',
- '犱=jǐ',
- '犲=chái',
- '犳=zhuó,bào',
- '犴=hān,àn',
- '犵=gē',
- '状=zhuàng',
- '犷=guǎng',
- '犸=mǎ',
- '犹=yóu',
- '犺=kàng,gǎng',
- '犻=pèi,fèi',
- '犼=hǒu',
- '犽=yà',
- '犾=yín',
- '犿=huān,fān',
- '狀=zhuàng',
- '狁=yǔn',
- '狂=kuáng',
- '狃=niǔ',
- '狄=dí',
- '狅=kuáng',
- '狆=zhòng',
- '狇=mù',
- '狈=bèi',
- '狉=pī',
- '狊=jú',
- '狋=yí,quán,chí',
- '狌=shēng,xīng',
- '狍=páo',
- '狎=xiá',
- '狏=tuó,yí',
- '狐=hú',
- '狑=líng',
- '狒=fèi',
- '狓=pī',
- '狔=nǐ',
- '狕=yǎo',
- '狖=yòu',
- '狗=gǒu',
- '狘=xuè',
- '狙=jū',
- '狚=dàn',
- '狛=bó',
- '狜=kǔ',
- '狝=xiǎn',
- '狞=níng',
- '狟=huán,huān',
- '狠=hěn',
- '狡=jiǎo',
- '狢=hé,mò',
- '狣=zhào',
- '狤=jié',
- '狥=xùn',
- '狦=shān',
- '狧=tà,shì',
- '狨=róng',
- '狩=shòu',
- '狪=tóng,dòng',
- '狫=lǎo',
- '独=dú',
- '狭=xiá',
- '狮=shī',
- '狯=kuài',
- '狰=zhēng',
- '狱=yù',
- '狲=sūn',
- '狳=yú',
- '狴=bì',
- '狵=máng,dòu',
- '狶=xī,shǐ',
- '狷=juàn',
- '狸=lí',
- '狹=xiá',
- '狺=yín',
- '狻=suān',
- '狼=láng',
- '狽=bèi',
- '狾=zhì',
- '狿=yán',
- '猀=shā',
- '猁=lì',
- '猂=hàn',
- '猃=xiǎn',
- '猄=jīng',
- '猅=pái',
- '猆=fēi',
- '猇=xiāo',
- '猈=bài,pí',
- '猉=qí',
- '猊=ní',
- '猋=biāo',
- '猌=yìn',
- '猍=lái',
- '猎=liè',
- '猏=jiān,yàn',
- '猐=qiāng',
- '猑=kūn',
- '猒=yàn',
- '猓=guō',
- '猔=zòng',
- '猕=mí',
- '猖=chāng',
- '猗=yī,yǐ',
- '猘=zhì',
- '猙=zhēng',
- '猚=yá,wèi',
- '猛=měng',
- '猜=cāi',
- '猝=cù',
- '猞=shē',
- '猟=liè',
- '猠=null',
- '猡=luó',
- '猢=hú',
- '猣=zōng',
- '猤=guì',
- '猥=wěi',
- '猦=fēng',
- '猧=wō',
- '猨=yuán',
- '猩=xīng',
- '猪=zhū',
- '猫=māo,máo',
- '猬=wèi',
- '猭=chuàn,chuān',
- '献=xiàn',
- '猯=tuān,tuàn',
- '猰=yà,jiá,qiè',
- '猱=náo',
- '猲=xiē,hè,gé,hài',
- '猳=jiā',
- '猴=hóu',
- '猵=biān,piàn',
- '猶=yóu',
- '猷=yóu',
- '猸=méi',
- '猹=chá',
- '猺=yáo',
- '猻=sūn',
- '猼=bó,pò',
- '猽=míng',
- '猾=huá',
- '猿=yuán',
- '獀=sōu',
- '獁=mǎ',
- '獂=huán',
- '獃=dāi',
- '獄=yù',
- '獅=shī',
- '獆=háo',
- '獇=qiāng',
- '獈=yì',
- '獉=zhēn',
- '獊=cāng',
- '獋=háo,gāo',
- '獌=màn',
- '獍=jìng',
- '獎=jiǎng',
- '獏=mò',
- '獐=zhāng',
- '獑=chán',
- '獒=áo',
- '獓=áo',
- '獔=háo',
- '獕=suǒ',
- '獖=fén,fèn',
- '獗=jué',
- '獘=bì',
- '獙=bì',
- '獚=huáng',
- '獛=pú',
- '獜=lín,lìn',
- '獝=xù',
- '獞=tóng',
- '獟=yào,xiāo',
- '獠=liáo',
- '獡=shuò,xī',
- '獢=xiāo',
- '獣=shòu',
- '獤=dūn',
- '獥=jiào',
- '獦=gé,liè,xiē',
- '獧=juàn',
- '獨=dú',
- '獩=huì',
- '獪=kuài',
- '獫=xiǎn',
- '獬=xiè',
- '獭=tǎ',
- '獮=xiǎn',
- '獯=xūn',
- '獰=níng',
- '獱=biān,piàn',
- '獲=huò',
- '獳=nòu,rú',
- '獴=méng',
- '獵=liè',
- '獶=náo,nǎo,yōu',
- '獷=guǎng',
- '獸=shòu',
- '獹=lú',
- '獺=tǎ',
- '獻=xiàn',
- '獼=mí',
- '獽=ráng',
- '獾=huān',
- '獿=náo,yōu',
- '玀=luó',
- '玁=xiǎn',
- '玂=qí',
- '玃=jué',
- '玄=xuán',
- '玅=miào',
- '玆=zī',
- '率=lǜ,shuài',
- '玈=lú',
- '玉=yù',
- '玊=sù',
- '王=wáng,wàng',
- '玌=qiú',
- '玍=gǎ',
- '玎=dīng',
- '玏=lè',
- '玐=bā',
- '玑=jī',
- '玒=hóng',
- '玓=dì',
- '玔=chuàn',
- '玕=gān',
- '玖=jiǔ',
- '玗=yú',
- '玘=qǐ',
- '玙=yú',
- '玚=chàng,yáng',
- '玛=mǎ',
- '玜=hóng',
- '玝=wǔ',
- '玞=fū',
- '玟=mín,wén',
- '玠=jiè',
- '玡=yà',
- '玢=bīn,fēn',
- '玣=biàn',
- '玤=bàng',
- '玥=yuè',
- '玦=jué',
- '玧=mén,yǔn',
- '玨=jué',
- '玩=wán',
- '玪=jiān,qián',
- '玫=méi',
- '玬=dǎn',
- '玭=pín',
- '玮=wěi',
- '环=huán',
- '现=xiàn',
- '玱=qiāng,cāng',
- '玲=líng',
- '玳=dài',
- '玴=yì',
- '玵=án,gān',
- '玶=píng',
- '玷=diàn',
- '玸=fú',
- '玹=xuán,xián',
- '玺=xǐ',
- '玻=bō',
- '玼=cī,cǐ',
- '玽=gǒu',
- '玾=jiǎ',
- '玿=sháo',
- '珀=pò',
- '珁=cí',
- '珂=kē',
- '珃=rǎn',
- '珄=shēng',
- '珅=shēn',
- '珆=yí,tāi',
- '珇=zǔ,jù',
- '珈=jiā',
- '珉=mín',
- '珊=shān',
- '珋=liǔ',
- '珌=bì',
- '珍=zhēn',
- '珎=zhēn',
- '珏=jué',
- '珐=fà',
- '珑=lóng',
- '珒=jīn',
- '珓=jiào',
- '珔=jiàn',
- '珕=lì',
- '珖=guāng',
- '珗=xiān',
- '珘=zhōu',
- '珙=gǒng',
- '珚=yān',
- '珛=xiù',
- '珜=yáng',
- '珝=xǔ',
- '珞=luò',
- '珟=sù',
- '珠=zhū',
- '珡=qín',
- '珢=yín,kèn',
- '珣=xún',
- '珤=bǎo',
- '珥=ěr',
- '珦=xiàng',
- '珧=yáo',
- '珨=xiá',
- '珩=héng',
- '珪=guī',
- '珫=chōng',
- '珬=xù',
- '班=bān',
- '珮=pèi',
- '珯=lǎo',
- '珰=dāng',
- '珱=yīng',
- '珲=hún,huī',
- '珳=wén',
- '珴=é',
- '珵=chéng',
- '珶=dì,tí',
- '珷=wǔ',
- '珸=wú',
- '珹=chéng',
- '珺=jùn',
- '珻=méi',
- '珼=bèi',
- '珽=tǐng',
- '現=xiàn',
- '珿=chù',
- '琀=hán',
- '琁=xuán,qióng',
- '琂=yán',
- '球=qiú',
- '琄=xuàn',
- '琅=láng',
- '理=lǐ',
- '琇=xiù',
- '琈=fú,fū',
- '琉=liú',
- '琊=yá',
- '琋=xī',
- '琌=líng',
- '琍=lí',
- '琎=jīn',
- '琏=liǎn',
- '琐=suǒ',
- '琑=suǒ',
- '琒=fēng',
- '琓=wán',
- '琔=diàn',
- '琕=pín,bǐng',
- '琖=zhǎn',
- '琗=cuì,sè',
- '琘=mín',
- '琙=yù',
- '琚=jū',
- '琛=chēn',
- '琜=lái',
- '琝=mín',
- '琞=shèng',
- '琟=wéi,yù',
- '琠=tiǎn,tiàn',
- '琡=shū',
- '琢=zhuó,zuó',
- '琣=běng,pěi',
- '琤=chēng',
- '琥=hǔ',
- '琦=qí',
- '琧=è',
- '琨=kūn',
- '琩=chāng',
- '琪=qí',
- '琫=běng',
- '琬=wǎn',
- '琭=lù',
- '琮=cóng',
- '琯=guǎn',
- '琰=yǎn',
- '琱=diāo',
- '琲=bèi',
- '琳=lín',
- '琴=qín',
- '琵=pí',
- '琶=pá',
- '琷=què',
- '琸=zhuó',
- '琹=qín',
- '琺=fà',
- '琻=jīn',
- '琼=qióng',
- '琽=dǔ',
- '琾=jiè',
- '琿=hún,huī',
- '瑀=yǔ',
- '瑁=mào',
- '瑂=méi',
- '瑃=chūn',
- '瑄=xuān',
- '瑅=tí',
- '瑆=xīng',
- '瑇=dài',
- '瑈=róu',
- '瑉=mín',
- '瑊=jiān',
- '瑋=wěi',
- '瑌=ruǎn',
- '瑍=huàn',
- '瑎=xié,jiē',
- '瑏=chuān',
- '瑐=jiǎn',
- '瑑=zhuàn',
- '瑒=chàng,yáng',
- '瑓=liàn',
- '瑔=quán',
- '瑕=xiá',
- '瑖=duàn',
- '瑗=yuàn',
- '瑘=yé',
- '瑙=nǎo',
- '瑚=hú',
- '瑛=yīng',
- '瑜=yú',
- '瑝=huáng',
- '瑞=ruì',
- '瑟=sè',
- '瑠=liú',
- '瑡=shī',
- '瑢=róng',
- '瑣=suǒ',
- '瑤=yáo',
- '瑥=wēn',
- '瑦=wǔ',
- '瑧=zhēn',
- '瑨=jìn',
- '瑩=yíng',
- '瑪=mǎ',
- '瑫=tāo',
- '瑬=liú',
- '瑭=táng',
- '瑮=lì',
- '瑯=láng',
- '瑰=guī',
- '瑱=tiàn,tián,zhèn',
- '瑲=qiāng,cāng',
- '瑳=cuō',
- '瑴=jué',
- '瑵=zhǎo',
- '瑶=yáo',
- '瑷=ài',
- '瑸=bīn,pián',
- '瑹=tú,shū',
- '瑺=cháng',
- '瑻=kūn',
- '瑼=zhuān',
- '瑽=cōng',
- '瑾=jǐn',
- '瑿=yī',
- '璀=cuǐ',
- '璁=cōng',
- '璂=qí',
- '璃=lí',
- '璄=jǐng',
- '璅=zǎo,suǒ',
- '璆=qiú',
- '璇=xuán',
- '璈=áo',
- '璉=liǎn',
- '璊=mén',
- '璋=zhāng',
- '璌=yín',
- '璍=yè',
- '璎=yīng',
- '璏=zhì',
- '璐=lù',
- '璑=wú',
- '璒=dēng',
- '璓=xiù',
- '璔=zēng',
- '璕=xún',
- '璖=qú',
- '璗=dàng',
- '璘=lín',
- '璙=liáo',
- '璚=qióng,jué',
- '璛=sù',
- '璜=huáng',
- '璝=guī',
- '璞=pú',
- '璟=jǐng',
- '璠=fán',
- '璡=jīn',
- '璢=liú',
- '璣=jī',
- '璤=huì',
- '璥=jǐng',
- '璦=ài',
- '璧=bì',
- '璨=càn',
- '璩=qú',
- '璪=zǎo',
- '璫=dāng',
- '璬=jiǎo',
- '璭=guǎn',
- '璮=tǎn',
- '璯=huì,kuài',
- '環=huán',
- '璱=sè',
- '璲=suì',
- '璳=tián',
- '璴=chǔ',
- '璵=yú',
- '璶=jìn',
- '璷=lú,fū',
- '璸=bīn,pián',
- '璹=shú',
- '璺=wèn',
- '璻=zuǐ',
- '璼=lán',
- '璽=xǐ',
- '璾=jì,zī',
- '璿=xuán',
- '瓀=ruǎn',
- '瓁=wò',
- '瓂=gài',
- '瓃=léi',
- '瓄=dú',
- '瓅=lì',
- '瓆=zhì',
- '瓇=róu',
- '瓈=lí',
- '瓉=zàn',
- '瓊=qióng',
- '瓋=tì',
- '瓌=guī',
- '瓍=suí',
- '瓎=là',
- '瓏=lóng',
- '瓐=lú',
- '瓑=lì',
- '瓒=zàn',
- '瓓=làn',
- '瓔=yīng',
- '瓕=mí,xǐ',
- '瓖=xiāng',
- '瓗=qióng,wěi,wèi',
- '瓘=guàn',
- '瓙=dào',
- '瓚=zàn',
- '瓛=huán,yè,yà',
- '瓜=guā',
- '瓝=bó',
- '瓞=dié',
- '瓟=bó,páo',
- '瓠=hù',
- '瓡=zhí,hú',
- '瓢=piáo',
- '瓣=bàn',
- '瓤=ráng',
- '瓥=lì',
- '瓦=wǎ,wà',
- '瓧=null',
- '瓨=xiáng,hóng',
- '瓩=null',
- '瓪=bǎn',
- '瓫=pén',
- '瓬=fǎng',
- '瓭=dǎn',
- '瓮=wèng',
- '瓯=ōu',
- '瓰=null',
- '瓱=null',
- '瓲=null',
- '瓳=hú',
- '瓴=líng',
- '瓵=yí',
- '瓶=píng',
- '瓷=cí',
- '瓸=bǎi,wǎ',
- '瓹=juàn,juān',
- '瓺=cháng',
- '瓻=chī',
- '瓼=null',
- '瓽=dàng',
- '瓾=wā',
- '瓿=bù',
- '甀=zhuì',
- '甁=píng',
- '甂=biān',
- '甃=zhòu',
- '甄=zhēn',
- '甅=null',
- '甆=cí',
- '甇=yīng',
- '甈=qì',
- '甉=xián',
- '甊=lǒu',
- '甋=dì',
- '甌=ōu',
- '甍=méng',
- '甎=zhuān',
- '甏=bèng',
- '甐=lìn',
- '甑=zèng',
- '甒=wǔ',
- '甓=pì',
- '甔=dān',
- '甕=wèng',
- '甖=yīng',
- '甗=yǎn',
- '甘=gān',
- '甙=dài',
- '甚=shèn,shén',
- '甛=tián',
- '甜=tián',
- '甝=hán',
- '甞=cháng',
- '生=shēng',
- '甠=qíng',
- '甡=shēn',
- '產=chǎn',
- '産=chǎn',
- '甤=ruí',
- '甥=shēng',
- '甦=sū',
- '甧=shēn',
- '用=yòng',
- '甩=shuǎi',
- '甪=lù',
- '甫=fǔ',
- '甬=yǒng',
- '甭=béng',
- '甮=béng',
- '甯=níng,nìng',
- '田=tián',
- '由=yóu',
- '甲=jiǎ',
- '申=shēn',
- '甴=yóu,zhá',
- '电=diàn',
- '甶=fú',
- '男=nán',
- '甸=diàn,tián,shèng',
- '甹=pīng',
- '町=tǐng,dīng',
- '画=huà',
- '甼=tǐng,dīng',
- '甽=zhèn',
- '甾=zāi,zī',
- '甿=méng',
- '畀=bì',
- '畁=bì,qí',
- '畂=mǔ',
- '畃=xún',
- '畄=liú',
- '畅=chàng',
- '畆=mǔ',
- '畇=yún',
- '畈=fàn',
- '畉=fú',
- '畊=gēng',
- '畋=tián',
- '界=jiè',
- '畍=jiè',
- '畎=quǎn',
- '畏=wèi',
- '畐=fú,bì',
- '畑=tián',
- '畒=mǔ',
- '畓=duō',
- '畔=pàn',
- '畕=jiāng',
- '畖=wā',
- '畗=dá,fú',
- '畘=nán',
- '留=liú',
- '畚=běn',
- '畛=zhěn',
- '畜=chù,xù',
- '畝=mǔ',
- '畞=mǔ',
- '畟=cè,jì',
- '畠=zāi,zī',
- '畡=gāi',
- '畢=bì',
- '畣=dá',
- '畤=zhì,chóu,shì',
- '略=lüè',
- '畦=qí',
- '畧=lüè',
- '畨=fān,pān',
- '畩=yī',
- '番=fān,pān',
- '畫=huà',
- '畬=shē,yú',
- '畭=shē',
- '畮=mǔ',
- '畯=jùn',
- '異=yì',
- '畱=liú',
- '畲=shē',
- '畳=dié',
- '畴=chóu',
- '畵=huà',
- '當=dāng,dàng,dǎng',
- '畷=zhuì',
- '畸=jī',
- '畹=wǎn',
- '畺=jiāng,jiàng',
- '畻=chéng',
- '畼=chàng',
- '畽=tuǎn',
- '畾=léi',
- '畿=jī',
- '疀=chā',
- '疁=liú',
- '疂=dié',
- '疃=tuǎn',
- '疄=lín,lìn',
- '疅=jiāng',
- '疆=jiāng,qiáng',
- '疇=chóu',
- '疈=pì',
- '疉=dié',
- '疊=dié',
- '疋=pǐ,yǎ,shū',
- '疌=jié,qiè',
- '疍=dàn',
- '疎=shū',
- '疏=shū',
- '疐=zhì,dì',
- '疑=yí,nǐ',
- '疒=nè',
- '疓=nǎi',
- '疔=dīng',
- '疕=bǐ',
- '疖=jiē',
- '疗=liáo',
- '疘=gāng',
- '疙=gē,yì',
- '疚=jiù',
- '疛=zhǒu',
- '疜=xià',
- '疝=shàn',
- '疞=xū',
- '疟=nüè,yào',
- '疠=lì,lài',
- '疡=yáng',
- '疢=chèn',
- '疣=yóu',
- '疤=bā',
- '疥=jiè',
- '疦=jué,xuè',
- '疧=qí',
- '疨=yǎ,xiā',
- '疩=cuì',
- '疪=bì',
- '疫=yì',
- '疬=lì',
- '疭=zòng',
- '疮=chuāng',
- '疯=fēng',
- '疰=zhù',
- '疱=pào',
- '疲=pí',
- '疳=gān',
- '疴=kē',
- '疵=cī',
- '疶=xuē',
- '疷=zhī',
- '疸=dǎn',
- '疹=zhěn',
- '疺=fá,biǎn',
- '疻=zhǐ',
- '疼=téng',
- '疽=jū',
- '疾=jí',
- '疿=fèi,féi',
- '痀=gōu',
- '痁=shān,diàn',
- '痂=jiā',
- '痃=xuán',
- '痄=zhà',
- '病=bìng',
- '痆=niè',
- '症=zhèng,zhēng',
- '痈=yōng',
- '痉=jìng',
- '痊=quán',
- '痋=téng,chóng',
- '痌=tōng,tóng',
- '痍=yí',
- '痎=jiē',
- '痏=wěi,yòu,yù',
- '痐=huí',
- '痑=tān,shǐ',
- '痒=yǎng',
- '痓=zhì',
- '痔=zhì',
- '痕=hén',
- '痖=yǎ',
- '痗=mèi',
- '痘=dòu',
- '痙=jìng',
- '痚=xiāo',
- '痛=tòng',
- '痜=tū',
- '痝=máng',
- '痞=pǐ',
- '痟=xiāo',
- '痠=suān',
- '痡=pū,pù',
- '痢=lì',
- '痣=zhì',
- '痤=cuó',
- '痥=duó',
- '痦=wù',
- '痧=shā',
- '痨=láo',
- '痩=shòu',
- '痪=huàn',
- '痫=xián',
- '痬=yì',
- '痭=bēng,péng',
- '痮=zhàng',
- '痯=guǎn',
- '痰=tán',
- '痱=fèi,féi',
- '痲=má',
- '痳=má,lìn',
- '痴=chī',
- '痵=jì',
- '痶=tiǎn,diàn',
- '痷=ān,yè,è',
- '痸=chì',
- '痹=bì',
- '痺=bì',
- '痻=mín',
- '痼=gù',
- '痽=duī',
- '痾=kē,ē',
- '痿=wěi',
- '瘀=yū',
- '瘁=cuì',
- '瘂=yǎ',
- '瘃=zhú',
- '瘄=cù',
- '瘅=dàn,dān',
- '瘆=shèn',
- '瘇=zhǒng',
- '瘈=zhì,chì',
- '瘉=yù',
- '瘊=hóu',
- '瘋=fēng',
- '瘌=là',
- '瘍=yáng',
- '瘎=chén',
- '瘏=tú',
- '瘐=yǔ',
- '瘑=guō',
- '瘒=wén',
- '瘓=huàn',
- '瘔=kù',
- '瘕=jiǎ,xiá,xiā',
- '瘖=yīn',
- '瘗=yì',
- '瘘=lòu',
- '瘙=sào',
- '瘚=jué',
- '瘛=chì',
- '瘜=xī',
- '瘝=guān',
- '瘞=yì',
- '瘟=wēn',
- '瘠=jí',
- '瘡=chuāng',
- '瘢=bān',
- '瘣=huì,lěi',
- '瘤=liú',
- '瘥=chài,cuó',
- '瘦=shòu',
- '瘧=nüè,yào',
- '瘨=diān,chēn',
- '瘩=dá,da',
- '瘪=biē,biě',
- '瘫=tān',
- '瘬=zhàng',
- '瘭=biāo',
- '瘮=shèn',
- '瘯=cù',
- '瘰=luǒ',
- '瘱=yì',
- '瘲=zòng',
- '瘳=chōu',
- '瘴=zhàng',
- '瘵=zhài',
- '瘶=sòu',
- '瘷=sè',
- '瘸=qué',
- '瘹=diào',
- '瘺=lòu',
- '瘻=lòu',
- '瘼=mò',
- '瘽=qín',
- '瘾=yǐn',
- '瘿=yǐng',
- '癀=huáng',
- '癁=fú',
- '療=liáo',
- '癃=lóng',
- '癄=qiáo,jiào',
- '癅=liú',
- '癆=láo',
- '癇=xián',
- '癈=fèi',
- '癉=dàn,dān',
- '癊=yìn',
- '癋=hè',
- '癌=ái',
- '癍=bān',
- '癎=xián',
- '癏=guān',
- '癐=guì,wēi',
- '癑=nòng,nóng',
- '癒=yù',
- '癓=wēi',
- '癔=yì',
- '癕=yōng',
- '癖=pǐ',
- '癗=lěi',
- '癘=lì,lài',
- '癙=shǔ',
- '癚=dàn',
- '癛=lǐn',
- '癜=diàn',
- '癝=lǐn',
- '癞=lài',
- '癟=biē,biě',
- '癠=jì',
- '癡=chī',
- '癢=yǎng',
- '癣=xuǎn',
- '癤=jiē',
- '癥=zhēng',
- '癦=mèng',
- '癧=lì',
- '癨=huò',
- '癩=lài',
- '癪=jī',
- '癫=diān',
- '癬=xuǎn',
- '癭=yǐng',
- '癮=yǐn',
- '癯=qú',
- '癰=yōng',
- '癱=tān',
- '癲=diān',
- '癳=luǒ',
- '癴=luán',
- '癵=luán',
- '癶=bō',
- '癷=bō,bǒ',
- '癸=guǐ',
- '癹=bá',
- '発=fā',
- '登=dēng',
- '發=fā',
- '白=bái',
- '百=bǎi',
- '癿=qié',
- '皀=jí,bī',
- '皁=zào',
- '皂=zào',
- '皃=mào',
- '的=de,dí,dì',
- '皅=pā,bà',
- '皆=jiē',
- '皇=huáng',
- '皈=guī',
- '皉=cǐ',
- '皊=líng',
- '皋=gāo,háo',
- '皌=mò',
- '皍=jí',
- '皎=jiǎo',
- '皏=pěng',
- '皐=gāo,yáo',
- '皑=ái',
- '皒=é',
- '皓=hào',
- '皔=hàn',
- '皕=bì',
- '皖=wǎn',
- '皗=chóu',
- '皘=qiàn',
- '皙=xī',
- '皚=ái',
- '皛=xiǎo',
- '皜=hào',
- '皝=huàng',
- '皞=hào',
- '皟=zé',
- '皠=cuǐ',
- '皡=hào',
- '皢=xiǎo',
- '皣=yè',
- '皤=pó',
- '皥=hào',
- '皦=jiǎo',
- '皧=ài',
- '皨=xīng',
- '皩=huàng',
- '皪=lì,luò,bō',
- '皫=piǎo',
- '皬=hé',
- '皭=jiào',
- '皮=pí',
- '皯=gǎn',
- '皰=pào',
- '皱=zhòu',
- '皲=jūn',
- '皳=qiú',
- '皴=cūn',
- '皵=què',
- '皶=zhā',
- '皷=gǔ',
- '皸=jūn',
- '皹=jūn',
- '皺=zhòu',
- '皻=zhā,cǔ',
- '皼=gǔ',
- '皽=zhāo,zhǎn,dǎn',
- '皾=dú',
- '皿=mǐn',
- '盀=qǐ',
- '盁=yíng',
- '盂=yú',
- '盃=bēi',
- '盄=diào',
- '盅=zhōng',
- '盆=pén',
- '盇=hé',
- '盈=yíng',
- '盉=hé',
- '益=yì',
- '盋=bō',
- '盌=wǎn',
- '盍=hé',
- '盎=àng',
- '盏=zhǎn',
- '盐=yán',
- '监=jiān,jiàn',
- '盒=hé',
- '盓=yū',
- '盔=kuī',
- '盕=fàn',
- '盖=gài,gě,hé',
- '盗=dào',
- '盘=pán',
- '盙=fǔ',
- '盚=qiú',
- '盛=shèng,chéng',
- '盜=dào',
- '盝=lù',
- '盞=zhǎn',
- '盟=méng',
- '盠=lí',
- '盡=jìn',
- '盢=xù',
- '監=jiān,jiàn',
- '盤=pán',
- '盥=guàn',
- '盦=ān',
- '盧=lú',
- '盨=xǔ',
- '盩=zhōu,chóu',
- '盪=dàng',
- '盫=ān',
- '盬=gǔ',
- '盭=lì',
- '目=mù',
- '盯=dīng',
- '盰=gàn',
- '盱=xū',
- '盲=máng',
- '盳=máng,wàng',
- '直=zhí',
- '盵=qì',
- '盶=yuǎn',
- '盷=xián,tián',
- '相=xiāng,xiàng',
- '盹=dǔn',
- '盺=xīn',
- '盻=xì,pǎn',
- '盼=pàn',
- '盽=fēng',
- '盾=dùn',
- '盿=mín',
- '眀=míng',
- '省=shěng,xǐng',
- '眂=shì',
- '眃=yún,hùn',
- '眄=miǎn',
- '眅=pān',
- '眆=fǎng',
- '眇=miǎo',
- '眈=dān',
- '眉=méi',
- '眊=mào',
- '看=kàn,kān',
- '県=xiàn',
- '眍=kōu',
- '眎=shì',
- '眏=yāng,yǎng,yìng',
- '眐=zhēng',
- '眑=yǎo,āo,ǎo',
- '眒=shēn',
- '眓=huò',
- '眔=dà',
- '眕=zhěn',
- '眖=kuàng',
- '眗=jū,xū,kōu',
- '眘=shèn',
- '眙=yí,chì',
- '眚=shěng',
- '眛=mèi',
- '眜=mò,miè',
- '眝=zhù',
- '眞=zhēn',
- '真=zhēn',
- '眠=mián',
- '眡=shì',
- '眢=yuān',
- '眣=dié,tì',
- '眤=nì',
- '眥=zì',
- '眦=zì',
- '眧=chǎo',
- '眨=zhǎ',
- '眩=xuàn',
- '眪=bǐng,fǎng',
- '眫=pàng,pán',
- '眬=lóng',
- '眭=guì,suī',
- '眮=tóng',
- '眯=mī,mí',
- '眰=dié,zhì',
- '眱=dì',
- '眲=nè',
- '眳=míng',
- '眴=xuàn,shùn,xún',
- '眵=chī',
- '眶=kuàng',
- '眷=juàn',
- '眸=móu',
- '眹=zhèn',
- '眺=tiào',
- '眻=yáng',
- '眼=yǎn',
- '眽=mò',
- '眾=zhòng',
- '眿=mò',
- '着=zhuó,zháo,zhāo,zhe',
- '睁=zhēng',
- '睂=méi',
- '睃=suō',
- '睄=qiáo,shào,xiāo',
- '睅=hàn',
- '睆=huǎn',
- '睇=dì',
- '睈=chěng',
- '睉=cuó,zhuài',
- '睊=juàn',
- '睋=é',
- '睌=miǎn',
- '睍=xiàn',
- '睎=xī',
- '睏=kùn',
- '睐=lài',
- '睑=jiǎn',
- '睒=shǎn',
- '睓=tiǎn',
- '睔=gùn',
- '睕=wān',
- '睖=lèng',
- '睗=shì',
- '睘=qióng',
- '睙=lì',
- '睚=yá',
- '睛=jīng',
- '睜=zhēng',
- '睝=lí',
- '睞=lài',
- '睟=suì,zuì',
- '睠=juàn',
- '睡=shuì',
- '睢=huī,suī',
- '督=dū',
- '睤=bì',
- '睥=bì,pì',
- '睦=mù',
- '睧=hūn',
- '睨=nì',
- '睩=lù',
- '睪=yì,zé,gāo',
- '睫=jié',
- '睬=cǎi',
- '睭=zhǒu',
- '睮=yú',
- '睯=hūn',
- '睰=mà',
- '睱=xià',
- '睲=xǐng,xìng',
- '睳=huī',
- '睴=hùn',
- '睵=zāi',
- '睶=chǔn',
- '睷=jiān',
- '睸=mèi',
- '睹=dǔ',
- '睺=hóu',
- '睻=xuān',
- '睼=tí',
- '睽=kuí',
- '睾=gāo',
- '睿=ruì',
- '瞀=mào',
- '瞁=xù',
- '瞂=fá',
- '瞃=wò',
- '瞄=miáo',
- '瞅=chǒu',
- '瞆=guì,wèi,kuì',
- '瞇=mī,mí',
- '瞈=wěng',
- '瞉=kòu,jì',
- '瞊=dàng',
- '瞋=chēn',
- '瞌=kē',
- '瞍=sǒu',
- '瞎=xiā',
- '瞏=qióng,huán',
- '瞐=mò',
- '瞑=míng',
- '瞒=mán,mén',
- '瞓=fèn',
- '瞔=zé',
- '瞕=zhàng',
- '瞖=yì',
- '瞗=diāo,dōu',
- '瞘=kōu',
- '瞙=mò',
- '瞚=shùn',
- '瞛=cōng',
- '瞜=lóu,lǘ,lou',
- '瞝=chī',
- '瞞=mán,mén',
- '瞟=piǎo',
- '瞠=chēng',
- '瞡=guī',
- '瞢=méng,měng',
- '瞣=wàn',
- '瞤=rún,shùn',
- '瞥=piē',
- '瞦=xī',
- '瞧=qiáo',
- '瞨=pú',
- '瞩=zhǔ',
- '瞪=dèng',
- '瞫=shěn',
- '瞬=shùn',
- '瞭=liǎo,liào',
- '瞮=chè',
- '瞯=xián,jiàn',
- '瞰=kàn',
- '瞱=yè',
- '瞲=xuè',
- '瞳=tóng',
- '瞴=wǔ,mí',
- '瞵=lín',
- '瞶=guì,kuì',
- '瞷=jiàn',
- '瞸=yè',
- '瞹=ài',
- '瞺=huì',
- '瞻=zhān',
- '瞼=jiǎn',
- '瞽=gǔ',
- '瞾=zhào',
- '瞿=qú,jù',
- '矀=wéi',
- '矁=chǒu',
- '矂=sào',
- '矃=nǐng,chēng',
- '矄=xūn',
- '矅=yào',
- '矆=huò,yuè',
- '矇=mēng',
- '矈=mián',
- '矉=pín',
- '矊=mián',
- '矋=lěi',
- '矌=kuàng,guō',
- '矍=jué',
- '矎=xuān',
- '矏=mián',
- '矐=huò',
- '矑=lú',
- '矒=méng,měng',
- '矓=lóng',
- '矔=guàn,quán',
- '矕=mǎn,mán',
- '矖=xǐ',
- '矗=chù',
- '矘=tǎng',
- '矙=kàn',
- '矚=zhǔ',
- '矛=máo',
- '矜=jīn,qín,guān',
- '矝=jīn,qín,guān',
- '矞=yù,xù,jué',
- '矟=shuò',
- '矠=zé',
- '矡=jué',
- '矢=shǐ',
- '矣=yǐ',
- '矤=shěn',
- '知=zhī,zhì',
- '矦=hóu,hòu',
- '矧=shěn',
- '矨=yǐng',
- '矩=jǔ',
- '矪=zhōu',
- '矫=jiǎo,jiáo',
- '矬=cuó',
- '短=duǎn',
- '矮=ǎi',
- '矯=jiǎo,jiáo',
- '矰=zēng',
- '矱=yuē',
- '矲=bà',
- '石=shí,dàn',
- '矴=dìng',
- '矵=qì',
- '矶=jī',
- '矷=zǐ',
- '矸=gān',
- '矹=wù',
- '矺=zhé',
- '矻=kū',
- '矼=gāng,qiāng,kòng',
- '矽=xī',
- '矾=fán',
- '矿=kuàng',
- '砀=dàng',
- '码=mǎ',
- '砂=shā',
- '砃=dān',
- '砄=jué',
- '砅=lì',
- '砆=fū',
- '砇=mín',
- '砈=è',
- '砉=xū,huā',
- '砊=kāng',
- '砋=zhǐ',
- '砌=qì,qiè',
- '砍=kǎn',
- '砎=jiè',
- '砏=pīn,bīn,fēn',
- '砐=è',
- '砑=yà',
- '砒=pī',
- '砓=zhé',
- '研=yán,yàn',
- '砕=suì',
- '砖=zhuān',
- '砗=chē',
- '砘=dùn',
- '砙=wǎ',
- '砚=yàn',
- '砛=jīn',
- '砜=fēng',
- '砝=fǎ',
- '砞=mò',
- '砟=zhǎ',
- '砠=jū',
- '砡=yù',
- '砢=kē,luǒ',
- '砣=tuó',
- '砤=tuó',
- '砥=dǐ',
- '砦=zhài',
- '砧=zhēn',
- '砨=ě',
- '砩=fú,fèi',
- '砪=mǔ',
- '砫=zhù,zhǔ',
- '砬=lì,lā,lá',
- '砭=biān',
- '砮=nǔ',
- '砯=pīng',
- '砰=pēng',
- '砱=líng',
- '砲=pào',
- '砳=lè',
- '破=pò',
- '砵=bō',
- '砶=pò',
- '砷=shēn',
- '砸=zá',
- '砹=ài',
- '砺=lì',
- '砻=lóng',
- '砼=tóng',
- '砽=yòng',
- '砾=lì',
- '砿=kuàng',
- '础=chǔ',
- '硁=kēng',
- '硂=quán',
- '硃=zhū',
- '硄=kuāng,guāng',
- '硅=guī',
- '硆=è',
- '硇=náo',
- '硈=qià',
- '硉=lù',
- '硊=wěi,guì',
- '硋=ài',
- '硌=luò,gè',
- '硍=kèn,xiàn,gǔn,yǐn',
- '硎=xíng',
- '硏=yán,yàn',
- '硐=dòng',
- '硑=pēng,píng',
- '硒=xī',
- '硓=lǎo',
- '硔=hóng',
- '硕=shuò,shí',
- '硖=xiá',
- '硗=qiāo',
- '硘=qíng',
- '硙=wéi,wèi',
- '硚=qiáo',
- '硛=null',
- '硜=kēng',
- '硝=xiāo',
- '硞=què,kè,kù',
- '硟=chàn',
- '硠=láng',
- '硡=hōng',
- '硢=yù',
- '硣=xiāo',
- '硤=xiá',
- '硥=mǎng,bàng',
- '硦=luò,lòng',
- '硧=yǒng,tóng',
- '硨=chē',
- '硩=chè',
- '硪=wò',
- '硫=liú',
- '硬=yìng',
- '硭=máng',
- '确=què',
- '硯=yàn',
- '硰=shā',
- '硱=kǔn',
- '硲=yù',
- '硳=null',
- '硴=huā',
- '硵=lǔ',
- '硶=chěn',
- '硷=jiǎn',
- '硸=nüè',
- '硹=sōng',
- '硺=zhuó',
- '硻=kēng,kěng',
- '硼=péng',
- '硽=yān,yǎn',
- '硾=zhuì,chuí,duǒ',
- '硿=kōng',
- '碀=chēng',
- '碁=qí',
- '碂=zòng,cóng',
- '碃=qìng',
- '碄=lín',
- '碅=jūn',
- '碆=bō',
- '碇=dìng',
- '碈=mín',
- '碉=diāo',
- '碊=jiān,zhàn',
- '碋=hè',
- '碌=lù,liù',
- '碍=ài',
- '碎=suì',
- '碏=què,xī',
- '碐=léng',
- '碑=bēi',
- '碒=yín',
- '碓=duì',
- '碔=wǔ',
- '碕=qí',
- '碖=lún,lǔn,lùn',
- '碗=wǎn',
- '碘=diǎn',
- '碙=náo,gāng',
- '碚=bèi',
- '碛=qì',
- '碜=chěn',
- '碝=ruǎn',
- '碞=yán',
- '碟=dié',
- '碠=dìng',
- '碡=zhóu',
- '碢=tuó',
- '碣=jié,yà',
- '碤=yīng',
- '碥=biǎn',
- '碦=kè',
- '碧=bì',
- '碨=wěi,wèi',
- '碩=shuò,shí',
- '碪=zhēn',
- '碫=duàn',
- '碬=xiá',
- '碭=dàng',
- '碮=tí,dī',
- '碯=nǎo',
- '碰=pèng',
- '碱=jiǎn',
- '碲=dì',
- '碳=tàn',
- '碴=chá,chā',
- '碵=tián',
- '碶=qì',
- '碷=dùn',
- '碸=fēng',
- '碹=xuàn',
- '確=què',
- '碻=què,qiāo',
- '碼=mǎ',
- '碽=gōng',
- '碾=niǎn',
- '碿=sù,xiè',
- '磀=é',
- '磁=cí',
- '磂=liú,liù',
- '磃=sī,tí',
- '磄=táng',
- '磅=bàng,páng',
- '磆=huá,kě,gū',
- '磇=pī',
- '磈=kuǐ,wěi',
- '磉=sǎng',
- '磊=lěi',
- '磋=cuō',
- '磌=tián',
- '磍=xiá,qià,yà',
- '磎=xī',
- '磏=lián,qiān',
- '磐=pán',
- '磑=ái,wèi',
- '磒=yǔn',
- '磓=duī',
- '磔=zhé',
- '磕=kē',
- '磖=lá,lā',
- '磗=zhuān',
- '磘=yáo',
- '磙=gǔn',
- '磚=zhuān',
- '磛=chán',
- '磜=qì',
- '磝=áo,qiāo',
- '磞=pēng,pèng',
- '磟=liù',
- '磠=lǔ',
- '磡=kàn',
- '磢=chuǎng',
- '磣=chěn',
- '磤=yīn,yǐn',
- '磥=lěi,léi',
- '磦=biāo',
- '磧=qì',
- '磨=mó,mò',
- '磩=qì,zhú',
- '磪=cuī',
- '磫=zōng',
- '磬=qìng',
- '磭=chuò',
- '磮=lún',
- '磯=jī',
- '磰=shàn',
- '磱=láo,luò',
- '磲=qú',
- '磳=zēng',
- '磴=dèng',
- '磵=jiàn',
- '磶=xì',
- '磷=lín',
- '磸=dìng',
- '磹=diàn',
- '磺=huáng',
- '磻=pán,bō',
- '磼=jí,shé',
- '磽=qiāo',
- '磾=dī',
- '磿=lì',
- '礀=jiàn',
- '礁=jiāo',
- '礂=xī',
- '礃=zhǎng',
- '礄=qiáo',
- '礅=dūn',
- '礆=jiǎn',
- '礇=yù',
- '礈=zhuì',
- '礉=hé,qiāo,qiào',
- '礊=kè,huò',
- '礋=zé',
- '礌=léi,lěi',
- '礍=jié',
- '礎=chǔ',
- '礏=yè',
- '礐=què,hú',
- '礑=dàng',
- '礒=yǐ',
- '礓=jiāng',
- '礔=pī',
- '礕=pī',
- '礖=yù',
- '礗=pīn',
- '礘=è,qì',
- '礙=ài',
- '礚=kē',
- '礛=jiān',
- '礜=yù',
- '礝=ruǎn',
- '礞=méng',
- '礟=pào',
- '礠=cí',
- '礡=bō',
- '礢=yǎng',
- '礣=miè',
- '礤=cǎ',
- '礥=xián,xín',
- '礦=kuàng',
- '礧=léi,lěi,lèi',
- '礨=lěi',
- '礩=zhì',
- '礪=lì',
- '礫=lì',
- '礬=fán',
- '礭=què',
- '礮=pào',
- '礯=yīng',
- '礰=lì',
- '礱=lóng',
- '礲=lóng',
- '礳=mò',
- '礴=bó',
- '礵=shuāng',
- '礶=guàn',
- '礷=jiān',
- '礸=cǎ',
- '礹=yán,yǎn',
- '示=shì',
- '礻=shì',
- '礼=lǐ',
- '礽=réng',
- '社=shè',
- '礿=yuè',
- '祀=sì',
- '祁=qí',
- '祂=tā',
- '祃=mà',
- '祄=xiè',
- '祅=yāo',
- '祆=xiān',
- '祇=zhǐ,qí',
- '祈=qí',
- '祉=zhǐ',
- '祊=bēng,fāng',
- '祋=duì',
- '祌=zhòng',
- '祍=rèn',
- '祎=yī',
- '祏=shí',
- '祐=yòu',
- '祑=zhì',
- '祒=tiáo',
- '祓=fú',
- '祔=fù',
- '祕=mì,bì',
- '祖=zǔ',
- '祗=zhī',
- '祘=suàn',
- '祙=mèi',
- '祚=zuò',
- '祛=qū',
- '祜=hù',
- '祝=zhù',
- '神=shén',
- '祟=suì',
- '祠=cí',
- '祡=chái',
- '祢=mí',
- '祣=lǚ',
- '祤=yǔ',
- '祥=xiáng',
- '祦=wú',
- '祧=tiāo',
- '票=piào,piāo',
- '祩=zhù',
- '祪=guǐ',
- '祫=xiá',
- '祬=zhī',
- '祭=jì,zhài',
- '祮=gào',
- '祯=zhēn',
- '祰=gào',
- '祱=shuì,lèi',
- '祲=jìn',
- '祳=shèn',
- '祴=gāi',
- '祵=kǔn',
- '祶=dì',
- '祷=dǎo',
- '祸=huò',
- '祹=táo',
- '祺=qí',
- '祻=gù',
- '祼=guàn',
- '祽=zuì',
- '祾=líng',
- '祿=lù',
- '禀=bǐng',
- '禁=jīn,jìn',
- '禂=dǎo',
- '禃=zhí',
- '禄=lù',
- '禅=chán,shàn',
- '禆=bì,pí',
- '禇=chǔ',
- '禈=huī',
- '禉=yǒu',
- '禊=xì',
- '禋=yīn',
- '禌=zī',
- '禍=huò',
- '禎=zhēn',
- '福=fú',
- '禐=yuàn',
- '禑=xú',
- '禒=xiǎn',
- '禓=shāng,yáng',
- '禔=tí,zhǐ',
- '禕=yī',
- '禖=méi',
- '禗=sī',
- '禘=dì',
- '禙=bèi',
- '禚=zhuó',
- '禛=zhēn',
- '禜=yíng',
- '禝=jì',
- '禞=gào',
- '禟=táng',
- '禠=sī',
- '禡=mà',
- '禢=tà',
- '禣=fù',
- '禤=xuān',
- '禥=qí',
- '禦=yù',
- '禧=xǐ',
- '禨=jī,jì',
- '禩=sì',
- '禪=shàn,chán',
- '禫=dàn',
- '禬=guì',
- '禭=suì',
- '禮=lǐ',
- '禯=nóng',
- '禰=mí',
- '禱=dǎo',
- '禲=lì',
- '禳=ráng',
- '禴=yuè',
- '禵=tí',
- '禶=zàn',
- '禷=lèi',
- '禸=róu',
- '禹=yǔ',
- '禺=yú,yù,ǒu',
- '离=lí',
- '禼=xiè',
- '禽=qín',
- '禾=hé',
- '禿=tū',
- '秀=xiù',
- '私=sī',
- '秂=rén',
- '秃=tū',
- '秄=zǐ,zì',
- '秅=chá,ná',
- '秆=gǎn',
- '秇=yì,zhí',
- '秈=xiān',
- '秉=bǐng',
- '秊=nián',
- '秋=qiū',
- '秌=qiū',
- '种=zhǒng,zhòng,chóng',
- '秎=fèn',
- '秏=hào,mào',
- '秐=yún',
- '科=kē',
- '秒=miǎo',
- '秓=zhī',
- '秔=jīng',
- '秕=bǐ',
- '秖=zhǐ',
- '秗=yù',
- '秘=mì,bì',
- '秙=kù,kū',
- '秚=bàn',
- '秛=pī',
- '秜=ní,nì',
- '秝=lì',
- '秞=yóu',
- '租=zū',
- '秠=pī',
- '秡=bó',
- '秢=líng',
- '秣=mò',
- '秤=chèng',
- '秥=nián',
- '秦=qín',
- '秧=yāng',
- '秨=zuó',
- '秩=zhì',
- '秪=dī',
- '秫=shú',
- '秬=jù',
- '秭=zǐ',
- '秮=huó,kuò',
- '积=jī',
- '称=chēng,chèn,chèng',
- '秱=tóng',
- '秲=shì,zhì',
- '秳=huó,kuò',
- '秴=huō',
- '秵=yīn',
- '秶=zī',
- '秷=zhì',
- '秸=jiē',
- '秹=rěn',
- '秺=dù',
- '移=yí',
- '秼=zhū',
- '秽=huì',
- '秾=nóng',
- '秿=fù,pū',
- '稀=xī',
- '稁=gǎo',
- '稂=láng',
- '稃=fū',
- '稄=xùn,zè',
- '稅=shuì',
- '稆=lǚ',
- '稇=kǔn',
- '稈=gǎn',
- '稉=jīng',
- '稊=tí',
- '程=chéng',
- '稌=tú,shǔ',
- '稍=shāo,shào',
- '税=shuì',
- '稏=yà',
- '稐=lǔn',
- '稑=lù',
- '稒=gū',
- '稓=zuó',
- '稔=rěn',
- '稕=zhùn,zhǔn',
- '稖=bàng',
- '稗=bài',
- '稘=jī,qí',
- '稙=zhī',
- '稚=zhì',
- '稛=kǔn',
- '稜=léng,lēng,líng',
- '稝=péng',
- '稞=kē',
- '稟=bǐng',
- '稠=chóu',
- '稡=zuì,zú,sū',
- '稢=yù',
- '稣=sū',
- '稤=lüè',
- '稥=xiāng',
- '稦=yī',
- '稧=xì,qiè',
- '稨=biǎn',
- '稩=jì',
- '稪=fú',
- '稫=pì,bì',
- '稬=nuò',
- '稭=jiē',
- '種=zhǒng,zhòng',
- '稯=zōng,zǒng',
- '稰=xǔ,xū',
- '稱=chēng,chèn,chèng',
- '稲=dào',
- '稳=wěn',
- '稴=xián,jiān,liàn',
- '稵=zī,jiū',
- '稶=yù',
- '稷=jì',
- '稸=xù',
- '稹=zhěn',
- '稺=zhì',
- '稻=dào',
- '稼=jià',
- '稽=jī,qǐ',
- '稾=gǎo',
- '稿=gǎo',
- '穀=gǔ',
- '穁=róng',
- '穂=suì',
- '穃=ròng',
- '穄=jì',
- '穅=kāng',
- '穆=mù',
- '穇=cǎn,shān,cēn',
- '穈=mén,méi',
- '穉=zhì',
- '穊=jì',
- '穋=lù',
- '穌=sū',
- '積=jī',
- '穎=yǐng',
- '穏=wěn',
- '穐=qiū',
- '穑=sè',
- '穒=null',
- '穓=yì',
- '穔=huáng',
- '穕=qiè',
- '穖=jǐ,jì',
- '穗=suì',
- '穘=xiāo,rào',
- '穙=pú',
- '穚=jiāo',
- '穛=zhuō,bó',
- '穜=tóng,zhǒng',
- '穝=zuō',
- '穞=lǔ',
- '穟=suì',
- '穠=nóng',
- '穡=sè',
- '穢=huì',
- '穣=ráng',
- '穤=nuò',
- '穥=yǔ',
- '穦=pīn',
- '穧=jì',
- '穨=tuí',
- '穩=wěn',
- '穪=chēng,chèn,chèng',
- '穫=huò',
- '穬=kuàng',
- '穭=lǚ',
- '穮=biāo,pāo',
- '穯=sè',
- '穰=ráng',
- '穱=zhuō,jué',
- '穲=lí',
- '穳=cuán,zàn',
- '穴=xué',
- '穵=wā',
- '究=jiū',
- '穷=qióng',
- '穸=xī',
- '穹=qióng',
- '空=kōng,kòng,kǒng',
- '穻=yū,yǔ',
- '穼=shēn',
- '穽=jǐng',
- '穾=yào',
- '穿=chuān',
- '窀=zhūn',
- '突=tū',
- '窂=láo',
- '窃=qiè',
- '窄=zhǎi',
- '窅=yǎo',
- '窆=biǎn',
- '窇=báo',
- '窈=yǎo',
- '窉=bìng',
- '窊=wā',
- '窋=zhú,kū',
- '窌=jiào,liáo,liù',
- '窍=qiào',
- '窎=diào',
- '窏=wū',
- '窐=wā,guī',
- '窑=yáo',
- '窒=zhì',
- '窓=chuāng',
- '窔=yào',
- '窕=tiǎo,yáo',
- '窖=jiào',
- '窗=chuāng',
- '窘=jiǒng',
- '窙=xiāo',
- '窚=chéng',
- '窛=kòu',
- '窜=cuàn',
- '窝=wō',
- '窞=dàn',
- '窟=kū',
- '窠=kē',
- '窡=zhuó',
- '窢=huò',
- '窣=sū',
- '窤=guān',
- '窥=kuī',
- '窦=dòu',
- '窧=zhuō',
- '窨=yìn,xūn',
- '窩=wō',
- '窪=wā',
- '窫=yà,yē',
- '窬=yú',
- '窭=jù',
- '窮=qióng',
- '窯=yáo',
- '窰=yáo',
- '窱=tiǎo',
- '窲=cháo',
- '窳=yǔ',
- '窴=tián,diān,yǎn',
- '窵=diào',
- '窶=jù',
- '窷=liào',
- '窸=xī',
- '窹=wù',
- '窺=kuī',
- '窻=chuāng',
- '窼=chāo,kē',
- '窽=kuǎn,cuàn',
- '窾=kuǎn,cuàn',
- '窿=lóng',
- '竀=chēng,chèng',
- '竁=cuì',
- '竂=liáo',
- '竃=zào',
- '竄=cuàn',
- '竅=qiào',
- '竆=qióng',
- '竇=dòu',
- '竈=zào',
- '竉=lǒng',
- '竊=qiè',
- '立=lì',
- '竌=chù',
- '竍=shí',
- '竎=fù',
- '竏=qiān',
- '竐=chù,qì',
- '竑=hóng',
- '竒=qí',
- '竓=háo',
- '竔=shēng',
- '竕=fēn',
- '竖=shù',
- '竗=miào',
- '竘=qǔ,kǒu',
- '站=zhàn',
- '竚=zhù',
- '竛=líng',
- '竜=lóng',
- '竝=bìng',
- '竞=jìng',
- '竟=jìng',
- '章=zhāng',
- '竡=bǎi',
- '竢=sì',
- '竣=jùn',
- '竤=hóng',
- '童=tóng',
- '竦=sǒng',
- '竧=jìng,zhěn',
- '竨=diào',
- '竩=yì',
- '竪=shù',
- '竫=jìng',
- '竬=qǔ',
- '竭=jié',
- '竮=píng',
- '端=duān',
- '竰=lí',
- '竱=zhuǎn',
- '竲=céng,zēng',
- '竳=dēng',
- '竴=cūn',
- '竵=wāi',
- '競=jìng',
- '竷=kǎn,kàn',
- '竸=jìng',
- '竹=zhú',
- '竺=zhú,dǔ',
- '竻=lè,jīn',
- '竼=péng',
- '竽=yú',
- '竾=chí',
- '竿=gān',
- '笀=máng',
- '笁=zhú',
- '笂=wán',
- '笃=dǔ',
- '笄=jī',
- '笅=jiǎo,jiào',
- '笆=bā',
- '笇=suàn',
- '笈=jí',
- '笉=qǐn',
- '笊=zhào',
- '笋=sǔn',
- '笌=yá',
- '笍=zhuì,ruì',
- '笎=yuán',
- '笏=hù',
- '笐=háng,hàng',
- '笑=xiào',
- '笒=cén,jìn,hán',
- '笓=pí,bì',
- '笔=bǐ',
- '笕=jiǎn',
- '笖=yǐ',
- '笗=dōng',
- '笘=shān',
- '笙=shēng',
- '笚=dā,xiá,nà',
- '笛=dí',
- '笜=zhú',
- '笝=nà',
- '笞=chī',
- '笟=gū',
- '笠=lì',
- '笡=qiè',
- '笢=mǐn',
- '笣=bāo',
- '笤=tiáo',
- '笥=sì',
- '符=fú',
- '笧=cè',
- '笨=bèn',
- '笩=fá',
- '笪=dá',
- '笫=zǐ',
- '第=dì',
- '笭=líng',
- '笮=zuó,zé',
- '笯=nú',
- '笰=fú,fèi',
- '笱=gǒu',
- '笲=fán',
- '笳=jiā',
- '笴=gě',
- '笵=fàn',
- '笶=shǐ',
- '笷=mǎo',
- '笸=pǒ',
- '笹=tì',
- '笺=jiān',
- '笻=qióng',
- '笼=lóng,lǒng',
- '笽=mǐn',
- '笾=biān',
- '笿=luò',
- '筀=guì',
- '筁=qū',
- '筂=chí',
- '筃=yīn',
- '筄=yào',
- '筅=xiǎn',
- '筆=bǐ',
- '筇=qióng',
- '筈=kuò',
- '等=děng',
- '筊=jiǎo,jiào',
- '筋=jīn',
- '筌=quán',
- '筍=sǔn',
- '筎=rú',
- '筏=fá',
- '筐=kuāng',
- '筑=zhù,zhú',
- '筒=tǒng',
- '筓=jī',
- '答=dá,dā',
- '筕=háng',
- '策=cè',
- '筗=zhòng',
- '筘=kòu',
- '筙=lái',
- '筚=bì',
- '筛=shāi',
- '筜=dāng',
- '筝=zhēng',
- '筞=cè',
- '筟=fū',
- '筠=yún,jūn',
- '筡=tú',
- '筢=pá',
- '筣=lí',
- '筤=láng,làng',
- '筥=jǔ',
- '筦=guǎn',
- '筧=jiǎn',
- '筨=hán',
- '筩=tǒng',
- '筪=xiá',
- '筫=zhì,zhǐ',
- '筬=chéng',
- '筭=suàn',
- '筮=shì',
- '筯=zhù',
- '筰=zuó',
- '筱=xiǎo',
- '筲=shāo',
- '筳=tíng',
- '筴=cè',
- '筵=yán',
- '筶=gào',
- '筷=kuài',
- '筸=gān',
- '筹=chóu',
- '筺=kuāng',
- '筻=gàng',
- '筼=yún',
- '筽=o',
- '签=qiān',
- '筿=xiǎo',
- '简=jiǎn',
- '箁=póu,bù,fú,pú',
- '箂=lái',
- '箃=zōu',
- '箄=pái,bēi',
- '箅=bì',
- '箆=bì',
- '箇=gè',
- '箈=tái,chí',
- '箉=guǎi,dài',
- '箊=yū',
- '箋=jiān',
- '箌=zhào,dào',
- '箍=gū',
- '箎=chí',
- '箏=zhēng',
- '箐=qìng,jīng',
- '箑=shà',
- '箒=zhǒu',
- '箓=lù',
- '箔=bó',
- '箕=jī',
- '箖=lín,lǐn',
- '算=suàn',
- '箘=jùn,qūn',
- '箙=fú',
- '箚=zhá',
- '箛=gū',
- '箜=kōng',
- '箝=qián',
- '箞=quān',
- '箟=jùn',
- '箠=chuí',
- '管=guǎn',
- '箢=wǎn,yuān',
- '箣=cè',
- '箤=zú',
- '箥=pǒ',
- '箦=zé',
- '箧=qiè',
- '箨=tuò',
- '箩=luó',
- '箪=dān',
- '箫=xiāo',
- '箬=ruò',
- '箭=jiàn',
- '箮=xuān',
- '箯=biān',
- '箰=sǔn',
- '箱=xiāng',
- '箲=xiǎn',
- '箳=píng',
- '箴=zhēn',
- '箵=xīng',
- '箶=hú',
- '箷=shī,yí',
- '箸=zhù',
- '箹=yuē,yào,chuò',
- '箺=chūn',
- '箻=lǜ',
- '箼=wū',
- '箽=dǒng',
- '箾=shuò,xiāo,qiào',
- '箿=jí',
- '節=jié',
- '篁=huáng',
- '篂=xīng',
- '篃=mèi',
- '範=fàn',
- '篅=chuán',
- '篆=zhuàn',
- '篇=piān',
- '篈=fēng',
- '築=zhù,zhú',
- '篊=hóng',
- '篋=qiè',
- '篌=hóu',
- '篍=qiū',
- '篎=miǎo',
- '篏=qiàn',
- '篐=gū',
- '篑=kuì',
- '篒=yì',
- '篓=lǒu',
- '篔=yún',
- '篕=hé',
- '篖=táng',
- '篗=yuè',
- '篘=chōu',
- '篙=gāo',
- '篚=fěi',
- '篛=ruò',
- '篜=zhēng',
- '篝=gōu',
- '篞=niè',
- '篟=qiàn',
- '篠=xiǎo',
- '篡=cuàn',
- '篢=gōng,gǎn,lǒng',
- '篣=péng,páng',
- '篤=dǔ',
- '篥=lì',
- '篦=bì',
- '篧=zhuó,huò',
- '篨=chú',
- '篩=shāi',
- '篪=chí',
- '篫=zhù',
- '篬=qiāng,cāng',
- '篭=lóng,lǒng',
- '篮=lán',
- '篯=jiǎn,jiān',
- '篰=bù',
- '篱=lí',
- '篲=huì',
- '篳=bì',
- '篴=zhú,dí',
- '篵=cōng',
- '篶=yān',
- '篷=péng',
- '篸=cēn,zān,cǎn',
- '篹=zhuàn,zuàn,suǎn',
- '篺=pí',
- '篻=piǎo,biāo',
- '篼=dōu',
- '篽=yù',
- '篾=miè',
- '篿=tuán,zhuān',
- '簀=zé',
- '簁=shāi',
- '簂=guó,guì',
- '簃=yí',
- '簄=hù',
- '簅=chǎn',
- '簆=kòu',
- '簇=cù',
- '簈=píng',
- '簉=zào',
- '簊=jī',
- '簋=guǐ',
- '簌=sù',
- '簍=lǒu',
- '簎=cè,jí',
- '簏=lù',
- '簐=niǎn',
- '簑=suō',
- '簒=cuàn',
- '簓=diāo',
- '簔=suō',
- '簕=lè',
- '簖=duàn',
- '簗=zhù',
- '簘=xiāo',
- '簙=bó',
- '簚=mì,miè',
- '簛=shāi',
- '簜=dàng',
- '簝=liáo',
- '簞=dān',
- '簟=diàn',
- '簠=fǔ',
- '簡=jiǎn',
- '簢=mǐn',
- '簣=kuì',
- '簤=dài',
- '簥=jiāo',
- '簦=dēng',
- '簧=huáng',
- '簨=sǔn,zhuàn',
- '簩=láo',
- '簪=zān',
- '簫=xiāo',
- '簬=lù',
- '簭=shì',
- '簮=zān',
- '簯=qí',
- '簰=pái',
- '簱=qí',
- '簲=pái',
- '簳=gǎn,gàn',
- '簴=jù',
- '簵=lù',
- '簶=lù',
- '簷=yán',
- '簸=bò,bǒ',
- '簹=dāng',
- '簺=sài',
- '簻=zhuā',
- '簼=gōu',
- '簽=qiān',
- '簾=lián',
- '簿=bù,bó',
- '籀=zhòu',
- '籁=lài',
- '籂=shi',
- '籃=lán',
- '籄=kuì',
- '籅=yú',
- '籆=yuè',
- '籇=háo',
- '籈=zhēn,jiān',
- '籉=tái',
- '籊=tì',
- '籋=niè',
- '籌=chóu',
- '籍=jí',
- '籎=yí',
- '籏=qí',
- '籐=téng',
- '籑=zhuàn',
- '籒=zhòu',
- '籓=fān,pān,biān',
- '籔=sǒu,shǔ',
- '籕=zhòu',
- '籖=qiān',
- '籗=zhuó',
- '籘=téng',
- '籙=lù',
- '籚=lú',
- '籛=jiǎn,jiān',
- '籜=tuò',
- '籝=yíng',
- '籞=yù',
- '籟=lài',
- '籠=lóng,lǒng',
- '籡=qiè',
- '籢=lián',
- '籣=lán',
- '籤=qiān',
- '籥=yuè',
- '籦=zhōng',
- '籧=qú',
- '籨=lián',
- '籩=biān',
- '籪=duàn',
- '籫=zuǎn',
- '籬=lí',
- '籭=shāi',
- '籮=luó',
- '籯=yíng',
- '籰=yuè',
- '籱=zhuó',
- '籲=yù',
- '米=mǐ',
- '籴=dí',
- '籵=fán',
- '籶=shēn',
- '籷=zhé',
- '籸=shēn',
- '籹=nǚ',
- '籺=hé',
- '类=lèi',
- '籼=xiān',
- '籽=zǐ',
- '籾=ní',
- '籿=cùn',
- '粀=zhàng',
- '粁=qiān',
- '粂=zhāi',
- '粃=bǐ',
- '粄=bǎn',
- '粅=wù',
- '粆=shā,chǎo',
- '粇=kāng,jīng',
- '粈=róu',
- '粉=fěn',
- '粊=bì',
- '粋=cuì',
- '粌=yǐn',
- '粍=zhé',
- '粎=mǐ',
- '粏=tà',
- '粐=hù',
- '粑=bā',
- '粒=lì',
- '粓=gān',
- '粔=jù',
- '粕=pò',
- '粖=yù',
- '粗=cū',
- '粘=nián,zhān',
- '粙=zhòu',
- '粚=chī',
- '粛=sù',
- '粜=tiào',
- '粝=lì',
- '粞=xī',
- '粟=sù',
- '粠=hóng',
- '粡=tóng',
- '粢=zī,cí',
- '粣=cè,sè',
- '粤=yuè',
- '粥=zhōu,yù',
- '粦=lín',
- '粧=zhuāng',
- '粨=bǎi',
- '粩=lāo',
- '粪=fèn',
- '粫=ér',
- '粬=qū',
- '粭=hé',
- '粮=liáng',
- '粯=xiàn',
- '粰=fū,fú',
- '粱=liáng',
- '粲=càn',
- '粳=jīng',
- '粴=lǐ',
- '粵=yuè',
- '粶=lù',
- '粷=jú',
- '粸=qí',
- '粹=cuì',
- '粺=bài',
- '粻=zhāng',
- '粼=lín',
- '粽=zòng',
- '精=jīng',
- '粿=guǒ',
- '糀=huā',
- '糁=sǎn,shēn',
- '糂=shēn',
- '糃=táng',
- '糄=biān,biǎn',
- '糅=róu',
- '糆=miàn',
- '糇=hóu',
- '糈=xǔ',
- '糉=zòng',
- '糊=hū,hú,hù',
- '糋=jiàn',
- '糌=zān',
- '糍=cí',
- '糎=lí',
- '糏=xiè',
- '糐=fū',
- '糑=nuò',
- '糒=bèi',
- '糓=gǔ,gòu',
- '糔=xiǔ',
- '糕=gāo',
- '糖=táng',
- '糗=qiǔ',
- '糘=jiā',
- '糙=cāo',
- '糚=zhuāng',
- '糛=táng',
- '糜=mí,méi',
- '糝=sǎn,shēn',
- '糞=fèn',
- '糟=zāo',
- '糠=kāng',
- '糡=jiàng',
- '糢=mó',
- '糣=sǎn,shēn',
- '糤=sǎn',
- '糥=nuò',
- '糦=xī',
- '糧=liáng',
- '糨=jiàng',
- '糩=kuài',
- '糪=bó',
- '糫=huán',
- '糬=shǔ',
- '糭=zòng',
- '糮=xiàn',
- '糯=nuò',
- '糰=tuán',
- '糱=niè',
- '糲=lì',
- '糳=zuò',
- '糴=dí',
- '糵=niè',
- '糶=tiào',
- '糷=làn',
- '糸=mì,sī',
- '糹=sī',
- '糺=jiū,jiǔ',
- '系=xì,jì',
- '糼=gōng',
- '糽=zhēng,zhěng',
- '糾=jiū',
- '糿=gōng',
- '紀=jì',
- '紁=chà,chǎ',
- '紂=zhòu',
- '紃=xún',
- '約=yuē,yāo',
- '紅=hóng,gōng',
- '紆=yū',
- '紇=hé,gē',
- '紈=wán',
- '紉=rèn',
- '紊=wěn',
- '紋=wén,wèn',
- '紌=qiú',
- '納=nà',
- '紎=zī',
- '紏=tǒu',
- '紐=niǔ',
- '紑=fóu',
- '紒=jì,jié,jiè',
- '紓=shū',
- '純=chún',
- '紕=pī,pí,bǐ',
- '紖=zhèn',
- '紗=shā',
- '紘=hóng',
- '紙=zhǐ',
- '級=jí',
- '紛=fēn',
- '紜=yún',
- '紝=rèn',
- '紞=dǎn',
- '紟=jīn,jìn',
- '素=sù',
- '紡=fǎng',
- '索=suǒ',
- '紣=cuì',
- '紤=jiǔ',
- '紥=zhā,zā',
- '紦=hā',
- '紧=jǐn',
- '紨=fū,fù',
- '紩=zhì',
- '紪=qī',
- '紫=zǐ',
- '紬=chōu,chóu',
- '紭=hóng',
- '紮=zhā,zā',
- '累=léi,lěi,lèi',
- '細=xì',
- '紱=fú',
- '紲=xiè',
- '紳=shēn',
- '紴=bō,bì',
- '紵=zhù',
- '紶=qū,qǔ',
- '紷=líng',
- '紸=zhù',
- '紹=shào',
- '紺=gàn',
- '紻=yǎng',
- '紼=fú',
- '紽=tuó',
- '紾=zhěn,tiǎn',
- '紿=dài',
- '絀=chù',
- '絁=shī',
- '終=zhōng',
- '絃=xián',
- '組=zǔ',
- '絅=jiōng,jiǒng',
- '絆=bàn',
- '絇=qú',
- '絈=mò',
- '絉=shù',
- '絊=zuì',
- '絋=kuàng',
- '経=jīng',
- '絍=rèn',
- '絎=háng',
- '絏=xiè',
- '結=jié,jiē',
- '絑=zhū',
- '絒=chóu',
- '絓=guà,kuā',
- '絔=bǎi,mò',
- '絕=jué',
- '絖=kuàng',
- '絗=hú',
- '絘=cì',
- '絙=huán,gēng',
- '絚=gēng',
- '絛=tāo',
- '絜=xié,jié',
- '絝=kù',
- '絞=jiǎo',
- '絟=quán,shuān',
- '絠=gǎi,ǎi',
- '絡=luò,lào',
- '絢=xuàn',
- '絣=bēng,bīng,pēng',
- '絤=xiàn',
- '絥=fú',
- '給=gěi,jǐ',
- '絧=tōng,tóng,dòng',
- '絨=róng',
- '絩=tiào,diào,dào',
- '絪=yīn',
- '絫=lěi,lèi,léi',
- '絬=xiè',
- '絭=juàn',
- '絮=xù',
- '絯=gāi,hài',
- '絰=dié',
- '統=tǒng',
- '絲=sī',
- '絳=jiàng',
- '絴=xiáng',
- '絵=huì',
- '絶=jué',
- '絷=zhí',
- '絸=jiǎn',
- '絹=juàn',
- '絺=chī,zhǐ',
- '絻=miǎn,wèn,mán,wàn',
- '絼=zhèn',
- '絽=lǚ',
- '絾=chéng',
- '絿=qiú',
- '綀=shū',
- '綁=bǎng',
- '綂=tǒng',
- '綃=xiāo',
- '綄=huán,huàn,wàn',
- '綅=qīn,xiān',
- '綆=gěng',
- '綇=xū',
- '綈=tí,tì',
- '綉=xiù',
- '綊=xié',
- '綋=hóng',
- '綌=xì',
- '綍=fú',
- '綎=tīng',
- '綏=suí',
- '綐=duì',
- '綑=kǔn',
- '綒=fū',
- '經=jīng',
- '綔=hù',
- '綕=zhī',
- '綖=yán,xiàn',
- '綗=jiǒng',
- '綘=féng',
- '継=jì',
- '続=xù',
- '綛=rěn',
- '綜=zōng,zèng',
- '綝=lín,chēn',
- '綞=duǒ',
- '綟=lì,liè',
- '綠=lǜ',
- '綡=jīng',
- '綢=chóu',
- '綣=quǎn',
- '綤=shào',
- '綥=qí',
- '綦=qí',
- '綧=zhǔn,zhùn',
- '綨=jī,qí',
- '綩=wǎn',
- '綪=qiàn,qīng,zhēng',
- '綫=xiàn',
- '綬=shòu',
- '維=wéi',
- '綮=qìng,qǐ',
- '綯=táo',
- '綰=wǎn',
- '綱=gāng',
- '網=wǎng',
- '綳=bēng,běng,bèng',
- '綴=zhuì',
- '綵=cǎi',
- '綶=guǒ',
- '綷=cuì',
- '綸=lún,guān',
- '綹=liǔ',
- '綺=qǐ',
- '綻=zhàn',
- '綼=bì',
- '綽=chuò,chāo',
- '綾=líng',
- '綿=mián',
- '緀=qī',
- '緁=jī',
- '緂=tián,tǎn,chān',
- '緃=zōng',
- '緄=gǔn',
- '緅=zōu',
- '緆=xī',
- '緇=zī',
- '緈=xìng',
- '緉=liǎng',
- '緊=jǐn',
- '緋=fēi',
- '緌=ruí',
- '緍=mín',
- '緎=yù',
- '総=zǒng',
- '緐=fán',
- '緑=lǜ,lù',
- '緒=xù',
- '緓=yīng',
- '緔=shàng',
- '緕=zī',
- '緖=xù',
- '緗=xiāng',
- '緘=jiān',
- '緙=kè',
- '線=xiàn',
- '緛=ruǎn,ruàn',
- '緜=mián',
- '緝=jī,qī',
- '緞=duàn',
- '緟=chóng,zhòng',
- '締=dì',
- '緡=mín',
- '緢=miáo,máo',
- '緣=yuán',
- '緤=xiè,yè',
- '緥=bǎo',
- '緦=sī',
- '緧=qiū',
- '編=biān',
- '緩=huǎn',
- '緪=gēng,gèng',
- '緫=zǒng',
- '緬=miǎn',
- '緭=wèi',
- '緮=fù',
- '緯=wěi',
- '緰=tōu,xū,shū',
- '緱=gōu',
- '緲=miǎo',
- '緳=xié',
- '練=liàn',
- '緵=zōng,zòng',
- '緶=biàn,pián',
- '緷=gǔn,yùn',
- '緸=yīn',
- '緹=tí',
- '緺=guā,wō',
- '緻=zhì',
- '緼=yùn,yūn,wēn',
- '緽=chēng',
- '緾=chán',
- '緿=dài',
- '縀=xié',
- '縁=yuán',
- '縂=zǒng',
- '縃=xū',
- '縄=shéng',
- '縅=wēi',
- '縆=gēng,gèng',
- '縇=null',
- '縈=yíng',
- '縉=jìn',
- '縊=yì',
- '縋=zhuì',
- '縌=nì',
- '縍=bāng,bàng',
- '縎=gǔ,hú',
- '縏=pán',
- '縐=zhòu',
- '縑=jiān',
- '縒=cī,cuò,suǒ',
- '縓=quán',
- '縔=shuǎng',
- '縕=yùn,yūn,wēn',
- '縖=xiá',
- '縗=cuī,suī,shuāi',
- '縘=xì',
- '縙=róng,rǒng,ròng',
- '縚=tāo',
- '縛=fù',
- '縜=yún',
- '縝=zhěn',
- '縞=gǎo',
- '縟=rù',
- '縠=hú',
- '縡=zài,zēng',
- '縢=téng',
- '縣=xiàn,xuán',
- '縤=sù',
- '縥=zhěn',
- '縦=zòng',
- '縧=tāo',
- '縨=huǎng',
- '縩=cài',
- '縪=bì',
- '縫=féng,fèng',
- '縬=cù',
- '縭=lí',
- '縮=suō,sù',
- '縯=yǎn,yǐn',
- '縰=xǐ',
- '縱=zòng,zǒng',
- '縲=léi',
- '縳=zhuàn,juàn',
- '縴=qiàn',
- '縵=màn',
- '縶=zhí',
- '縷=lǚ',
- '縸=mù,mò',
- '縹=piǎo,piāo',
- '縺=lián',
- '縻=mí',
- '縼=xuàn',
- '總=zǒng',
- '績=jì',
- '縿=shān',
- '繀=suì',
- '繁=fán,pó',
- '繂=lǜ',
- '繃=bēng,běng,bèng',
- '繄=yī',
- '繅=sāo',
- '繆=móu,miù,miào,mù,liǎo',
- '繇=yáo,yóu,zhòu',
- '繈=qiǎng',
- '繉=shéng',
- '繊=xiān',
- '繋=jì',
- '繌=zōng,zòng',
- '繍=xiù',
- '繎=rán',
- '繏=xuàn',
- '繐=suì',
- '繑=qiāo',
- '繒=zēng,zèng',
- '繓=zuǒ',
- '織=zhī,zhì',
- '繕=shàn',
- '繖=sǎn',
- '繗=lín',
- '繘=jú,jué',
- '繙=fān',
- '繚=liáo',
- '繛=chuō,chuò',
- '繜=zūn,zǔn',
- '繝=jiàn',
- '繞=rào',
- '繟=chǎn,chán',
- '繠=ruǐ',
- '繡=xiù',
- '繢=huì,huí',
- '繣=huà',
- '繤=zuǎn',
- '繥=xī',
- '繦=qiǎng',
- '繧=wén',
- '繨=da',
- '繩=shéng',
- '繪=huì',
- '繫=xì,jì',
- '繬=sè',
- '繭=jiǎn',
- '繮=jiāng',
- '繯=huán',
- '繰=qiāo,sāo',
- '繱=cōng',
- '繲=xiè',
- '繳=jiǎo,zhuó',
- '繴=bì',
- '繵=dàn,tán,chán',
- '繶=yì',
- '繷=nǒng',
- '繸=suì',
- '繹=yì',
- '繺=shā',
- '繻=rú',
- '繼=jì',
- '繽=bīn',
- '繾=qiǎn',
- '繿=lán',
- '纀=pú,fú',
- '纁=xūn',
- '纂=zuǎn',
- '纃=zī',
- '纄=péng',
- '纅=yào,lì',
- '纆=mò',
- '纇=lèi',
- '纈=xiè',
- '纉=zuǎn',
- '纊=kuàng',
- '纋=yōu',
- '續=xù',
- '纍=léi',
- '纎=xiān',
- '纏=chán',
- '纐=jiǎo',
- '纑=lú',
- '纒=chán',
- '纓=yīng',
- '纔=cái',
- '纕=xiāng,rǎng',
- '纖=xiān',
- '纗=zuī',
- '纘=zuǎn',
- '纙=luò',
- '纚=lí,xǐ,lǐ,sǎ',
- '纛=dào',
- '纜=lǎn',
- '纝=léi',
- '纞=liàn',
- '纟=sī',
- '纠=jiū',
- '纡=yū',
- '红=hóng,gōng',
- '纣=zhòu',
- '纤=xiān,qiàn',
- '纥=hé,gē',
- '约=yuē,yāo',
- '级=jí',
- '纨=wán',
- '纩=kuàng',
- '纪=jì,jǐ',
- '纫=rèn',
- '纬=wěi',
- '纭=yún',
- '纮=hóng',
- '纯=chún',
- '纰=pī,pí,bǐ',
- '纱=shā',
- '纲=gāng',
- '纳=nà',
- '纴=rèn',
- '纵=zòng,zǒng',
- '纶=lún,guān',
- '纷=fēn',
- '纸=zhǐ',
- '纹=wén,wèn',
- '纺=fǎng',
- '纻=zhù',
- '纼=zhèn',
- '纽=niǔ',
- '纾=shū',
- '线=xiàn',
- '绀=gàn',
- '绁=xiè',
- '绂=fú',
- '练=liàn',
- '组=zǔ',
- '绅=shēn',
- '细=xì',
- '织=zhī,zhì',
- '终=zhōng',
- '绉=zhòu',
- '绊=bàn',
- '绋=fú',
- '绌=chù',
- '绍=shào',
- '绎=yì',
- '经=jīng',
- '绐=dài',
- '绑=bǎng',
- '绒=róng',
- '结=jié,jiē',
- '绔=kù',
- '绕=rào',
- '绖=dié',
- '绗=háng',
- '绘=huì',
- '给=gěi,jǐ',
- '绚=xuàn',
- '绛=jiàng',
- '络=luò,lào',
- '绝=jué',
- '绞=jiǎo',
- '统=tǒng',
- '绠=gěng',
- '绡=xiāo',
- '绢=juàn',
- '绣=xiù',
- '绤=xì',
- '绥=suí',
- '绦=tāo',
- '继=jì',
- '绨=tí,tì',
- '绩=jì',
- '绪=xù',
- '绫=líng',
- '绬=yīng',
- '续=xù',
- '绮=qǐ',
- '绯=fēi',
- '绰=chuò,chāo',
- '绱=shàng',
- '绲=gǔn',
- '绳=shéng',
- '维=wéi',
- '绵=mián',
- '绶=shòu',
- '绷=bēng,běng,bèng',
- '绸=chóu',
- '绹=táo',
- '绺=liǔ',
- '绻=quǎn',
- '综=zōng,zèng',
- '绽=zhàn',
- '绾=wǎn',
- '绿=lǜ,lù',
- '缀=zhuì',
- '缁=zī',
- '缂=kè',
- '缃=xiāng',
- '缄=jiān',
- '缅=miǎn',
- '缆=lǎn',
- '缇=tí',
- '缈=miǎo',
- '缉=jī,qī',
- '缊=yùn,yūn,wēn',
- '缋=huì,huí',
- '缌=sī',
- '缍=duǒ',
- '缎=duàn',
- '缏=biàn,pián',
- '缐=xiàn',
- '缑=gōu',
- '缒=zhuì',
- '缓=huǎn',
- '缔=dì',
- '缕=lǚ',
- '编=biān',
- '缗=mín',
- '缘=yuán',
- '缙=jìn',
- '缚=fù',
- '缛=rù',
- '缜=zhěn',
- '缝=féng,fèng',
- '缞=cuī,suī,shuāi',
- '缟=gǎo',
- '缠=chán',
- '缡=lí',
- '缢=yì',
- '缣=jiān',
- '缤=bīn',
- '缥=piǎo,piāo',
- '缦=màn',
- '缧=léi',
- '缨=yīng',
- '缩=suō,sù',
- '缪=móu,miù,miào,mù,liǎo',
- '缫=sāo',
- '缬=xié',
- '缭=liáo',
- '缮=shàn',
- '缯=zēng,zèng',
- '缰=jiāng',
- '缱=qiǎn',
- '缲=qiāo,sāo',
- '缳=huán',
- '缴=jiǎo,zhuó',
- '缵=zuǎn',
- '缶=fǒu',
- '缷=xiè',
- '缸=gāng',
- '缹=fǒu',
- '缺=quē',
- '缻=fǒu',
- '缼=quē',
- '缽=bō',
- '缾=píng',
- '缿=xiàng',
- '罀=zhào',
- '罁=gāng',
- '罂=yīng',
- '罃=yīng',
- '罄=qìng',
- '罅=xià',
- '罆=guàn',
- '罇=zūn',
- '罈=tán',
- '罉=chēng',
- '罊=qì',
- '罋=wèng',
- '罌=yīng',
- '罍=léi',
- '罎=tán',
- '罏=lú',
- '罐=guàn',
- '网=wǎng',
- '罒=wǎng',
- '罓=wǎng',
- '罔=wǎng',
- '罕=hǎn',
- '罖=wǎng',
- '罗=luó',
- '罘=fú',
- '罙=shēn',
- '罚=fá',
- '罛=gū',
- '罜=zhǔ',
- '罝=jū',
- '罞=máo',
- '罟=gǔ',
- '罠=mín',
- '罡=gāng',
- '罢=bà,ba,pí',
- '罣=guà',
- '罤=tí',
- '罥=juàn',
- '罦=fú',
- '罧=shēn',
- '罨=yǎn',
- '罩=zhào',
- '罪=zuì',
- '罫=guǎi,guà',
- '罬=zhuó',
- '罭=yù',
- '置=zhì',
- '罯=ǎn',
- '罰=fá',
- '罱=lǎn',
- '署=shǔ',
- '罳=sī',
- '罴=pí',
- '罵=mà',
- '罶=liǔ',
- '罷=bà,ba,pí',
- '罸=fá',
- '罹=lí',
- '罺=cháo',
- '罻=wèi',
- '罼=bì',
- '罽=jì',
- '罾=zēng',
- '罿=chōng',
- '羀=liǔ',
- '羁=jī',
- '羂=juàn',
- '羃=mì',
- '羄=zhào',
- '羅=luó',
- '羆=pí',
- '羇=jī',
- '羈=jī',
- '羉=luán',
- '羊=yáng,xiáng',
- '羋=mǐ',
- '羌=qiāng',
- '羍=dá',
- '美=měi',
- '羏=yáng,xiáng',
- '羐=líng',
- '羑=yǒu',
- '羒=fén',
- '羓=bā',
- '羔=gāo',
- '羕=yàng',
- '羖=gǔ',
- '羗=qiāng',
- '羘=zāng',
- '羙=měi,gāo',
- '羚=líng',
- '羛=yì,xī',
- '羜=zhù',
- '羝=dī',
- '羞=xiū',
- '羟=qiǎng',
- '羠=yí',
- '羡=xiàn',
- '羢=róng',
- '羣=qún',
- '群=qún',
- '羥=qiǎng',
- '羦=huán',
- '羧=suō',
- '羨=xiàn',
- '義=yì',
- '羪=yōu',
- '羫=qiāng,kòng',
- '羬=qián,xián,yán',
- '羭=yú',
- '羮=gēng',
- '羯=jié',
- '羰=tāng',
- '羱=yuán',
- '羲=xī',
- '羳=fán',
- '羴=shān',
- '羵=fén',
- '羶=shān',
- '羷=liǎn',
- '羸=léi',
- '羹=gēng',
- '羺=nóu',
- '羻=qiàng',
- '羼=chàn',
- '羽=yǔ',
- '羾=hóng,gòng',
- '羿=yì',
- '翀=chōng',
- '翁=wēng',
- '翂=fēn',
- '翃=hóng',
- '翄=chì',
- '翅=chì',
- '翆=cuì',
- '翇=fú',
- '翈=xiá',
- '翉=běn',
- '翊=yì',
- '翋=là',
- '翌=yì',
- '翍=pī,bì,pō',
- '翎=líng',
- '翏=liù',
- '翐=zhì',
- '翑=qú,yù',
- '習=xí',
- '翓=xié',
- '翔=xiáng',
- '翕=xī',
- '翖=xī',
- '翗=ké',
- '翘=qiáo,qiào',
- '翙=huì',
- '翚=huī',
- '翛=xiāo',
- '翜=shà',
- '翝=hóng',
- '翞=jiāng',
- '翟=dí,zhái',
- '翠=cuì',
- '翡=fěi',
- '翢=dào,zhōu',
- '翣=shà',
- '翤=chì',
- '翥=zhù',
- '翦=jiǎn',
- '翧=xuān',
- '翨=chì',
- '翩=piān',
- '翪=zōng',
- '翫=wán',
- '翬=huī',
- '翭=hóu',
- '翮=hé',
- '翯=hè',
- '翰=hàn',
- '翱=áo',
- '翲=piāo',
- '翳=yì',
- '翴=lián',
- '翵=hóu,qú',
- '翶=áo',
- '翷=lín',
- '翸=pěn',
- '翹=qiáo,qiào',
- '翺=áo',
- '翻=fān',
- '翼=yì',
- '翽=huì',
- '翾=xuān',
- '翿=dào'
-];
-
-const List<String> CHINESE_DICT = const [
- '倀=伥',
- '瀅=滢',
- '瀆=渎',
- '倆=俩',
- '倉=仓',
- '瀉=泻',
- '個=个',
- '瀋=渖',
- '瀏=浏',
- '們=们',
- '瀕=濒',
- '逕=迳',
- '瀘=泸',
- '這=这',
- '瀝=沥',
- '瀟=潇',
- '瀠=潆',
- '連=连',
- '瀦=潴',
- '瀧=泷',
- '瀨=濑',
- '倫=伦',
- '耬=耧',
- '耮=耢',
- '瀲=潋',
- '進=进',
- '怵=憷',
- '瀾=澜',
- '灃=沣',
- '灄=滠',
- '偉=伟',
- '遊=游',
- '運=运',
- '過=过',
- '灑=洒',
- '達=达',
- '違=违',
- '聖=圣',
- '灘=滩',
- '遙=遥',
- '遜=逊',
- '遝=沓',
- '灝=灏',
- '遞=递',
- '聞=闻',
- '遠=远',
- '灣=湾',
- '灤=滦',
- '恥=耻',
- '灩=滟',
- '適=适',
- '聯=联',
- '聰=聪',
- '聲=声',
- '遲=迟',
- '聳=耸',
- '側=侧',
- '偵=侦',
- '聵=聩',
- '聶=聂',
- '職=职',
- '遷=迁',
- '選=选',
- '聹=聍',
- '遺=遗',
- '遼=辽',
- '偽=伪',
- '聽=听',
- '災=灾',
- '聾=聋',
- '邁=迈',
- '還=还',
- '悅=悦',
- '肅=肃',
- '邇=迩',
- '邊=边',
- '邏=逻',
- '邐=逦',
- '傑=杰',
- '傖=伧',
- '傘=伞',
- '備=备',
- '傭=佣',
- '傯=偬',
- '傳=传',
- '傴=伛',
- '債=债',
- '悵=怅',
- '悶=闷',
- '傷=伤',
- '為=为',
- '傾=倾',
- '僂=偻',
- '僅=仅',
- '僉=佥',
- '烏=乌',
- '僑=侨',
- '郟=郏',
- '惡=恶',
- '郤=郄',
- '僥=侥',
- '僨=偾',
- '惱=恼',
- '惲=恽',
- '烴=烃',
- '郵=邮',
- '價=价',
- '惻=恻',
- '儀=仪',
- '儂=侬',
- '億=亿',
- '脅=胁',
- '鄆=郓',
- '儈=侩',
- '脈=脉',
- '鄉=乡',
- '儉=俭',
- '脊=嵴',
- '儐=傧',
- '鄒=邹',
- '儔=俦',
- '鄔=邬',
- '儕=侪',
- '鄖=郧',
- '儘=尽',
- '愛=爱',
- '脛=胫',
- '愜=惬',
- '償=偿',
- '無=无',
- '鄧=邓',
- '愨=悫',
- '優=优',
- '脫=脱',
- '鄭=郑',
- '鄰=邻',
- '儲=储',
- '鄲=郸',
- '愴=怆',
- '鄴=邺',
- '鄶=郐',
- '儷=俪',
- '愷=恺',
- '脹=胀',
- '儺=傩',
- '鄺=邝',
- '儻=傥',
- '儼=俨',
- '愾=忾',
- '煆=煅',
- '酈=郦',
- '煉=炼',
- '態=态',
- '兌=兑',
- '慍=愠',
- '腎=肾',
- '兒=儿',
- '煒=炜',
- '腖=胨',
- '兗=兖',
- '慘=惨',
- '煙=烟',
- '慚=惭',
- '慟=恸',
- '腡=脶',
- '煢=茕',
- '慣=惯',
- '煥=焕',
- '腦=脑',
- '內=内',
- '兩=两',
- '煩=烦',
- '慪=怄',
- '慫=怂',
- '腫=肿',
- '煬=炀',
- '慮=虑',
- '慳=悭',
- '腳=脚',
- '慶=庆',
- '腸=肠',
- '膁=肷',
- '憂=忧',
- '醃=腌',
- '膃=腽',
- '冇=没',
- '冊=册',
- '憊=惫',
- '憐=怜',
- '憑=凭',
- '憒=愦',
- '熒=荧',
- '膕=腘',
- '憖=慭',
- '熗=炝',
- '憚=惮',
- '膚=肤',
- '醜=丑',
- '醞=酝',
- '膠=胶',
- '憤=愤',
- '膩=腻',
- '冪=幂',
- '醫=医',
- '憫=悯',
- '醬=酱',
- '憮=怃',
- '熱=热',
- '醱=酦',
- '憲=宪',
- '熲=颎',
- '憶=忆',
- '膽=胆',
- '熾=炽',
- '膾=脍',
- '膿=脓',
- '釀=酿',
- '燁=烨',
- '釁=衅',
- '釃=酾',
- '釅=酽',
- '懇=恳',
- '燈=灯',
- '應=应',
- '燉=炖',
- '臉=脸',
- '釋=释',
- '懌=怿',
- '懍=懔',
- '凍=冻',
- '臍=脐',
- '臏=膑',
- '燒=烧',
- '臒=癯',
- '釓=钆',
- '釔=钇',
- '釕=钌',
- '釗=钊',
- '臘=腊',
- '釘=钉',
- '燙=烫',
- '釙=钋',
- '臚=胪',
- '凜=凛',
- '燜=焖',
- '針=针',
- '懟=怼',
- '臟=脏',
- '營=营',
- '臠=脔',
- '臢=臜',
- '懣=懑',
- '釣=钓',
- '釤=钐',
- '臥=卧',
- '燦=灿',
- '釧=钏',
- '懨=恹',
- '臨=临',
- '釩=钒',
- '燭=烛',
- '凱=凯',
- '懲=惩',
- '燴=烩',
- '釵=钗',
- '懶=懒',
- '懷=怀',
- '釷=钍',
- '懸=悬',
- '釹=钕',
- '懺=忏',
- '臺=台',
- '釺=钎',
- '懼=惧',
- '燼=烬',
- '懾=慑',
- '燾=焘',
- '戀=恋',
- '鈀=钯',
- '鈁=钫',
- '鈃=钘',
- '鈄=钭',
- '與=与',
- '戇=戆',
- '興=兴',
- '鈈=钚',
- '舉=举',
- '鈉=钠',
- '舊=旧',
- '爍=烁',
- '鈍=钝',
- '爐=炉',
- '鈐=钤',
- '鈑=钣',
- '鈒=钑',
- '戔=戋',
- '鈔=钞',
- '鈕=钮',
- '爛=烂',
- '鈞=钧',
- '鈣=钙',
- '鈥=钬',
- '鈦=钛',
- '戧=戗',
- '鈧=钪',
- '戩=戬',
- '刪=删',
- '爭=争',
- '戰=战',
- '鈰=铈',
- '戲=戏',
- '鈳=钶',
- '鈴=铃',
- '戶=户',
- '鈷=钴',
- '鈸=钹',
- '鈹=铍',
- '爺=爷',
- '鈺=钰',
- '鈽=钸',
- '爾=尔',
- '鈾=铀',
- '爿=丬',
- '鈿=钿',
- '鉀=钾',
- '剄=刭',
- '牆=墙',
- '則=则',
- '鉈=铊',
- '鉉=铉',
- '鉍=铋',
- '鉑=铂',
- '鉕=钷',
- '剗=刬',
- '鉗=钳',
- '牘=牍',
- '艙=舱',
- '鉚=铆',
- '剛=刚',
- '鉛=铅',
- '剝=剥',
- '鉞=钺',
- '扡=扦',
- '艤=舣',
- '鉤=钩',
- '艦=舰',
- '鉦=钲',
- '艫=舻',
- '鉬=钼',
- '鉭=钽',
- '剮=剐',
- '艱=艰',
- '剴=剀',
- '創=创',
- '鉶=铏',
- '艸=艹',
- '鉸=铰',
- '鉺=铒',
- '鉻=铬',
- '牽=牵',
- '鉿=铪',
- '銀=银',
- '劃=划',
- '銃=铳',
- '劄=札',
- '銅=铜',
- '劇=剧',
- '劈=噼',
- '劉=刘',
- '劊=刽',
- '劌=刿',
- '劍=剑',
- '銍=铚',
- '劑=剂',
- '銑=铣',
- '銓=铨',
- '犖=荦',
- '銖=铢',
- '銘=铭',
- '銚=铫',
- '犛=牦',
- '銛=铦',
- '銜=衔',
- '銠=铑',
- '犢=犊',
- '銣=铷',
- '銥=铱',
- '銦=铟',
- '犧=牺',
- '銨=铵',
- '銩=铥',
- '銪=铕',
- '銫=铯',
- '銬=铐',
- '銱=铞',
- '銳=锐',
- '銷=销',
- '芻=刍',
- '銻=锑',
- '銼=锉',
- '狀=状',
- '勁=劲',
- '鋁=铝',
- '鋃=锒',
- '鋅=锌',
- '鋇=钡',
- '拋=抛',
- '鋌=铤',
- '鋏=铗',
- '鋒=锋',
- '動=动',
- '務=务',
- '鋙=铻',
- '拚=拼',
- '勝=胜',
- '鋝=锊',
- '勞=劳',
- '鋟=锓',
- '勢=势',
- '鋣=铘',
- '鋤=锄',
- '鋥=锃',
- '鋦=锔',
- '苧=苎',
- '鋨=锇',
- '勩=勚',
- '鋪=铺',
- '鋯=锆',
- '鋰=锂',
- '勱=劢',
- '鋱=铽',
- '勳=勋',
- '勵=励',
- '鋶=锍',
- '勸=劝',
- '鋸=锯',
- '狹=狭',
- '勻=匀',
- '鋼=钢',
- '狽=狈',
- '錁=锞',
- '錄=录',
- '錆=锖',
- '錇=锫',
- '錈=锩',
- '錐=锥',
- '錒=锕',
- '錕=锟',
- '錘=锤',
- '猙=狰',
- '錙=锱',
- '錚=铮',
- '猛=勐',
- '錟=锬',
- '錠=锭',
- '錡=锜',
- '錢=钱',
- '錦=锦',
- '錨=锚',
- '錩=锠',
- '錫=锡',
- '匭=匦',
- '錮=锢',
- '錯=错',
- '匱=匮',
- '茲=兹',
- '錳=锰',
- '猶=犹',
- '錸=铼',
- '猻=狲',
- '挾=挟',
- '區=区',
- '獁=犸',
- '鍁=锨',
- '獄=狱',
- '獅=狮',
- '鍆=钔',
- '鍇=锴',
- '鍈=锳',
- '荊=荆',
- '鍋=锅',
- '鍍=镀',
- '獎=奖',
- '協=协',
- '鍔=锷',
- '鍘=铡',
- '鍚=钖',
- '鍛=锻',
- '鍠=锽',
- '鍤=锸',
- '鍥=锲',
- '獨=独',
- '獪=狯',
- '捫=扪',
- '獫=猃',
- '鍬=锹',
- '獮=狝',
- '獰=狞',
- '鍰=锾',
- '獲=获',
- '獵=猎',
- '鍵=键',
- '鍶=锶',
- '獷=犷',
- '獸=兽',
- '獺=獭',
- '鍺=锗',
- '卻=却',
- '獻=献',
- '獼=猕',
- '鍾=锺',
- '玀=猡',
- '鎂=镁',
- '掃=扫',
- '掄=抡',
- '鎄=锿',
- '莊=庄',
- '鎊=镑',
- '鎔=镕',
- '莖=茎',
- '鎖=锁',
- '掗=挜',
- '鎘=镉',
- '厙=厍',
- '掙=挣',
- '掛=挂',
- '鎛=镈',
- '鎡=镃',
- '莢=荚',
- '鎢=钨',
- '鎣=蓥',
- '鎦=镏',
- '莧=苋',
- '鎧=铠',
- '玨=珏',
- '鎪=锼',
- '鎬=镐',
- '厭=厌',
- '鎮=镇',
- '鎰=镒',
- '厲=厉',
- '鎳=镍',
- '厴=厣',
- '鎿=镎',
- '揀=拣',
- '參=参',
- '鏃=镞',
- '鏇=镟',
- '鏈=链',
- '鏌=镆',
- '鏍=镙',
- '鏐=镠',
- '鏑=镝',
- '鏗=铿',
- '鏘=锵',
- '揚=扬',
- '換=换',
- '鏜=镗',
- '鏞=镛',
- '鏟=铲',
- '鏡=镜',
- '叢=丛',
- '鏢=镖',
- '鏤=镂',
- '鏨=錾',
- '揮=挥',
- '華=华',
- '鏰=镚',
- '鏵=铧',
- '鏷=镤',
- '鏹=镪',
- '鏽=锈',
- '現=现',
- '鐃=铙',
- '萇=苌',
- '萊=莱',
- '鐋=铴',
- '損=损',
- '鐐=镣',
- '吒=咤',
- '鐒=铹',
- '鐓=镦',
- '鐔=镡',
- '搖=摇',
- '搗=捣',
- '鐘=钟',
- '鐙=镫',
- '鐠=镨',
- '鐦=锎',
- '鐧=锏',
- '鐫=镌',
- '萬=万',
- '鐮=镰',
- '鐲=镯',
- '吳=吴',
- '鐳=镭',
- '萵=莴',
- '鐵=铁',
- '搶=抢',
- '鐶=镮',
- '鐸=铎',
- '琺=珐',
- '鐺=铛',
- '琿=珲',
- '鐿=镱',
- '呂=吕',
- '鑄=铸',
- '葉=叶',
- '瑉=珉',
- '鑊=镬',
- '瑋=玮',
- '摑=掴',
- '瑒=玚',
- '葒=荭',
- '鑒=鉴',
- '鑔=镲',
- '著=着',
- '摜=掼',
- '鑞=镴',
- '摟=搂',
- '鑠=铄',
- '摣=揸',
- '瑣=琐',
- '鑣=镳',
- '瑤=瑶',
- '葤=荮',
- '鑥=镥',
- '葦=苇',
- '瑩=莹',
- '瑪=玛',
- '鑭=镧',
- '摯=挚',
- '鑰=钥',
- '呱=哌',
- '瑲=玱',
- '鑲=镶',
- '摳=抠',
- '摶=抟',
- '葷=荤',
- '鑷=镊',
- '鑹=镩',
- '摻=掺',
- '呼=唿',
- '鑼=锣',
- '鑽=钻',
- '鑾=銮',
- '鑿=凿',
- '钁=镢',
- '撈=捞',
- '璉=琏',
- '撏=挦',
- '撐=撑',
- '撓=挠',
- '蒔=莳',
- '撚=捻',
- '钜=鉅',
- '蒞=莅',
- '撟=挢',
- '璡=琎',
- '撣=掸',
- '璣=玑',
- '撥=拨',
- '璦=瑷',
- '撫=抚',
- '璫=珰',
- '環=环',
- '撲=扑',
- '撳=揿',
- '璵=玙',
- '撻=挞',
- '咼=呙',
- '蒼=苍',
- '璽=玺',
- '撾=挝',
- '撿=捡',
- '璿=璇',
- '蓀=荪',
- '擁=拥',
- '擄=掳',
- '擇=择',
- '擊=击',
- '瓊=琼',
- '擋=挡',
- '蓋=盖',
- '瓏=珑',
- '擔=担',
- '瓔=璎',
- '據=据',
- '瓚=瓒',
- '擠=挤',
- '員=员',
- '哢=咔',
- '蓧=莜',
- '擬=拟',
- '蓮=莲',
- '擯=摈',
- '蓯=苁',
- '擰=拧',
- '擱=搁',
- '擲=掷',
- '擴=扩',
- '蓴=莼',
- '擷=撷',
- '擺=摆',
- '擻=擞',
- '擼=撸',
- '蓽=荜',
- '擾=扰',
- '攄=摅',
- '唄=呗',
- '攆=撵',
- '甌=瓯',
- '攏=拢',
- '攔=拦',
- '甕=瓮',
- '唕=唣',
- '攖=撄',
- '攙=搀',
- '唚=吣',
- '攛=撺',
- '攜=携',
- '攝=摄',
- '蔞=蒌',
- '攢=攒',
- '產=产',
- '攣=挛',
- '蔣=蒋',
- '攤=摊',
- '蔥=葱',
- '蔦=茑',
- '攪=搅',
- '攬=揽',
- '蔭=荫',
- '蕁=荨',
- '蕆=蒇',
- '蕎=荞',
- '問=问',
- '蕒=荬',
- '蕕=莸',
- '敗=败',
- '敘=叙',
- '蕘=荛',
- '畝=亩',
- '啞=哑',
- '啟=启',
- '镟=碹',
- '畢=毕',
- '啢=唡',
- '蕢=蒉',
- '蕩=荡',
- '蕪=芜',
- '畫=画',
- '蕭=萧',
- '異=异',
- '敵=敌',
- '當=当',
- '蕷=蓣',
- '長=长',
- '數=数',
- '門=门',
- '斂=敛',
- '閂=闩',
- '斃=毙',
- '閃=闪',
- '閆=闫',
- '疇=畴',
- '薈=荟',
- '閈=闬',
- '閉=闭',
- '疊=叠',
- '薊=蓟',
- '開=开',
- '薌=芗',
- '閌=闶',
- '閎=闳',
- '閏=闰',
- '薑=姜',
- '閒=闲',
- '間=间',
- '薔=蔷',
- '閔=闵',
- '斕=斓',
- '薘=荙',
- '閘=闸',
- '喚=唤',
- '薟=莶',
- '閡=阂',
- '閣=阁',
- '閥=阀',
- '薦=荐',
- '閨=闺',
- '薩=萨',
- '閩=闽',
- '喪=丧',
- '閫=阃',
- '斬=斩',
- '喬=乔',
- '閬=阆',
- '閭=闾',
- '單=单',
- '閱=阅',
- '喲=哟',
- '閶=阊',
- '斷=断',
- '閹=阉',
- '薺=荠',
- '閻=阎',
- '於=于',
- '閼=阏',
- '閽=阍',
- '閾=阈',
- '閿=阌',
- '闃=阒',
- '嗆=呛',
- '嗇=啬',
- '闈=闱',
- '嗊=唝',
- '闊=阔',
- '闋=阕',
- '闌=阑',
- '藍=蓝',
- '闍=阇',
- '嗎=吗',
- '藎=荩',
- '闐=阗',
- '闒=阘',
- '闓=闿',
- '闔=阖',
- '闕=阙',
- '闖=闯',
- '痙=痉',
- '嗚=呜',
- '關=关',
- '藝=艺',
- '闞=阚',
- '闠=阓',
- '闡=阐',
- '闤=阛',
- '藥=药',
- '闥=闼',
- '嗩=唢',
- '藪=薮',
- '嗬=呵',
- '嗶=哔',
- '藶=苈',
- '藹=蔼',
- '藺=蔺',
- '蘀=萚',
- '瘂=痖',
- '蘄=蕲',
- '蘆=芦',
- '蘇=苏',
- '蘊=蕴',
- '瘋=疯',
- '蘋=苹',
- '嘍=喽',
- '瘍=疡',
- '瘓=痪',
- '嘔=呕',
- '嘖=啧',
- '嘗=尝',
- '蘚=藓',
- '嘜=唛',
- '瘞=瘗',
- '蘞=蔹',
- '瘡=疮',
- '蘢=茏',
- '瘧=疟',
- '嘩=哗',
- '阪=坂',
- '蘭=兰',
- '瘮=瘆',
- '嘮=唠',
- '嘯=啸',
- '嘰=叽',
- '嘵=哓',
- '嘸=呒',
- '瘺=瘘',
- '蘺=蓠',
- '嘽=啴',
- '蘿=萝',
- '時=时',
- '療=疗',
- '噅=咴',
- '癆=痨',
- '癇=痫',
- '晉=晋',
- '癉=瘅',
- '噓=嘘',
- '處=处',
- '癘=疠',
- '陘=陉',
- '虛=虚',
- '虜=虏',
- '噝=咝',
- '晝=昼',
- '陝=陕',
- '號=号',
- '癟=瘪',
- '噠=哒',
- '癡=痴',
- '癢=痒',
- '陣=阵',
- '癤=疖',
- '噥=哝',
- '噦=哕',
- '虧=亏',
- '癩=癞',
- '癬=癣',
- '癭=瘿',
- '癮=瘾',
- '噯=嗳',
- '虯=虬',
- '癰=痈',
- '陰=阴',
- '癱=瘫',
- '噲=哙',
- '癲=癫',
- '陳=陈',
- '噴=喷',
- '噸=吨',
- '陸=陆',
- '發=发',
- '陽=阳',
- '嚀=咛',
- '嚇=吓',
- '暈=晕',
- '暉=晖',
- '隉=陧',
- '隊=队',
- '嚌=哜',
- '階=阶',
- '嚕=噜',
- '隕=陨',
- '暘=旸',
- '皚=皑',
- '際=际',
- '暢=畅',
- '嚦=呖',
- '嚨=咙',
- '隨=随',
- '險=险',
- '暫=暂',
- '皰=疱',
- '隱=隐',
- '嚲=亸',
- '嚳=喾',
- '嚴=严',
- '隴=陇',
- '嚶=嘤',
- '皸=皲',
- '隸=隶',
- '皺=皱',
- '隻=只',
- '囀=啭',
- '囁=嗫',
- '囂=嚣',
- '曄=晔',
- '囅=冁',
- '曆=历',
- '曇=昙',
- '囈=呓',
- '囉=啰',
- '曉=晓',
- '雋=隽',
- '囑=嘱',
- '曖=暧',
- '雖=虽',
- '雙=双',
- '雛=雏',
- '雜=杂',
- '盜=盗',
- '盞=盏',
- '雞=鸡',
- '曠=旷',
- '離=离',
- '監=监',
- '難=难',
- '盤=盘',
- '盧=卢',
- '曨=昽',
- '囪=囱',
- '曬=晒',
- '雲=云',
- '書=书',
- '蛺=蛱',
- '電=电',
- '蛻=蜕',
- '會=会',
- '蜆=蚬',
- '圇=囵',
- '國=国',
- '圍=围',
- '園=园',
- '圓=圆',
- '圖=图',
- '團=团',
- '眥=眦',
- '朧=胧',
- '霧=雾',
- '霽=霁',
- '眾=众',
- '靂=雳',
- '靄=霭',
- '靆=叇',
- '靈=灵',
- '靉=叆',
- '蝕=蚀',
- '靚=靓',
- '睜=睁',
- '靜=静',
- '睞=睐',
- '蝟=猬',
- '靦=腼',
- '蝦=虾',
- '靨=靥',
- '坰=垧',
- '東=东',
- '蝸=蜗',
- '鞀=鼗',
- '螄=蛳',
- '鞏=巩',
- '瞘=眍',
- '瞞=瞒',
- '螞=蚂',
- '螢=萤',
- '垵=埯',
- '螻=蝼',
- '瞼=睑',
- '鞽=鞒',
- '螿=螀',
- '韁=缰',
- '韃=鞑',
- '蟄=蛰',
- '蟈=蝈',
- '韉=鞯',
- '韋=韦',
- '韌=韧',
- '韍=韨',
- '蟎=螨',
- '矓=眬',
- '韓=韩',
- '韙=韪',
- '矚=瞩',
- '韜=韬',
- '韝=鞴',
- '韞=韫',
- '埡=垭',
- '蟣=虮',
- '蟬=蝉',
- '矯=矫',
- '蟯=蛲',
- '蟲=虫',
- '柵=栅',
- '蟶=蛏',
- '執=执',
- '蟻=蚁',
- '韻=韵',
- '矽=硅',
- '響=响',
- '頁=页',
- '頂=顶',
- '頃=顷',
- '堅=坚',
- '蠅=蝇',
- '項=项',
- '蠆=虿',
- '順=顺',
- '頇=顸',
- '須=须',
- '堊=垩',
- '頊=顼',
- '頌=颂',
- '蠍=蝎',
- '頎=颀',
- '頏=颃',
- '蠐=蛴',
- '預=预',
- '蠑=蝾',
- '頑=顽',
- '頒=颁',
- '頓=顿',
- '蠔=蚝',
- '堖=垴',
- '頗=颇',
- '領=领',
- '頜=颌',
- '堝=埚',
- '蠟=蜡',
- '頡=颉',
- '蠣=蛎',
- '頤=颐',
- '頦=颏',
- '蠨=蟏',
- '頭=头',
- '頮=颒',
- '堯=尧',
- '頰=颊',
- '報=报',
- '蠱=蛊',
- '頲=颋',
- '場=场',
- '頴=颕',
- '蠶=蚕',
- '頷=颔',
- '頸=颈',
- '頹=颓',
- '蠻=蛮',
- '頻=频',
- '堿=碱',
- '顆=颗',
- '塊=块',
- '塋=茔',
- '題=题',
- '額=额',
- '顎=颚',
- '塏=垲',
- '顏=颜',
- '塒=埘',
- '顒=颙',
- '術=术',
- '顓=颛',
- '塗=涂',
- '願=愿',
- '顙=颡',
- '塚=冢',
- '衛=卫',
- '顛=颠',
- '硜=硁',
- '衝=冲',
- '類=类',
- '塢=坞',
- '顢=颟',
- '塤=埙',
- '硤=硖',
- '顥=颢',
- '顧=顾',
- '硨=砗',
- '顫=颤',
- '顬=颥',
- '硯=砚',
- '顯=显',
- '顰=颦',
- '顱=颅',
- '顳=颞',
- '顴=颧',
- '塵=尘',
- '塹=堑',
- '墊=埝',
- '梔=栀',
- '梘=枧',
- '墜=坠',
- '條=条',
- '袞=衮',
- '梟=枭',
- '風=风',
- '碩=硕',
- '碭=砀',
- '颭=飐',
- '墮=堕',
- '颮=飑',
- '颯=飒',
- '墳=坟',
- '墶=垯',
- '颶=飓',
- '碸=砜',
- '颸=飔',
- '確=确',
- '颺=飏',
- '颻=飖',
- '碼=码',
- '颼=飕',
- '墾=垦',
- '飀=飗',
- '棄=弃',
- '飄=飘',
- '飆=飚',
- '壇=坛',
- '壋=垱',
- '磑=硙',
- '壓=压',
- '棖=枨',
- '棗=枣',
- '壘=垒',
- '壙=圹',
- '壚=垆',
- '磚=砖',
- '飛=飞',
- '補=补',
- '裝=装',
- '壞=坏',
- '壟=垅',
- '棟=栋',
- '裡=里',
- '壢=坜',
- '磣=碜',
- '飣=饤',
- '飥=饦',
- '棧=栈',
- '磧=碛',
- '壩=坝',
- '飩=饨',
- '壪=塆',
- '飪=饪',
- '飫=饫',
- '棬=桊',
- '飭=饬',
- '壯=壮',
- '磯=矶',
- '飯=饭',
- '棲=栖',
- '飲=饮',
- '飴=饴',
- '棶=梾',
- '壺=壶',
- '壼=壸',
- '飼=饲',
- '壽=寿',
- '製=制',
- '磽=硗',
- '飽=饱',
- '飾=饰',
- '飿=饳',
- '餃=饺',
- '礄=硚',
- '餄=饸',
- '餅=饼',
- '複=复',
- '餉=饷',
- '養=养',
- '褌=裈',
- '餌=饵',
- '礎=础',
- '餎=饹',
- '椏=桠',
- '餏=饻',
- '餑=饽',
- '餒=馁',
- '餓=饿',
- '餕=馂',
- '餖=饾',
- '餘=馀',
- '褘=袆',
- '礙=碍',
- '餛=馄',
- '餜=馃',
- '餞=饯',
- '夠=够',
- '餡=馅',
- '夢=梦',
- '夥=伙',
- '礦=矿',
- '館=馆',
- '礪=砺',
- '礫=砾',
- '礬=矾',
- '礱=砻',
- '餱=糇',
- '褲=裤',
- '褳=裢',
- '餳=饧',
- '餶=馉',
- '餷=馇',
- '褸=褛',
- '餺=馎',
- '褻=亵',
- '餼=饩',
- '夾=夹',
- '餾=馏',
- '餿=馊',
- '饁=馌',
- '饃=馍',
- '饅=馒',
- '襆=幞',
- '襇=裥',
- '饈=馐',
- '饉=馑',
- '楊=杨',
- '饊=馓',
- '饋=馈',
- '饌=馔',
- '襏=袯',
- '奐=奂',
- '饑=饥',
- '饒=饶',
- '楓=枫',
- '襖=袄',
- '饗=飨',
- '饜=餍',
- '襝=裣',
- '饞=馋',
- '襠=裆',
- '饢=馕',
- '襤=褴',
- '奧=奥',
- '楨=桢',
- '奩=奁',
- '奪=夺',
- '襪=袜',
- '業=业',
- '奮=奋',
- '襯=衬',
- '襲=袭',
- '襴=襕',
- '極=极',
- '祿=禄',
- '見=见',
- '禍=祸',
- '禎=祯',
- '覎=觃',
- '規=规',
- '覓=觅',
- '禕=祎',
- '視=视',
- '覘=觇',
- '妝=妆',
- '覡=觋',
- '覥=觍',
- '禦=御',
- '覦=觎',
- '親=亲',
- '榪=杩',
- '禪=禅',
- '覬=觊',
- '馬=马',
- '馭=驭',
- '馮=冯',
- '禮=礼',
- '榮=荣',
- '覯=觏',
- '禰=祢',
- '禱=祷',
- '馱=驮',
- '覲=觐',
- '馳=驰',
- '馴=驯',
- '覷=觑',
- '馹=驲',
- '覺=觉',
- '覽=览',
- '禿=秃',
- '榿=桤',
- '覿=觌',
- '觀=观',
- '槁=藁',
- '駁=驳',
- '秈=籼',
- '構=构',
- '槍=枪',
- '姍=姗',
- '駐=驻',
- '駑=驽',
- '駒=驹',
- '駔=驵',
- '駕=驾',
- '駘=骀',
- '駙=驸',
- '駛=驶',
- '駝=驼',
- '駟=驷',
- '駢=骈',
- '槧=椠',
- '槨=椁',
- '駭=骇',
- '駰=骃',
- '駱=骆',
- '槳=桨',
- '觴=觞',
- '觶=觯',
- '觸=触',
- '駸=骎',
- '駿=骏',
- '樁=桩',
- '訁=讠',
- '騁=骋',
- '樂=乐',
- '訂=订',
- '騂=骍',
- '訃=讣',
- '樅=枞',
- '稅=税',
- '騅=骓',
- '稈=秆',
- '計=计',
- '訊=讯',
- '訌=讧',
- '騌=骔',
- '騍=骒',
- '討=讨',
- '騎=骑',
- '騏=骐',
- '訐=讦',
- '訒=讱',
- '樓=楼',
- '訓=训',
- '訕=讪',
- '訖=讫',
- '騖=骛',
- '記=记',
- '標=标',
- '騙=骗',
- '娛=娱',
- '訛=讹',
- '訝=讶',
- '樞=枢',
- '稟=禀',
- '訟=讼',
- '樣=样',
- '訣=诀',
- '騤=骙',
- '訥=讷',
- '訩=讻',
- '訪=访',
- '騫=骞',
- '設=设',
- '騭=骘',
- '種=种',
- '騮=骝',
- '騰=腾',
- '稱=称',
- '許=许',
- '訴=诉',
- '訶=诃',
- '騶=驺',
- '騷=骚',
- '樸=朴',
- '騸=骟',
- '樹=树',
- '樺=桦',
- '診=诊',
- '騾=骡',
- '驀=蓦',
- '穀=谷',
- '婁=娄',
- '詁=诂',
- '驁=骜',
- '驂=骖',
- '驃=骠',
- '驄=骢',
- '驅=驱',
- '詆=诋',
- '橈=桡',
- '驊=骅',
- '橋=桥',
- '穌=稣',
- '驌=骕',
- '積=积',
- '驍=骁',
- '詎=讵',
- '穎=颖',
- '驏=骣',
- '詐=诈',
- '詒=诒',
- '詔=诏',
- '評=评',
- '驕=骄',
- '詖=诐',
- '詗=诇',
- '驗=验',
- '詘=诎',
- '驚=惊',
- '詛=诅',
- '驛=驿',
- '詞=词',
- '機=机',
- '驟=骤',
- '詠=咏',
- '穠=秾',
- '穡=穑',
- '詡=诩',
- '橢=椭',
- '穢=秽',
- '詢=询',
- '驢=驴',
- '詣=诣',
- '驤=骧',
- '驥=骥',
- '婦=妇',
- '試=试',
- '驦=骦',
- '穩=稳',
- '詩=诗',
- '驪=骊',
- '橫=横',
- '詫=诧',
- '驫=骉',
- '詬=诟',
- '婭=娅',
- '穭=稆',
- '詭=诡',
- '詮=诠',
- '詰=诘',
- '話=话',
- '該=该',
- '詳=详',
- '詵=诜',
- '詼=诙',
- '詿=诖',
- '檁=檩',
- '誄=诔',
- '誅=诛',
- '誆=诓',
- '誇=夸',
- '檉=柽',
- '誌=志',
- '認=认',
- '誑=诳',
- '誒=诶',
- '檔=档',
- '誕=诞',
- '誘=诱',
- '誚=诮',
- '檜=桧',
- '語=语',
- '檟=槚',
- '誠=诚',
- '誡=诫',
- '檢=检',
- '檣=樯',
- '誣=诬',
- '誤=误',
- '誥=诰',
- '誦=诵',
- '媧=娲',
- '誨=诲',
- '窩=窝',
- '窪=洼',
- '說=说',
- '檮=梼',
- '窮=穷',
- '媯=妫',
- '窯=窑',
- '誰=谁',
- '課=课',
- '檳=槟',
- '窶=窭',
- '誶=谇',
- '檸=柠',
- '誹=诽',
- '窺=窥',
- '檻=槛',
- '媼=媪',
- '誼=谊',
- '媽=妈',
- '檾=苘',
- '調=调',
- '諂=谄',
- '櫃=柜',
- '竄=窜',
- '諄=谆',
- '竅=窍',
- '竇=窦',
- '談=谈',
- '諉=诿',
- '竊=窃',
- '嫋=袅',
- '請=请',
- '諍=诤',
- '諏=诹',
- '髏=髅',
- '諑=诼',
- '諒=谅',
- '櫓=橹',
- '體=体',
- '髕=髌',
- '論=论',
- '髖=髋',
- '嫗=妪',
- '諗=谂',
- '櫚=榈',
- '櫛=栉',
- '諛=谀',
- '諜=谍',
- '櫝=椟',
- '諝=谞',
- '櫞=橼',
- '諞=谝',
- '櫟=栎',
- '諡=谥',
- '諢=诨',
- '諤=谔',
- '櫥=橱',
- '諦=谛',
- '櫧=槠',
- '諧=谐',
- '櫨=栌',
- '櫪=枥',
- '櫫=橥',
- '諫=谏',
- '櫬=榇',
- '諭=谕',
- '諮=谘',
- '諱=讳',
- '櫳=栊',
- '諳=谙',
- '嫵=妩',
- '競=竞',
- '諶=谌',
- '諷=讽',
- '櫸=榉',
- '諸=诸',
- '諺=谚',
- '嫻=娴',
- '櫻=樱',
- '諼=谖',
- '諾=诺',
- '嫿=婳',
- '謀=谋',
- '鬁=疬',
- '謁=谒',
- '謂=谓',
- '欄=栏',
- '謄=誊',
- '謅=诌',
- '鬆=松',
- '嬈=娆',
- '權=权',
- '謊=谎',
- '嬋=婵',
- '嬌=娇',
- '謎=谜',
- '欏=椤',
- '謐=谧',
- '欒=栾',
- '謔=谑',
- '欖=榄',
- '謖=谡',
- '謗=谤',
- '嬙=嫱',
- '謙=谦',
- '講=讲',
- '謝=谢',
- '欞=棂',
- '謠=谣',
- '嬡=嫒',
- '鬢=鬓',
- '嬤=嬷',
- '鬥=斗',
- '謨=谟',
- '鬨=闹',
- '鬩=阋',
- '嬪=嫔',
- '謫=谪',
- '謬=谬',
- '鬮=阄',
- '嬰=婴',
- '鬱=郁',
- '謳=讴',
- '嬸=婶',
- '謹=谨',
- '欽=钦',
- '謾=谩',
- '筆=笔',
- '證=证',
- '孌=娈',
- '筍=笋',
- '歎=叹',
- '譎=谲',
- '魎=魉',
- '譏=讥',
- '歐=欧',
- '譖=谮',
- '識=识',
- '魘=魇',
- '譙=谯',
- '譚=谭',
- '魚=鱼',
- '魛=鱽',
- '譜=谱',
- '歟=欤',
- '歡=欢',
- '魢=鱾',
- '筧=笕',
- '魨=鲀',
- '孫=孙',
- '譫=谵',
- '譯=译',
- '魯=鲁',
- '議=议',
- '歲=岁',
- '譴=谴',
- '魴=鲂',
- '護=护',
- '魷=鱿',
- '學=学',
- '歸=归',
- '譸=诪',
- '魺=鲄',
- '譽=誉',
- '譾=谫',
- '孿=孪',
- '歿=殁',
- '讀=读',
- '鮁=鲅',
- '鮃=鲆',
- '變=变',
- '鮊=鲌',
- '箋=笺',
- '讋=詟',
- '鮋=鲉',
- '鮍=鲏',
- '讎=雠',
- '箏=筝',
- '鮐=鲐',
- '鮑=鲍',
- '讒=谗',
- '鮒=鲋',
- '讓=让',
- '鮓=鲊',
- '讕=谰',
- '讖=谶',
- '殘=残',
- '讚=赞',
- '鮚=鲒',
- '讜=谠',
- '鮜=鲘',
- '殞=殒',
- '讞=谳',
- '鮞=鲕',
- '殤=殇',
- '鮦=鲖',
- '鮪=鲔',
- '殫=殚',
- '鮫=鲛',
- '鮭=鲑',
- '殮=殓',
- '宮=宫',
- '鮮=鲜',
- '殯=殡',
- '殲=歼',
- '鮳=鲓',
- '鮶=鲪',
- '殺=杀',
- '鮺=鲝',
- '殼=壳',
- '毀=毁',
- '節=节',
- '鯀=鲧',
- '鯁=鲠',
- '範=范',
- '毆=殴',
- '鯇=鲩',
- '築=筑',
- '鯉=鲤',
- '鯊=鲨',
- '篋=箧',
- '鯒=鲬',
- '鯔=鲻',
- '鯕=鲯',
- '鯖=鲭',
- '鯗=鲞',
- '鯛=鲷',
- '鯝=鲴',
- '鯡=鲱',
- '寢=寝',
- '鯢=鲵',
- '篤=笃',
- '鯤=鲲',
- '實=实',
- '寧=宁',
- '鯧=鲳',
- '鯨=鲸',
- '審=审',
- '篩=筛',
- '鯪=鲮',
- '寫=写',
- '鯫=鲰',
- '寬=宽',
- '鯰=鲶',
- '篳=筚',
- '鯴=鲺',
- '寵=宠',
- '鯵=鲹',
- '寶=宝',
- '鯷=鳀',
- '鯽=鲫',
- '毿=毵',
- '鯿=鳊',
- '簀=箦',
- '鰁=鳈',
- '鰂=鲗',
- '鰃=鳂',
- '將=将',
- '專=专',
- '氈=毡',
- '鰈=鲽',
- '鰉=鳇',
- '尋=寻',
- '氌=氇',
- '對=对',
- '簍=篓',
- '鰍=鳅',
- '導=导',
- '鰏=鲾',
- '鰒=鳆',
- '鰓=鳃',
- '谘=咨',
- '鰜=鳒',
- '簞=箪',
- '鰟=鳑',
- '鰠=鳋',
- '簡=简',
- '氣=气',
- '簣=篑',
- '鰣=鲥',
- '鰥=鳏',
- '鰨=鳎',
- '鰩=鳐',
- '氫=氢',
- '簫=箫',
- '氬=氩',
- '鰭=鳍',
- '鰮=鳁',
- '鰱=鲢',
- '氳=氲',
- '鰳=鳓',
- '鰵=鳘',
- '尷=尴',
- '簷=檐',
- '鰷=鲦',
- '氹=凼',
- '簹=筜',
- '鰹=鲣',
- '鰻=鳗',
- '鰼=鳛',
- '簽=签',
- '簾=帘',
- '鰾=鳔',
- '鱂=鳉',
- '籃=篮',
- '鱅=鳙',
- '屆=届',
- '豈=岂',
- '鱈=鳕',
- '鱉=鳖',
- '籌=筹',
- '屍=尸',
- '豎=竖',
- '豐=丰',
- '鱒=鳟',
- '豔=艳',
- '鱔=鳝',
- '鱖=鳜',
- '鱗=鳞',
- '鱘=鲟',
- '汙=污',
- '屙=疴',
- '籙=箓',
- '屜=屉',
- '籜=箨',
- '鱝=鲼',
- '籟=籁',
- '鱟=鲎',
- '籠=笼',
- '鱠=鲙',
- '屢=屡',
- '鱣=鳣',
- '層=层',
- '鱤=鳡',
- '鱧=鳢',
- '屨=屦',
- '鱨=鲿',
- '籩=笾',
- '籪=簖',
- '屬=属',
- '豬=猪',
- '籬=篱',
- '屭=屃',
- '鱭=鲚',
- '籮=箩',
- '鱯=鳠',
- '籲=吁',
- '豶=豮',
- '鱷=鳄',
- '鱸=鲈',
- '決=决',
- '鱺=鲡',
- '貓=猫',
- '貝=贝',
- '貞=贞',
- '貟=贠',
- '負=负',
- '岡=冈',
- '財=财',
- '貢=贡',
- '貧=贫',
- '貨=货',
- '販=贩',
- '貪=贪',
- '貫=贯',
- '責=责',
- '貯=贮',
- '貰=贳',
- '貲=赀',
- '貳=贰',
- '貴=贵',
- '粵=粤',
- '貶=贬',
- '買=买',
- '貸=贷',
- '貺=贶',
- '費=费',
- '貼=贴',
- '貽=贻',
- '貿=贸',
- '賀=贺',
- '況=况',
- '賁=贲',
- '賂=赂',
- '賃=赁',
- '賄=贿',
- '賅=赅',
- '資=资',
- '賈=贾',
- '糊=煳',
- '賊=贼',
- '賑=赈',
- '賒=赊',
- '賓=宾',
- '賕=赇',
- '賙=赒',
- '賚=赉',
- '賜=赐',
- '糝=糁',
- '糞=粪',
- '賞=赏',
- '賠=赔',
- '賡=赓',
- '賢=贤',
- '賣=卖',
- '賤=贱',
- '鳥=鸟',
- '賦=赋',
- '糧=粮',
- '鳧=凫',
- '賧=赕',
- '鳩=鸠',
- '質=质',
- '賬=账',
- '賭=赌',
- '糲=粝',
- '鳲=鸤',
- '鳳=凤',
- '糴=籴',
- '峴=岘',
- '賴=赖',
- '鳴=鸣',
- '賵=赗',
- '島=岛',
- '糶=粜',
- '鳶=鸢',
- '糸=纟',
- '賺=赚',
- '賻=赙',
- '購=购',
- '峽=峡',
- '賽=赛',
- '糾=纠',
- '賾=赜',
- '紀=纪',
- '紂=纣',
- '約=约',
- '贄=贽',
- '紅=红',
- '贅=赘',
- '紆=纡',
- '鴆=鸩',
- '紇=纥',
- '贇=赟',
- '鴇=鸨',
- '紈=纨',
- '贈=赠',
- '紉=纫',
- '鴉=鸦',
- '紋=纹',
- '崍=崃',
- '納=纳',
- '贍=赡',
- '贏=赢',
- '紐=纽',
- '贐=赆',
- '鴒=鸰',
- '紓=纾',
- '贓=赃',
- '純=纯',
- '贔=赑',
- '紕=纰',
- '鴕=鸵',
- '紖=纼',
- '贖=赎',
- '崗=岗',
- '紗=纱',
- '贗=赝',
- '紘=纮',
- '紙=纸',
- '級=级',
- '紛=纷',
- '贛=赣',
- '鴛=鸳',
- '紜=纭',
- '紝=纴',
- '鴝=鸲',
- '鴞=鸮',
- '鴟=鸱',
- '崠=岽',
- '紡=纺',
- '崢=峥',
- '鴣=鸪',
- '鴦=鸯',
- '鴨=鸭',
- '鴬=鸴',
- '紮=扎',
- '鴯=鸸',
- '細=细',
- '鴰=鸹',
- '紱=绂',
- '崳=嵛',
- '紳=绅',
- '鴴=鸻',
- '紵=纻',
- '洶=汹',
- '紹=绍',
- '紺=绀',
- '鴻=鸿',
- '紼=绋',
- '紿=绐',
- '鴿=鸽',
- '絀=绌',
- '終=终',
- '鵂=鸺',
- '鵃=鸼',
- '組=组',
- '絆=绊',
- '絎=绗',
- '絏=绁',
- '嵐=岚',
- '結=结',
- '鵐=鹀',
- '鵑=鹃',
- '鵒=鹆',
- '鵓=鹁',
- '絕=绝',
- '絛=绦',
- '鵜=鹈',
- '絝=绔',
- '鵝=鹅',
- '絞=绞',
- '鵠=鹄',
- '絡=络',
- '鵡=鹉',
- '絢=绚',
- '給=给',
- '絨=绒',
- '鵪=鹌',
- '赬=赪',
- '鵬=鹏',
- '鵮=鹐',
- '鵯=鹎',
- '絰=绖',
- '統=统',
- '絲=丝',
- '鵲=鹊',
- '絳=绛',
- '鵷=鹓',
- '浹=浃',
- '絹=绢',
- '嶁=嵝',
- '綁=绑',
- '綃=绡',
- '嶄=崭',
- '綆=绠',
- '涇=泾',
- '嶇=岖',
- '鶇=鸫',
- '綈=绨',
- '鶉=鹑',
- '鶊=鹒',
- '綌=绤',
- '綏=绥',
- '經=经',
- '鶓=鹋',
- '嶔=嵚',
- '趕=赶',
- '嶗=崂',
- '鶘=鹕',
- '趙=赵',
- '鶚=鹗',
- '綜=综',
- '綞=缍',
- '嶠=峤',
- '綠=绿',
- '鶡=鹖',
- '嶢=峣',
- '綢=绸',
- '綣=绻',
- '鶤=鹍',
- '鶥=鹛',
- '嶧=峄',
- '嶨=峃',
- '趨=趋',
- '鶩=鹜',
- '綬=绶',
- '鶬=鸧',
- '維=维',
- '嶮=崄',
- '綯=绹',
- '鶯=莺',
- '綰=绾',
- '綱=纲',
- '網=网',
- '趲=趱',
- '鶲=鹟',
- '嶴=岙',
- '綴=缀',
- '鶴=鹤',
- '嶸=嵘',
- '綸=纶',
- '綹=绺',
- '鶹=鹠',
- '綺=绮',
- '嶺=岭',
- '鶺=鹡',
- '綻=绽',
- '鶻=鹘',
- '涼=凉',
- '嶼=屿',
- '鶼=鹣',
- '嶽=岳',
- '綽=绰',
- '綾=绫',
- '綿=绵',
- '鶿=鹚',
- '鷁=鹢',
- '鷂=鹞',
- '緄=绲',
- '緇=缁',
- '緊=紧',
- '鷊=鹝',
- '巋=岿',
- '緋=绯',
- '淒=凄',
- '巒=峦',
- '緒=绪',
- '緓=绬',
- '鷓=鹧',
- '巔=巅',
- '緔=绱',
- '鷖=鹥',
- '緗=缃',
- '鷗=鸥',
- '緘=缄',
- '緙=缂',
- '鷙=鸷',
- '淚=泪',
- '線=缐',
- '鷚=鹨',
- '緝=缉',
- '緞=缎',
- '締=缔',
- '緡=缗',
- '跡=迹',
- '緣=缘',
- '淥=渌',
- '鷥=鸶',
- '緦=缌',
- '鷦=鹪',
- '淨=净',
- '編=编',
- '淩=凌',
- '緩=缓',
- '淪=沦',
- '鷫=鹔',
- '緬=缅',
- '緯=纬',
- '鷯=鹩',
- '巰=巯',
- '緱=缑',
- '緲=缈',
- '鷲=鹫',
- '鷳=鹇',
- '練=练',
- '淵=渊',
- '緶=缏',
- '淶=涞',
- '鷸=鹬',
- '緹=缇',
- '巹=卺',
- '鷹=鹰',
- '淺=浅',
- '鷺=鹭',
- '鸇=鹯',
- '縈=萦',
- '縉=缙',
- '縊=缢',
- '縋=缒',
- '鸌=鹱',
- '鸏=鹲',
- '縐=绉',
- '踐=践',
- '縑=缣',
- '縕=缊',
- '鸕=鸬',
- '縗=缞',
- '鸘=鹴',
- '渙=涣',
- '鸚=鹦',
- '減=减',
- '縛=缚',
- '鸛=鹳',
- '縝=缜',
- '鸝=鹂',
- '縞=缟',
- '鸞=鸾',
- '丟=丢',
- '縟=缛',
- '渢=沨',
- '縣=县',
- '帥=帅',
- '並=并',
- '渦=涡',
- '師=师',
- '縫=缝',
- '測=测',
- '縭=缡',
- '縮=缩',
- '縱=纵',
- '縲=缧',
- '帳=帐',
- '踴=踊',
- '縵=缦',
- '帶=带',
- '縶=絷',
- '縷=缕',
- '縹=缥',
- '總=总',
- '渾=浑',
- '績=绩',
- '幀=帧',
- '幃=帏',
- '繃=绷',
- '繅=缫',
- '繆=缪',
- '繈=襁',
- '湊=凑',
- '蹌=跄',
- '繒=缯',
- '織=织',
- '繕=缮',
- '蹕=跸',
- '幗=帼',
- '幘=帻',
- '繚=缭',
- '湞=浈',
- '繞=绕',
- '幟=帜',
- '蹠=跖',
- '繡=绣',
- '繢=缋',
- '幣=币',
- '湣=愍',
- '蹣=蹒',
- '蹤=踪',
- '湧=涌',
- '繩=绳',
- '繪=绘',
- '幫=帮',
- '幬=帱',
- '繭=茧',
- '繯=缳',
- '湯=汤',
- '繰=缲',
- '繳=缴',
- '鹵=卤',
- '鹹=咸',
- '繹=绎',
- '蹺=跷',
- '鹺=鹾',
- '鹼=硷',
- '繼=继',
- '鹽=盐',
- '繽=缤',
- '幾=几',
- '繾=缱',
- '亂=乱',
- '躂=跶',
- '麅=狍',
- '纇=颣',
- '溈=沩',
- '纈=缬',
- '躉=趸',
- '纊=纩',
- '躊=踌',
- '躋=跻',
- '續=续',
- '躍=跃',
- '纏=缠',
- '躑=踯',
- '躒=跞',
- '纓=缨',
- '躓=踬',
- '躕=蹰',
- '準=准',
- '纖=纤',
- '麗=丽',
- '纘=缵',
- '亙=亘',
- '躚=跹',
- '溜=熘',
- '纜=缆',
- '溝=沟',
- '亞=亚',
- '躡=蹑',
- '躥=蹿',
- '麥=麦',
- '躦=躜',
- '麩=麸',
- '躪=躏',
- '庫=库',
- '溫=温',
- '溮=浉',
- '溳=涢',
- '麵=面',
- '麼=么',
- '軀=躯',
- '廁=厕',
- '廂=厢',
- '黃=黄',
- '廄=厩',
- '滄=沧',
- '滅=灭',
- '廈=厦',
- '車=车',
- '軋=轧',
- '滌=涤',
- '軌=轨',
- '黌=黉',
- '軍=军',
- '廎=庼',
- '滎=荥',
- '軑=轪',
- '軒=轩',
- '軔=轫',
- '廚=厨',
- '軛=轭',
- '廝=厮',
- '點=点',
- '廟=庙',
- '軟=软',
- '廠=厂',
- '廡=庑',
- '廢=废',
- '廣=广',
- '軤=轷',
- '黨=党',
- '廩=廪',
- '軫=轸',
- '廬=庐',
- '滬=沪',
- '滯=滞',
- '滲=渗',
- '軲=轱',
- '黲=黪',
- '廳=厅',
- '黴=霉',
- '黶=黡',
- '黷=黩',
- '滸=浒',
- '軸=轴',
- '軹=轵',
- '軺=轺',
- '滻=浐',
- '軻=轲',
- '軼=轶',
- '黽=黾',
- '滾=磙',
- '軾=轼',
- '滿=满',
- '黿=鼋',
- '漁=渔',
- '鼂=鼌',
- '較=较',
- '輅=辂',
- '輇=辁',
- '鼇=鳌',
- '輈=辀',
- '載=载',
- '鼉=鼍',
- '漊=溇',
- '輊=轾',
- '輒=辄',
- '輔=辅',
- '輕=轻',
- '漚=沤',
- '輛=辆',
- '輜=辎',
- '輝=辉',
- '輞=辋',
- '輟=辍',
- '漢=汉',
- '漣=涟',
- '輥=辊',
- '輦=辇',
- '輩=辈',
- '輪=轮',
- '漬=渍',
- '輬=辌',
- '輯=辑',
- '漲=涨',
- '弳=弪',
- '輳=辏',
- '鼴=鼹',
- '張=张',
- '漵=溆',
- '強=强',
- '漸=渐',
- '輸=输',
- '輻=辐',
- '缽=钵',
- '輾=辗',
- '漿=浆',
- '輿=舆',
- '轀=辒',
- '潁=颍',
- '轂=毂',
- '轄=辖',
- '轅=辕',
- '彆=别',
- '轆=辘',
- '佇=伫',
- '齇=齄',
- '彈=弹',
- '轉=转',
- '齊=齐',
- '齋=斋',
- '彌=弥',
- '罌=罂',
- '轍=辙',
- '彎=弯',
- '齎=赍',
- '轎=轿',
- '齏=齑',
- '潑=泼',
- '齒=齿',
- '潔=洁',
- '轔=辚',
- '齔=龀',
- '齕=龁',
- '齗=龂',
- '佘=畲',
- '彙=汇',
- '齙=龅',
- '潛=潜',
- '齜=龇',
- '轟=轰',
- '齟=龃',
- '彠=彟',
- '齠=龆',
- '轡=辔',
- '齡=龄',
- '轢=轹',
- '潤=润',
- '轤=轳',
- '彥=彦',
- '齦=龈',
- '齧=啮',
- '齪=龊',
- '齬=龉',
- '潯=浔',
- '潰=溃',
- '罰=罚',
- '齲=龋',
- '罵=骂',
- '齶=腭',
- '潷=滗',
- '罷=罢',
- '齷=龌',
- '潿=涠',
- '澀=涩',
- '羅=罗',
- '來=来',
- '澆=浇',
- '羆=罴',
- '澇=涝',
- '羈=羁',
- '羋=芈',
- '後=后',
- '龍=龙',
- '龐=庞',
- '徑=径',
- '龔=龚',
- '龕=龛',
- '侖=仑',
- '澗=涧',
- '龜=龟',
- '從=从',
- '徠=徕',
- '澠=渑',
- '澤=泽',
- '羥=羟',
- '辦=办',
- '澦=滪',
- '羨=羡',
- '義=义',
- '澩=泶',
- '辭=辞',
- '澮=浍',
- '辮=辫',
- '辯=辩',
- '澱=淀',
- '農=农',
- '侶=侣',
- '徹=彻',
- '濁=浊',
- '俁=俣',
- '係=系',
- '濃=浓',
- '習=习',
- '濔=沵',
- '濕=湿',
- '濘=泞',
- '濜=浕',
- '濟=济',
- '俠=侠',
- '濤=涛',
- '濫=漤',
- '翬=翚',
- '濰=潍',
- '濱=滨',
- '翹=翘',
- '濺=溅',
- '濼=泺',
- '翽=翙',
- '濾=滤'
-];
-
-const List<String> MULTI_PINYIN_DICT = const [
- '奇偶=jī,ǒu',
- '俯首帖耳=fǔ,shǒu,tiē,ěr',
- '委靡=wěi,mǐ',
- '正月=zhēng,yuè',
- '倒嗓=dǎo,sǎng',
- '教学相长=jiào,xué,xiāng,zhǎng',
- '挨个=āi,gè',
- '阿罗汉=ā,luó,hàn',
- '口供=kǒu,gòng',
- '伺候=cì,hòu',
- '柞水=zhà,shuǐ',
- '大汗=dà,hán',
- '背静=bèi,jìng',
- '抛头露面=pāo,tóu,lù,miàn',
- '露天=lù,tiān',
- '排忧解难=pái,yōu,jiě,nán',
- '看门=kān,mén',
- '横财=hèng,cái',
- '躯壳=qū,qiào',
- '答复=dá,fù',
- '复辟=fù,bì',
- '应届=yīng,jiè',
- '风靡=fēng,mǐ',
- '月晕=yuè,yùn',
- '乘客=chéng,kè',
- '荨麻=xún,má',
- '关卡=guān,qiǎ',
- '掂掇=diān,duo',
- '闭门造车=bì,mén,zào,chē',
- '如法炮制=rú,fǎ,páo,zhì',
- '行伍=háng,wǔ',
- '不差累黍=bù,chà,lěi,shǔ',
- '二十八宿=èr,shí,bā,xiù',
- '曲高和寡=qǔ,gāo,hè,guǎ',
- '渑池=miǎn,chí',
- '创伤=chuāng,shāng',
- '差额=chā,é',
- '贫血=pín,xuè',
- '咽喉=yān,hóu',
- '苫布=shàn,bù',
- '择席=zhái,xí',
- '和药=huò,yào',
- '吁求=yù,qiú',
- '登载=dēng,zǎi',
- '家畜=jiā,chù',
- '万头攒动=wàn,tóu,cuán,dòng',
- '绿林=lù,lín',
- '属意=zhǔ,yì',
- '强词夺理=qiǎng,cí,duó,lǐ',
- '差点=chà,diǎn',
- '搀和=chān,huo',
- '铜臭=tóng,xiù',
- '称呼=chēng,hū',
- '畜牧=xù,mù',
- '理发=lǐ,fà',
- '宁可=nìng,kě',
- '装模作样=zhuāng,mú,zuò,yàng',
- '估量=gū,liang',
- '济济一堂=jǐ,jǐ,yī,táng',
- '着忙=zháo,máng',
- '传记=zhuàn,jì',
- '好吃懒做=hào,chī,lǎn,zuò',
- '好色=hào,sè',
- '一差二错=yī,chā,èr,cuò',
- '扁担=biǎn,dàn',
- '创作=chuàng,zuò',
- '转动=zhuàn,dòng',
- '搅合=jiǎo,hé',
- '紫衫=zǐ,shān',
- '畜力=chù,lì',
- '碉堡=diāo,bǎo',
- '鲜见=xiǎn,jiàn',
- '着迷=zháo,mí',
- '干部=gàn,bù',
- '阴差阳错=yīn,chā,yáng,cuò',
- '暖和=nuǎn,huo',
- '打颤=dǎ,zhàn',
- '捧场=pěng,chǎng',
- '中奖=zhòng,jiǎng',
- '好动=hào,dòng',
- '仆从=pú,cóng',
- '杯水车薪=bēi,shuǐ,chē,xīn',
- '歃血为盟=shà,xuè,wéi,méng',
- '打点=dǎ,diǎn',
- '间道=jiàn,dào',
- '削减=xuē,jiǎn',
- '供销=gōng,xiāo',
- '脱发=tuō,fà',
- '劲敌=jìng,dí',
- '煞白=shà,bái',
- '心血=xīn,xuè',
- '草苫=cǎo,shān',
- '骨干=gǔ,gàn',
- '等量齐观=děng,liàng,qí,guān',
- '手臂=shǒu,bì',
- '茄子=qié,zi',
- '传说=chuán,shuō',
- '倒嚼=dǎo,jiào',
- '成都=chéng,dū',
- '处女=chǔ,nǚ',
- '坦率=tǎn,shuài',
- '瘦削=shòu,xuē',
- '着急=zháo,jí',
- '蛮横=mán,hèng',
- '请帖=qǐng,tiě',
- '外场=wài,cháng',
- '种植=zhòng,zhí',
- '重复=chóng,fù',
- '战栗=zhàn,lì',
- '杉木=shā,mù',
- '逮捕=dài,bǔ',
- '当日=dāng,rì',
- '蹊跷=qī,qiāo',
- '搭载=dā,zài',
- '连累=lián,lěi',
- '嚏喷=tì,pen',
- '扫帚=sào,zhǒu',
- '当时=dāng,shí',
- '倒仓=dǎo,cāng',
- '东莞=dōng,guǎn',
- '积攒=jī,zǎn',
- '沓子=tà,zǐ',
- '安宁=ān,níng',
- '土著=tǔ,zhù',
- '声调=shēng,diào',
- '妥帖=tuǒ,tiē',
- '相片儿=xiàng,piān,er',
- '应用=yìng,yòng',
- '牲畜=shēng,chù',
- '处决=chǔ,jué',
- '相机行事=xiàng,jī,xíng,shì',
- '切削=qiē,xiāo',
- '怨声载道=yuàn,shēng,zài,dào',
- '脉脉=mò,mò',
- '热和=rè,huo',
- '我们俩=wǒ,mēn,liǎ',
- '芥末=jiè,mò',
- '巷道=hàng,dào',
- '湖泊=hú,pō',
- '冠心病=guān,xīn,bìng',
- '钻床=zuàn,chuáng',
- '攒射=cuán,shè',
- '悄然=qiǎo,rán',
- '朴刀=pō,dāo',
- '切割=qiē,gē',
- '吐谷浑=tǔ,yù,hún',
- '雪茄=xuě,jiā',
- '圩子=wéi,zǐ',
- '草率=cǎo,shuài',
- '投奔=tóu,bèn',
- '牵累=qiān,lěi',
- '尖嘴薄舌=jiān,zuǐ,bó,shé',
- '剿说=chāo,shuō',
- '熨帖=yù,tiē',
- '莎草=suō,cǎo',
- '喝止=hè,zhǐ',
- '创造=chuàng,zào',
- '苏打=sū,dá',
- '弄堂=lòng,táng',
- '法家拂士=fǎ,jiā,bì,shì',
- '经幢=jīng,chuáng',
- '尾巴=wěi,bā',
- '管窥蠡测=guǎn,kuī,lí,cè',
- '好学=hào,xué',
- '差强人意=chā,qiǎng,rén,yì',
- '黄埔=huáng,pǔ',
- '不差=bù,chà',
- '说服=shuì,fú',
- '处分=chǔ,fèn',
- '当年=dāng,nián',
- '林荫道=lín,yīn,dào',
- '星宿=xīng,xiù',
- '大而无当=dà,ér,wú,dàng',
- '运转=yùn,zhuǎn',
- '结巴=jiē,bā',
- '打哈欠=dǎ,hā,qiàn',
- '阻塞=zǔ,sè',
- '曲牌=qǔ,pái',
- '水杉=shuǐ,shān',
- '忖度=cǔn,duó',
- '骨朵=gū,duǒ',
- '桑葚儿=sāng,rèn,er',
- '露骨=lù,gǔ',
- '佣钱=yòng,qián',
- '柏林=bó,lín',
- '挨近=āi,jìn',
- '倒板=dǎo,bǎn',
- '引吭高歌=yǐn,háng,gāo,gē',
- '排山倒海=pái,shān,dǎo,hǎi',
- '色差=sè,chā',
- '倔强=jué,jiàng',
- '枸橘=gōu,jú',
- '背脊=bèi,jǐ',
- '屏气=bǐng,qì',
- '埋怨=mán,yuàn',
- '油坊=yóu,fáng',
- '着意=zhuó,yì',
- '强颜欢笑=qiǎng,yán,huān,xiào',
- '一唱一和=yī,chàng,yī,hè',
- '曲艺=qǔ,yì',
- '殷红=yān,hóng',
- '好客=hào,kè',
- '乳臭=rǔ,xiù',
- '打量=dǎ,liang',
- '和泥=huó,ní',
- '瓦刀=wà,dāo',
- '拓片=tà,piàn',
- '染坊=rǎn,fáng',
- '中牟=zhōng,mù',
- '记载=jì,zǎi',
- '谷坊=gǔ,fáng',
- '不省人事=bù,xǐng,rén,shì',
- '吉人天相=jí,rén,tiān,xiàng',
- '应时=yìng,shí',
- '靡费=mí,fèi',
- '出没=chū,mò',
- '蔚县=yù,xiàn',
- '相称=xiāng,chèn',
- '差别=chā,bié',
- '露苗=lòu,miáo',
- '钻杆=zuàn,gǎn',
- '重创=zhòng,chuāng',
- '芥蓝菜=gài,lán,cài',
- '围剿=wéi,jiǎo',
- '三更=sān,gēng',
- '着慌=zháo,huāng',
- '否极泰来=pǐ,jí,tài,lái',
- '银行=yín,háng',
- '轧钢=zhá,gāng',
- '好古=hào,gǔ',
- '脑壳=nǎo,ké',
- '甲壳=jiǎ,qiào',
- '乐器=yuè,qì',
- '披靡=pī,mǐ',
- '脖颈=bó,gěng',
- '好吹牛=hào,chuī,niú',
- '瓶塞=píng,sāi',
- '袅娜=niǎo,nuó',
- '负荷=fù,hè',
- '首都=shǒu,dū',
- '扒手=pá,shǒu',
- '当地=dāng,dì',
- '咀嚼=jǔ,jué',
- '配角=pèi,jué',
- '威吓=wēi,hè',
- '模样=mú,yàng',
- '薄弱=bó,ruò',
- '通缉=tōng,jī',
- '落价=lào,jià',
- '口觉=kǒu,jué',
- '场所=chǎng,suǒ',
- '拾级而上=shè,jí,ér,shàng',
- '里应外合=lǐ,yìng,wài,hé',
- '翅膀=chì,bǎng',
- '作为=zuò,wéi',
- '枞阳=zōng,yáng',
- '狗血喷头=gǒu,xuè,pēn,tóu',
- '几案=jī,àn',
- '的确=dí,què',
- '参差=cēn,cī',
- '吴堡=wú,bǔ',
- '吭声=kēng,shēng',
- '疾风劲草=jí,fēng,jìng,cǎo',
- '数见不鲜=shuò,jiàn,bù,xiān',
- '寒号=hán,hào',
- '柞蚕=zuò,cán',
- '退避三舍=tuì,bì,sān,shè',
- '着重=zhuó,zhòng',
- '阿胶=ē,jiāo',
- '参与=cān,yù',
- '着凉=zháo,liáng',
- '干劲=gàn,jìn',
- '种花=zhòng,huā',
- '活塞=huó,sāi',
- '溃烂=kuì,làn',
- '供给=gōng,jǐ',
- '嘲骂=cháo,mà',
- '捋胡子=lǚ,hú,zǐ',
- '大曲=dà,qū',
- '颠三倒四=diān,sān,dǎo,sì',
- '乐曲=yuè,qǔ',
- '直言贾祸=zhí,yán,gǔ,huò',
- '马尾巴=mǎ,yǐ,bā',
- '间或=jiàn,huò',
- '强劲=qiáng,jìng',
- '给予=jǐ,yǔ',
- '传问=chuán,wèn',
- '蚌埠=bèng,bù',
- '放假=fàng,jià',
- '露富=lòu,fù',
- '喷香=pèn,xiāng',
- '禅让=shàn,ràng',
- '播种=bō,zhǒng',
- '萝卜=luó,bo',
- '应付=yìng,fù',
- '瓦窑堡=wǎ,yáo,bǔ',
- '传闻=chuán,wén',
- '柞绸=zuò,chóu',
- '宽绰=kuān,chuo',
- '上供=shàng,gòng',
- '古刹=gǔ,chà',
- '水浒传=shuǐ,hǔ,zhuàn',
- '压蔓=yā,wàn',
- '更换=gēng,huàn',
- '大伯=dà,bó',
- '大腹便便=dà,fù,pián,pián',
- '落枕=lào,zhěn',
- '五更=wǔ,gēng',
- '华山=huà,shān',
- '泌阳=bì,yáng',
- '软和=ruǎn,huo',
- '瓜葛=guā,gé',
- '裨益=bì,yì',
- '削球=xiāo,qiú',
- '不着边际=bù,zhuó,biān,jì',
- '患难与共=huàn,nàn,yǔ,gòng',
- '骨碌=gū,lu',
- '主角=zhǔ,jué',
- '溃脓=huì,nóng',
- '白纸坊=bái,zhǐ,fāng',
- '淡泊=dàn,bó',
- '补给=bǔ,jǐ',
- '着手=zhuó,shǒu',
- '钥匙=yào,shi',
- '差等=chā,děng',
- '冲床=chòng,chuáng',
- '缝隙=fèng,xì',
- '种草=zhòng,cǎo',
- '嘲笑=cháo,xiào',
- '角力=jué,lì',
- '调皮=tiáo,pí',
- '请假=qǐng,jià',
- '图穷匕见=tú,qióng,bǐ,xiàn',
- '虚与委蛇=xū,yǔ,wēi,yí',
- '笼统=lǒng,tǒng',
- '种子=zhǒng,zi',
- '了如指掌=liǎo,rú,zhǐ,zhǎng',
- '笼络=lǒng,luò',
- '吐蕃=tǔ,bō',
- '扒草=pá,cǎo',
- '涡河=guō,hé',
- '弃甲曳兵=qì,jiǎ,yè,bīng',
- '空白=kòng,bái',
- '天姥山=tiān,mǔ,shān',
- '亲家=qìng,jiā',
- '秦桧=qín,guì',
- '镐京=hào,jīng',
- '一曝十寒=yī,pù,shí,hán',
- '首创=shǒu,chuàng',
- '重荷=zhòng,hè',
- '弹药=dàn,yào',
- '曲调=qǔ,diào',
- '颠倒=diān,dǎo',
- '应征=yìng,zhēng',
- '作坊=zuō,fang',
- '牵强=qiān,qiǎng',
- '磨坊=mò,fáng',
- '屏藩=píng,fān',
- '貉绒=háo,róng',
- '侥幸=jiǎo,xìng',
- '模具=mú,jù',
- '摇曳=yáo,yè',
- '大埔=dà,bù',
- '处理=chǔ,lǐ',
- '稀薄=xī,bó',
- '落花生=luò,huā,shēng',
- '歙县=shè,xiàn',
- '大城=dài,chéng',
- '粘贴=zhān,tiē',
- '画片儿=huà,piān,er',
- '毛遂自荐=máo,suí,zì,jiàn',
- '堡垒=bǎo,lěi',
- '阿姨=ā,yí',
- '无数=wú,shù',
- '什物=shí,wù',
- '笼罩=lǒng,zhào',
- '重叠=chóng,dié',
- '东阿=dōng,ē',
- '头晕=tóu,yūn',
- '连翘=lián,qiáo',
- '应运=yìng,yùn',
- '没落=mò,luò',
- '悄寂=qiǎo,jì',
- '哄堂=hōng,táng',
- '重峦叠嶂=chóng,luán,dié,zhàng',
- '背包=bēi,bāo',
- '便宜=pián,yi',
- '瓜蔓=guā,wàn',
- '阿訇=ā,hōng',
- '晕车=yūn,chē',
- '嘲讽=cháo,fěng',
- '哈什蚂=hà,shí,mǎ',
- '带累=dài,lěi',
- '柴沟堡=chái,gōu,bǔ',
- '浒墅关=xǔ,shù,guān',
- '半身不遂=bàn,shēn,bù,suí',
- '烙饼=lào,bǐng',
- '遗臭万年=yí,chòu,wàn,nián',
- '淡薄=dàn,bó',
- '系鞋带=jì,xié,dài',
- '刚劲=gāng,jìng',
- '暑假=shǔ,jià',
- '称心=chèn,xīn',
- '不遂=bù,suí',
- '拗口=ào,kǒu',
- '颤栗=zhàn,lì',
- '骠骑=piào,qí',
- '落炕=lào,kàng',
- '数字=shù,zì',
- '呜咽=wū,yè',
- '屏幕=píng,mù',
- '粉坊=fěn,fáng',
- '疟疾=nüè,jí',
- '数据=shù,jù',
- '俩人=liǎ,rén',
- '数学=shù,xué',
- '哈达=hǎ,dá',
- '屏除=bǐng,chú',
- '场合=chǎng,hé',
- '卡子=qiǎ,zi',
- '服服帖帖=fú,fu,tiē,tiē',
- '夹带=jiā,dài',
- '赤身露体=chì,shēn,lù,tǐ',
- '钻具=zuàn,jù',
- '选择=xuǎn,zé',
- '了解=liǎo,jiě',
- '丢三落四=diū,sān,là,sì',
- '悬崖勒马=xuán,yá,lè,mǎ',
- '勾当=gòu,dàng',
- '间接=jiàn,jiē',
- '失着=shī,zhāo',
- '挨打=ái,dǎ',
- '侦缉=zhēn,jī',
- '大伯子=dà,bǎi,zǐ',
- '尺头=chǐ,tóu',
- '僬侥=jiāo,yáo',
- '骠勇=piào,yǒng',
- '味同嚼蜡=wèi,tóng,jiáo,là',
- '蛤蚌=gé,bàng',
- '差池=chā,chí',
- '校样=jiào,yàng',
- '倒戈=dǎo,gē',
- '当天=dàng,tiān',
- '枞树=cōng,shù',
- '度德量力=duó,dé,liàng,lì',
- '炮弹=pào,dàn',
- '刹车=shā,chē',
- '泥古不化=nì,gǔ,bù,huà',
- '熨烫=yùn,tàng',
- '晕倒=yūn,dǎo',
- '调查=diào,chá',
- '称职=chèn,zhí',
- '蔓延=màn,yán',
- '耕种=gēng,zhòng',
- '和面=huó,miàn',
- '哭天抢地=kū,tiān,qiāng,dì',
- '扫兴=sǎo,xìng',
- '冷场=lěng,chǎng',
- '发疟子=fā,yào,zǐ',
- '裨补=bì,bǔ',
- '称道=chēng,dào',
- '提防=dī,fáng',
- '乘便=chéng,biàn',
- '塞外=sài,wài',
- '累及=lěi,jí',
- '重沓=chóng,tà',
- '螳臂当车=táng,bì,dāng,chē',
- '驳壳枪=bó,ké,qiāng',
- '间谍=jiàn,dié',
- '翘楚=qiáo,chǔ',
- '剥削=bō,xuē',
- '敷衍塞责=fū,yǎn,sè,zé',
- '标识=biāo,zhì',
- '应傲=yìng,ào',
- '矩形=jǔ,xíng',
- '勒索=lè,suǒ',
- '血泊=xuè,pō',
- '屏弃=bǐng,qì',
- '红曲=hóng,qǔ',
- '勒紧=lēi,jǐn',
- '万箭攒心=wàn,jiàn,cuán,xīn',
- '刀耕火种=dāo,gēng,huǒ,zhòng',
- '各奔前程=gè,bèn,qián,chéng',
- '勒派=lè,pài',
- '更生=gēng,shēng',
- '排子车=pǎi,zǐ,chē',
- '露马脚=lòu,mǎ,jiǎo',
- '翘首=qiáo,shǒu',
- '转身=zhuǎn,shēn',
- '音乐=yīn,yuè',
- '游说=yóu,shuì',
- '都市=dū,shì',
- '佝偻=gōu,lóu',
- '没收=mò,shōu',
- '血泪=xuè,lèi',
- '大都=dà,dū',
- '提溜=dī,liū',
- '数落=shǔ,luò',
- '打擂=dǎ,lèi',
- '畜产=xù,chǎn',
- '单薄=dān,bó',
- '尿脬=suī,pāo',
- '伛偻=yǔ,lǚ',
- '重洋=chóng,yáng',
- '曳光弹=yè,guāng,dàn',
- '将校=jiàng,xiào',
- '惟妙惟肖=wéi,miào,wéi,xiào',
- '刁难=diāo,nàn',
- '应声=yīng,shēng',
- '反省=fǎn,xǐng',
- '属文=zhǔ,wén',
- '公诸同好=gōng,zhū,tóng,hào',
- '红杉=hóng,shān',
- '落膘=luò,biāo',
- '绰绰有余=chuò,chuò,yǒu,yú',
- '喝令=hè,lìng',
- '你们俩=nǐ,mēn,liǎ',
- '大夫=dài,fū',
- '着落=zhuó,luò',
- '看护=kān,hù',
- '视差=shì,chā',
- '葛藤=gé,téng',
- '着水=zhe,shuǐ',
- '尉迟=yù,chí',
- '荷枪实弹=hè,qiāng,shí,tán',
- '缩砂密=sù,shā,mì',
- '奇数=jī,shù',
- '萎靡=wěi,mǐ',
- '呕心沥血=ǒu,xīn,lì,xuè',
- '发难=fā,nàn',
- '钻空=zuān,kòng',
- '好管闲事=hào,guǎn,xián,shì',
- '龟裂=jūn,liè',
- '称意=chēng,yì',
- '一丘之貉=yī,qiū,zhī,hé',
- '轧辊=zhá,gǔn',
- '牢笼=láo,lóng',
- '重申=chóng,shēn',
- '重唱=chóng,chàng',
- '葛布=gé,bù',
- '迫击炮=pǎi,jī,pào',
- '系绳子=jì,shéng,zǐ',
- '对称=duì,chèn',
- '厚薄=hòu,báo',
- '令人发指=lìng,rén,fà,zhǐ',
- '难兄难弟=nàn,xiōng,nàn,dì',
- '疲沓=pí,ta',
- '燕山=yān,shān',
- '圩场=xū,cháng',
- '处方=chǔ,fāng',
- '零散=líng,sǎn',
- '模子=mú,zǐ',
- '报答=bào,dá',
- '压轴=yā,zhòu',
- '差数=chā,shù',
- '丧事=sāng,shì',
- '博闻强识=bó,wén,qiáng,zhì',
- '好好学习=hǎo,hǎo,xué,xí',
- '自怨自艾=zì,yuàn,zì,yì',
- '心宽体胖=xīn,kuān,tǐ,pán',
- '目的=mù,dì',
- '挑拨离间=tiǎo,bō,lí,jiàn',
- '执拗=zhí,niù',
- '思量=sī,liang',
- '一念之差=yī,niàn,zhī,chā',
- '潦倒=liáo,dǎo',
- '爱好=ài,hào',
- '喝彩=hè,cǎi',
- '范蠡=fàn,lǐ',
- '唱和=chàng,hè',
- '搭理=dā,lǐ',
- '监利=jiàn,lì',
- '树荫=shù,yīn',
- '茶几=chá,jī',
- '转载=zhuǎn,zǎi',
- '唱片儿=chàng,piān,er',
- '重新=chóng,xīn',
- '好吃好喝=hào,chī,hào,hē',
- '字帖=zì,tiè',
- '便宜行事=biàn,yí,xíng,shì',
- '勉强=miǎn,qiǎng',
- '丽水=lí,shuǐ',
- '衡量=héng,liáng',
- '阿弥陀佛=ē,mí,tuó,fó',
- '屡见不鲜=lǚ,jiàn,bù,xiān',
- '创巨痛深=chuāng,jù,tòng,shēn',
- '量体裁衣=liáng,tǐ,cái,yī',
- '秘鲁=bì,lǔ',
- '弯曲=wān,qū',
- '龟兹=qiū,cí',
- '阿木林=ā,mù,lín',
- '封禅=fēng,shàn',
- '阿谀=ē,yú',
- '苜蓿=mù,xu',
- '烙印=lào,yìn',
- '矿藏=kuàng,cáng',
- '挨说=ái,shuō',
- '一场雨=yī,cháng,yǔ',
- '落色=lào,shǎi',
- '困难=kùn,nán',
- '提供=tí,gōng',
- '芥菜=jiè,cài',
- '恐吓=kǒng,hè',
- '才干=cái,gàn',
- '答应=dā,yìng',
- '率领=shuài,lǐng',
- '单于=chán,yú',
- '看守=kān,shǒu',
- '宁愿=nìng,yuàn',
- '宝藏=bǎo,zàng',
- '好高骛远=hào,gāo,wù,yuǎn',
- '深恶痛疾=shēn,wù,tòng,jí',
- '懒散=lǎn,sǎn',
- '子弹=zǐ,dàn',
- '包乘制=bāo,chéng,zhì',
- '一目了然=yī,mù,liǎo,rán',
- '排场=pái,chang',
- '炮烙=páo,luò',
- '苣荬菜=qǔ,mǎi,cài',
- '测量=cè,liáng',
- '伯伯=bó,bo',
- '责难=zé,nàn',
- '钻孔=zuān,kǒng',
- '左传=zuǒ,zhuàn',
- '乌拉=wù,la',
- '看管=kān,guǎn',
- '莘庄=xīn,zhuāng',
- '骨殖=gǔ,shi',
- '曝光=bào,guāng',
- '撺掇=cuān,duo',
- '校舍=xiào,shè',
- '恶心=ě,xīn',
- '剿袭=chāo,xí',
- '漂泊=piāo,bó',
- '血晕=xiě,yùn',
- '累赘=léi,zhuì',
- '屏息=bǐng,xī',
- '角斗=jué,dòu',
- '露相=lòu,xiàng',
- '重阳=chóng,yáng',
- '乘兴=chéng,xìng',
- '内省=nèi,xǐng',
- '更事=gēng,shì',
- '飞来横祸=fēi,lái,hèng,huò',
- '倾箱倒箧=qīng,xiāng,dǎo,qiè',
- '络腮=luò,sāi',
- '择菜=zhái,cài',
- '转速=zhuàn,sù',
- '羽扇纶巾=yǔ,shàn,guān,jīn',
- '并州=bīng,zhōu',
- '散漫=sǎn,màn',
- '桑葚=sāng,shèn',
- '将兵=jiàng,bīng',
- '宿舍=sù,shè',
- '成为=chéng,wéi',
- '力能扛鼎=lì,néng,gāng,dǐng',
- '财会=cái,kuài',
- '间断=jiàn,duàn',
- '夹道=jiā,dào',
- '箪食壶浆=dān,sì,hú,jiāng',
- '起哄=qǐ,hòng',
- '说客=shuì,kè',
- '择不开=zhái,bù,kāi',
- '碾坊=niǎn,fáng',
- '可汗=kè,hán',
- '乘风破浪=chéng,fēng,pò,làng',
- '重庆=chóng,qìng',
- '鸭绿江=yā,lù,jiāng',
- '好逸恶劳=hào,yì,wù,láo',
- '簸箕=bò,ji',
- '屏风=píng,fēng',
- '钻探=zuān,tàn',
- '勒令=lè,lìng',
- '哄骗=hǒng,piàn',
- '呱呱坠地=gū,gū,zhuì,dì',
- '喝道=hè,dào',
- '应承=yìng,chéng',
- '厌恶=yàn,wù',
- '场院=cháng,yuàn',
- '苤蓝=piě,lan',
- '鲜为人知=xiǎn,wéi,rén,zhī',
- '幼畜=yòu,chù',
- '什锦=shí,jǐn',
- '牌坊=pái,fāng',
- '差不多=chà,bù,duō',
- '揠苗助长=yà,miáo,zhù,zhǎng',
- '应验=yìng,yàn',
- '属望=zhǔ,wàng',
- '间距=jiàn,jù',
- '影片儿=yǐng,piān,er',
- '掂量=diān,liang',
- '裂缝=liè,fèng',
- '条几=tiáo,jī',
- '颤动=chàn,dòng',
- '出没无常=chū,mò,wú,cháng',
- '饥荒=jī,huāng',
- '落子=lào,zǐ',
- '冲模=chòng,mú',
- '里弄=lǐ,lòng',
- '枸杞=gǒu,qǐ',
- '煞尾=shā,wěi',
- '规矩=guī,ju',
- '拓本=tà,běn',
- '呼幺喝六=hū,yāo,hè,liù',
- '差价=chā,jià',
- '似的=shì,de',
- '堵塞=dǔ,sè',
- '佣金=yòng,jīn',
- '重霄=chóng,xiāo',
- '电势差=diàn,shì,chā',
- '间不容发=jiān,bù,róng,fà',
- '厚朴=hòu,pò',
- '哭丧=kū,sang',
- '差不离=chà,bù,lí',
- '附和=fù,hè',
- '校勘=jiào,kān',
- '处罚=chǔ,fá',
- '差异=chā,yì',
- '处置=chǔ,zhì',
- '字帖儿=zì,tiě,ér',
- '他们俩=tā,mēn,liǎ',
- '中靶=zhòng,bǎ',
- '坷垃=kē,lā',
- '胳膊=gē,bo',
- '殷殷=yǐn,yǐn',
- '正旦=zhēng,dàn',
- '暴露=bào,lòu',
- '好胜=hào,shèng',
- '尺寸=chǐ,cùn',
- '发颤=fā,chàn',
- '冠盖相属=guān,gài,xiāng,zhǔ',
- '流氓=liú,máng',
- '烙铁=lào,tiě',
- '厦门=xià,mén',
- '空心吃药=kōng,xīn,chī,yào',
- '澄清=chéng,qīng',
- '色子=shǎi,zǐ',
- '翻供=fān,gòng',
- '呼吁=hū,yù',
- '言差语错=yán,chā,yǔ,cuò',
- '寡廉鲜耻=guǎ,lián,xiǎn,chǐ',
- '结实=jiē,shi',
- '行市=háng,shì',
- '胸脯=xiōng,pú',
- '重来=chóng,lái',
- '背景=bèi,jǐng',
- '不蔓不枝=bù,màn,bù,zhī',
- '载歌载舞=zài,gē,zài,wǔ',
- '间隙=jiàn,xì',
- '千载难逢=qiān,zǎi,nán,féng',
- '估衣=gù,yī',
- '配给=pèi,jǐ',
- '胳臂=gē,bei',
- '老伯=lǎo,bó',
- '重载=chóng,zǎi',
- '堡子=bǔ,zi',
- '装载=zhuāng,zài',
- '相似=xiāng,sì',
- '好大喜功=hào,dà,xǐ,gōng',
- '大王=dài,wáng',
- '结发=jié,fà',
- '安步当车=ān,bù,dāng,chē',
- '传承=chuán,chéng',
- '好奇=hào,qí',
- '擂台=lèi,tái',
- '贝壳=bèi,ké',
- '哽咽=gěng,yè',
- '喜好=xǐ,hào',
- '乘势=chéng,shì',
- '校正=jiào,zhèng',
- '数目=shù,mù',
- '偏差=piān,chā',
- '宝坻=bǎo,dǐ',
- '适当=shì,dàng',
- '什么=shén,me',
- '囤积=tún,jī',
- '自给自足=zì,jǐ,zì,zú',
- '创举=chuàng,jǔ',
- '颠簸=diān,bǒ',
- '畜养=xù,yǎng',
- '尉犁=yù,lí',
- '折本=shé,běn',
- '笼子=lóng,zi',
- '十里堡=shí,lǐ,pù',
- '勒逼=lè,bī',
- '朴硝=pò,xiāo',
- '塞翁失马=sài,wēng,shī,mǎ',
- '碑帖=bēi,tiè',
- '校订=jiào,dìng',
- '封妻荫子=fēng,qī,yìn,zǐ',
- '蠡县=lǐ,xiàn',
- '切磋=qiē,cuō',
- '调换=diào,huàn',
- '应许=yīng,xǔ',
- '喷嚏=pēn,tì',
- '假期=jà,qī',
- '咬文嚼字=yǎo,wén,jiáo,zì',
- '六安=lù,ān',
- '济南=jǐ,nán',
- '地壳=dì,qiào',
- '会计=kuài,jì',
- '误差=wù,chā',
- '为难=wéi,nán',
- '豁口=huō,kǒu',
- '边塞=biān,sài',
- '锁钥=suǒ,yuè',
- '婀娜=ē,nuó',
- '攒动=cuán,dòng',
- '省亲=xǐng,qīn',
- '草创=cǎo,chuàng',
- '停泊=tíng,bó',
- '台州=tāi,zhōu',
- '坊巷=fāng,xiàng',
- '重逢=chóng,féng',
- '种树=zhòng,shù',
- '乐谱=yuè,pǔ',
- '臂膀=bì,bǎng',
- '着眼=zhuó,yǎn',
- '扁舟=piān,zhōu',
- '校对=jiào,duì',
- '貉子=háo,zi',
- '阿附=ē,fù',
- '粮囤=liáng,dùn',
- '强迫=qiǎng,pò',
- '削铅笔=xiāo,qiān,bǐ'
-];
diff --git a/plugin/wechat_flutter_plugin/lib/pinyin/pinyin_exception.dart b/plugin/wechat_flutter_plugin/lib/pinyin/pinyin_exception.dart
deleted file mode 100644
index 9a840ab..0000000
--- a/plugin/wechat_flutter_plugin/lib/pinyin/pinyin_exception.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-/// Pinyin Exception.
-class PinyinException implements Exception {
- String message;
-
- PinyinException([this.message]);
-
- String toString() {
- if (message == null) return "Exception";
- return "Exception: $message";
- }
-}
diff --git a/plugin/wechat_flutter_plugin/lib/pinyin/pinyin_format.dart b/plugin/wechat_flutter_plugin/lib/pinyin/pinyin_format.dart
deleted file mode 100644
index 15b0467..0000000
--- a/plugin/wechat_flutter_plugin/lib/pinyin/pinyin_format.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * 拼音格式：
- * WITHOUT_TONE--不带声调
- * WITH_TONE_MARK--带声调
- * WITH_TONE_NUMBER--数字代表声调
- */
-
-///
-enum PinyinFormat { WITHOUT_TONE, WITH_TONE_MARK, WITH_TONE_NUMBER }
diff --git a/plugin/wechat_flutter_plugin/lib/pinyin/pinyin_helper.dart b/plugin/wechat_flutter_plugin/lib/pinyin/pinyin_helper.dart
deleted file mode 100644
index 277f846..0000000
--- a/plugin/wechat_flutter_plugin/lib/pinyin/pinyin_helper.dart
+++ /dev/null
@@ -1,343 +0,0 @@
-import 'dart:collection';
-
-import 'package:dim/pinyin/chinese_helper.dart';
-import 'package:dim/pinyin/pinyin_exception.dart';
-import 'package:dim/pinyin/pinyin_format.dart';
-import 'package:dim/pinyin/pinyin_resourece.dart';
-
-/**
- * 汉字转拼音类
- */
-
-
-///
-class PinyinHelper {
- static Map<String, String> pinyinMap = PinyinResource.getPinyinResource();
- static Map<String, String> multiPinyinMap =
- PinyinResource.getMultiPinyinResource();
-
- static final String pinyinSeparator = ","; // 拼音分隔符
- // 所有带声调的拼音字母
- static final String allMarkedVowel = "āáǎàēéěèīíǐìōóǒòūúǔùǖǘǚǜ";
- static final String allUnmarkedVowel = "aeiouv";
- static int minMultiLength = 2;
- static int maxMultiLength = 0;
-
- /**
- *获取字符串首字拼音
- *@param str 需要转换的字符串
- * @return 首字拼音 (成都 cheng)
- */
-
- ///
- static String getFirstWordPinyin(String str) {
- String _pinyin = getPinyinE(str, separator: pinyinSeparator);
- return _pinyin.split(pinyinSeparator)[0];
- }
-
- /**
- * 获取字符串对应拼音的首字母
- * @param str 需要转换的字符串
- * @param defPinyin 拼音分隔符 def: '#'
- * @return 对应拼音的首字母 (成都 cd)
- */
-
- ///
- static String getShortPinyin(String str, {String defPinyin: '#'}) {
- StringBuffer sb = new StringBuffer();
- String pinyin =
- getPinyinE(str, separator: pinyinSeparator, defPinyin: defPinyin);
- List<String> list = pinyin.split(pinyinSeparator);
- list.forEach((value) {
- sb.write(value[0]);
- });
- return sb.toString();
- }
-
- /**
- * 将字符串转换成相应格式的拼音
- * @param str 需要转换的字符串
- * @param separator 拼音分隔符 def: " "
- * @param format 拼音格式 def: PinyinFormat.WITHOUT_TONE
- * @return 字符串的拼音(成都 cheng du)
- */
-
- ///
- static String getPinyin(String str,
- {String separator: " ", PinyinFormat format: PinyinFormat.WITHOUT_TONE}) {
- StringBuffer sb = new StringBuffer();
- str = ChineseHelper.convertToSimplifiedChinese(str);
- int strLen = str.length;
- int i = 0;
- while (i < strLen) {
- String subStr = str.substring(i);
- MultiPinyin node = convertToMultiPinyin(subStr, separator, format);
- if (node == null) {
- String _char = str[i];
- if (ChineseHelper.isChinese(_char)) {
- List<String> pinyinArray = convertToPinyinArray(_char, format);
- if (pinyinArray.length > 0) {
- sb.write(pinyinArray[0]);
- } else {
- throw new PinyinException("Can't convert to pinyin: " + _char);
- }
- } else {
- sb.write(_char);
- }
- if (i < strLen) {
- sb.write(separator);
- }
- i++;
- } else {
- sb.write(node.pinyin);
- i += node.word.length;
- }
- }
- return ((sb.toString().endsWith(separator) && separator != "")
- ? sb.toString().substring(0, sb.toString().length - 1)
- : sb.toString());
- }
-
- /**
- * 将字符串转换成相应格式的拼音 (不能转换的字拼音默认用' '替代 )
- * @param str 需要转换的字符串
- * @param separator 拼音分隔符 def: " "
- * @param defPinyin 拼音分隔符 def: ' '
- * @param format 拼音格式 def: PinyinFormat.WITHOUT_TONE
- * @return 字符串的拼音(成都 cheng du)
- */
-
- ///
- static String getPinyinE(String str,
- {String separator: " ",
- String defPinyin: ' ',
- PinyinFormat format: PinyinFormat.WITHOUT_TONE}) {
- StringBuffer sb = new StringBuffer();
- str = ChineseHelper.convertToSimplifiedChinese(str);
- int strLen = str.length;
- int i = 0;
- while (i < strLen) {
- String subStr = str.substring(i);
- MultiPinyin node = convertToMultiPinyin(subStr, separator, format);
- if (node == null) {
- String _char = str[i];
- if (ChineseHelper.isChinese(_char)) {
- List<String> pinyinArray = convertToPinyinArray(_char, format);
- if (pinyinArray.length > 0) {
- sb.write(pinyinArray[0]);
- } else {
- sb.write(defPinyin);
- print("### Can't convert to pinyin: " +
- _char +
- " defPinyin: " +
- defPinyin);
- }
- } else {
- sb.write(_char);
- }
- if (i < strLen) {
- sb.write(separator);
- }
- i++;
- } else {
- sb.write(node.pinyin);
- i += node.word.length;
- }
- }
- return ((sb.toString().endsWith(separator) && separator != "")
- ? sb.toString().substring(0, sb.toString().length - 1)
- : sb.toString());
- }
-
- /**
- * 获取多音字拼音
- * @param str 需要转换的字符串
- * @param separator 拼音分隔符
- * @param format 拼音格式
- * @return 多音字拼音
- */
-
- ///
- static MultiPinyin convertToMultiPinyin(
- String str, String separator, PinyinFormat format) {
- if (str.length < minMultiLength) return null;
- if (maxMultiLength == 0) {
- List<String> keys = multiPinyinMap.keys.toList();
- for (int i = 0, length = keys.length; i < length; i++) {
- if (keys[i].length > maxMultiLength) {
- maxMultiLength = keys[i].length;
- }
- }
- }
- for (int end = minMultiLength, length = str.length;
- (end <= length && end <= maxMultiLength);
- end++) {
- String subStr = str.substring(0, end);
- String multi = multiPinyinMap[subStr];
- if (multi != null && multi.length > 0) {
- List<String> str = multi.split(pinyinSeparator);
- StringBuffer sb = new StringBuffer();
- str.forEach((value) {
- List<String> pinyin = formatPinyin(value, format);
- sb.write(pinyin[0]);
- sb.write(separator);
- });
- return new MultiPinyin(word: subStr, pinyin: sb.toString());
- }
- }
- return null;
- }
-
- /**
- * 将单个汉字转换为相应格式的拼音
- * @param c 需要转换成拼音的汉字
- * @param format 拼音格式
- * @return 汉字的拼音
- */
-
- ///
- static List<String> convertToPinyinArray(String c, PinyinFormat format) {
- String pinyin = pinyinMap[c];
- if ((pinyin != null) && ("null" != pinyin)) {
- return formatPinyin(pinyin, format);
- }
- return new List();
- }
-
- /**
- * 将带声调的拼音格式化为相应格式的拼音
- * @param pinyinStr 带声调格式的拼音
- * @param format 拼音格式
- * @return 格式转换后的拼音
- */
-
- ///
- static List<String> formatPinyin(String pinyinStr, PinyinFormat format) {
- if (format == PinyinFormat.WITH_TONE_MARK) {
- return pinyinStr.split(pinyinSeparator);
- } else if (format == PinyinFormat.WITH_TONE_NUMBER) {
- return convertWithToneNumber(pinyinStr);
- } else if (format == PinyinFormat.WITHOUT_TONE) {
- return convertWithoutTone(pinyinStr);
- }
- return new List();
- }
-
- /**
- * 将带声调格式的拼音转换为不带声调格式的拼音
- * @param pinyinArrayStr 带声调格式的拼音
- * @return 不带声调的拼音
- */
-
- ///
- static List<String> convertWithoutTone(String pinyinArrayStr) {
- List<String> pinyinArray;
- for (int i = allMarkedVowel.length - 1; i >= 0; i--) {
- int originalChar = allMarkedVowel.codeUnitAt(i);
- double index = (i - i % 4) / 4;
- int replaceChar = allUnmarkedVowel.codeUnitAt(index.toInt());
- pinyinArrayStr = pinyinArrayStr.replaceAll(
- String.fromCharCode(originalChar), String.fromCharCode(replaceChar));
- }
- // 将拼音中的ü替换为v
- pinyinArray = pinyinArrayStr.replaceAll("ü", "v").split(pinyinSeparator);
- // 去掉声调后的拼音可能存在重复，做去重处理
- LinkedHashSet<String> pinyinSet = new LinkedHashSet<String>();
- pinyinArray.forEach((value) {
- pinyinSet.add(value);
- });
- return pinyinSet.toList();
- }
-
- /**
- * 将带声调格式的拼音转换为数字代表声调格式的拼音
- * @param pinyinArrayStr 带声调格式的拼音
- * @return 数字代表声调格式的拼音
- */
-
- ///
- static List<String> convertWithToneNumber(String pinyinArrayStr) {
- List<String> pinyinArray = pinyinArrayStr.split(pinyinSeparator);
- for (int i = pinyinArray.length - 1; i >= 0; i--) {
- bool hasMarkedChar = false;
- String originalPinyin = pinyinArray[i].replaceAll("ü", "v"); // 将拼音中的ü替换为v
- for (int j = originalPinyin.length - 1; j >= 0; j--) {
- int originalChar = originalPinyin.codeUnitAt(j);
- // 搜索带声调的拼音字母，如果存在则替换为对应不带声调的英文字母
- if (originalChar < 'a'.codeUnitAt(0) ||
- originalChar > 'z'.codeUnitAt(0)) {
- int indexInAllMarked =
- allMarkedVowel.indexOf(String.fromCharCode(originalChar));
- int toneNumber = indexInAllMarked % 4 + 1; // 声调数
- double index = (indexInAllMarked - indexInAllMarked % 4) / 4;
- int replaceChar = allUnmarkedVowel.codeUnitAt(index.toInt());
- pinyinArray[i] = originalPinyin.replaceAll(
- String.fromCharCode(originalChar),
- String.fromCharCode(replaceChar)) +
- toneNumber.toString();
- hasMarkedChar = true;
- break;
- }
- }
- if (!hasMarkedChar) {
- // 找不到带声调的拼音字母说明是轻声，用数字5表示
- pinyinArray[i] = originalPinyin + "5";
- }
- }
-
- return pinyinArray;
- }
-
- /**
- * 将单个汉字转换成带声调格式的拼音
- * @param c 需要转换成拼音的汉字
- * @return 字符串的拼音
- */
-
- ///
- static List<String> convertCharToPinyinArray(String c) {
- return convertToPinyinArray(c, PinyinFormat.WITH_TONE_MARK);
- }
-
- /**
- * 判断一个汉字是否为多音字
- * @param c汉字
- * @return 判断结果，是汉字返回true，否则返回false
- */
-
- ///
- static bool hasMultiPinyin(String c) {
- List<String> pinyinArray = convertCharToPinyinArray(c);
- if (pinyinArray != null && pinyinArray.length > 1) {
- return true;
- }
- return false;
- }
-
- /// 添加拼音字典
- static void addPinyinDict(List<String> list) {
- pinyinMap.addAll(PinyinResource.getResource(list));
- }
-
- /// 添加多音字字典
- static void addMultiPinyinDict(List<String> list) {
- multiPinyinMap.addAll(PinyinResource.getResource(list));
- }
-}
-
-/// 多音字
-class MultiPinyin {
- String word;
- String pinyin;
-
- MultiPinyin({this.word, this.pinyin});
-
- @override
- String toString() {
- StringBuffer sb = new StringBuffer('{');
- sb.write("\"word\":\"$word\"");
- sb.write(",\"pinyin\":\"$pinyin\"");
- sb.write('}');
- return sb.toString();
- }
-}
diff --git a/plugin/wechat_flutter_plugin/lib/pinyin/pinyin_resourece.dart b/plugin/wechat_flutter_plugin/lib/pinyin/pinyin_resourece.dart
deleted file mode 100644
index ea47fe7..0000000
--- a/plugin/wechat_flutter_plugin/lib/pinyin/pinyin_resourece.dart
+++ /dev/null
@@ -1,30 +0,0 @@
-import 'dart:collection';
-
-import 'package:dim/pinyin/dict_data.dart';
-
-/// Pinyin Resource.
-class PinyinResource {
- static Map<String, String> getPinyinResource() {
- return getResource(PINYIN_DICT);
- }
-
- static Map<String, String> getChineseResource() {
- return getResource(CHINESE_DICT);
- }
-
- static Map<String, String> getMultiPinyinResource() {
- return getResource(MULTI_PINYIN_DICT);
- }
-
- static Map<String, String> getResource(List<String> list) {
- Map<String, String> map = new HashMap();
- List<MapEntry<String, String>> mapEntryList = new List();
- for (int i = 0, length = list.length; i < length; i++) {
- List<String> tokens = list[i].trim().split("=");
- MapEntry<String, String> mapEntry = new MapEntry(tokens[0], tokens[1]);
- mapEntryList.add(mapEntry);
- }
- map.addEntries(mapEntryList);
- return map;
- }
-}
diff --git a/plugin/wechat_flutter_plugin/lib/route/fade_route.dart b/plugin/wechat_flutter_plugin/lib/route/fade_route.dart
deleted file mode 100644
index 72880cd..0000000
--- a/plugin/wechat_flutter_plugin/lib/route/fade_route.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-import 'package:flutter/material.dart';
-
-class FadeRoute extends PageRouteBuilder {
- final Widget widget;
-
- FadeRoute(this.widget)
- : super(
- transitionDuration: const Duration(milliseconds: 100),
- pageBuilder: (BuildContext context, Animation<double> animation1,
- Animation<double> animation2) {
- return widget;
- },
- transitionsBuilder: (BuildContext context,
- Animation<double> animation1,
- Animation<double> animation2,
- Widget child) {
- return FadeTransition(
- opacity: Tween(begin: 0.0, end: 1.0).animate(CurvedAnimation(
- parent: animation1, curve: Curves.fastOutSlowIn)),
- child: child,
- );
- });
-}
diff --git a/plugin/wechat_flutter_plugin/lib/route/rotation_route.dart b/plugin/wechat_flutter_plugin/lib/route/rotation_route.dart
deleted file mode 100644
index 83394b9..0000000
--- a/plugin/wechat_flutter_plugin/lib/route/rotation_route.dart
+++ /dev/null
@@ -1,22 +0,0 @@
-import 'package:flutter/material.dart';
-
-class RotationRoute extends PageRouteBuilder {
- final Widget widget;
-
- RotationRoute(this.widget)
- : super(
- transitionDuration: const Duration(milliseconds: 500),
- pageBuilder: (BuildContext context, Animation<double> animation1,
- Animation<double> animation2) {
- return widget;
- },
- transitionsBuilder: (BuildContext context,
- Animation<double> animation1,
- Animation<double> animation2,
- Widget child) {
- return ScaleTransition(
- scale: Tween(begin: 0.0, end: 1.0).animate(CurvedAnimation(
- parent: animation1, curve: Curves.fastOutSlowIn)),
- child: child);
- });
-}
diff --git a/plugin/wechat_flutter_plugin/lib/time/time_util.dart b/plugin/wechat_flutter_plugin/lib/time/time_util.dart
deleted file mode 100644
index 804ad4b..0000000
--- a/plugin/wechat_flutter_plugin/lib/time/time_util.dart
+++ /dev/null
@@ -1,82 +0,0 @@
-
-import 'dart:async';
-
-///timer callback.(millisUntilFinished 毫秒).
-typedef void OnTimerTickCallback(int millisUntilFinished);
-
-class TimerUtil {
- TimerUtil({this.mInterval = Duration.millisecondsPerSecond, this.mTotalTime});
-
- OnTimerTickCallback _onTimerTickCallback;
-
- /// Timer是否启动.
- bool _isActive = false;
-
- Timer _mTimer;
-
- /// Timer间隔 单位毫秒，默认1000毫秒(1秒).
- int mInterval;
-
- /// 倒计时总时间
- int mTotalTime; //单位毫秒
-
- /// 设置Timer间隔.
- void setInterval(int interval) {
- if (interval <= 0) interval = Duration.millisecondsPerSecond;
- mInterval = interval;
- }
-
- /// 设置倒计时总时间.
- void setTotalTime(int totalTime) {
- if (totalTime <= 0) return;
- mTotalTime = totalTime;
- }
-
- /// Timer是否启动.
- bool isActive() {
- return _isActive;
- }
-
- void _doCallback(int time) {
- if (_onTimerTickCallback != null) {
- _onTimerTickCallback(time);
- }
- }
-
- void startCountDown() {
- if (_isActive || mInterval <= 0 || mTotalTime <= 0) return;
- _isActive = true;
- Duration duration = Duration(milliseconds: mInterval);
- _doCallback(mTotalTime);
- _mTimer = Timer.periodic(duration, (Timer timer) {
- int time = mTotalTime - mInterval;
- mTotalTime = time;
- if (time >= mInterval) {
- _doCallback(time);
- } else if (time == 0) {
- _doCallback(time);
- cancel();
- } else {
- timer.cancel();
- Future.delayed(Duration(milliseconds: time), () {
- mTotalTime = 0;
- _doCallback(0);
- cancel();
- });
- }
- });
- }
-
- void cancel() {
- if (_mTimer != null) {
- _mTimer.cancel();
- _mTimer = null;
- }
- _isActive = false;
- }
-
- // set timer callback.
- void setOnTimerTickCallback(OnTimerTickCallback callback) {
- _onTimerTickCallback = callback;
- }
-}
diff --git a/plugin/wechat_flutter_plugin/pubspec.yaml b/plugin/wechat_flutter_plugin/pubspec.yaml
deleted file mode 100644
index e52004e..0000000
--- a/plugin/wechat_flutter_plugin/pubspec.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: dim
-description: flutter_wechat_plugin
-version: 0.2.8
-author: brzhang <1595819400@qq.com>, q1 <zonggeu@gmail.com>
-homepage: https://github.com/fluttercandies/wechat_flutter
-
-dependencies:
- flutter:
- sdk: flutter
-# flutter_native_image: any
-# flutter_image_compress: any
-
-flutter:
- plugin:
- androidPackage: com.brzhang.flutter.dim
- pluginClass: DimPlugin
-
-environment:
- sdk: ">=2.1.0 <3.0.0"
diff --git a/plugin/wechat_flutter_plugin/res/values/strings_en.arb b/plugin/wechat_flutter_plugin/res/values/strings_en.arb
deleted file mode 100644
index 9e26dfe..0000000
--- a/plugin/wechat_flutter_plugin/res/values/strings_en.arb
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/pubspec.yaml b/pubspec.yaml
index 699e4d6..ddcad27 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,10 +3,10 @@ description: A new Flutter project..
publish_to: 'none' # Remove this line if you wish to publish to pub.dev
-version: 1.0.1+101
+version: 1.0.0+100
environment:
- sdk: ">=2.7.0 <3.0.0"
+ sdk: '>=2.16.2 <3.0.0'
dependencies:
flutter:
@@ -15,90 +15,100 @@ dependencies:
flutter_localizations:
sdk: flutter
#IOS风格材料图标
- cupertino_icons: ^0.1.2
+ cupertino_icons: 1.0.5
#即时通讯【腾讯云】
- dim:
- path: plugin/wechat_flutter_plugin
+ tencent_im_sdk_plugin: 5.0.2
+ tencent_im_sdk_plugin_platform_interface: 0.3.8
+ #加解密
+ archive: 3.3.4
#持久化存储
- # shared_preferences: 0.5.2+2 #[Flutter2及之前]用这个
- shared_preferences: ^2.0.8
+ shared_preferences: 2.0.15
#状态管理
- # provider: 4.3.1 #1.22.5版本Flutter用这个
- provider: ^6.0.1 #Flutter2.5用这个
- # provider: ^5.0.0 #Flutter2用这个
- # cached_network_image: 1.1.1 # 1.9版本flutter
- # cached_network_image: 2.0.0 #1.22.5版本Flutter用这个
- cached_network_image: ^3.0.0 #Flutter2用这个
+ provider: 6.0.4
+ #图片显示
+ cached_network_image: 3.2.0
+ flutter_cache_manager: 3.3.0
#toast提示框
- toast: 0.1.5
+# toast: 0.3.0
+ oktoast: 3.1.2
#web显示
- webview_flutter: 0.3.22+1
+ webview_flutter: 3.0.4
#选取图库
-# image_picker: 0.6.1+2 #flutter2或者之前的使用这个
- image_picker: ^0.8.5+3 #Flutter2.10用这个,,其他可注释
- #文本扩展显示
- # extended_text: 1.0.1 #1.17版本Flutter用这个
- # extended_text: 4.0.0 #1.20版本Flutter用这个
- # extended_text: 4.0.1 #1.22.5版本Flutter用这个
- # extended_text: ^6.0.5 #Flutter2用这个,,其他可注释
- # extended_text: ^7.0.0 #flutter2.5用这个,,其他可注释
- extended_text: ^9.0.0 #flutter2.10.4用这个,,其他可注释
- #文字表情混入
- # extended_text_field: 1.0.1 #1.17版本Flutter用这个
- # extended_text_field: 4.0.0 #1.20版本Flutter用这个
- # extended_text_field: 5.0.1 #1.22.5版本Flutter用这个
- # extended_text_field: ^7.0.1 #Flutter2用这个,,其他可注释
- # extended_text_field: ^8.0.0 #Flutter2.5用这个,,其他可注释
- extended_text_field: ^10.0.0 #Flutter2.10用这个,,其他可注释
- # extended_text_library: 4.0.2 #1.22.5版本Flutter用这个,,其他可注释
- # extended_text_library: ^6.0.0 #Flutter2用这个,,其他可注释
- # extended_text_library: ^7.0.0 #Flutter2.5用这个,,其他可注释
- extended_text_library: ^9.0.0 #Flutter2.10用这个,,其他可注释
+ image_picker: 0.8.6
+ #Text expanded show.
+ extended_text: 9.1.1
+ #Text insert emoji.
+ extended_text_field: 10.1.1
+ #Text insert emoji.[support lib]
+ extended_text_library: 9.1.0
#打开系统浏览器
- url_launcher: 5.2.7
+ url_launcher: 6.1.6
#网络连接
- connectivity: 0.4.6
+ connectivity_plus: 2.3.9
#图片显示
- photo_view: 0.4.2
- # dio: 2.2.2 #低于Flutter-1.17使用此版本
- # dio: 3.0.9 #1.22.5版本Flutter用这个
- dio: ^4.0.0 #Flutter2用这个
+ photo_view: 0.14.0
+ #网络请求
+ dio: 4.0.6
#打开文件
-# open_file: 2.0.3 #flutter2或者之前的使用这个
- open_file: ^3.2.1 #flutter 2.10使用这个
+ open_file: 3.2.1
#获取包信息
-# package_info: 0.4.0+2 #flutter2或者之前的使用这个
- package_info_plus: ^1.4.0 #flutter 2.10使用这个
+ package_info_plus: 1.4.2
#音频处理
-# flutter_sound: 1.7.0 # flutter 2.10之前的用这个
- flutter_sound: ^9.1.2 # flutter 2.10用这个
+ flutter_sound: 9.2.13
#权限处理
-# permission_handler: 3.1.0 # flutter 2.10之前的用这个
- permission_handler: ^9.2.0 # flutter 2.10用这个
+ permission_handler: 10.2.0
#音频处理
- # audioplayers: 0.13.3 #1.22.5版本Flutter用这个
- audioplayers: ^0.19.0 #Flutter2用这个
- #调用相机
- camera: # 0.5.7+1
- path: plugin/camera
+ audioplayers: 1.1.1
#视频播放
- # video_player: 0.10.11+2 #1.22.5版本Flutter用这个
- video_player: ^2.1.1 #Flutter2用这个
+ video_player: 2.4.7
#图片压缩
-# flutter_image_compress: 0.6.8 # flutter 2.10之前的用这个
-# flutter_image_compress: ^1.1.0 # flutter 2.10用这个
+ flutter_image_compress: 1.1.3
#拼音
- lpinyin: ^1.0.7
+ lpinyin: 2.0.3
#特殊列表滑动
- azlistview: ^0.1.0
+ azlistview: 2.0.0
#微信图库
- # wechat_assets_picker: ^4.2.1 #1.22.5版本Flutter用这个
- # wechat_assets_picker: ^5.4.0 #Flutter2用这个
- wechat_assets_picker: ^6.2.3 #flutter2.5用这个
+ wechat_assets_picker: 7.2.0
#扩展图片
- extended_image: 6.0.2+1 # flutter 2.10 用这个
+ extended_image: 6.2.0
#平台
- platform: ^3.1.0 # flutter 2.10 用这个
+ platform: 3.1.0
+ #状态管理
+ get: 4.6.5
+ #事件总线
+ event_bus: 2.0.0
+ #拍摄和录制视频
+ wechat_camera_picker: 3.6.3
+ #扫码功能
+ flutter_scankit: 1.2.4
+ #防止重复点击
+ just_throttle_it: 2.1.0
+ #通讯录
+ flutter_contacts: 1.1.5+1
+ #二维码生成
+ qr_flutter: 4.0.0
+ #获取视频缩略图
+ video_thumbnail: 0.5.3
+ #路径提供商
+ path_provider: 2.0.11
+ #视频播放和获取视频时长
+ fijkplayer: 0.10.1
+ #保存图片
+ image_gallery_saver: 1.7.1
+ #本地数据库管理
+ sqflite: 2.0.2+1
+ #日志
+ logging: 1.1.0
+ #获取视频信息
+ flutter_video_info: 1.3.1
+ #音视频
+ tencent_trtc_cloud: 2.3.9
+# #音视频通话
+# wechat_flutter_call:
+# path: plugin/wechat_flutter_call
+# #工具集
+# wechat_flutter_util:
+# path: plugin/wechat_flutter_util
dev_dependencies:
flutter_test:
@@ -133,6 +143,8 @@ flutter:
- assets/images/ic_right_arrow_grey.webp
- assets/images/ic_add_friend.webp
- assets/images/ic_no_data.webp
+ - assets/images/loading.gif
+ - assets/images/ic_chat_play_icon.png
- assets/images/login/select_avatar.webp
- assets/images/login/ic_select_have.webp
@@ -192,6 +204,7 @@ flutter:
- assets/images/contact/ic_scanqr.webp
- assets/images/contact/ic_search_wework.webp
- assets/images/contact/ic_contact_add.webp
+ - assets/images/contact/ic_search_long.png
- assets/images/discover/ff_Icon_album.webp
- assets/images/discover/ff_Icon_shake.webp
@@ -206,6 +219,7 @@ flutter:
- assets/images/group/
- assets/images/wechat/
- assets/images/wechat/in/
+ - assets/images/live/
- assets/data/contacts.json
- assets/data/friends.json
diff --git a/reDep.sh b/reDep.sh
new file mode 100644
index 0000000..516117b
--- /dev/null
+++ b/reDep.sh
@@ -0,0 +1,2 @@
+flutter clean
+flutter packages get
\ No newline at end of file
diff --git a/web/favicon.png b/web/favicon.png
deleted file mode 100644
index 8aaa46a..0000000
Binary files a/web/favicon.png and /dev/null differ
diff --git a/web/icons/Icon-192.png b/web/icons/Icon-192.png
deleted file mode 100644
index b749bfe..0000000
Binary files a/web/icons/Icon-192.png and /dev/null differ
diff --git a/web/icons/Icon-512.png b/web/icons/Icon-512.png
deleted file mode 100644
index 88cfd48..0000000
Binary files a/web/icons/Icon-512.png and /dev/null differ
diff --git a/web/index.html b/web/index.html
deleted file mode 100644
index 3cb2c1f..0000000
--- a/web/index.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <!--
- If you are serving your web app in a path other than the root, change the
- href value below to reflect the base path you are serving from.
-
- The path provided below has to start and end with a slash "/" in order for
- it to work correctly.
-
- Fore more details:
- * https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base
- -->
- <base href="/">
-
- <meta charset="UTF-8">
- <meta content="IE=Edge" http-equiv="X-UA-Compatible">
- <meta name="description" content="A new Flutter project.">
-
- <!-- iOS meta tags & icons -->
- <meta name="apple-mobile-web-app-capable" content="yes">
- <meta name="apple-mobile-web-app-status-bar-style" content="black">
- <meta name="apple-mobile-web-app-title" content="wechat_flutter">
- <link rel="apple-touch-icon" href="icons/Icon-192.png">
-
- <!-- Favicon -->
- <link rel="icon" type="image/png" href="favicon.png"/>
-
- <title>wechat_flutter</title>
- <link rel="manifest" href="manifest.json">
-</head>
-<body>
- <!-- This script installs service_worker.js to provide PWA functionality to
- application. For more information, see:
- https://developers.google.com/web/fundamentals/primers/service-workers -->
- <script>
- if ('serviceWorker' in navigator) {
- window.addEventListener('flutter-first-frame', function () {
- navigator.serviceWorker.register('flutter_service_worker.js');
- });
- }
- </script>
- <script src="main.dart.js" type="application/javascript"></script>
-</body>
-</html>
diff --git a/web/manifest.json b/web/manifest.json
deleted file mode 100644
index 719c96c..0000000
--- a/web/manifest.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "name": "wechat_flutter",
- "short_name": "wechat_flutter",
- "start_url": ".",
- "display": "standalone",
- "background_color": "#0175C2",
- "theme_color": "#0175C2",
- "description": "A new Flutter project.",
- "orientation": "portrait-primary",
- "prefer_related_applications": false,
- "icons": [
- {
- "src": "icons/Icon-192.png",
- "sizes": "192x192",
- "type": "image/png"
- },
- {
- "src": "icons/Icon-512.png",
- "sizes": "512x512",
- "type": "image/png"
- }
- ]
-}